Fix Rampage (The final (For Real (True)))

src/model/card_behaviour.py

@@ -76,7 +76,7 @@ async def effect_draw(effect: Effect, turn: "Turn", _target: str):
 
 async def effect_draw_and_discard(effect: Effect, turn: "Turn", _target: str):
     turn.discard_markers += 1
-    turn.discard_marker_card = effect.card
+    turn.discard_marker_effect = effect
     return await turn.player.draw_and_play(1)
 
 

src/model/turn.py

@@ -33,7 +33,7 @@ class Turn(Serializable):
     fuck_u_markers: int
     damage_reserve: int
     gold_reserve: int
-    discard_marker_card: Optional[Card]
+    discard_marker_effect: Optional[Effect]
 
     def __init__(self, player: "Player") -> None:
         super().__init__()
@@ -44,7 +44,7 @@ class Turn(Serializable):
         self.effects_availables: List[Effect] = []
         self.cards_locked: List[Card] = []
         self.discard_markers = 0
-        self.discard_marker_card = None
+        self.discard_marker_effect = None
         self.fuck_u_markers = 0
 
     async def end_turn(self) -> None:
@@ -60,7 +60,7 @@ class Turn(Serializable):
         self.effects_availables = []
         self.cards_locked = []
         self.discard_markers = 0
-        self.discard_marker_card = None
+        self.discard_marker_effect = None
         self.fuck_u_markers = 0
         for p in self.player.game.players:
             p.turn.champions_health = {}
@@ -113,6 +113,9 @@ class Turn(Serializable):
         else:
             return print("you don't have any discard or fuck_u markers")
 
+        while self.discard_marker_effect in self.effects_availables:
+            self.effects_availables.remove(self.discard_marker_effect)
+
         await self.player.discard_card(card_id)
         await self.player.game.notify_controller(MessageType.UPDATE, self.serialize())
 
@@ -137,7 +140,7 @@ class Turn(Serializable):
                 "You cannot use another effect than draw_and_discard with discard markers!"
             )
 
-        if self.discard_markers > 0 and effect.card != self.discard_marker_card:
+        if self.discard_markers > 0 and effect != self.discard_marker_effect:
             return print("You have to discard first before using another card's effect")
 
         card = effect.card
@@ -198,7 +201,7 @@ class Turn(Serializable):
             "effects_availables": [effect.uuid for effect in self.effects_availables],
         }
 
-        return {k: data[k] for k in data.keys() - ["player", "discard_marker_card"]}
+        return {k: data[k] for k in data.keys() - ["player", "discard_marker_effect"]}
 
     async def restack_discarded_champion(self, card_id) -> bool:
         card = self.player.game.search_card_in_pile(card_id, self.player.discard_pile)
@@ -303,6 +306,7 @@ class Turn(Serializable):
 
                 if p.turn.champions_health[str(c.uuid)] > self.damage_reserve:
                     print("You don't have enough damage points to stun champion!")
+                    return
                 self.damage_reserve -= p.turn.champions_health[str(c.uuid)]
                 await self.player.stun(str(c.uuid))