добавлена табличка с пожертвованиями игроков

GGLast · GGLast · commit f8ae51f4c9fa · 2026-05-02T12:12:36.000+03:00
diff --git a/artifacts/api-server/src/lib/adepts-quiz-relay-types.ts b/artifacts/api-server/src/lib/adepts-quiz-relay-types.ts
@@ -27,6 +27,8 @@ export type AdeptsQuizRelayPayload = {
   themes?: string[];
   questions?: unknown[][];
   dataVersion?: number;
+  /** Пожертвования по 5 местам; общие для сессии. */
+  donations?: (number | null)[];
 };
 
 const THEME_COUNT = 8;
@@ -49,6 +51,7 @@ export function defaultQuizRelayPayload(sessionId: string): AdeptsQuizRelayPaylo
     quizBoardHoverCell: null,
     questionUsedGrid,
     dataVersion: 59,
+    donations: [null, null, null, null, null],
   };
 }
 
diff --git a/artifacts/api-server/src/lib/adepts-quiz-room-store.ts b/artifacts/api-server/src/lib/adepts-quiz-room-store.ts
@@ -43,6 +43,9 @@ export function getQuizRelayOrDefault(sessionId: string): AdeptsQuizRelayPayload
     s = defaultQuizRelayPayload(sessionId);
     rooms.set(sessionId, s);
   }
+  if (!s.donations || s.donations.length !== 5) {
+    s.donations = [null, null, null, null, null];
+  }
   return s;
 }
 
@@ -68,6 +71,18 @@ export function setQuizRelayFull(sessionId: string, payload: AdeptsQuizRelayPayl
   base.questionUsedGrid = structuredClone(payload.questionUsedGrid);
   if (payload.dataVersion !== undefined) base.dataVersion = payload.dataVersion;
 
+  const rawDon = (payload as Record<string, unknown>)["donations"];
+  if (Array.isArray(rawDon) && rawDon.length === 5) {
+    base.donations = rawDon.map((v) => {
+      if (v === null || v === undefined) return null;
+      if (typeof v === "number" && Number.isFinite(v)) return Math.round(v);
+      const n = Number(v);
+      return Number.isFinite(n) ? Math.round(n) : null;
+    }) as (number | null)[];
+  } else if (!base.donations || base.donations.length !== 5) {
+    base.donations = [null, null, null, null, null];
+  }
+
   if (payload.catalogIncluded && payload.themes && payload.questions) {
     base.catalogIncluded = true;
     base.themes = structuredClone(payload.themes);
diff --git a/artifacts/game-client/src/apps/adepts-game/hooks/useGameState.ts b/artifacts/game-client/src/apps/adepts-game/hooks/useGameState.ts
@@ -15,6 +15,7 @@ import {
 import {
   buildAdeptsQuizRelayPayload,
   deriveThemesAndQuestionsFromQuizIncoming,
+  normalizeQuizDonations,
 } from "@/lib/adeptsQuizSocketRelay";
 import {
   getAdeptsCommandSocket,
@@ -45,6 +46,8 @@ export type GameState = {
   quizBoardHoverCell?: QuizBoardHoverCell;
   dataVersion?: number;
   boardRoom?: string;
+  /** Пожертвования по 5 местам; общие для всех раундов квиза. */
+  donations: (number | null)[];
 };
 
 const DEFAULT_PLAYERS: Player[] = Array.from({ length: 5 }, (_, i) => ({
@@ -69,16 +72,31 @@ function emptyGrid(): Pick<GameState, "themes" | "questions"> {
   };
 }
 
+const DEFAULT_DONATIONS: (number | null)[] = [null, null, null, null, null];
+
 const DEFAULT_CORE: Omit<GameState, "themes" | "questions"> = {
   activeQuizCard: null,
   currentTurnSeat: 0,
   quizBoardHoverCell: null,
   players: DEFAULT_PLAYERS,
   dataVersion: undefined,
   boardRoom: undefined,
+  donations: [...DEFAULT_DONATIONS],
 };
 
 const PLAYERS_KEY = "adepts-shared-players";
+const DONATIONS_KEY = "adepts-shared-donations";
+
+function loadSharedDonations(): (number | null)[] {
+  try {
+    const s = localStorage.getItem(DONATIONS_KEY);
+    if (!s) return [...DEFAULT_DONATIONS];
+    const parsed = JSON.parse(s) as unknown;
+    return normalizeQuizDonations(parsed) ?? [...DEFAULT_DONATIONS];
+  } catch {
+    return [...DEFAULT_DONATIONS];
+  }
+}
 
 type BoardRuntime = {
   storageKey: string;
@@ -327,6 +345,7 @@ function loadInitialState(boardId: AdeptsBoardId): GameState {
           ...DEFAULT_CORE,
           ...emptyGrid(),
           players: rosterPlayers,
+          donations: loadSharedDonations(),
         });
       }
     }
@@ -340,11 +359,13 @@ function loadInitialState(boardId: AdeptsBoardId): GameState {
           ...emptyGrid(),
           players: rosterPlayers,
           dataVersion: rt.dataVersion,
+          donations: loadSharedDonations(),
         });
       }
       return migrateCatalog(boardId, {
         ...parsed,
         players: rosterPlayers,
+        donations: normalizeQuizDonations(parsed.donations) ?? loadSharedDonations(),
         activeQuizCard: parsed.activeQuizCard ?? null,
         currentTurnSeat: Number.isInteger(parsed.currentTurnSeat)
           ? ((Number(parsed.currentTurnSeat) % 5) + 5) % 5
@@ -366,12 +387,14 @@ function loadInitialState(boardId: AdeptsBoardId): GameState {
       ...emptyGrid(),
       players: rosterPlayers,
       dataVersion: rt.dataVersion,
+      donations: loadSharedDonations(),
     });
   }
   return migrateCatalog(boardId, {
     ...DEFAULT_CORE,
     ...emptyGrid(),
     players: rosterPlayers,
+    donations: loadSharedDonations(),
   });
 }
 
@@ -457,6 +480,7 @@ export function useGameState(boardId: AdeptsBoardId) {
             boardId: rec["boardId"],
             players: rec["players"],
             currentTurnSeat: rec["currentTurnSeat"],
+            donations: rec["donations"],
             // Reset all board-specific fields to safe defaults
             activeQuizCard: null,
             quizBoardHoverCell: null,
@@ -501,13 +525,17 @@ export function useGameState(boardId: AdeptsBoardId) {
           hoverFromRelay = null;
         }
 
+        const incomingDonations = normalizeQuizDonations(recToUse["donations"]);
+        const nextDonations = incomingDonations ?? prev.donations;
+
         let nextState = withClosedActiveQuizIfCellUsed(
           migrateCatalog(boardId, {
             ...prev,
             boardRoom: typeof recToUse["boardRoom"] === "string" ? recToUse["boardRoom"] : prev.boardRoom,
             themes,
             questions,
             players: merged,
+            donations: nextDonations,
             activeQuizCard: rawCard,
             // Relay is authoritative: never let host+Roster merge stomp server `currentTurnSeat`.
             currentTurnSeat:
@@ -568,6 +596,7 @@ export function useGameState(boardId: AdeptsBoardId) {
   useEffect(() => {
     localStorage.setItem(rt.storageKey, JSON.stringify(state));
     localStorage.setItem(PLAYERS_KEY, JSON.stringify(state.players));
+    localStorage.setItem(DONATIONS_KEY, JSON.stringify(state.donations));
 
     /** Consume before `catalogReady` / `allowQuizPush` returns — otherwise skip stays true and a later `hostQuizRelay` can stomp relay (host pick then no modal). */
     const skipThisCommit = skipEmitRef.current;
@@ -601,6 +630,15 @@ export function useGameState(boardId: AdeptsBoardId) {
           setState((prev) => ({ ...prev, players }));
         } catch {}
       }
+      if (e.key === DONATIONS_KEY && e.newValue) {
+        try {
+          const d = normalizeQuizDonations(JSON.parse(e.newValue));
+          if (d) {
+            skipEmitRef.current = true;
+            setState((prev) => ({ ...prev, donations: d }));
+          }
+        } catch {}
+      }
     };
     window.addEventListener("storage", handler);
     return () => window.removeEventListener("storage", handler);
@@ -768,6 +806,8 @@ export function useGameState(boardId: AdeptsBoardId) {
         players: DEFAULT_PLAYERS.map((p) => ({ ...p })),
         dataVersion: rt.dataVersion,
         boardRoom: getAdeptsSessionId(),
+        donations:
+          prev.donations?.length === 5 ? [...prev.donations] : [...DEFAULT_DONATIONS],
       })
     );
   }, [boardId, rt.dataVersion]);
diff --git a/artifacts/game-client/src/apps/adepts-game/pages/FuneralRoundPage.tsx b/artifacts/game-client/src/apps/adepts-game/pages/FuneralRoundPage.tsx
@@ -6,6 +6,7 @@ import { QuizBoardReloadButton } from "@/components/QuizBoardReloadButton";
 import { useRole } from "@/hooks/useRole";
 import { ChatPanel } from "@/components/ChatPanel";
 import { QuizBoardPandoraLottoOverlay } from "@/components/QuizBoardPandoraLottoOverlay";
+import { DonationsTable } from "@/components/DonationsTable";
 import { getQuizNavSocket } from "@/hooks/quizNavSocket";
 
 const BOARD_BG = "/funeral-board-bg.png";
@@ -146,7 +147,9 @@ export default function FuneralRoundPage() {
             aria-label="Сцена похорон"
           />
         </main>
-        <div className="min-h-0 min-w-0" aria-hidden="true" />
+        <aside className="flex min-h-0 min-w-0 flex-col items-end p-2 pt-3">
+          <DonationsTable players={state.players} donations={state.donations} />
+        </aside>
       </div>
 
       <div className="relative z-[110] grid shrink-0 grid-cols-[minmax(0,15%)_minmax(0,1fr)_minmax(0,15%)]">
diff --git a/artifacts/game-client/src/apps/adepts-game/pages/Home.tsx b/artifacts/game-client/src/apps/adepts-game/pages/Home.tsx
@@ -10,6 +10,7 @@ import { QuizBoardReloadButton } from "@/components/QuizBoardReloadButton";
 import { useRole } from "@/hooks/useRole";
 import { ChatPanel } from "@/components/ChatPanel";
 import { QuizBoardPandoraLottoOverlay } from "@/components/QuizBoardPandoraLottoOverlay";
+import { DonationsTable } from "@/components/DonationsTable";
 import { getQuizNavSocket } from "@/hooks/quizNavSocket";
 
 function resolveUrl(url: string): string {
@@ -173,7 +174,9 @@ export default function Home({ boardId }: { boardId: AdeptsBoardId }) {
             />
           </div>
         </main>
-        <div className="min-h-0 min-w-0" aria-hidden="true" />
+        <aside className="flex min-h-0 min-w-0 flex-col items-end p-2 pt-3">
+          <DonationsTable players={state.players} donations={state.donations} />
+        </aside>
       </div>
 
       <div className="grid shrink-0 grid-cols-[minmax(0,15%)_minmax(0,1fr)_minmax(0,15%)]">
diff --git a/artifacts/game-client/src/components/DonationsTable.tsx b/artifacts/game-client/src/components/DonationsTable.tsx
@@ -0,0 +1,48 @@
+import type { Player } from "@/lib/adepts-quiz-types";
+
+type Props = {
+  players: Player[];
+  donations: (number | null)[];
+};
+
+/** Компактная таблица пожертвований — общая для всех фаз квиза (синхрон через relay). */
+export function DonationsTable({ players, donations }: Props) {
+  const rows = players.slice(0, 5);
+  const d =
+    donations.length >= 5
+      ? donations
+      : [...donations, ...Array(Math.max(0, 5 - donations.length)).fill(null)].slice(0, 5);
+
+  return (
+    <div
+      className="w-full max-w-[min(100%,14rem)] rounded-lg border-2 border-amber-400/75 bg-gradient-to-b from-amber-950/35 to-black/50 px-2.5 py-2 shadow-[0_0_22px_rgba(250,204,21,0.45),0_0_8px_rgba(251,191,36,0.25)_inset] backdrop-blur-sm"
+      aria-label="Пожертвования игроков"
+    >
+      <table className="w-full border-collapse text-left font-display text-[11px] leading-tight sm:text-xs">
+        <caption className="sr-only">Пожертвования по игрокам</caption>
+        <thead>
+          <tr className="border-b border-amber-500/50 text-amber-100/95">
+            <th scope="col" className="pb-1.5 pr-2 font-semibold tracking-wide">
+              Игрок
+            </th>
+            <th scope="col" className="pb-1.5 font-semibold tracking-wide">
+              Пожертвования
+            </th>
+          </tr>
+        </thead>
+        <tbody>
+          {rows.map((p, i) => (
+            <tr key={p.id} className="border-b border-white/10 last:border-b-0">
+              <td className="max-w-[5.5rem] truncate py-1 pr-2 text-foreground/95" title={p.name}>
+                {p.name}
+              </td>
+              <td className="py-1 tabular-nums text-amber-50/95">
+                {d[i] === null || d[i] === undefined ? "—" : d[i]}
+              </td>
+            </tr>
+          ))}
+        </tbody>
+      </table>
+    </div>
+  );
+}
diff --git a/artifacts/game-client/src/lib/adeptsQuizSocketRelay.ts b/artifacts/game-client/src/lib/adeptsQuizSocketRelay.ts
@@ -32,8 +32,29 @@ export type AdeptsQuizRelayPayload = {
   themes?: string[];
   questions?: Question[][];
   dataVersion?: number;
+  /** Пожертвования по местам 1–5; общие для всей сессии квиза. */
+  donations?: (number | null)[];
 };
 
+export function normalizeQuizDonations(raw: unknown): (number | null)[] | null {
+  if (!Array.isArray(raw) || raw.length !== 5) return null;
+  const out: (number | null)[] = [];
+  for (let i = 0; i < 5; i++) {
+    const v = raw[i];
+    if (v === null || v === undefined) {
+      out.push(null);
+      continue;
+    }
+    if (typeof v === "number" && Number.isFinite(v)) {
+      out.push(Math.round(v));
+      continue;
+    }
+    const n = Number(v);
+    out.push(Number.isFinite(n) ? Math.round(n) : null);
+  }
+  return out;
+}
+
 export function buildAdeptsQuizRelayPayload(
   slice: {
     players: Player[];
@@ -43,6 +64,7 @@ export function buildAdeptsQuizRelayPayload(
     currentTurnSeat: number;
     quizBoardHoverCell?: QuizBoardHoverCell | null;
     dataVersion?: number;
+    donations: (number | null)[];
   },
   boardRoom: string,
   includeCatalog: boolean,
@@ -55,6 +77,7 @@ export function buildAdeptsQuizRelayPayload(
     currentTurnSeat: slice.currentTurnSeat,
     quizBoardHoverCell: slice.quizBoardHoverCell ?? null,
     questionUsedGrid: slice.questions.map((row) => row.map((q) => Boolean(q.used))),
+    donations: normalizeQuizDonations(slice.donations) ?? [null, null, null, null, null],
   };
   if (boardId !== undefined) out.boardId = boardId;
   if (slice.dataVersion !== undefined) out.dataVersion = slice.dataVersion;
