Mercurial > pyntnclick
diff gamelib/scenes/cryo.py @ 362:4e939b3c73f8
Allow Nones in list of results
author | Neil Muller <neil@dip.sun.ac.za> |
---|---|
date | Sat, 28 Aug 2010 17:07:24 +0200 |
parents | 9d97d2e338db |
children | 2cadb47405a4 |
line wrap: on
line diff
--- a/gamelib/scenes/cryo.py Sat Aug 28 16:56:09 2010 +0200 +++ b/gamelib/scenes/cryo.py Sat Aug 28 17:07:24 2010 +0200 @@ -165,15 +165,11 @@ self.state.add_item(pipe) self.state.add_inventory_item(pipe.name) self.set_interact("chopped") - result = Result("It takes more effort than one would expect, but " - "eventually the pipe is separated from the wall.") - ai_result = make_jim_dialog("Prisoner %s. Vandalism is an offence " - "punishable by a minimum of an additional 6 months " - "to your sentence" % PLAYER_ID, self.state) - if ai_result: - return result, ai_result - return result - + return (Result("It takes more effort than one would expect, but " + "eventually the pipe is separated from the wall."), + make_jim_dialog("Prisoner %s. Vandalism is an offence " + "punishable by a minimum of an additional 6 months " + "to your sentence" % PLAYER_ID, self.state)) def is_interactive(self): return self.get_data('fixed')