diff --git a/components/ecaz-ambassadors.tsx b/components/ecaz-ambassadors.tsx index e01d8e9d..68523f11 100644 --- a/components/ecaz-ambassadors.tsx +++ b/components/ecaz-ambassadors.tsx @@ -23,7 +23,7 @@ import { TERRITORIES } from '@/game/board'; import { faction } from '@/game/catalog'; export const AMBASSADOR_COVERAGE = - 'Development coverage: Ambassador placement, Ecaz’s direct Duke acquisition and consensual alliance, Emperor, Atreides, Harkonnen, CHOAM, Ixian, Richese, Fremen, Guild and Tleilaxu entry effects are supported, plus Bene Gesserit copies. The Tleilaxu effect offers physical force returns or a first-death own-leader revival. Basic offers an optional new-ally Duke loan; Advanced automatically grants the available Duke after accepted alliance consent. One-battle loan tenure is provisional; an unused living loan is set aside at turn end. Ordinary revival accounting, repeat-death/shared-leader cases and competing arrivals remain for refinement; full Ecaz starts remain disabled.'; + 'Development coverage: Ambassador placement, Ecaz’s direct Duke acquisition and consensual alliance, Emperor, Atreides, Harkonnen, CHOAM, Ixian, Richese, Fremen, Guild and Tleilaxu entry effects are supported, plus Bene Gesserit copies. The Tleilaxu effect offers physical forces or a first-death own leader, including Atreides’ separate Kwisatz Haderach token. Basic offers an optional new-ally Duke loan; Advanced automatically grants the available Duke after accepted alliance consent. One-battle loan tenure is provisional; an unused living loan is set aside at turn end. Ordinary revival accounting, repeat-return/shared-leader cases and competing arrivals remain for refinement; full Ecaz starts remain disabled.'; function tokenLocation(token: AmbassadorToken) { if (token.zone === 'placed') return `Placed in ${TERRITORIES.find((t) => t.id === token.location)?.name ?? 'a stronghold'}`; diff --git a/components/ecaz-entry.tsx b/components/ecaz-entry.tsx index 931c625b..020b29dd 100644 --- a/components/ecaz-entry.tsx +++ b/components/ecaz-entry.tsx @@ -283,10 +283,11 @@ export function EcazEntry({ ) : entry.stage === 'revival' ? ( <>

- Revive one eligible own leader, or return up to {entry.revival?.maximum ?? 0} - {' '}physical forces from the Tanks for free. This independent grant - leaves ordinary allowances and income unchanged provisionally. - Repeat-death and shared-leader interactions remain unfinished. + Revive one eligible first-death own leader, including Atreides’ first + killed Kwisatz Haderach, or return up to {entry.revival?.maximum ?? 0} + {' '}physical forces for free. This independent grant leaves ordinary + allowances and income unchanged provisionally. Repeat-return and + shared-leader interactions remain unfinished.

{entry.revival?.blocked && (

{entry.revival.blocked}

diff --git a/docs/CURRENT_STATUS.md b/docs/CURRENT_STATUS.md index fe968abb..22d4d01e 100644 --- a/docs/CURRENT_STATUS.md +++ b/docs/CURRENT_STATUS.md @@ -29,6 +29,22 @@ optional skill bands, combinations and public expansion starts remain open. Rules implementation continues; comprehensive assurance and administration remain deferred until all rules are implemented. +**Tleilaxu Ambassador first-death Kwisatz Haderach — 11 October.** +The source-supported separate KH identity (base p17) now appears in the +private native or Bene Gesserit-copied Tleilaxu grant. It is not appended to +the five ordinary native leaders; battle losses, wallets, force pools and +ordinary leader usage are unchanged, while its original activation and +first-kill cycle1 record are required. Every existing KH return advances the +same cycle marker; a prior return stays guarded by the pending repeat-death +interpretation. Two native before programs with real seven-loss combat, a +KH Lasgun/Shield death and an actual placed-token arrival offered no KH and +rejected it. Four native/copied human/Easy programs now return that same +token and resume the original entrant. Six consumer cases and all four legal +bot profiles pass; the frozen six-file union passes44/44 with types/lint +clean. Styled390px humans use the native button, inspect awakened10-loss +private status and explicitly select the legal copied effect. No +repeat-return, shared-leader or revival-income ruling changes. + **Semuta / Homeworld income costs and retained printed shares — 11 October.** The existing `karamaIncomeDiscard` now also covers the same source-qualified Guild, Emperor auction and Richese special-purchase income in the original diff --git a/docs/IMPLEMENTATION_STATUS.md b/docs/IMPLEMENTATION_STATUS.md index e7a62eda..2582c351 100644 --- a/docs/IMPLEMENTATION_STATUS.md +++ b/docs/IMPLEMENTATION_STATUS.md @@ -1,5 +1,37 @@ # Dune implementation status +## 11 October 2026 — source-supported first-death KH Ambassador return + +The Tleilaxu Ambassador's own-leader alternative excluded Atreides' +separate Kwisatz Haderach token even though base p17 revives KH like a +leader without adding it to the ordinary roster. Two native before programs +with genuine seven-loss combat, an actual KH Lasgun/Shield death, a real +worm alliance and a real placed-token arrival offered no KH choice and +rejected it. + +Shared `tleilaxu-ambassador-leaders.ts` now supplies the private eligibility +list and validates the submitted identity for native and Bene Gesserit +copied grants. KH requires Advanced Atreides, seven battle losses, its own +dead state and the original cycle1 marker; foreign discs, living KH and a +prior return marker remain excluded. No response/decision shape, ordinary +roster, wallet, force or quota calculation changed. + +Returning KH clears its dead/battle-use state and advances the same cycle +marker used by original Ghola and ordinary KH returns. It does not reset +battle losses, add a physical disc, spend the ordinary leader allowance, +charge spice or alter force pools. Four native/copied human/Easy runtime +programs return the same token and resume the original Guild entrant once. +Six consumer cases cover both paths, owner/stale/exclusive errors, living and +prior-return exclusion and all four minimal legal bots. The fixture's battle +preparation and physical Ghola descriptor were corrected during development; +no engine rule was changed for those fixture errors. Styled390px humans use +the native button, inspect awakened10-loss status and select the legal +copied effect before returning KH. + +No repeat-return, shared-leader or revival-income interpretation is settled; +those remain the recorded policy questions. Types/lint and the frozen +six-file Ambassador union pass44/44; no broad-suite or deployed acceptance. + ## 11 October 2026 — Homeworld income cost before original printed share Seven source-qualified before programs lacked Semuta for Basic/Advanced low diff --git a/docs/RULE_DECISIONS.md b/docs/RULE_DECISIONS.md index f4a2e9b0..bac2b5ce 100644 --- a/docs/RULE_DECISIONS.md +++ b/docs/RULE_DECISIONS.md @@ -27,7 +27,7 @@ They supersede earlier software-absence claims only within their named scope. | --- | --- | --- | | Odd-force Ecaz Occupy | Main paragraph: ceiling contribution/loss, floor survivors; conflicting FAQ remains unresolved. | [Occupy](ECAZ_OCCUPY_RULES.md) | | New-ally Duke loan | Optional existing-disc loan after Ambassador alliance consent; one battle and unused turn-end set-aside. | [Duke acquisition](ECAZ_DUKE_ACQUISITION.md) | -| Tleilaxu Ambassador leader alternative | First-death own native leader revives free instead of forces, independently of ordinary revival allowance. | [Ambassador](TLEILAXU_AMBASSADOR_RULES.md) | +| Tleilaxu Ambassador leader alternative | First-death own native leader, or Atreides' source-supported separate first-killed KH, revives free instead of forces. Ordinary allowance independence remains provisional; repeat returns/shared custody stay separate. | [Ambassador](TLEILAXU_AMBASSADOR_RULES.md) | | Ordinary allied shipment transit | Depart during the shipper's turn; excess new physical visitors still present at ending go to Tanks, even when exit was prevented. Old co-occupation timing is separate. | [Allied transit](ALLIED_TRANSIT_RULES.md) | | Ordinary mixed No-Field battle | Private pool is physical forces plus reserve-limited token materialization; both plans seal before one reveal. Advanced now shares this provisional policy; combined Occupy remains separate. | [No-Field](RICHESE_NO_FIELD_RULES.md) | | Guild-recipient allied No-Field | Rounded one-force Guild fee: one spice to bank, even when Richese funds it; no Guild self-shipment income. | [Allied No-Field payment](RICHESE_ALLIED_SHIPMENT_AUDIT.md) | diff --git a/docs/TLEILAXU_AMBASSADOR_RULES.md b/docs/TLEILAXU_AMBASSADOR_RULES.md index 580af055..9103eef7 100644 --- a/docs/TLEILAXU_AMBASSADOR_RULES.md +++ b/docs/TLEILAXU_AMBASSADOR_RULES.md @@ -2,6 +2,30 @@ Primary-source review, 2026-09-07, with later runtime checkpoints below. This document supplements the [Ambassador effects audit](ECAZ_AMBASSADOR_EFFECTS_AUDIT.md) and [runtime readiness review](TLEILAXU_AMBASSADOR_RUNTIME_READINESS.md). Recorded source questions remain distinct from the Basic-first implementation choices. +## First-death own Kwisatz Haderach — 11 October 2026 + +The source-supported separate KH identity below now appears in Atreides' +private native or Bene Gesserit-copied Tleilaxu grant. Its original advanced +activation and first-kill cycle1 record are required. It is not appended to +the five ordinary native leaders and does not inherit foreign/shared custody. + +The return clears its dead/battle-use state and advances the same cycle +marker used by original Ghola and ordinary KH returns. Battle losses, +ordinary roster identities, wallets, force pools and ordinary leader usage +remain unchanged; quota independence retains the existing first-version +qualification. A prior return marker stays guarded by the pending repeat-death +interpretation rather than gaining a new exception. + +Two native before programs recorded real seven-loss combat followed by a +KH Lasgun/Shield death, real worm alliance and Ambassador placement/arrival, +but offered no KH and rejected its choice. Four native/copied human/Easy +programs now return the same token and source entrant once. Six consumer +cases include both paths, owner/stale/exclusive errors, living/prior-return +exclusion and all four minimal legal bot profiles. Styled390px humans use +the native button, inspect awakened10-loss status, and explicitly select the +legal copied Tleilaxu effect before returning KH; original Guild Movement +still finishes. This does not settle the three policy questions below. + ## First-version leader alternative — 8 October 2026 The beneficiary may now revive one first-death own leader for free instead of diff --git a/game/engine.ts b/game/engine.ts index 6b2e7d7d..e8c206c0 100644 --- a/game/engine.ts +++ b/game/engine.ts @@ -15,6 +15,7 @@ import { } from './leader-skill-combat'; import { quoteSukPhysicalRescue, quoteSukRescue, SukPhysicalRescueError, sukReceiptSignature, sukRescueOptions, type SukForceGroup, type SukPhysicalRescueQuote, type SukPhysicalRescueReceipt, type SukReserveDestinations, type SukRescueOption, type SukRescueReceipt } from './suk-graduate'; import { quoteTleilaxuAmbassadorForces, TleilaxuAmbassadorForceError } from './tleilaxu-ambassador-forces'; +import { tleilaxuAmbassadorLeaderChoices, tleilaxuAmbassadorLeaderSelection } from './tleilaxu-ambassador-leaders'; import { leaderSkillStrongholdCount, sandmasterVictorySpice, sandmasterVictoryPiles, type SandmasterVictorySpiceOffer } from './leader-skill-battle-board'; import { beginRihani, chooseRihaniDraw, finishRihani, validateRihani, type RihaniReceipt, type RihaniSkill } from './rihani-decipherer'; import { planetologistMovementModeSupported, planetologistLeader, planetologistRange, selectedOriginElites, groundMovementRange, type PlanetologistMovement } from './planetologist-movement'; @@ -16675,8 +16676,8 @@ function resolveAmbassadorEffect(g: Game) { return; } if (effect === 'tleilaxu') { - // Initial leader path: first-death own discs, independent of ordinary quota. - // Repeat-death and shared-disc interactions remain explicit refinement work. + // First-death own identities include KH's separate token under base p17. + // Repeat returns, shared discs and ordinary-quota policy stay separate. entry.stage = 'revival'; g.decision = { kind: 'ecazAmbassador', player: p.id }; log( @@ -16879,13 +16880,21 @@ function decideAmbassador(g: Game, p: Player, action: Action) { if (action.leader !== undefined) { requireRule(action.forces === undefined && action.elite === undefined, 'Choose a leader or forces, not both.'); - const leader = p.leaders.find(l => l.id === action.leader && - l.faction === p.faction && l.dead && l.deaths === 1 && - !l.capturedBy && !l.gholaBy); - requireRule(leader, 'Choose a first-death own leader from the Tanks.'); - leader.dead = false; - delete leader.usedAt; - log(g, `${p.name} revived ${leader.name} for free through the Tleilaxu Ambassador. The ordinary leader allowance is unchanged.`, + const selected = tleilaxuAmbassadorLeaderSelection(g, p, action.leader); + requireRule(selected, 'Choose an eligible first-death own leader or Kwisatz Haderach from the Tanks.'); + let name: string; + if (selected === 'kwisatz') { + const kwisatz = p.kwisatz!; + kwisatz.dead = false; + delete kwisatz.usedAt; + kwisatz.revivalCycle = Math.max(p.revivalCycle, kwisatz.revivalCycle ?? 1) + 1; + name = 'Kwisatz Haderach'; + } else { + selected.dead = false; + delete selected.usedAt; + name = selected.name; + } + log(g, `${p.name} revived ${name} for free through the Tleilaxu Ambassador. The ordinary leader allowance is unchanged.`, { faction: 'tleilaxu', name: 'Tleilaxu Ambassador' }); finishAmbassador(g); return; @@ -32730,9 +32739,7 @@ export function viewGame(state: Game, id: string) { tanks: me.tanks, eliteTanks: me.elites?.tanks ?? 0, eliteRevived: me.elites?.revived ?? 0, - leaders: me.leaders.filter(l => l.faction === me.faction && - l.dead && l.deaths === 1 && !l.capturedBy && !l.gholaBy) - .map(l => ({ id: l.id, name: l.name, strength: l.strength })), + leaders: tleilaxuAmbassadorLeaderChoices(g, me), blocked: ambassadorEffectBlock( g, diff --git a/game/reference.ts b/game/reference.ts index 07c17bbb..889057e6 100644 --- a/game/reference.ts +++ b/game/reference.ts @@ -1368,7 +1368,7 @@ export const RULE_TOPICS: RuleTopic[] = [ 'The Guild Ambassador grants an immediate free shipment of zero through four physical reserve forces for Ecaz or its ally, including typed elites. Choose a clear territory and sector; this does not spend ordinary shipment or movement, ally aid or a retained rate card. Fremen may use destinations outside their ordinary reinforcement radius, but their southern reserves stay on-planet and this effect never permits storm entry. Only Ixians may ship directly into their placed mobile stronghold.', 'During Shipment and Movement, Guild can use its special Karama to stop another eligible off-planet Ambassador shipment before forces arrive; it does not stop this grant during a phase-one worm sequence. A successful off-planet shipment may invite Bene Gesserit accompaniment and accrues applicable phase-five Heighliner income once. BG can accompany Ixians into the mobile stronghold. Projected accompaniment choices show blocked sectors and keep Polar Sink and decline available when legal. Intrusion, separate Terror and accompanying fighter-triggered Ambassadors finish before the original entrant or worm rider resumes.', 'No-Field substitution into the free four-force grant remains unavailable. In bounded classic plus Ecaz/Moritani games, a shared Ambassador/Terror entry gives both owners saved optional prompts in current storm order without repeating the committed entry; this is a provisional table order, not a printed publisher priority. A Terror entry now waits for the arrival’s own interaction — Guild income, a Bene Gesserit fighter Intrusion or advisor choice, or Fremen storm protection — and then opens without replaying payment or force transfer. Ambassador-created Fremen/Guild child arrivals remain gated. Atomics Aftermath, Homeworlds, Nexus and Discovery combinations do not gain coverage from this overlap path.', - 'The Tleilaxu Ambassador offers one first-death own-leader revival or up to four physical forces for free. These are exclusive choices; the beneficiary sees its own eligible leaders privately. The ordinary allowance remains unchanged provisionally. Repeat-death, shared-leader and revival-income interactions remain for refinement.', + 'The Tleilaxu Ambassador offers one first-death own-leader revival or up to four physical forces for free. Atreides may choose its separate first-killed Kwisatz Haderach under the base leader-revival rule; this does not add a disc to the ordinary roster, reset battle losses or spend the ordinary leader allowance. Native and Bene Gesserit copied grants share the same private eligibility. Every existing KH return advances its original cycle marker; a prior return remains outside this first-death preview. The force/leader choices are exclusive and ordinary allowance independence stays provisional. Repeat-return, shared-leader and revival-income interpretations remain separate.', 'All eleven effect guides are readable. Emperor, Atreides, Harkonnen, CHOAM, Ixian, Richese, Fremen and Guild entry effects are integrated, together with Bene Gesserit copies of those eight effects and direct Duke acquisition or consensual alliance through the reusable Ecaz token. Advanced combined Occupy has a separate bounded Development Verified guide, and Basic even-force Occupy now composes the same shared controls. Remaining effects, exceptional Duke custody and complete Ecaz rules remain unfinished. Mobile stronghold placement is gated. Full Ecaz starts remain disabled.', ], checklist: [ @@ -1412,6 +1412,8 @@ export const RULE_TOPICS: RuleTopic[] = [ 'tests/ecaz-alliance-engine.test.ts', 'tests/ecaz-alliance-recovery.test.ts', 'tests/ecaz-entry-bots.test.ts', + 'game/tleilaxu-ambassador-leaders.ts', + 'tests/kwisatz-ambassador.test.ts', 'tests/ecaz-entry-continuations.test.ts', 'tests/ecaz-entry-recovery.test.ts', 'tests/richese-ambassador.test.ts', diff --git a/game/tleilaxu-ambassador-leaders.ts b/game/tleilaxu-ambassador-leaders.ts new file mode 100644 index 00000000..ece343a0 --- /dev/null +++ b/game/tleilaxu-ambassador-leaders.ts @@ -0,0 +1,36 @@ +import type { Game, Player } from './engine'; +import type { Leader } from './cards'; + +type Context = Pick; +type Beneficiary = Pick; +export type TleilaxuAmbassadorLeaderChoice = { id: string; name: string; strength: number }; + +const ownFirstDeath = (player: Beneficiary, leader: Leader) => + leader.faction === player.faction && leader.dead && leader.deaths === 1 && + !leader.capturedBy && !leader.gholaBy; + +/** Base p17 revives KH like a leader without adding it to the ordinary roster. + * Native KH death records start at cycle1; every existing return advances that + * marker. Repeat-return/ordinary-quota interpretation remains outside this grant. */ +function firstKwisatz(context: Context, player: Beneficiary): boolean { + return context.advanced && player.faction === 'atreides' && player.battleLosses >= 7 && + player.kwisatz?.dead === true && (player.kwisatz.revivalCycle ?? 1) === 1; +} + +/** Return the actual own identity, never a foreign disc or a cloned physical leader. */ +export function tleilaxuAmbassadorLeaderSelection( + context: Context, player: Beneficiary, id: unknown, +): Leader | 'kwisatz' | null { + if (id === 'kwisatz') return firstKwisatz(context, player) ? 'kwisatz' : null; + return player.leaders.find(leader => leader.id === id && ownFirstDeath(player, leader)) ?? null; +} + +export function tleilaxuAmbassadorLeaderChoices( + context: Context, player: Beneficiary, +): TleilaxuAmbassadorLeaderChoice[] { + const choices: TleilaxuAmbassadorLeaderChoice[] = []; + for (const leader of player.leaders) + if (ownFirstDeath(player, leader)) choices.push({ id: leader.id, name: leader.name, strength: leader.strength }); + if (firstKwisatz(context, player)) choices.push({ id: 'kwisatz', name: 'Kwisatz Haderach', strength: 2 }); + return choices; +} diff --git a/tests/fixture-kwisatz-ambassador.ts b/tests/fixture-kwisatz-ambassador.ts new file mode 100644 index 00000000..4e5bd8a5 --- /dev/null +++ b/tests/fixture-kwisatz-ambassador.ts @@ -0,0 +1,180 @@ +import assert from 'node:assert/strict'; +import { + applyAction, createGame, initializeFactionExpansionsGameForAudit, joinGame, + newPlayer, type Action, type Game, +} from '../game/engine'; +import { TERRITORIES } from '../game/board'; +import { AMBASSADOR_EFFECTS, type AmbassadorEffect } from '../game/ecaz-ambassadors'; +import { nextRicheseSkillsTechNativeStep } from './fixture-richese-skills-tech'; +import { moveSemutaEmperorCard, semutaEmperorCardId, semutaEmperorPlayer } from './fixture-semuta-emperor-share'; + +export type KwisatzAmbassadorStep = { actor: string; action: Action }; +export type KwisatzAmbassadorFixture = { + game: Game; beforeArrival: Game; afterDeath: Game; afterLosses: Game; + actions: KwisatzAmbassadorStep[]; owner: string; beneficiary: string; + entrant: string; token: string; copied: boolean; location: string; +}; + +/** Control only the original nine-draw Ambassador packet when starting forces + * initialize; no token identity, cohort or history is assigned afterwards. */ +function withPacket(copied: boolean, run: () => T): T { + const pool = AMBASSADOR_EFFECTS.filter(effect => effect !== 'ecaz'); + const first: Exclude[] = copied + ? ['beneGesserit', 'atreides', 'choam', 'emperor', 'fremen'] + : ['tleilaxu', 'atreides', 'choam', 'emperor', 'fremen']; + const desired = [...first, ...pool.filter(effect => !first.includes(effect))]; + const current = [...pool], rolls: number[] = []; + for (let i = current.length - 1; i > 0; i--) { + const j = current.indexOf(desired[i]); assert.ok(j >= 0 && j <= i); + rolls.push(Math.floor((j + 0.5) * 0x100000000 / (i + 1))); + [current[i], current[j]] = [current[j], current[i]]; + } + const descriptor = Object.getOwnPropertyDescriptor(crypto, 'getRandomValues'); + const original = crypto.getRandomValues.bind(crypto); let cursor = 0; + crypto.getRandomValues = (array: T): T => { + if (array instanceof Uint32Array && array.length === 1 && cursor < rolls.length) + array[0] = rolls[cursor++]; + else Reflect.apply(original, crypto, [array]); + return array; + }; + try { return run(); } + finally { + if (descriptor) Object.defineProperty(crypto, 'getRandomValues', descriptor); + else Reflect.deleteProperty(crypto, 'getRandomValues'); + } +} + +/** Two original battles record seven losses, then an actual KH Lasgun/Shield + * death. Original worm alliance, placement and entrant shipment invoke the grant. + * Later force/card positions are conserved; no clocks, wallets, deaths or allies + * are fabricated. Ghola returns only the accompanying ordinary leader. */ +export function createKwisatzAmbassadorFixture(copied = false): KwisatzAmbassadorFixture { + let game = createGame('KWISATZAMBASSADOR', newPlayer('x', 'Ecaz', 'ecaz'), true, ['ecaz']); + joinGame(game, newPlayer('a', 'Atreides', 'atreides')); + joinGame(game, newPlayer('g', 'Guild', 'guild')); + for (const player of game.players) game = applyAction(game, player.id, { type: 'ready' }); + game = initializeFactionExpansionsGameForAudit(game); + const actions: KwisatzAmbassadorStep[] = []; + const act = (actor: string, action: Action) => { + actions.push({ actor, action }); game = applyAction(game, actor, action); + }; + const clean = () => !game.decision && !game.response && !game.phaseOpening && !game.pendingTreacheryDiscard; + const next = () => { + if (game.decision?.kind === 'ecazPlacement') + return { actor: game.decision.player, action: { type: 'decision', decline: true } }; + const step = nextRicheseSkillsTechNativeStep(game); + if (step.action.type === 'stormDial') step.action.amount = 0; + return step; + }; + const reach = (until: () => boolean) => { + for (let n = 0; !until() && n < 2400; n++) { + assert.notEqual(game.status, 'finished'); const step = next(); act(step.actor, step.action); + } + assert.ok(until(), 'Original native actions must reach the KH Ambassador boundary'); + }; + while (game.status === 'setup') { + const step = next(); + const after = withPacket(copied, () => applyAction(game, step.actor, step.action)); + actions.push(step); game = after; + } + const effect = copied ? 'beneGesserit' : 'tleilaxu'; + const token = game.ecazAmbassadors!.tokens.find(token => token.effect === effect)!; + assert.equal(token.zone, 'supply'); + assert.equal(game.ecazAmbassadors!.tokens.find(t => t.effect === 'tleilaxu')!.zone, copied ? 'pool' : 'supply'); + const landBlows = (count: number) => { + for (let at = 0; at < count; at++) { + const index = game.spiceDeck.findIndex((card, i) => i >= at && 'territory' in card); + assert.ok(index >= at); game.spiceDeck.splice(at, 0, game.spiceDeck.splice(index, 1)[0]); + } + }; + landBlows(2); + const reserveBoard = () => { + for (const player of game.players) { + player.reserves += Object.values(player.forces).reduce((sum, count) => sum + count, 0); + player.forces = {}; + } + }; + const stageBattle = (amount: number, enemy: number) => { + reserveBoard(); + const site = TERRITORIES.find(t => t.type === 'sand' && !t.sectors.includes(game.storm)); assert.ok(site); + const key = `${site.id}:${site.sectors[0]}`; + for (const [id, count] of [['a', amount], ['g', enemy]] as const) { + const player = semutaEmperorPlayer(game, id); assert.ok(player.reserves >= count); + player.reserves -= count; player.forces[key] = count; + } + return site.id; + }; + const openBattle = (site: string) => { + reach(() => game.phase === 6 && clean()); + while (game.active === 'x') { const step = next(); act(step.actor, step.action); } + assert.ok(game.active === 'a' || game.active === 'g'); + act(game.active!, { type: 'chooseBattle', territory: site, target: game.active === 'a' ? 'g' : 'a' }); + while (game.response || game.decision || game.battle?.preparation || game.battle?.preLeader?.closed === false) { + const step = next(); act(step.actor, step.action); + } + }; + const seal = (actor: string, action: Action) => { + act(actor, action); + while (game.response || game.decision?.kind === 'fullPlanOffer') { + const step = next(); act(step.actor, step.action); + } + }; + const nativeLeader = (id: string, strongest: boolean) => { + const leaders = semutaEmperorPlayer(game, id).leaders.filter(l => !l.dead && !l.usedAt) + .sort((a, b) => strongest ? b.strength - a.strength : a.strength - b.strength); + assert.ok(leaders[0]); return leaders[0].id; + }; + reach(() => game.phase === 5 && clean()); + const firstSite = stageBattle(7, 2); openBattle(firstSite); + seal('a', { type: 'battlePlan', leader: nativeLeader('a', false), dial: 0, support: 0 }); + seal('g', { type: 'battlePlan', leader: nativeLeader('g', true), dial: 1, support: 1 }); + reach(() => !game.battle && clean()); + assert.equal(semutaEmperorPlayer(game, 'a').battleLosses, 7); + const afterLosses = structuredClone(game); + reach(() => game.turn === 2 && game.phase === 1 && clean()); + const worm = game.spiceDeck.findIndex(card => 'worm' in card); assert.ok(worm >= 0); + game.spiceDeck.unshift(game.spiceDeck.splice(worm, 1)[0]); + reach(() => game.nexus && !game.spiceWindow && !game.spiceResolution && clean()); + act('x', { type: 'alliance', target: 'a' }); act('a', { type: 'alliance', target: 'x' }); + reach(() => game.phase === 5 && clean()); + const secondSite = stageBattle(3, 3); + const shield = moveSemutaEmperorCard(game, semutaEmperorCardId(game, card => card.kind === 'shield'), 'a'); + const lasgun = moveSemutaEmperorCard(game, semutaEmperorCardId(game, card => card.kind === 'lasgun'), 'g'); + openBattle(secondSite); + const accompanying = nativeLeader('a', false); + seal('a', { type: 'battlePlan', leader: accompanying, dial: 0, support: 0, defense: shield, kwisatz: true }); + seal('g', { type: 'battlePlan', leader: nativeLeader('g', true), dial: 0, support: 0, weapon: lasgun }); + reach(() => !game.battle && clean()); + assert.equal(semutaEmperorPlayer(game, 'a').kwisatz?.dead, true); + assert.equal(semutaEmperorPlayer(game, 'a').kwisatz?.revivalCycle, 1); + const afterDeath = structuredClone(game); + landBlows(4); + reach(() => game.turn === 3 && game.phase === 4 && game.decision?.kind === 'ecazPlacement'); + const destination = TERRITORIES.find(t => t.type === 'stronghold' && !t.sectors.includes(game.storm) && + !game.players.some(p => Object.keys(p.forces).some(key => key.startsWith(`${t.id}:`)))); + assert.ok(destination); + act('x', { type: 'decision', token: token.id, territory: destination.id }); + while (game.response) { const step = next(); act(step.actor, step.action); } + assert.equal(game.ecazAmbassadors!.tokens.find(t => t.id === token.id)!.zone, 'placed'); + act('x', { type: 'decision', decline: true }); + reach(() => game.phase === 5 && game.active === 'g' && clean()); + const ghola = moveSemutaEmperorCard(game, semutaEmperorCardId(game, card => card.effect === 'ghola'), 'a'); + act('a', { type: 'card', card: ghola, leader: accompanying }); + reach(clean); + const atreides = semutaEmperorPlayer(game, 'a'); + atreides.reserves += atreides.tanks; atreides.tanks = 0; + assert.equal(atreides.kwisatz?.dead, true); + assert.ok(atreides.leaders.every(l => !l.dead)); + const beforeArrival = structuredClone(game); + act('g', { type: 'ship', amount: 1, territory: destination.id, sector: destination.sectors[0] }); + reach(() => game.pendingAmbassador?.stage === 'offer'); + const event = game.pendingAmbassador!.event; + act('x', { type: 'decision', event, trigger: true, beneficiary: 'a', choice: 'effect' }); + if (copied) { + assert.equal(game.pendingAmbassador?.stage, 'copy'); + act('a', { type: 'decision', event, effect: 'tleilaxu' }); + } + assert.equal(game.pendingAmbassador?.stage, 'revival'); + return { game, beforeArrival, afterDeath, afterLosses, actions, owner: 'x', beneficiary: 'a', + entrant: 'g', token: token.id, copied, location: destination.id }; +} diff --git a/tests/kwisatz-ambassador.test.ts b/tests/kwisatz-ambassador.test.ts new file mode 100644 index 00000000..66342dc6 --- /dev/null +++ b/tests/kwisatz-ambassador.test.ts @@ -0,0 +1,80 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { applyAction, viewGame } from '../game/engine'; +import { botActions } from '../game/bots'; +import { createKwisatzAmbassadorFixture } from './fixture-kwisatz-ambassador'; + +for (const copied of [false, true]) void test( + `${copied ? 'copied Bene Gesserit' : 'native Tleilaxu'} Ambassador revives the original first-death KH without consuming ordinary leaders or its entrant`, () => { + const f = createKwisatzAmbassadorFixture(copied); + const before = f.game.players.find(p => p.id === f.beneficiary)!; + assert.equal(f.afterLosses.players.find(p => p.id === f.beneficiary)!.battleLosses, 7); + assert.equal(before.battleLosses, 10); + assert.ok(before.leaders.every(leader => !leader.dead)); + assert.equal(before.kwisatz!.dead, true); + const offer = viewGame(f.game, f.beneficiary).ambassadorEntry!.revival!; + const kh = offer.leaders.find(leader => leader.id === 'kwisatz'); + assert.ok(kh, 'The separate KH identity is a source-supported own-leader choice'); + for (const p of f.game.players) if (p.id !== f.beneficiary) + assert.equal(viewGame(f.game, p.id).ambassadorEntry!.revival, null); + const event = f.game.pendingAmbassador!.event; + const action = { type: 'decision', event, leader: kh.id }; + assert.throws(() => applyAction(f.game, f.owner, action)); + assert.throws(() => applyAction(f.game, f.beneficiary, { ...action, event: `${event}:stale` })); + assert.throws(() => applyAction(f.game, f.beneficiary, { ...action, forces: 1 })); + const done = applyAction(f.game, f.beneficiary, action); + const after = done.players.find(p => p.id === f.beneficiary)!; + assert.equal(after.kwisatz!.dead, false); + assert.equal(after.kwisatz!.revivalCycle, 2, 'The original return advances KH history rather than resetting it'); + assert.equal(after.battleLosses, before.battleLosses); + assert.equal(after.leaderRevived, before.leaderRevived); + assert.deepEqual(after.leaders, before.leaders, 'KH is not an ordinary native roster disc'); + assert.equal(after.spice, before.spice); + assert.equal(after.reserves, before.reserves); + assert.equal(after.tanks, before.tanks); + assert.equal(done.active, f.entrant); + assert.equal(done.players.find(p => p.id === f.entrant)!.shipped, true); + assert.equal(done.ecazAmbassadors!.tokens.find(token => token.id === f.token)!.zone, copied ? 'removed' : 'used'); + assert.throws(() => applyAction(done, f.beneficiary, action)); + const suffix = applyAction(done, f.entrant, { type: 'endMovement' }); + assert.ok(!suffix.movementRemaining!.includes(f.entrant)); + assert.equal(suffix.players.find(p => p.id === f.beneficiary)!.kwisatz!.dead, false); + assert.throws(() => applyAction(suffix, f.entrant, { type: 'endMovement' })); + }, +); + +void test('a prior KH return marker preserves the unresolved repeat-death boundary', () => { + const f = createKwisatzAmbassadorFixture(); + const repeated = structuredClone(f.game); + repeated.players.find(p => p.id === f.beneficiary)!.kwisatz!.revivalCycle = 2; + const offer = viewGame(repeated, f.beneficiary).ambassadorEntry!.revival!; + assert.equal(offer.leaders.some(leader => leader.id === 'kwisatz'), false); + assert.throws(() => applyAction(repeated, f.beneficiary, + { type: 'decision', event: repeated.pendingAmbassador!.event, leader: 'kwisatz' })); + assert.equal(repeated.players.find(p => p.id === f.beneficiary)!.kwisatz!.dead, true); + assert.equal(repeated.players.find(p => p.id === f.beneficiary)!.kwisatz!.revivalCycle, 2); +}); + +void test('a living KH never becomes a free duplicate identity', () => { + const f = createKwisatzAmbassadorFixture(), alive = structuredClone(f.game); + alive.players.find(p => p.id === f.beneficiary)!.kwisatz!.dead = false; + assert.equal(viewGame(alive, f.beneficiary).ambassadorEntry!.revival!.leaders.some(l => l.id === 'kwisatz'), false); + assert.throws(() => applyAction(alive, f.beneficiary, + { type: 'decision', event: alive.pendingAmbassador!.event, leader: 'kwisatz' })); +}); + +for (const copied of [false, true]) void test( + `all minimal legal bot profiles return the available ${copied ? 'copied' : 'native'} KH alternative`, () => { + const f = createKwisatzAmbassadorFixture(copied); + for (const difficulty of ['Easy', 'Medium', 'Hard', 'Brutal'] as const) { + const view = viewGame(f.game, f.beneficiary); + view.players.find(p => p.id === f.beneficiary)!.bot = difficulty; + const action = botActions(view)[0]; assert.ok(action); + const done = applyAction(f.game, f.beneficiary, action); + assert.equal(done.players.find(p => p.id === f.beneficiary)!.kwisatz!.dead, false); + assert.equal(done.players.find(p => p.id === f.beneficiary)!.leaderRevived, + f.game.players.find(p => p.id === f.beneficiary)!.leaderRevived); + assert.equal(done.active, f.entrant); + } + }, +);