change discard to make_discard

src/cards/pack1_faction_wild.json

@@ -17,7 +17,7 @@
                     "effect_type": "champion_action"
                 },
                 {
-                    "effect": "discard",
+                    "effect": "make_discard",
                     "amount": 1,
                     "effect_type": "faction_combo"
                 }
@@ -83,7 +83,7 @@
                     "amount": 6
                 },
                 {
-                    "effect": "discard",
+                    "effect": "make_discard",
                     "amount": 1
                 },
                 {
@@ -159,7 +159,7 @@
                     "amount": 4
                 },
                 {
-                    "effect": "discard",
+                    "effect": "make_discard",
                     "amount": 1,
                     "effect_type": "faction_combo"
                 },
@@ -229,7 +229,7 @@
                     "effect_type": "champion_action"
                 },
                 {
-                    "effect": "discard",
+                    "effect": "make_discard",
                     "amount": 1,
                     "effect_type": "champion_action"
                 }
@@ -249,7 +249,7 @@
                     "amount": 3
                 },
                 {
-                    "effect": "discard",
+                    "effect": "make_discard",
                     "amount": 1
                 },
                 {
@@ -273,11 +273,11 @@
                     "amount": 8
                 },
                 {
-                    "effect": "discard",
+                    "effect": "make_discard",
                     "amount": 1
                 },
                 {
-                    "effect": "discard",
+                    "effect": "make_discard",
                     "amount": 1,
                     "effect_type": "suicide"
                 }

src/model/card_behaviour.py

@@ -51,7 +51,7 @@ async def effect_damage(effect: Effect, turn: "Turn", _target: str):
 
 
 async def effect_heal(effect: Effect, turn: "Turn", _target: str):
-    turn.heal(effect.amount)
+    await turn.heal(effect.amount)
     return True
 
 
@@ -77,7 +77,7 @@ async def effect_draw_and_discard(effect: Effect, turn: "Turn", _target: str):
     return await turn.player.draw_and_play(1)
 
 
-async def effect_discard(_effect: Effect, turn: "Turn", target: str):
+async def effect_make_discard(_effect: Effect, turn: "Turn", target: str):
     return await turn.player.make_enemy_discard(target)
 
 
@@ -110,7 +110,7 @@ card_effect_all_behaviours = {
     CardEffects.SACRIFICE: effect_sacrifice,
     CardEffects.DRAW: effect_draw,
     CardEffects.DRAW_AND_DISCARD: effect_draw_and_discard,
-    CardEffects.DISCARD: effect_discard,
+    CardEffects.MAKE_DISCARD: effect_make_discard,
     CardEffects.RESTACK_DISCARDED_CHAMPION: effect_restack_discarded_champion,
     CardEffects.RESTACK_DISCARDED_CARD: effect_restack_discarded,
     CardEffects.STACK_NEXT_ACTION_BOUGHT: effect_stack_next_action,

src/model/card_validator.py

@@ -41,7 +41,7 @@ class CardEffects(str, Enum):
     SACRIFICE = "sacrifice"
     DRAW = "draw"
     DRAW_AND_DISCARD = "draw_and_discard"
-    DISCARD = "discard"
+    MAKE_DISCARD = "make_discard"
     RESTACK_DISCARDED_CHAMPION = "restack_discarded_champion"
     RESTACK_DISCARDED_CARD = "restack_discarded_card"
     STACK_NEXT_ACTION_BOUGHT = "stack_next_action_bought"