From 8261112b52452a38a2db64f35917f4840625037c Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Sun, 27 Dec 2020 13:52:36 +0100 Subject: [PATCH] show who is a bot --- backend/bang/cards.py | 2 +- backend/bang/game.py | 6 ++++-- frontend/src/components/Card.vue | 3 ++- frontend/src/components/Lobby.vue | 4 ++++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/backend/bang/cards.py b/backend/bang/cards.py index 18ed6c9..cd52f2c 100644 --- a/backend/bang/cards.py +++ b/backend/bang/cards.py @@ -128,7 +128,7 @@ class Prigione(Card): self.desc = "Equipaggia questa carta a un altro giocatore, tranne lo Sceriffo. Il giocatore scelto all'inizio del suo turno, prima di pescare dovrà estrarre: se esce Cuori scarta questa carta e gioca normalmente il turno, altrimenti scarta questa carta e salta il turno" self.desc_eng = "Equip this card to another player, except the Sheriff. The player chosen at the beginning of his turn, must flip a card before drawing: if it's Hearts, discard this card and play the turn normally, otherwise discard this card and skip the turn" self.need_target = True - self.alt_text = "♥️=🆓" + self.alt_text = "♥️= 🆓" def play_card(self, player, against, _with=None): if against != None and not isinstance(player.game.get_player_named(against).role, r.Sheriff): diff --git a/backend/bang/game.py b/backend/bang/game.py index ff57d4e..8d00c57 100644 --- a/backend/bang/game.py +++ b/backend/bang/game.py @@ -43,12 +43,12 @@ class Game: self.sio.emit('room', room=self.name if not sid else sid, data={ 'name': self.name, 'started': self.started, - 'players': [{'name':p.name, 'ready': p.character != None} for p in self.players], + 'players': [{'name':p.name, 'ready': p.character != None, 'is_bot': p.is_bot} for p in self.players], 'password': self.password, 'is_competitive': self.is_competitive, 'disconnect_bot': self.disconnect_bot, 'expansions': self.expansions, - 'available_expansions': self.available_expansions + 'available_expansions': self.available_expansions, }) def toggle_expansion(self, expansion_name): @@ -527,6 +527,7 @@ class Game: 'is_sheriff': isinstance(pls[j].role, roles.Sheriff), 'cards': len(pls[j].hand)+len(pls[j].equipment), 'is_ghost': pls[j].is_ghost, + 'is_bot': pls[j].is_bot, } for j in range(len(pls)) if i != j] def get_alive_players(self): @@ -550,5 +551,6 @@ class Game: 'real_character': p.real_character.__dict__ if p.real_character else None, 'icon': p.role.icon if self.initial_players == 3 and p.role else '🤠', 'is_ghost': p.is_ghost, + 'is_bot': p.is_bot, } for p in self.get_alive_players()] self.sio.emit('players_update', room=self.name, data=data) diff --git a/frontend/src/components/Card.vue b/frontend/src/components/Card.vue index 091739e..b541e76 100644 --- a/frontend/src/components/Card.vue +++ b/frontend/src/components/Card.vue @@ -103,7 +103,8 @@ export default { text-align: center; width: 100%; top: -10pt; -} + font-size: 11pt; +} .card .emoji { position: absolute; text-align: center; diff --git a/frontend/src/components/Lobby.vue b/frontend/src/components/Lobby.vue index eb8ce58..a43cf03 100644 --- a/frontend/src/components/Lobby.vue +++ b/frontend/src/components/Lobby.vue @@ -31,6 +31,9 @@
+
+ 🤖 +
@@ -116,6 +119,7 @@ export default { return { name: x.name, ready: x.ready, + is_bot: x.is_bot, ncards: 0, } })