Mercurial > fife-parpg

comparison demos/shooter/scripts/ships/enemies.py @ 474:10aff123c62c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some minor code cleanups. Changed the player ship controls a little to feel more natural.
author prock@33b003aa-7bff-0310-803a-e67f0ece8222
date Wed, 21 Apr 2010 16:49:59 +0000
parents 3164715a0621
children afde89c1d50b
comparison
equal deleted inserted replaced
473:b78020d31186 474:10aff123c62c
30 class EnemyActionListener(ShipActionListener): 30 class EnemyActionListener(ShipActionListener):
31 def __init__(self, ship): 31 def __init__(self, ship):
32 super(EnemyActionListener, self).__init__(ship) 32 super(EnemyActionListener, self).__init__(ship)
33 33
34 def onInstanceActionFinished(self, instance, action): 34 def onInstanceActionFinished(self, instance, action):
35 if action.getId() == 'explode':
36 self._ship.removeFromScene()
37
38 super(EnemyActionListener, self).onInstanceActionFinished(instance, action) 35 super(EnemyActionListener, self).onInstanceActionFinished(instance, action)
36
39 37
40 class BossActionListener(ShipActionListener): 38 class BossActionListener(ShipActionListener):
41 def __init__(self, ship): 39 def __init__(self, ship):
42 super(BossActionListener, self).__init__(ship) 40 super(BossActionListener, self).__init__(ship)
43 41
44 def onInstanceActionFinished(self, instance, action): 42 def onInstanceActionFinished(self, instance, action):
43 super(BossActionListener, self).onInstanceActionFinished(instance, action)
44
45 if action.getId() == 'explode': 45 if action.getId() == 'explode':
46 self._ship.removeFromScene()
47 self._ship.endLevel() 46 self._ship.endLevel()
48
49 super(BossActionListener, self).onInstanceActionFinished(instance, action)
50 47
51 48
52 class Saucer1(Ship): 49 class Saucer1(Ship):
53 def __init__(self, scene, name, instance, findInstance=True): 50 def __init__(self, scene, name, instance, findInstance=True):
54 super(Saucer1, self).__init__(scene, name, findInstance) 51 super(Saucer1, self).__init__(scene, name, findInstance)