# HG changeset patch # User Simon Cross # Date 1282998247 -7200 # Node ID 81f5fb9f50e486b86507ea347bf305606629023d # Parent 349c5bac4bb5c03e027a074bcb5af83cf0748160 Hook up manual. diff -r 349c5bac4bb5 -r 81f5fb9f50e4 Resources/images/machine/machine_room.png Binary file Resources/images/machine/machine_room.png has changed diff -r 349c5bac4bb5 -r 81f5fb9f50e4 gamelib/scenes/machine.py --- 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):