Attempt to fix Game States. Edit is gone.

Author: drcrazy

artifacts/game-client/src/apps/adepts-game-2/hooks/useGameState.ts

@@ -26,6 +26,8 @@ export type GameState = {
   /** Текущий ход: индекс места игрока 0..4 */
   currentTurnSeat: number;
   quizBoardHoverCell?: QuizBoardHoverCell;
+  /** Идентификатор доски — проверяется в sync-обработчике для отклонения данных чужой доски */
+  boardRoom?: string;
 };
 
 function gd(id: string) {
@@ -382,8 +384,10 @@ export function useGameState() {
         hadRoster &&
         typeof localStorage !== "undefined" &&
         localStorage.getItem("player_role") === "host";
+      const isSameBoard = incoming.boardRoom === ROOM;
       const nextState = {
         ...incoming,
+        themes: isSameBoard ? (incoming.themes ?? DEFAULT_STATE.themes) : DEFAULT_STATE.themes,
         players: merged,
         activeQuizCard: incoming.activeQuizCard ?? null,
         currentTurnSeat: hostResetTurn
@@ -394,15 +398,17 @@ export function useGameState() {
         questions: DEFAULT_STATE.questions.map((themeQs, tIdx) =>
           themeQs.map((defaultQ, qIdx) => ({
             ...defaultQ,
-            used: incoming.questions?.[tIdx]?.[qIdx]?.used ?? defaultQ.used,
+            used: isSameBoard
+              ? (incoming.questions?.[tIdx]?.[qIdx]?.used ?? defaultQ.used)
+              : defaultQ.used,
           }))
         ),
       };
       skipEmitRef.current = true;
       setState(nextState);
       if (hadRoster) {
         skipEmitRef.current = false;
-        queueMicrotask(() => socketRef.current?.emit("update", nextState));
+        queueMicrotask(() => socketRef.current?.emit("update", { ...nextState, boardRoom: ROOM }));
       }
     });
 
@@ -421,7 +427,7 @@ export function useGameState() {
       return;
     }
 
-    socketRef.current?.emit("update", state);
+    socketRef.current?.emit("update", { ...state, boardRoom: ROOM });
   }, [state]);
 
   useEffect(() => {

artifacts/game-client/src/apps/adepts-game-3/hooks/useGameState.ts

@@ -26,6 +26,8 @@ export type GameState = {
   /** Текущий ход: индекс места игрока 0..4 */
   currentTurnSeat: number;
   quizBoardHoverCell?: QuizBoardHoverCell;
+  /** Идентификатор доски — проверяется в sync-обработчике для отклонения данных чужой доски */
+  boardRoom?: string;
 };
 
 function gd(id: string) {
@@ -568,8 +570,10 @@ export function useGameState() {
         hadRoster &&
         typeof localStorage !== "undefined" &&
         localStorage.getItem("player_role") === "host";
+      const isSameBoard = incoming.boardRoom === ROOM;
       const nextState = {
         ...incoming,
+        themes: isSameBoard ? (incoming.themes ?? DEFAULT_STATE.themes) : DEFAULT_STATE.themes,
         players: merged,
         activeQuizCard: incoming.activeQuizCard ?? null,
         currentTurnSeat: hostResetTurn
@@ -580,15 +584,17 @@ export function useGameState() {
         questions: DEFAULT_STATE.questions.map((themeQs, tIdx) =>
           themeQs.map((defaultQ, qIdx) => ({
             ...defaultQ,
-            used: incoming.questions?.[tIdx]?.[qIdx]?.used ?? defaultQ.used,
+            used: isSameBoard
+              ? (incoming.questions?.[tIdx]?.[qIdx]?.used ?? defaultQ.used)
+              : defaultQ.used,
           }))
         ),
       };
       skipEmitRef.current = true;
       setState(nextState);
       if (hadRoster) {
         skipEmitRef.current = false;
-        queueMicrotask(() => socketRef.current?.emit("update", nextState));
+        queueMicrotask(() => socketRef.current?.emit("update", { ...nextState, boardRoom: ROOM }));
       }
     });
 
@@ -607,7 +613,7 @@ export function useGameState() {
       return;
     }
 
-    socketRef.current?.emit("update", state);
+    socketRef.current?.emit("update", { ...state, boardRoom: ROOM });
   }, [state]);
 
   useEffect(() => {

artifacts/game-client/src/apps/adepts-game/hooks/useGameState.ts

@@ -29,6 +29,8 @@ export type GameState = {
   /** Подсветка ячейки доски под курсором ведущего / игрока с ходом */
   quizBoardHoverCell?: QuizBoardHoverCell;
   dataVersion?: number;
+  /** Идентификатор доски — проверяется в sync-обработчике для отклонения данных чужой доски */
+  boardRoom?: string;
 };
 
 const DEFAULT_STATE: GameState = {
@@ -226,21 +228,31 @@ export function useGameState() {
         hadRoster &&
         typeof localStorage !== "undefined" &&
         localStorage.getItem("player_role") === "host";
+      const isSameBoard = incoming.boardRoom === ROOM;
       const nextState = restoreLegacyWheelCards({
         ...incoming,
+        themes: isSameBoard ? (incoming.themes ?? DEFAULT_STATE.themes) : DEFAULT_STATE.themes,
         players: merged,
         activeQuizCard: incoming.activeQuizCard ?? null,
         currentTurnSeat: hostResetTurn
           ? 0
           : Number.isInteger(incoming.currentTurnSeat)
             ? ((Number(incoming.currentTurnSeat) % 5) + 5) % 5
             : 0,
+        questions: DEFAULT_STATE.questions.map((themeQs, tIdx) =>
+          themeQs.map((defaultQ, qIdx) => ({
+            ...defaultQ,
+            used: isSameBoard
+              ? (incoming.questions?.[tIdx]?.[qIdx]?.used ?? defaultQ.used)
+              : defaultQ.used,
+          }))
+        ),
       });
       skipEmitRef.current = true;
       setState(nextState);
       if (hadRoster) {
         skipEmitRef.current = false;
-        queueMicrotask(() => socketRef.current?.emit("update", nextState));
+        queueMicrotask(() => socketRef.current?.emit("update", { ...nextState, boardRoom: ROOM }));
       }
     });
 
@@ -260,7 +272,7 @@ export function useGameState() {
       return;
     }
 
-    socketRef.current?.emit("update", state);
+    socketRef.current?.emit("update", { ...state, boardRoom: ROOM });
   }, [state]);
 
   // Cross-tab sync via StorageEvent (same machine, different tabs)