Merge branch 'dev' into main

This commit is contained in:
Giulio 2021-04-24 15:27:24 +02:00
commit 91172426e2
2 changed files with 8 additions and 2 deletions

View File

@ -108,8 +108,11 @@ class Game:
self.players[i].notify_self()
current_roles = [x.role.name for x in self.players]
random.shuffle(current_roles)
current_roles = '|'.join([x + '|' + str(current_roles.count(x)) for x in current_roles])
self.sio.emit('chat_message', room=self.name, data=f'_allroles|{current_roles}')
cr = ''
for x in current_roles:
if (x not in cr):
cr += x + '|' + str(current_roles.count(x)) +'|'
self.sio.emit('chat_message', room=self.name, data=f'_allroles|{cr}')
self.play_turn()
def choose_characters(self):

View File

@ -46,8 +46,11 @@ export default {
},
methods: {
showDesc(card) {
//console.log(card)
if (card.desc)
this.desc = (this.$i18n.locale=='it'?card.desc:card.desc_eng)
else if (card.is_character)
this.desc = card.name
else
this.desc = this.$t(`cards.${card.name}.desc`)
}