From 01e2ad7bd8c9b7b2ebbf411fffe47db1b403d299 Mon Sep 17 00:00:00 2001 From: Giulio Date: Sat, 24 Apr 2021 12:14:45 +0200 Subject: [PATCH 1/2] fix allroles --- backend/bang/game.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/backend/bang/game.py b/backend/bang/game.py index b107b27..142fabe 100644 --- a/backend/bang/game.py +++ b/backend/bang/game.py @@ -106,8 +106,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): From 84c9c5516e5f791ac943ba7bb275fd31063203e8 Mon Sep 17 00:00:00 2001 From: Giulio Date: Sat, 24 Apr 2021 15:10:07 +0200 Subject: [PATCH 2/2] fix chooser desc --- frontend/src/components/Chooser.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frontend/src/components/Chooser.vue b/frontend/src/components/Chooser.vue index 391f337..9c7524a 100644 --- a/frontend/src/components/Chooser.vue +++ b/frontend/src/components/Chooser.vue @@ -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`) }