From 47c2d2e297117330f663e77f03b8186006d5d43f Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Tue, 10 Jan 2023 17:10:06 +0000 Subject: [PATCH 1/2] fix ui issues --- frontend/src/components/Chat.vue | 5 +++-- frontend/src/components/Lobby.vue | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/Chat.vue b/frontend/src/components/Chat.vue index c8c85e3..15ace39 100644 --- a/frontend/src/components/Chat.vue +++ b/frontend/src/components/Chat.vue @@ -5,7 +5,7 @@

{{$t("chat.chat")}}

-

{{$tc("chat.spectators", spectators)}}

+

{{$tc("chat.spectators", spectators)}}

@@ -178,6 +178,7 @@ input { .chat, .cont { display: flex; flex-direction: column; + max-height: 90vh; } #msg-form { width:100%; @@ -197,7 +198,7 @@ input { margin-left: 10pt; } .chat, .cont { - height: 90vh; + height: 88vh; margin-left: 10pt; } #submit-message { diff --git a/frontend/src/components/Lobby.vue b/frontend/src/components/Lobby.vue index f29a790..e31319a 100644 --- a/frontend/src/components/Lobby.vue +++ b/frontend/src/components/Lobby.vue @@ -329,7 +329,6 @@ export default { this.$socket.emit('start_game') }, shufflePlayers() { - this.started = true; this.$socket.emit('shuffle_players') }, choose(player_name) { From 7767f75604b936d4fcbe1bd91b9b00263d071b90 Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Tue, 10 Jan 2023 20:16:49 +0000 Subject: [PATCH 2/2] fix ghost card on ghost town --- backend/bang/players.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/bang/players.py b/backend/bang/players.py index 641892f..71adbf1 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -211,8 +211,8 @@ class Player: def notify_self(self): if any((True for c in self.equipment if isinstance(c, tvosc.Fantasma))): self.is_ghost = True - elif self.is_ghost and not self.game.check_event(ceh.CittaFantasma): - self.is_ghost = False + elif self.is_ghost: + self.is_ghost = self.game.check_event(ceh.CittaFantasma) and self.is_my_turn if self.is_ghost: self.lives = 0 if self.pending_action == PendingAction.DRAW and self.game.check_event(ce.Peyote): self.available_cards = [{