From e400ab22ba72968c2fc574f64b46c95d71eed87d Mon Sep 17 00:00:00 2001
From: GM <giulio97.migani@gmail.com>
Date: Sat, 14 Jan 2023 15:58:23 +0000
Subject: [PATCH] fix player desc

---
 backend/bang/expansions/gold_rush/shop_cards.py        | 4 ++--
 backend/bang/expansions/the_valley_of_shadows/cards.py | 2 +-
 backend/bang/players.py                                | 8 ++++----
 frontend/src/components/Chooser.vue                    | 2 ++
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/backend/bang/expansions/gold_rush/shop_cards.py b/backend/bang/expansions/gold_rush/shop_cards.py
index 405bf7b..9424177 100644
--- a/backend/bang/expansions/gold_rush/shop_cards.py
+++ b/backend/bang/expansions/gold_rush/shop_cards.py
@@ -43,7 +43,7 @@ class Bicchierino(ShopCard):
             'icon': p.role.icon if(player.game.initial_players == 3) else '⭐️' if isinstance(p.role, r.Sheriff) else '🤠',
             'alt_text': ''.join(['❤️']*p.lives)+''.join(['💀']*(p.max_lives-p.lives)),
             'is_character': True,
-            'noDesc': True
+            'is_player': True
         } for p in player.game.get_alive_players()]
         player.choose_text = 'choose_bicchierino'
         player.pending_action = pl.PendingAction.CHOOSE
@@ -168,7 +168,7 @@ class Ricercato(ShopCard):
             'icon': p.role.icon if(player.game.initial_players == 3) else '🤠',
             'alt_text': ''.join(['❤️']*p.lives)+''.join(['💀']*(p.max_lives-p.lives)),
             'is_character': True,
-            'noDesc': True
+            'is_player': True
         } for p in player.game.get_alive_players() if p != player and not isinstance(p.role, r.Sheriff)]
         player.available_cards.append({'name': player.name, 'number':0,'icon': 'you', 'is_character': True})
         player.choose_text = 'choose_ricercato'
diff --git a/backend/bang/expansions/the_valley_of_shadows/cards.py b/backend/bang/expansions/the_valley_of_shadows/cards.py
index 9d4a31f..cd11117 100644
--- a/backend/bang/expansions/the_valley_of_shadows/cards.py
+++ b/backend/bang/expansions/the_valley_of_shadows/cards.py
@@ -21,7 +21,7 @@ class Fantasma(Card):
                 'avatar': p.avatar,
                 'alt_text': ''.join(['❤️']*p.lives)+''.join(['💀']*(p.max_lives-p.lives)),
                 'is_character': True,
-                'noDesc': True
+                'is_player': True
             } for p in player.game.get_dead_players(include_ghosts=False)] 
             player.game.deck.scrap(self, True)
             return True
diff --git a/backend/bang/players.py b/backend/bang/players.py
index 63c9ff0..2438377 100644
--- a/backend/bang/players.py
+++ b/backend/bang/players.py
@@ -468,7 +468,7 @@ class Player:
                 'alt_text': ''.join(['❤️']*p.lives)+''.join(['💀']*(p.max_lives-p.lives)),
                 'avatar': p.avatar,
                 'is_character': True,
-                'noDesc': True
+                'is_player': True
             } for p in self.game.get_alive_players() if p != self and p.lives < p.max_lives]
             self.available_cards.append({'icon': '❌', 'noDesc': True})
             self.choose_text = 'choose_fratelli_di_sangue'
@@ -497,7 +497,7 @@ class Player:
                 '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'])),
                 'is_character': True,
-                'desc': p['name']
+                'is_player': True
             } 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'
@@ -509,7 +509,7 @@ class Player:
                 'icon': p.role.icon if(self.game.initial_players == 3) else '⭐️' if isinstance(p.role, r.Sheriff) else '🤠',
                 'is_character': True,
                 'avatar': p.avatar,
-                'noDesc': True
+                'is_player': 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'
@@ -1360,7 +1360,7 @@ class Player:
             'is_character': True,
             'avatar': p.avatar,
             'alt_text': ''.join(['🎴️'] * len(p.gold_rush_equipment)),
-            'noDesc': True
+            'is_player': True
         } for p in self.game.get_alive_players() if p != self and any((e.number + 1 <= self.gold_nuggets for e in p.gold_rush_equipment))]
         self.available_cards.append({'icon': '❌', 'noDesc': True})
         self.choose_text = 'gold_rush_discard'
diff --git a/frontend/src/components/Chooser.vue b/frontend/src/components/Chooser.vue
index 27dc68c..6020be4 100644
--- a/frontend/src/components/Chooser.vue
+++ b/frontend/src/components/Chooser.vue
@@ -56,6 +56,8 @@ export default {
 			//console.log(card)
 			if (card.noDesc || card.name == null || card.name == "PewPew!")
 				this.desc = ""
+			else if (card.is_player)
+				this.desc = card.name
 			else if (card.goal)
 				this.desc = this.$t(`cards.${card.name}.name`)
 			else if (card.desc)