diff --git a/backend/bang/expansions/fistful_of_cards/card_events.py b/backend/bang/expansions/fistful_of_cards/card_events.py index 6059083..6ae3830 100644 --- a/backend/bang/expansions/fistful_of_cards/card_events.py +++ b/backend/bang/expansions/fistful_of_cards/card_events.py @@ -9,7 +9,7 @@ class CardEvent(ABC): class Agguato(CardEvent): def __init__(self): super().__init__("Agguato", "🛁") - self.desc = "La distanza base di tra 2 qualsiasi giocatori è 1" + self.desc = "La distanza base tra 2 qualsiasi giocatori è 1" self.desc_eng = "The base distance from any 2 players is 1" class Cecchino(CardEvent): diff --git a/backend/bang/game.py b/backend/bang/game.py index b77fa28..65a1739 100644 --- a/backend/bang/game.py +++ b/backend/bang/game.py @@ -111,8 +111,8 @@ class Game: cr = '' for x in current_roles: if (x not in cr): - cr += x + '|' + str(current_roles.count(x)) +'|' - self.sio.emit('chat_message', room=self.name, data=f'_allroles|{cr}') + cr += '|' +x + '|' + str(current_roles.count(x)) + self.sio.emit('chat_message', room=self.name, data=f'_allroles{cr}') self.play_turn() def choose_characters(self): diff --git a/backend/bang/players.py b/backend/bang/players.py index 5578ee8..dab6f92 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -423,6 +423,8 @@ class Player: for i in range(self.max_lives-self.lives): self.hand.append(self.game.deck.draw()) else: + if self.character.check(self.game, chd.PixiePete): + self.hand.append(self.game.deck.draw()) for i in range(2): card: cs.Card = self.game.deck.draw() self.hand.append(card) @@ -434,8 +436,6 @@ class Player: self.hand.append(self.game.deck.draw()) if self.game.check_event(ceh.Sete): return self.notify_self() - if self.character.check(self.game, chd.PixiePete): - self.hand.append(self.game.deck.draw()) if self.game.check_event(ceh.IlTreno) or (self.is_ghost and self.game.check_event(ceh.CittaFantasma)): self.hand.append(self.game.deck.draw()) self.notify_self() diff --git a/frontend/src/components/Chat.vue b/frontend/src/components/Chat.vue index 17bf7b1..32e910f 100644 --- a/frontend/src/components/Chat.vue +++ b/frontend/src/components/Chat.vue @@ -4,7 +4,7 @@
.