прикрутил титры

Author: GGLast

artifacts/api-server/src/lib/adepts-quiz-relay-types.ts

@@ -39,6 +39,9 @@ export type AdeptsQuizRelayPayload = {
   donationLog?: AdeptsDonationLogEntry[];
   /** После бонуса ×2 с «деда» на 400 — скрыть таблицу на квиз-доске 3; сброс при входе на похороны. */
   hideDonationsTableOnBoard3?: boolean;
+  /** Титры (квиз-доска 3); обновляется только если поле присутствует в relay от доски 3. */
+  creditsRollActive?: boolean;
+  creditsRollStartedAt?: number;
 };
 
 const THEME_COUNT = 8;

artifacts/api-server/src/lib/adepts-quiz-room-store.ts

@@ -115,6 +115,30 @@ export function setQuizRelayFull(sessionId: string, payload: AdeptsQuizRelayPayl
   if (typeof payload.hideDonationsTableOnBoard3 === "boolean") {
     base.hideDonationsTableOnBoard3 = payload.hideDonationsTableOnBoard3;
   }
+
+  /**
+   * Титры только на квиз-доске 3: relay с доски 1 или 2 не несёт полей титров — сбрасываем,
+   * чтобы при переходе между досками титры не оставались «включёнными» на сервере.
+   */
+  if (incomingBoardId === 1 || incomingBoardId === 2) {
+    base.creditsRollActive = false;
+    delete base.creditsRollStartedAt;
+  } else {
+    const pExtra = payload as Record<string, unknown>;
+    if ("creditsRollActive" in pExtra) {
+      base.creditsRollActive = pExtra["creditsRollActive"] === true;
+      if (!base.creditsRollActive) {
+        delete base.creditsRollStartedAt;
+      }
+    }
+    if (
+      "creditsRollStartedAt" in pExtra &&
+      typeof pExtra["creditsRollStartedAt"] === "number" &&
+      Number.isFinite(pExtra["creditsRollStartedAt"])
+    ) {
+      base.creditsRollStartedAt = Math.floor(pExtra["creditsRollStartedAt"] as number);
+    }
+  }
   // (lean relay, same board) → keep existing catalog intact so clients that connect later
   // still receive the most recently edited catalog for this board.
 }

artifacts/game-client/public/credits-kung-fu-fighting.mp3

@@ -51,6 +51,9 @@ export type GameState = {
   donationLog: DonationLogEntry[];
   /** После ×2 с деда на 400 — скрыть таблицу на 3-й доске; сброс при входе на похороны (сервер). */
   hideDonationsTableOnBoard3?: boolean;
+  /** Титры после игры (только квиз-доска 3). */
+  creditsRollActive?: boolean;
+  creditsRollStartedAt?: number;
 };
 
 const DEFAULT_PLAYERS: Player[] = Array.from({ length: 5 }, (_, i) => ({
@@ -86,6 +89,8 @@ const DEFAULT_CORE: Omit<GameState, "themes" | "questions"> = {
   boardRoom: undefined,
   donationLog: [...DEFAULT_DONATION_LOG],
   hideDonationsTableOnBoard3: false,
+  creditsRollActive: false,
+  creditsRollStartedAt: undefined,
 };
 
 const PLAYERS_KEY = "adepts-shared-players";
@@ -384,6 +389,9 @@ function loadInitialState(boardId: AdeptsBoardId): GameState {
           typeof parsed.hideDonationsTableOnBoard3 === "boolean"
             ? parsed.hideDonationsTableOnBoard3
             : false,
+        /** Титры не восстанавливаем из localStorage — только по кнопке «Титры». */
+        creditsRollActive: false,
+        creditsRollStartedAt: undefined,
       });
     }
   } catch (err) {
@@ -541,6 +549,30 @@ export function useGameState(boardId: AdeptsBoardId) {
         const nextHideDonationsTableOnBoard3 =
           typeof rawHide === "boolean" ? rawHide : (prev.hideDonationsTableOnBoard3 ?? false);
 
+        const nextCredits =
+          boardId !== 3
+            ? { creditsRollActive: false, creditsRollStartedAt: undefined as number | undefined }
+            : boardMismatch
+              ? {
+                  /** Relay с другой доски (1/2): титры не переносим; сервер уже сбросил credits. */
+                  creditsRollActive: false,
+                  creditsRollStartedAt: undefined,
+                }
+              : (() => {
+                  const active = recToUse["creditsRollActive"] === true;
+                  const rawAt = recToUse["creditsRollStartedAt"];
+                  const at =
+                    typeof rawAt === "number" && Number.isFinite(rawAt)
+                      ? Math.floor(rawAt)
+                      : active
+                        ? prev.creditsRollStartedAt
+                        : undefined;
+                  return {
+                    creditsRollActive: active,
+                    creditsRollStartedAt: active ? at : undefined,
+                  };
+                })();
+
         let nextState = withClosedActiveQuizIfCellUsed(
           migrateCatalog(boardId, {
             ...prev,
@@ -557,6 +589,8 @@ export function useGameState(boardId: AdeptsBoardId) {
             dataVersion:
               typeof recToUse["dataVersion"] === "number" ? recToUse["dataVersion"] : prev.dataVersion,
             hideDonationsTableOnBoard3: nextHideDonationsTableOnBoard3,
+            creditsRollActive: nextCredits.creditsRollActive,
+            creditsRollStartedAt: nextCredits.creditsRollStartedAt,
           })
         );
 
@@ -608,7 +642,11 @@ export function useGameState(boardId: AdeptsBoardId) {
   }, [boardId, adeptsSocketKey]);
 
   useEffect(() => {
-    localStorage.setItem(rt.storageKey, JSON.stringify(state));
+    const persisted: GameState =
+      boardId === 3
+        ? { ...state, creditsRollActive: false, creditsRollStartedAt: undefined }
+        : state;
+    localStorage.setItem(rt.storageKey, JSON.stringify(persisted));
     localStorage.setItem(PLAYERS_KEY, JSON.stringify(state.players));
     localStorage.setItem(DONATION_LOG_KEY, JSON.stringify(state.donationLog));
 
@@ -626,15 +664,20 @@ export function useGameState(boardId: AdeptsBoardId) {
       type: "hostQuizRelay",
       payload: buildAdeptsQuizRelayPayload(state, getAdeptsSessionId(), includeCatalog, boardId),
     });
-  }, [state, catalogReady, rt.storageKey]);
+  }, [state, catalogReady, rt.storageKey, boardId]);
 
   useEffect(() => {
     const storageKey = rt.storageKey;
     const handler = (e: StorageEvent) => {
       if (e.key === storageKey && e.newValue) {
         try {
           skipEmitRef.current = true;
-          setState(JSON.parse(e.newValue));
+          const parsed = JSON.parse(e.newValue) as GameState;
+          if (boardId === 3) {
+            parsed.creditsRollActive = false;
+            parsed.creditsRollStartedAt = undefined;
+          }
+          setState(parsed);
         } catch {}
       }
       if (e.key === PLAYERS_KEY && e.newValue) {
@@ -830,6 +873,18 @@ export function useGameState(boardId: AdeptsBoardId) {
     getAdeptsCommandSocket().emit("command", { type: "playerDonation", amount });
   }, []);
 
+  const setBoard3CreditsRoll = useCallback(
+    (active: boolean) => {
+      if (boardId !== 3 || !isHostRole()) return;
+      setState((prev) => ({
+        ...prev,
+        creditsRollActive: active,
+        creditsRollStartedAt: active ? Date.now() : undefined,
+      }));
+    },
+    [boardId],
+  );
+
   const emitPickCell = useCallback(
     (themeIndex: number, questionIndex: number, opts?: { turnSeat?: number }) => {
       /**
@@ -869,5 +924,6 @@ export function useGameState(boardId: AdeptsBoardId) {
     resetGame,
     emitPickCell,
     submitPlayerDonation,
+    setBoard3CreditsRoll,
   };
 }

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

@@ -11,6 +11,8 @@ import { useRole } from "@/hooks/useRole";
 import { ChatPanel } from "@/components/ChatPanel";
 import { QuizBoardPandoraLottoOverlay } from "@/components/QuizBoardPandoraLottoOverlay";
 import { DonationsTable } from "@/components/DonationsTable";
+import { AdeptsCreditsRollOverlay } from "@/components/AdeptsCreditsRollOverlay";
+import { Button } from "@/components/ui/button";
 import { getAdeptsCommandSocket } from "@/lib/adeptsCommandSocket";
 import { getQuizNavSocket } from "@/hooks/quizNavSocket";
 
@@ -65,6 +67,7 @@ export default function Home({ boardId }: { boardId: AdeptsBoardId }) {
     patchActiveQuizCard,
     setQuizBoardHoverCell,
     emitPickCell,
+    setBoard3CreditsRoll,
   } = useGameState(boardId);
 
   const handleAwardPoints = (playerIndex: number, points: number) => {
@@ -165,9 +168,22 @@ export default function Home({ boardId }: { boardId: AdeptsBoardId }) {
         <h1 className="font-display text-2xl tracking-wider text-primary glow-text">
           САМЫЙ ДУШНЫЙ 3.0
         </h1>
-        <span className="adepts-quiz-badge text-sm font-display tracking-wider text-primary/80 border border-primary/40 px-3 py-1.5 rounded">
-          {BADGE_LABEL[boardId]}
-        </span>
+        <div className="flex flex-wrap items-center gap-2">
+          <span className="adepts-quiz-badge text-sm font-display tracking-wider text-primary/80 border border-primary/40 px-3 py-1.5 rounded">
+            {BADGE_LABEL[boardId]}
+          </span>
+          {boardId === 3 && isHost ? (
+            <Button
+              type="button"
+              variant="outline"
+              size="sm"
+              className="font-display text-xs uppercase tracking-wider border-primary/50 text-primary/90 hover:bg-primary/10"
+              onClick={() => setBoard3CreditsRoll(true)}
+            >
+              Титры
+            </Button>
+          ) : null}
+        </div>
         <div className="ml-auto flex items-center gap-2">
           <QuizBoardReloadButton />
           {isHost && <GamePhaseNav />}
@@ -337,6 +353,15 @@ export default function Home({ boardId }: { boardId: AdeptsBoardId }) {
       )}
 
       <QuizBoardPandoraLottoOverlay />
+
+      {boardId === 3 && state.creditsRollActive === true ? (
+        <AdeptsCreditsRollOverlay
+          open
+          startedAt={state.creditsRollStartedAt}
+          isHost={isHost}
+          onHostClose={() => setBoard3CreditsRoll(false)}
+        />
+      ) : null}
     </div>
   );
 }