From 40e4d1df83992a34c57ef65631e16be0a292fd59 Mon Sep 17 00:00:00 2001 From: Giulio Date: Tue, 15 Jun 2021 22:13:38 +0200 Subject: [PATCH 1/4] fix Cecchino --- backend/bang/game.py | 1 + backend/bang/players.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/bang/game.py b/backend/bang/game.py index a6f2725..9fba240 100644 --- a/backend/bang/game.py +++ b/backend/bang/game.py @@ -590,6 +590,7 @@ class Game: 'is_ghost': pls[j].is_ghost, 'is_bot': pls[j].is_bot, 'icon': pls[j].role.icon if (pls[j].role is not None) else '🤠', + 'role': pls[j].role, } for j in range(len(pls)) if i != j] def get_alive_players(self): diff --git a/backend/bang/players.py b/backend/bang/players.py index 1cbe9d6..15386c3 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -358,8 +358,9 @@ class Player: self.is_using_checchino = True self.available_cards = [{ 'name': p['name'], - 'icon': p.role.icon if(self.game.initial_players == 3) else '⭐️' if p['is_sheriff'] else '🤠', - 'alt_text': ''.join(['❤️']*p['lives'])+''.join(['💀']*(p['max_lives']-p['lives'])) + 'icon': p['role'].icon if(self.game.initial_players == 3) else '⭐️' if p['is_sheriff'] else '🤠', + 'alt_text': ''.join(['❤️']*p['lives'])+''.join(['💀']*(p['max_lives']-p['lives'])), + 'desc': p['name'] } for p in self.game.get_visible_players(self) if p['dist'] <= self.get_sight()] self.available_cards.append({'icon': '❌', 'noDesc': True}) self.choose_text = 'choose_cecchino' From 8cf1d536ca93a1e8cb0570e660040812b06e2fe6 Mon Sep 17 00:00:00 2001 From: Giulio Date: Wed, 16 Jun 2021 13:01:16 +0200 Subject: [PATCH 2/4] disable google translate --- frontend/public/index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/public/index.html b/frontend/public/index.html index bc4dd0c..61a29af 100644 --- a/frontend/public/index.html +++ b/frontend/public/index.html @@ -1,6 +1,7 @@ - + + From 0e9c8ad0286b4ef8701fe34842683a3a9191d828 Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Wed, 16 Jun 2021 16:34:03 +0200 Subject: [PATCH 3/4] easy debug room --- 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 9fba240..7c9de12 100644 --- a/backend/bang/game.py +++ b/backend/bang/game.py @@ -42,7 +42,7 @@ class Game: self.someone_won = False self.attack_in_progress = False self.characters_to_distribute = 2 # personaggi da dare a inizio partita - self.debug = False + self.debug = self.name == 'debug' def reset(self): print('resetting lobby') From 7f0f8bb5c16a5cdaece5b92d31d3eff5191635cc Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Wed, 16 Jun 2021 16:43:38 +0200 Subject: [PATCH 4/4] fix doc holyday --- backend/bang/players.py | 2 +- frontend/src/components/Player.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/bang/players.py b/backend/bang/players.py index 15386c3..a32b8d1 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -973,7 +973,7 @@ class Player: self.notify_self() def holyday_special(self, data): - if self.character.check(self.game, chd.DocHolyday) and self.special_use_count < 1: + if self.character.check(self.game, chd.DocHolyday) and self.special_use_count < 1 and self.pending_action == PendingAction.PLAY: self.special_use_count += 1 cards = sorted(data['cards'], reverse=True) for c in cards: diff --git a/frontend/src/components/Player.vue b/frontend/src/components/Player.vue index 3c12388..a31fce1 100644 --- a/frontend/src/components/Player.vue +++ b/frontend/src/components/Player.vue @@ -24,7 +24,7 @@ - +
{{$t('hand')}} @@ -307,7 +307,7 @@ export default { }, holydayScrapBang(other) { this.$socket.emit('holyday_special', { - cards : [this.hand.indexOf(this.scrapHand[0]), this.hand.indexOf(this.scrapHand[1])], + cards : [this.scrapHand[0], this.scrapHand[1]], against: other.name }) this.scrapHand = []