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

fix desc card on chooser one more time

Browse Source
This commit is contained in:
Giulio 2021-05-22 16:27:39 +02:00
parent 0f86409859
commit 16800e6079
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
backend/bang/players.py
View File

@ -167,9 +167,12 @@ class Player:
if self.is_ghost: self.lives = 0 if self.is_ghost: self.lives = 0
if self.pending_action == PendingAction.DRAW and self.game.check_event(ce.Peyote): if self.pending_action == PendingAction.DRAW and self.game.check_event(ce.Peyote):
self.available_cards = [{ self.available_cards = [{
'icon': '🔴' 'icon': '🔴',
'noDesc': True
},{ },{
'icon': '⚫' 'icon': '⚫',
'noDesc': True
}] }]
self.is_drawing = True self.is_drawing = True
self.choose_text = 'choose_guess' self.choose_text = 'choose_guess'
@ -178,7 +181,7 @@ class Player:
self.can_play_ranch = False self.can_play_ranch = False
self.available_cards = [c for c in self.hand] self.available_cards = [c for c in self.hand]
self.discarded_cards = [] self.discarded_cards = []
self.available_cards.append({'icon': '✅'}) self.available_cards.append({'icon': '✅','noDesc': True})
self.is_playing_ranch = True self.is_playing_ranch = True
self.choose_text = 'choose_ranch' self.choose_text = 'choose_ranch'
self.pending_action = PendingAction.CHOOSE self.pending_action = PendingAction.CHOOSE
@ -346,7 +349,7 @@ class Player:
'icon': '⭐️' if isinstance(p.role, r.Sheriff) else '🤠', 'icon': '⭐️' if isinstance(p.role, r.Sheriff) else '🤠',
'alt_text': ''.join(['❤️']*p.lives)+''.join(['💀']*(p.max_lives-p.lives)) '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] } 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.choose_text = 'choose_fratelli_di_sangue'
self.pending_action = PendingAction.CHOOSE self.pending_action = PendingAction.CHOOSE
self.is_giving_life = True self.is_giving_life = True
@ -369,7 +372,7 @@ class Player:
'icon': '⭐️' if p['is_sheriff'] else '🤠', 'icon': '⭐️' if p['is_sheriff'] else '🤠',
'alt_text': ''.join(['❤️']*p['lives'])+''.join(['💀']*(p['max_lives']-p['lives'])) '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()] } 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.choose_text = 'choose_cecchino'
self.pending_action = PendingAction.CHOOSE self.pending_action = PendingAction.CHOOSE
self.notify_self() self.notify_self()
@ -378,7 +381,7 @@ class Player:
'name': p.name, 'name': p.name,
'icon': '⭐️' if isinstance(p.role, r.Sheriff) else '🤠' 'icon': '⭐️' if isinstance(p.role, r.Sheriff) else '🤠'
} for p in self.game.get_alive_players() if len(p.equipment) > 0 and p != self] } 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.choose_text = 'choose_rimbalzo_player'
self.pending_action = PendingAction.CHOOSE self.pending_action = PendingAction.CHOOSE
self.using_rimbalzo = 1 self.using_rimbalzo = 1

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

@ -47,7 +47,7 @@ export default {
methods: { methods: {
showDesc(card) { showDesc(card) {
//console.log(card) //console.log(card)
if (card.name == null || card.name == "PewPew!") if (card.noDesc || card.name == null || card.name == "PewPew!")
this.desc = "" this.desc = ""
else if (card.desc) else if (card.desc)
this.desc = (this.$i18n.locale=='it'?card.desc:card.desc_eng) this.desc = (this.$i18n.locale=='it'?card.desc:card.desc_eng)

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

@ -219,6 +219,7 @@ export default {
name: this.name, name: this.name,
number: 0, number: 0,
icon: this.$t('you'), icon: this.$t('you'),
desc: this.$t('you'),
is_character: true, is_character: true,
}) })
} }
@ -241,6 +242,7 @@ export default {
name: this.$t('take_dmg'), name: this.$t('take_dmg'),
icon: '❌', icon: '❌',
is_equipment: true, 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=>{ 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) cc.push(x)