diff --git a/backend/bang/game.py b/backend/bang/game.py index 9152d93..2e50dd5 100644 --- a/backend/bang/game.py +++ b/backend/bang/game.py @@ -252,7 +252,7 @@ class Game: print('did_lose', did_lose) if self.player_bangs > 0 and self.check_event(ce.PerUnPugnoDiCarte): self.player_bangs -= 1 - if self.player_bangs > 1: + if self.player_bangs >= 1: print('bang again') if self.players[self.turn].get_banged(self.deck.event_cards[0]): self.players[self.turn].notify_self() diff --git a/backend/bang/players.py b/backend/bang/players.py index c7f69bf..fd76bbf 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -456,6 +456,7 @@ class Player: data=f'_flipped|{self.name}|{picked.name}|{picked.num_suit()}') if picked.check_suit(self.game, [cs.Suit.SPADES]) and 2 <= picked.number <= 9 and pickable_cards == 0: self.lives -= 3 + self.attacker = None self.game.deck.scrap(self.equipment.pop(i), True) self.sio.emit('chat_message', room=self.game.name, data=f'_explode|{self.name}') self.heal_if_needed() @@ -773,7 +774,7 @@ class Player: self.expected_response = self.game.deck.mancato_cards.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: + if 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) if not no_dmg: self.on_failed_response_cb = self.take_damage_response