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

fix show ready

Browse Source
This commit is contained in:
Alberto Xamin 2020-11-28 16:11:23 +01:00
parent fbf5d6a859
commit 535c56533d
No known key found for this signature in database
GPG Key ID: 4F026F48309500A2
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
backend/bang/game.py
View File

@ -23,13 +23,14 @@ class Game:
self.expansions = [] self.expansions = []
def notify_room(self): def notify_room(self):
self.sio.emit('room', room=self.name, data={ if len([p for p in self.players if p.character == None]) != 0:
'name': self.name, self.sio.emit('room', room=self.name, data={
'started': self.started, 'name': self.name,
'players': [{'name':p.name, 'ready': False} for p in self.players], 'started': self.started,
'password': self.password, 'players': [{'name':p.name, 'ready': p.character != None} for p in self.players],
'expansions': self.expansions, 'password': self.password,
}) 'expansions': self.expansions,
})
def toggle_expansion(self, expansion_name): def toggle_expansion(self, expansion_name):
if not self.started: if not self.started:

7
frontend/src/components/Lobby.vue
View File

@ -132,7 +132,7 @@ export default {
let rotateAngle = (i) * offsetAngle let rotateAngle = (i) * offsetAngle
let size = 130 let size = 130
return { 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)`, style: `position:absolute;transform: rotate(${rotateAngle}deg) translate(0, -${size}pt) rotate(-${rotateAngle}deg) translate(${size}pt,${size}pt)`,
...x ...x
} }
@ -155,10 +155,13 @@ export default {
} }
}, },
getPlayerCard(player) { getPlayerCard(player) {
let icon = ''
if (!this.started) icon = '🤠'
else icon = player.ready !== undefined ? ((player.ready)?'👍': '🤔') : (player.is_sheriff ? '⭐' : player.icon)
return { return {
name: player.name, name: player.name,
number: ((this.username == player.name) ? this.$t('you') : (this.players[0].name == player.name) ? this.$t('owner') :'') + (player.dist ? `${player.dist}⛰` : ''), 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, is_character: true,
} }
}, },