diff --git a/backend/bang/game.py b/backend/bang/game.py index da83947..5d2da93 100644 --- a/backend/bang/game.py +++ b/backend/bang/game.py @@ -104,9 +104,9 @@ class Game: for k in range(self.players[i].max_lives): self.players[i].hand.append(self.deck.draw()) self.players[i].notify_self() - current_roles = [type(x.role).__name__ for x in self.players] + current_roles = [x.role.name for x in self.players] random.shuffle(current_roles) - current_roles = str({x:current_roles.count(x) for x in current_roles}).replace('{','').replace('}','') + 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}') self.play_turn() diff --git a/frontend/src/components/Card.vue b/frontend/src/components/Card.vue index 43c8db0..0fb4876 100644 --- a/frontend/src/components/Card.vue +++ b/frontend/src/components/Card.vue @@ -12,12 +12,13 @@ export default { name: 'Card', props: { - card: Object + card: Object, + donotlocalize: Boolean }, computed: { cardName(){ // console.log(this.$t(`cards.${this.card.name}.name`)) - if (this.$t(`cards.${this.card.name}.name`) !== `cards.${this.card.name}.name`) { + if (!this.donotlocalize && this.$t(`cards.${this.card.name}.name`) !== `cards.${this.card.name}.name`) { return this.$t(`cards.${this.card.name}.name`) } return this.card.name diff --git a/frontend/src/components/Chat.vue b/frontend/src/components/Chat.vue index 7b3708a..17bf7b1 100644 --- a/frontend/src/components/Chat.vue +++ b/frontend/src/components/Chat.vue @@ -5,7 +5,7 @@

{{msg.text}}

-

.

+

.

@@ -34,7 +34,7 @@ export default { }), sockets: { chat_message(msg) { - console.log(msg) + // console.log(msg) if ((typeof msg === "string") && msg.indexOf('_') === 0) { let params = msg.split('|') let type = params.shift().substring(1) @@ -42,6 +42,12 @@ export default { params[1] = this.$t(`cards.${params[1]}.name`) } else if (type === "choose_character"){ params.push(this.$t(`cards.${params[1]}.desc`)) + } else if (type === "allroles") { + params.forEach((p,i)=>{ + if (i%2 === 0) { + params[i] = this.$t(`cards.${params[i]}.name`) + } + }) } this.messages.push({text:this.$t(`chat.${type}`, params)}); if (type == 'turn' && params[0] == this.username) { diff --git a/frontend/src/components/Deck.vue b/frontend/src/components/Deck.vue index 9fb672a..6262936 100644 --- a/frontend/src/components/Deck.vue +++ b/frontend/src/components/Deck.vue @@ -1,7 +1,7 @@