Mercurial > nagslang
changeset 406:7fcde01ea50e
No, we really don't need EnemyDeathEvent
| author | Stefano Rivera <stefano@rivera.za.net> |
|---|---|
| date | Sat, 07 Sep 2013 11:16:59 +0200 |
| parents | c0ce236f153c |
| children | 314ddad2d6d2 |
| files | nagslang/enemies.py nagslang/events.py nagslang/screens/area.py |
| diffstat | 3 files changed, 2 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/nagslang/enemies.py Sat Sep 07 10:42:37 2013 +0200 +++ b/nagslang/enemies.py Sat Sep 07 11:16:59 2013 +0200 @@ -8,7 +8,6 @@ from nagslang import render from nagslang.constants import (COLLISION_TYPE_ENEMY, COLLISION_TYPE_FURNITURE, ACID_SPEED, ACID_DAMAGE, ZORDER_MID) -from nagslang.events import EnemyDeathEvent from nagslang.game_object import (GameObject, SingleShapePhysicser, Result, Bullet, make_body) from nagslang.mutators import FLIP_H @@ -70,7 +69,7 @@ def lose_health(self, amount): self.health -= amount if self.health <= 0: - EnemyDeathEvent.post() + self.world.kills += 1 self.physicser.remove_from_space() def set_direction(self, dx, dy):
--- a/nagslang/events.py Sat Sep 07 10:42:37 2013 +0200 +++ b/nagslang/events.py Sat Sep 07 11:16:59 2013 +0200 @@ -44,9 +44,3 @@ @classmethod def post(cls, destination, dest_pos): super(DoorEvent, cls).post(destination=destination, dest_pos=dest_pos) - - -class EnemyDeathEvent(UserEvent): - @classmethod - def post(cls): - super(EnemyDeathEvent, cls).post()
--- a/nagslang/screens/area.py Sat Sep 07 10:42:37 2013 +0200 +++ b/nagslang/screens/area.py Sat Sep 07 11:16:59 2013 +0200 @@ -8,7 +8,7 @@ COLLISION_TYPE_WALL, COLLISION_TYPE_PLAYER, CALLBACK_COLLIDERS, COLLISION_TYPE_FURNITURE, COLLISION_TYPE_WEREWOLF_ATTACK, CMD_TOGGLE_FORM, CMD_ACTION) -from nagslang.events import ScreenChange, DoorEvent, EnemyDeathEvent +from nagslang.events import ScreenChange, DoorEvent from nagslang.level import Level from nagslang.screens.base import Screen from nagslang.sound import sound @@ -177,8 +177,6 @@ return # else we're teleporting within the screen, and just the # position change is enough - elif EnemyDeathEvent.matches(ev): - self.world.kills += 1 self.keys.handle_event(ev) def _calc_viewport(self, level_surface, display_surface):