From 0be89a1dfe98e33cd79e6296edf017484f8607e5 Mon Sep 17 00:00:00 2001 From: Eric Wagoner Date: Mon, 26 Oct 2026 22:38:00 -0400 Subject: [PATCH] Credibility pass: the code reads as one hand's work. Dead plumbing and copies removed, four claims the source does not support corrected, and inherited kit text re-read for this game Engine: the facade re-exports the board in one block; describe() and the dead letters preference, void ply, the King-taken line, the identity maps and the unused imports are gone; SIDE_NAMES is the one spelling of a side; the drake's hunter comment no longer claims only four kinds reach the air. Prose: no shatranj and no sitting duck, which Gygax never wrote; the Thief statistic and the Basilisk's "one trick" are gone; lessons say what the board shows instead of repeating the panel; a Thief's leap counts four. Browser: one keyboard walk, in BoardArtwork; the lesson board and page share one game and one inspected piece; the chronicle's possessive is told, not patched by a regex; the chronicle colours and the reading layout are global rules instead of three copies; the guide and the about panel say what the code and the article actually do. Server and docs: the room server states that it is the kit's, kept whole; the skills, the deploy README and the share card name files that exist. Co-Authored-By: Claude Fable 5.1 Claude-Session: https://claude.ai/code/session_01CCLa2PaEeCj8njQZSWGqHx --- .claude/skills/wyrm-pulse/SKILL.md | 2 +- .claude/skills/wyrm-reports/SKILL.md | 9 ++-- .claude/skills/wyrm-visitors/SKILL.md | 4 +- deploy/README.md | 7 +-- docs/compose-game.ts | 6 +-- docs/og-card.html | 2 +- server/src/index.ts | 4 +- server/src/rooms.test.ts | 8 ++-- server/src/rooms.ts | 17 +++++-- src/app.css | 25 ++++++++++ src/lib/components/Board.svelte | 66 ++++++++------------------ src/lib/components/BoardArtwork.svelte | 39 +++++++++++---- src/lib/components/Chronicle.svelte | 20 +------- src/lib/components/Hall.svelte | 5 +- src/lib/components/LessonBoard.svelte | 66 ++++++++------------------ src/lib/components/PiecePanel.svelte | 8 ++-- src/lib/components/SeatsSlip.svelte | 2 +- src/lib/game/board.ts | 8 ++-- src/lib/game/bot.ts | 10 ++-- src/lib/game/chronicle.ts | 34 +++++-------- src/lib/game/index.test.ts | 25 +++++----- src/lib/game/index.ts | 48 +++++++------------ src/lib/game/lessons.test.ts | 11 ++--- src/lib/game/lessons.ts | 24 +++++----- src/lib/game/lore.ts | 14 +++--- src/routes/guide/+page.svelte | 2 +- src/routes/learn/+page.svelte | 37 +++------------ src/routes/learn/game/+page.svelte | 64 ++----------------------- 28 files changed, 227 insertions(+), 340 deletions(-) diff --git a/.claude/skills/wyrm-pulse/SKILL.md b/.claude/skills/wyrm-pulse/SKILL.md index 1450061..db61bcd 100644 --- a/.claude/skills/wyrm-pulse/SKILL.md +++ b/.claude/skills/wyrm-pulse/SKILL.md @@ -1,6 +1,6 @@ --- name: wyrm-pulse -description: The weekly Wyrm operations pulse — game server health, errors, the last week of traffic and rooms from the rollup, backup status, and the box's vitals. Use when Eric asks how the server is doing, wants an ops check, or says "run the pulse". +description: The weekly Wyrm operations pulse: game server health, errors, the last week of traffic and rooms from the rollup, backup status, and the box's vitals. Use when Eric asks how the server is doing, wants an ops check, or says "run the pulse". --- # Wyrm pulse diff --git a/.claude/skills/wyrm-reports/SKILL.md b/.claude/skills/wyrm-reports/SKILL.md index 5e76f60..fcc6176 100644 --- a/.claude/skills/wyrm-reports/SKILL.md +++ b/.claude/skills/wyrm-reports/SKILL.md @@ -1,6 +1,6 @@ --- name: wyrm-reports -description: Work the Wyrm reports desk — fetch players' bug reports, show the last week's reports and replies, and process the unanswered ones end to end (replay the ledger to the pinned round, check the rules text, fix, reply). Use when Eric asks about bug reports, player feedback, or says "work the reports desk". +description: Work the Wyrm reports desk: fetch players' bug reports, show the last week's reports and replies, and process the unanswered ones end to end (replay the ledger to the pinned round, check the rules text, fix, reply). Use when Eric asks about bug reports, player feedback, or says "work the reports desk". --- # The Wyrm reports desk @@ -54,9 +54,10 @@ to hear his players' voices; never compress their words into a table. `game.resolve(state, line.inputs)` per turn line, printing the state around the pinned round. The `chat` lines show what the players said to each other at the time. -2. **Check the rules before the code.** The rules are data in - `src/lib/game/rules.ts` and prose at /rules, which names the texts it - follows; read them before deciding the engine is wrong. Many reports +2. **Check the rules before the code.** The rules are the article in + `docs/source.md`, with the engine's readings of its open points under + Decisions; the moves are in `src/lib/game/board.ts` and the ends of a + game in `index.ts`. Read them before deciding the engine is wrong. Many reports are the rules working as written. 3. **Verdict.** `by-design` (the engine matches the text; no change), `resolved` (a defect, fixed before replying), or `open` (needs Eric's diff --git a/.claude/skills/wyrm-visitors/SKILL.md b/.claude/skills/wyrm-visitors/SKILL.md index 68ef981..c741774 100644 --- a/.claude/skills/wyrm-visitors/SKILL.md +++ b/.claude/skills/wyrm-visitors/SKILL.md @@ -1,6 +1,6 @@ --- name: wyrm-visitors -description: The Wyrm visitors report — who is at the table right now, who came today and how far each game got, and today's traffic. Use when Eric asks who has been playing, about new players or visitors, "anyone playing?", or wants a traffic report. +description: The Wyrm visitors report: who is at the table right now, who came today and how far each game got, and today's traffic. Use when Eric asks who has been playing, about new players or visitors, "anyone playing?", or wants a traffic report. --- # Wyrm visitors @@ -23,7 +23,7 @@ spills into the next UTC day. Run yesterday too when the hour is early. - **players today / NEW today**: names seated in rooms created today; NEW means the name's first room ever is today. - **rooms today**: one line each: time, code, humans vs bots, empty - seats, state (lobby only / started, no turns / in play), turn count, + seats, state (lobby only / started, no turns / in play / abandoned after twelve idle hours / who won, or a draw), turn count, span, the last turn's time, and how many lines of table talk were said. Talk is a sign people came together; a bot game has none. diff --git a/deploy/README.md b/deploy/README.md index 41f5d55..12e74e4 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -18,7 +18,7 @@ service user, /opt/ and /var/lib/ trees, access log small Node process capped at 300 MB by its unit file, and a room is a few kilobytes of ledger, so the host carries several. Each game needs a port of its own on the host: wizwar 8787, waving-hands 8788, hnefatafl 8789, -dip 8790. +dip 8790, wyrm 8791. ## Current production @@ -65,8 +65,9 @@ runs every game's rollup and backup from /etc/cron.d/gamehall. - `wyrm-backup.sh`: nightly at 07:23 UTC, mirrors /var/lib/wyrm to the `kestrel-wizwar-backups` Space under `wyrm/` (a current copy less the rollup, and dated snapshots kept 90 days). It needs rclone with the Spaces - credentials in /root/.config/rclone/rclone.conf, copied by hand from the - wizwar droplet; until then it logs "skipped". + credentials in /root/.config/rclone/rclone.conf, which the shared host has; + a game on a box of its own copies them over first, and until then the + script logs "skipped". Errors from the game server go to Sentry, project `wyrm` in the locallygrownnet organisation; the DSN is in the unit file. On the shared host diff --git a/docs/compose-game.ts b/docs/compose-game.ts index 66c5be4..bb7ebb8 100644 --- a/docs/compose-game.ts +++ b/docs/compose-game.ts @@ -6,7 +6,7 @@ import { createGame, applyMove, validateMove } from '../src/lib/game/index.ts'; import { chooseMove } from '../src/lib/game/bot.ts'; import { narrate } from '../src/lib/game/chronicle.ts'; -import { square, squareName, legalMovesFrom, type Side } from '../src/lib/game/board.ts'; +import { square, squareName, legalMovesFrom } from '../src/lib/game/board.ts'; import { TOLD_MOVES } from '../src/lib/game/told.ts'; const FORCED: Record = Object.fromEntries(TOLD_MOVES.map((m, n) => [n + 1, m])); @@ -17,7 +17,7 @@ let s = createGame({ A: 'Gold', B: 'Scarlet' }); for (let ply = 1; ply <= plies && !s.over; ply++) { const seat = s.toMove === 'gold' ? 'A' : 'B'; if (ply === askPly && askSquare) { - console.log(`ply ${ply}, ${s.toMove} to move, ${askSquare} may go to: ${legalMovesFrom(s.cells, square(askSquare), 'printed').map(squareName).join(' ')}`); + console.log(`ply ${ply}, ${s.toMove} to move, ${askSquare} may go to: ${legalMovesFrom(s.cells, square(askSquare), s.setup).map(squareName).join(' ')}`); process.exit(0); } const forced = FORCED[ply]; @@ -29,7 +29,7 @@ for (let ply = 1; ply <= plies && !s.over; ply++) { console.log(`ply ${ply}: forced ${forced[0]}-${forced[1]} refused: ${why}`); process.exit(1); } - } else move = chooseMove(s.cells, s.toMove as Side, 'printed', 40000)!; + } else move = chooseMove(s.cells, s.toMove, s.setup, 40000)!; s = applyMove(s, move.from, move.to); } for (const t of narrate(s)) console.log(`${t.ply}${FORCED[t.ply] ? '*' : ' '} ${t.lines.map((l) => l.text).join(' ')}`); diff --git a/docs/og-card.html b/docs/og-card.html index 0c3f004..d352793 100644 --- a/docs/og-card.html +++ b/docs/og-card.html @@ -1,5 +1,5 @@ - + diff --git a/server/src/index.ts b/server/src/index.ts index 01d67b3..c39cb38 100644 --- a/server/src/index.ts +++ b/server/src/index.ts @@ -29,7 +29,7 @@ // // Caddy serves the static site and proxies /api and /ws here. The keeper's // door answers only on the host itself, and only to the key in KEEPER_KEY_FILE -// (deploy/wyrm-reseat.sh sends it): +// (the deploy/wyrm-*.sh scripts send it): // // GET /keeper/rooms/:id who sits at the table, and when each person last moved or spoke // POST /keeper/rooms/:id/reseat {seat} a new token for a player locked out, as a link to send them @@ -389,7 +389,7 @@ server.on('upgrade', (req, socket, head) => { /** * A browser that died without closing (a crashed tab, a sleeping laptop, a dropped network) leaves its socket * open until TCP gives up, counted in the gallery all the while. The protocol's own ping, which every browser - * answers by itself, finds it within two rounds. + * answers by itself, finds it: one silent through a whole round is closed. */ const answered = new WeakMap(); setInterval(() => { diff --git a/server/src/rooms.test.ts b/server/src/rooms.test.ts index 15636e5..9fc5a7e 100644 --- a/server/src/rooms.test.ts +++ b/server/src/rooms.test.ts @@ -22,7 +22,7 @@ const GOLD_OPENS: Input = { from: square('2c2'), to: square('2c3') }; const SCARLET_ANSWERS: Input = { from: square('2c7'), to: square('2c6') }; /** The bots move once the request that made their move due has been answered: after this tick. */ -const settled = () => new Promise((r) => setImmediate(r)); +const answered = () => new Promise((r) => setImmediate(r)); /** A table of two: Ann, who opened it and plays Gold, and Bo, the game begun. */ function table(spec: GameSpec = game) { @@ -138,7 +138,7 @@ describe('rooms', () => { expect(host.room.state!.setup).toBe('shifted'); // Gold moves first, and Gold is the drake: it moves once the host's request has been answered, not inside it. expect(host.room.state!.moves).toHaveLength(0); - await settled(); + await answered(); expect(host.room.state!.moves).toHaveLength(1); expect(rooms.waitingOn(host.room)).toEqual(['A']); }); @@ -205,13 +205,13 @@ describe('the host and the other seats', () => { rooms.submit(room, ann, GOLD_OPENS, 0); rooms.standIn(room, ann, 'B'); // The move was Bo's; the drake makes it as soon as the host has been answered. - await settled(); + await answered(); expect(room.resolved).toBe(2); expect(rooms.waitingOn(room)).toEqual(['A']); expect(() => rooms.seatOf(room, bo)).toThrow(/gave your seat to a drake/); expect(rooms.view(room, 'A').seats[1]).toEqual({ id: 'B', name: 'Bo', bot: true, standIn: true }); rooms.submit(room, ann, { from: square('2d2'), to: square('2d3') }, 2); - await settled(); + await answered(); expect(room.resolved).toBe(4); }); diff --git a/server/src/rooms.ts b/server/src/rooms.ts index 3a6eca5..5056454 100644 --- a/server/src/rooms.ts +++ b/server/src/rooms.ts @@ -3,6 +3,12 @@ // same place. Inputs wait in memory until every seat that must move has moved; // then the round resolves at once, bots included. Nothing here knows the // game beyond the GameSpec it is given. +// +// This is the kit's room server, kept whole so the kit's fixes land by copy. +// Wyrm seats two and moves one side at a time, so only one seat ever owes a +// move and the paced play of bots left alone at a table never arises here. +// The strings a player reads say drake, the game's word for its house +// player; the code and its comments keep the kit's word, bot. import { createHash, randomBytes, timingSafeEqual } from 'node:crypto'; import { cleanOptions, SPECTATOR, tableSize, type GameSpec, type SeatId, type TableOptions } from '../../src/lib/game/spec'; @@ -361,10 +367,14 @@ export class Rooms { * to hang and the bot's to come at once. The table is told as each move * lands, the same as any other. */ + /** A room forgotten and loaded again drives itself; a timer or tick that wakes with the old one must do nothing. */ + private isTable(room: Room): boolean { + return this.rooms.get(room.id) === room; + } + private botsAfterAnswering(room: Room): void { setImmediate(() => { - // A room forgotten and loaded again drives itself; this one is no longer the table. - if (this.rooms.get(room.id) !== room) return; + if (!this.isTable(room)) return; try { this.driveBots(room); this.botsSpeak(room, 'phase'); @@ -403,8 +413,7 @@ export class Rooms { const hurried = this.hurried.has(room.id); const next = setTimeout(() => { this.pacing.delete(room.id); - // A room forgotten and loaded again drives itself; this one is no longer the table. - if (this.rooms.get(room.id) !== room) return; + if (!this.isTable(room)) return; this.driveBots(room, hurried ? HURRIED_STEP : 1); // Played out: the bots have their say once, as after any round, which ends a game with parting words. if (!this.pacing.has(room.id)) this.botsSpeak(room, 'phase'); diff --git a/src/app.css b/src/app.css index 2c7eabb..5e8e503 100644 --- a/src/app.css +++ b/src/app.css @@ -196,6 +196,31 @@ button:disabled { max-width: 40em; } +/* A lesson: the boards beside the words. */ +.reading.wide { + max-width: 1280px; +} + +/* The chronicle's lines, coloured by what they tell, at the table and in a lesson. */ +.telling li.capture { + color: var(--ember); +} + +.telling li.check, +.telling li.freeze, +.telling li.promotion { + color: var(--frost); +} + +.telling li.note { + color: var(--bone-dim); + font-style: italic; +} + +.telling li.end { + color: var(--blood); +} + .reading section { padding: 1.25rem 0 0.5rem; border-top: 1px solid var(--rule); diff --git a/src/lib/components/Board.svelte b/src/lib/components/Board.svelte index 092f16f..7a4dee7 100644 --- a/src/lib/components/Board.svelte +++ b/src/lib/components/Board.svelte @@ -9,7 +9,7 @@ import { narrate } from '$lib/game/chronicle'; import BoardArtwork, { type Token } from './BoardArtwork.svelte'; import { - legalMovesFrom, movesFrom, squareName, sideOf, kindOf, kingSquare, inCheck, levelOf, fileOf, rankOf, idx, frozen, NAMES, FILES, RANKS, LEVELS, + legalMovesFrom, movesFrom, squareName, sideOf, kindOf, kingSquare, inCheck, levelOf, frozen, NAMES, SIDE_NAMES, type Move, type Side } from '$lib/game'; import type { Room } from '$lib/net/room.svelte'; @@ -24,11 +24,9 @@ const seat = g.seats.find((id) => g.players[id].side === side); return seat ? g.players[seat].name : side; }; - const sideName = (side: Side) => (side === 'gold' ? 'Gold' : 'Scarlet'); const flipped = $derived(mySide === 'scarlet'); const inCheckNow = $derived(!g.over && inCheck(g.cells, g.toMove)); const checkSquare = $derived(inCheckNow ? kingSquare(g.cells, g.toMove) : -1); - const label = squareName; // --- Tokens: pieces with a life of their own, so a move slides, a capture fades and a Warrior stands up a Hero --- let tokens = $state([]); @@ -102,7 +100,7 @@ } const shownStory = $derived(shownPly > 0 ? storyOf(shownPly) : ''); - // --- Choosing and moving --------------------------------------------------- + // --- Choosing and moving --- let selected = $state(null); const targets = $derived(selected === null ? [] : legalMovesFrom(g.cells, selected, g.setup)); /** Any piece, tapped to read about it; the panel beside the boards tells what it is and what it can do from there. */ @@ -128,7 +126,7 @@ await room.submit({ from, to }); } - const wordFor = (i: number) => `${sideOf(g.cells[i]) === 'gold' ? 'Gold' : 'Scarlet'} ${NAMES[kindOf(g.cells[i])]}`; + const wordFor = (i: number) => `${SIDE_NAMES[sideOf(g.cells[i])!]} ${NAMES[kindOf(g.cells[i])]}`; async function tap(i: number) { if (room.sending || animating) return; @@ -136,13 +134,13 @@ if (!yourMove) { // Not your move, or no seat: a tap on a piece still opens its panel. inspected = g.cells[i] !== '' ? (inspected === i ? null : i) : null; - if (inspected !== null) announce(`${wordFor(i)} on ${label(i)}. About this piece is shown beside the boards.`); + if (inspected !== null) announce(`${wordFor(i)} on ${squareName(i)}. About this piece is shown beside the boards.`); return; } if (selected !== null && targets.includes(i)) { if (prefs.confirmMoves === true) { pending = { from: selected, to: i }; - announce(`Move ${label(selected)} to ${label(i)}? Confirm or cancel below.`); + announce(`Move ${squareName(selected)} to ${squareName(i)}? Confirm or cancel below.`); return; } await send(selected, i); @@ -156,43 +154,17 @@ if (selected !== null) { const to = legalMovesFrom(g.cells, i, g.setup); const why = frozen(g.cells, i) ? ' It is frozen by the Basilisk beneath it.' : ''; - announce(`Selected ${wordFor(i)} on ${label(i)}. ${to.length} ${to.length === 1 ? 'square' : 'squares'} to move to${to.length ? ': ' + to.map(label).join(', ') : ''}.${why}`); + announce(`Selected ${wordFor(i)} on ${squareName(i)}. ${to.length} ${to.length === 1 ? 'square' : 'squares'} to move to${to.length ? ': ' + to.map(squareName).join(', ') : ''}.${why}`); } else announce('Selection cleared.'); } else selected = null; } - function focusSquare(i: number) { - document.querySelector(`rect.square[data-i="${i}"]`)?.focus(); - } - - /** Arrows walk a board, Page Up and Page Down climb and descend, Enter picks up and sets down. */ - function key(e: KeyboardEvent, i: number) { - const f = fileOf(i); - const r = rankOf(i); - const lv = levelOf(i); - const step: Record = { - ArrowLeft: [flipped ? 1 : -1, 0, 0], ArrowRight: [flipped ? -1 : 1, 0, 0], ArrowUp: [0, flipped ? -1 : 1, 0], ArrowDown: [0, flipped ? 1 : -1, 0], - PageUp: [0, 0, 1], PageDown: [0, 0, -1] - }; - if (e.key in step) { - e.preventDefault(); - const [df, dr, dl] = step[e.key]; - const nf = f + df; - const nr = r + dr; - const nl = lv + dl; - if (nf >= 0 && nf < FILES && nr >= 0 && nr < RANKS && nl >= 1 && nl <= LEVELS) focusSquare(idx(nl, nf, nr)); - return; - } - if (e.key === 'Enter' || e.key === ' ') { - e.preventDefault(); - void tap(i); - } else if (e.key === 'Escape') { - selected = null; - inspected = null; - reviewing = null; - pending = null; - announce('Selection cleared.'); - } + function escape() { + selected = null; + inspected = null; + reviewing = null; + pending = null; + announce('Selection cleared.'); } const verdict = $derived.by(() => { @@ -210,27 +182,27 @@ {#if g.over} {verdict} {g.over.reason} {:else if room.spectating} - {nameOfSide(g.toMove)} to move · {sideName(g.toMove)}{#if inCheckNow} · in check{/if} · move {g.moves.length + 1} + {nameOfSide(g.toMove)} to move · {SIDE_NAMES[g.toMove]}{#if inCheckNow} · in check{/if} · move {g.moves.length + 1} {:else if yourMove} - Your move · {sideName(mySide!)}{#if inCheckNow} · your King is in check{/if} · Checkmate {nameOfSide(g.toMove === 'gold' ? 'scarlet' : 'gold')}’s King. + Your move · {SIDE_NAMES[mySide!]}{#if inCheckNow} · your King is in check{/if} · Checkmate {nameOfSide(g.toMove === 'gold' ? 'scarlet' : 'gold')}’s King. {:else if room.view.playingOn} - The drakes play on · a move every few seconds{#if !room.spectating} {/if} + The drakes play on · a move every few seconds  {:else} - {nameOfSide(g.toMove)} is thinking · you are {sideName(mySide!)}{#if inCheckNow} · {nameOfSide(g.toMove)} is in check{/if} + {nameOfSide(g.toMove)} is thinking · you are {SIDE_NAMES[mySide!]}{#if inCheckNow} · {nameOfSide(g.toMove)} is in check{/if} {/if} {#if shownStory && (shownCaptured.length || reviewing !== null || shownLast?.check || shownLast?.promoted)}

0}>{shownStory}{#if reviewing !== null} {/if}

{/if} {#if pending} -

Move {label(pending.from)} to {label(pending.to)}? +

Move {squareName(pending.from)} to {squareName(pending.to)}?

{/if} {#if room.error}

{room.error}

{/if}
- +
@@ -256,7 +228,7 @@
  • {g.players[id].name}{id === room.me ? ' (you)' : ''} - {sideName(g.players[id].side)}, {pieceCount(g.players[id].side)} pieces + {SIDE_NAMES[g.players[id].side]}, {pieceCount(g.players[id].side)} pieces
    • {/each} diff --git a/src/lib/components/BoardArtwork.svelte b/src/lib/components/BoardArtwork.svelte index 0189047..35e6104 100644 --- a/src/lib/components/BoardArtwork.svelte +++ b/src/lib/components/BoardArtwork.svelte @@ -13,12 +13,12 @@ - + {#each levels as lv, slot (lv)} {@const top = slot * (boardHeight + GAP)} @@ -114,7 +135,7 @@ role={decorative ? undefined : 'gridcell'} aria-label={decorative ? undefined : describe(i)} aria-selected={decorative ? undefined : selected === i} - tabindex={decorative ? undefined : yourMove ? 0 : -1} + tabindex={decorative ? undefined : 0} onclick={decorative ? undefined : () => tap(i)} onkeydown={decorative ? undefined : (e) => key(e, i)} /> diff --git a/src/lib/components/Chronicle.svelte b/src/lib/components/Chronicle.svelte index fe08e6b..19ce3df 100644 --- a/src/lib/components/Chronicle.svelte +++ b/src/lib/components/Chronicle.svelte @@ -29,7 +29,7 @@ Move {t.ply} {notation(t.move)} -
      +
        {#each t.lines as l, i (i)}
      • {l.text}
        • {/each} @@ -97,22 +97,4 @@ color: var(--bone); } - li.capture { - color: var(--ember); - } - - li.check, - li.freeze, - li.promotion { - color: var(--frost); - } - - li.note { - color: var(--bone-dim); - font-style: italic; - } - - li.end { - color: var(--blood); - } diff --git a/src/lib/components/Hall.svelte b/src/lib/components/Hall.svelte index 26e4dd2..5cf2802 100644 --- a/src/lib/components/Hall.svelte +++ b/src/lib/components/Hall.svelte @@ -48,14 +48,13 @@ { n: t.turnsPlayed, label: 'turns recorded' }, { n: hours(t.minutesAtTable), label: 'at the table' } ]; - const onCards = new Set([]); const details = [ { n: t.gamesBegun, label: `games begun, at ${t.tablesOpened} ${t.tablesOpened === 1 ? 'table' : 'tables'}` }, { n: t.namesSeated, label: t.namesSeated === 1 ? 'name has taken a seat' : 'names have taken a seat' }, { n: t.turnsPlayed, label: `turns recorded; ${t.longestGameTurns} in the longest game` }, { n: t.gamesWithBot, label: t.gamesWithBot === 1 ? 'game with a bot seated' : 'games with a bot seated' }, ...(t.talkLines ? [{ n: t.talkLines, label: t.talkLines === 1 ? 'line of table talk' : 'lines of table talk' }] : []), - ...Object.entries(t.byGame).filter(([label]) => !onCards.has(label)).map(([label, n]) => ({ n, label })) + ...Object.entries(t.byGame).map(([label, n]) => ({ n, label })) ]; const first = t.firstGameAt ? `The first game began ${new Date(t.firstGameAt).toLocaleDateString(undefined, { year: 'numeric', month: 'long', day: 'numeric' })}. ` : ''; return { headline, details, note: `${first}Names are counted, not people: one player under two names is two here. Table time counts only the minutes between moves, so a game left open overnight adds nothing for the night.` }; @@ -321,7 +320,7 @@ {#snippet aboutGame()}
        -

        Gary Gygax, who made Dungeons & Dragons, published Dragonchess in the hundredth issue of Dragon Magazine, in August 1985, as seven pages of rules and no board. He played it against himself on three sheets of plexiglass with metal miniatures for pieces, and told readers that three rectangles laid in a row on a table would do. The keeper has that issue on the shelf and built the boards it never came with.

        +

        Gary Gygax, who made Dungeons & Dragons, published Dragonchess in the hundredth issue of Dragon Magazine, in August 1985, as seven pages of rules and no board. It was playtested on three sheets of plexiglass with metal miniatures for pieces, and he told readers that three rectangles laid in a row on a table would do. The keeper has that issue on the shelf and built the boards it never came with.

        Wyrm plays the game as the article gives it, every piece as written, with the few open readings settled on the rules page, where the article is transcribed in full. The house player is a drake, a search that reads a few moves ahead and values the pieces roughly as Gygax did, so it is fair company for a first game and beatable by a careful one. The name is this site's own. Dragonchess was Gygax's and TSR's, and another company sells a game called Dragon Chess that has nothing to do with this one.

        It is free and keeps no accounts. A game lives on a small server as an append-only ledger of moves, so it can be replayed from its first move, and nothing in it is hidden from either player or from the gallery.

        diff --git a/src/lib/components/LessonBoard.svelte b/src/lib/components/LessonBoard.svelte index 5cbb815..4f86933 100644 --- a/src/lib/components/LessonBoard.svelte +++ b/src/lib/components/LessonBoard.svelte @@ -1,37 +1,30 @@
        - +
        diff --git a/src/lib/components/PiecePanel.svelte b/src/lib/components/PiecePanel.svelte index cc23a0f..59af640 100644 --- a/src/lib/components/PiecePanel.svelte +++ b/src/lib/components/PiecePanel.svelte @@ -4,8 +4,7 @@ // how to play it. The lore is src/lib/game/lore.ts; the rest is read off // the board. import { LORE } from '$lib/game/lore'; - import { NAMES, LETTERS, kindOf, sideOf, levelOf, rankOf, frozen, movesFrom, legalMovesFrom, squareName, inCheck, type State, type Side } from '$lib/game'; - import { VALUES, PER_LEVEL } from '$lib/game/board'; + import { NAMES, LETTERS, SIDE_NAMES, VALUES, PER_LEVEL, kindOf, sideOf, levelOf, rankOf, frozen, movesFrom, legalMovesFrom, squareName, inCheck, type State, type Side } from '$lib/game'; let { g, at, mySide, close }: { g: State; at: number; mySide: Side | null; close: () => void } = $props(); @@ -13,15 +12,14 @@ const kind = $derived(kindOf(cell)); const side = $derived(sideOf(cell)!); const lore = $derived(LORE[kind]); - const sideWord = $derived(side === 'gold' ? 'Gold' : 'Scarlet'); - const owner = $derived(mySide === null ? `${sideWord}’s` : side === mySide ? 'Your' : `${sideWord}’s`); + const owner = $derived(side === mySide ? 'Your' : `${SIDE_NAMES[side]}’s`); const world = (i: number) => (levelOf(i) === 3 ? 'in the air' : levelOf(i) === 1 ? 'in the underworld' : 'on the land'); const value = $derived(kind === 'K' ? 'beyond price' : String(VALUES[kind]).replace('.5', '½')); /** Whose piece a victim is, from the viewer's side of the table. */ const whose = (i: number) => { const s = sideOf(g.cells[i])!; - return mySide === null ? `${s === 'gold' ? 'Gold' : 'Scarlet'}’s` : s === mySide ? 'your' : 'the'; + return mySide === null ? `${SIDE_NAMES[s]}’s` : s === mySide ? 'your' : 'the'; }; const list = (items: string[]) => (items.length <= 1 ? items[0] ?? '' : `${items.slice(0, -1).join(', ')} and ${items[items.length - 1]}`); diff --git a/src/lib/components/SeatsSlip.svelte b/src/lib/components/SeatsSlip.svelte index c644c45..cdb7939 100644 --- a/src/lib/components/SeatsSlip.svelte +++ b/src/lib/components/SeatsSlip.svelte @@ -63,7 +63,7 @@ {:else} - + {/if} {/if} diff --git a/src/lib/game/board.ts b/src/lib/game/board.ts index 3f6eb5e..f2dfad1 100644 --- a/src/lib/game/board.ts +++ b/src/lib/game/board.ts @@ -31,12 +31,13 @@ export const LETTERS: Record = { S: 'S', G: 'G', R: 'Dr', W: 'W', O: 'O', U: 'U', H: 'H', T: 'T', C: 'C', M: 'M', K: 'K', P: 'P', D: 'D', B: 'B', E: 'E' }; -/** Gygax's values, with the King beyond price. */ +/** Gygax's values. He gives the King none: 0 here, and the panel says "beyond price". */ export const VALUES: Record = { K: 0, M: 11, P: 10, C: 9, R: 8, G: 5, O: 5, H: 4.5, T: 4, E: 4, B: 3, U: 2.5, D: 2, S: 1, W: 1 }; export const SIDES: Side[] = ['gold', 'scarlet']; +export const SIDE_NAMES: Record = { gold: 'Gold', scarlet: 'Scarlet' }; export const other = (side: Side): Side => (side === 'gold' ? 'scarlet' : 'gold'); /** A cell index from level 1 to 3, file 0 to 11 and rank 0 to 7. */ @@ -128,11 +129,10 @@ export function movesFrom(cells: Cell[], from: number, setup: Setup = 'printed') const enemy = (i: number) => cells[i] !== '' && sideOf(cells[i]) !== side; const open = (i: number) => cells[i] === '' || sideOf(cells[i]) !== side; /** Add the square if it is on the board and passes the test. */ - const add = (lv: number, file: number, rank: number, ok: (i: number) => boolean) => { - if (lv < 1 || lv > LEVELS || !inBounds(file, rank)) return false; + const add = (lv: number, file: number, rank: number, ok: (i: number) => boolean): void => { + if (lv < 1 || lv > LEVELS || !inBounds(file, rank)) return; const i = idx(lv, file, rank); if (ok(i)) out.push(i); - return true; }; /** Slide until something is in the way; a piece of the other side may be taken. */ const slide = (dirs: number[][]) => { diff --git a/src/lib/game/bot.ts b/src/lib/game/bot.ts index 56ea0d2..d9decbb 100644 --- a/src/lib/game/bot.ts +++ b/src/lib/game/bot.ts @@ -5,7 +5,7 @@ // replays to the same choice. import { - CELLS, PER_LEVEL, VALUES, type Cell, type Kind, type Side, type Setup, + CELLS, type Cell, type Kind, type Side, type Setup, frozen, idx, kindOf, levelOf, rankOf, fileOf, movesFrom, other, playOn, sideOf, inCheck, legalMoves } from './board'; @@ -15,12 +15,16 @@ const MAX_DEPTH = 8; const QUIESCE_DEPTH = 4; const MATE = 100_000; -/** Centipawn-ish weights: Gygax's values times twenty, the Dragon raised as Jackman advises. */ +/** + * Centipawn-ish weights: Gygax's values times twenty, except the Dragon, + * raised to a Paladin's weight. Edward Jackman's write-up on the Chess + * Variant Pages argues Gygax's 8 is too low, and the search bears it out. + */ const WEIGHT: Record = { K: 0, M: 220, P: 200, C: 180, R: 200, G: 100, O: 100, H: 90, T: 80, E: 80, B: 60, U: 50, D: 40, S: 20, W: 20 }; -/** The pieces that can reach the air and so can hunt a Dragon: the Griffon, the Hero, the Paladin and the Mage. */ +/** The land pieces fast enough to hunt a Dragon in the air. The Cleric and the King can rise too, but a step at a time. */ const HUNTERS: ReadonlySet = new Set(['G', 'H', 'P', 'M']); /** Chebyshev distance between two squares of the air, the Dragon's measure. */ diff --git a/src/lib/game/chronicle.ts b/src/lib/game/chronicle.ts index 3fdbd12..91f54d4 100644 --- a/src/lib/game/chronicle.ts +++ b/src/lib/game/chronicle.ts @@ -5,10 +5,8 @@ // replay of the moves, so the chronicle is a function of the game and // never part of the ledger: rewording it changes no rules. -import { - type Cell, type Kind, type Side, CELLS, PER_LEVEL, NAMES, frozen, kindOf, levelOf, opening, other, playOn, rankOf, sideOf, squareName -} from './board'; -import type { Move, State } from './index'; +import { type Cell, type Kind, type Side, PER_LEVEL, NAMES, frozen, kindOf, levelOf, opening, other, playOn, rankOf, sideOf, squareName } from './board'; +import { playerName, type Move, type State } from './index'; export type LineKind = 'move' | 'capture' | 'check' | 'freeze' | 'promotion' | 'end' | 'note'; @@ -48,7 +46,6 @@ function crossing(kind: Kind, from: number, to: number): string { /** How a victim is told. */ function falls(victim: Kind, owner: string, where: string): string { switch (victim) { - case 'K': return `${owner} King is taken`; case 'R': return `${owner} Dragon falls from the sky at ${where}`; case 'B': return `${owner} Basilisk is crushed at ${where}, and its gaze is broken`; case 'S': return `${owner} Sylph is scattered at ${where}`; @@ -57,8 +54,6 @@ function falls(victim: Kind, owner: string, where: string): string { } } -const possessive = (name: string) => `${name}’s`; - /** The pieces on the land held frozen, by square. */ function frozenSquares(cells: Cell[]): Set { const held = new Set(); @@ -66,10 +61,13 @@ function frozenSquares(cells: Cell[]): Set { return held; } +/** Whose a piece is, as a possessive: "Aud’s", "Scarlet’s", or "Your" at a lesson. */ +export type Owner = (side: Side) => string; + /** Tell one move from the position it was made in. */ -function tellOne(before: Cell[], move: Move, ply: number, name: (side: Side) => string): { lines: Line[]; after: Cell[] } { - const who = possessive(name(move.by)); - const foe = possessive(name(other(move.by))); +function tellOne(before: Cell[], move: Move, owner: Owner): { lines: Line[]; after: Cell[] } { + const who = owner(move.by); + const foe = owner(other(move.by)); const piece = NAMES[move.kind]; const from = squareName(move.from); const to = squareName(move.to); @@ -95,7 +93,7 @@ function tellOne(before: Cell[], move: Move, ply: number, name: (side: Side) => const heldBefore = frozenSquares(before); const heldAfter = frozenSquares(after); for (const i of heldAfter) { - if (heldBefore.has(i) && !(move.afar === false && i === move.to)) continue; + if (heldBefore.has(i) && (move.afar || i !== move.to)) continue; const owner = sideOf(after[i]) === move.by ? who : foe; lines.push({ kind: 'freeze', text: `The Basilisk’s gaze falls on ${owner} ${NAMES[kindOf(after[i])]} at ${squareName(i)}, which cannot stir.` }); } @@ -118,20 +116,16 @@ function tellOne(before: Cell[], move: Move, ply: number, name: (side: Side) => } if (move.check) lines.push({ kind: 'check', text: `${foe} King is in check.` }); - void ply; return { lines, after }; } /** The whole game told, one entry a move, from a replay of the moves. A game begun from the opening needs no `start`. */ export function narrate(state: State, start?: Cell[]): Telling[] { - const name = (side: Side) => { - const seat = state.seats.find((id) => state.players[id].side === side); - return seat ? state.players[seat].name : side === 'gold' ? 'Gold' : 'Scarlet'; - }; + const owner: Owner = (side) => `${playerName(state, side)}’s`; let cells = start ?? opening(state.setup); const out: Telling[] = []; state.moves.forEach((move, n) => { - const { lines, after } = tellOne(cells, move, n + 1, name); + const { lines, after } = tellOne(cells, move, owner); cells = after; out.push({ ply: n + 1, move, lines }); }); @@ -140,8 +134,6 @@ export function narrate(state: State, start?: Cell[]): Telling[] { } /** One move told on its own, from the position it was made in. */ -export function tell(before: Cell[], move: Move, name: (side: Side) => string): string { - return tellOne(before, move, 0, name).lines.map((l) => l.text).join(' '); +export function tell(before: Cell[], move: Move, owner: Owner): string { + return tellOne(before, move, owner).lines.map((l) => l.text).join(' '); } - -export { CELLS }; diff --git a/src/lib/game/index.test.ts b/src/lib/game/index.test.ts index 5c3323f..ce006ed 100644 --- a/src/lib/game/index.test.ts +++ b/src/lib/game/index.test.ts @@ -1,15 +1,19 @@ import { describe, expect, it } from 'vitest'; -import { CURRENT_RULES, applyMove, createGame, game, describe as tell, notation, positionKey, resolveRound, validateMove, type State } from './index'; +import { CURRENT_RULES, applyMove, createGame, game, notation, positionKey, resolveRound, validateMove, type State } from './index'; import { CELLS, census, frozen, inCheck, kindOf, legalMoves, legalMovesFrom, movesFrom, opening, playOn, square, squareName, type Cell, type Side } from './board'; import { chooseMove, evaluate } from './bot'; +import { narrate, tell } from './chronicle'; + +/** The players' names as the chronicle writes them. */ +const owner = (side: Side) => (side === 'gold' ? 'Aud’s' : 'Bjorn’s'); /** A position from a few named pieces: 'gK' on '2g1' and so on. Kings are added where none is given. */ function position(pieces: Record, toMove: Side = 'gold'): State { const s = createGame({ A: 'Aud', B: 'Bjorn' }); s.cells = new Array(CELLS).fill(''); for (const [name, cell] of Object.entries(pieces)) s.cells[square(name)] = cell; - if (!s.cells.includes('gK')) s.cells[square('2l1')] = s.cells[square('2l1')] || 'gK'; - if (!s.cells.includes('sK')) s.cells[square('2a8')] = s.cells[square('2a8')] || 'sK'; + if (!s.cells.includes('gK')) s.cells[square('2l1')] = 'gK'; + if (!s.cells.includes('sK')) s.cells[square('2a8')] = 'sK'; s.toMove = toMove; s.seen = { [positionKey(s.cells, toMove)]: 1 }; return s; @@ -209,7 +213,7 @@ describe('the lower board', () => { const s = position({ '1d4': 'gB', '2d4': 'sO', '2d3': 'gW' }); expect(frozen(s.cells, square('2d4'))).toBe(true); expect(names(s.cells, '2d4')).toEqual([]); - // The frozen Oliphant looks along the rank at Gold's King on l... put the King in its line. + // Gold's King on the frozen Oliphant's rank is not in check: a held piece threatens nothing. const line = position({ '1d4': 'gB', '2d4': 'sO', '2l4': 'gK' }); expect(inCheck(line.cells, 'gold')).toBe(false); line.cells[square('1d4')] = ''; @@ -301,17 +305,17 @@ describe('check and the ends', () => { const after = resolveRound(s, { A: { from: square('2c2'), to: square('2c3') } }); expect(after.toMove).toBe('scarlet'); expect(after.moves).toHaveLength(1); - expect(tell(after, after.moves[0])).toBe('Aud’s Warrior steps from 2c2 to 2c3.'); + expect(tell(s.cells, after.moves[0], owner)).toBe('Aud’s Warrior steps from 2c2 to 2c3.'); expect(notation(after.moves[0])).toBe('W/2c2-2c3'); }); it('tells a capture, a climb and a strike from afar', () => { const s = position({ '3c4': 'gR', '2c4': 'sW', '2e4': 'gH' }); const afar = applyMove(s, square('3c4'), square('2c4')); - expect(tell(afar, afar.moves[0], s.cells)).toBe('Aud’s Dragon strikes down from 3c4 without leaving the air, and Bjorn\u2019s Warrior falls at 2c4.'); + expect(tell(s.cells, afar.moves[0], owner)).toBe('Aud’s Dragon strikes down from 3c4 without leaving the air, and Bjorn\u2019s Warrior falls at 2c4.'); expect(notation(afar.moves[0])).toBe('Drx2c4'); const climb = applyMove(s, square('2e4'), square('3d5')); - expect(tell(climb, climb.moves[0], s.cells)).toBe('Aud’s Hero springs up from 2e4 to 3d5, into the air.'); + expect(tell(s.cells, climb.moves[0], owner)).toBe('Aud’s Hero springs up from 2e4 to 3d5, into the air.'); }); }); @@ -372,8 +376,7 @@ describe('the drake', () => { }); describe('the chronicle', () => { - it('tells a Basilisk’s gaze falling and lifting, a Warrior standing up a Hero, and a King leaving the land', async () => { - const { narrate } = await import('./chronicle'); + it('tells a Basilisk’s gaze falling and lifting, a Warrior standing up a Hero, and a King leaving the land', () => { const s = position({ '1c3': 'gB', '2d4': 'sT', '2a7': 'gW', '2g1': 'gK' }); s.cells[square('2l1')] = ''; const frozen = applyMove(s, square('1c3'), square('1d4')); @@ -386,9 +389,9 @@ describe('the chronicle', () => { 'Aud’s Basilisk slithers from 1d4 to 1d5.', 'Bjorn’s Thief at 2d4 is free to move again.' ]); - const hero = applyMove(applyMove(freed, square('2b7'), square('2a8')), square('2a7'), square('2a8')); + const hero = applyMove(applyMove(freed, square('2b7'), square('2c7')), square('2a7'), square('2a8')); const told = narrate(hero, s.cells)[4].lines; - expect(told[0].text).toBe('Aud’s Warrior steps from 2a7 to 2a8, and Bjorn’s King is taken.'); + expect(told[0].text).toBe('Aud’s Warrior steps from 2a7 to 2a8.'); expect(told.some((l) => l.kind === 'promotion')).toBe(true); const up = applyMove(s, square('2g1'), square('3g1')); expect(narrate(up, s.cells)[0].lines.map((l) => l.text)).toEqual([ diff --git a/src/lib/game/index.ts b/src/lib/game/index.ts index 6ded756..af51563 100644 --- a/src/lib/game/index.ts +++ b/src/lib/game/index.ts @@ -5,22 +5,21 @@ // around them: seats, turns, the ends, and the GameSpec the kit runs. import { type GameSpec, type Outcome, type SeatId, type TableOptions } from './spec'; -import { - type Cell, type Kind, type Side, type Setup, NAMES, LETTERS, cellOf, hasLegalMove, inCheck, kindOf, legalMovesFrom, - levelOf, movesFrom, opening, other, playOn, sideOf, squareName -} from './board'; -export { FILES, RANKS, LEVELS, PER_LEVEL, fileOf, rankOf, levelOf, idx, isLight, kindOf, sideOf, frozen, kingSquare, inCheck, other, square, playOn } from './board'; +import { type Cell, type Kind, type Side, type Setup, LETTERS, NAMES, SIDE_NAMES, hasLegalMove, inCheck, kindOf, legalMovesFrom, levelOf, movesFrom, opening, other, playOn, sideOf, squareName } from './board'; import { chooseMove } from './bot'; -import { narrate } from './chronicle'; + +// The board's geometry and move generation, re-exported so the browser imports one module. +export type { Cell, Kind, Side, Setup }; +export { + CELLS, FILES, LEVELS, PER_LEVEL, RANKS, NAMES, LETTERS, SIDE_NAMES, VALUES, cellOf, fileOf, frozen, hasLegalMove, idx, inCheck, isLight, kindOf, kingSquare, + legalMovesFrom, levelOf, movesFrom, other, playOn, rankOf, sideOf, square, squareName +} from './board'; export const CURRENT_RULES = 1; /** Plies without a capture before the game is drawn: fifty moves by each side. */ export const QUIET_LIMIT = 100; -export type { Cell, Kind, Side, Setup }; -export { NAMES, LETTERS, squareName, legalMovesFrom, movesFrom }; - export interface Player { id: SeatId; name: string; @@ -62,18 +61,16 @@ export interface State { export type Input = { from: number; to: number }; -export const SIDES: { value: Side; label: string; note: string }[] = [ +export const SIDE_CHOICES: { value: Side; label: string; note: string }[] = [ { value: 'gold', label: 'Gold, and move first', note: 'Gold opens the game.' }, { value: 'scarlet', label: 'Scarlet', note: 'Scarlet answers.' } ]; -export const SETUPS: { value: Setup; label: string; note: string }[] = [ +export const SETUP_CHOICES: { value: Setup; label: string; note: string }[] = [ { value: 'printed', label: 'As printed in 1985', note: 'The Sylphs stand on a, c, e, g, i and k. Gold’s Dragon can take one on the first move.' }, { value: 'shifted', label: 'Sylphs shifted one file', note: 'The Sylphs stand over the Dwarves, on b, d, f, h, j and l, out of the Dragons’ reach.' } ]; -export const sideName = (side: Side): string => (side === 'gold' ? 'Gold' : 'Scarlet'); - export function createGame(names: Record, _seed = 0, rules = CURRENT_RULES, options?: TableOptions): State { const seats = Object.keys(names); const hostSide: Side = options?.side === 'scarlet' ? 'scarlet' : 'gold'; @@ -94,7 +91,7 @@ export function seatOf(state: State, side: Side): SeatId | null { export function playerName(state: State, side: Side): string { const seat = seatOf(state, side); - return seat ? state.players[seat].name : sideName(side); + return seat ? state.players[seat].name : SIDE_NAMES[side]; } /** The end of the game in words a player reads, and the key the tally counts. */ @@ -155,13 +152,6 @@ export function resolveRound(previous: State, inputs: Record): St return applyMove(previous, input.from, input.to); } -/** The move told as the chronicle tells it, with what came of it. */ -export function describe(state: State, move: Move, start?: Cell[]): string { - const n = state.moves.indexOf(move); - const telling = narrate(state, start)[n]; - return telling ? telling.lines.map((l) => l.text).join(' ') : ''; -} - /** The move in Gygax's notation: piece, from, x, to, with (H), "afar" and ch as he wrote them. */ export function notation(move: Move): string { const piece = LETTERS[move.kind]; @@ -177,12 +167,11 @@ export const game: GameSpec = { botNames: ['Fafnir', 'Nidhogg', 'Ladon', 'Vritra', 'Apep', 'Jormungand'], currentRules: CURRENT_RULES, options: [ - { key: 'side', label: 'You play', choices: SIDES, default: 'gold' }, - { key: 'setup', label: 'The Sylphs', choices: SETUPS, default: 'printed' } + { key: 'side', label: 'You play', choices: SIDE_CHOICES, default: 'gold' }, + { key: 'setup', label: 'The Sylphs', choices: SETUP_CHOICES, default: 'printed' } ], preferences: [ - { key: 'coordinates', label: 'Square names on the boards', kind: 'toggle', default: true }, - { key: 'letters', label: 'Pieces as letters', kind: 'toggle', default: false, note: 'Gygax’s initials instead of the drawn pieces.' } + { key: 'coordinates', label: 'Square names on the boards', kind: 'toggle', default: true } ], create: createGame, resolve: resolveRound, @@ -191,10 +180,8 @@ export const game: GameSpec = { turn: (state) => state.moves.length + 1, // Nothing is hidden on any board, so every viewer sees the whole state. view: (state) => state, - botInput: (state, seat) => { - const side = state.players[seat]?.side ?? state.toMove; - return chooseMove(state.cells, side, state.setup) ?? { from: -1, to: -1 }; - }, + // A side with no legal move has already ended the game, so the drake is never asked for one. + botInput: (state, seat) => chooseMove(state.cells, state.players[seat]?.side ?? state.toMove, state.setup)!, cleanInput: (raw) => { const r = raw as { from?: unknown; to?: unknown }; const n = (v: unknown) => (Number.isInteger(v) ? (v as number) : -1); @@ -208,11 +195,10 @@ export const game: GameSpec = { else if (state.end === 'stalemate') lines['ended in stalemate'] = 1; else if (state.end === 'repetition') lines['drawn by repetition'] = 1; else if (state.end === 'quiet') lines['drawn after fifty quiet moves'] = 1; - if (state.over?.winner) lines[`won by ${sideName(state.players[state.over.winner].side)}`] = 1; + if (state.over?.winner) lines[`won by ${SIDE_NAMES[state.players[state.over.winner].side]}`] = 1; lines['moves played'] = state.moves.length; return lines; }, tallyBegun: (options) => ({ [options.setup === 'shifted' ? 'begun with the Sylphs shifted' : 'begun as printed']: 1 }) }; -export { cellOf }; diff --git a/src/lib/game/lessons.test.ts b/src/lib/game/lessons.test.ts index bb89171..cb5b210 100644 --- a/src/lib/game/lessons.test.ts +++ b/src/lib/game/lessons.test.ts @@ -1,6 +1,7 @@ import { describe, expect, it } from 'vitest'; import { SCENES, sceneCells } from './lessons'; -import { frozen, hasLegalMove, inCheck, kindOf, legalMovesFrom, movesFrom, other, playOn, square } from './board'; +import { frozen, hasLegalMove, inCheck, kindOf, legalMovesFrom, movesFrom, playOn, square } from './board'; +import { CALLOUTS, TOLD_MOVES, toldStates } from './told'; describe('the lessons', () => { it('every scene’s move is legal for the side to move, and only the asked-for moves count', () => { @@ -29,7 +30,7 @@ describe('the lessons', () => { return { cells, after: playOn(cells, square(from), square(to)), s }; }; // The Warrior's step is blocked and its capture is not. - expect(movesFrom(sceneCells(at('warrior')), square('2c2')).map((i) => i)).toEqual([square('2d3')]); + expect(movesFrom(sceneCells(at('warrior')), square('2c2'))).toEqual([square('2d3')]); // The Hero leaps the Warrior and takes the Mage. expect(play('hero').after.captured).toBe('M'); // The Mage comes down two boards onto the Basilisk. @@ -51,7 +52,7 @@ describe('the lessons', () => { // The King is in check before it moves, and out of it after either move; up or down leaves it off the land. const king = sceneCells(at('king')); expect(inCheck(king, 'gold')).toBe(true); - expect(legalMovesFrom(king, square('2g1'), 'printed').map((i) => i).sort()).toEqual([square('1g1'), square('2f1'), square('2h1'), square('3g1')].sort()); + expect(legalMovesFrom(king, square('2g1'), 'printed').sort()).toEqual([square('1g1'), square('2f1'), square('2h1'), square('3g1')].sort()); // The last scene is mate in one by either listed move, and by no other. const mate = play('mate'); for (const [from, to] of mate.s.moves) { @@ -67,13 +68,11 @@ describe('the lessons', () => { } expect(kindOf(mate.cells[square('2d4')])).toBe('K'); expect(frozen(mate.cells, square('2d4'))).toBe(true); - void other; }); }); describe('the game told', () => { - it('plays through the engine from the opening to a checkmate, and every callout sits on a move', async () => { - const { toldStates, TOLD_MOVES, CALLOUTS } = await import('./told'); + it('plays through the engine from the opening to a checkmate, and every callout sits on a move', () => { const states = toldStates(); expect(states).toHaveLength(TOLD_MOVES.length + 1); const last = states[states.length - 1]; diff --git a/src/lib/game/lessons.ts b/src/lib/game/lessons.ts index b1aee60..c81b17b 100644 --- a/src/lib/game/lessons.ts +++ b/src/lib/game/lessons.ts @@ -1,8 +1,8 @@ // The lessons: one scene a piece, each a small position with something to // see and a move to make. The page shows the boards the scene needs, says // what to look at, takes the move from the player, and tells what came of -// it. Every scene's move is checked legal by a test, and every claim in -// the words is checked against board.ts there too. +// it. A test plays every scene's move through the engine and checks the +// captures, the freeze and the mate the words promise. import { type Cell, type Side, CELLS, square } from './board'; @@ -37,7 +37,7 @@ export const SCENES: Scene[] = [ before: 'Twelve of these stand in a wall at the start. A Warrior steps one square straight ahead, never two, and takes one square diagonally ahead, as a pawn does. The Unicorn at 2c3 blocks this one’s step, but the Warrior at 2d3 is on its diagonal.', task: 'Take the Scarlet Warrior. Tap your Warrior at 2c2, then 2d3.', moves: [['2c2', '2d3']], - after: 'The Warrior falls, and yours stands on the d file now. A Warrior that reaches the far rank stands up a Hero, with no choice about it, which is a real gain but not a queen. There is no double step and no capture in passing, because Gygax limited the Warrior to the old single step of shatranj, and so every advance is a commitment.', + after: 'The Warrior falls, and yours stands on the d file now. A Warrior that reaches the far rank stands up a Hero, with no choice about it, which is a real gain but not a queen. There is no double step and no capture in passing, so every advance is a commitment.', aside: 'That is a legal move, but the Warrior at 2d3 is the one to take. Set the scene again and look for it.' }, { @@ -49,7 +49,7 @@ export const SCENES: Scene[] = [ before: 'The war elephant is a rook by another name. It runs any distance along a rank or a file while the way is clear, and never leaves the land. The a file is open from your corner to the Thief at 2a6.', task: 'Take the Thief. Tap the Oliphant at 2a1, then 2a6.', moves: [['2a1', '2a6']], - after: 'On a board twelve squares wide an open file runs a long way, and the Oliphant is the piece that owns it. Remember what the sky can do, though. An Oliphant standing on the land beneath an enemy Dragon is as good as lost, because it cannot strike back upward.', + after: 'On a board twelve squares wide an open file runs a long way, and the Oliphant is the piece that owns it. Look up before you settle on a file, though. The Oliphant cannot strike at the air, so an enemy Dragon over the squares ahead of it takes it at leisure.', aside: 'A legal move, but the Thief at 2a6 is the one to take. Set the scene again and look for it.' }, { @@ -73,7 +73,7 @@ export const SCENES: Scene[] = [ before: 'The bishop of the land, quick along the diagonals. From 2d1 the diagonal runs e2, f3, g4 and on to the Oliphant at 2h5, with nothing in the way.', task: 'Take the Oliphant. Tap the Thief, then 2h5.', moves: [['2d1', '2h5']], - after: 'Five squares in one move, and a five-point piece for a four-point one. A Thief’s work is in the middle ranks, which is where the Dragon hunts from the air, so it is the piece most often lost to a strike from above. Two Thieves cover both colours of square.', + after: 'Four squares in one move, and a five-point piece for a four-point one. A Thief’s work is in the middle ranks, which is where the Dragon hunts from the air, so look up before you leave it there. Two Thieves cover both colours of square.', aside: 'A legal move, but the Oliphant at 2h5 is the one to take. Set the scene again and look for it.' }, { @@ -97,7 +97,7 @@ export const SCENES: Scene[] = [ before: 'The one piece at home on every board. It moves one square in any direction wherever it stands, and it can step straight up or down to the board above or below. A Scarlet Sylph hovers directly over it.', task: 'Step up into the air and take the Sylph. Tap the Cleric, then 3e4 on the upper board.', moves: [['2e4', '3e4']], - after: 'The Cleric is in the air now and moves there exactly as it did on the land. Gygax says not to underestimate it. Of the five kinds of piece that can visit all three boards, it is the only one that plays the same on each, and he values it at nine, above the Dragon.', + after: 'The Cleric is in the air now and moves there exactly as it did on the land. Nothing else that visits all three boards keeps its moves on each, which is why Gygax values it at nine, above the Dragon.', aside: 'A legal move, but the step up to 3e4 is the one to see. Set the scene again and look for it.' }, { @@ -109,7 +109,7 @@ export const SCENES: Scene[] = [ before: 'On the land the Mage is a queen. Here it is in the air, where it can only step one square along a rank or file, or move straight up or down. Straight down two boards is the underworld, and a Scarlet Basilisk sits there at 1c4. The land square between, 2c4, is empty, and it has to be, because the Mage does not vault.', task: 'Descend two boards and take the Basilisk. Tap the Mage, then 1c4 on the lowest board.', moves: [['3c4', '1c4']], - after: 'The Basilisk is crushed and the Mage stands in the underworld, where it is a shadow of itself, one step at a time. Gygax warns against bringing the Mage out early, since lesser pieces develop by chasing it. Its moves between boards serve it best as an escape.', + after: 'The Basilisk is crushed and the Mage stands in the underworld, where it is a shadow of itself, one step at a time. Gygax warns against bringing the Mage out early, since lesser pieces develop by chasing it.', aside: 'A legal move, but the drop to 1c4 is the one to see. Set the scene again and look for it.' }, { @@ -145,7 +145,7 @@ export const SCENES: Scene[] = [ before: 'Half eagle and half lion. In the air the Griffon leaps two squares one way and three the other, so the Warrior at 3f7 is one leap away. It can also swoop to the land, onto any of the four squares diagonally beside the square beneath it. The Thief at 2e5 is one of those four.', task: 'Swoop down and take the Thief. Tap the Griffon, then 2e5 on the middle board.', moves: [['3d4', '2e5']], - after: 'The Thief is gone, and the Griffon is on the land, where it has lost its wings and creeps one square diagonally until it climbs back. Drop to pick off a defender and climb before the land can gather. In the air it is worth a little more than a Hero, and nothing on the land sees its leap coming.', + after: 'The Thief is gone, and the Griffon is on the land, where it has lost its wings and creeps one square diagonally until it climbs back. A Griffon that drops is a Griffon that must climb again, so drop for something worth two moves. Nothing on the land sees its leap coming.', aside: 'A legal move, but the swoop onto the Thief at 2e5 is the one to see. Set the scene again and look for it.' }, { @@ -169,7 +169,7 @@ export const SCENES: Scene[] = [ before: 'A miner of the underworld. It walks one square forward or sideways without taking, and takes one square diagonally ahead, so the Warrior at 1e5 is in reach. It can also strike straight up at the land. A Scarlet Hero has stopped at 2d4, directly over it.', task: 'Burst up and take the Hero. Tap the Dwarf, then 2d4 on the middle board.', moves: [['1d4', '2d4']], - after: 'A Dwarf is a mine beneath the land, and a piece that settles above one is taken. On the land it keeps the same moves, and it comes back down only onto an empty square beneath it. Gygax says the Dwarves play little part early, and make the best outposts late, if you have not hurried them forward.', + after: 'The square above a Dwarf is a trap for anything that settles there. On the land the Dwarf keeps the same moves, and it comes back down only onto an empty square beneath it. Gygax says the Dwarves play little part early, and make the best outposts late, if you have not hurried them forward.', aside: 'A legal move, but the strike up at the Hero on 2d4 is the one to see. Set the scene again and look for it.' }, { @@ -181,7 +181,7 @@ export const SCENES: Scene[] = [ before: 'The serpent whose gaze turns to stone. A Basilisk moves one square forward or diagonally forward, taking what is there, or one square straight back, and never leaves the underworld. Whatever enemy stands on the land directly above it cannot move, take or threaten anything. The Scarlet Mage stands at 2e4. The square beneath it, 1e4, is one step ahead of your Basilisk.', task: 'Slither under the Mage. Tap the Basilisk, then 1e4.', moves: [['1e3', '1e4']], - after: 'The Mage is frozen where it stands, and will be until the Basilisk moves or is taken. Gygax says an immobilised piece can be treated as if it did not exist, except that it still blocks its square. His own trick runs the other way too. Stand a piece of yours over your own Basilisk, and whatever takes it is frozen on the spot for you to take at your leisure.', + after: 'The Mage is frozen where it stands, and will be until the Basilisk moves or is taken. Gygax says an immobilised piece can be treated as if it did not exist, except that it still blocks its square. Stand a piece of yours over your own Basilisk and the trick runs the other way.', aside: 'A legal move, but 1e4, beneath the Mage, is the one to see. Set the scene again and look for it.' }, { @@ -202,10 +202,10 @@ export const SCENES: Scene[] = [ pieces: { '2g1': 'gK', '2g8': 'sO', '2f2': 'gW', '2h2': 'gW' }, side: 'gold', levels: [3, 2, 1], - before: 'The whole game. The King moves one square in any direction on the land, and one step straight up or down between boards. Here it is in check, because the Scarlet Oliphant looks down the open g file. Nothing of yours can take the Oliphant or step into the file, so the King must move. Two squares on the land are safe, and it could also climb into the air or dig into the underworld.', + before: 'The King is the whole game. It moves one square in any direction on the land, and one step straight up or down between boards. Here it is in check, because the Scarlet Oliphant looks down the open g file. Nothing of yours can take the Oliphant or step into the file, so the King must move. Two squares on the land are safe, and it could also climb into the air or dig into the underworld.', task: 'Step out of check along the rank. Tap the King, then 2f1 or 2h1.', moves: [['2g1', '2f1'], ['2g1', '2h1']], - after: 'Safe, and still on the land. The King could have climbed or dug instead, but off the land a King can do nothing except come straight back, and Gygax calls it a sitting duck there. At the table, keep two more things in mind. The square beneath your King is where an enemy Basilisk would freeze it, and your Dragon above it is its roof.', + after: 'Safe, and still on the land. The King could have climbed or dug instead, but off the land a King can do nothing except come straight back, and Gygax says it is easily trapped there. At the table, keep two more things in mind. The square beneath your King is where an enemy Basilisk would freeze it, and your Dragon above it is its roof.', aside: 'That is out of check, but off the land the King can only come back. Set the scene again and stay on the land.' }, { diff --git a/src/lib/game/lore.ts b/src/lib/game/lore.ts index 77a830f..e42e9ba 100644 --- a/src/lib/game/lore.ts +++ b/src/lib/game/lore.ts @@ -1,7 +1,7 @@ // What each piece is, in the game's own voice: the panel a player opens by // tapping a piece. The moves are Gygax's, restated for a reader at the // table. The rest is ours, written from his strategic notes and from the -// shape of the rules, and every claim in it is checked against board.ts. +// shape of the rules, checked against board.ts before either changes. import type { Kind } from './board'; @@ -38,13 +38,13 @@ export const LORE: Record = { is: 'The great wyrm of the sky, roosting above its own King on the g file. The game takes its name from this one.', moves: 'It never leaves the air. It slides any distance along a diagonal, or steps one square in any direction. And it strikes from afar. Without moving, it can take an enemy on the land directly beneath it or on any of the four squares beside that one. The victim is lifted away and the Dragon stays where it is.', why: 'Gygax set the Dragon directly over the King on purpose. Its strike covers the five land squares beneath it, so a Dragon at home is a roof over the King, and a Dragon that flies off to hunt leaves the King under the other Dragon’s shadow.', - play: 'Gygax rated it at eight, and players since have called that too low. The drake values it as a Paladin, and keeps it home until the other Dragon is dead or far away. Early, keep yours home and let it threaten. Later, a Dragon over the enemy’s back rank is a terror, since only five kinds of land piece can reach the air at all. Mind the Sylphs, which capture straight ahead on its board and cost a point to lose.' + play: 'Gygax rated it at eight, and Edward Jackman, who wrote the game up for the Chess Variant Pages, called that too low. The drake values it as a Paladin, and keeps it home until the other Dragon is dead or far away. Early, keep yours home and let it threaten. Later, a Dragon over the enemy’s back rank is a terror, since only five kinds of land piece can reach the air at all. Mind the Sylphs, which capture straight ahead on its board and cost a point to lose.' }, W: { count: 'twelve a side', is: 'The levy of the land, twelve spears in a wall across the second rank.', moves: 'One square straight ahead, never two, and it captures one square diagonally ahead. On reaching the far rank it stands up as a Hero, with no say in the matter. It never leaves the land.', - why: 'A chess pawn with the double step and the capture in passing taken away. Gygax said he limited it to the single step of shatranj, the old game chess came from, which slows the opening and makes every advance a commitment.', + why: 'A chess pawn with the double step and the capture in passing taken away, which slows the opening and makes every advance a commitment.', play: 'Twelve files is a wide front. Push in the middle and leave the wings to the Oliphants. Chains guard one another as in chess. A Warrior that gets through becomes a Hero, worth four and a half, a real gain but not a queen, so do not spend three pieces to get one there.' }, O: { @@ -73,7 +73,7 @@ export const LORE: Record = { is: 'The bishop of the land, quick along the diagonals and quick to be elsewhere.', moves: 'Any distance along a diagonal, as far as the way is clear. It never leaves the land.', why: 'Two Thieves cover both colours of square, and on a board this wide the diagonals run far.', - play: 'A Thief is the piece most often lost to a Dragon’s strike, because its work is in the middle ranks where the Dragon hunts. Keep it on a diagonal the Dragon does not cover, and remember that a Basilisk beneath a Thief freezes it mid-flight.' + play: 'A Thief works in the middle ranks, where the Dragon hunts, so keep it on a diagonal the Dragon does not cover, and remember that a Basilisk beneath a Thief freezes it mid-flight.' }, C: { count: 'one a side', @@ -87,14 +87,14 @@ export const LORE: Record = { is: 'The queen of the land, and a traveller between worlds with little to do once it has arrived.', moves: 'On the land a Mage slides any distance along a rank, file or diagonal. It can also move straight up or down, one board or two, though to pass through the land the square there must be empty. In the air or the underworld it is reduced to one square sideways, forward or back.', why: 'The most valuable piece on the board, worth eleven, and Gygax warns against the queen hunt. A Mage brought out early is chased by lesser pieces that develop as they chase it.', - play: 'Keep it back until the Unicorns and Heroes are out. Its step between boards is a way to flee a Dragon’s gaze, or to drop into the underworld and take a Basilisk from beside it, but a Mage down there is a shadow of itself and takes three moves to go and come back. Its moves between boards serve it best as an escape.' + play: 'Keep it back until the Unicorns and Heroes are out. Its step between boards is a way to flee a Dragon’s gaze, or to drop into the underworld and take a Basilisk from beside it, but a Mage down there is a shadow of itself and takes three moves to go and come back.' }, K: { count: 'one a side', is: 'The King of the land. The game is won by trapping the other one and lost by losing this one.', moves: 'One square in any direction on the land, and one step straight up to the air or down to the underworld, taking what is there. Off the land it can do nothing but come straight back.', why: 'As in chess, the object is to checkmate it. A King attacked with no escape loses the game, and a King frozen by a Basilisk beneath it is mated by any attack that cannot be blocked or captured.', - play: 'Keep the square beneath it in mind. An enemy Basilisk that reaches the underworld under your King freezes it where it stands. Keep it on the land unless staying is worse, since off the land it can only return, and Gygax calls it a sitting duck there. The Dragon above it is its roof.' + play: 'Keep the square beneath it in mind. An enemy Basilisk that reaches the underworld under your King freezes it where it stands. Keep it on the land unless staying is worse, since off the land it can only return, and Gygax says it is easily trapped there. The Dragon above it is its roof.' }, P: { count: 'one a side', @@ -114,7 +114,7 @@ export const LORE: Record = { count: 'two a side', is: 'The serpent whose gaze turns to stone. Whatever enemy stands on the land directly above a Basilisk cannot move, cannot take, and threatens nothing, until the Basilisk moves or dies.', moves: 'It moves one square straight or diagonally forward, taking what is there, or one square straight back onto an empty square. It never leaves the underworld. The freeze is not a move. It simply holds for as long as the Basilisk stays beneath its victim.', - why: 'The Basilisk is the game’s one trick that chess does not have. It is how the underworld reaches the land without ever rising.', + why: 'The Basilisk is how the underworld reaches the land without ever rising.', play: 'Gygax’s own advice is to stand a piece of yours over your own Basilisk. Whatever captures it is frozen on the spot, and you take it at your leisure. A Basilisk arriving under a piece that guards the enemy King can be a checkmate on its own, and a Basilisk under the King itself leaves it unable to step out of any check. Walk it forward early. It is slow, and the squares that matter are far away.' }, E: { diff --git a/src/routes/guide/+page.svelte b/src/routes/guide/+page.svelte index 6c6c878..b07b4df 100644 --- a/src/routes/guide/+page.svelte +++ b/src/routes/guide/+page.svelte @@ -31,7 +31,7 @@

        The hall

        The hall, with a name field, the two table choices, the button to play the drake, and the opening position drawn beside them

        Write your name and choose your company. Play now against a drake seats you across from the house player and begins at once. Open a table lays a table and hands you a link and a four-letter code to send to a friend. Join one takes a code someone sent you.

        -

        Two choices sit above the buttons. You play picks your side, and Gold moves first. The Sylphs picks where the six Sylphs start. As Gygax printed it, Gold's Dragon can take an undefended Sylph on the very first move, which a reader of the Chess Variant Pages took for a misprint. The shifted setup moves the Sylphs one file over, out of reach. Beneath the buttons, your games lists every table this browser holds a seat at and whose move it is.

        +

        Two choices sit above the buttons. You play picks your side, and Gold moves first. The Sylphs picks where the six Sylphs start. As Gygax printed it, Gold's Dragon can take an undefended Sylph on the very first move, which a reader of the Chess Variant Pages took for a misprint. The shifted setup moves the Sylphs one file over, out of reach. Your games, which comes first once you have one, lists every table this browser holds a seat at and whose move it is.

        diff --git a/src/routes/learn/+page.svelte b/src/routes/learn/+page.svelte index a4ea592..ef6784b 100644 --- a/src/routes/learn/+page.svelte +++ b/src/routes/learn/+page.svelte @@ -6,8 +6,7 @@ import PiecePanel from '$lib/components/PiecePanel.svelte'; import { SCENES, sceneCells } from '$lib/game/lessons'; import { tell } from '$lib/game/chronicle'; - import { createGame, playOn, square, squareName, type Cell, type Move } from '$lib/game'; - import { kindOf, inCheck, hasLegalMove, other } from '$lib/game/board'; + import { createGame, playOn, square, kindOf, inCheck, hasLegalMove, other, SIDE_NAMES, type Cell, type Move, type Side } from '$lib/game'; const room = $derived((page.url.searchParams.get('room') ?? '').toUpperCase()); const withRoom = (path: string) => (room ? `${path}?room=${room}` : path); @@ -31,17 +30,17 @@ const right = scene.moves.some(([a, b]) => square(a) === from && square(b) === to); const played = playOn(cells, from, to); const move: Move = { by: scene.side, from, to, kind: kindOf(cells[from]), captured: played.captured, afar: played.afar, promoted: played.promoted, check: inCheck(played.cells, other(scene.side)) }; - const name = (s: typeof scene.side) => (s === scene.side ? 'You' : 'Scarlet'); - let told = tell(cells, move, name).replace(/You’s/g, 'Your'); + const owner = (s: Side) => (s === scene.side ? 'Your' : `${SIDE_NAMES[s]}’s`); + let told = tell(cells, move, owner); const mated = move.check && !hasLegalMove(played.cells, other(scene.side), 'printed'); if (mated) told += ' Checkmate.'; outcome = { told, text: right ? scene.after : (scene.aside ?? scene.after), right }; cells = played.cells; } - /** The panel reads a game; this one is the scene's. */ + /** The board and the panel read a game; this one is the scene's, with the reader on the scene's side. */ const g = $derived.by(() => { - const s = createGame({ A: 'You', B: 'Scarlet' }); + const s = createGame({ A: scene.side === 'gold' ? 'You' : SIDE_NAMES.gold, B: scene.side === 'scarlet' ? 'You' : SIDE_NAMES.scarlet }); s.cells = cells; s.toMove = scene.side; return s; @@ -52,7 +51,7 @@ Wyrm: learn the pieces -
        +
        {#if room}Back to your game{' · '}{/if}Back to the hall · How to play · The rules

        Learn the pieces

        @@ -67,7 +66,7 @@
        - (inspected = at)} /> +

        Scene {n + 1} of {SCENES.length}

        @@ -97,28 +96,6 @@