Mercurial > skaapsteker
changeset 339:a9d760134706
Rename ItemRepopulationEvent to AddSprite before repurposing it for fireballs.
| author | Simon Cross <hodgestar@gmail.com> |
|---|---|
| date | Sat, 09 Apr 2011 12:53:49 +0200 |
| parents | af021507a7e3 |
| children | f870e3122ac7 |
| files | skaapsteker/engine.py skaapsteker/levelscene.py skaapsteker/sprites/player.py |
| diffstat | 3 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/skaapsteker/engine.py Sat Apr 09 12:47:09 2011 +0200 +++ b/skaapsteker/engine.py Sat Apr 09 12:53:49 2011 +0200 @@ -153,12 +153,12 @@ super(GlobalNpcEvent, cls).post(ev=ev) -class ItemRepopulationEvent(UserEvent): # TODO: Needed? +class AddSpriteEvent(UserEvent): - utype = "ITEM_REPOPULATION_EVENT" + utype = "ADD_SPRITE_EVENT" @classmethod def post(cls, item): - """Put a Sprite back in the world. + """Put a Sprite into the world. """ - super(ItemRepopulationEvent, cls).post(item=item) + super(AddSpriteEvent, cls).post(item=item)
--- a/skaapsteker/levelscene.py Sat Apr 09 12:47:09 2011 +0200 +++ b/skaapsteker/levelscene.py Sat Apr 09 12:53:49 2011 +0200 @@ -298,5 +298,5 @@ self._open_dialogue(ev.npc) elif engine.CloseDialog.matches(ev): self._close_dialogue() - elif engine.ItemRepopulationEvent.matches(ev): + elif engine.AddSpriteEvent.matches(ev): self._world.add(ev.item)
--- a/skaapsteker/sprites/player.py Sat Apr 09 12:47:09 2011 +0200 +++ b/skaapsteker/sprites/player.py Sat Apr 09 12:53:49 2011 +0200 @@ -7,7 +7,7 @@ from ..physics import Sprite from ..constants import Layers from ..data import get_files, load_image -from ..engine import PlayerDied, ItemRepopulationEvent +from ..engine import PlayerDied, AddSpriteEvent class Player(Sprite): @@ -243,6 +243,7 @@ print 'ninja fireball attack attack attack' self.attacking = 2 self._last_time = time.time() # Reset the animation clock + #FireProjectile.push() def _lightning_attack(self): print 'thunderbolts and lightning' @@ -335,7 +336,7 @@ if sprite is None: return self.discard_item() - ItemRepopulationEvent.post(sprite) + AddSpriteEvent.post(sprite) def take_item(self, item):