Connect bounded Orgiz spice transfers to Discovery Collection
This commit is contained in:
1 parent
c9a3625ff2
commit
209fb18a27
11 files changed
+327
-123
No files matched your search
+20
-11
@@ -6,16 +6,25 @@ Expansion starts and full rules/publication acceptance remain gated.**
|
||||
|
||||
## Current checkpoint and work
|
||||
|
||||
The live NAS Apps `dune` image is now the immutable
|
||||
`ghcr.io/quintine/dune:sha-4801ce003bd28d5f0aaf26c3bcded3dcfea4df07`
|
||||
from successful container workflow `36355611201`. The public homepage displays
|
||||
that full revision. After the update, owner sign-in succeeded and the nine
|
||||
existing rooms remained in the directory, including a playing room at version
|
||||
54. A 0600 online SQLite backup in the persistent app volume passed
|
||||
`PRAGMA quick_check` before the update; the temporary remote plaintext owner
|
||||
key and provisioning SQL were removed afterward. Private saved-seat
|
||||
reconnection and complete historical-data comparison were not exercised.
|
||||
The pending Diplomat retreat work is not in this deployed image.
|
||||
The live NAS Apps `dune` image is the immutable
|
||||
`ghcr.io/quintine/dune:sha-c9a3625ff2a9ddafdbc08e64de809eca6029db85`
|
||||
from successful container workflow `36358270534`. The public footer's title and
|
||||
accessibility name show that full revision; visible text shows `c9a3625`.
|
||||
After the update, owner sign-in succeeded and nine existing rooms remained,
|
||||
including a playing room at version 54. A fresh 0600 online SQLite backup in
|
||||
the persistent app volume passed `PRAGMA quick_check` before the update. The
|
||||
earlier temporary remote plaintext owner key and provisioning SQL were removed.
|
||||
Private saved-seat reconnection, complete historical-data comparison and live
|
||||
Diplomat retreat gameplay were not exercised; its local behavior is verified,
|
||||
not production gameplay-proven.
|
||||
|
||||
The bounded Discovery Orgiz Collection transfer is connected in current local
|
||||
source for Basic/Advanced, with an automatic public log and saved continuation.
|
||||
It treats each positive collected board deposit as one observable blow, a source
|
||||
inference pending a publisher clarification. A focused engine/browser/SQLite
|
||||
checkpoint is in [Discovery prototype](DISCOVERY_PROTOTYPE.md); this code is
|
||||
not yet in the live `c9a3625` image. Contested/shared transfers and full
|
||||
Discovery release acceptance remain gated.
|
||||
|
||||
The bounded [Fremen Nexus Cunning](NEXUS_FREMEN_RULES.md#connected-native-cunning-path)
|
||||
prototype connects an initially empty worm's public offer, one spent private
|
||||
@@ -242,7 +251,7 @@ These links define bounded working behavior, not complete module certification.
|
||||
| Base/Advanced setup | [Normal Advanced preview](ADVANCED_PREVIEW.md), [genuine setup](ADVANCED_SETUP_TEST_SEAM.md), [Advanced study](AI_ADVANCED_SETUP_CALIBRATION_20260907.md), [Fremen cancellation](FREMEN_MOVEMENT_KARAMA_RULES.md), [Atreides full-plan audit](ATREIDES_FULL_PLAN_TIMING.md). Earlier Basic-then-flip fixtures do not establish current setup coverage. |
|
||||
| Expansion factions | [Ixians/Tleilaxu](IX_PROTOTYPE.md) and [all seven faction selections](EXPANSION_FACTIONS_PROTOTYPE.md): genuine setup, Ecaz six-force placement and [Advanced Loyalty](ECAZ_LOYALTY.md), separate optional card variants, private controls and saved per-lot Ixian/Richese decline. Actual special-lot exchange remains pending. |
|
||||
| Leader Skills | [Common lifecycle](LEADER_SKILLS_RUNTIME.md), [known skilled capture](LEADER_SKILLS_CAPTURE.md), [Mentat question preview](MENTAT_QUESTION.md), [Bureaucrat payments](BUREAUCRAT_PAYMENTS.md), five battle disciplines, [Planetologist](PLANETOLOGIST_RULES.md), [Suk Graduate](SUK_GRADUATE_RULES.md), [Rihani and other battle effects](LEADER_BATTLE_EFFECTS.md), [Smuggler shipment](SMUGGLER_SHIPMENT.md), [No-Field](SMUGGLER_NO_FIELD.md) and [battle collection](SMUGGLER_BATTLE.md), [Sandmaster routes](SANDMASTER_MOVEMENT.md) and [worm rides](SANDMASTER_WORM.md), [Banker spending](SPICE_BANKER_RUNTIME.md), [Diplomat defense](DIPLOMAT_DEFENSE.md) and [bounded retreat](LEADER_SKILLS_RULES.md#bounded-diplomat-retreat-interpretation). Remaining bands and combinations are explicit in those contracts. |
|
||||
| Discoveries | [Prototype](DISCOVERY_PROTOTYPE.md): genuine setup, Great Maker, seven cards/eight tokens, inspection and stash rewards, nested sites, signed later free entry, carried Ornithopter, sole Cistern, bounded Jacurutu income, Testing Station and Shrine. Orgiz and contested/mixed cases remain pending. |
|
||||
| Discoveries | [Prototype](DISCOVERY_PROTOTYPE.md): genuine setup, Great Maker, seven cards/eight tokens, inspection and stash rewards, nested sites, signed later free entry, carried Ornithopter, sole Cistern, bounded Orgiz transfers, Jacurutu income, Testing Station and Shrine. Orgiz's per-deposit interpretation, contested/shared benefits and mixed physical allocation remain provisional or pending. The Orgiz path in current source is not yet deployed. |
|
||||
| Nexus/Homeworlds | [Decision index](RULE_DECISIONS.md) links each integrated faction family, native/borrowed effects, physical custody, private choices, payments and transport. [CHOAM Collection trade](NEXUS_CHOAM_SECRET_ALLY.md) and [Emperor extra revival](NEXUS_EMPEROR_SECRET_ALLY_RUNTIME.md) are connected; CHOAM inspection and Emperor purchase remain pending. A source audit or helper alone is not a completed effect. |
|
||||
| Truthtrance | [Spice facts](TRUTHTRANCE_SPICE_FACTS.md), [card counts](TRUTHTRANCE_CARD_COUNT.md), [hand inventory](TRUTHTRANCE_HAND_INVENTORY.md), [recorded knowledge](TRUTHTRANCE_KNOWLEDGE.md), and [Basic/no-Guild Advanced reserve-shipment promises](TRUTHTRANCE_SHIPMENT_PROMISES.md) use authoritative private state. Earlier readiness audits do not supersede these follow-ups. |
|
||||
| Other cards | [Sapho runtime](JUICE_OF_SAPHO_RUNTIME.md) includes first among remaining unstarted movement turns after Advanced Guild has finished. [Recruits](RECRUITS_RUNTIME.md) connects clean Revival play; [Harass & Withdraw](HARASS_WITHDRAW_RUNTIME.md) connects the bounded battle return in the same independent three-card preview. Richese card contracts and the checklist identify other connected effects and explicit gaps. |
|
||||
|
||||
+25
-10
@@ -69,9 +69,17 @@ to redeal a started game. The default `ix` profile remains available.
|
||||
territory into sector zero of that location. This spends no spice, shipment or
|
||||
normal movement. Empty, storm-blocked and occupancy-blocked offers skip without
|
||||
holding up the turn. Accepted groups and arrival reactions survive restoration.
|
||||
- **Cistern:** during Collection, a sole occupant receives two bank spice. If two
|
||||
factions occupy Cistern, the unresolved benefit is withheld without blocking
|
||||
Collection; this boundary does not decide which occupant should receive it.
|
||||
- **Cistern:** during Collection, a sole fighter occupant receives two bank
|
||||
spice after ordinary advisor releases. If two fighters occupy Cistern, the
|
||||
unresolved benefit is withheld without blocking Collection; this boundary
|
||||
does not decide which occupant should receive it.
|
||||
- **Orgiz:** during Collection, a sole fighter occupant takes one spice from
|
||||
the unique rival collector of each positive board deposit after ordinary
|
||||
advisor releases. One collected pile is one observable blow even if previous
|
||||
blows stacked there. The transfer occurs after ordinary collection, conserves
|
||||
player spice, appears in the public log, and resumes from saved state without
|
||||
another payment. Unresolved Ecaz shared lots and contested Orgiz occupation
|
||||
withhold their uncertain transfers, not the ordinary Collection phase.
|
||||
|
||||
- **Jacurutu:** winning a battle here automatically grants one bank spice per
|
||||
opposing undialed physical force sent to the Tanks. Winner casualties and
|
||||
@@ -120,10 +128,16 @@ answers or newly approved table rulings.
|
||||
|
||||
The printed Cistern text names an occupant but permits two factions to occupy a
|
||||
revealed location. The prototype pays an ordinary sole occupant and withholds
|
||||
the contested bonus. Orgiz remains disabled because the source also does not
|
||||
settle whether a stacked board deposit represents one or several collected
|
||||
spice blows; contested occupancy and unresolved Ecaz shared collection add
|
||||
further unanswered cases.
|
||||
the contested bonus. The publisher's [Ecaz & Moritani rulebook, page 13](https://gamers-hq.de/media/pdf/0f/7a/86/Dune_EcazMoritani_Rulebook_EN.pdf)
|
||||
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.
|
||||
|
||||
The Testing Station's two-occupant case leaves ordering and cumulative adjustment
|
||||
unresolved. The prototype opens only the sole-occupant path and continues an
|
||||
@@ -211,9 +225,10 @@ to Spice Blow. Refresh restored the same station forces and private Snooper.
|
||||
This is targeted control/recovery evidence, not an unmodified complete game.
|
||||
The 187 opening saved rooms remain preserved; no server restart was needed.
|
||||
|
||||
1. Resolve Orgiz's collected-blow interpretation, contested Cistern/Testing
|
||||
Station benefits and Jacurutu's mixed physical dial allocation; complete their
|
||||
remaining controls and effects when settled.
|
||||
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.
|
||||
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
|
||||
|
||||
@@ -1,11 +1,19 @@
|
||||
# Dune implementation status
|
||||
|
||||
## 27 September 2026 — Bounded Orgiz Processing Station Collection
|
||||
|
||||
The [Discovery prototype](DISCOVERY_PROTOTYPE.md#connected-behavior) now composes a sole Orgiz occupant's one-spice transfer over ordinary Collection: one uniquely collected board deposit is one observable blow, even when older blows stacked there. Separate deposits pay separately; contested Orgiz occupancy and unresolved Ecaz shared lots withhold their uncertain transfers without blocking ordinary collection. Advisor releases follow the ordinary Collection quote. This is a documented inference from the *Ecaz & Moritani* rulebook, not a publisher ruling. Basic/Advanced engine, JSON restoration, simultaneous in-memory SQLite CAS, conserved spice, rejected-action custody and player-visible log are covered by 20 focused Discovery cases. An actual staged engine continuation reached Collection and credited the Orgiz owner; an isolated local browser table rendered its token guidance and chronicle log without writing a room. The broader Discovery, combined-expansion and publication gates remain closed; this source is not yet the live `c9a3625` image.
|
||||
|
||||
The complete offline suite passed 5,549 tests across 696 files, the app build passed, and scoped TypeScript/ESLint checks passed. `npm run check` still stops at an unrelated in-progress Nexus/Fremen draft with `fremenNexusMovementBlockedTurn` missing from `Player`; that draft was not changed or included in this checkpoint.
|
||||
|
||||
## 27 September 2026 — Bounded skilled Diplomat retreat
|
||||
|
||||
The standalone [Leader Skills retreat interpretation](LEADER_SKILLS_RULES.md#bounded-diplomat-retreat-interpretation) now offers a surviving losing trained leader an event-bound, saved decision before ordinary loser casualties. The server quotes destination-specific undialed normal/elite counts using dial commitments, occupied strongholds, sector adjacency and the storm; accepted choices transfer those exact physical counters, while a decline or dead leader follows ordinary losses. Human controls and all four AI profiles use the same projected choices. Nine focused engine, controls and concurrent in-memory SQLite cases passed, including JSON restoration, split-sector custody, legacy-battle continuation and rejected-action immutability. An isolated browser view from a genuine revealed battle rendered the destination/count selectors and decline; POST was blocked, so no room was changed. The scoped type check and production build passed. This is a provisional strength/outcome-order interpretation, not a complete skill or combined-module ruling, and it is not yet deployed.
|
||||
|
||||
The complete offline regression suite passed 5,545 tests across 696 files after the retreat changes. The unrelated in-progress Nexus/Fremen draft still blocks the repository-wide type/lint check; the scoped type check covers this retreat slice. The live `4801ce0` image predates this slice.
|
||||
|
||||
Deployment follow-up: successful workflow `36358270534` published `c9a3625ff2a9ddafdbc08e64de809eca6029db85`, and a dedicated deployment agent updated only the NAS Apps `dune` image. The public footer title/accessibility name matched the full revision, the owner signed in, and all nine prior rooms remained (one playing room at version 54). The 0600 online SQLite backup passed `PRAGMA quick_check`. Live Diplomat battle gameplay and private saved-seat recovery were not exercised; the local browser fixture remains the feature-specific UI evidence.
|
||||
|
||||
## 27 September 2026 — Ixian/Tleilaxu with Nexus Cards
|
||||
|
||||
The paired-faction Nexus sample path now includes genuine Ixian/Tleilaxu games without opening the public expansion/module starts. At seed 20260927 all ten two-through-six-seat Basic/Advanced [samples](VERIFICATION_WORKFLOW.md#reusable-base-and-faction-sample-games) completed with 3,853 accepted actions, 100 JSON restores, five unallied card choices and no rejected actions. The three-seat Basic and Advanced traces reach Ixian auction decisions and Nexus draws; Basic reaches a Face Dancer decision, Advanced an Ixian Technology decision. A five-seat Basic trace also plays one Atreides Nexus effect, while an interrupted four-seat Advanced game resumes its own roster. The source-bound report is `/tmp/dune-ix-nexus-checkpoint-20260927/report.json`. This does not certify all card effects, combined module configurations or complete expansion rules.
|
||||
|
||||
@@ -38,7 +38,7 @@ Updated 14 September 2026. This is the authoritative navigation index for existi
|
||||
| Basic Ixians / Leader Skills | Per-origin cyborg range, room-local HMS force routes, rescue before actual cyborg Tank substitution, Rihani before faction substitution and mandatory cleanup compose existing contracts. Ambiguous rescued cyborg reserve origins are explicit player choices. Exact green Ix Specials are Thumper, Harvester and Amal. | [Integration and physical sources](IX_LEADER_SKILLS.md) |
|
||||
| Basic Tleilaxu / Leader Skills | Compose settled native Rihani Face Dancer eligibility, own revival offers and Face Dance death return through the full deck. Zoal copies opposing printed disc value for unmodified Smuggler collection. Advanced foreign gholas and existing skill questions remain gated. | [Integration and sources](TLEILAXU_LEADER_SKILLS.md) |
|
||||
| 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) |
|
||||
| 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 and later-turn Ornithopter spending are prototyped; Jacurutu income, Testing Station and Shrine have bounded prototypes; Orgiz and contested/mixed cases remain pending. | [Component authority](DISCOVERY_COMPONENTS.md), [prototype boundary](DISCOVERY_PROTOTYPE.md) |
|
||||
| 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) |
|
||||
| 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) |
|
||||
@@ -79,7 +79,7 @@ These are unresolved in the cited records. Do not infer an answer from elapsed t
|
||||
| Guild Secret Ally/Homeworlds | Whether the reserve-return grant overrides the Homeworld return restriction. The question was already sent; that route stays guarded. | [Homeworld return](NEXUS_GUILD_SECRET_ALLY_RULES.md#homeworld-prices-and-the-unresolved-return), [checkpoint](NEXUS_GUILD_SECRET_ALLY_RUNTIME.md) |
|
||||
| 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. | [Common boundaries](NEXUS_CARD_RULES.md#remaining-source-questions-and-release-boundaries) and the individual faction source/runtime documents above |
|
||||
| Orgiz collection | User question pending: take one spice per positive board pile collected, or leave the effect pending? The publisher does not clarify stacked Spice Blows. The draft quote remains opt-in and is not enabled by the engine. Contested Cistern income also remains outside the ordinary sole-occupant prototype. | [Discovery interpretations](DISCOVERY_PROTOTYPE.md#interpretations-retained-for-refinement) |
|
||||
| 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) |
|
||||
| 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. No existing postbattle choice covers every winner: a pause only for a holder leaks ownership, precommitment removes the after-win choice, and a universal window makes nonholders pass. The product-exception question has been sent; no timing policy is implemented pending the answer. Ordinary Karama cancellation is also not established by the retrieved sources. | [After-victory inspection audit](NEXUS_CHOAM_SECRET_ALLY.md#after-victory-inspection-audit) |
|
||||
|
||||
Reference in new issue
Block a user