From 535c56533d057d266ba750de1d6f8586d661473b Mon Sep 17 00:00:00 2001
From: Alberto Xamin <alberto@xamin.it>
Date: Sat, 28 Nov 2020 16:11:23 +0100
Subject: [PATCH] fix show ready

---
 backend/bang/game.py              | 15 ++++++++-------
 frontend/src/components/Lobby.vue |  7 +++++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/backend/bang/game.py b/backend/bang/game.py
index 7c69cbe..b0679bb 100644
--- a/backend/bang/game.py
+++ b/backend/bang/game.py
@@ -23,13 +23,14 @@ class Game:
         self.expansions = []
 
     def notify_room(self):
-        self.sio.emit('room', room=self.name, data={
-            'name': self.name,
-            'started': self.started,
-            'players': [{'name':p.name, 'ready': False} for p in self.players],
-            'password': self.password,
-            'expansions': self.expansions,
-        })
+        if len([p for p in self.players if p.character == None]) != 0:
+            self.sio.emit('room', room=self.name, data={
+                'name': self.name,
+                'started': self.started,
+                'players': [{'name':p.name, 'ready': p.character != None} for p in self.players],
+                'password': self.password,
+                'expansions': self.expansions,
+            })
 
     def toggle_expansion(self, expansion_name):
         if not self.started:
diff --git a/frontend/src/components/Lobby.vue b/frontend/src/components/Lobby.vue
index 8457c6e..912e1ac 100644
--- a/frontend/src/components/Lobby.vue
+++ b/frontend/src/components/Lobby.vue
@@ -132,7 +132,7 @@ export default {
 				let rotateAngle = (i) * offsetAngle
 				let size = 130
 				return {
-					card:this.getPlayerCard(x),
+					card: this.getPlayerCard(x),
 					style: `position:absolute;transform: rotate(${rotateAngle}deg) translate(0, -${size}pt) rotate(-${rotateAngle}deg) translate(${size}pt,${size}pt)`,
 					...x
 				}
@@ -155,10 +155,13 @@ export default {
 			}
 		},
 		getPlayerCard(player) {
+			let icon = ''
+			if (!this.started) icon = '🤠'
+			else icon = player.ready !== undefined ? ((player.ready)?'👍': '🤔') : (player.is_sheriff ? '⭐' : player.icon)
 			return {
 				name: player.name,
 				number: ((this.username == player.name) ? this.$t('you') : (this.players[0].name == player.name) ? this.$t('owner') :'') + (player.dist ? `${player.dist}⛰` : ''),
-				icon: (player.lives === undefined || player.lives > 0) ? (player.is_sheriff ? '⭐' : player.icon || ((player.ready)?'👍': '🤠') ) : '☠️',
+				icon: icon,
 				is_character: true,
 			}
 		},