Mercurial > boomslang

changeset 333:81f5fb9f50e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Hook up manual.
author Simon Cross <hodgestar+bzr@gmail.com>
date Sat, 28 Aug 2010 14:24:07 +0200
parents 349c5bac4bb5
children 3a90f940aa19
files Resources/images/machine/machine_room.png gamelib/scenes/machine.py
diffstat 2 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
Binary file Resources/images/machine/machine_room.png has changed
--- a/gamelib/scenes/machine.py	Sat Aug 28 14:16:10 2010 +0200
+++ b/gamelib/scenes/machine.py	Sat Aug 28 14:24:07 2010 +0200
@@ -272,19 +272,17 @@
     NAME = "machine.manual"
 
     INTERACTS = {
-        "manual": InteractNoImage(434, 496, 66, 34), # TODO: replace with manual
-        "empty": InteractNoImage(434, 496, 66, 34),
+        "manual": InteractImage(432, 493, "manual_on_floor.png"),
     }
 
     INITIAL = "manual"
 
     def interact_without(self):
-        if self.current_interact is self.interacts["manual"]:
-            self.state.add_inventory_item("manual")
-            self.set_interact("empty")
-            return Result("Ah! The ship's instruction manual. You'd feel better"
-                          " if the previous owner wasn't lying next to it with a"
-                          " gaping hole in his rib cage.")
+        self.scene.remove_thing(self)
+        self.state.add_inventory_item("manual")
+        return Result("Ah! The ship's instruction manual. You'd feel better"
+                      " if the previous owner wasn't lying next to it with a"
+                      " gaping hole in his rib cage.")
 
 
 class Manual(Item):