# HG changeset patch
# User Simon Cross <hodgestar+bzr@gmail.com>
# Date 1282685884 -7200
# Node ID d00aa26941c451b7f36f3beaa0b7f29f919ab771
# Parent  5e5d71e40e54d73033f327a401cacbdd553ef3aa
Add machine and engine rooms to map. Fix typo in name of mess hall doorway thing.

diff -r 5e5d71e40e54 -r d00aa26941c4 gamelib/scenes/engine.py
--- a/gamelib/scenes/engine.py	Tue Aug 24 23:32:05 2010 +0200
+++ b/gamelib/scenes/engine.py	Tue Aug 24 23:38:04 2010 +0200
@@ -1,6 +1,6 @@
 """Engine room where things need to be repaired."""
 
-from gamelib.state import Scene, Item, Thing
+from gamelib.state import Scene, Item, Thing, InteractText, Result
 
 
 class Engine(Scene):
@@ -9,8 +9,32 @@
     BACKGROUND = None # TODO
 
     INITIAL_DATA = {
-        'accessible': False,
+        'accessible': True,
         }
 
+    def __init__(self, state):
+        super(Engine, self).__init__(state)
+        self.add_thing(ToMap())
+
+    def enter(self):
+        return Result("Somewhere in the darkness the engine waits and bides its time.")
+
+
+class ToMap(Thing):
+    "Way to map."
+
+    NAME = "engine.tomap"
+    DEST = "map"
+
+    INTERACTS = {
+        "door": InteractText(100, 200, "To Map"),
+        }
+
+    INITIAL = "door"
+
+    def interact_without(self):
+        """Go to map."""
+        self.state.set_current_scene("map")
+
 
 SCENES = [Engine]
diff -r 5e5d71e40e54 -r d00aa26941c4 gamelib/scenes/machine.py
--- a/gamelib/scenes/machine.py	Tue Aug 24 23:32:05 2010 +0200
+++ b/gamelib/scenes/machine.py	Tue Aug 24 23:38:04 2010 +0200
@@ -1,6 +1,6 @@
 """Machine room where tools and machines are found."""
 
-from gamelib.state import Scene, Item, Thing
+from gamelib.state import Scene, Item, Thing, InteractText, Result
 
 
 class Machine(Scene):
@@ -9,8 +9,32 @@
     BACKGROUND = None # TODO
 
     INITIAL_DATA = {
-        'accessible': False,
+        'accessible': True,
         }
 
+    def __init__(self, state):
+        super(Machine, self).__init__(state)
+        self.add_thing(ToMap())
+
+    def enter(self):
+        return Result("The machine room is dark and forbidding.")
+
+
+class ToMap(Thing):
+    "Way to map."
+
+    NAME = "machine.tomap"
+    DEST = "map"
+
+    INTERACTS = {
+        "door": InteractText(100, 200, "To Map"),
+        }
+
+    INITIAL = "door"
+
+    def interact_without(self):
+        """Go to map."""
+        self.state.set_current_scene("map")
+
 
 SCENES = [Machine]
diff -r 5e5d71e40e54 -r d00aa26941c4 gamelib/scenes/mess.py
--- a/gamelib/scenes/mess.py	Tue Aug 24 23:32:05 2010 +0200
+++ b/gamelib/scenes/mess.py	Tue Aug 24 23:38:04 2010 +0200
@@ -97,7 +97,7 @@
 class ToMap(Thing):
     "Way to map."
 
-    NAME = "bridge.tomap"
+    NAME = "mess.tomap"
     DEST = "map"
 
     INTERACTS = {