From 003e27222dc6a73e55f077d0cfa2367432391ffc Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Sun, 27 Jun 2021 20:49:25 +0200 Subject: [PATCH] fix bang-bottiglia --- backend/bang/cards.py | 2 +- frontend/src/components/Player.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/bang/cards.py b/backend/bang/cards.py index 9316807..89aa1b6 100644 --- a/backend/bang/cards.py +++ b/backend/bang/cards.py @@ -212,7 +212,7 @@ class Bang(Card): import bang.expansions.high_noon.card_events as ceh if player.game.check_event(ceh.Sermone) and not self.number == 42: # 42 gold rush return False - if (player.has_played_bang and (not any([isinstance(c, Volcanic) for c in player.equipment]) or player.game.check_event(ce.Lazo)) and against != None) and not self.number == 42: # 42 gold rush: + if ((player.has_played_bang and not self.number == 42) and (not any([isinstance(c, Volcanic) for c in player.equipment]) or player.game.check_event(ce.Lazo)) and against != None): # 42 gold rush: return False elif against != None: import bang.characters as chars diff --git a/frontend/src/components/Player.vue b/frontend/src/components/Player.vue index ef2c5aa..847e2e5 100644 --- a/frontend/src/components/Player.vue +++ b/frontend/src/components/Player.vue @@ -353,7 +353,7 @@ export default { if (from_equipment && (!card.can_be_used_now || (this.eventCard && this.eventCard.name == "Lazo"))) return; else if (card.usable_next_turn && !card.can_be_used_now) return this.really_play_card(card, null); let calamity_special = (card.name === 'Mancato!' && this.character.name === 'Calamity Janet') - let cant_play_bang = (this.has_played_bang && this.equipment.filter(x => x.name == 'Volcanic').length == 0) + let cant_play_bang = (this.has_played_bang && card.number !==42 && this.equipment.filter(x => x.name == 'Volcanic').length == 0) if (this.pending_action == 2) { this.can_target_sheriff = (card.name !== 'Prigione') if (card.need_with && !this.card_with) {