Minor fixes

Saner use of JSON and consumables, dealing no damage no longer prints what may have been negative damage
Shoes01 · Jun 11, 2019 · 9ad8d4b · 9ad8d4b
1 parent 17e4ce9
commit 9ad8d4b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/components/item/consumable.py b/components/item/consumable.py
@@ -1,3 +1,3 @@
 class ConsumableComponent():
     def __init__(self, effects):
-        self.effects = {} if effects is True else effects # type: a dict of effects
+        self.effects = {} if effects is None else effects # type: a dict of effects
diff --git a/data/consumables.json b/data/consumables.json
@@ -7,7 +7,7 @@
     {
         "archtype": "item",
 
-        "consumable": true,
+        "consumable": null,
         "name": {"name": "Soul Jar"},
         "render": {"char": "!", "color": "con_jar"}
     }

diff --git a/processors/combat.py b/processors/combat.py
@@ -53,6 +53,8 @@ def process(self):
 
                 if damage > 0:
                     self.world.component_for_entity(defender_ID, StatsComponent).hp -= damage
+                else:
+                    damage = 0
 
                 if def_stats['hp'] <= 0:
                     self.world.get_processor(DeathProcessor).queue.put({'ent': defender_ID})