Compose classic Nexus and Leader Skills with physical Suk rescue
This commit is contained in:
1 parent
c8482a2d96
commit
3ae5e1f994
18 files changed
+1587
-18
No files matched your search
@@ -16,6 +16,26 @@ open mode gates.
|
||||
|
||||
## Current checkpoint and work
|
||||
|
||||
**Classic Nexus / Leader Skills — bounded Development Verified:** fresh
|
||||
classic/base33/all14 Skills/all12 Nexus, Basic/Advanced2..6, explicit original
|
||||
`leader-skills --nexus-cards`, without other overlays/public starts/new rulings.
|
||||
New40/affected151, types/lint/build, ten actual setup and twelve native rule
|
||||
programs, four legal Suk/free-return policies and ten genuine2..6-seat games
|
||||
pass (4,446 actions/no rejection,117 JSON continuations/eight closing choices).
|
||||
Natural Cunning/Suk is not claimed. Actual normal and trained Suk revealed
|
||||
two pending-Cunning lifecycle failures; matching original casualty commitment
|
||||
now stays pending through rescue and completes only at physical settlement.
|
||||
Original backed-up CLI **HKCLYXPK / APXBER55 v8/setup** preserves exact
|
||||
starting hands/offers/actors after a scoped original14 shuffle.
|
||||
Human390px **HKCLYXPK v20 / APXBER55 v24, Collection** chooses posture,
|
||||
Cunning, Caid3 or Fenring6/dial6/support3/Shield. Normal loss4 saves1 to reserves
|
||||
(14 reserve/3 Tanks/3 board); trained loss5 keeps the original7 pending until
|
||||
rescue3 (1 kept/2 returned), then15 reserve/2 Tanks/3 board. Both preserve all5
|
||||
starred reserves, zero starred Tanks, Shield/Suk, support10→7 once and separate
|
||||
city2→9. Actual phone controls/inspectors/refresh and no root390px overflow
|
||||
pass; only dedicated QA rooms change. [Scope and bounded evidence](NEXUS_CARD_RULES.md#classic-nexus-and-leader-skills-composition--4-october-2026)
|
||||
preserve borrowed Smuggler, Atreides Suk/KH, pending Nexus and all release gates.
|
||||
|
||||
**Paired E1/E2 Nexus / Tech / Strongholds — bounded Development Verified:**
|
||||
fresh both Ixians+Tleilaxu OR CHOAM+Richese plus classics/one family deck
|
||||
preserves Tech3..6 Basic/Advanced and Strongholds2..6 Advanced without Skills.
|
||||
|
||||
@@ -29,6 +29,36 @@ Advanced native/combined-module skills remain guarded. See
|
||||
[native preview scope](MENTAT_QUESTION.md#native-skill-integration--2-october-2026).
|
||||
|
||||
|
||||
## Classic Nexus composition — 4 October 2026
|
||||
|
||||
Fresh `leader-skills --nexus-cards` composes classic/base33/all14 Skills/all12
|
||||
Nexus, Basic/Advanced2..6, without native factions, Tech, Strongholds, Homeworlds,
|
||||
Banker/Mentat previews or other overlays. Original starting hands may already
|
||||
be dealt before skill selection; supplied saved offers/hands and authenticated
|
||||
actors are continued, not replaced. Actual closing Nexus deals remain required.
|
||||
|
||||
Original free-three ledgers, bank purchase and Traitor Deck draw/return preserve
|
||||
physical skill custody. Temporary Emperor Sardaukar remain ordinary counters
|
||||
through actual discipline bonuses, paid support, casualties and Suk rescue.
|
||||
The reproduced normal/selected trained rescue failures now retain the identical
|
||||
original Cunning casualty commitment until actual physical settlement, then
|
||||
complete its receipt once. Rescue never repeats support or converts actual
|
||||
normal counters into starred inventory.
|
||||
|
||||
New40/affected151, types/lint/build, ten genuine setup programs, twelve actual
|
||||
rule programs, four legal rescue/free-return policies and ten genuine2..6-seat
|
||||
games (4,446 actions/no rejection,117 JSON continuations/eight actual closing
|
||||
choices) pass. Human390px **HKCLYXPK v20 / APXBER55 v24, Collection** seals
|
||||
Caid3 or trained Fenring6/dial6/support3/Shield. Normal loss4 saves1 to reserves
|
||||
(14 reserve/3 Tanks/3 board); trained loss5 saves3 with1 kept/2 returned
|
||||
(15 reserve/2 Tanks/3 board). All5 native Sardaukar stay reserved and Shield/
|
||||
Suk remain; actual support10→7 precedes separate city2→9. Pending trained
|
||||
rescue retains all7 original physical counters until selection resolves.
|
||||
Original posture/Cunning/casualty/rescue/cleanup/inspectors and refreshed phone
|
||||
outcomes pass. Controlled original shuffle/order/relocations are labeled.
|
||||
[Canonical scope, source and evidence](NEXUS_CARD_RULES.md#classic-nexus-and-leader-skills-composition--4-october-2026)
|
||||
preserves the other explicit skill/Nexus rulings, source guards and all gates.
|
||||
|
||||
## Standalone E3 module composition — 4 October 2026
|
||||
|
||||
Fresh original Ecaz OR Moritani skill profiles preserve unused Tech Tokens in
|
||||
|
||||
@@ -2,6 +2,87 @@
|
||||
|
||||
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.
|
||||
|
||||
## Classic Nexus and Leader Skills composition — 4 October 2026
|
||||
|
||||
The existing fresh local `leader-skills --nexus-cards` entry explicitly
|
||||
composes classic/base33/all14 Skills/all12 Nexus in Basic/Advanced2..6.
|
||||
Original prediction, starting Treachery, actual two-card skill offers/
|
||||
assignment and Traitor order remain. Starting hands may already be dealt
|
||||
in the initializer's saved setup; continuing it never redeals those hands
|
||||
or substitutes its saved offers. Nexus still has no initial deal: a genuine
|
||||
qualifying alliance Nexus must close before an unallied player can draw.
|
||||
|
||||
This combines the independent Nexus lifecycle below and the original
|
||||
[fourteen-card skill source](LEADER_SKILLS_RULES.md). No Tech, Strongholds,
|
||||
Homeworlds, native factions/decks, Banker/Mentat preview, independent cards,
|
||||
unrelated overlays, public start or played-game conversion is admitted.
|
||||
Other card-specific module guards remain, including borrowed Smuggler
|
||||
shipment arithmetic, Advanced Atreides Suk/KH, modified Smuggler collection,
|
||||
borrowed Voice, worm protection and Tleilaxu revival accounting.
|
||||
|
||||
Original Emperor extra-three and Fremen ordinary/free-three returns retain
|
||||
their distinct ledgers, actual counters, wallet and Advanced elite cap.
|
||||
Neither changes physical skill assignment. The normal bank-auction purchase
|
||||
retains the actual buyer price and delivers the actual lot once; it creates
|
||||
no bank payment or normal Banker award. Harkonnen Cunning draws/returns
|
||||
the actual Traitor Deck card without changing trained-disc custody or
|
||||
undoing a committed true/false traitor call after identity custody changes.
|
||||
|
||||
Emperor Cunning still turns exactly five existing ordinary counters into
|
||||
temporary effective Sardaukar for one battle, never physical starred pieces.
|
||||
Actual normal/skilled disciplines affect strength, not printed-disc bounty;
|
||||
original support is paid once. A living normal Suk saves one casualty to
|
||||
reserves, while a surviving selected trained Suk may save up to three,
|
||||
keeping one in its original sector and returning the rest to reserves.
|
||||
|
||||
The combined path reproduced two real lifecycle failures: normal automatic
|
||||
rescue left Cunning expecting its pre-loss army, and selected trained rescue
|
||||
left it expecting the earlier casualty chooser. The fix keeps the Cunning
|
||||
receipt pending against the identical original Suk casualty commitment while
|
||||
rescue is selected. It completes only after actual physical rescue settlement,
|
||||
with original actor/event/turn/territory/choice/signature checks retained.
|
||||
No provisional marking complete, extra payment, elite conversion or second
|
||||
loss is added.
|
||||
|
||||
```sh
|
||||
node --import tsx tools/start-prototype.ts --profile leader-skills \
|
||||
--nexus-cards --db /private/local.sqlite --room ROOMCODE --version 7 \
|
||||
--out /private/new-classic-nexus-skills-entry
|
||||
node --import tsx tools/faction-games.ts --profile nexus-skills \
|
||||
--players all --rules both --out /private/new-classic-nexus-skills-games
|
||||
```
|
||||
|
||||
### Bounded classic skill development evidence
|
||||
|
||||
New40/affected151 cases, types/lint/build, ten genuine2..6-seat setup programs,
|
||||
twelve actual native rule programs and all four legal Suk/free-return policies
|
||||
pass. Ten genuine2..6-seat Basic/Advanced games complete4,446 accepted actions,
|
||||
no rejection,117 JSON continuations and eight actual closing Nexus choices.
|
||||
They do not claim natural Cunning/Suk use (zero Cunning actions).
|
||||
`/tmp/dune-classic-nexus-skills-games-20261004/report.json` captures unchanged
|
||||
tree `86d2c73debec01f5d4bb5c06a8a475274562d3ea9f68cb92b6e67c0dab67e4a2`.
|
||||
|
||||
Original backed-up CLI **HKCLYXPK / APXBER55 v8/setup** uses a scoped original
|
||||
all14 shuffle before native deals; other randomness is unchanged. Saved first
|
||||
starting hands/offers and authenticated actors survive fixture continuation.
|
||||
Controlled390px **HKCLYXPK v20 / APXBER55 v24, Collection** chooses actual
|
||||
face-up/behind-shield posture and Cunning, then seals Caid3 or Fenring6,
|
||||
dial6/support3/Shield versus Master Bewt3/dial0. Original support3 pays
|
||||
wallet10→7 once; separate Arrakeen Collection2 makes9.
|
||||
|
||||
Normal four ordinary losses save one to reserves:14 reserves/3 Tanks/3 board.
|
||||
Trained five ordinary losses keep the original seven-force army pending while
|
||||
three-rescue is selected, then keep one, return two and settle:
|
||||
15 reserves/2 Tanks/3 board. Both preserve all5 actual Sardaukar in reserves,
|
||||
zero starred Tanks and the original retained Shield/Suk assignment.
|
||||
Cunning and Suk receipts are complete only after physical settlement.
|
||||
Original phone posture, Cunning, typed losses, rescue selector, card cleanup,
|
||||
skill/force inspectors and refreshed outcomes are observed without root390px
|
||||
overflow. Only dedicated QA rooms change; controlled relocation is labeled.
|
||||
|
||||
This is bounded development proof, not full Nexus/Skills, assurance,
|
||||
calibration, public-start or deployed acceptance.
|
||||
|
||||
## Paired E1/E2 Tech and Stronghold composition — 4 October 2026
|
||||
|
||||
The existing fresh local `nexus` entry additionally preserves unused original
|
||||
|
||||
@@ -89,6 +89,18 @@ See [scope and authority](NEXUS_CARD_RULES.md#classic-tech-and-stronghold-compos
|
||||
this does not admit native Tleilaxu income, Homeworlds, Skills or seller-paid
|
||||
and forced-Emperor producers, and leaves their pending questions unchanged.
|
||||
|
||||
The separate fresh classic `leader-skills --nexus-cards` composition additionally
|
||||
admits the original extra-three return and normal bank purchase with all14
|
||||
Skills but no Tech/Strongholds or other overlays. Exact-three/elite caps,
|
||||
independent ordinary ledger and physical skill custody remain. Bank purchase
|
||||
creates no actual bank payment or Banker award. Actual Cunning with normal or
|
||||
selected trained Suk retains the original typed casualty receipt while rescue
|
||||
is pending, completing only after physical settlement; its temporary Sardaukar
|
||||
stay ordinary counters and original support is paid once. [Bounded scope and
|
||||
evidence](NEXUS_CARD_RULES.md#classic-nexus-and-leader-skills-composition--4-october-2026)
|
||||
does not answer the separate native income, seller-paid or forced-payer rulings.
|
||||
|
||||
|
||||
## Betrayal and remaining decisions
|
||||
|
||||
Normal Emperor-funded auction help goes to the ally and is paid back to Emperor, according to November's FAQ. Therefore forcing its contribution cannot automatically be implemented as transferring its spice to the bank. Bind the actual allied purchase and its original price/contributions. [November FAQ, p.2](https://www.gf9games.com/dune/wp-content/uploads/2020/11/Dune-FAQ-Nov-2020.pdf#page=2)
|
||||
|
||||
@@ -103,6 +103,15 @@ The current first path is a deliberate subset of that proposed contract: with Fr
|
||||
|
||||
The bounded classic Tech/Advanced Stronghold composition now calls the existing Axlotl activity hook after this actual free batch; spice stays on the token until native phase-end settlement, without changing these ordinary ledgers. See [the composition contract](NEXUS_CARD_RULES.md#classic-tech-and-stronghold-composition--4-october-2026). Tleilaxu income and Homeworld arrivals remain excluded: those broader continuations require the native pending-revival pipeline, not this quiet transfer. Fewer-than-three Tanks, previous force returns and higher free rates/modifiers still remain unavailable rather than guessing a ruling. Protection remains unimplemented; Cunning's bounded path is separate.
|
||||
|
||||
The separate fresh classic `leader-skills --nexus-cards` composition preserves
|
||||
the same ordinary/free-three ledgers, zero wallet cost, actual counters and
|
||||
Advanced one-elite cap with all14 original skills, without Tech/Strongholds
|
||||
or other overlays. It does not change physical training, grant leader revival,
|
||||
reset prior returns or settle worm-protection reactions. [Scope and bounded
|
||||
proof](NEXUS_CARD_RULES.md#classic-nexus-and-leader-skills-composition--4-october-2026)
|
||||
remains separate from complete Fremen/Nexus certification.
|
||||
|
||||
|
||||
`game/revival.ts` already computes free rate/remaining from `p.revived`, typed prices and ordinary limits. Engine `beginRevival`/`finishRevival` retains pending requests and Tleilaxu prevention/income continuations. The future combined-mode adapter should be an explicit source-labelled, phase-bound free-rate entitlement consumed by an actual normal revival request, retaining previous returns and exact free/paid normal/starred allocation. Never refund earlier paid revivals or reset `revived`/elite counters on card play or reload.
|
||||
|
||||
Keep these questions visible: how the three-total interacts with a higher native free rate, prior paid/free returns, low-Homeworld bonus and Recruits; whether a partial group below three is permitted when Tanks cannot supply three; and whether the benefit survives La La La or Tleilaxu prevention. The [existing revival audit](FREMEN_REVIVAL_AUDIT.md) and [Homeworld benefit audit](HOMEWORLD_BENEFITS_RULES.md) do not by themselves answer differently worded Nexus composition.
|
||||
|
||||
@@ -207,6 +207,7 @@ See [the cutover and Advanced sequence](MORITANI_ASSASSINATE_LEADERS.md#authorit
|
||||
| Native Tech without Leader Skills | Fresh3..6 Basic/Advanced selected E1/E2 native families or standalone Ecaz OR Moritani plus classics preserve original unused three Tech Tokens through `factions`; Advanced Strongholds use the existing native entry. Physical setup, printed/first-Storm owners, phase-end income and single-player complete-set victory are unchanged. Actual Ecaz selected lead receives the original opposing token, never a joint allied holding; Basic odd Occupy remains guarded. Moritani original forfeiture/assassination and winner Tech before Face Dance reuse existing handlers. No new ruling, wallet grant, public start or save conversion. | [Original composition/source and evidence](EXPANSION_FACTIONS_PROTOTYPE.md#native-tech-composition--4-october-2026), [Stronghold contract](STRONGHOLD_CARDS.md#native-tech-composition-without-skills--4-october-2026) |
|
||||
| Classic Nexus / Tech / Strongholds | Fresh classic/base33/all12 Nexus may preserve original Tech3..6 Basic/Advanced and/or Strongholds2..6 Advanced, without Skills/HW/expansion decks or unrelated previews. Original closing deals, first-Storm Tech and actual end-Mentat card claims remain. Actual Nexus free-three returns invoke Axlotl without merging their extra/ordinary ledgers; industry collects once at native phase end. Borrowed tariffs never relocate Fremen on-planet reserves or native faction identity. Held Arrakeen pays actual support; temporary Sardaukar remain ordinary counters. Losing Moritani retention precedes original winner Tech, then CHOAM excludes every used opposing card. Bank purchase retains actual wallet/card without an industry trigger. Pending borrowed Voice, worm protection and Tleilaxu revival remain guarded; no public starts/save conversion or new ruling. | [Composition/source and bounded evidence](NEXUS_CARD_RULES.md#classic-tech-and-stronghold-composition--4-october-2026) |
|
||||
| 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 / 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) |
|
||||
| Discoveries | Preserve seven sourced Spice Cards and eight physical tokens, private faction peeks and Collection choices. Revealed locations are separate territories; only Jacurutu counts toward stronghold victory. Next-turn free entry, sole-occupant Cistern income, bounded sole-occupant Orgiz transfer and later-turn Ornithopter spending are prototyped; Jacurutu income, Testing Station and Shrine also have bounded paths. Contested and mixed cases remain pending. | [Component authority](DISCOVERY_COMPONENTS.md), [prototype boundary](DISCOVERY_PROTOTYPE.md) |
|
||||
| Guild Secret Ally | One explicit Guild-priced ordinary shipment; borrowed prices/routes preserve native identity. Free Fremen reinforcement remains a separate choice. | [Route contract](NEXUS_GUILD_SECRET_ALLY_RULES.md), [verified runtime](NEXUS_GUILD_SECRET_ALLY_RUNTIME.md) |
|
||||
| Homeworld custody and mobility | Physical home/visitor groups, population thresholds, tariffs and transport permissions retain distinct sources; Homeworld immunity is not universal immunity. | [Homeworld rules](HOMEWORLD_RULES.md), [benefits](HOMEWORLD_BENEFITS_RULES.md), [mobility](HOMEWORLD_MOBILITY_RULES.md), [invasion](HOMEWORLD_INVASION_RULES.md), [Guild transport](GUILD_HOMEWORLD_TRANSPORT_RULES.md) |
|
||||
|
||||
Reference in new issue
Block a user