Merge branch 'main' into dev

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 = [{

frontend/src/components/Chat.vue

@@ -5,7 +5,7 @@
 				<h3>{{$t("chat.chat")}}</h3>
 				<button class="btn" @click="collapsed = !collapsed" style="max-height:20pt;">{{collapsed?">>":"X"}}</button>
 			</div>
-			<h4 v-if="spectators > 0">{{$tc("chat.spectators", spectators)}}</h4>
+			<h4 v-if="spectators > 0" style="margin:0">{{$tc("chat.spectators", spectators)}}</h4>
 		</div>
 		<div class="cont">
 			<transition-group name="message" tag="div" id="chatbox" :style="`${collapsed?'display:none':''}`">
@@ -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 {

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) {