From 2f31fa2bd57fc6500f1a3c1ba933af18b9eb9ec4 Mon Sep 17 00:00:00 2001 From: Giulio Date: Sun, 16 May 2021 01:12:03 +0200 Subject: [PATCH] fix belle star and lazo --- backend/bang/deck.py | 6 +++--- backend/bang/players.py | 4 ++-- frontend/src/i18n/en.json | 2 +- frontend/src/i18n/it.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/bang/deck.py b/backend/bang/deck.py index 6b85276..7c5a84b 100644 --- a/backend/bang/deck.py +++ b/backend/bang/deck.py @@ -9,12 +9,12 @@ class Deck: super().__init__() self.cards: List[cs.Card] = cs.get_starting_deck(game.expansions) self.mancato_cards: List[str] = [] - self.mancato_cards_not_green: List[str] = [] + self.mancato_cards_not_green_or_blue: List[str] = [] for c in self.cards: if isinstance(c, cs.Mancato) and c.name not in self.mancato_cards: self.mancato_cards.append(c.name) - if not c.usable_next_turn: - self.mancato_cards_not_green.append(c.name) + if not (c.usable_next_turn or c.is_equipment): + self.mancato_cards_not_green_or_blue.append(c.name) self.all_cards_str: List[str] = [] for c in self.cards: if c.name not in self.all_cards_str: diff --git a/backend/bang/players.py b/backend/bang/players.py index 544705f..d27b301 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -774,8 +774,8 @@ class Player: print('has mancato') self.pending_action = PendingAction.RESPOND self.expected_response = self.game.deck.mancato_cards.copy() - if self.attacker and self.attacker in self.game.get_alive_players() and isinstance(self.attacker.character, chd.BelleStar) or self.game.check_event(ce.Lazo): - self.expected_response = self.game.deck.mancato_cards_not_green.copy() + if self.attacker and self.attacker in self.game.get_alive_players() and self.character.check(self.game, chd.BelleStar) or self.game.check_event(ce.Lazo): + self.expected_response = self.game.deck.mancato_cards_not_green_or_blue.copy() elif self.character.check(self.game, chars.CalamityJanet) and cs.Bang(0, 0).name not in self.expected_response: self.expected_response.append(cs.Bang(0, 0).name) elif self.character.check(self.game, chd.ElenaFuente): diff --git a/frontend/src/i18n/en.json b/frontend/src/i18n/en.json index f756a38..feff2b7 100644 --- a/frontend/src/i18n/en.json +++ b/frontend/src/i18n/en.json @@ -396,7 +396,7 @@ }, "Belle Star": { "name": "Belle Star", - "desc": "During her turn the green cards of the other players do not work." + "desc": "During her turn the green and blue cards of the other players do not work." }, "Vera Custer": { "name": "Vera Custer", diff --git a/frontend/src/i18n/it.json b/frontend/src/i18n/it.json index efbb589..6f9cea3 100644 --- a/frontend/src/i18n/it.json +++ b/frontend/src/i18n/it.json @@ -396,7 +396,7 @@ }, "Belle Star": { "name": "Belle Star", - "desc": "Nel suo turno le carte verdi degli altri giocatori non hanno effetto." + "desc": "Nel suo turno le carte verdi e blu degli altri giocatori non hanno effetto." }, "Vera Custer": { "name": "Vera Custer",