ricercato can target self

backend/bang/expansions/gold_rush/shop_cards.py

@@ -41,6 +41,7 @@ class Bicchierino(ShopCard):
             'name': p.name,
             '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
         } for p in player.game.get_alive_players()]
         player.choose_text = 'choose_bicchierino'
@@ -155,6 +156,7 @@ class Ricercato(ShopCard):
     def __init__(self):
         super().__init__("Ricercato", 2, ShopCardKind.BLACK)
         self.icon = '🤠️'
+        self.can_target_self = True
 
     def play_card(self, player, against=None, _with=None):
         player.sio.emit('chat_message', room=player.game.name, data=f'_purchase_card|{player.name}|{self.name}')
@@ -162,8 +164,10 @@ class Ricercato(ShopCard):
             'name': p.name,
             '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
         } for p in player.game.get_alive_players() if p != player]
+        player.available_cards.append({'name': player.name, 'number':0,'icon': 'you', 'is_character': True})
         player.choose_text = 'choose_ricercato'
         player.pending_action = pl.PendingAction.CHOOSE
         player.notify_self()

backend/bang/players.py

@@ -362,6 +362,7 @@ class Player:
                 'name': p.name,
                 'icon': p.role.icon if(self.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
             } for p in self.game.get_alive_players() if p != self and p.lives < p.max_lives]
             self.available_cards.append({'icon': '❌', 'noDesc': True})
@@ -390,6 +391,7 @@ class Player:
                 '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'])),
+                'is_character': True,
                 '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})
@@ -400,6 +402,7 @@ class Player:
             self.available_cards = [{
                 'name': p.name,
                 'icon': p.role.icon if(self.game.initial_players == 3) else '⭐️' if isinstance(p.role, r.Sheriff) else '🤠',
+                'is_character': True,
                 '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})
@@ -1138,6 +1141,7 @@ class Player:
         self.available_cards = [{
             'name': p.name,
             'icon': p.role.icon if(self.game.initial_players == 3) else '⭐️' if isinstance(p.role, r.Sheriff) else '🤠',
+            'is_character': True,
             'alt_text': ''.join(['🎴️'] * len(p.gold_rush_equipment)),
             'noDesc': True
         } for p in self.game.get_alive_players() if p != self and len([e for e in p.gold_rush_equipment if e.number + 1 <= self.gold_nuggets]) > 0]

frontend/src/components/Card.vue

@@ -1,7 +1,7 @@
 <template>
 	<div :class="{ card: true, equipment: card.is_equipment, character:card.is_character, back:card.is_back, 'usable-next-turn':card.usable_next_turn, 'must-be-used':card.must_be_used, 'gold-rush': card.expansion === 'gold_rush', 'brown':card.kind === 0, 'black':card.kind === 1,}">
 		<h4>{{cardName}}</h4>
-		<div class="emoji">{{card.icon}}</div>
+		<div class="emoji">{{emoji}}</div>
 		<div class="alt_text">{{card.alt_text}}</div>
 		<div class="suit">{{number}}{{suit}}</div>
 		<div class="expansion" v-if="card.expansion_icon">{{card.expansion_icon}}</div>
@@ -21,8 +21,14 @@ export default {
 			if (!this.donotlocalize && this.$t(`cards.${this.card.name}.name`) !== `cards.${this.card.name}.name`) {
 				return this.$t(`cards.${this.card.name}.name`)
 			}
+			if (this.card.name == "you") {
+				return this.$t('you')
+			}
 			return this.card.name
 		},
+		emoji(){
+			return this.card.icon != "you" ? this.card.icon : this.$t('you')
+		},
 		suit() {
 			if (this.card && !isNaN(this.card.suit)) {
 				let x = ['♦️','♣️','♥️','♠️']

frontend/src/components/Chooser.vue

@@ -49,10 +49,10 @@ export default {
 			//console.log(card)
 			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)
 			else if (card.is_character)
 				this.desc = card.name
+			else if (card.desc)
+				this.desc = (this.$i18n.locale=='it'?card.desc:card.desc_eng)
 			else
 				this.desc = this.$t(`cards.${card.name}.desc`)
 		}

frontend/src/components/Player.vue

@@ -244,7 +244,6 @@ export default {
 					name: this.name,
 					number: 0,
 					icon: this.$t('you'),
-					desc: this.$t('you'),
 					is_character: true,
 				})
 			}