fixed dmg calc and multiple kill()s

Author: flipcoder

game/base/being.py

@@ -12,13 +12,21 @@ def __init__(self, app, scene, filename=None):
         super().__init__(app, scene, filename)
         self.solid = True
         self.hp = 1.0
+        self.score = 0
+        self.alive = True  # prevent mutliple kill()
 
-    def hurt(self, dmg, bullet, player):
+    def hurt(self, dmg, bullet, damager):
+        """
+        Apply damage from bullet shot by damager
+        Returns amount of damage taken (won't be more than self.hp)
+        """
         if not self.hp:
             return 0
-        self.hp -= dmg
-        if self.hp <= 0:
-            player.score += max(int(dmg), 1)
-            self.kill(dmg, bullet, player)
-            return dmg
-        return dmg
+        dmg_taken = min(self.hp, dmg)
+        if dmg_taken > 0:
+            self.hp -= dmg_taken
+            assert self.hp >= 0
+            if self.hp == 0:
+                self.kill(dmg_taken, bullet, damager)
+            damager.score += max(int(dmg_taken), 1)
+        return dmg_taken

game/base/entity.py

@@ -26,7 +26,7 @@ def __init__(self, app, scene, filename=None, **kwargs):
         self.scene = scene
         self.slot = None  # weakref
         self.slots = SlotList()
-        self._life = kwargs.get("life")
+        self._life = kwargs.get("life")  # particle life (length of time to exist)
         self.on_move = Signal()
         self.on_remove = Signal()
         # self.dirty = True

game/entities/bullet.py

@@ -3,24 +3,39 @@
 from game.constants import *
 from game.base.entity import Entity
 from glm import vec3, normalize
-from game.entities.butterfly import Butterfly
+from game.base.enemy import Enemy
 
 
 class Bullet(Entity):
     def __init__(
-        self, app, scene, parent, position, direction, damage, img=BULLET_IMAGE_PATH
+        self,
+        app,
+        scene,
+        parent,
+        position,
+        direction,
+        damage,
+        img=BULLET_IMAGE_PATH,
+        life=1,
+        **kwargs
     ):
 
         velocity = normalize(direction) * BULLET_SPEED
         super().__init__(
-            app, scene, BULLET_IMAGE_PATH, position=position, velocity=velocity, life=1,
+            app,
+            scene,
+            BULLET_IMAGE_PATH,
+            position=position,
+            velocity=velocity,
+            life=life,
+            **kwargs
         )
         self.damage = damage
         self.solid = True
         self.size.z = 1000  # to prevent tunneling
         self.parent = parent  # whoever shot the bullet
 
     def collision(self, other, dt):
-        if isinstance(other, Butterfly):
-            other.hurt(self.damage, self, self.parent)
-            self.remove()
+        if isinstance(other, Enemy):
+            other.hurt(self.damage, self, self.parent)  # apply dmg
+            self.remove()  # remove the bullet

game/entities/butterfly.py

@@ -64,9 +64,13 @@ def get_animation(self, color):
 
     def fall(self):
         self.velocity = -Y * 100
-        self.life = 2
+        self.life = 2  # remove in 2 seconds
 
     def kill(self, damage, bullet, player):
+
+        if not self.alive:
+            return False
+
         # Butterfly will turn gray when killed
         self.frames = self.get_animation(GRAY)
 
@@ -91,6 +95,9 @@ def kill(self, damage, bullet, player):
         self.play_sound("butterfly.wav")
         self.fall()
 
+        self.alive = False
+        return True
+
     # def hurt(self, damage, bullet, player):
     #     return super().hurt(damage, bullet, player)
 

game/entities/player.py

@@ -66,7 +66,7 @@ def hurt(self, damage, bullet, enemy):
         damage = min(self.hp, damage)  # calc effective damage (not more than hp)
         self.hp -= damage
         if self.hp <= 0:
-            self.kill(damage, bullet, enemy)
+            self.kill(damage, bullet, enemy)  # kill self
         # if self.hp < 3:
         # self.smoke_event = scene.when.every(1, self.smoke)
         return damage