make disconnected state

mafia-rust · Dec 18, 2023 · 4c0d4f8 · 4c0d4f8
1 parent d1f4e7c
commit 4c0d4f8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/client/src/game/gameManager.tsx b/client/src/game/gameManager.tsx
@@ -18,7 +18,7 @@ export function createGameManager(): GameManager {
         playerId: null,
 
         state: {
-            stateType: "outsideLobby"
+            stateType: "disconnected"
         },
 
         getMyName() {

diff --git a/client/src/game/gameState.d.tsx b/client/src/game/gameState.d.tsx
@@ -4,9 +4,11 @@ import { Role, RoleState } from "./roleState.d";
 import { RoleOutline } from "./roleListState.d";
 
 
-export type State = {
+export type State = Disconnected | OutsideLobbyState | LobbyState | GameState;
 
-} & (OutsideLobbyState | LobbyState | GameState);
+export type Disconnected = {
+    stateType: "disconnected"
+}
 
 export type OutsideLobbyState = {
     stateType: "outsideLobby"

diff --git a/client/src/game/messageListener.tsx b/client/src/game/messageListener.tsx
@@ -140,24 +140,24 @@ export default function messageListener(packet: ToClientPacket){
         break;
         case "roleList":
             //list of role list entriy
-            if(GAME_MANAGER.state.stateType !== "outsideLobby")
+            if(GAME_MANAGER.state.stateType === "lobby" || GAME_MANAGER.state.stateType === "game")
                 GAME_MANAGER.state.roleList = packet.roleList;
         break;
         case "roleOutline":
             //role list entriy
-            if(GAME_MANAGER.state.stateType !== "outsideLobby")
+            if(GAME_MANAGER.state.stateType === "lobby" || GAME_MANAGER.state.stateType === "game")
                 GAME_MANAGER.state.roleList[packet.index] = packet.roleOutline;
         break;
         case "phaseTime":
-            if(GAME_MANAGER.state.stateType !== "outsideLobby")
+            if(GAME_MANAGER.state.stateType === "lobby" || GAME_MANAGER.state.stateType === "game")
                 GAME_MANAGER.state.phaseTimes[packet.phase as keyof typeof GAME_MANAGER.state.phaseTimes] = packet.time;
         break;
         case "phaseTimes":
-            if(GAME_MANAGER.state.stateType !== "outsideLobby")
+            if(GAME_MANAGER.state.stateType === "lobby" || GAME_MANAGER.state.stateType === "game")
                 GAME_MANAGER.state.phaseTimes = packet.phaseTimeSettings;
         break;
         case "excludedRoles":
-            if(GAME_MANAGER.state.stateType !== "outsideLobby")
+            if(GAME_MANAGER.state.stateType === "lobby" || GAME_MANAGER.state.stateType === "game")
                 GAME_MANAGER.state.excludedRoles = packet.roles;
         break;
         case "phase":