+ Your shipment turn is still ahead. This answer stays binding while + other players finish; shipment actions become available on your turn. +
}- Automatic enforcement currently supports the active - player’s unused ordinary shipment in Basic or Advanced + Automatic enforcement supports an unused shipment this + phase, including a player still waiting for their turn, + in Basic or Advanced base rules, including the Guild, or a classic payer in the Richese Semuta profile. Select - that player and finish pending decisions first. + an eligible player and finish pending decisions first. Native No-Field shipments and other rules configurations remain unfinished.
diff --git a/docs/CURRENT_STATUS.md b/docs/CURRENT_STATUS.md index 81454eef..7d2f6722 100644 --- a/docs/CURRENT_STATUS.md +++ b/docs/CURRENT_STATUS.md @@ -1,6 +1,6 @@ # Current development status -Updated 18 October 2026. **The full twelve-faction goal is unfinished. Basic +Updated 24 October 2026. **The full twelve-faction goal is unfinished. Basic is playable. Advanced, expansion-faction and supported optional-module starts are labelled previews; complete rules/publication acceptance remains gated.** @@ -16,6 +16,27 @@ open mode gates. ## Current checkpoint and work +**Truthtrance before the respondent's turn — 24 October. Prototyped / Partial.** +Same-phase questions now include a supported unused turn still in the original +queue. Waiting promises remain visible without an executable early action; +private reachability uses owned resources, and native Guild WAIT/TAKE retains its +original timing. Pending foreign declarations defer release; their approved ally +funding stays locked. Voluntary Emperor gifts/BG accompaniment cannot spend the +last completion. Minimal policies legally decline optional accompaniment while +bound; no strategy tuning, new profile/module or earlier-phase opening. + +A disjoint genuine-fixture lane, bounded continuation review and owner +integration pass **14 files146/146**, one updated existing in-memory scope case, +types/lint/build and three original-action/rendered-table programmes plus four +finite policies. Public classic Basic/Advanced starting deals use40/45 source +actions; paid intervening turns and later Emperor3/cost3 or Guild3/half2 fulfill +in16/19/29 continuations. Four profiles make eight legal answer/shipment proposals +and finish. Separate controlled funding, price, gift and advisor probes pass. +Feedback repaired an obsolete negative waiting-target fixture and two type +declarations. No broader recovery campaign, browser/visual/deployed or full-mode +acceptance. No saved-room/database/reset/restart/deployment operation. +[Canonical behavior and exact proof](TRUTHTRANCE_SHIPMENT_PROMISES.md#same-phase-waiting-respondents--24-october-2026). + **Truthtrance with Advanced Guild — 18 October. Prototyped / Partial.** Base Advanced questions include Guild without another profile/module opening. Native interception, permission and rate responses retain the promise until delivery or diff --git a/docs/IMPLEMENTATION_STATUS.md b/docs/IMPLEMENTATION_STATUS.md index de1e1c64..3e0b383c 100644 --- a/docs/IMPLEMENTATION_STATUS.md +++ b/docs/IMPLEMENTATION_STATUS.md @@ -1,5 +1,27 @@ # Dune implementation status +## 24 October 2026 — Truthtrance before the respondent's turn + +Supported unused shipments still in the original same-phase queue now admit +structured promises without granting an early action. Private owned-resource +reachability, frozen mixed facts, native Guild WAIT/TAKE and actual paid delivery +retain their original boundaries. Pending foreign funding outcomes defer release; +approved contributions stay locked. Voluntary gifts/accompaniment cannot spend +the last legal completion. The minimal advisor policy declines while bound. + +A disjoint public-action fixture lane, bounded continuation review and owner +integration pass14-file146/146, one existing in-memory scope case, types/lint/build +and three actual gameplay/rendering programmes plus four finite policies. +Original Basic/Advanced deals use40/45 source actions. Paid earlier turns and +later Emperor3/cost3 or Guild3/half2 finish in16/19/29 continuations; four profiles +make eight legal answer/shipment proposals. Controlled probes remain separate. +Feedback repaired an obsolete waiting-target negative and two type declarations. +[Canonical behavior, source and exact proof](TRUTHTRANCE_SHIPMENT_PROMISES.md#same-phase-waiting-respondents--24-october-2026). +No other profile/module/earlier-phase opening, strategy refinement, broad recovery +campaign, complete-mode or browser/deployed acceptance. Final assurance remains +due. No saved-room/database/reset/restart/deployment operation. + + ## 18 October 2026 — Truthtrance with native Advanced Guild Base Advanced shipment promises now include Guild. Native responses remain diff --git a/docs/RULE_DECISIONS.md b/docs/RULE_DECISIONS.md index 50083882..bacf1bb1 100644 --- a/docs/RULE_DECISIONS.md +++ b/docs/RULE_DECISIONS.md @@ -854,7 +854,7 @@ dedicated retrieved worked FAQs. [Contract and remaining limits](HOMEWORLD_OCCUP | Purchased price with immune Junction | Keep the original offered half/full tariff and normal payees; no quarter price or bank-only overlay. Under the standing choose-recommendation instruction, accepting this source with a purchased grant requires explicit acknowledgment that it ends unused, with no card refund. Consume only upon actual delivery, not failed, stale, unfunded or deferred acceptance; the ordinary purchased route remains available. This is a conservative product composition, not a publisher worked example. | [Source immunity and selected choice](JUNCTION_TRANSPORT_RULES.md#purchased-price-and-immune-offer--15-october-2026), [original versus controlled proof](JUNCTION_TRANSPORT_RUNTIME.md#purchased-price-source-choice--15-october-2026) | | Deferred shipment arrival | Quote unsupported ordinary arrivals before saving Guild interception. A validated legacy ordinary declaration may return unspent on the typed arrival error; corrupted declarations and special parent/card receipts are not silently cleared. This repairs continuation without deciding simultaneous reaction priority. | [Reproduction and bounded recovery](DEFERRED_SHIPMENT_ARRIVAL.md) | | Native Ambassador own-arrival continuation | Under the standing choose-recommended-option instruction, reuse committed entry after its own Guild income, BG Intrusion and accompaniment controls. Existing callbacks put a legitimate accompanying BG fighter child before the deferred original entrant; each sees the then-live token, so declining the child preserves a later original offer and consuming it does not recreate a token. Advisors remain exempt. This child-first/live-token composition is provisional, not a located publisher priority ruling. Actual busy controls, unsupported paired/module guards and separate native rate-window admission remain distinct. | [Native original-action evidence and boundary](DEFERRED_SHIPMENT_ARRIVAL.md#native-own-arrival-continuations--15-october-2026) | -| Truthtrance | Current facts are boolean disclosures, not promises to preserve resources. Structured Basic/base Advanced active-opportunity shipment promises include native Guild interception and rate/permission responses; no other profile/module opens. Opposing stops settle the whole claim against absent shipment; own stops cannot evade a promise. Executable guidance waits for native controls, and prose is not automatically enforced. | [Spice facts](TRUTHTRANCE_SPICE_FACTS.md), [card facts](TRUTHTRANCE_CARD_COUNT.md), [shipment promises](TRUTHTRANCE_SHIPMENT_PROMISES.md#advanced-guild-interception-and-rates--18-october-2026), [remaining audit](TRUTHTRANCE_NONBATTLE_READINESS_20260907.md) | +| Truthtrance | Current facts are boolean disclosures, not promises to preserve resources. Structured Basic/base Advanced unused current-phase shipment promises include waiting respondents, native Guild timing/interception and rate/permission responses; no other profile/module opens. Opposing stops settle the whole claim against absent shipment; own stops cannot evade a promise. Answering preserves the original queue; executable guidance waits for the actual turn and native controls. Own voluntary outflows cannot remove the last completion; prose is not automatically enforced. | [Spice facts](TRUTHTRANCE_SPICE_FACTS.md), [card facts](TRUTHTRANCE_CARD_COUNT.md), [shipment promises](TRUTHTRANCE_SHIPMENT_PROMISES.md#same-phase-waiting-respondents--24-october-2026), [remaining audit](TRUTHTRANCE_NONBATTLE_READINESS_20260907.md) | | Truthtrance hand categories | Count current physical hand custody by explicitly named primary role; alternate battle slots and faction powers do not reclassify cards. Only an aggregate answer is disclosed. | [Hand inventory](TRUTHTRANCE_HAND_INVENTORY.md) | | Moritani Advanced assassination preview | After an eligible battle loss, a different opposing-faction Traitor Card may be revealed even if its leader is already dead (zero bounty). Face-up set-aside and one private replacement occur during Mentat; one use per faction. Normal-call duration, uniform hidden-eligibility UX and exceptional combinations remain explicit. | [Runtime/source contract](MORITANI_ASSASSINATE_LEADERS.md) | | Moritani Extortion at Mentat | The user selected normal Terror placement/relocation first, including any Karama response; only then collect the reserved five bank spice and approach other players in storm order for a possible three-spice payment. Payment removes the token; all declines recover it with rotated hidden supply IDs. The relative placement timing is a user-selected interpretation, not a publisher ruling. | [Publisher sequence and selected timing](MORITANI_EXTORTION_RULES.md#mentat-ordering-selected-interpretation-not-a-publisher-ruling) | diff --git a/docs/TRUTHTRANCE_SHIPMENT_PROMISES.md b/docs/TRUTHTRANCE_SHIPMENT_PROMISES.md index 5c85771b..80c53dc5 100644 --- a/docs/TRUTHTRANCE_SHIPMENT_PROMISES.md +++ b/docs/TRUTHTRANCE_SHIPMENT_PROMISES.md @@ -4,7 +4,7 @@ Original checkpoint, 7 September 2026; Advanced follow-up, 13 September 2026. Th The former Advanced Guild exclusion is superseded by the [18 October native Guild composition](#advanced-guild-interception-and-rates--18-october-2026). -Earlier scope descriptions and verification totals remain historical. +The [24 October waiting-turn follow-up](#same-phase-waiting-respondents--24-october-2026) supersedes the active-only timing boundary. Earlier scope descriptions and verification totals remain historical. ## Authority and supported meaning @@ -157,3 +157,90 @@ reference evidence edits are checked against all frozen file hashes before push. Broader phases/routes/modules, full Truthtrance/modes, final assurance and browser/deployed acceptance remain open. No saved-room/database/reset/restart/ deployment operation was performed. + + +## Same-phase waiting respondents — 24 October 2026 + +**Prototyped / Partial.** Structured reserve-shipment and mixed current-fact +questions now include a respondent whose unused turn remains in the original +Shipment & Movement queue, as well as the active player. The same current-turn +FAQ commitment/release rule applies; this removes a software timing boundary, +not a new printed restriction or numerical ruling. Existing base Basic/Advanced +and classic-payer Richese Semuta profiles remain; no other module or earlier +phase opens. Semuta eligibility reads the actual respondent, not the active +faction. Original Truthtrance priority and the interrupted turn stay intact. + +Feasibility uses the respondent's existing resources, owned preparation and +joint whole promises. A private quote selects that owner's later turn and clears +a foreign transient shipping price/declaration, without changing the real active +player, queue or intervening decisions. No future income, voluntary cooperation, +returned troops or vacated destination is assumed. Mixed facts remain frozen at +the original answer. The public accepted question and owner promise panel stay +visible; executable completion guidance waits for the actual turn and a clean +control boundary. Native Guild WAIT/TAKE still chooses its real opportunity. + +Foreign pending decisions retain the future promise until the outcome is known. +An ally's already approved shipment contribution cannot be withdrawn or counted +as freely recoverable preparation while its original declaration is pending. +Delivery may spend it and release an impossible answer; a stop preserves the +original refund and later recovery route. Other opposing completed effects still +release only when no legal completion remains. A waiting owner may not declare +an Emperor gift or accept BG accompaniment that spends the last completion; +the allowed outflow is checked before opening its response, where the eventual +responder is another player. Affordable gifts/accompaniment remain legal. + +### Targeted proof and limits + +A disjoint original-action fixture lane, bounded continuation review and owner +integration pass **14 files146/146**, one updated existing in-memory scope case, +`npm run check:quick`, production build and three actual-gameplay/rendered-table +programmes. First feedback updated an old negative pending-question fixture: +a waiting respondent is now legal, so the invalid case also removes that turn. +Type feedback added the queue's existing null case to the helper signature and +narrowed the generic policy answer in its test. No rule change followed feedback. + +The passing frozen source is based on +`2939ffa900f8f201fd0b55173cb2406657ccc93b`, tree +`96bf67b82570590afe79feda3491373f02714ff8b591c8897f81f0f07a261285`, +2,598 tracked/nonignored files. The supplied untracked PDF contributes only its +hash; it is neither committed nor republished. Final checkpoint/reference prose +is checked against all frozen file hashes before push. + +`tests/fixture-truthtrance-future-shipment.ts` earns the question from public +classic four-seat setup and the original unopened physical starting deal. Only +five unopened card positions, unopened land Spice positions and scalar lotteries +are selected. No dealt holdings, wallets, armies, phase, turn queue, timing flags +or promise receipts are installed. Three programmes finish the respondent turn: + +- Basic Emperor uses40 source and16 continuation actions. Atreides really ships1 + to Imperial Basin for2 first; Emperor later ships3 to Sietch Tabr for3. +- Advanced Emperor uses45 source and19 continuations, including original Guild + WAIT before the question and another afterward. The later3 include one + physical Sardaukar; the original tariff is3. +- A mixed future Guild answer uses45 source and29 continuations. Atreides and + Emperor each really pay2 for an earlier shipment; Guild waits once more while + bound, then takes its native turn before still-unstarted Harkonnen. Guild3 + pays half2 and fulfills once; its earlier current-spice fact stays compiled + from the answer even as earned incoming shipment income accrues. + +`tests/truthtrance-future-shipment-engine.test.ts` covers those actual paths, +original queue, no early action/witness, native timing, one physical discard and +later paid fulfillment. Four existing profiles make eight legal answer/shipment +proposals, with no early movement action, and complete their native turn in the +runtime smoke. `tests/truthtrance-future-shipment.test.ts` separately controls +foreign temporary prices, actual respondent Semuta scope, locked approved ally +funding with allowance/stop, and both rejected and affordable Emperor gifts/BG +accompaniment. All four minimal profiles legally decline the optional advisor +choice while bound; this is legality, not strategic refinement. + +Actual GameTable/ShipmentPromises render the question, persistent waiting +promise without executable guidance, active private guide and finished turn. +Framework aliases/CSS stubs do not establish browser clicks, visual or deployed +acceptance. Private reports, source hashes, HTML and runtime results are in +`/home/quintine/.local/share/dune/checkpoints/20261024-truth-future-shipment/`; +`frozen-integrated-3/report.json` is the complete passing batch. Earlier failed +feedback is retained. No new save/recovery audit was added. + +Earlier phases, broader routes/modules/actions, full Truthtrance/modes, final +assurance and browser/deployed acceptance remain open. No saved-room/database/ +reset/restart/deployment operation was performed. diff --git a/game/bots.ts b/game/bots.ts index 1dc0f831..68bf3512 100644 --- a/game/bots.ts +++ b/game/bots.ts @@ -2720,6 +2720,10 @@ function policyActions(g: GameView): Action[] { { type: 'decision', accept: false }, ]; } + if (d.kind === 'advisor' && liveShipmentPromises(g.shipmentPromises ?? [], me.id, g.turn).length) + // A waiting promise may need these reserves. Declining is the minimal + // legal policy until optional accompaniment strategy is implemented. + return [{ type: 'decision', accept: false }]; if (d.kind === 'advisor') return [ ...(g.advanced && d.destination && (g.homeworldMobility?.advisorAccompanyMaximum ?? 1) > 0 diff --git a/game/engine.ts b/game/engine.ts index 2b9274cf..043af044 100644 --- a/game/engine.ts +++ b/game/engine.ts @@ -373,6 +373,7 @@ import { shipmentClaimDestinations, liveShipmentPromises, shipmentPromiseModeSupported, + shipmentPromiseTurnAvailable, type ShipmentClaim, type ShipmentPromise, } from './shipment-promises'; @@ -13457,6 +13458,16 @@ function settleStrongholdOwnership(g: Game, quoted?: StrongholdState) { ); } } +function committedOutgoingAid(g: Game, p: Player): number { + if (!p.ally) return 0; + return Math.max( + g.pendingHomeworldShipment?.player === p.ally ? g.pendingHomeworldShipment.allyPayment : 0, + g.pendingShipment?.player === p.ally ? g.pendingShipment.allyPayment : 0, + g.pendingGuildTransport?.player === p.ally ? g.pendingGuildTransport.allyPayment : 0, + g.phase === 6 ? (g.battle?.plans[p.ally!]?.allyPayment ?? 0) + : g.auction?.bidder === p.ally ? (g.auction.allyPayment ?? 0) : 0, + ); +} function pledgeAid(g: Game, p: Player, requested: unknown) { requireRule( p.ally && getPlayer(g, p.ally).ally === p.id, @@ -13473,14 +13484,7 @@ function pledgeAid(g: Game, p: Player, requested: unknown) { ), 'Ally funding cannot be reduced until the submitted Silent bids are revealed.', ); - const committed = - g.pendingHomeworldShipment?.player === p.ally - ? g.pendingHomeworldShipment.allyPayment - : g.phase === 6 - ? (g.battle?.plans[p.ally]?.allyPayment ?? 0) - : g.auction?.bidder === p.ally - ? (g.auction.allyPayment ?? 0) - : 0; + const committed = committedOutgoingAid(g, p); const amount = integer( requested, g.richeseAuction?.method === 'silent' && @@ -22671,12 +22675,9 @@ function shipmentPromiseIntegrity(g: Game) { ); if (promise.turn === g.turn && !promise.released && !promise.fulfilled) requireRule( - shipmentPromiseModeSupported(g) && - g.status === 'playing' && - g.phase === 5 && - g.active === promise.player && - shipmentAvailable(g,getPlayer(g,promise.player)), - 'The saved shipment promise does not belong to a supported unused shipment opportunity.', + shipmentPromiseModeSupported(g, promise.player) && + shipmentPromiseTurnAvailable(g, promise.player, shipmentAvailable(g,getPlayer(g,promise.player))), + 'The saved shipment promise does not belong to a supported unused shipment opportunity this phase.', ); } } @@ -22702,10 +22703,7 @@ function findShipmentCompletion( ), ): { actions: Action[] } | null { if ( - state.status !== 'playing' || - state.phase !== 5 || - state.active !== owner.id || - !shipmentAvailable(state,owner) + !shipmentPromiseTurnAvailable(state, owner.id, shipmentAvailable(state,owner)) ) return null; if (promises.every(p => matchesShipment(p, null) === p.answer)) @@ -22713,6 +22711,18 @@ function findShipmentCompletion( const initial = structuredClone(state); initial.truthtrance = null; projectPendingShipmentKarama(initial, owner.id); + const waiting = state.active !== owner.id; + const outgoingFloor = committedOutgoingAid(state, owner); + if (waiting) { + // Quote this owner's later turn without taking it or resolving another + // player's declaration. Keep all actual resources and the original queue. + initial.active = owner.id; + if (initial.karamaShipping?.player !== owner.id) initial.karamaShipping = null; + if (initial.pendingShipment?.player !== owner.id) initial.pendingShipment = null; + if (initial.pendingGuildTransport?.player !== owner.id) initial.pendingGuildTransport = null; + if (initial.pendingHomeworldShipment?.player !== owner.id) initial.pendingHomeworldShipment = null; + initial.pendingKarama = null; + } // Test choices after the interrupt, while leaving the real continuation intact. // Every actual action still revalidates its timing, quote and physical custody. initial.response = null; @@ -22831,8 +22841,8 @@ function findShipmentCompletion( // conversion effects. More reserves/lower cost cannot remove // a previously available choice of physical shipment count. const preparations: Action[] = []; - if (g.aid[p.id]?.amount > 0) - preparations.push({ type: 'pledgeAid', amount: 0 }); + if ((g.aid[p.id]?.amount ?? 0) > outgoingFloor) + preparations.push({ type: 'pledgeAid', amount: outgoingFloor }); const karama = p.hand.find((c) => canUseAsKaramaRole(g, p, c)); if (karama && !g.karamaShipping) preparations.push({ @@ -22951,6 +22961,18 @@ function reconcileShipmentPromises( if (promise.turn !== g.turn || promise.released || promise.fulfilled) continue; const p = getPlayer(g, promise.player); + const future = g.active !== p.id; + const ownVoluntary = voluntary?.actor === p.id && + (['card', 'bribe', 'pledgeAid', 'emperorGift'].includes(voluntary.action.type) || + future && voluntary.action.type === 'decision'); + // A foreign pending parent may spend or refund its approved funding. Wait + // for that outcome; never release a future promise just for waiting. + if (future && !ownVoluntary && (g.truthtrance || g.response || g.decision || + g.phaseOpening || g.pendingShipment || g.pendingGuildTransport || + g.pendingHomeworldShipment || g.pendingTreacheryDiscard || g.ornithopter)) { + kept.push(promise); + continue; + } if ( findShipmentCompletion(g, p, [ ...kept.filter((old) => old.player === p.id), @@ -22960,9 +22982,7 @@ function reconcileShipmentPromises( kept.push(promise); else { requireRule( - !voluntary || - voluntary.actor !== p.id || - !['card', 'bribe', 'pledgeAid'].includes(voluntary.action.type), + !ownVoluntary, 'You cannot voluntarily make your Truthtrance shipment answer impossible.', ); promise.released = true; @@ -32727,6 +32747,13 @@ function applyActionInner( location: location(dest.territory, dest.sector), amount, }; + if (liveShipmentPromises(g.shipmentPromises ?? [], p.id, g.turn).length) { + // Accepting accompaniment is voluntary even though a later responder + // commits its reserve withdrawal. Check that allowed outcome now. + const afterAdvisor = structuredClone(g); + finishResponse(afterAdvisor, false); + reconcileShipmentPromises(afterAdvisor, { actor: p.id, action }); + } } else log(g, `${p.name} declined the free shipment.`); } else if (decision.kind === 'wormPlacement') { requireRule( @@ -33645,6 +33672,13 @@ function applyActionInner( maximum, t === 'emperorGift' ? 'Spice' : 'Forces', ); + if (t === 'emperorGift' && liveShipmentPromises(g.shipmentPromises ?? [], p.id, g.turn).length) { + // Permission to cancel the gift is not funding for an already promised + // shipment. Validate the voluntary outflow before opening its response. + const afterGift = structuredClone(g); + getPlayer(afterGift, p.id).spice -= amount; + reconcileShipmentPromises(afterGift, { actor: p.id, action }); + } const elite = t === 'emperorRevival' ? eliteChoice( @@ -35150,7 +35184,10 @@ export function viewGame(state: Game, id: string) { battleChoices: g.status === 'playing' && g.phase === 6 ? battleOrderQuote(g).choices : [], battleOrder: projectedBattleOrder(g), guildAmbassadorAdvisorChoices: guildAdvisorChoices(g, id), - truthShipmentSupported: shipmentPromiseModeSupported(g), + truthShipmentSupported: g.players.some(p => shipmentPromiseModeSupported(g, p.id)), + truthShipmentTargets: !g.response && !g.decision && !g.phaseOpening && !g.pendingShipment + ? g.players.filter(p => shipmentPromiseModeSupported(g, p.id) && + shipmentPromiseTurnAvailable(g, p.id, shipmentAvailable(g, p))).map(p => p.id) : [], guildShipmentStopPromiseBlock: ownGuildStopPromiseBlock(g, me), truthShipmentAnswers: g.truthtrance?.stage === 'answer' && @@ -35162,6 +35199,7 @@ export function viewGame(state: Game, id: string) { // original question and whole answer remain public through truthHistory. shipmentPromises: (g.shipmentPromises ?? []).filter(p => !p.mixed || p.player === id), shipmentCompletion: + g.active === id && !g.pendingTreacheryDiscard && !g.response && !g.pendingKarama && !g.truthtrance && !g.decision && !g.phaseOpening && !g.pendingShipment && diff --git a/game/reference.ts b/game/reference.ts index e7002989..deacf564 100644 --- a/game/reference.ts +++ b/game/reference.ts @@ -2912,15 +2912,15 @@ export const RULE_TOPICS: RuleTopic[] = [ category: 'Cards', coverage: 'Partial', summary: - 'Bind a shipment from reserves to a named territory with a minimum physical force count during the active supported shipment opportunity.', + 'Bind an unused reserve shipment this phase, including a player whose turn is still ahead, to a named destination and minimum physical count.', steps: [ - 'Declare Truthtrance, select the active player and choose Bind a shipment from reserves. Choose a printed destination and minimum of one to twenty forces, or combine two shipment conditions using AND or OR. Each describes the same shipment. Automatic enforcement supports base Basic and base Advanced games, including Guild, before that active player ships and after pending decisions finish. Other optional configurations keep their existing boundaries.', + 'Declare Truthtrance, select an eligible player whose unused shipment is active or still ahead this phase, and choose Bind a shipment from reserves. Choose a printed destination and minimum of one to twenty forces, or combine two shipment conditions using AND or OR. Each describes the same shipment. Automatic enforcement supports base Basic and base Advanced games, including Guild, before that player ships and after pending decisions finish. Earlier players keep their original turns; answering never grants an early shipment. Other optional configurations keep their existing boundaries.', 'Yes requires the complete statement to match while possible: all AND conditions or at least one OR condition. No requires the whole statement to be false: at least one AND condition false, or every OR condition false. A smaller count, different destination, transport of forces already on the board or no shipment may satisfy No. Forces already in the destination and ground movement do not satisfy the question. Fremen reinforcements and Guild transport from southern reserves do count.', 'The target privately sees feasible answers based on their own resources and earlier promises. Available Ghola revival, Karama discounts, incoming pledged aid and reclaiming their own unused pledge are included. Other players’ unplayed cards and future voluntary gifts are not assumed.', 'Accepted whole answers are public and constrain the event together with earlier promises. When an answer requires a shipment, honor it before ground movement or finishing and do not voluntarily spend away the last legal completion. A completed opposing effect that makes compliance impossible releases it publicly.', 'Guild interception and rate or transport-permission responses finish before delivery. An opposing stop consumes the shipment without payment or arrival: answers matching no shipment fulfill and impossible answers release. You cannot stop your own shipment to evade your answer. An unaffordable canceled rate leaves shipment available; a retained owned discount or ordinary Fremen reinforcement may still provide a legal route.', 'Choose Mixed current fact and shipment for nested AND/OR groups of supported current facts and this-turn reserve shipments. Current facts freeze privately when answered: Yes OR a true current fact can allow skipping even after later losing that holding; No AND a false current fact can allow shipping even after that fact changes. Unknown is not false. Only the whole question and answer are public.', - 'Your own promises show the original grouped question, not private compiled clause results. Optional private next-step guidance includes preparation, funding or shipment, only after pending controls finish. All four legal policies use server-feasible choices and the same complete route. Earlier phases, other modules, expansion shipment modes, other future actions and arbitrary prose enforcement remain unfinished.', + 'Your own promises show the original grouped question, not private compiled clause results. While waiting, the promise remains visible without an executable action. Optional private next-step guidance includes preparation, funding or shipment only on your actual turn after pending controls finish. All four legal policies use server-feasible choices and the same complete route. Earlier phases, other modules, expansion shipment modes, other future actions and arbitrary prose enforcement remain unfinished.', ], example: 'Yes to at least six forces to Carthag and No to at least eight there leaves a shipment of six or seven. Moving existing forces into Carthag does not fulfill either shipment event.', @@ -2930,7 +2930,7 @@ export const RULE_TOPICS: RuleTopic[] = [ area: 'Implementation', status: 'Partial', detail: - 'Authoritative reserve commitments, mixed current-fact AND/OR, frozen clauses, owned preparation, actual shipment/skip and opposing release include base Advanced Guild interception, permission and rates. Self-stop cannot evade an answer; broader timing/modules remain unfinished.', + 'Authoritative reserve commitments, mixed current-fact AND/OR, frozen clauses, owned preparation, actual shipment/skip and opposing release include base Advanced Guild interception, permission and rates. Same-phase waiting turns retain joint promises through native Guild WAIT/TAKE and paid intervening turns. Own gifts/accompaniment cannot spend the last completion; broader phases/modules remain unfinished.', }, { area: 'Player controls', @@ -2954,7 +2954,7 @@ export const RULE_TOPICS: RuleTopic[] = [ area: 'Verification', status: 'Partial', detail: - 'Current Guild batch passes106 rule cases plus one updated existing in-memory scope case, types/lint/build, four original-action/rendered-table programmes and four finite policy continuations. Earlier persistence/privacy evidence is historical; full Truthtrance, modes, final assurance and deployed acceptance remain open.', + 'Current waiting-turn batch passes146 rule cases plus one updated existing in-memory scope case, types/lint/build, three original-action/rendered-table programmes and four finite legal policy continuations. Earlier persistence/privacy evidence is historical; full Truthtrance, modes, final assurance and deployed acceptance remain open.', evidence: [ 'tests/shipment-promises.test.ts', 'tests/shipment-promises-bots.test.ts', @@ -2965,6 +2965,9 @@ export const RULE_TOPICS: RuleTopic[] = [ 'tests/compound-shipment-recovery.test.ts', 'tests/mixed-shipment-question.test.ts', 'tests/mixed-shipment-engine.test.ts', + 'tests/truthtrance-future-shipment.test.ts', + 'tests/truthtrance-future-shipment-engine.test.ts', + 'tests/fixture-truthtrance-future-shipment.ts', 'tests/truthtrance-guild-shipment.test.ts', 'tests/truthtrance-guild-shipment-engine.test.ts', 'tests/fixture-truthtrance-guild-shipment.ts', diff --git a/game/shipment-promises.ts b/game/shipment-promises.ts index d267f741..3bf120a2 100644 --- a/game/shipment-promises.ts +++ b/game/shipment-promises.ts @@ -159,7 +159,7 @@ export function shipmentPromiseModeSupported(game: { semutaPreview?: unknown; leaderSkills?: unknown; discoveryEnabled?: unknown; -}): boolean { +}, respondent = game.active): boolean { if (game.semutaPreview === true && game.expansions.length === 1 && game.expansions[0] === 'choam' && !game.techTokens && !game.strongholdCards && !game.nexusCards && !game.homeworlds && @@ -169,7 +169,7 @@ export function shipmentPromiseModeSupported(game: { player.faction === 'atreides' || player.faction === 'harkonnen' || player.faction === 'emperor' || player.faction === 'beneGesserit' || player.faction === 'fremen')) { - const target = game.players.find(player => player.id === game.active); + const target = game.players.find(player => player.id === respondent); return !!target && target.faction !== 'richese'; } return ( @@ -181,6 +181,16 @@ export function shipmentPromiseModeSupported(game: { !game.homeworlds)) ); } +/** Current-turn eligibility, distinct from permission to execute an action now. */ +export function shipmentPromiseTurnAvailable(game: { + status: string; + phase: number; + active?: string | null; + movementRemaining?: readonly string[] | null; +}, player: string, unused: boolean): boolean { + return game.status === 'playing' && game.phase === 5 && unused && + (game.active === player || !!game.movementRemaining?.includes(player)); +} export type ShipmentPromise = ShipmentClaim & { turn: number; player: string; diff --git a/game/truthtrance.ts b/game/truthtrance.ts index 45a0a933..a59657dc 100644 --- a/game/truthtrance.ts +++ b/game/truthtrance.ts @@ -2,6 +2,7 @@ import { shipmentAvailable } from './shipment-opportunity'; import type { ShipmentClaim } from './shipment-promises'; import { shipmentPromiseModeSupported, + shipmentPromiseTurnAvailable, parseShipmentClaim, shipmentClaimText, ShipmentClaimError, @@ -192,19 +193,15 @@ function parseQuestion(g: Game, asker: string, value: unknown): TruthQuestion { ); if (v.kind === 'shipment' || v.kind === 'mixedShipment') { check( - shipmentPromiseModeSupported(g) && - g.status === 'playing' && - g.phase === 5 && - g.active === v.target && - shipmentAvailable( - g, - g.players.find((p) => p.id === v.target)!, - ) && + shipmentPromiseModeSupported(g, v.target) && + shipmentPromiseTurnAvailable(g, v.target, shipmentAvailable( + g, g.players.find((p) => p.id === v.target)!, + )) && !g.response && !g.decision && !g.phaseOpening && !g.pendingShipment, - 'Structured shipment promises require a supported active unused shipment: Basic or Advanced base rules, or a classic payer in the Richese Semuta profile. Finish pending decisions first.', + 'Structured shipment promises require a supported unused shipment this phase: the respondent must be active or still waiting for their turn. Finish pending decisions first.', ); try { if (v.kind === 'mixedShipment') { diff --git a/tests/fixture-truthtrance-future-shipment.ts b/tests/fixture-truthtrance-future-shipment.ts new file mode 100644 index 00000000..b618fb2e --- /dev/null +++ b/tests/fixture-truthtrance-future-shipment.ts @@ -0,0 +1,181 @@ +import assert from 'node:assert/strict'; +import { applyAction, createGame, joinGame, newPlayer, type Action, type Game } from '../game/engine'; +import type { TruthQuestion } from '../game/truthtrance'; +import { nextStrongholdFactionsNativeStep } from './fixture-stronghold-factions'; +import { withClassicDiscoveryNexusLottery } from './fixture-discovery-classic-nexus'; + +export type FutureShipmentStep = { actor: string; action: Action }; +export type FutureShipmentTransition = { before: Game; step: FutureShipmentStep; after: Game }; +export const futureShipmentPlayer = (game: Game, actor = 'emperor') => { + const player = game.players.find(player => player.id === actor); assert.ok(player); return player; +}; +export const futureShipmentClean = (game: Game) => !game.response && !game.phaseOpening && + !game.decision && !game.truthtrance && !game.pendingTreacheryDiscard; +export function actFutureShipment(game: Game, actor: string, action: Action, actions: FutureShipmentStep[] = []): Game { + const next = withClassicDiscoveryNexusLottery(() => applyAction(game, actor, action)); + actions.push({ actor, action: structuredClone(action) }); return next; +} +/** Real original decisions only. The owned programme supplies its questions, + * answers, shipments and each deliberately selected Guild timing choice. */ +export function nextFutureShipmentStep(game: Game): FutureShipmentStep | null { + if (game.truthtrance) { + if (game.truthtrance.stage !== 'priority') return null; + const actor = game.players.find(player => !game.truthtrance!.passed.includes(player.id)); assert.ok(actor); + return { actor: actor.id, action: { type: 'truthPass' } }; + } + if (!game.response && !game.phaseOpening && !game.pendingTreacheryDiscard && game.decision?.kind === 'guildTiming') + return { actor: game.decision.player, action: { type: 'decision', take: false } }; + return nextStrongholdFactionsNativeStep(game); +} +export function advanceFutureShipment(game: Game, until: (state: Game) => boolean, actions: FutureShipmentStep[] = []): Game { + for (let count = 0; count < 1800; count++) { + if (until(game)) return game; + assert.notEqual(game.status, 'finished', 'The original future-shipment programme ended before its next control'); + const step = nextFutureShipmentStep(game); assert.ok(step, 'Choose the actual structured question and answer before advancing'); + game = actFutureShipment(game, step.actor, step.action, actions); + } + throw Error('The original future-shipment programme did not reach its finite boundary'); +} + +/** Original public Basic/Advanced classic setup deals selected unopened cards, + * including the physical Truthtrance. Advanced starts with an actual Guild + * WAIT, leaving the distinct respondent's original turn still ahead. No dealt + * custody, armies, resources, phase, queue, timing flags or promises are staged. */ +export function createFutureShipmentFixture(options: { + advanced?: boolean; target?: 'emperor' | 'guild'; mixed?: boolean; +} = {}) { + const target = options.target ?? 'emperor', advanced = options.advanced ?? target === 'guild'; + assert.ok(target !== 'guild' || advanced, 'The bounded future Guild programme uses its native Advanced timing'); + const mixed = options.mixed ?? target === 'guild'; + let game = createGame('TRUTHFUTURESHIPMENT', newPlayer('atreides', 'Atreides', 'atreides'), advanced); + for (const faction of ['emperor', 'harkonnen', 'guild'] as const) joinGame(game, newPlayer(faction, faction, faction)); + const actions: FutureShipmentStep[] = []; + const act = (actor: string, action: Action) => { game = actFutureShipment(game, actor, action, actions); }; + const reach = (until: (state: Game) => boolean) => { game = advanceFutureShipment(game, until, actions); }; + for (const player of game.players) act(player.id, { type: 'ready' }); + const lobby = structuredClone(game); + act(game.host, advanced ? { type: 'start', advancedPreview: true } : { type: 'start' }); + const setup = structuredClone(game); + assert.equal(game.status, 'setup'); + assert.ok(game.players.every(player => player.hand.length === 0)); + const truth = game.deck.find(card => card.effect === 'truthtrance'); + const karama = game.deck.find(card => card.effect === 'karama'); + const filler = [game.deck.find(card => card.name === 'Baliset'), + game.deck.find(card => card.kind === 'shield'), game.deck.find(card => card.kind === 'snooper')]; + assert.ok(truth && karama && filler.every(Boolean)); + const deal = [truth.id, filler[0]!.id, karama.id, filler[1]!.id, filler[2]!.id]; + for (const [position, id] of deal.entries()) { + const from = game.deck.findIndex(card => card.id === id); assert.ok(from >= position); + [game.deck[position], game.deck[from]] = [game.deck[from], game.deck[position]]; + } + const beforeStartingDeal = structuredClone(game); + reach(state => state.status === 'playing'); + const afterSetup = structuredClone(game), front: Game['spiceDeck'] = []; + assert.ok(futureShipmentPlayer(game, 'atreides').hand.some(card => card.id === truth.id)); + assert.ok(futureShipmentPlayer(game, 'harkonnen').hand.some(card => card.id === karama.id)); + for (let count = 0; count < (advanced ? 2 : 1); count++) { + const index = game.spiceDeck.findIndex(card => 'territory' in card && !card.discovery); assert.ok(index >= 0); + front.push(game.spiceDeck.splice(index, 1)[0]); + } + game.spiceDeck.unshift(...front); + let initialWait: FutureShipmentTransition | null = null; + if (advanced) { + reach(state => state.phase === 5 && !state.response && !state.phaseOpening && state.decision?.kind === 'guildTiming'); + const before = structuredClone(game), step: FutureShipmentStep = { actor: 'guild', action: { type: 'decision', take: false } }; + act(step.actor, step.action); reach(futureShipmentClean); + initialWait = { before, step, after: structuredClone(game) }; + } else reach(state => state.phase === 5 && state.active === 'atreides' && futureShipmentClean(state)); + assert.equal(game.active, 'atreides'); + assert.notEqual(game.active, target); + assert.ok(game.movementRemaining!.includes(target)); + assert.equal(futureShipmentPlayer(game, target).shipped, false); + const question: TruthQuestion = mixed ? { kind: 'mixedShipment', target, mixed: { kind: 'and', terms: [ + { kind: 'shipment', territory: 'sietch_tabr', minimum: 3 }, + { kind: 'fact', fact: { kind: 'spice', compare: 'gte', value: 3 } }, + ] } } : { kind: 'shipment', target, territory: 'sietch_tabr', minimum: 3 }; + return { game, lobby, setup, beforeStartingDeal, afterSetup, initialWait, question, + advanced, mixed, target, asker: 'atreides', guild: 'guild', counterHolder: 'harkonnen', + card: truth.id, karama: karama.id, location: 'sietch_tabr:14', deal, + sourceActionCount: actions.length, actions, + staging: ['Only five unopened original starting-deal positions, unopened land Spice positions and scalar lotteries are selected. Public classic Basic/Advanced setup actually deals Truthtrance to Atreides and a distinct Karama to Harkonnen for genuine native response passes. Advanced begins with the real Guild WAIT. No postdeal holdings, resources, armies, clocks, movement queue, timing flags or promise receipts are assigned.'] }; +} +export type FutureShipmentFixture = ReturnType