Compose classic Discovery skills and Advanced Orgiz collection

docs/CURRENT_STATUS.md

@@ -17,6 +17,42 @@ open mode gates.
 
 ## Current checkpoint and work
 
+**Advanced Orgiz / classic Discovery Skills — bounded Development Verified:**
+the supplied Advanced rulebook p24 uses a territory-Collection trigger.
+Advanced transfers one collected spice per territory with a unique rival payer;
+Basic keeps the provisional per-positive-deposit interpretation. Shared,
+contested or inconsistent payers withhold only uncertain transfers. Original
+bank income, collected/desert facts and paid continuations remain.
+
+Fresh explicit `leader-skills --discoveries` composes classic/base33/all14
+Skills with Discovery7/8, optional original Tech3–6, Basic/Advanced2–6.
+Trained physical entry, original nested invoices, separate Planetologist/fixed3
+movement, Harkonnen8-card stash, Suk rescue/Tech reward and distinct-party
+Bureaucrat diversion use original controls and four minimal legal policies.
+Native skill families, Nexus/Strongholds/HW and Banker/Mentat previews stay
+outside this entry; no public start or played-game conversion.
+
+Affected rule/control/reference **75 cases**, types/lint/build and actual
+programmes pass. Two genuine six-seat Basic/Advanced Tech games finish
+**1,578 accepted / 1,578 attempts / 42 JSON** on unchanged946335ef tree.
+Counts prove continuation, not natural activation of every new effect.
+
+Actual **PCDX5J8M** CLI starts v7; human natural Warmaster/Staban assignment v8.
+Human Cistern inspect/reveal v10/v11 keeps it empty; original turn-two entry v12,
+human three-counter entry **v13** costs no spice/reserves/movement. Atv14 the
+protected counters survive and ordinary shipment is available. Original human
+one-force shipment/Guild allowance reach **v16**, spice3→2/reserves12→11,
+four Cistern counters and unchanged Warmaster; refresh fits390px.
+
+Actual **FCVCEA3R** final movement ending opens **v8/Collection** automatically.
+Controlled conserved positions collect5 across three deposits/two territories:
+owner11→13/payer's own view10→8; two named-territory notices preserve bank
+income and ordinary facts. Expanded Advanced guidance/refresh fit390px.
+Tabs released; no unrelated record was written.
+[Source, prototype bounds and evidence](DISCOVERY_PROTOTYPE.md#classic-leader-skills-and-advanced-orgiz--5-october-2026).
+Full combinations, pending rulings, assurance and deployed acceptance remain.
+
+
 **Native Discovery / optional original Tech — bounded Development Verified:**
 fresh classic, selected E1/E2 or standalone Ecaz OR Moritani Basic/Advanced
 profiles retain original setup, decks/cache, seven Discovery Spice Cards and

docs/DISCOVERY_PROTOTYPE.md

@@ -118,6 +118,108 @@ not written; no reset, public activation, save conversion or deployed claim.
 
 
 
+## Classic Leader Skills and Advanced Orgiz — 5 October 2026
+
+An explicit fresh `leader-skills --discoveries` entry composes classic factions,
+the original base 33-card deck, all fourteen physical Leader Skills, seven
+Discovery Spice Cards and eight tokens. Basic/Advanced supports two through six
+seats; optional unused original Tech requires at least three. The existing
+skill-first choices, trained-disc posture and original faction setup remain.
+Native families, Nexus, Strongholds, Homeworlds and separate Banker/Mentat
+previews are not admitted by this particular entry. It does not redeal a
+previously initialized Discovery or upgrade a played game.
+
+```sh
+node --import tsx tools/start-prototype.ts --profile leader-skills --discoveries --db PATH --room CODE --version NUMBER --out /private/new-directory
+node --import tsx tools/faction-games.ts --profile discovery-skills-tech --rules both --players 6 --out /private/new-directory
+```
+
+Physical next-turn entry spends neither the ordinary movement allowance nor
+spice and does not change the trained disc. Paid nested shipment retains its
+original invoice. Planetologist movement and the carried Discovery Ornithopter
+are separate alternatives: the latter replaces one movement with fixed range
+three rather than adding a skill modifier or action. Original Harkonnen
+eight-card capacity, owner-selected stash discard, normal/skilled Suk rescue
+and subsequent original Tech reward use existing producers. A distinct
+Bureaucrat holder may divert the printed two spice from an eligible five-spice
+single-payer shipment without changing the payer's invoice or physical arrival.
+Existing modified-defense, Atreides Suk/KH and private split-source guards remain.
+
+### Authorized Advanced Collection wording
+
+The supplied `UNOFFICIAL_Revised_Dune_Rulebook_v.2.3_web.pdf`, **physical page 24**,
+says Orgiz steals one collected spice **each time collection occurs in a
+territory containing spice**, rather than the publisher's older per-blow text.
+For Advanced, the quote maps an original territory's positive Collection to
+one transfer, even when multiple collected source keys identify the same
+unique rival payer. A different, missing, contested or shared payer withholds
+that territory's transfer; other territories and ordinary Collection proceed.
+An owner's own Collection is not theft. This is the explicit application of
+the authorized Advanced trigger, not a newly discovered publisher ruling on
+contested ownership or shared allocation.
+
+Basic retains its recorded provisional one-transfer-per-positive-deposit
+interpretation. The context requires its existing public `advanced` boolean:
+missing mode is not silently treated as either source. Effect `location`
+remains one actual deterministic collected key; Advanced notices name the
+territory. Original collected/desert facts, remaining map spice, bank-income
+prefix and already-paid phase continuations are not rewritten or replayed.
+
+Original programs with explicitly controlled, conserved counter/spice positions
+show one rival collecting five spice across three deposits in two territories:
+**Advanced transfers two; Basic transfers three**. These are controlled board
+positions, not naturally produced card history. The trained programme moves
+three actual Guild counters into Cistern free, then ships one additional
+reserve there for one spice, reaching four physical counters.
+
+Two genuine six-seat Basic/Advanced Skills+Discovery+Tech games finish
+**1,578 accepted / 1,578 attempted / 42 JSON continuations** on unchanged tree
+`946335ef77745f086cd9bd07bfa405c46c06785a3aae7a684a8e244ce2da4ee5`.
+That proves original continuation, not natural activation of every new effect,
+complete Skills/Discovery combinations or strategic calibration. Focused
+consumers live in `tests/discovery-orgiz-advanced-runtime.test.ts` and
+`tests/discovery-classic-skills-runtime.test.ts`; source cases remain in
+`tests/discovery-collection.test.ts`.
+
+### Actual human controls and targeted checks
+
+The frozen affected rule/control/reference union passes **75 cases**, with
+TypeScript/lint and the actual build. Named owner-defined quote/driver contracts
+replace newly encountered concrete-function return-type coupling.
+
+Actual fresh **PCDX5J8M v6** starts through the existing backed-up
+`leader-skills --discoveries` CLI at **v7/setup**. Guild's natural physical
+offers are Warmaster and Prana Bindu Adept; human assignment chooses Warmaster
+on Staban Tuek at **v8**. The subsequent original programme retains those
+already-dealt choices, controlling only four unplayed Spice Cards and the
+actual token lottery. Human Cistern inspection/reveal reaches **v10/v11** while
+the location remains empty.
+
+Six original phase actions expose turn-two entry at **v12**, before the storm.
+Human **Move 3 forces inside** reaches **v13**, preserves spice3/reserves12,
+movement0 and the existing shipment flag, and keeps Warmaster. Twenty-two
+original controls reach movement at **v14**: the three Cistern counters survive
+the storm and ordinary shipment is available. Human reserve shipment plus
+original Guild **Allow shipment** reach **v16**, spice **3→2**, reserves
+**12→11**, four Cistern counters and unchanged training. Refresh fits **390px**.
+
+Actual **FCVCEA3R v6** retains its authenticated Atreides/Guild/Fremen identities.
+Original setup/inspection/reveal and phase controls plus explicitly conserved
+counter/spice positions stop before the final movement ending at **v7**.
+Human **Finish shipment & movement** opens automatic Collection at **v8**:
+Guild's ordinary five collected spice remain factual; Atreides receives
+**11→13** and Guild's own view shows **10→8**, with two territory-labelled Orgiz
+notices. Ordinary Fremen stronghold income is still logged. Rival budgets remain
+masked in other seats; each balance was read from its own controlled QA seat.
+The expanded rule panel and footer show Advanced territory counting and pending
+mixed/contested limits. Refresh retains v8 at390px. Managed tabs released.
+
+Only these dedicated QA records were written. The failed throwaway attempt to
+wait in an empty Battle phase was corrected to stop before the original final
+movement ending: ordinary automation skips empty battles rather than adding a
+new confirmation. No clock, wallet, paid quote, public gate or existing-game
+conversion was fabricated.
+
 ## Connected behavior
 
 - **Great Maker:** ordinary worm consequences resolve first. Every faction then
@@ -221,12 +323,13 @@ the contested bonus. The publisher's [Ecaz & Moritani rulebook, page 13](https:/
 says an Orgiz occupant steals one spice of each collected blow. Its bundled
 Q&A does not define a stacked pile as one or several blows; searches of the
 publisher/designer and community rules pages found no explicit clarification.
-The bounded implementation treats each positive board deposit collected as one
-observable blow, transfers one spice from its unique collector, and does not
-take spice from the occupant itself. This is an inference, not an official
-ruling. Two fighters occupying Orgiz withhold all theft. An Ecaz shared lot
-with no assigned collector withholds theft from its entire territory; independent
-deposits elsewhere and ordinary collection proceed.
+Basic's bounded implementation treats each positive board deposit as one
+observable blow, transfers one spice from its unique collector and does not
+take spice from the occupant itself. That remains an inference, not an official
+ruling. Advanced now follows the supplied rulebook's territory-Collection
+trigger described above. Two fighters occupying Orgiz still withhold theft.
+An Ecaz shared lot or inconsistent collected payers withholds that territory's
+transfer; independent territories and ordinary Collection proceed.
 
 The Testing Station's two-occupant case leaves ordering and cumulative adjustment
 unresolved. The prototype opens only the sole-occupant path and continues an
@@ -316,8 +419,8 @@ The 187 opening saved rooms remain preserved; no server restart was needed.
 
 1. Resolve contested Cistern/Orgiz/Testing Station benefits, Ecaz shared-lot
    Orgiz allocation and Jacurutu's mixed physical dial allocation; complete
-   remaining controls and effects when settled. The per-collected-deposit
-   Orgiz interpretation remains provisional.
+   remaining controls and effects when settled. Basic's per-collected-deposit
+   Orgiz interpretation remains provisional; the Advanced count is source-cut over.
 2. Integrate combined modules and complete games, then refine interaction,
    strategy and presentation coverage before opening normal start gates.
 3. Use the existing prototype starter and saved-room verification for further

docs/IMPLEMENTATION_STATUS.md

@@ -1,5 +1,42 @@
 # Dune implementation status
 
+## 5 October 2026 — Advanced Orgiz and classic Discovery Skills
+
+Authorized supplied Advanced p24 territory-Collection wording now groups actual
+positive source keys into one transfer per territory and unique foreign payer.
+Basic keeps the existing provisional deposit mapping. Mixed/shared/contested
+sources leave only their transfer unpaid; ordinary facts, bank prefix and
+already-paid continuation remain unchanged. No new publisher ruling is claimed.
+
+Explicit fresh classic `leader-skills --discoveries` preserves base33/all14
+Skills/Discovery7/8 and optional untouched Tech3–6, Basic/Advanced2–6.
+Original trained entry, nested tariff, independent Planetologist/fixed-three
+routes, Harkonnen stash capacity, Suk/Tech ordering and Bureaucrat5→bank2
+diversion reuse original consumers. Other overlays/native skill profiles and
+Banker/Mentat previews remain separate. No public activation or save conversion.
+
+Targeted rule/control/reference75, TypeScript/lint/build and actual programmes
+pass. Basic3 versus Advanced2 transfers preserve ordinary five-spice collection
+in controlled conserved positions. Two genuine six-seat games finish
+1,578/1,578/42 JSON on unchanged tree
+`946335ef77745f086cd9bd07bfa405c46c06785a3aae7a684a8e244ce2da4ee5`;
+no natural-every-effect claim. Newly encountered concrete-function return-type
+coupling uses named owner-defined CollectionQuote/DiscoveryCollectionQuote/
+SkillsTechBattleStep contracts.
+
+Actual PCDX5J8M CLIv7, natural human Warmaster/Stabanv8, Cistern inspect/reveal
+v10/v11 and three-counter free entryv13 preserve training/resources. Original
+protected turn-two continuationv14 permits a one-force paid shipment; human
+Guild allowancev16 gives spice3→2/reserves12→11/four Cistern counters. Refresh390px.
+Actual FCVCEA3R final movement endingv8 automatically collects five and transfers
+two: owner11→13/payer-own-view10→8, two territorial notices and bank prefix intact.
+The failed throwaway empty-Battle wait was corrected to the original automatic
+phase path, not a new confirmation. Tabs released; no unrelated game write.
+
+[Canonical source/control evidence](DISCOVERY_PROTOTYPE.md#classic-leader-skills-and-advanced-orgiz--5-october-2026).
+Complete combinations, pending contested/shared/mixed rulings, assurance and
+deployed acceptance remain open.
+
 ## 5 October 2026 — native Discovery with original Tech
 
 Fresh classic, selected E1/E2 and standalone Ecaz OR Moritani Discovery entry

docs/RULE_DECISIONS.md

@@ -236,7 +236,7 @@ dedicated retrieved worked FAQs. [Contract and remaining limits](HOMEWORLD_OCCUP
 | 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) |
 | 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) |
-| Discoveries | Preserve seven sourced Spice Cards and eight physical tokens, private faction peeks and Collection choices. Fresh classic, selected E1/E2 or standalone Ecaz OR Moritani profiles may retain original Tech3..6. Native setup, physical typed entry, revealed-only nested No-Field custody/materialization, CHOAM stash capacity and original Moritani assassination use existing source handlers. Revealed locations are separate; only Jacurutu counts toward stronghold victory. Existing bounded Cistern/Orgiz/Ornithopter/Jacurutu/Testing Station/Shrine paths remain prototypes; contested/shared/mixed cases and public starts are not resolved. | [Component authority](DISCOVERY_COMPONENTS.md), [native source composition](DISCOVERY_PROTOTYPE.md#native-setup-and-original-consumers--5-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) |
 | 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) |
 | Homeworld effects | Keep original payment/revival/placement identities and qualification observations; observations alone do not choose an occupied-benefit owner. | [Payments](HOMEWORLD_PAYMENT_INCOME_RULES.md), [card economy](HOMEWORLD_CARD_ECONOMY_RULES.md), [Collection](HOMEWORLD_COLLECTION_RULES.md), [revival deployment](HOMEWORLD_REVIVAL_DEPLOYMENT_RULES.md), [victory reinforcement](HOMEWORLD_VICTORY_REINFORCEMENT_RULES.md), [replacement](HOMEWORLD_REPLACEMENT_RULES.md), [Tupile](HOMEWORLD_TUPILE_INTELLIGENCE_RULES.md) |
@@ -287,7 +287,7 @@ These are unresolved in the cited records. Do not infer an answer from elapsed t
 | Occupied Homeworlds | Entitlement/expiry after departure, replacement or contest; unique powers and shared income. The first-occupier/current-occupier question was already sent. | [Occupation questions](HOMEWORLD_OCCUPATION_RULES.md#questions-the-retrieved-sources-do-not-settle), [lifecycle audit](HOMEWORLD_OCCUPATION_LIFECYCLE_AUDIT.md) |
 | Nexus responses and composition | Betrayal private-response timing, partial revival/payment choices, Emperor fewer-than-five, fresh advisor/storm cases, Duke restoration and remaining faction-specific combinations. Tleilaxu Secret Ally force accounting, leader slot/eligibility and force-only use remain unresolved after requested publisher/designer source searches; do not infer answers from native Tleilaxu revival or Ghola. | [Common boundaries](NEXUS_CARD_RULES.md#remaining-source-questions-and-release-boundaries), [Tleilaxu source search](NEXUS_TLEILAXU_RULES.md#source-search-follow-up) and individual faction source/runtime documents |
 | Moritani Atomics after alliance change | The publisher's persistent −1 hand-limit text names Moritani and “your ally,” but not whether the penalty follows a later ally, remains on the original ally or affects both. Requested online source searches found no clarification; the alliance-change case remains gated. | [Terror source boundary](MORITANI_TERROR_RULES.md#material-gaps-and-ordinary-compositions) |
-| Orgiz collection | The [publisher rulebook, page 13](https://gamers-hq.de/media/pdf/0f/7a/86/Dune_EcazMoritani_Rulebook_EN.pdf) says an occupant steals one spice of each collected blow, but its Q&A and searched designer/community sources do not define stacked board piles. Choose one transfer per positive collected board deposit as the observable first version, from its unique rival collector; this is an inference, not a publisher ruling. Contested Orgiz occupancy and Ecaz shared lots withhold only the uncertain transfer while ordinary collection continues. | [Discovery interpretation](DISCOVERY_PROTOTYPE.md#interpretations-retained-for-refinement) |
+| Orgiz collection | Basic retains the publisher-p13 per-blow ambiguity and provisional one-transfer-per-positive-deposit mapping. Authorized supplied Advanced rulebook physical24 instead says each time Collection occurs in a territory containing spice: Advanced applies one transfer per actual positive territory Collection, only to a unique rival payer. Multiple source keys do not add transfers. Contested ownership, inconsistent/different payers and Ecaz shared lots still withhold only uncertain transfers; ordinary Collection proceeds. No new publisher ruling on those pending cases is claimed. | [Advanced source cutover and Basic boundary](DISCOVERY_PROTOTYPE.md#authorized-advanced-collection-wording) |
 | Jacurutu physical dial | The user question asks whether the losing player should choose the physical normal/elite forces represented by its dial. When legal Advanced allocations produce different rewards, income remains explicitly unpaid; numeric wheel subtraction is not a ruling. | [Discovery interpretations](DISCOVERY_PROTOTYPE.md#interpretations-retained-for-refinement) |
 | Testing Station contest/timing | Only sole non-advisor occupation is prototyped. Two-occupant priority/stacking remains unresolved; opening after the ordinary storm-card window is an explicit source-timing inference. Weather Control is excluded by the printed text. | [Discovery interpretations](DISCOVERY_PROTOTYPE.md#interpretations-retained-for-refinement) |
 | CHOAM Secret Ally battle timing | The printed after-victory inspection is optional and the Nexus identity stays secret. The connected prototype chooses a uniform use-or-continue window for every winner when Nexus is enabled and CHOAM absent; nonholders pass, while a holder may decide after the result. This privacy-preserving prompt is a product inference, not publisher text. A holder-only pause would reveal custody and a precommitment would remove the printed choice. Ordinary Karama cancellation remains unestablished by retrieved sources; no response is invented. | [After-victory inspection boundary](NEXUS_CHOAM_SECRET_ALLY.md#after-victory-inspection-audit) |