comparison gamelib/scenes/bridge.py @ 267:024e8ab4b785

Remove unneeded tests
author Neil Muller <neil@dip.sun.ac.za>
date Fri, 27 Aug 2010 20:14:51 +0200
parents 3b4a78422201
children 95e4021e9959
comparison
equal deleted inserted replaced
266:80cb577e38f2 267:024e8ab4b785
227 227
228 def is_interactive(self): 228 def is_interactive(self):
229 return self.state.detail_views[self.COMPUTER].get_data('tab') == 'alert' 229 return self.state.detail_views[self.COMPUTER].get_data('tab') == 'alert'
230 230
231 def interact_without(self): 231 def interact_without(self):
232 if not self.is_interactive():
233 return
234 self.state.detail_views[self.COMPUTER].set_data('tab', 'log') 232 self.state.detail_views[self.COMPUTER].set_data('tab', 'log')
235 return Result(soundfile='beep550.ogg') 233 return Result(soundfile='beep550.ogg')
236 234
237 235
238 class AlertTab(Thing): 236 class AlertTab(Thing):
248 246
249 def is_interactive(self): 247 def is_interactive(self):
250 return self.state.detail_views[self.COMPUTER].get_data('tab') == 'log' 248 return self.state.detail_views[self.COMPUTER].get_data('tab') == 'log'
251 249
252 def interact_without(self): 250 def interact_without(self):
253 if not self.is_interactive():
254 return
255 self.state.detail_views[self.COMPUTER].set_data('tab', 'alert') 251 self.state.detail_views[self.COMPUTER].set_data('tab', 'alert')
256 return Result(soundfile='beep550.ogg') 252 return Result(soundfile='beep550.ogg')
257 253
258 254
259 class CompUpButton(Thing): 255 class CompUpButton(Thing):
271 tab = self.state.detail_views[self.COMPUTER].get_data('tab') 267 tab = self.state.detail_views[self.COMPUTER].get_data('tab')
272 page = self.state.detail_views[self.COMPUTER].get_data('log page') 268 page = self.state.detail_views[self.COMPUTER].get_data('log page')
273 return tab == 'log' and page > 0 269 return tab == 'log' and page > 0
274 270
275 def interact_without(self): 271 def interact_without(self):
276 if not self.is_interactive():
277 return
278 page = self.state.detail_views[self.COMPUTER].get_data('log page') 272 page = self.state.detail_views[self.COMPUTER].get_data('log page')
279 self.state.detail_views[self.COMPUTER].set_data('log page', page-1) 273 self.state.detail_views[self.COMPUTER].set_data('log page', page-1)
280 return Result(soundfile='beep550.ogg') 274 return Result(soundfile='beep550.ogg')
281 275
282 276
296 page = self.state.detail_views[self.COMPUTER].get_data('log page') 290 page = self.state.detail_views[self.COMPUTER].get_data('log page')
297 max_page = self.state.detail_views[self.COMPUTER].get_data('max page') 291 max_page = self.state.detail_views[self.COMPUTER].get_data('max page')
298 return tab == 'log' and (page + 1) < max_page 292 return tab == 'log' and (page + 1) < max_page
299 293
300 def interact_without(self): 294 def interact_without(self):
301 if not self.is_interactive():
302 return
303 page = self.state.detail_views[self.COMPUTER].get_data('log page') 295 page = self.state.detail_views[self.COMPUTER].get_data('log page')
304 self.state.detail_views[self.COMPUTER].set_data('log page', page+1) 296 self.state.detail_views[self.COMPUTER].set_data('log page', page+1)
305 return Result(soundfile='beep550.ogg') 297 return Result(soundfile='beep550.ogg')
306 298
307 299