добавлено начисление после благословления ДЕДОМ

Author: GGLast

artifacts/api-server/src/adepts.ts

@@ -11,6 +11,7 @@ import {
   applyActiveQuizPatch,
   applyPickCell,
   applyPlayerDonation,
+  applyHostMounts400DedDonationDoubleReward,
   cloneQuizRelay,
   getQuizRelayOrDefault,
 } from "./lib/adepts-quiz-room-store";
@@ -295,6 +296,22 @@ export function setupAdepts(io: Server): void {
           run();
           return;
         }
+        case "hostMounts400DedDonationBonus": {
+          if (!host) return;
+          const ti = Number(cmd["themeIndex"]);
+          const qi = Number(cmd["questionIndex"]);
+          if (!Number.isFinite(ti) || !Number.isFinite(qi)) return;
+          const r = applyHostMounts400DedDonationDoubleReward(sessionId, ti, qi);
+          if (!r.ok) {
+            logger.warn(
+              { sessionId, socketId: socket.id, err: r.error, themeIndex: ti, questionIndex: qi },
+              "hostMounts400DedDonationBonus rejected",
+            );
+            return;
+          }
+          run();
+          return;
+        }
         case "hostClearActiveCard": {
           if (!host) return;
           applyHostClearActiveCard(sessionId);

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

@@ -105,6 +105,10 @@ export function setQuizRelayFull(sessionId: string, payload: AdeptsQuizRelayPayl
     delete base.themes;
     delete base.questions;
   }
+  /** Каждый lean-relay от ведущего несёт `themes` — обновляем подписи без полного каталога. */
+  if (Array.isArray(payload.themes) && payload.themes.length > 0) {
+    base.themes = payload.themes.map((x) => String(x ?? "").trim().slice(0, 64));
+  }
   // (lean relay, same board) → keep existing catalog intact so clients that connect later
   // still receive the most recently edited catalog for this board.
 }
@@ -315,6 +319,44 @@ export function applySeatNickRosterToQuizRelay(sessionId: string, seatNicks: str
   }
 }
 
+/**
+ * Карточка на 400 (индекс вопроса 3): клик ведущего по «деду» (dedFly) — +2× сумма пожертвования на **место**
+ * (0–4) из журнала. Текущий игрок на месте получает очки. Название темы на сервере не проверяем (часто пусто
+ * или другое написание). Строки без `seatIndex` игнорируются.
+ */
+export function applyHostMounts400DedDonationDoubleReward(
+  sessionId: string,
+  themeIndex: number,
+  questionIndex: number,
+): { ok: true } | { ok: false; error: string } {
+  const s = getQuizRelayOrDefault(sessionId);
+  const c = s.activeQuizCard;
+  if (!c) return { ok: false, error: "no active card" };
+  const t = Math.floor(themeIndex);
+  const q = Math.floor(questionIndex);
+  if (c.themeIndex !== t || c.questionIndex !== q) return { ok: false, error: "card mismatch" };
+  if (pointValueForQuestionIndex(q) !== 400) return { ok: false, error: "not 400" };
+
+  const log = s.donationLog ?? [];
+  const bonusBySeat = new Map<number, number>();
+
+  for (const e of log) {
+    const amt = Math.floor(Number(e.amount));
+    if (!Number.isFinite(amt) || amt < 1) continue;
+    const si = e.seatIndex;
+    if (typeof si !== "number" || !Number.isInteger(si) || si < 0 || si > 4) continue;
+    const seat = ((si % 5) + 5) % 5;
+    const bonus = amt * 2;
+    bonusBySeat.set(seat, (bonusBySeat.get(seat) ?? 0) + bonus);
+  }
+
+  for (const [seat, add] of bonusBySeat) {
+    const p = s.players[seat];
+    if (p) p.score += add;
+  }
+  return { ok: true };
+}
+
 export function applyPlayerDonation(
   sessionId: string,
   seat: number,

artifacts/game-client/src/apps/adepts-game/pages/Home.tsx

@@ -11,8 +11,23 @@ import { useRole } from "@/hooks/useRole";
 import { ChatPanel } from "@/components/ChatPanel";
 import { QuizBoardPandoraLottoOverlay } from "@/components/QuizBoardPandoraLottoOverlay";
 import { DonationsTable } from "@/components/DonationsTable";
+import { getAdeptsCommandSocket } from "@/lib/adeptsCommandSocket";
 import { getQuizNavSocket } from "@/hooks/quizNavSocket";
 
+/** Вопрос 400 = индекс 3. Бонус дед-слеша: тема «Маунты» по названию или любой dedFly в каталоге. */
+function shouldEmitDedFlyDonationBonus(
+  themeName: string | undefined,
+  questionIndex: number,
+  splashVariant: string | undefined,
+): boolean {
+  if (questionIndex !== 3) return false;
+  if (splashVariant === "dedFly") return true;
+  const n = String(themeName ?? "")
+    .trim()
+    .toLowerCase();
+  return n.includes("маунт") || n.includes("mount");
+}
+
 function resolveUrl(url: string): string {
   if (!url) return url;
   if (url.startsWith("http") || url.startsWith("//")) return url;
@@ -218,7 +233,26 @@ export default function Home({ boardId }: { boardId: AdeptsBoardId }) {
           allowRaccoonSplashSeatPass={openCard.splashSeatPassUsed !== true}
           splashDismissed={openCard.splashDismissed === true}
           splashDedFlyExitStarted={openCard.splashDedFlyExitStarted === true}
-          onDedFlyExitStart={() => patchActiveQuizCard({ splashDedFlyExitStarted: true })}
+          onDedFlyExitStart={() => {
+            patchActiveQuizCard({ splashDedFlyExitStarted: true });
+            if (!isHost || !openCard) return;
+            const qMeta = state.questions[openCard.themeIndex]?.[openCard.questionIndex];
+            if (
+              shouldEmitDedFlyDonationBonus(
+                state.themes[openCard.themeIndex],
+                openCard.questionIndex,
+                qMeta?.splashVariant,
+              )
+            ) {
+              queueMicrotask(() => {
+                getAdeptsCommandSocket().emit("command", {
+                  type: "hostMounts400DedDonationBonus",
+                  themeIndex: openCard.themeIndex,
+                  questionIndex: openCard.questionIndex,
+                });
+              });
+            }
+          }}
           canFinalizeDedFlySplashDismiss={isHost}
           canDismissRaccoonSplash={canDismissSplash}
           onDismissSplash={() =>

artifacts/game-client/src/lib/adeptsQuizSocketRelay.ts

@@ -64,9 +64,10 @@ export function buildAdeptsQuizRelayPayload(
   };
   if (boardId !== undefined) out.boardId = boardId;
   if (slice.dataVersion !== undefined) out.dataVersion = slice.dataVersion;
+  /** Всегда шлём подписи тем — на сервере нужны для «Маунты 400» и т.п. без тяжёлого каталога. */
+  out.themes = slice.themes;
   if (includeCatalog) {
     out.catalogIncluded = true;
-    out.themes = slice.themes;
     out.questions = slice.questions;
   }
   return out;