Changeset 265:8a695b8ecd6c

Timestamp:

09/04/13 22:37:48 (9 years ago)

Author:

David Sharpe

Branch:

default

Phase:

public

Rebase:

61616133613866313634653438613766636237393962366432303137633561623438616539386136

Message:

Correcting damage application

Location:

nagslang

Files:

• constants.py (modified) (1 diff)
• enemies.py (modified) (1 diff)
• protagonist.py (modified) (1 diff)
• screens/area.py (modified) (1 diff)

nagslang/constants.py

@@ -17 +17 @@
 COLLISION_TYPE_DOOR = 6
 COLLISION_TYPE_PROJECTILE = 7
+COLLISION_TYPE_WEREWOLF_ATTACK = 8
 
 SWITCH_PUSHERS = [COLLISION_TYPE_PLAYER, COLLISION_TYPE_BOX]

nagslang/enemies.py

@@ -128 +128 @@
 
     def collide_with_protagonist(self, protagonist):
-        return 5
+        protagonist.lose_health(15)
 
     @classmethod

nagslang/protagonist.py

@@ -220 +220 @@
         """Attempt to hurt something.
         """
-        vec = Vec2d.unit()
-        vec.angle = self.angle
-        vec.length = 100
-        FireEvent.post(self.physicser.position, vec)
-        print "Biff", self.physicser.position, vec
+        if self.in_wolf_form():
+            pass
+        else:
+            vec = Vec2d.unit()
+            vec.angle = self.angle
+            vec.length = 100
+            FireEvent.post(self.physicser.position, vec)
+            print "Biff", self.physicser.position, vec
 
     def in_wolf_form(self):

nagslang/screens/area.py

@@ -87 +87 @@
         gobj = arbiter.shapes[1].physicser.game_object
         result = gobj.collide_with_protagonist(self.protagonist)
-        if arbiter.shapes[1].collision_type == COLLISION_TYPE_ENEMY:
-            self.protagonist.lose_health(15)
         # The collision handler must return `True` or `False`. We don't want to
         # accidentally reject collisions from handlers that return `None`, so