From 357d2a184b26e2f362dd7eeacc6fab970ccb6dae Mon Sep 17 00:00:00 2001 From: Giulio Date: Tue, 4 May 2021 13:39:36 +0200 Subject: [PATCH 1/5] fix desc --- backend/bang/expansions/fistful_of_cards/card_events.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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): From e31a81b81881678eaed8696c6dfb4c4354912379 Mon Sep 17 00:00:00 2001 From: Giulio Date: Tue, 4 May 2021 13:40:13 +0200 Subject: [PATCH 2/5] fix PixiePete and Sete --- backend/bang/players.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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() From 2eb94c2d98cf12a85e89a13b91fc033acd874e8b Mon Sep 17 00:00:00 2001 From: Giulio Date: Tue, 4 May 2021 14:35:22 +0200 Subject: [PATCH 3/5] it doesn't work well with touch-to-search --- frontend/src/components/Chat.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@

{{$t("chat.chat")}}

-

{{msg.text}}

+

{{msg.text}}

.

From fd539d7e0e7d449a9069d006a68d70318293a399 Mon Sep 17 00:00:00 2001 From: Giulio Date: Tue, 4 May 2021 14:57:09 +0200 Subject: [PATCH 4/5] fix again allrules --- backend/bang/game.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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): From ffa3ffdcd9961a86265ff0c241b1542bbd29f27c Mon Sep 17 00:00:00 2001 From: Giulio Date: Tue, 4 May 2021 15:28:47 +0200 Subject: [PATCH 5/5] fix chooser one more time --- frontend/src/components/Chooser.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/Chooser.vue b/frontend/src/components/Chooser.vue index 3c0afcb..7ffc6b6 100644 --- a/frontend/src/components/Chooser.vue +++ b/frontend/src/components/Chooser.vue @@ -47,7 +47,7 @@ export default { methods: { showDesc(card) { //console.log(card) - if (card.name == "PewPew!") + if (card.name == null || card.name == "PewPew!") this.desc = "" else if (card.desc) this.desc = (this.$i18n.locale=='it'?card.desc:card.desc_eng)