techwire/bang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix player desc

Browse Source
This commit is contained in:
GM 2023-01-14 15:58:23 +00:00
parent edeefa28c6
commit e400ab22ba
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/bang/expansions/gold_rush/shop_cards.py
View File

@ -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'

2
backend/bang/expansions/the_valley_of_shadows/cards.py
View File

@ -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

8
backend/bang/players.py
View File

@ -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'

2
frontend/src/components/Chooser.vue
View File

@ -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)