From a3c280b922fca472420f8edbcd3a65684e7bdaea Mon Sep 17 00:00:00 2001 From: Claude Date: Mon, 16 Nov 2026 23:59:15 -0500 Subject: [PATCH] Play: review follow-ups (night-review, council-critic) Lane plate shows Opp total on top and You below with the Portal rule and tie-break reason; results use the engine's lane leaders (on-topic tie); opponent fizzles never name a card in hand; guest names no longer use secret characters; pick one of the four starter decks in the lobby; '+N saved' energy in the turn banner; keyword words fit; hand fade hint; phones hide node chrome on the Play route and keep the Play button clear of the floating account button. Co-Authored-By: Claude Opus 5.5 --- src/game/MatchBoard.tsx | 13 ++++++++----- src/game/OnlinePlay.tsx | 2 +- src/game/PlaySection.tsx | 17 ++++++++++++----- src/game/Results.tsx | 2 +- src/game/adapter.ts | 13 ++++++++----- src/game/online.ts | 14 +++++++++++++- src/game/play.css | 13 ++++++++++++- src/game/types.ts | 1 + 8 files changed, 56 insertions(+), 19 deletions(-) diff --git a/src/game/MatchBoard.tsx b/src/game/MatchBoard.tsx index 4ca0085..9493300 100644 --- a/src/game/MatchBoard.tsx +++ b/src/game/MatchBoard.tsx @@ -29,11 +29,12 @@ export function MatchBoard({ title, opponent, view, legal, onAct, problem, error useEffect(() => { if (view.turn !== lastTurn.current && !view.over) { lastTurn.current = view.turn; - setBanner(view.turn === view.maxTurns ? `Final turn · ${view.maxEnergy} energy` : `Turn ${view.turn} · ${view.maxEnergy} energy`); + const saved = view.saved ? ` (+${view.saved} saved)` : ''; + setBanner(view.turn === view.maxTurns ? `Final turn · ${view.maxEnergy} energy${saved}` : `Turn ${view.turn} · ${view.maxEnergy} energy${saved}`); const t = setTimeout(() => setBanner(''), 1400); return () => clearTimeout(t); } - }, [view.turn, view.over, view.maxTurns, view.maxEnergy]); + }, [view.turn, view.over, view.maxTurns, view.maxEnergy, view.saved]); const act = onAct; const canPlay = (cardId: string, lane: number) => legal.some(a => a.type === 'play' && a.cardId === cardId && a.lane === lane); @@ -66,9 +67,11 @@ export function MatchBoard({ title, opponent, view, legal, onAct, problem, error
{lane.mine.map(c => setSheet({ kind: 'card', card: c, side: 'mine' })} />)} diff --git a/src/game/OnlinePlay.tsx b/src/game/OnlinePlay.tsx index 1db4caa..4e5d3a7 100644 --- a/src/game/OnlinePlay.tsx +++ b/src/game/OnlinePlay.tsx @@ -58,7 +58,7 @@ export function OnlinePlay({ mode, playerName, onExit, onFinish }: { if (finished.current || !status || !seat || status.phase !== 'finished' || !st?.result) return; finished.current = true; const names = st.lanes.map(l => l.topic.name); - finishTimer.current = setTimeout(() => onFinish(resultView(st.result!, seat.seat, names)), 900); + finishTimer.current = setTimeout(() => onFinish(resultView(st.result!, seat.seat, names, st.lanes.map(l => l.leader))), 900); }, [status, seat, onFinish]); useEffect(() => () => clearTimeout(finishTimer.current), []); diff --git a/src/game/PlaySection.tsx b/src/game/PlaySection.tsx index 6635139..b249bf0 100644 --- a/src/game/PlaySection.tsx +++ b/src/game/PlaySection.tsx @@ -3,7 +3,7 @@ import { CircleHelp, ExternalLink, Globe2, Layers3, Play, Server, Swords, UserRo import type { TestnetBlock } from '../../shared/testnet.ts'; import { Avatar } from '../auth/LoginButton.tsx'; import { BOTS, type Bot } from './bots.ts'; -import { cardFromBlock, loanerPool, opponentDeck as botDeck, starterDeck } from './cards.ts'; +import { DEFAULT_STARTER, STARTERS, cardFromBlock, loanerPool, opponentDeck as botDeck, starterDeck } from './cards.ts'; import { DeckBuilder, deckProblem, deckWarning } from './DeckBuilder.tsx'; import { CategoryIcon } from './GameCard.tsx'; import { MatchScreen } from './MatchScreen.tsx'; @@ -19,6 +19,7 @@ import './play.css'; type Screen = 'lobby' | 'deck' | 'match' | 'online' | 'results' | 'tutorial'; const DECK_KEY = 'wikideck-play-deck-v1'; const TUTORIAL_KEY = 'wikideck-play-tutorial-v1'; +const STARTER_KEY = 'wikideck-play-starter-v1'; const store = { get: (k: string) => { try { return localStorage.getItem(k); } catch { return null; } }, set: (k: string, v: string) => { try { localStorage.setItem(k, v); } catch { /* storage unavailable */ } }, @@ -33,6 +34,7 @@ export function PlaySection({ owned }: { owned: TestnetBlock[] }) { const [bot, setBot] = useState(BOTS[0]); const [savedIds, setSavedIds] = useState(() => { try { return JSON.parse(store.get(DECK_KEY) ?? 'null'); } catch { return null; } }); const [seed, setSeed] = useState(''); + const [starterId, setStarterId] = useState(() => { const s = store.get(STARTER_KEY); return STARTERS.some(d => d.id === s) ? s! : DEFAULT_STARTER; }); const [result, setResult] = useState(); const mode = modes.find(m => m.id === modeId) ?? modes[0]; const rules = mode.ruleset; @@ -40,10 +42,10 @@ export function PlaySection({ owned }: { owned: TestnetBlock[] }) { // Rebuild the saved deck from current cards; NFTs you no longer own simply drop out. const deck = useMemo(() => { - if (!savedIds) return starterDeck(rules); + if (!savedIds) return starterDeck(rules, starterId); const byId = new Map(pool.map(c => [c.id, c])); return savedIds.flatMap(id => byId.get(id) ?? []); - }, [savedIds, pool, rules]); + }, [savedIds, pool, rules, starterId]); const problem = deckProblem(deck, rules); const warning = deckWarning(deck); const opponent = useMemo(() => botDeck(seed, rules), [seed, rules]); @@ -55,7 +57,8 @@ export function PlaySection({ owned }: { owned: TestnetBlock[] }) { // While a match is on screen, hide the floating eom.dev account button (it sits over the dock on phones). useEffect(() => { document.documentElement.classList.toggle('wd-in-match', screen === 'match' || screen === 'online'); - return () => document.documentElement.classList.remove('wd-in-match'); + document.documentElement.classList.add('wd-play'); + return () => document.documentElement.classList.remove('wd-in-match', 'wd-play'); }, [screen]); if (screen === 'tutorial') return { store.set(TUTORIAL_KEY, '1'); setScreen('lobby'); }} />; @@ -103,9 +106,13 @@ export function PlaySection({ owned }: { owned: TestnetBlock[] }) {

Deck {deck.length}

+ {!savedIds &&
{STARTERS.map(d => + )}
} + {savedIds && } {problem ?

{problem} Edit your deck to play {mode.name}.

: warning &&

{warning}

} diff --git a/src/game/Results.tsx b/src/game/Results.tsx index a31d4a3..43dd221 100644 --- a/src/game/Results.tsx +++ b/src/game/Results.tsx @@ -11,7 +11,7 @@ export function Results({ result, modeName, onRematch, onLobby }: { result: Resu
{modeName.toUpperCase()} · {result.turns} TURNS

{outcome === 'win' ? 'Victory!' : outcome === 'loss' ? 'Defeat' : 'Draw'}

{result.reason === 'concede' ? (outcome === 'win' ? 'Your opponent conceded.' : 'You conceded.') - : `You won ${won} of ${result.lanes.length} lanes${tiebreak ? ', so total power decided it' : ''}.`}

+ : `You won ${won} of ${result.lanes.length} Topics${tiebreak ? ', so total power decided it' : ''}.`}

    {result.lanes.map(l =>
  1. {l.name}{l.myPower} – {l.theirPower}{l.winner === 0 ? 'Won' : l.winner === 1 ? 'Lost' : 'Tied'} diff --git a/src/game/adapter.ts b/src/game/adapter.ts index 7da75f2..7b3ea6f 100644 --- a/src/game/adapter.ts +++ b/src/game/adapter.ts @@ -38,7 +38,7 @@ function logLine(e: LogEvent, me: PlayerId, title: (id: string) => string): stri case 'portalRevealed': return `Portal revealed: ${e.topic.name}.`; case 'underdog': return `${who(e.player)} got the underdog bonus.`; case 'reveal': return `${who(e.player)} played ${title(e.cardId)}.`; - case 'fizzle': return `${who(e.player)}: ${title(e.cardId)} fizzled (no room) and went back to hand.`; + case 'fizzle': return e.player === me ? `Your ${title(e.cardId)} fizzled (no room) and went back to hand.` : 'An opponent play fizzled.'; // never name a card in their hand case 'effect': return `${e.source}: ${e.text}`; case 'concede': return `${who(e.player)} ${e.afk ? 'timed out' : 'conceded'}.`; case 'matchOver': return 'Match over.'; @@ -73,7 +73,7 @@ export const engine = { }, isOver: (s: MatchState) => isOver(s), result(state: MatchState, me: PlayerId): ResultView { - return resultView(result(state)!, me, state.lanes.map(l => l.topic.name)); + return resultView(result(state)!, me, state.lanes.map(l => l.topic.name), viewFor(state, me).lanes.map(l => l.leader)); }, }; @@ -96,7 +96,7 @@ export function viewFromPlayerView(v: PlayerView, opts: { log?: string[]; capaci return { index: i, stat: lane.topic.stat, revealed: lane.portalRevealed, name: lane.portalRevealed ? lane.topic.name : STAT_LABEL[lane.topic.stat], - modifier: portal, portalNote: lane.portalRevealed ? undefined : `Topic and Portal reveal on turn ${rules.portalReveal[i]}`, + modifier: portal, portalNote: lane.portalRevealed ? undefined : `Portal reveals on turn ${rules.portalReveal[i]}`, mine: lane.cards[0].map((c, k) => onBoard(c, lane.cardPower[0][k], lane.topic.stat, allOn)), theirs: lane.cards[1].map((c, k) => onBoard(c, lane.cardPower[1][k], lane.topic.stat, allOn)), staged: v.queue.filter(q => q.lane === i).flatMap(q => { @@ -110,6 +110,7 @@ export function viewFromPlayerView(v: PlayerView, opts: { log?: string[]; capaci const queued = new Set(v.queue.map(q => q.cardId)); return { me, turn: v.turn, maxTurns: rules.turns, energy: v.energyLeft, maxEnergy: v.energy, + saved: Math.max(0, v.energy - (rules.energyByTurn[v.turn - 1] ?? 0) - rules.bonusEnergy), hand: v.hand.filter(c => !queued.has(c.cardId)).map(c => toUICard(c, rules)), deckCount: v.deckCount, oppHandCount: v.opponent.handCount, oppDeckCount: v.opponent.deckCount, oppQueued: v.opponent.queuedCount, lanes, log: opts.log ?? [], waitingForOpponent: v.committed && v.phase !== 'over', over: v.phase === 'over', @@ -117,14 +118,16 @@ export function viewFromPlayerView(v: PlayerView, opts: { log?: string[]; capaci } /** Results from `me`'s point of view: in a ResultView, 0 always means "you" and 1 "your opponent". */ -export function resultView(r: MatchResult, me: PlayerId, laneNames: string[]): ResultView { +export function resultView(r: MatchResult, me: PlayerId, laneNames: string[], leaders?: ('you' | 'opponent' | null)[]): ResultView { const opp: PlayerId = me === 0 ? 1 : 0; return { winner: r.winner === null ? null : r.winner === me ? 0 : 1, turns: r.turns, reason: r.reason, totalPower: [r.totalPower[me], r.totalPower[opp]], lanes: r.lanePower.map((pw, i) => { const a = pw[me], b = pw[opp]; - return { name: laneNames[i] ?? `Topic ${i + 1}`, myPower: a, theirPower: b, winner: a === b ? null : a > b ? 0 : 1 }; + const lead = leaders?.[i]; // the consensus tie-break (on-topic count) can decide an equal lane + const winner = lead !== undefined ? (lead === 'you' ? 0 : lead === 'opponent' ? 1 : null) : a === b ? null : a > b ? 0 : 1; + return { name: laneNames[i] ?? `Topic ${i + 1}`, myPower: a, theirPower: b, winner }; }), }; } diff --git a/src/game/online.ts b/src/game/online.ts index 52d8e86..b50e946 100644 --- a/src/game/online.ts +++ b/src/game/online.ts @@ -35,10 +35,22 @@ export async function playerSecret(hostOrigin: string): Promise { return b64url(new Uint8Array(await crypto.subtle.sign('HMAC', key, new TextEncoder().encode(hostOrigin)))); } +/** A random 4-character tag for guest names, separate from the secret. */ +function guestTag(): string { + const KEY = 'wikideck-guest-tag'; + try { + const t = localStorage.getItem(KEY); + if (t && /^[A-Za-z0-9]{4}$/.test(t)) return t; + const fresh = b64url(crypto.getRandomValues(new Uint8Array(6))).replace(/[^A-Za-z0-9]/g, '').slice(0, 4).padEnd(4, 'x'); + localStorage.setItem(KEY, fresh); + return fresh; + } catch { return 'anon'; } +} + /** Host display names allow 1–24 letters, digits, spaces and _ . - */ export function lobbyName(name: string | undefined): string { const clean = (name ?? '').normalize('NFC').replace(/[^\p{L}\p{N} _.-]/gu, '').trim().slice(0, 24); - return clean || `Guest ${masterSecret().slice(0, 4)}`; + return clean || `Guest ${guestTag()}`; } async function call(path: string, init: { method?: string; body?: unknown; token?: string } = {}): Promise { diff --git a/src/game/play.css b/src/game/play.css index ab17635..754fefb 100644 --- a/src/game/play.css +++ b/src/game/play.css @@ -181,4 +181,15 @@ html.wd-in-match .auth-wrap,body:has(.match) .auth-wrap{display:none} .lane-drop.on-topic{border-color:var(--ctp-green);color:var(--ctp-green);background:color-mix(in srgb,var(--ctp-green) 10%,transparent)} .sheet h3{display:flex;align-items:center;gap:8px} @media(max-width:400px){.gcard-board .gcard-home{display:none}.gcard-board.is-on-topic{box-shadow:inset 3px 0 0 var(--ctp-green)}} -.starter-picks{margin-bottom:14px} +.starter-picks{margin:8px 0 14px} +/* Review follow-ups: vertical lane plate (opponent total on top, yours below), rule line, tie reason */ +.lane-plate{grid-template-columns:1fr;grid-template-rows:auto auto auto;justify-items:center;gap:2px;padding:4px 3px} +.lane-score{display:flex;align-items:baseline;gap:3px;line-height:1.1} +.lane-score small{font-size:8px;font-weight:600;color:var(--ctp-overlay1);text-transform:uppercase} +.lane-rule{font-size:9px!important;line-height:1.25;color:var(--ctp-subtext0)!important;display:-webkit-box;-webkit-line-clamp:3;-webkit-box-orient:vertical;overflow:hidden} +.lane-tie{font-size:9px!important;color:var(--ctp-yellow)!important} +.gcard-keyword{text-transform:none;letter-spacing:0;font-size:10px;white-space:nowrap} +@media(max-width:480px){.hand{-webkit-mask-image:linear-gradient(to right,#000 82%,transparent);mask-image:linear-gradient(to right,#000 82%,transparent);padding-right:24px}} +/* Phones: on the Play route, hide the node/RPC chrome above the game so Play starts above the fold. */ +@media(max-width:760px){html.wd-play .testnet-status,html.wd-play .error-banner,html.wd-play main>footer{display:none}} +@media(max-width:480px){html.wd-play:not(.wd-in-match) .play-dock{padding-right:62px}} diff --git a/src/game/types.ts b/src/game/types.ts index 0eb1122..1b45ad2 100644 --- a/src/game/types.ts +++ b/src/game/types.ts @@ -47,6 +47,7 @@ export type MatchView = { maxTurns: number; energy: number; // left this turn maxEnergy: number; + saved: number; // energy carried over from last turn (included in maxEnergy) hand: UICard[]; deckCount: number; oppHandCount: number;