comparison gamelib/scenes/crew_quarters.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 452230d78541
children a95bfba3acd5
comparison
equal deleted inserted replaced
361:9d97d2e338db 362:4e939b3c73f8
85 return Result("It's already unlocked. There's no more challenge.") 85 return Result("It's already unlocked. There's no more challenge.")
86 # TODO: Add years to the sentence for safecracking. 86 # TODO: Add years to the sentence for safecracking.
87 # TODO: Wax lyrical some more about safecracking. 87 # TODO: Wax lyrical some more about safecracking.
88 self.set_data('is_cracked', True) 88 self.set_data('is_cracked', True)
89 self.set_interact('full_safe') 89 self.set_interact('full_safe')
90 open_result = Result("Even after centuries of neglect, the tumblers slide" 90 return (Result("Even after centuries of neglect, the tumblers slide"
91 " almost silently into place. Turns out the combination" 91 " almost silently into place. Turns out the combination"
92 " was '1 2 3 4 5'. An idiot must keep his luggage in" 92 " was '1 2 3 4 5'. An idiot must keep his luggage in"
93 " here.") 93 " here."),
94 ai_result = make_jim_dialog("Prisoner %s, you have been observed commiting a felony violation. " 94 make_jim_dialog("Prisoner %s, you have been observed commiting a felony violation. "
95 "This will go onto your permenant record, and your sentence may be extended by up to twenty years." 95 "This will go onto your permenant record, and your sentence may be extended by up to twenty years."
96 % PLAYER_ID, self.state) 96 % PLAYER_ID, self.state))
97 if ai_result:
98 return open_result, ai_result
99 return open_result
100 97
101 def get_description(self): 98 def get_description(self):
102 return "Ah, a vintage Knoxx & Co. model QR3. Quaint, but reasonably secure." 99 return "Ah, a vintage Knoxx & Co. model QR3. Quaint, but reasonably secure."
103 100
104 101