Mercurial > boomslang

comparison gamelib/scenes/bridge.py @ 330:8f85902f4cb6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Massage chair and base where swapped
author Stefano Rivera <stefano@rivera.za.net>
date Sat, 28 Aug 2010 14:01:17 +0200
parents 67e8a547970b
children 7d30cff9f949
comparison
equal deleted inserted replaced
329:0bb1ab329bee 330:8f85902f4cb6
111 111
112 def get_description(self): 112 def get_description(self):
113 return "The main bridge computer screen." 113 return "The main bridge computer screen."
114 114
115 115
116 class MassageChair(Thing): 116 class MassageChairBase(Thing):
117 "The captain's massage chair, contains superconductor" 117 "The captain's massage chair, contains superconductor"
118 118
119 NAME = 'bridge.massagechair' 119 NAME = 'bridge.massagechair_base'
120 120
121 INTERACTS = { 121 INTERACTS = {
122 'chair': InteractNoImage(127, 518, 69, 64), 122 'chair': InteractNoImage(127, 518, 69, 64),
123 } 123 }
124 124
135 if self.get_data('contains_superconductor'): 135 if self.get_data('contains_superconductor'):
136 return "A top of the line Massage-o-Matic Captain's Executive Command Chair. " \ 136 return "A top of the line Massage-o-Matic Captain's Executive Command Chair. " \
137 "It's massaging a skeleton." 137 "It's massaging a skeleton."
138 return "The chair won't work any more, it has no power." 138 return "The chair won't work any more, it has no power."
139 139
140 def is_interactive(self): 140
141 return False 141 class MassageChair(Thing):
142
143
144 class MassageChairBase(Thing):
145 "The captain's massage chair, contains superconductor" 142 "The captain's massage chair, contains superconductor"
146 143
147 NAME = 'bridge.massagechair_base' 144 NAME = 'bridge.massagechair'
148 145
149 INTERACTS = { 146 INTERACTS = {
150 'chair': InteractRectUnion(( 147 'chair': InteractRectUnion((
151 (148, 418, 77, 68), 148 (148, 418, 77, 68),
152 (69, 363, 80, 156), 149 (69, 363, 80, 156),
159 } 156 }
160 157
161 INITIAL = 'chair' 158 INITIAL = 'chair'
162 159
163 def get_description(self): 160 def get_description(self):
164 return self.state.current_scene.things['bridge.massagechair'] \ 161 return self.state.current_scene.things['bridge.massagechair_base'] \
165 .get_description() 162 .get_description()
163
164 def is_interactive(self):
165 return False
166
166 167
167 class Stethoscope(Item): 168 class Stethoscope(Item):
168 "Used for cracking safes. Found on the doctor on the chair" 169 "Used for cracking safes. Found on the doctor on the chair"
169 170
170 INVENTORY_IMAGE = 'stethoscope.png' 171 INVENTORY_IMAGE = 'stethoscope.png'
212 213
213 INITIAL = 'superconductor' 214 INITIAL = 'superconductor'
214 215
215 def interact_without(self): 216 def interact_without(self):
216 self.state.add_inventory_item('superconductor') 217 self.state.add_inventory_item('superconductor')
217 self.state.current_scene.things['bridge.massagechair'] \ 218 self.state.current_scene.things['bridge.massagechair_base'] \
218 .set_data('contains_superconductor', False) 219 .set_data('contains_superconductor', False)
219 self.scene.remove_thing(self) 220 self.scene.remove_thing(self)
220 return Result("The superconductor module unclips easily.") 221 return Result("The superconductor module unclips easily.")
221 222
222 class BlinkingLights(Thing): 223 class BlinkingLights(Thing):