Mercurial > nagslang
changeset 341:63d0c70a4e15
Enemies can hurt things again. (Oops.)
| author | Jeremy Thurgood <firxen@gmail.com> |
|---|---|
| date | Fri, 06 Sep 2013 12:55:48 +0200 |
| parents | eb24e74df4c3 |
| children | 11febdb72296 |
| files | nagslang/enemies.py nagslang/protagonist.py |
| diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/nagslang/enemies.py Fri Sep 06 12:48:03 2013 +0200 +++ b/nagslang/enemies.py Fri Sep 06 12:55:48 2013 +0200 @@ -106,6 +106,7 @@ is_moving = True # Always walking. enemy_type = 'A' health = 42 + enemy_damage = 15 impulse_factor = 50 def __init__(self, space, world, position, end_position): @@ -176,6 +177,7 @@ is_moving = False enemy_type = 'B' health = 42 + enemy_damage = 20 impulse_factor = 300 def __init__(self, space, world, position, attack_range=100):
--- a/nagslang/protagonist.py Fri Sep 06 12:48:03 2013 +0200 +++ b/nagslang/protagonist.py Fri Sep 06 12:55:48 2013 +0200 @@ -341,6 +341,6 @@ if self.changing_sequence: self._go_to_next_form() if int(self.lifetime + dt) > int(self.lifetime): - if self.form == self.WOLF_FORM: + if self.in_wolf_form(): self.gain_health(1) super(Protagonist, self).update(dt)