From c81a806a6b9c34e2809154a1df2f11f08de6d228 Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Sun, 9 Apr 2023 10:24:44 +0100 Subject: [PATCH] fix regolamento di conti --- .../expansions/wild_west_show/card_events.py | 17 ++++++++++------- backend/bang/players.py | 4 ++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/backend/bang/expansions/wild_west_show/card_events.py b/backend/bang/expansions/wild_west_show/card_events.py index 20387aa..1565d12 100644 --- a/backend/bang/expansions/wild_west_show/card_events.py +++ b/backend/bang/expansions/wild_west_show/card_events.py @@ -108,17 +108,20 @@ class RegolamentoDiConti(CardEvent): def on_clicked(self, game, player): super().on_clicked(game, player) - if len(player.hand) > 0: - if not player.has_played_bang and any( + if ( + len(player.hand) > 0 + and not player.has_played_bang + and any( ( player.get_sight() >= p["dist"] for p in game.get_visible_players(player) ) - ): - player.available_cards = player.hand.copy() - player.pending_action = players.PendingAction.CHOOSE - player.choose_text = "choose_play_as_bang" - player.notify_self() + ) + ): + player.available_cards = player.hand.copy() + player.pending_action = players.PendingAction.CHOOSE + player.choose_text = "choose_play_as_bang" + player.notify_self() class Sacagaway(CardEvent): diff --git a/backend/bang/players.py b/backend/bang/players.py index 9a80af2..e8f5a33 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -2075,8 +2075,8 @@ class Player: ) if ( self.character.check(self.game, chars.CalamityJanet) - and cs.Bang(0, 0).name not in self.expected_response - ): + or self.game.check_event(cew.RegolamentoDiConti) + ) and cs.Bang(0, 0).name not in self.expected_response: self.expected_response.append(cs.Bang(0, 0).name) if self.character.check(self.game, chw.BigSpencer): self.expected_response = []