Compose Advanced Leader Skills and Strongholds with optional Tech
This commit is contained in:
1 parent
3c7725c3a5
commit
f259488a9a
19 files changed
+1570
-54
No files matched your search
+22
-11
@@ -16,17 +16,28 @@ open mode gates.
|
||||
|
||||
## Current checkpoint and work
|
||||
|
||||
**In progress — Advanced Skills / Stronghold Cards, with optional Tech:**
|
||||
parent owns shared eligibility, original initializer/opt-ins, sample CLI and
|
||||
guide. Two bounded case owners own classic support/defense/income/rescue and
|
||||
native HMS/typed losses/FaceDance/marker outcomes in separate new
|
||||
`fixture-*-skills-stronghold.ts` / `*-skills-stronghold-runtime.test.ts`.
|
||||
Contract: original classic or supported E1/E2 native2..6 Advanced rosters/decks,
|
||||
all14 skills/six cards; optional Tech requires3..6. Canonical unused lobby
|
||||
components, original setup, real end-Mentat Stronghold ownership and printed/
|
||||
first-Storm Tech owners only. Basic Strongholds, E3/other overlays, public
|
||||
starts, played-game conversion and unrelated rulings stay excluded.
|
||||
Current programs are not yet exercised; full goal remains unfinished.
|
||||
**Advanced Skills / Stronghold Cards — bounded Development Verified:**
|
||||
fresh classic or supported E1/E2 native2..6 Advanced preserves original
|
||||
all14 skills/six unused cards; optional Tech requires3..6. Original setup,
|
||||
decks/cache/wallets, real end-Mentat card control and printed/first-Storm Tech
|
||||
remain. No Basic Strongholds, E3/other overlays, public starts, save conversion
|
||||
or unrelated rulings. New21/affected277/final fixture-consumer72 cases,
|
||||
types/lint/build and twelve actual rule programs pass. Twenty-two genuine
|
||||
paired/triple-module3-seat games complete6,672 actions/no rejection and171
|
||||
JSON continuations on captured unchanged source. Original CLI **J5AAWGEQ v8**
|
||||
and **NY6Y4J4K v10** retain real setup and unused Strongholds/native Tech.
|
||||
Human390px **HERCFX3B v20/Mentat** pays4 after Arrakeen bank2, rescues3,
|
||||
retains Shield and original winner Tech, then collects separate Banker12→13.
|
||||
**PG2GR3RC v26/Collection** declares real HMS copy and uses bank1/own0,
|
||||
typed4 Suboid+2 cyborg losses and real rescue before original Axlotl reward.
|
||||
Market/phase openings remain native; refresh retains both versions/outcomes.
|
||||
Controlled positions are labeled, not claimed natural histories. Original
|
||||
copied-Diplomat/skill-Stone and other guards remain. See
|
||||
[combined scope and source evidence](LEADER_SKILLS_RUNTIME.md#advanced-stronghold-composition--4-october-2026).
|
||||
Full combinations, assurance, AI, public and deployed acceptance remain open.
|
||||
Final guide10/10, types/lint/build and rebuilt390px reference pass (351px topic,
|
||||
no overflow); original human v20/Mentat andv26/Collection remain after the
|
||||
final isolated QA reload. Owned drivers/tabs are removed; rooms/store remain.
|
||||
|
||||
**Native E1/E2 Leader Skills / Tech Tokens — bounded Development Verified:**
|
||||
fresh supported Ixian/Tleilaxu/CHOAM/Richese Basic/Advanced3..6-seat entries
|
||||
|
||||
@@ -1,5 +1,37 @@
|
||||
# Dune implementation status
|
||||
|
||||
## 4 October 2026 — Advanced Skills and Strongholds, with optional Tech
|
||||
|
||||
Two bounded owners supplied classic subsidy/defense/income/rescue and native
|
||||
HMS/typed losses/FaceDance/marker programs; parent integrated public-config
|
||||
eligibility, canonical unused-component admission, original Banker/Mentat
|
||||
opt-ins and sample CLI. Advanced classic or supported E1/E2 native2..6 retains
|
||||
all14 skills/six cards; Tech requires3..6. Deck/cache, wallets and actual setup,
|
||||
end-Mentat claims and printed/first-Storm Tech remain. E3/other overlays,
|
||||
Basic Strongholds, public starts, save conversion and unrelated guards remain.
|
||||
|
||||
New21/affected277 and final fixture-consumer72 cases, types/lint/build pass.
|
||||
Original setup probes cover26 valid entries/two below-three Tech rejections.
|
||||
Twelve actual programs and twenty-two genuine paired/triple3-seat games pass:
|
||||
6,672 accepted actions/no rejection,171 JSON continuations, captured unchanged
|
||||
tree `171ecf79ccdef187ca662ddd00c0e5d3c5bce5231d386ee16566ac062ba5dc21`.
|
||||
Fixtures use real nonmandatory winner cards before Collection, a funded bribe
|
||||
before cash-boundary rejection, explicit typed casualty choice and original
|
||||
mutual-traitor support payment. The no-spend fixture follows the original
|
||||
response pass queue rather than treating bot recommendations as a legal menu.
|
||||
Two explicit type annotations and exact per-token owner comparison fix fixture
|
||||
inference/lint findings without weakening the custody comparison.
|
||||
|
||||
Original CLI J5AAWGEQv8/NY6Y4J4Kv10 and human390px HERCFX3Bv20/Mentat,
|
||||
PG2GR3RCv26/Collection retain original IDs, legal payments, cards/forces and
|
||||
Tech. Actual classic own4 after bank2 qualifies one unavailable Banker grant;
|
||||
trained rescue retains support, and native readiness collects12→13 once.
|
||||
Native copy bank1/own0 preserves wallet10 before original Collection2;
|
||||
typed rescue keeps original subtype custody before winner cleanup/Axlotl.
|
||||
Detailed current scope, source pages and human outcomes remain in
|
||||
[the existing skill runtime](LEADER_SKILLS_RUNTIME.md#advanced-stronghold-composition--4-october-2026).
|
||||
No full-module, assurance, strategic-AI, public or deployed acceptance claim.
|
||||
|
||||
## 4 October 2026 — native E1/E2 Leader Skills with original Tech Tokens
|
||||
|
||||
Three bounded owners supplied independent Ixian/CHOAM, Tleilaxu and Richese
|
||||
|
||||
@@ -29,6 +29,75 @@ Advanced native/combined-module skills remain guarded. See
|
||||
[native preview scope](MENTAT_QUESTION.md#native-skill-integration--2-october-2026).
|
||||
|
||||
|
||||
## Advanced Stronghold composition — 4 October 2026
|
||||
|
||||
Fresh Advanced `leader-skills` and separate `banker-income` entries preserve
|
||||
canonical unused Stronghold Cards with all fourteen skills in classic or
|
||||
already-supported E1/E2 native two-through-six-seat lobbies. Optional original
|
||||
Tech Tokens requires three-through-six seats. Original deck/roster restrictions,
|
||||
Richese cache, wallets, offers and native setup remain; cards acquire owners
|
||||
only at actual end Mentat. The authorized supplied source physical21
|
||||
(printed19) permits these variants together. Basic Strongholds, E3/other
|
||||
overlays, public starts, save conversion and unrelated rulings stay excluded.
|
||||
|
||||
Arrakeen reduces the actual force-support invoice by at most two bank spice;
|
||||
only the remaining payer debit can qualify normal Banker income. Rescue never
|
||||
refunds committed support. CHOAM's original income includes bank-funded support.
|
||||
Physical Carthag defenses retain their roles and matching normal discipline;
|
||||
modified/copied Diplomat defenses keep their existing guard. Habbanya holder
|
||||
priority, Tabr opposing-dial income and Tuek played-Worthless income compose
|
||||
original skill scores without replacing printed values or traitor outcomes.
|
||||
Suk/native substitution, card cleanup and mandatory Tech precede Face Dance;
|
||||
replacement retains the original winner's earnings and returns a killed skill
|
||||
once. Hidden-skill/untrained Stone cases do not settle active skill/Stone timing.
|
||||
|
||||
New21 cases and affected277/277 pass. Final shared fixture-consumer72/72,
|
||||
types/lint and build pass. Actual original setup probes cover26 valid
|
||||
two/three/six-seat module/Banker entries and two below-three Tech rejections.
|
||||
Twelve actual rule programs cover four support thresholds, HMS typed rescue,
|
||||
CHOAM support/Auditor exclusion, capped Richese marker, Tabr/Tuek Face Dance
|
||||
and both cache-acquired Stone modes. Twenty-two genuine Advanced three-seat
|
||||
paired/triple-module games complete6,672 accepted actions/no rejection and171
|
||||
JSON continuations on captured unchanged tree
|
||||
`171ecf79ccdef187ca662ddd00c0e5d3c5bce5231d386ee16566ac062ba5dc21`.
|
||||
The two sample profiles are `skills-stronghold` and `skills-stronghold-tech`.
|
||||
|
||||
Fixture corrections preserve actual rules, not new interpretations: ensure a
|
||||
physical nonmandatory winner card when stopping before Collection; fund a real
|
||||
bribe before testing an unaffordable plan; explicitly select original cyborg
|
||||
loss allocation; mutual traitors still pay original support and earn no spice.
|
||||
The common no-spend fixture now follows the persisted response pass queue
|
||||
directly. A bot recommendation is not a complete legal-action menu; an
|
||||
uncontrolled initial card deal exposed that distinction at Atreides inspection.
|
||||
No production response policy or legal rule is bypassed.
|
||||
|
||||
Original CLI **J5AAWGEQ v8/setup** retains six unowned cards/three unowned Tech;
|
||||
**NY6Y4J4K v10/setup** retains six unowned cards, printed Ixian Heighliners and
|
||||
Fremen Production, with Axlotl awaiting original first-Storm assignment.
|
||||
Human390px **HERCFX3B v20/Mentat** selects trained Staban5/dial6/support6/Shield.
|
||||
Actual bank2/own4 takes native available6→2; Suk saves3, keeps1 and returns2,
|
||||
leaving Arrakeen3/reserves14/Tanks3 and retained Shield. Emperor8 go to Tanks.
|
||||
Only original opposing Production transfers; Guild keeps Axlotl and Atreides
|
||||
keeps Heighliners. Separate Collection2 makes Guild4. Banker Atreides remains
|
||||
12 with front1 through Collection; human readiness reaches Mentat13/front0.
|
||||
Human390px **PG2GR3RC v26/Collection** publicly chooses Arrakeen from two real
|
||||
HMS copy options, then trained C’tair5/dial5/support1/Shield. Bank covers1,
|
||||
own payment0; actual4 Suboid+2 cyborg losses precede rescue2 ordinary+1 elite,
|
||||
keeping ordinary and returning one of each. Original substitution is declined.
|
||||
HMS3 plus Arrakeen1/Tabr1, reserves12/Tanks3; cyborg reserves6/Tanks1/board0.
|
||||
Both held defenses remain; sole opposing Axlotl transfers, Fremen Production
|
||||
stays. Wallet10 remains through battle; original Collection2 makes12 after the
|
||||
native CHOAM market finish and original phase-opening readiness.
|
||||
Ix first Mentat controls only HMS/Arrakeen; the second copy's Tabr control is
|
||||
labeled later Movement staging. No later Ix Mentat victory is suppressed.
|
||||
Phone cost/copy/rescue/counter controls are readable; refresh preserves both
|
||||
versions and outcomes. Full combinations, assurance, strategic AI, public and
|
||||
deployed acceptance remain open.
|
||||
Final reference10/10, types/lint/build and rebuilt390px combined guide pass
|
||||
(351px topic,390px page, no overflow). The final isolated reload retains human
|
||||
v20/Mentat andv26/Collection. Owned temporary drivers and managed tabs are
|
||||
removed; rooms/store, private metadata and original captures remain.
|
||||
|
||||
## Native E1/E2 Tech Tokens composition — 4 October 2026
|
||||
|
||||
Fresh three-through-six-seat Basic/Advanced `leader-skills` and separate
|
||||
|
||||
@@ -199,6 +199,7 @@ See [the cutover and Advanced sequence](MORITANI_ASSASSINATE_LEADERS.md#authorit
|
||||
| Leader Skills | Fourteen physical cards, variant setup order, public/hidden assignment, death return, own-leader revival and captured lower-band effects are sourced. Five battle disciplines, Planetologist movement/Special substitution, Suk Graduate rescues and common lifecycle are prototyped; Rihani, lower Mentat/Bureaucrat/Sandmaster, normal Smuggler and normal Diplomat now have connected follow-ups. Remaining bands and combinations stay missing. Known skilled capture identifies the leader through its unique public card. | [Source contract](LEADER_SKILLS_RULES.md), [capture inference](LEADER_SKILLS_CAPTURE.md), [runtime](LEADER_SKILLS_RUNTIME.md), [Diplomat](DIPLOMAT_DEFENSE.md), [Planetologist](PLANETOLOGIST_RULES.md), [Suk Graduate](SUK_GRADUATE_RULES.md) |
|
||||
| Classic Leader Skills / Tech Tokens | Fresh classic3..6 Basic/Advanced, base33/all14, canonical unused three tokens and original setup/first-Storm owners. Existing leader-skills/banker-income entry preserves selected Tech; native/other overlays stay separate. Tech collects at phase end, independent Banker waits for actual Mentat; neither currency store is a recursive payment producer. Smuggler changes actual priced count; original Suk/Sandmaster precede card cleanup and mandatory token transfer. One token auto-transfers, several require choice, none skips. Mentat/Bureaucrat original bounds remain. This composes existing rules, not a new ruling or public activation. | [Scope and evidence](LEADER_SKILLS_RUNTIME.md#classic-tech-tokens-composition--4-october-2026) |
|
||||
| Native E1/E2 Leader Skills / Tech Tokens | Fresh supported Ixian/Tleilaxu/CHOAM/Richese3..6 Basic/Advanced keeps original native deck/roster limits, all14 skills, cache and printed Tech setup. Original typed payments/rescue/card cleanup precede mandatory winner token reward; Tleilaxu A.1–3 expressly preserves that reward before Face Dance. Actual Charity affects Production, not Axlotl; native CHOAM initial income is not poverty Charity. Separate Banker/Mentat bounds and unrelated guards remain. E3/other overlays, public starts and save conversion are excluded. This composes sourced rules, not a new interpretation. | [Scope, supplied physical21/38 and evidence](LEADER_SKILLS_RUNTIME.md#native-e1e2-tech-tokens-composition--4-october-2026) |
|
||||
| Advanced Leader Skills / Stronghold Cards | Fresh classic or supported E1/E2 native2..6 Advanced preserves all14 skills, six unused cards, original decks/cache/wallets and actual end-Mentat claims; optional Tech requires3..6. Arrakeen bank subsidy is separate from actual payer debit/Banker threshold and original CHOAM income. Physical defense/normal discipline, holder tie and Tabr/Tuek income compose original skill outcomes. Suk/native cleanup and mandatory Tech precede Face Dance, retaining original rewards and one killed-skill return. Copied-Diplomat/active skill-Stone and unrelated guards remain. Basic Strongholds, E3/other overlays, public starts and save conversion are excluded. | [Authorized physical21/38, existing effects and evidence](LEADER_SKILLS_RUNTIME.md#advanced-stronghold-composition--4-october-2026) |
|
||||
| Native Mentat preview | Explicit fresh `leader-skills --mentat-question` reuses the existing private uniform question for already-supported Basic Ixian/Tleilaxu/CHOAM/Moritani profiles. Exact/default card roles, held fallback and skill-before-faction timing are unchanged. Ordinary/public activation, empty-hand handling, Advanced native skills and other modules stay gated; this is integration, not a new answer to the pending UX question. | [Native integration and existing authority](MENTAT_QUESTION.md#native-skill-integration--2-october-2026) |
|
||||
| Normal Spice Banker local preview | Fresh classic/base33 Basic/Advanced or supported Basic native skill profiles, all14 skills alone. One additional deferred bank spice per physical card/turn/phase for another payer's one actual bank payment ≥4; no payer pooling or advance spending. Tleilaxu self-revival pays Bank; other-player revival pays Tleilaxu unless canceled. The separate free-revival award never contributes to payer debit. Actual initialized Mentat collects once; original earned-faction retention and separate-payer threshold remain provisional local policies, not answers to pending custody/split questions. No public start, retrofit or other overlays. | [Normal-band contract](SPICE_BANKER_RUNTIME.md#normal-income-local-contract--2-october-2026), [native integration](SPICE_BANKER_RUNTIME.md#basic-native-banker-integration--2-october-2026), [skill authority](LEADER_SKILLS_RULES.md) |
|
||||
| Advanced Stronghold faction integration | Fresh `stronghold-factions` admits selected E1/E2 native families and standalone Ecaz OR Moritani with classic2..6-seat Advanced, canonical selected decks and six Stronghold Cards alone. Standalone E3 uses ecaz33; Moritani excludes Harkonnen. Ecaz co-control holds the card at Ecaz, but only the selected actual holder-plan receives its effect; fixed Ecaz strength is free, and Arrakeen funds only actual variable support. Losing Moritani retains printed Tuek income before original assassination, printed bounty and one actual Mentat replacement; winner cleanup finishes once and normal Traitor reveal forfeits assassination for the game. Existing E1/E2 No-Field/Stone/FaceDance and retained winner rewards remain. E3 pairs/mixed families, mixed No-Field/full-plan, Stone/Poison Tooth and other overlays stay guarded. This composes existing contracts, not a new ruling. Save/privacy/custody assurance follows all rules. | [E1/E2 scope](STRONGHOLD_CARDS.md#expanded-e1e2-faction-rules), [standalone E3 scope and evidence](STRONGHOLD_CARDS.md#standalone-e3-stronghold-composition--4-october-2026) |
|
||||
|
||||
@@ -6,6 +6,15 @@ positive bank payments to automatic current Mentat collection.
|
||||
Bounded coverage is **Partial / Development Verified**. No public start,
|
||||
old-game retrofit or other module is enabled; this is not deployed acceptance.
|
||||
|
||||
**4 October Advanced Stronghold composition:** the same separate local entry
|
||||
preserves unused Stronghold Cards in Advanced classic or supported E1/E2
|
||||
native2..6-seat skills; optional Tech still needs3..6. Arrakeen bank support
|
||||
is not payer spending: declared0/2/5/6 means actual own0/0/3/4, and only4
|
||||
qualifies a grant. Human **HERCFX3B v20/Mentat** pays4 after bank2 while Suk
|
||||
rescues3 without refunding support. Atreides retains wallet12/front1 until
|
||||
actual Mentat, then13/front0. See the [combined source and evidence](LEADER_SKILLS_RUNTIME.md#advanced-stronghold-composition--4-october-2026).
|
||||
Original earned-custody/separate-payer policies remain; no public activation.
|
||||
|
||||
**4 October native Tech composition:** the same separate opt-in preserves
|
||||
unused original Tech in fresh3..6-seat supported Ixian/Tleilaxu/CHOAM/Richese
|
||||
Basic/Advanced lobbies. Native deck/roster limits and payment recipients remain.
|
||||
|
||||
@@ -2,6 +2,35 @@
|
||||
|
||||
Historical development module checkpoint, 7 September 2026: the six printed effects, public card custody, mobile declaration, support accounting, AI choices and readable faces are integrated. The later user-authorized [classic Advanced preview](ADVANCED_PREVIEW.md) already permits Stronghold Cards; preserve that access. Complete Advanced/expansion release and arbitrary combinations remain gated.
|
||||
|
||||
## Advanced Leader Skills composition — 4 October 2026
|
||||
|
||||
Fresh local `leader-skills` and separate `banker-income` preserve unused six
|
||||
Stronghold Cards with all14 skills in Advanced classic or supported E1/E2
|
||||
native2..6-seat rosters. Optional original Tech requires3..6; native wallets,
|
||||
decks/cache, setup and actual end-Mentat claims remain. The supplied authorized
|
||||
Advanced source physical21/printed19 permits variants together. Basic
|
||||
Strongholds, E3/other modules, public starts and save conversion stay excluded.
|
||||
|
||||
Original support subsidy changes actual payer debit, not rescue losses or
|
||||
the normal Banker threshold. Native CHOAM still earns on bank-funded support.
|
||||
Physical Carthag/normal discipline, holder-only Habbanya tie, Tabr dial income,
|
||||
Tuek played-Worthless income and HMS pre-plan copy compose source-clear skills.
|
||||
Suk and original native cleanup finish before optional Tech and Face Dance;
|
||||
the original winner retains earnings/cards, and killed training returns once.
|
||||
Copied Diplomat/modified defense and active skill/Stone interpretations remain
|
||||
guarded. No card custody is assigned to create a case.
|
||||
|
||||
New21, affected277 and final shared fixture-consumer72 cases, types/lint/build,
|
||||
twelve actual programs and twenty-two genuine paired/triple games pass
|
||||
(6,672 accepted actions/no rejection,171 JSON continuations).
|
||||
Human390px **HERCFX3B v20/Mentat** pays actual support4 after bank2, rescues3,
|
||||
keeps Shield and original two Tech while separate Banker fronts1 then collects
|
||||
12→13 at actual Mentat. **PG2GR3RC v26/Collection** declares real HMS copy,
|
||||
bank-funded1/own0, typed4 Suboid+2 cyborg loss/rescue before sole Axlotl reward.
|
||||
All original responses, market finish and phase-opening readiness remain.
|
||||
Read the [combined scope and exact outcomes](LEADER_SKILLS_RUNTIME.md#advanced-stronghold-composition--4-october-2026).
|
||||
This is bounded Development Verified, not complete-module/public/deployed proof.
|
||||
|
||||
## Standalone E3 Stronghold composition — 4 October 2026
|
||||
|
||||
Fresh `stronghold-factions` additionally admits Advanced native Ecaz OR native
|
||||
|
||||
Reference in new issue
Block a user