Enable Sandmaster collection on flight and marker routes

This commit is contained in:
Quintine committed 2026-10-26 10:11:18 +11:00
1 parent 4af90e547c
commit ec549028ba
20 files changed
+1623 -165

No files matched your search

+41 -9
View File
@@ -16,6 +16,40 @@ open mode gates.
## Current checkpoint and work
**Sandmaster special-route collection — 26 October. Prototyped / Partial.**
Physical range3/twoGroups, carried Discovery and the own concealed marker now use
the existing signed route/pile choice. Fixed range stays3; different normal card
groups use current range and each gets its existing collection opportunity.
Declared legal detours and current positive piles survive the quote; original
typed/marker cohorts, flight identities and one disposal/credit remain. Marker0/
3/5 stays concealed without materialization. Shared transport choices, editable
routes, pile/decline controls and guarded callbacks feed minimal legal policy.
Existing allocation/reset composition remains provisional; no mode gate opens.
Three disjoint native/control lanes and root integration pass **14 files,130/130**,
types/lint/build and **18 engine/GameTable SSR/actual selected-props callbacks**
on unchanged source. Eight public E/R/A +choam/Skills paths earn card1, shipment8
and real turn-two Spice blows (Basic73 / Advanced79 source actions); four public
G/E/H Skills/Discovery paths acquire the token through actual Collection and use
it with a real later blow (Basic65 / Advanced71). Collection/decline and current
second-group piles finish in two-to-four continuation actions. Physical paths
retain45 Treachery, Discovery33; each retains14 Skills/15 Traitors. Six labelled
controlled marker paths supplement12 native paths; their positions/piles have
no played chronology claim. Eight physical, seven Discovery, fifteen controlled
and thirteen marker engine cases cover the slice. Feedback corrects an assumed
native source-spice remainder, nullable projection narrowing and a test name.
A bounded inventory also finds first versions of all28 independent Skill bands
connected. Stale absence claims are corrected; full interactions, polished AI
and complete-mode acceptance remain due. [Inventory](LEADER_SKILLS_RUNTIME.md#independent-band-inventory--26-october-2026).
Frozen v3 report/logs:
`/home/quintine/.local/share/dune/checkpoints/20261026-sandmaster-flight-proof-v3/`;
journeys/HTML: adjacent `20261026-sandmaster-flight-runtime/`.
No saved-room/D1/server, reset/restart, deployment or recovery operation occurs.
SSR/selected-props callbacks do not certify DOM/hydration, browser/mobile/deployed
acceptance or full modes/combinations. [Source and execution](SANDMASTER_MOVEMENT.md#flight-and-concealed-marker-routes--26-october-2026).
**Planetologist flight composition — 26 October. Prototyped / Partial.**
Both skill alternatives now compose with physical range3/twoGroups and carried
Discovery. Fixed3 stays3; twoGroups applies normal+1/cap3 or ordinary gathering
@@ -166,14 +200,12 @@ deployed acceptance. Full Truthtrance, modes/combinations and final assurance
remain open. [Battle controls](TRUTHTRANCE_NONBATTLE_READINESS_20260907.md#grouped-battle-plan-authoring--26-october-2026);
[shipment controls](COMPOUND_SHIPMENT_PROMISES.md#full-pure-shipment-authoring--26-october-2026).
Next source-supported interaction: Sandmaster collection along physical
Ornithopter range3/twoGroups and carried Discovery routes. Its printed moving-
forces band excludes none of these items. The live `validateSandmasterOrder`
and `game/sandmaster-movement.ts` adapters still refuse them. Preserve chosen
paths, exact piles, one collection per entered territory per movement, current
range, original cohorts and one commitment/disposal. A second card movement
requotes current spice; income never enlarges unmoved quotas. Use actual trained
sources and produced Spice blows, not changed played assignments or staged piles.
Next delivery inventory: remaining standalone Richese card effects, six Terror
effects and the independent Ecaz card variant named in the readiness row below.
Use their current canonical checklist/handlers/controls to distinguish a missing
primitive from a stale absence claim or unfinished combination, then deliver
real independent gaps before more Skill combinations. All28 Skill bands have
connected first versions; that finding does not establish all Dune rules complete.
Bounded allied-marker review found an existing legal voluntary-reveal→endMovement
route; the supplied
physical15/36 text does not expressly add alliance separation as a forced reveal
@@ -8504,7 +8536,7 @@ These links define bounded working behavior, not complete module certification.
| --- | --- |
| Basic core | Broader truthful commitments, unresolved special timing and integrated rules/human/AI acceptance. Ordinary Guild rate cancellation now exists: the `guildRate` prepayment response and `guildRateBlocked` turn window cover ordinary reserve shipment, eligible cross-planet transport and Guild return through the normalized `guildTransport`/shipment intents (`game/engine.ts`, `docs/GUILD_RATE_KARAMA_RULES.md`); the older 7 September readiness note that called it absent is superseded. |
| Six-faction Advanced | Base gaps, provisional special-Karama outcomes, remaining timing audits and authentic multiplayer/browser acceptance. The user-authorized unfinished preview is available; setup matrices and complete samples do not certify full compliance. |
| Twelve factions and all optional modules | Every missing effect, remaining skill bands, Ecaz card variant, Kull Wahad, unfinished Richese cards, Terror effects, occupation entitlement, Nexus interactions, contested Discoveries and complete games across valid combinations. The 7 October 2026 rulings settled CHOAM's low-population opening income, the Richese exhausted/canceled cache count, Suk/Kwisatz loss counting, the Guild Secret Ally Homeworld reserve return and Sandmaster HMS-relocation eligibility; the preserved captures can be resumed. Detailed boundaries remain in the checklist/decision index. |
| Twelve factions and all optional modules | Every missing effect, remaining skill interactions and integrated acceptance, Ecaz card variant, Kull Wahad, unfinished Richese cards, Terror effects, occupation entitlement, Nexus interactions, contested Discoveries and complete games across valid combinations. The 7 October 2026 rulings settled CHOAM's low-population opening income, the Richese exhausted/canceled cache count, Suk/Kwisatz loss counting, the Guild Secret Ally Homeworld reserve return and Sandmaster HMS-relocation eligibility; the preserved captures can be resumed. Detailed boundaries remain in the checklist/decision index. |
| AI | Maintain minimal legal participation and critical correctness fixes while game features are unfinished. Full implementation, strategy refinement and calibration wait until all non-AI features are complete; then target approximately 75% higher-tier wins for Medium/Easy, Hard/Medium and Brutal/Hard. See the [AI development plan](AI_DEVELOPMENT_PLAN.md). These targets remain unverified. |
| Multiplayer | Broader disconnected/abandoned-seat recovery, unattended continuation and network-failure acceptance, while preserving authoritative versioning, custody, privacy and saves. |
| Administration | Complete the [admin panel](ADMIN_PANEL.md): permissions, room directory and creation/removal, lifecycle controls, participant support, backup/restore and operational audit tools. Required before full AI refinement. |
+33
View File
@@ -1,5 +1,38 @@
# Dune implementation status
## 26 October 2026 — Sandmaster flight and concealed-marker routes
**Prototyped / Partial.** Physical range3/twoGroups, carried Discovery and the
own No-Field use exact source routes and current chosen piles. Fixed3 remains3;
each different card movement uses current normal range and its own one-per-
entered-territory opportunity. Source/flight identity, current trainer, typed
cohort and exact pile amounts bind the receipt. Chosen detours remain intact;
declines earn0. The marker counts as one without materializing0/3/5. Route/pile
editing and a guarded actual submit leaf share projected transport; minimal
policies retain original destination priority. Legacy ordinary order fields stay.
Frozen **14-file130/130**, types/lint/build and **18 engine/GameTable SSR/actual
selected-props callback paths** pass. Eight public physical sources earn card1,
shipment8 and actual later Spice (Basic73 / Advanced79 actions); four public
Discovery sources earn original Collection acquisition and real later Spice
(Basic65 / Advanced71). Two-to-four continuation actions finish Collection,
without replaying bonuses/disposal. Physical45/Discovery33 Treachery,14 Skills
and15 Traitors remain. Six controlled marker callback paths make no played
source claim. Eight physical, seven Discovery, fifteen control and thirteen
marker engine cases cover the slice. Feedback repairs the native residual-spice
assumption, nullable projection narrowing and reserved test variable name.
Bounded delivery inventory finds all28 independent Skill bands connected, while
retaining Partial/Prototyped classifications and full acceptance gates; current
absence wording is reconciled with the existing evidence.
[Band inventory](LEADER_SKILLS_RUNTIME.md#independent-band-inventory--26-october-2026).
Proof: `/home/quintine/.local/share/dune/checkpoints/20261026-sandmaster-flight-proof-v3/`;
journeys/HTML: adjacent `20261026-sandmaster-flight-runtime/`. No saved-room/D1/
server, reset/restart, deployment or recovery operation. SSR/selected-props
callbacks do not prove DOM/hydration, browser/mobile/deployed or complete-mode
acceptance. Full rules, interactions and final assurance remain open.
[Source and contract](SANDMASTER_MOVEMENT.md#flight-and-concealed-marker-routes--26-october-2026).
## 26 October 2026 — Planetologist physical and Discovery flight matrix
**Prototyped / Partial.** Connect both skill alternatives to physical range3,
+7 -5
View File
@@ -1,10 +1,12 @@
# Leader Skill battle effects
13 September 2026. **Prototyped, with Partial rules coverage.** This follow-up
connects both Rihani Decipherer bands and the lower battle bands of Mentat,
Bureaucrat and Sandmaster. Normal Mentat questioning, Bureaucrat payments and
Sandmaster movement collection remain missing, as do Spice Banker, Diplomat and
Smuggler. Public module starts and publication remain gated.
13 September 2026 checkpoint. **Prototyped, with Partial rules coverage.**
This dated follow-up connected both Rihani bands and the lower battle bands of
Mentat, Bureaucrat and Sandmaster. Its earlier absence claims for normal Mentat,
payments, movement collection, Banker, Diplomat and Smuggler are superseded:
the [26 October inventory](LEADER_SKILLS_RUNTIME.md#independent-band-inventory--26-october-2026)
records connected first versions of all28 independent bands. Full interactions,
mode acceptance and publication remain gated.
## Source contract
+30 -5
View File
@@ -1,5 +1,27 @@
# Leader Skills first functional prototype
## Independent band inventory — 26 October 2026
A bounded delivery inventory finds connected first versions of all28 independent
normal/battle bands on the fourteen physical faces. This supersedes older
absence claims below; it does not certify every interaction, complete modes,
comprehensive verification, polished controls or AI strategy.
| Faces | Connected normal and battle effects |
| --- | --- |
| Warmaster and four weapon/defense disciplines | Shared role scoring and actual battle-plan/posture controls |
| Bureaucrat and Spice Banker | Payment redirection, normal deferred income, stronghold penalty and sealed battle spending |
| Mentat, Rihani, Diplomat and Suk Graduate | Private questioning, traitor inspection/exchange, defense copying/retreat and physical rescue |
| Sandmaster, Smuggler and Planetologist | Route/victory collection, shipment/battle collection and movement/Special substitution |
The [physical faces](LEADER_SKILLS_RULES.md),
[canonical implementation/control/AI checklist](../game/reference.ts) and its
linked current helpers are the evidence. Current Sandmaster flight/marker
delivery completes the previously guarded route adapters; no wholly absent
independent band was identified. Keep `Prototyped` / `Partial` classifications.
Recorded edge interpretations, including [empty-hand Mentat](MENTAT_QUESTION.md),
valid module combinations, full games and final assurance remain open.
**17 October default cutover:** normal Spice Banker income is mandatory in
fresh supported ordinary all-fourteen Skills setups, including their existing
module and native-overlay envelopes. The separate income initializer/profile
@@ -1373,9 +1395,11 @@ Other expansion rosters and combined optional modules remain gated. Native
Advanced foreign gholas now follow the bounded Tleilaxu contract above; the
recorded source-contract timing questions remain open. Planetologist has bounded
movement and battle controls as described below.
Remaining normal-band payments, ordinary Mentat activation, modified Smuggler collection,
and the other guarded skill combinations still need connected effects. Diplomat
retreat is a bounded prototype, not a complete simultaneous-effect ruling.
The earlier missing normal-payment, ordinary Mentat and modified Smuggler
claims are superseded by their connected current contracts above and the
26 October independent-band inventory. Guarded interactions still require
integration and acceptance. Diplomat retreat remains a bounded prototype,
not a complete simultaneous-effect ruling.
## Planetologist follow-up
@@ -1389,8 +1413,9 @@ continuation and revalidate source custody before a response is spent.
Six base factions remain the supported roster. Mixed BG origins are supported
where ordinary rules determine the destination stance. Enemy-only mixed arrival
still needs a combined flip response. Expansion faction/card/module combinations
and full integrated acceptance remain unfinished. The remaining bands and skill families are
listed above; this is partial prototype coverage.
and full integrated acceptance remain unfinished. This dated roster/arrival
boundary is superseded by current native and flight contracts above; all
independent bands now have connected first versions, with partial coverage.
## Suk Graduate follow-up
+12
View File
@@ -1,5 +1,17 @@
# Rule decision index
## Sandmaster flight and concealed-marker collection — 26 October 2026
Compose the moving-forces normal band with both physical Ornithopter modes,
carried Discovery and an own concealed No-Field. Fixed flight remains3; twoGroups
retains current normal range and different original cohorts. Each accepted
movement gets the existing provisional one-per-entered-territory collection,
selecting one current positive pile or declining. Preserve chosen legal detours,
actual source and flight identities, exact pile bounds and original disposal.
Marker0/3/5 stays concealed without materialization. The reset and sector
allocation remain explicit selected policy, not a joint publisher FAQ.
[Source and execution](SANDMASTER_MOVEMENT.md#flight-and-concealed-marker-routes--26-october-2026).
## Planetologist physical and Discovery flight — 26 October 2026
Under 14 October choose-recommended authority, compose both skill alternatives
+63
View File
@@ -5,6 +5,69 @@ ground movement now connects the normal band through explicit routes, optional
collection, player controls, all four AI profiles and saved continuation.
This does not open public Leader Skills starts or publication.
## Flight and concealed-marker routes — 26 October 2026
Sandmaster's physical normal band applies when moving owned forces into or
through a territory with spice; it excludes none of the three flight sources.
The [physical Ornithopter](RICHESE_ORNITHOPTER_ENGINE_AUDIT.md#authority) changes
range or grants two different normal movements, and Discovery E3p13 changes
range for one later movement action. Neither removes route collection. The
[No-Field contract](RICHESE_NO_FIELD_RULES.md#verified-lifecycle) counts a
concealed marker as one force, including0. Compose these effects under existing
14 October authority; no joint publisher FAQ is claimed.
Physical range3 and carried Discovery use a maximum of3. Physical twoGroups
uses each group's current normal range. Each accepted movement gets its own
one-per-entered-territory opportunity under the existing provisional reset
policy, so a second different group can collect there again if spice remains.
The source territory grants no bonus without actually re-entering it. Each
territory selects one current positive pile or declines, retaining the existing
provisional sector-allocation policy. Declining collection does not decline
movement or preserve a spent card/token entitlement.
The original chosen route is authoritative, including a legal detour longer
than the shortest path. Current route bounds, storm/entry and typed force/marker
cohorts still apply. A physical flight fingerprint binds original card, event,
mode and completed-group index; Discovery binds token/acquisition turn alongside
its original parent receipt. The signed Sandmaster order retains exact source,
range, route, pile amounts, trainer and move. Legacy ordinary orders add no new
fields. No circular signature or public receipt is required in the action.
Marker-only routes remain concealed and do not materialize or debit reserves.
Selected physical counters at the same marker sector share one declared route.
Its value supplies no extra range or collection. First-flight arrivals do not
enlarge the remaining original cohort, and spice income adds no counters or
movement credit. The second movement requotes current piles. Original card/
token disposal and earned allowance occur once through their existing flow.
The form offers ordinary/card/token transport before validating its source
route, keeps route editing and selected-pile/decline controls, and guards the
actual callback with current transport and signed quote. Minimal policy adds
the same deterministic legal route choice while retaining original candidates
and destination priority. Other normal-band skills and special relocations
retain separate adapters. No saved root field, action kind or module gate opens.
**Frozen evidence:** v3 passes14 files,130/130, types/lint/build and18 engine/
GameTable SSR/actual selected-props callback paths. Eight genuine public physical
paths earn cache card1, four-counter shipment8 and actual produced Spice,
using Basic73 / Advanced79 source actions. Four public Discovery paths earn
original Collection acquisition and a later real Spice blow, using Basic65 /
Advanced71 actions. Two-to-four continuations finish Collection, with45 physical-
family or33 classic Treachery,14 Skills and15 Traitors retained. Six explicitly
controlled marker paths supplement the12 native paths; no played positions,
shipment or blow provenance is claimed for those supplements. Eight physical,
seven Discovery, fifteen control and thirteen marker cases cover the slice and
minimal policies. Positive source-pile exclusion in the Discovery seam is a
controlled supplement; native source spice is preserved at its actual value,
including0. Feedback corrects that earlier remainder assumption, projection
narrowing and a reserved test variable.
Report/logs: private `20261026-sandmaster-flight-proof-v3/` under
`/home/quintine/.local/share/dune/checkpoints/`; journeys/HTML: adjacent
`20261026-sandmaster-flight-runtime/`. No saved-room/D1/server, reset/restart,
deployment or recovery operation. SSR/selected-props callbacks do not certify
DOM/hydration, browser/mobile/deployed acceptance, full combinations or modes.
## Owned ground-route pile selection — 9 October 2026
Ordinary ground movement now offers every existing positive pile in each