Blood pact now kills if already bleeding

Signed-off-by: Ole Herman Schumacher Elgesem <oleherman93@gmail.com>

mrpg/core/creature.py

@@ -1,6 +1,6 @@
 from collections import OrderedDict
 
-from mrpg.utils.utils import limit
+from mrpg.utils.utils import limit, internal
 from mrpg.core.skill_collections import CreatureSkillCollection
 from mrpg.core.stats import Stats
 
@@ -21,6 +21,7 @@ def init(self, name, level, skill_names=None):
         self.use_skill = None
         self.effects = []
         self.effect_queue = []
+        self.dead = False
 
     def add_effects(self):
         out = []
@@ -35,6 +36,14 @@ def add_effects(self):
     def add_effect(self, effect, source=None):
         self.effect_queue.append(effect)
 
+    def has_effect(self, effect_name):
+        effect_name = internal(effect_name)
+        for e in self.effects:
+            compare = internal(e.name)
+            if compare == effect_name:
+                return True
+        return False
+
     def calculate_effects(self):
         return [effect.calculate() for effect in self.effects]
 
@@ -85,6 +94,8 @@ def damage(self, amount, limit_check=False, source=None):
         msg = ["{} lost {} hit points".format(self.name, amount)]
         if source:
             msg[0] += " from {}".format(source)
+        if self.dead:
+            msg = []  # Nice to not print extra damage messages when dead
         if limit_check:
             msg.append(self.limit_check())
         return msg
@@ -102,7 +113,7 @@ def town_heal(self):
         self.current["hp"] = self.base["hp"]
 
     def limit_check(self):
-        if self.current["hp"] <= 0:
+        if self.current["hp"] <= 0 or self.dead:
             self.current["hp"] = 0
             return ["{} died".format(self.name)]
         if self.current["hp"] > self.base["hp"]:
@@ -113,7 +124,7 @@ def limit_check(self):
     def is_alive(self):
         hp = self.current["hp"]
         assert hp >= 0
-        return hp > 0
+        return hp > 0 and not self.dead
 
     def is_dead(self):
         return not self.is_alive()

mrpg/core/skills.py

@@ -82,8 +82,12 @@ def apply(skill, user, target):
     def blood_pact():
         def calculate(skill, user, target):
             skill.damage = skill.healing = user.base["hp"]
+            skill.kill = user.has_effect("Bleed")
 
         def apply(skill, user, target):
+            if skill.kill:
+                user.dead = True
+                return ["{} bled out".format(user.name)]
             target = user
             bleed = Effects.get("Bleed")
             bleed.setup(skill, target)