diff gamelib/scenes/crew_quarters.py @ 360:452230d78541

Use make_jim_dialog everywhere
author Neil Muller <neil@dip.sun.ac.za>
date Sat, 28 Aug 2010 16:51:40 +0200
parents 6b94f549443b
children 4e939b3c73f8
line wrap: on
line diff
--- a/gamelib/scenes/crew_quarters.py	Sat Aug 28 16:36:38 2010 +0200
+++ b/gamelib/scenes/crew_quarters.py	Sat Aug 28 16:51:40 2010 +0200
@@ -7,7 +7,7 @@
 from gamelib.scenes.scene_widgets import (Door, InteractText, InteractNoImage,
                                           InteractRectUnion, InteractImage,
                                           InteractAnimated, GenericDescThing,
-                                          BaseCamera)
+                                          BaseCamera, make_jim_dialog)
 
 class CrewQuarters(Scene):
 
@@ -91,12 +91,12 @@
                       " almost silently into place. Turns out the combination"
                       " was '1 2 3 4 5'. An idiot must keep his luggage in"
                       " here.")
-        if self.state.scenes['bridge'].get_data('ai status') == 'online':
-            return open_result, Result("JIM says: 'Prisoner %s, you have been observed commiting a felony violation. "
+        ai_result = make_jim_dialog("Prisoner %s, you have been observed commiting a felony violation. "
                     "This will go onto your permenant record, and your sentence may be extended by up to twenty years."
-                    % PLAYER_ID, style="JIM")
-        else:
-            return open_result
+                    % PLAYER_ID, self.state)
+        if ai_result:
+            return open_result, ai_result
+        return open_result
 
     def get_description(self):
         return "Ah, a vintage Knoxx & Co. model QR3. Quaint, but reasonably secure."