помолимся чтобы работало - СУПЕР ИГРА ЧЕК!!!

Author: GGLast

artifacts/api-server/build.mjs

@@ -119,7 +119,7 @@ globalThis.__dirname = __bannerPath.dirname(globalThis.__filename);
     },
   });
 
-  for (const id of [1, 2, 3]) {
+  for (const id of [1, 2, 3, 4]) {
     await cp(
       path.resolve(artifactDir, `src/lib/default-adepts-quiz-board-${id}.json`),
       path.resolve(distDir, `default-adepts-quiz-board-${id}.json`),

artifacts/api-server/data/adepts-quiz-board-4.json

@@ -0,0 +1,31 @@
+{
+  "themes": ["СУПЕР ИГРА!"],
+  "questions": [
+    [
+      {
+        "text": "",
+        "questionUrl": "/super-game-card-1.png",
+        "answerText": "",
+        "answerUrl": ""
+      },
+      {
+        "text": "",
+        "questionUrl": "/super-game-card-2.png",
+        "answerText": "",
+        "answerUrl": ""
+      },
+      {
+        "text": "",
+        "questionUrl": "/super-game-card-3.png",
+        "answerText": "",
+        "answerUrl": ""
+      },
+      {
+        "text": "",
+        "questionUrl": "/super-game-card-4.png",
+        "answerText": "",
+        "answerUrl": ""
+      }
+    ]
+  ]
+}

artifacts/api-server/src/adepts-quiz-board-routes.ts

@@ -26,14 +26,15 @@ function boardIdFromReq(
   const raw = req.params["boardId"];
   const id = parsePersistedBoardId(raw);
   if (!id) {
-    res.status(400).json({ ok: false, error: "boardId must be 1, 2, or 3" });
+    res.status(400).json({ ok: false, error: "boardId must be 1, 2, 3, or 4" });
     return null;
   }
   return id;
 }
 
 function parsePutBody(
-  body: unknown
+  body: unknown,
+  boardId: AdeptsPersistedBoardId
 ): { ok: true; board: AdeptsQuizBoardPersisted } | { ok: false; error: string } {
   if (!body || typeof body !== "object") {
     return { ok: false, error: "JSON body required" };
@@ -83,13 +84,26 @@ function parsePutBody(
     if (themes.length === 0) {
       return { ok: false, error: "At least one theme required" };
     }
-    for (const row of questions) {
-      if (row.length !== 5) {
-        return { ok: false, error: "Each theme must have exactly 5 questions" };
+    if (boardId === 4) {
+      if (themes.length !== 1) {
+        return { ok: false, error: "Board 4 must have exactly 1 theme" };
+      }
+      const r0 = questions[0];
+      if (!Array.isArray(r0) || r0.length !== 4) {
+        return { ok: false, error: "Board 4 must have exactly 4 questions in the single row" };
+      }
+      if (questions.length !== 1) {
+        return { ok: false, error: "Board 4 must have exactly one questions row" };
+      }
+    } else {
+      for (const row of questions) {
+        if (row.length !== 5) {
+          return { ok: false, error: "Each theme must have exactly 5 questions" };
+        }
+      }
+      if (questions.length !== themes.length) {
+        return { ok: false, error: "themes length must match questions rows" };
       }
-    }
-    if (questions.length !== themes.length) {
-      return { ok: false, error: "themes length must match questions rows" };
     }
     const board: AdeptsQuizBoardPersisted = {
       themes,
@@ -138,7 +152,7 @@ export function attachAdeptsQuizBoardRoutes(app: Express): void {
     } else {
       id = 1;
     }
-    const parsed = parsePutBody(req.body);
+    const parsed = parsePutBody(req.body, id);
     if (!parsed.ok) {
       res.status(400).json({ ok: false, error: parsed.error });
       return;

artifacts/api-server/src/adepts.ts

@@ -12,6 +12,10 @@ import {
   applyPickCell,
   applyPlayerDonation,
   applyHostMounts400DedDonationDoubleReward,
+  applySuperTttPick,
+  applySuperTttResetBoard,
+  applyBoard4LeaveReset,
+  applyCloseSuperGameCard,
   clearHideDonationsTableOnBoard3,
   cloneQuizRelay,
   getQuizRelayOrDefault,
@@ -213,6 +217,66 @@ export function setupAdepts(io: Server): void {
           run();
           return;
         }
+        case "superTttPick": {
+          const seatResolved = resolvePickSeat(socket, cmd, host);
+          if (!host && seatResolved === null) {
+            logger.warn({ sessionId, socketId: socket.id }, "superTttPick rejected: no seat");
+            return;
+          }
+          const seatForPick = host ? (seatResolved ?? seat ?? 0) : seatResolved!;
+          const cellRaw = cmd["cellIndex"];
+          const cellIndex = typeof cellRaw === "number" ? cellRaw : Number(cellRaw);
+          const r = applySuperTttPick(sessionId, seatForPick, cellIndex, { hostBypass: host });
+          if (!r.ok) {
+            logger.warn(
+              { sessionId, socketId: socket.id, err: r.error, cellIndex, seat: seatForPick },
+              "superTttPick rejected",
+            );
+            return;
+          }
+          run();
+          return;
+        }
+        case "superTttResetBoard": {
+          if (!host) return;
+          const r = applySuperTttResetBoard(sessionId);
+          if (!r.ok) {
+            logger.warn({ sessionId, socketId: socket.id, err: r.error }, "superTttResetBoard rejected");
+            return;
+          }
+          run();
+          return;
+        }
+        case "board4LeaveReset": {
+          if (!host) return;
+          const r = applyBoard4LeaveReset(sessionId);
+          if (!r.ok) {
+            logger.warn({ sessionId, socketId: socket.id, err: r.error }, "board4LeaveReset rejected");
+            return;
+          }
+          run();
+          return;
+        }
+        case "closeSuperGameCard": {
+          const seatResolved = resolvePickSeat(socket, cmd, host);
+          if (!host && seatResolved === null) {
+            logger.warn({ sessionId, socketId: socket.id }, "closeSuperGameCard rejected: no seat");
+            return;
+          }
+          const seatForCmd = host ? (seatResolved ?? seat ?? 0) : seatResolved!;
+          const t = Number(cmd["themeIndex"]);
+          const q = Number(cmd["questionIndex"]);
+          const r = applyCloseSuperGameCard(sessionId, seatForCmd, t, q, { hostBypass: host });
+          if (!r.ok) {
+            logger.warn(
+              { sessionId, socketId: socket.id, err: r.error, themeIndex: t, questionIndex: q },
+              "closeSuperGameCard rejected",
+            );
+            return;
+          }
+          run();
+          return;
+        }
         case "playerDonation": {
           if (host) return;
           if (!socketClaimsPlayerRole(socket)) return;

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

@@ -13,8 +13,8 @@ import type {
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
-/** Persisted quiz boards: round 1–3 match `AdeptsBoardId` in the game client. */
-export type AdeptsPersistedBoardId = 1 | 2 | 3;
+/** Persisted quiz boards: ids match `AdeptsBoardId` in the game client. */
+export type AdeptsPersistedBoardId = 1 | 2 | 3 | 4;
 
 const QUESTION_KEYS: (keyof AdeptsQuizQuestionPersisted)[] = [
   "text",
@@ -31,7 +31,7 @@ const QUESTION_KEYS: (keyof AdeptsQuizQuestionPersisted)[] = [
 
 export function parsePersistedBoardId(raw: unknown): AdeptsPersistedBoardId | null {
   const n = typeof raw === "string" ? Number(raw) : typeof raw === "number" ? raw : NaN;
-  if (n === 1 || n === 2 || n === 3) return n;
+  if (n === 1 || n === 2 || n === 3 || n === 4) return n;
   return null;
 }
 
@@ -51,7 +51,7 @@ export function persistedDataFilePath(boardId: AdeptsPersistedBoardId): string {
   return path.resolve(process.cwd(), "data", `adepts-quiz-board-${boardId}.json`);
 }
 
-function parseBoardJson(raw: string): AdeptsQuizBoardPersisted {
+function parseBoardJson(raw: string, boardId: AdeptsPersistedBoardId): AdeptsQuizBoardPersisted {
   const data = JSON.parse(raw) as unknown;
   if (!data || typeof data !== "object") throw new Error("Invalid board JSON");
   const o = data as Record<string, unknown>;
@@ -64,11 +64,18 @@ function parseBoardJson(raw: string): AdeptsQuizBoardPersisted {
     return row.map((cell) => normalizeQuestion(cell));
   });
   if (themes.length === 0) throw new Error("At least one theme required");
-  for (const row of questions) {
-    if (row.length !== 5) throw new Error("Each theme must have exactly 5 questions");
-  }
-  if (questions.length !== themes.length) {
-    throw new Error("themes and questions row counts must match");
+  if (boardId === 4) {
+    if (themes.length !== 1) throw new Error("Board 4 must have exactly 1 theme row");
+    const row = questions[0];
+    if (!row || row.length !== 4) throw new Error("Board 4 must have exactly 4 question cells");
+    if (questions.length !== 1) throw new Error("themes and questions row counts must match");
+  } else {
+    for (const row of questions) {
+      if (row.length !== 5) throw new Error("Each theme must have exactly 5 questions");
+    }
+    if (questions.length !== themes.length) {
+      throw new Error("themes and questions row counts must match");
+    }
   }
   return { themes, questions };
 }
@@ -144,7 +151,7 @@ function ensurePersistedFileFromSeed(boardId: AdeptsPersistedBoardId): void {
   const dir = path.dirname(target);
   mkdirSync(dir, { recursive: true });
   const seed = readFileSync(seedFilePath(boardId), "utf8");
-  parseBoardJson(seed);
+  parseBoardJson(seed, boardId);
   writeFileSync(target, seed, "utf8");
 }
 
@@ -163,7 +170,7 @@ export function readAdeptsQuizBoard(boardId: AdeptsPersistedBoardId): AdeptsQuiz
   ensurePersistedFileFromSeed(boardId);
   const target = persistedDataFilePath(boardId);
   const raw = readFileSync(target, "utf8");
-  return parseBoardJson(raw);
+  return parseBoardJson(raw, boardId);
 }
 
 export function writeAdeptsQuizBoard(
@@ -212,7 +219,8 @@ export function patchQuestionCell(
     ) {
       throw new Error("Invalid theme index");
     }
-    if (!Number.isInteger(questionIndex) || questionIndex < 0 || questionIndex >= 5) {
+    const rowLen = board.questions[themeIndex]!.length;
+    if (!Number.isInteger(questionIndex) || questionIndex < 0 || questionIndex >= rowLen) {
       throw new Error("Invalid question index");
     }
     const row = [...board.questions[themeIndex]!];

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

@@ -22,9 +22,24 @@ export type AdeptsDonationLogEntry = {
   seatIndex?: number;
 };
 
+export type AdeptsSuperTttMark = "X" | "O";
+
+/** Крестики-нолики 5×5: победа — линия из 4 символов (после 4 карточек на доске 4). */
+export type AdeptsSuperTttState = {
+  cells: (AdeptsSuperTttMark | null)[];
+  nextIsX: boolean;
+  seatX: number;
+  seatO: number;
+};
+
+export type AdeptsSuperTttWinner = {
+  nick: string;
+  atMs: number;
+};
+
 export type AdeptsQuizRelayPayload = {
   boardRoom: string;
-  /** Board id (1 | 2 | 3). Used to detect cross-board relay contamination. */
+  /** Board id (1–4). Used to detect cross-board relay contamination. */
   boardId?: number;
   players: AdeptsRelayPlayer[];
   activeQuizCard: AdeptsRelayActiveCard | null;
@@ -39,9 +54,15 @@ export type AdeptsQuizRelayPayload = {
   donationLog?: AdeptsDonationLogEntry[];
   /** После бонуса ×2 с «деда» на 400 — скрыть таблицу на квиз-доске 3; сброс при входе на похороны. */
   hideDonationsTableOnBoard3?: boolean;
-  /** Титры (квиз-доска 3); обновляется только если поле присутствует в relay от доски 3. */
+  /** Титры (квиз-доски 3 и 4); в relay от досок 1/2 не приходят — сервер сбрасывает. */
   creditsRollActive?: boolean;
   creditsRollStartedAt?: number;
+  /** Доска «СУПЕР ИГРА!» (id 4): поле 5 клеток после открытия всех карточек. */
+  superTtt?: AdeptsSuperTttState | null;
+  /** Победитель крестиков-ноликов (оверлей ~5 с). */
+  superTttWinner?: AdeptsSuperTttWinner | null;
+  /** Доска 4: место игрока, открывшего верхнюю правую карточку (тема 0, вопрос 1 в сетке 2×2) — ○ против лидера (✕). */
+  superBoardFourKeyOpenerSeat?: number | null;
 };
 
 const THEME_COUNT = 8;