diff --git a/backend/bang/game.py b/backend/bang/game.py index d50d169..d9b6e7f 100644 --- a/backend/bang/game.py +++ b/backend/bang/game.py @@ -588,6 +588,7 @@ class Game: 'cards': len(pls[j].hand)+len(pls[j].equipment), '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 '🤠', } 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 0d02ca5..f200991 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -65,6 +65,7 @@ class Player: self.death_turn = 0 self.is_ghost = False self.not_chosen_character = None + self.noStar = False def reset(self): self.hand: cs.Card = [] @@ -101,6 +102,7 @@ class Player: self.is_dead = False self.is_ghost = False self.death_turn = 0 + self.noStar = False def join_game(self, game): self.game = game @@ -146,6 +148,7 @@ class Player: self.hand = [] self.equipment = [] self.pending_action = PendingAction.WAIT + self.noStar = (self.game.initial_players == 3) def set_available_character(self, available): self.available_characters = available @@ -352,7 +355,7 @@ class Player: if self.game.check_event(ce.FratelliDiSangue) and self.lives > 1 and not self.is_giving_life and len([p for p in self.game.get_alive_players() if p != self and p.lives < p.max_lives]): self.available_cards = [{ 'name': p.name, - 'icon': '⭐️' if isinstance(p.role, r.Sheriff) else '🤠', + '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)), 'noDesc': True } for p in self.game.get_alive_players() if p != self and p.lives < p.max_lives] @@ -380,7 +383,7 @@ class Player: self.is_using_checchino = True self.available_cards = [{ 'name': p['name'], - 'icon': '⭐️' if p['is_sheriff'] else '🤠', + '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'])) } for p in self.game.get_visible_players(self) if p['dist'] <= self.get_sight()] self.available_cards.append({'icon': '❌', 'noDesc': True}) @@ -390,7 +393,8 @@ class Player: elif self.is_my_turn and self.pending_action == PendingAction.PLAY and pile == 'event' and self.game.check_event(ce.Rimbalzo) and len([c for c in self.hand if c.name == cs.Bang(0,0).name]) > 0: self.available_cards = [{ 'name': p.name, - 'icon': '⭐️' if isinstance(p.role, r.Sheriff) else '🤠' + 'icon': p.role.icon if(self.game.initial_players == 3) else '⭐️' if p['is_sheriff'] else '🤠', + 'noDesc': True } for p in self.game.get_alive_players() if len(p.equipment) > 0 and p != self] self.available_cards.append({'icon': '❌', 'noDesc': True}) self.choose_text = 'choose_rimbalzo_player' diff --git a/frontend/src/components/Player.vue b/frontend/src/components/Player.vue index b15dbcb..5e430e4 100644 --- a/frontend/src/components/Player.vue +++ b/frontend/src/components/Player.vue @@ -116,6 +116,7 @@ export default { eventCard: false, emporioCards: {}, spectator: false, + noStar: false, }), sockets: { role(role) { @@ -163,6 +164,7 @@ export default { this.cancelChooseCardFromPlayer() this.shouldChooseCard = false } + this.noStar = self.noStar }, self_vis(vis) { // console.log('received visibility update') @@ -196,7 +198,7 @@ export default { return { name: player.name, number: player.dist !== undefined ? `${player.dist}⛰` : '', - icon: player.is_sheriff ? '⭐' : '🤠', + icon: this.noStar ? player.icon : player.is_sheriff ? '⭐' : '🤠', is_character: true, }}) return vis @@ -212,7 +214,7 @@ export default { return { name: player.name, number: player.dist !== undefined ? `${player.dist}⛰` : '', - icon: player.is_sheriff ? '⭐' : '🤠', + icon: this.noStar ? player.icon : player.is_sheriff ? '⭐' : '🤠', alt_text: Array(player.lives+1).join('❤️')+Array(player.max_lives-player.lives+1).join('💀'), is_character: true, }})