Mercurial > boomslang

changeset 462:eebd6e08cbc9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mac icons hooked up, chops added and engine fix message fixed.
author Jeremy Thurgood <firxen@gmail.com>
date Sun, 29 Aug 2010 01:23:08 +0200
parents edb495e3d3dd
children 8d25de1519db
files gamelib/scenes/cryo.py gamelib/scenes/engine.py setup.py
diffstat 3 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gamelib/scenes/cryo.py	Sun Aug 29 01:23:03 2010 +0200
+++ b/gamelib/scenes/cryo.py	Sun Aug 29 01:23:08 2010 +0200
@@ -165,7 +165,8 @@
             self.state.add_inventory_item(pipe.name)
             self.set_interact("chopped")
             responses = [Result("It takes more effort than one would expect, but "
-                                "eventually the pipe is separated from the wall.")]
+                                "eventually the pipe is separated from the wall.",
+                                soundfile="chop-chop.ogg")]
             if self.state.current_scene.get_data('vandalism_warn'):
                 self.state.current_scene.set_data('vandalism_warn', False)
                 responses.append(make_jim_dialog(
--- a/gamelib/scenes/engine.py	Sun Aug 29 01:23:03 2010 +0200
+++ b/gamelib/scenes/engine.py	Sun Aug 29 01:23:08 2010 +0200
@@ -3,6 +3,7 @@
 from albow.resource import get_image
 from gamelib.cursor import CursorSprite
 from gamelib.state import Scene, Item, Thing, Result
+from gamelib.scenes.game_constants import PLAYER_ID
 from gamelib.scenes.scene_widgets import (Door, InteractText, InteractNoImage,
                                           InteractRectUnion, InteractImage,
                                           InteractAnimated, GenericDescThing,
@@ -130,8 +131,8 @@
                 and  self.things['engine.superconductor'].get_data('working'):
             self.set_data('engine online', True)
             self.add_thing(Engines())
-            return make_jim_dialog("The engines are now operational. "
-                                   "You have done a satisfactory job.",
+            return make_jim_dialog("The engines are now operational. You have"
+                                   "done a satisfactory job, Prisoner %s." % PLAYER_ID,
                                    self.state)
 
     def enter(self):
--- a/setup.py	Sun Aug 29 01:23:03 2010 +0200
+++ b/setup.py	Sun Aug 29 01:23:08 2010 +0200
@@ -76,7 +76,7 @@
             },
             'py2app': {
                 'argv_emulation': 1,
-                # 'iconfile': 'Resources/icons/suspended.icns',
+                'iconfile': 'Resources/icons/suspended_sentence.icns',
 #                 'dist_dir': 'dist/suspended-sentence-%s' % version.VERSION_STR,
 #                 'bdist_base': 'build/bdist',
                 'packages': [