Mercurial > skaapsteker

changeset 208:c72d9bf911fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add start of player damage
author Neil Muller <drnlmuller@gmail.com>
date Wed, 06 Apr 2011 23:23:48 +0200
parents d2e4fb016627
children 189f7f8ef714
files skaapsteker/sprites/base.py skaapsteker/sprites/player.py
diffstat 2 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/skaapsteker/sprites/base.py	Wed Apr 06 23:21:29 2011 +0200
+++ b/skaapsteker/sprites/base.py	Wed Apr 06 23:23:48 2011 +0200
@@ -48,8 +48,9 @@
         self.setup(**opts)
 
 
-    def collided_player(self):
+    def collided_player(self, player):
         print "%s collided with player" % self
+        player.damage(1)
 
 
 class NPC(GameSprite):
--- a/skaapsteker/sprites/player.py	Wed Apr 06 23:21:29 2011 +0200
+++ b/skaapsteker/sprites/player.py	Wed Apr 06 23:23:48 2011 +0200
@@ -144,7 +144,13 @@
         else:
             self._collisions_seen += 1
         if hasattr(other, 'collided_player'):
-            other.collided_player()
+            other.collided_player(self)
+            print 'Health', self.the_world.fox.health
+
+    def damage(self, damage):
+        self.the_world.fox.health -= damage
+        if self.the_world.fox.health < 0:
+            print 'You should have dided'
 
 
     def set_pos(self, pos):