Compose original classic and paired Nexus Discovery modules

This commit is contained in:
Quintine committed 2026-10-06 04:06:16 +11:00
1 parent 9e8c718739
commit c8a6d0bb3c
20 files changed
+1603 -44

No files matched your search

+25
View File
@@ -17,6 +17,31 @@ open mode gates.
## Current checkpoint and work
**Classic Skills/Nexus/Discovery and paired native Nexus/Discovery — bounded
Development Verified:** original fresh classic base33/all14/all12 training
and separate paired E1/E2 no-Skills47/35/cache setup retain Discovery7/8,
Basic/Advanced2–6, optional Tech3+ and Advanced Strongholds2+.
Actual Maker losses/votes/typed rides, both piles, settled alliances and
end-Spice closing deals use original controls. Signed native nested markers
retain their one-invoice/current-revealed-site/physical-reserve contract.
Other overlays, native Skills/Nexus/Discovery, pending rulings, public starts
and played-save conversion stay gated.
Affected169, types/lint and build pass. All18 original six-seat samples complete:
13,576 accepted/13,576 attempts/359 JSON on unchanged7c65011d working tree.
Original human BT4SBSLB16/Charity retains natural training/Cistern3, six real
Guild Maker losses and its original Fremen closing draw. BZNXHKMU19/Charity
retains typed Shrine3/1Cyborg, two real Tleilaxu losses and native closing cards.
RJF6D6ML24/Movement retains original setup, two CHOAM losses, native closing
cards and actual signed No-Field5/3 Shrine8 settlement: Richese5→4/Guild3→4,
reserves19→14→11, no second fee. All three actual rides use two ordinary/one
Fedaykin free. Native undealt singleton ordering and controlled positions
are explicit, not natural-history/every-effect or deployed acceptance.
[Canonical combined evidence](DISCOVERY_PROTOTYPE.md#classic-skillsnexus-and-paired-native-nexus-discovery--6-october-2026).
Final cached-constructor/live-guide union50, TypeScript/lint and final build
pass; three final original programme re-runs complete1,659/1,659/44 JSON,
not added to the18 unique profile/seed samples.
**Native Leader Skills / Discovery — bounded Development Verified:**
fresh supported native Basic/Advanced family predicates retain original
decks, starting hands/offers/all14, Discovery7/8, optional Tech3+ and Advanced
+77
View File
@@ -35,6 +35,83 @@ node --import tsx tools/start-prototype.ts --profile discovery --db PATH --room
It preserves all seats and other rooms, requires the current version and refuses
to redeal a started game. The default `ix` profile remains available.
## Classic Skills/Nexus and paired native Nexus Discovery — 6 October 2026
Fresh classic `leader-skills --nexus-cards --discoveries` composes base33,
all14 original offered training, all12 Nexus and Discovery7/8. The separate
original `nexus --discoveries` entry additionally admits both Ixians+Tleilaxu
with Ix47, or both CHOAM+Richese with CHOAM35/cache, plus classic opponents,
without Skills. Both entries support Basic/Advanced2–6, optional unused
Tech3+ and Advanced Strongholds2+. Original actors, starting hands, offers,
native setup and printed component ownership are retained. Native combined
Skills/Nexus/Discovery, E3/mixed Nexus families, Homeworlds, variants/previews,
public starts, played-game conversion and pending rulings remain separate.
`classicNexusLeaderSkillsProfile`, `pairedDiscoveryNexusProfile` and the
existing original initializers own these exact envelopes. Ordinary skill
quotes and source-clear Emperor/Fremen ledgers remain shared. Richese Cunning
retains its original signed two-marker frame and one printed tariff; its
current destination must still be a revealed room location. Neither a held
Stronghold Card nor a selected marker grants a different nested site's benefit.
Actual end-Mentat claims and next-turn free entry precede Storm. Actual Great
Maker losses, storm-order votes and typed Fremen reserve rides precede settled
alliances and the closing Nexus choice at the end of the **entire Spice Blow**,
including both Advanced piles. No card is dealt at Maker reveal or Mentat.
The classic programme also exercises actual offered training, distinct free
revival quotas/Axlotl settlement, skilled nested battle cleanup and original
winner Tech. Paired E1 retains typed losses and Tech before Face Dance; E2
retains native declaration, private caps, CHOAM invoice and physical Cunning fuel.
Semantic evidence: `discovery-classic-nexus-skills-runtime.test.ts`,
`discovery-paired-nexus-runtime.test.ts` and their original fixture programmes.
Affected union **169/169** across14 files and types/lint pass; build passes.
The failed Advanced fixture had tried to reuse its already-discarded first-turn
Rock Outcroppings. It now conserves an actually unplayed second printed land,
without rewriting discard history. The native policy response uses the actual
eligible Karama holder, not the generic fixture's unrelated first actor.
Owning `LeaderSkillsView` supplies visibility; no concrete `ReturnType` contract.
Eight distinct new sample profiles use new4800–5500 bands and full roster/
expansion names, preserving old profiles/defaults/seeds:
`discovery-nexus-skills`, `discovery-nexus-skills-tech`,
`discovery-nexus-skills-stronghold`, `discovery-nexus-skills-stronghold-tech`,
`paired-discovery-nexus`, `paired-discovery-nexus-tech`,
`paired-discovery-nexus-stronghold`, `paired-discovery-nexus-stronghold-tech`.
All **18** original six-seat samples complete: **13,576 accepted/13,576 attempts/
359 JSON round trips**, unchanged working tree
`7c65011da5664444d85e873d85a4a1fd06bb5f880db7038a678fe7b90289ef8a`.
This is genuine original setup/continuation, not a natural-every-effect,
complete-faction, strategic-AI or recovery certificate.
Three new isolated human rooms preserve their original CLI setups:
BT4SBSLB8→9 entry programme retains natural Prana-Bindu Adept, Suk Graduate
and Sandmaster; human Cistern3 entry10, real Guild Maker losses6/vote11,
human vote12/typed Fremen ride14, settled-alliance closing15 and human
original Fremen draw16/Charity, deck12→11. BZNXHKMU10→11 retains original
native setup: human Shrine2ordinary/1Cyborg entry12, actual Tleilaxu losses2,
human vote14/typed ride16, closing17/actual native choices18–19/Charity.
RJF6D6ML10→11 retains its original native starting hands: human Guild
Shrine3 entry12, actual CHOAM losses2, vote14/typed ride16 and native closing
choices18–19. Both native closing programmes explicitly reorder only their
two **unplayed physical** singletons before actual draws; no held card is
injected and this is not natural draw history.
The E2 original continuation20 reaches real Richese timing. Human signed
No-Field5/3 shipment into revealed Shrine21, Guild allowance22 and the actual
Karama holder's allowance23 settle one invoice: Richese5→4, Guild3→4,
five real reserves materialize. Native reveal24 materializes the other three,
reserves19→14→11, Shrine8 and no second fee. All three human typed rides move
two ordinary/one Fedaykin to Polar Sink free, reserves20→17.
These are local working-tree controls, not protected live acceptance.
Final constructor predicate reuse and live-guide union **50/50**, TypeScript,
repaired unused-import lint and final build pass. The three original Advanced
four-component samples re-run unchanged after that cutover:1,659/1,659/44 JSON.
They are duplicate profile/seed re-runs, not additional unique samples in18.
The original starter help runs, and the new paired Discovery/Tech two-seat
request rejects with its existing three-through-six-seat prerequisite.
## Native Leader Skills composition — 6 October 2026
Fresh explicit `leader-skills --discoveries` now preserves original native
+28
View File
@@ -1,5 +1,33 @@
# Dune implementation status
## 6 October 2026 — Classic Skills/Nexus and paired native Nexus Discovery
Fresh original classic base33/all14/all12 and separate paired E1/E2 no-Skills
47/35/cache setups compose Discovery7/8, Basic/Advanced2–6, optional unused
Tech3+/Advanced Strongholds2+. Exact existing family predicates, original
constructors, actors/offers/starting hands and native setup remain.
Source-clear revival quotas, training, typed aftermath and held effects stay
shared. Richese Cunning keeps its signed one-tariff pair and current revealed
destination. Native combined Skills/Nexus/Discovery, other overlays, public
starts, conversion and unresolved rulings remain gated.
Affected169/14files, types/lint and build pass. Genuine original eighteen
six-seat samples finish13,576/13,576/359 JSON on unchanged7c65011d tree.
New4800–5500 sample bands/full roster names leave old profiles/seeds/defaults
unchanged. Original human BT4SBSLB16/Charity, BZNXHKMU19/Charity and
RJF6D6ML24/Movement use connected CLI setups and actual controls: training,
free entry, Maker6/2/2 casualties, storm-order votes, two-ordinary/one-Fedaykin
free rides, both Advanced piles, reciprocal alliance and end-Spice closing
deals. Native unplayed singleton ordering is explicitly controlled, not a
natural-history claim. E2 human signed5/3 nested pair settles one fee
Richese5→4/Guild3→4, original reserves19→14→11 and Shrine8, no second fee.
[Canonical scope/proof](DISCOVERY_PROTOTYPE.md#classic-skillsnexus-and-paired-native-nexus-discovery--6-october-2026).
Final constructor predicate reuse/live-guide union50, TypeScript, repaired
unused-import lint and final build pass. Three original final programme
re-runs finish1,659/1,659/44 JSON; these duplicate profile/seeds are not
added to18 original samples. CLI help and actual Tech two-seat rejection run.
Protected deployment/full acceptance/comprehensive assurance remain due.
## 6 October 2026 — Original native Leader Skills and Discovery
One exact Discovery envelope feeds existing native family/roster predicates
+21
View File
@@ -5,6 +5,27 @@ Normal mode starts and publication remain gated. The [source contract](LEADER_SK
contains all fourteen physical cards; the [capture interpretation](LEADER_SKILLS_CAPTURE.md)
records the fresh publisher/designer search requested by the user.
## Classic Nexus/Discovery composition — 6 October 2026
The fresh original classic `leader-skills --nexus-cards --discoveries` entry
retains base33/all14 offered training/all12 Nexus/Discovery7/8,
Basic/Advanced2–6, optional unused Tech3+ and Advanced Strongholds2+.
Original actors, hands, training and physical phase handlers remain.
Actual Great Maker losses/votes/typed reserve rides, both Advanced piles and
settled alliance precede the original end-Spice closing choice, not Mentat.
Source-clear Emperor/Fremen free-return ledgers, original Axlotl settlement,
skilled nested battle and mandatory original-winner Tech reuse existing rules.
Native Skills/Nexus/Discovery, HW/variants/previews/public starts/conversion
and unresolved effects remain guarded.
[Canonical combined evidence](DISCOVERY_PROTOTYPE.md#classic-skillsnexus-and-paired-native-nexus-discovery--6-october-2026)
records the169 affected union, eighteen genuine six-seat completions and three
connected original human programmes. BT4SBSLB retains naturally offered
Prana-Bindu Adept/Suk Graduate/Sandmaster, actual Cistern entry and six Guild
Maker casualties through the human closing draw. The separate paired native
Discovery/Nexus entries do not enable Skills. No complete all14/faction or
protected deployment claim follows from this bounded composition.
## Original native Discovery composition — 6 October 2026
Fresh native `leader-skills --discoveries` composes each already-supported
+28
View File
@@ -2,6 +2,34 @@
Original source audit, 10 September 2026, with dated bounded runtime follow-ups below. This document establishes the printed component inventory, source protocol and implementation boundaries; none lifts expansion release gates. The ordinary worm-triggered alliance Nexus already in the engine is distinct from this optional card module.
## Original Discovery, classic Skills and paired natives — 6 October 2026
The existing original fresh classic skill/Nexus entry additionally accepts
`--discoveries`: base33/all14 actual offered training/all12/Discovery7/8,
Basic/Advanced2–6, optional unused Tech3+ and Advanced Strongholds2+.
The separate original `nexus --discoveries` entry admits both native
Ixians+Tleilaxu/Ix47 OR CHOAM+Richese/CHOAM35/cache with classics, without
Skills and with the same optional component prerequisites. Actual original
actors, first hands, offers, native setup and phase handlers remain.
Native combined Skills/Nexus/Discovery, E3/mixed families, HW/variants/previews,
public starts and played-save conversion are not opened.
This composes existing sourced effects; it adds no universal priority or
new ruling. Original Maker losses/votes/typed reserve ride, both Advanced
piles and settled alliance precede the actual **end-Spice** closing choice.
Extra Emperor versus ordinary Fremen returns retain distinct quotas and
original Axlotl activity. Training stays on physical discs through nested
battle and cleanup/Tech. Native E1 typed losses and matching Face Dance
retain original ordering. E2 signed two-marker Cunning keeps one printed
tariff, original private caps/reserves and a currently revealed destination;
no held card supplies another site's benefit or a free companion.
[Combined canonical contract/proof](DISCOVERY_PROTOTYPE.md#classic-skillsnexus-and-paired-native-nexus-discovery--6-october-2026)
records169 affected tests, types/lint/build, eighteen genuine original
six-seat completions and three connected actual human programmes.
These are bounded local implementation proofs, not complete modes,
natural-every-effect, strategic AI, recovery or protected deployment acceptance.
## Classic Discovery / original Tech and Strongholds — 5 October 2026
Fresh local `nexus --discoveries` now admits classic/base33/all12 Nexus and
+2 -2
View File
@@ -234,9 +234,9 @@ dedicated retrieved worked FAQs. [Contract and remaining limits](HOMEWORLD_OCCUP
| Paired E1/E2 Nexus / Tech / Strongholds | Fresh both Ixians+Tleilaxu OR CHOAM+Richese plus classics with one original family deck/all12 Nexus preserves Tech3..6 Basic/Advanced and/or Strongholds2..6 Advanced, without Skills or other overlays. Original Cunning, typed Suboid/Cyborg loss and equal substitution, Face Dancer reward-before-replacement and draw-before-retirement, two physical No-Fields/one tariff, native industry at phase end and actual held/copy effects reuse original handlers. No mixed families, E3, new interpretations, public starts or played-game conversion. | [Scope, sources and bounded evidence](NEXUS_CARD_RULES.md#paired-e1e2-tech-and-stronghold-composition--4-october-2026), [Richese composition](NEXUS_RICHESE_RULES.md#paired-techstronghold-composition--4-october-2026) |
| Classic Nexus / Skills / Tech / Strongholds | Fresh classic original skill/Nexus entry retains selected unused Tech3..6 Basic/Advanced and/or Strongholds2..6 Advanced. Original setup/closing deals/owner timing, distinct free returns and phase-end industry remain. Held subsidy changes actual payer debit, not committed support/Suk entitlement; physical rescue precedes card cleanup and mandatory winner token choice. Original once-per-phase Bureaucrat diversion composes player payments. Captured-training leader revival remains blocked; public Ghola/ordinary options now omit those illegal choices rather than strand legal AI passes. Paired native combined components, HW, other previews, public/save conversion and new rulings stay guarded. | [Combined source contract](NEXUS_CARD_RULES.md#classic-nexus-skills-and-original-techstrongholds--4-october-2026) |
| Paired Nexus / Skills / Tech / Strongholds | Both Ixians+Tleilaxu OR CHOAM+Richese plus classics and one original family deck/all14/all12 preserve selected unused Tech3..6 Basic/Advanced and/or Strongholds2..6 Advanced through the original fresh skill/Nexus entry. Typed rescue precedes equal actual Cyborg Tank substitution, original card cleanup/mandatory winner Tech precedes Face Dance; held subsidy changes debit, not committed support, and reward/custody stay original winner. Signed marker pair/one invoice/native industry retains original timing. Bounded runtime/program/phone/genuine-game evidence does not certify full modules; mixed families/E3/HW/previews/companions/native Nexus free-return rulings/public start/save conversion stay guarded. | [Paired combined contract and evidence](NEXUS_CARD_RULES.md#paired-nexus-skills-and-original-techstrongholds--5-october-2026) |
| Classic Nexus / Leader Skills | Fresh classic/base33/all14 Skills/all12 Nexus, Basic/Advanced2..6, explicit `leader-skills --nexus-cards`, no other overlays/previews. Original starting hands/offers/skill-before-Traitor setup and actual closing Nexus draw remain. Exact extra/ordinary free-return ledgers, real bank purchase and committed Traitor declarations preserve trained-disc custody. Temporary ordinary-as-Sardaukar roles compose actual skill posture/bonuses/support; matching Cunning casualty receipt stays pending through original Suk rescue and completes only after physical settlement. Source-guarded borrowed Smuggler arithmetic, Atreides Suk/KH and unresolved effects remain; no public start, retrofit or new ruling. | [Scope, sources and bounded evidence](NEXUS_CARD_RULES.md#classic-nexus-and-leader-skills-composition--4-october-2026), [Skill runtime](LEADER_SKILLS_RUNTIME.md#classic-nexus-composition--4-october-2026) |
| Classic Nexus / Leader Skills | Fresh classic/base33/all14 Skills/all12 Nexus, Basic/Advanced2..6, explicit `leader-skills --nexus-cards`, optionally original Tech3+/Advanced Strongholds2+ and Discovery7/8 through `--discoveries`; HW/variants/unrelated previews stay separate. Original starting hands/offers/skill-before-Traitor setup and actual closing Nexus draw remain. Exact extra/ordinary free-return ledgers, real bank purchase and committed Traitor declarations preserve trained-disc custody. Temporary ordinary-as-Sardaukar roles compose actual skill posture/bonuses/support; matching Cunning casualty receipt stays pending through original Suk rescue and completes only after physical settlement. Source-guarded borrowed Smuggler arithmetic, Atreides Suk/KH and unresolved effects remain; no public start, retrofit or new ruling. | [Scope, sources and bounded evidence](NEXUS_CARD_RULES.md#original-discovery-classic-skills-and-paired-natives--6-october-2026), [Skill runtime](LEADER_SKILLS_RUNTIME.md#classic-nexusdiscovery-composition--6-october-2026) |
| Paired E1/E2 Nexus / Leader Skills | Fresh both Ixians+Tleilaxu OR CHOAM+Richese plus classics, one original family deck/all14 Skills/all12 Nexus, Basic/Advanced2..6, explicit original skill entry. Actual native setup/offers/closing draws remain. Full unsupported Suboids compose typed Suk rescue before equal actual Tank substitution; Face Dance follows original winner outcomes, kills/returns the winning trainer skill once without another bounty, and partial Cunning retains ordinary Mentat rights. Richese pair uses its original signed two-token frame/one invoice/native response/Guild continuation, not single-marker skill proof; CHOAM printed fuel/Planetologist physical route remain separate. No other overlays, companion/mixed-plan/new ruling/public starts or retrofit. | [Scope, sources and bounded evidence](NEXUS_CARD_RULES.md#paired-e1e2-nexus-and-leader-skills-composition--4-october-2026), [Skill runtime](LEADER_SKILLS_RUNTIME.md#paired-e1e2-nexus-composition--4-october-2026) |
| Classic Nexus / Discovery / original components | Fresh classic/base33/all12/Discovery7/8 Basic/Advanced2–6, original Tech3+/Advanced Strongholds2+, explicit `nexus --discoveries`. Original worm/vote/typed ride, next-turn entry, end-Mentat held custody and end-Spice closing draw after a Nexus and settled alliance remain. Extra/ordinary revival ledgers and borrowed Guild nested payment preserve native identity and physical outcomes. Skills/native/HW/variants/previews and unresolved mixed-module Fremen Betrayal remain gated; no new universal interruption priority. | [Composition contract and bounded evidence](DISCOVERY_PROTOTYPE.md#classic-nexus-composition--5-october-2026), [Nexus source contract](NEXUS_CARD_RULES.md#classic-discovery--original-tech-and-strongholds--5-october-2026) |
| Nexus / Discovery / original components | Fresh classic/base33/all12/Discovery7/8 Basic/Advanced2–6 optionally retains all14 original Skills through `leader-skills --nexus-cards --discoveries`; separate `nexus --discoveries` additionally admits both native E1 Ixians+Tleilaxu/Ix47 OR E2 CHOAM+Richese/CHOAM35+cache without Skills. Optional unused Tech3+/Advanced Strongholds2+ retain original setup/claims. Actual Maker losses/votes/typed rides, both Advanced piles and settled alliance precede the end-Spice closing draw. Source-clear return ledgers, trained battle and signed two-marker one-invoice/current-revealed-site native materialization use original handlers. Native combined Skills/Nexus/Discovery, E3/mixed families, HW/variants/previews and unresolved mixed-module Fremen Betrayal remain gated; no new universal interruption priority or ruling. | [Combined contract and bounded evidence](DISCOVERY_PROTOTYPE.md#classic-skillsnexus-and-paired-native-nexus-discovery--6-october-2026), [Nexus source contract](NEXUS_CARD_RULES.md#classic-discovery--original-tech-and-strongholds--5-october-2026) |
| Discovery / original Advanced Strongholds | Fresh original Discovery classic/selected E1/E2/standalone E3 and separate classic all14 Skills entry retain Strongholds6 Advanced2–6, optional Tech3–6 and original end-Mentat claims. Named held benefits or actual HMS copy do not inherit into nested locations; Jacurutu creates no seventh card. Live supported Ecaz Discovery feeds mandatory original coalition lead/armies/payment/aftermath rather than skipping legal battle. Native typed/marker, trained rescue and winner Tech retain their sources. Basic Strongholds, native Discovery Skills, HW/variants/previews/pending rules/public starts/save conversion remain separate. | [Bounded contract and original programmes](DISCOVERY_PROTOTYPE.md#original-advanced-stronghold-composition--5-october-2026), [mandatory Ecaz repair](ECAZ_OCCUPY_RULES.md#original-live-discovery-coalition--5-october-2026) |
| Native Leader Skills / Discovery | Original supported native Basic/Advanced family/roster predicates retain selected native decks/hands/all14 and Discovery7/8, optional Tech3+/Advanced Strongholds2+. Typed rescue precedes actual Cyborg substitution; original cleanup/Tech precedes Face Dance. Native stash/invoice/green marker and trained assassination/own revival keep physical sources. Actual starting hands/offers are authoritative. Hidden-Smuggler legal participation uses the engine's projected support quote, not private-state profile reconstruction. Native Ecaz owner-labelled coalition remains; no shared-Duke training, new ruling, other overlays/public starts or conversion. | [Bounded native contract and original runtime/human evidence](DISCOVERY_PROTOTYPE.md#native-leader-skills-composition--6-october-2026), [Smuggler capture repair](SMUGGLER_BATTLE.md#native-discovery-legal-participation--6-october-2026) |
| Discoveries | Preserve seven sourced Spice Cards/eight tokens, faction peeks and Collection choices. Fresh classic/native E1/E2/standalone E3 may retain original Tech3..6; separate fresh classic all14 Skills/Discovery/Tech uses original training, entry, movement, stash, rescue/rewards and Bureaucrat invoices. Native setup, revealed-only No-Fields and Moritani source histories remain. Advanced Orgiz uses the supplied p24 territory-Collection trigger; Basic stays provisional per deposit. Only Jacurutu adds a stronghold. Contested/shared/mixed cases, other combinations and public starts remain unfinished. | [Component authority](DISCOVERY_COMPONENTS.md), [native composition](DISCOVERY_PROTOTYPE.md#native-setup-and-original-consumers--5-october-2026), [classic Skills/Advanced source cutover](DISCOVERY_PROTOTYPE.md#classic-leader-skills-and-advanced-orgiz--5-october-2026) |