Mercurial > skaapsteker

changeset 210:9a6c711e2fdf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
KILLhg statushg status
author Neil Muller <drnlmuller@gmail.com>
date Wed, 06 Apr 2011 23:48:09 +0200
parents 189f7f8ef714
children d19b2f610b8b
files skaapsteker/sprites/base.py skaapsteker/sprites/player.py
diffstat 2 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/skaapsteker/sprites/base.py	Wed Apr 06 23:41:53 2011 +0200
+++ b/skaapsteker/sprites/base.py	Wed Apr 06 23:48:09 2011 +0200
@@ -52,6 +52,13 @@
         print "%s collided with player" % self
         player.damage(1)
 
+    def damage(self, damage):
+        print 'Damaged by ', damage
+        self.health -= damage
+        print 'Monster health', self.health
+        if self.health < 0:
+            self.kill()
+
 
 class NPC(GameSprite):
 
--- a/skaapsteker/sprites/player.py	Wed Apr 06 23:41:53 2011 +0200
+++ b/skaapsteker/sprites/player.py	Wed Apr 06 23:48:09 2011 +0200
@@ -137,6 +137,9 @@
         self.facing = new_facing
 
     def collided(self, other):
+        if self.attacking and hasattr(other, 'damage'):
+            # FIXME: Check if we're facing the right way
+            other.damage(5)
         if other not in self._last_collide:
             self._last_collide.append(other)
             self._collide_pos = self.collide_rect.midbottom