diff --git a/backend/bang/players.py b/backend/bang/players.py index fd76bbf..73838be 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -167,9 +167,12 @@ class Player: if self.is_ghost: self.lives = 0 if self.pending_action == PendingAction.DRAW and self.game.check_event(ce.Peyote): self.available_cards = [{ - 'icon': '🔴' + 'icon': '🔴', + 'noDesc': True },{ - 'icon': '⚫' + 'icon': '⚫', + 'noDesc': True + }] self.is_drawing = True self.choose_text = 'choose_guess' @@ -178,7 +181,7 @@ class Player: self.can_play_ranch = False self.available_cards = [c for c in self.hand] self.discarded_cards = [] - self.available_cards.append({'icon': '✅'}) + self.available_cards.append({'icon': '✅','noDesc': True}) self.is_playing_ranch = True self.choose_text = 'choose_ranch' self.pending_action = PendingAction.CHOOSE @@ -346,7 +349,7 @@ class Player: 'icon': '⭐️' if isinstance(p.role, r.Sheriff) else '🤠', 'alt_text': ''.join(['❤️']*p.lives)+''.join(['💀']*(p.max_lives-p.lives)) } for p in self.game.get_alive_players() if p != self and p.lives < p.max_lives] - self.available_cards.append({'icon': '❌'}) + self.available_cards.append({'icon': '❌', 'noDesc': True}) self.choose_text = 'choose_fratelli_di_sangue' self.pending_action = PendingAction.CHOOSE self.is_giving_life = True @@ -369,7 +372,7 @@ class Player: 'icon': '⭐️' if p['is_sheriff'] else '🤠', 'alt_text': ''.join(['❤️']*p['lives'])+''.join(['💀']*(p['max_lives']-p['lives'])) } for p in self.game.get_visible_players(self) if p['dist'] <= self.get_sight()] - self.available_cards.append({'icon': '❌'}) + self.available_cards.append({'icon': '❌', 'noDesc': True}) self.choose_text = 'choose_cecchino' self.pending_action = PendingAction.CHOOSE self.notify_self() @@ -378,7 +381,7 @@ class Player: 'name': p.name, 'icon': '⭐️' if isinstance(p.role, r.Sheriff) else '🤠' } for p in self.game.get_alive_players() if len(p.equipment) > 0 and p != self] - self.available_cards.append({'icon': '❌'}) + self.available_cards.append({'icon': '❌', 'noDesc': True}) self.choose_text = 'choose_rimbalzo_player' self.pending_action = PendingAction.CHOOSE self.using_rimbalzo = 1 diff --git a/frontend/src/components/Chooser.vue b/frontend/src/components/Chooser.vue index 7ffc6b6..751c0f8 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 == null || card.name == "PewPew!") + if (card.noDesc || card.name == null || card.name == "PewPew!") this.desc = "" else if (card.desc) this.desc = (this.$i18n.locale=='it'?card.desc:card.desc_eng) diff --git a/frontend/src/components/Player.vue b/frontend/src/components/Player.vue index d1b25d2..e90b3cf 100644 --- a/frontend/src/components/Player.vue +++ b/frontend/src/components/Player.vue @@ -219,6 +219,7 @@ export default { name: this.name, number: 0, icon: this.$t('you'), + desc: this.$t('you'), is_character: true, }) } @@ -241,6 +242,7 @@ export default { name: this.$t('take_dmg'), icon: '❌', is_equipment: true, + noDesc: true, }] this.hand.filter(x => x.can_be_used_now && (this.expected_response.indexOf(x.name) !== -1 || this.character.name === "Elena Fuente")).forEach(x=>{ cc.push(x)