Mercurial > fife-parpg

comparison demos/shooter/scripts/ships/shipbase.py @ 453:cf53848fb187

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Scene now gets updated when an object moves from one node to another. Player is now part of the scene. Projectiles can be files by both player and enemies. Some code cleanup.
author prock@33b003aa-7bff-0310-803a-e67f0ece8222
date Tue, 06 Apr 2010 19:12:41 +0000
parents f463ab431cc0
children bd7e8f708adf
comparison
equal deleted inserted replaced
452:f07d779362da 453:cf53848fb187
27 from scripts.common.baseobject import SpaceObject 27 from scripts.common.baseobject import SpaceObject
28 from scripts.weapons import Weapon 28 from scripts.weapons import Weapon
29 29
30 30
31 class Ship(SpaceObject): 31 class Ship(SpaceObject):
32 def __init__(self, model, name, layer, findInstance=True): 32 def __init__(self, scene, name, findInstance=True):
33 super(Ship, self).__init__(model, name, layer, findInstance) 33 super(Ship, self).__init__(scene, name, findInstance)
34 34
35 self._timedelta = 0 35 self._timedelta = 0
36 self._weapon = None 36 self._weapon = None
37 37
38 def _setWeapon(self, weapon): 38 def _setWeapon(self, weapon):
39 self._weapon = weapon 39 self._weapon = weapon
40 40
41 def _getWeapon(self, weapon): 41 def _getWeapon(self, weapon):
42 return self._weapon 42 return self._weapon
43 43
44 def fire(self, curtime): 44 def fire(self, curtime, direction):
45 if self._weapon: 45 if self._weapon:
46 return self._weapon.fire(curtime) 46 return self._weapon.fire(curtime, direction)
47 47
48 return None 48 return None
49 49
50 weapon = property(_getWeapon, _setWeapon) 50 weapon = property(_getWeapon, _setWeapon)
51 51