From 84d4dcd98e9d58188d09e194e1950ae5c4e4439f Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Thu, 9 Feb 2023 09:54:00 +0000 Subject: [PATCH] blackflower to choose_play_as_bang --- backend/bang/expansions/the_valley_of_shadows/characters.py | 2 +- backend/bang/game.py | 2 +- backend/bang/players.py | 2 +- frontend/src/i18n/en.json | 1 + frontend/src/i18n/it.json | 1 + 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/backend/bang/expansions/the_valley_of_shadows/characters.py b/backend/bang/expansions/the_valley_of_shadows/characters.py index 5cd1649..bc04ce8 100644 --- a/backend/bang/expansions/the_valley_of_shadows/characters.py +++ b/backend/bang/expansions/the_valley_of_shadows/characters.py @@ -16,7 +16,7 @@ class BlackFlower(Character): player.available_cards = [c for c in player.hand if c.suit == cs.Suit.CLUBS] player.special_use_count += 1 player.pending_action = PendingAction.CHOOSE - player.choose_text = 'blackflower_special' + player.choose_text = 'choose_play_as_bang' player.notify_self() class ColoradoBill(Character): diff --git a/backend/bang/game.py b/backend/bang/game.py index bd64659..76d6e3d 100644 --- a/backend/bang/game.py +++ b/backend/bang/game.py @@ -446,7 +446,7 @@ class Game: {'name':self.players[self.turn].name,'cards': self.available_cards}, default=lambda o: o.__dict__)) self.players[self.turn].notify_self() - def respond_emporio(self, player, i): + def respond_emporio(self, player:pl.Player, i:int): card = self.available_cards.pop(i) G.sio.emit('chat_message', room=self.name, data=f'_choose_emporio|{player.name}|{card.name}') player.hand.append(card) diff --git a/backend/bang/players.py b/backend/bang/players.py index 891af98..ebeac03 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -869,7 +869,7 @@ class Player: G.sio.emit('chat_message', room=player.game.name, data=f'_play_card_against|{self.name}|Sventagliata|{player.name}') self.pending_action = PendingAction.PLAY self.notify_self() - elif 'blackflower_special' in self.choose_text: + elif 'choose_play_as_bang' in self.choose_text: if card_index <= len(self.available_cards): self.hand.remove(self.available_cards[card_index]) self.game.deck.scrap(self.available_cards[card_index], player=self) diff --git a/frontend/src/i18n/en.json b/frontend/src/i18n/en.json index 5d84e7c..a332cc1 100644 --- a/frontend/src/i18n/en.json +++ b/frontend/src/i18n/en.json @@ -75,6 +75,7 @@ "choose_complice": "Choose how you will play Pardner!", "choose_ricercato": "Choose who you will play Wanted against.", "choose_birra_function": "Choose between getting 1 gold nugget by discarding beer or if you want to play the beer.", + "choose_play_as_bang": "Choose which card to play as Bang!", "emporio_others": "{0} is choosing which card to get from the General Store", "you_died": "YOU DIED", "spectate": "SPECTATE", diff --git a/frontend/src/i18n/it.json b/frontend/src/i18n/it.json index 3dbbae0..1fd2437 100644 --- a/frontend/src/i18n/it.json +++ b/frontend/src/i18n/it.json @@ -75,6 +75,7 @@ "choose_complice": "Scegli come giocare Complice!", "choose_ricercato": "Scegli il giocatore su cui vuoi giocare Ricercato", "choose_birra_function": "Scegli tra ottenere 1 pepita scartando la birra oppure giocare la birra.", + "choose_play_as_bang": "Scegli che carta giocare come Bang!", "emporio_others": "{0} sta scegliendo che carta prendere dall'emporio", "you_died": "SEI MORTO", "spectate": "SPETTATORE",