# HG changeset patch # User Simon Cross # Date 1282685525 -7200 # Node ID 5e5d71e40e54d73033f327a401cacbdd553ef3aa # Parent 7f6b11a0d4047fd0f55749e713e77baf6a8f947d Add bridge and mess to map and ways back. diff -r 7f6b11a0d404 -r 5e5d71e40e54 gamelib/scenes/bridge.py --- a/gamelib/scenes/bridge.py Tue Aug 24 23:30:43 2010 +0200 +++ b/gamelib/scenes/bridge.py Tue Aug 24 23:32:05 2010 +0200 @@ -1,25 +1,40 @@ """Bridge where the final showdown with the AI occurs.""" -from gamelib.state import Scene, Item, Thing, Result +from gamelib.state import Scene, Item, Thing, Result, InteractText class Bridge(Scene): - # FOLDER = "bridge" - # BACKGROUND = None # TODO - - # TODO: This is for testing. - FOLDER = "cryo" - BACKGROUND = "cryo_room.png" - NAME = "bridge" + FOLDER = "bridge" + BACKGROUND = None # TODO INITIAL_DATA = { - 'accessible': False, + 'accessible': True, } + def __init__(self, state): + super(Bridge, self).__init__(state) + self.add_thing(ToMap()) + def enter(self): return Result("The bridge is in a sorry, shabby state") +class ToMap(Thing): + "Way to map." + + NAME = "bridge.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 = [Bridge] diff -r 7f6b11a0d404 -r 5e5d71e40e54 gamelib/scenes/mess.py --- a/gamelib/scenes/mess.py Tue Aug 24 23:30:43 2010 +0200 +++ b/gamelib/scenes/mess.py Tue Aug 24 23:32:05 2010 +0200 @@ -10,7 +10,7 @@ BACKGROUND = "mess_hall.png" INITIAL_DATA = { - 'accessible': False, + 'accessible': True, } def __init__(self, state): @@ -21,6 +21,7 @@ self.add_item(ReplacementTubes("replacement_tubes")) self.add_thing(CansOnShelf()) self.add_thing(Tubes()) + self.add_thing(ToMap()) class EmptyCan(Item): @@ -93,4 +94,21 @@ INITIAL = "blocked" +class ToMap(Thing): + "Way to map." + + NAME = "bridge.tomap" + DEST = "map" + + INTERACTS = { + "door": InteractNoImage(20, 390, 85, 150), + } + + INITIAL = "door" + + def interact_without(self): + """Go to map.""" + self.state.set_current_scene("map") + + SCENES = [Mess] diff -r 7f6b11a0d404 -r 5e5d71e40e54 gamelib/state.py --- a/gamelib/state.py Tue Aug 24 23:30:43 2010 +0200 +++ b/gamelib/state.py Tue Aug 24 23:32:05 2010 +0200 @@ -38,8 +38,8 @@ state.load_scenes("cryo") state.load_scenes("bridge") state.load_scenes("mess") - # state.load_scenes("engine") - # state.load_scenes("machine") + state.load_scenes("engine") + state.load_scenes("machine") state.load_scenes("map") state.set_current_scene("cryo") state.set_do_enter_leave()