From 02ef834c98d9f6fcaca30ba767e9e745aaad0f95 Mon Sep 17 00:00:00 2001 From: Giulio Date: Wed, 19 May 2021 00:21:03 +0200 Subject: [PATCH 1/4] fix event per un pugno di carte --- backend/bang/game.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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() From 8a4eec5002a0d20753b5a6534b43b5c69306c844 Mon Sep 17 00:00:00 2001 From: Giulio Date: Wed, 19 May 2021 11:30:57 +0200 Subject: [PATCH 2/4] fix lazo and calamity janet's ability --- backend/bang/players.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/bang/players.py b/backend/bang/players.py index c7f69bf..eee4d35 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -773,6 +773,8 @@ 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() + 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) 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) if not no_dmg: From 9f71b00952ec33945ba51a6a4ea09bd36831d5fb Mon Sep 17 00:00:00 2001 From: Giulio Date: Wed, 19 May 2021 12:09:12 +0200 Subject: [PATCH 3/4] fix Dinamite attacker --- backend/bang/players.py | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/bang/players.py b/backend/bang/players.py index eee4d35..039b7e5 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() From b83b3d21a31caba94755590d3616423661bd5452 Mon Sep 17 00:00:00 2001 From: Giulio Date: Wed, 19 May 2021 12:13:42 +0200 Subject: [PATCH 4/4] better fix for calamity janet --- backend/bang/players.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/backend/bang/players.py b/backend/bang/players.py index 039b7e5..fd76bbf 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -774,9 +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() - 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) - 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