From db549aac49b35c61605737a39ff1d60dffdf7bf0 Mon Sep 17 00:00:00 2001 From: legonzaur Date: Mon, 6 May 2024 17:41:29 +0200 Subject: [PATCH] fix sub_effects triggering multiple times when effect is damage, gold or heal with amount > 1 --- src/model/turn.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/model/turn.py b/src/model/turn.py index f0e2f7a..c8a5efc 100644 --- a/src/model/turn.py +++ b/src/model/turn.py @@ -32,6 +32,7 @@ class Turn(Serializable): fuck_u_markers: int damage_reserve: int gold_reserve: int + discard_marker_card: Optional[Card] def __init__(self, player: "Player") -> None: super().__init__() @@ -42,7 +43,7 @@ class Turn(Serializable): self.effects_availables: List[Effect] = [] self.cards_locked: List[Card] = [] self.discard_markers = 0 - self.discard_marker_card: Optional[Card] + self.discard_marker_card = None self.fuck_u_markers = 0 async def end_turn(self) -> None: @@ -158,8 +159,15 @@ class Turn(Serializable): self.effects_availables.remove(effect) for e in effect.sub_effects: - for _ in range(e.amount): - self.effects_availables.append(e) + if effect.effect in [ + CardEffects.DAMAGE, + CardEffects.GOLD, + CardEffects.HEAL, + ]: + self.effects_availables.append(effect) + else: + for _ in range(e.amount): + self.effects_availables.append(e) await self.player.game.notify_controller("update", self.serialize()) def prepare(self, card_id: str) -> bool: @@ -189,7 +197,7 @@ class Turn(Serializable): "effects_availables": [effect.uuid for effect in self.effects_availables], } - return {k: data[k] for k in data.keys() - ["player"]} + return {k: data[k] for k in data.keys() - ["player", "discard_marker_card"]} async def restack_discarded_champion(self, card_id) -> bool: card = self.player.game.search_card_in_pile(card_id, self.player.discard_pile)