Integrate sourced Treachery cards with Advanced Occupy
This commit is contained in:
Quintine committed
1 parent
85caee6c83
commit
cd532222a5
21 files changed
+1226
-99
No files matched your search
+22
-4
@@ -25,6 +25,24 @@ authorization and deployment/publication safeguards remain intact. Use the
|
||||
[bounded context index](DEVELOPMENT.md#context-index) and
|
||||
[feedback/proof schedule](DEVELOPMENT.md#feedback-and-proof-schedule).
|
||||
|
||||
**Independent cards + Advanced Occupy — bounded Development Verified:** fresh
|
||||
explicit CLI `--ecaz-treachery` adds all three physical cards36/50/38/50.
|
||||
Own Ecaz Harass returns only its floor count while original mandatory ceil
|
||||
stays fixed/free; allied/opposing/canceled typed pools stay owner-labelled.
|
||||
Reinforcements retains provisional own3-reserve/+2-score accounting.
|
||||
Native/pure67, affected284/284 and27 actual programs/four policy seals pass.
|
||||
Current46 complete games:26,619 accepted/no rejects/696JSON continuations,
|
||||
source unchanged and9 combined lead choices. Full counters correct earlier
|
||||
compact-summary misreading: prior five/23-game batches had1/3 choices.
|
||||
Original CLI/human390px **T8T3ZYWH v12** and **WW54BZGM v12** prove own
|
||||
withdrawal/fixed loss and decisive +2/own reserve cost through actual Collection.
|
||||
Current mandatory-discard owner/selected-commitment blockers are fixed; Basic/
|
||||
unprofiled co-side guard stays. Final scoped reviews find no defect.
|
||||
See [combined-card source and proof](ECAZ_OCCUPY_RULES.md#independent-cards-with-combined-armies--2-october-2026).
|
||||
Final types/lint, canonical guide10/10, build,390px bounded guide and actual
|
||||
explicit-variant CLI help pass; ten changed-region local links/anchors are valid.
|
||||
Owned drivers/tabs/workers are removed/closed without resetting games.
|
||||
|
||||
**Native E1/E2 Ecaz Occupy — bounded Development Verified:** existing profile
|
||||
now composes Ixians/Tleilaxu/CHOAM with Ecaz/classic/optional Moritani2..6 and
|
||||
distinct selected E3/E1/E2 ordinary33/47/35 decks. Physical Ix owns native
|
||||
@@ -33,8 +51,8 @@ support shares exclude free fixed Ecaz strength. External FaceDance returns
|
||||
both winning armies with combined maximum; own-winning Tleilaxu is excluded.
|
||||
Native34, affected191/191, types/lint and19 actual program cases pass;23
|
||||
unstaged games complete13,004 accepted/no rejects/339JSON continuations,
|
||||
source unchanged. They contain no combined lead choice; native cases and
|
||||
human390px **5B4FW8D3 v12** and **UVGT4DLN v10** prove that rule path.
|
||||
source unchanged. Full `results.json` records three combined lead choices;
|
||||
human390px **5B4FW8D3 v12** and **UVGT4DLN v10** exercise explicit rule edges.
|
||||
Two scoped rule reviews find no defect. Richese mixed planning, optional
|
||||
overlays, full factions/public starts remain gated; assurance follows all rules.
|
||||
See [native force-owner integration](ECAZ_OCCUPY_RULES.md#native-e1e2-force-owner-integration--2-october-2026).
|
||||
@@ -64,8 +82,8 @@ Moritani2..6 Advanced, base33/no overlays; full Ecaz and public starts remain ga
|
||||
See [the cutover and proof](ECAZ_OCCUPY_RULES.md#authorized-advanced-cutover--2-october-2026).
|
||||
Final coherent affected rule/guide **173/173** passes. Current-source five
|
||||
unstaged2..6 games complete:2,123 accepted actions, zero rejections and54JSON
|
||||
continuations, `sourceUnchanged:true`. They contain no combined lead choice;
|
||||
the seven native cases and human rooms prove that path, not these game samples.
|
||||
continuations, `sourceUnchanged:true`. Full `results.json` records one
|
||||
combined lead choice; the seven native cases and human rooms cover exact branches.
|
||||
Final types/lint, corrected guide10/10, build and390px Partial/Development
|
||||
Verified guide pass; six changed-region local links/anchors are valid.
|
||||
Code **e112df858a5a3d27992d22478c5c0d4f3dfac642** is pushed.
|
||||
|
||||
@@ -72,9 +72,9 @@ legal plans for either lead, active or canceled.
|
||||
|
||||
The coherent affected rule/guide batch passes **173/173**. Current-source
|
||||
five unstaged2..6 games complete with2,123 accepted actions, no rejections
|
||||
and54JSON continuations, `sourceUnchanged:true`. No game sample triggers
|
||||
a combined lead choice: profile continuation is observed there, while the
|
||||
native cases and human rooms establish the actual combined rule path.
|
||||
and54JSON continuations, `sourceUnchanged:true`. Full `results.json` records
|
||||
one actual combined lead choice. Native cases and human rooms provide the
|
||||
explicit arithmetic, casualty and counter-path evidence.
|
||||
|
||||
|
||||
### Native E1/E2 force-owner integration — 2 October 2026
|
||||
@@ -100,9 +100,9 @@ Native34 rule cases, coherent affected191/191, types/lint and19 actual program
|
||||
cases pass, including Ix substitution decline/prevention and zero/full whole
|
||||
co-side replacement. Twenty-three unstaged classic/paired/mixed2..6 games
|
||||
complete with13,004 accepted actions/no rejection and339JSON continuations,
|
||||
`sourceUnchanged:true`. They contain no combined lead choice; those samples
|
||||
prove profile continuation, not the rare rule transitions covered by native
|
||||
cases and human controls. Two scoped rule reviews find no defect.
|
||||
`sourceUnchanged:true`. Full `results.json` records three actual combined
|
||||
lead choices. Native cases and human controls additionally exercise the typed/
|
||||
replacement boundaries. Two scoped rule reviews find no defect.
|
||||
|
||||
Original CLI/human390px **5B4FW8D3 v12** let physical Ixians sacrifice two
|
||||
Suboids to recover two Cyborgs after an Ecaz-led plan; Ecaz retained its Shield
|
||||
@@ -112,6 +112,55 @@ returned Ecaz1/Guild2 to their own reserves, placed three Tleilaxu forces and
|
||||
retained the original Ecaz Slip Tip and bounty. Both continue the original
|
||||
phase rather than manufacturing another battle or card owner.
|
||||
|
||||
### Independent cards with combined armies — 2 October 2026
|
||||
|
||||
The existing fresh `ecaz-occupy` CLI accepts explicit `--ecaz-treachery`,
|
||||
independently selecting all three physical cards before the original setup:
|
||||
36 Ecaz-only,50 Ix,38 CHOAM,50 both. No default/public start or saved retrofit.
|
||||
|
||||
The printed E3p16 Harass FAQ returns only the card user's own undialed
|
||||
forces. An active Ecaz card user returns `floor(original E/2)` and retains
|
||||
the original `ceil(E/2)` free/full physical commitment; no ally support is
|
||||
charged to those fixed fighters. A selected ally uses its typed variable
|
||||
commitment after subtracting fixed strength. Canceled Occupy uses the lead's
|
||||
ordinary own pool. Opposing successful Traitor cancels returns; withdrawn
|
||||
reserves are outside later loss, explosion and FaceDance replacement.
|
||||
This is a composition of the own-only FAQ and authorized Advanced arithmetic,
|
||||
not a newly retrieved detailed Ecaz casualty FAQ.
|
||||
|
||||
Reinforcements uses the card user's own three normal-first reserve counters
|
||||
and existing +2 score-only modifier, not ally reserves, extra physical dial
|
||||
losses or support. Existing provisional all-revealed-outcome cost/disposal
|
||||
is unchanged and remains explicitly not a publisher ruling. Both slots and
|
||||
opposing holders work; own same-plan Harass/Reinforcements and Stone/optional
|
||||
module guards stay. Basic/unprofiled co-side card battles remain rejected.
|
||||
|
||||
Native/pure67 cases, relevant284-case batch and27 actual native-program
|
||||
cases pass, including all four legal policies. Two natural captured games
|
||||
exposed an existing mandatory-discard callback comparing casualties to the
|
||||
logical winner rather than physical owner. Correct owner and explicit fully
|
||||
committed Harass pool constraints now preserve the selected loss allocation.
|
||||
Both original captures continued to completion; no database reset or new
|
||||
recovery-audit campaign. Obsolete wording/log/default pins were deleted.
|
||||
Final scoped source/native reviews find no defect.
|
||||
|
||||
Current-source46 ordinary/variant2..6 games complete26,619 accepted actions/
|
||||
no rejection/696JSON continuations, source unchanged. Full `results.json`
|
||||
records9 actual combined lead choices; compact `report.json` lacks counters.
|
||||
Original CLI/human390px **T8T3ZYWH v12** sealed Ecaz Harass total5/support2,
|
||||
returned Ecaz2 reserves, sent original fixed3 to Tanks and left Guild2.
|
||||
**WW54BZGM v12** sealed total5/support2 with Reinforcements; its +2 won the
|
||||
real equal-leader comparison, paid three Ecaz reserves, left Ecaz2/Guild2 and
|
||||
sent six total Ecaz counters to Tanks. Both reach original Collection.
|
||||
|
||||
### Encounter evidence correction — 2 October 2026
|
||||
|
||||
Earlier “no combined lead choice” statements were incorrect: the compact
|
||||
`report.json` deliberately omits `used` counters. The immutable full
|
||||
`results.json` records1 choice in the five-game checkpoint and3 in the
|
||||
23-game checkpoint. Neither historical report is rewritten. The current
|
||||
46-game original/variant batch records9 actual combined lead choices.
|
||||
|
||||
## Provenance and attribution correction
|
||||
|
||||
| Source | Observed wording or correction | Authority and conclusion |
|
||||
|
||||
@@ -76,8 +76,11 @@ This is a legal strategy path, not strength calibration.
|
||||
winner. A user question has been sent; no answer is assumed. The guard uses
|
||||
public configuration, never Stone Burner's hidden custody. CHOAM without
|
||||
Richese remains eligible. This is a development boundary, not a printed ban.
|
||||
- Co-present reciprocal Ecaz allied armies on either side reject before
|
||||
sealing; other faction integration gates remain in force. This prototype does not settle Ecaz's undialed allied support allocation.
|
||||
- Co-present armies remain guarded in Basic or without the supported Advanced
|
||||
Occupy profile. The [combined-army follow-up](ECAZ_OCCUPY_RULES.md#independent-cards-with-combined-armies--2-october-2026)
|
||||
returns only actual card-user forces: original fixed Ecaz commitment or the
|
||||
selected ally's native variable commitment. It never returns the other ally
|
||||
or recomputes mandatory fixed losses from the diminished board.
|
||||
- [Bounded Reinforcements](REINFORCEMENTS_RUNTIME.md) can appear in the
|
||||
opposing Battle Plan in classic-faction Basic/Advanced games. The two cards
|
||||
cannot share one player's plan; their relative same-plan timing remains
|
||||
|
||||
@@ -1,5 +1,58 @@
|
||||
# Dune implementation status
|
||||
|
||||
## 2 October 2026 — independent Treachery cards with Advanced Occupy
|
||||
|
||||
Existing `ecaz-occupy` now accepts explicit fresh CLI `--ecaz-treachery`,
|
||||
independently including all three original cards:36 Ecaz-only,50 Ix,38 CHOAM,
|
||||
50 both. Native original setup/owned cards are retained; no public/default start
|
||||
or started-game retrofit. Basic/unprofiled co-side card battles stay guarded.
|
||||
|
||||
Three bounded owners shared owner-labelled Harass total-dial normalization,
|
||||
actual native reveal/outcome integration and original-source cases. Own Ecaz
|
||||
Harass returns its floor count while original mandatory ceil remains fixed/free;
|
||||
selected ally uses typed total-minus-fixed commitment. Opponent/canceled
|
||||
ordinary pools stay separate. Returned reserves remain outside later losses/
|
||||
explosion/FaceDance. Reinforcements preserves its existing provisional own
|
||||
three-reserve normal-first cost and +2 score-only policy on every revealed
|
||||
outcome, not a new publisher interpretation or ally reserve charge.
|
||||
|
||||
Exact first own-Ecaz Harass/Reinforcements cases and types/lint passed.
|
||||
Full-case/native natural play then exposed the mandatory-discard callback's
|
||||
logical-winner/physical-owner mismatch. Explicit fullyCommitted Harass facts
|
||||
also preserve exact selected physical losses instead of unconstrained
|
||||
re-enumeration. Both captured original games now complete after the fix.
|
||||
Independent review additionally restored the outside-profile co-side guard;
|
||||
native before/after reproduction proved Basic accepted before and rejects now.
|
||||
Current regression checks exercise both blockers; old wording/log/default pins
|
||||
were removed instead of re-pinned. Native counter precedence in the advisor
|
||||
fixture was corrected without forcing a reaction or suppressing its window.
|
||||
|
||||
Pure/native67, coherent affected284/284, types/lint and27 actual native
|
||||
program cases pass, including all four real card policy seals. Current46
|
||||
ordinary/variant2..6 games complete26,619 accepted/no rejects/696JSON
|
||||
continuations, source unchanged, with nine actual combined lead choices.
|
||||
Earlier “no combined lead choice” statements were projection-reading errors:
|
||||
compact `report.json` omits counters; immutable full `results.json` records
|
||||
one in the five-game and three in the23-game checkpoint. Those reports remain
|
||||
unchanged; current guidance corrects the claims.
|
||||
|
||||
Original CLI/human390px **T8T3ZYWH v12** used Ecaz Harass total5/support2:
|
||||
Ecaz2 returned to reserves, original fixed3 went to Tanks, Guild2 remained.
|
||||
**WW54BZGM v12** used equal real leaders and total5/support2 Reinforcements;
|
||||
its +2 won, three own reserves were spent, Ecaz2/Guild2 remained and six total
|
||||
Ecaz counters entered Tanks. Both reached original Collection.
|
||||
|
||||
Final `check:quick` types/lint, canonical guide10/10, build and390px
|
||||
Partial / Development: Verified guide pass. Ten changed-region local links/
|
||||
anchors and actual variant CLI help are valid. Both fresh36-card CLI starts
|
||||
were exercised. Owned three native/diagnostic drivers are removed; three
|
||||
managed human/guide tabs and both isolated workers are closed.
|
||||
|
||||
Final source/native scoped reviews find no defect. No new recovery/privacy/
|
||||
custody/seat/getter/wholeDB/HTTP/full6,500-suite assurance campaign; direct
|
||||
current playability blockers were fixed. Full rules/factions/combined modes,
|
||||
later comprehensive review/assurance and deployment remain unfinished.
|
||||
|
||||
## 2 October 2026 — native Ixian, Tleilaxu and CHOAM Ecaz Occupy integration
|
||||
|
||||
The existing Advanced `ecaz-occupy` profile now admits source-selected native
|
||||
@@ -25,9 +78,9 @@ traitor CHOAM payments, and zero/full whole-co-side replacement.
|
||||
|
||||
Twenty-three unstaged classic/paired/mixed2..6 games complete with13,004
|
||||
accepted actions/no rejection and339JSON continuations, `sourceUnchanged:true`.
|
||||
Exact family metadata33/47/35 matches selected decks. No sample reaches a
|
||||
combined lead choice; native programs/meaningful cases and human rooms establish
|
||||
that rare rule path, while game samples prove profile continuation.
|
||||
Exact family metadata33/47/35 matches selected decks. Full `results.json`
|
||||
records three actual combined lead choices; native programs/meaningful cases
|
||||
and human rooms additionally establish the exact typed/replacement boundaries.
|
||||
|
||||
Original CLI/human390px **5B4FW8D3 v12** let actual Ixians exchange two
|
||||
surviving Suboids for two lost Cyborgs after Ecaz formed the plan. Ecaz retained
|
||||
@@ -86,9 +139,9 @@ with exactly1 Ecaz support debit. Both resumed original Collection.
|
||||
|
||||
Final coherent affected rule/guide **173/173** passes. The current-rule five
|
||||
unstaged2..6 games complete with2,123 accepted actions/no rejections and54JSON
|
||||
continuations, `sourceUnchanged:true`, ordinary33/E3 report metadata. No sample
|
||||
uses a combined lead choice; those games prove profile continuation, while
|
||||
named actual native cases and human rooms prove the rare combined battle path.
|
||||
continuations, `sourceUnchanged:true`, ordinary33/E3 report metadata. Full
|
||||
`results.json` records one actual combined lead choice; named native cases
|
||||
and human rooms additionally establish the exact arithmetic and counter paths.
|
||||
The earlier pre-storm-fix report is preserved as different-source evidence.
|
||||
|
||||
Final `check:quick` types/lint, corrected canonical guide10/10 and build pass.
|
||||
|
||||
@@ -3,13 +3,19 @@
|
||||
The separate Ecaz Treachery Cards variant shuffles one physical Reinforcements
|
||||
card independently of choosing the Ecaz faction. Its bounded handler supports
|
||||
Basic or Advanced classic-faction tables and clean Ecaz/Moritani expansion
|
||||
tables without other optional modules or co-present Ecaz allied armies. The
|
||||
tables without other optional modules. The fresh opted-in Advanced Occupy
|
||||
profile additionally composes co-present armies and native Ixian/Tleilaxu/CHOAM
|
||||
families; Basic/unprofiled co-side use stays guarded. The
|
||||
holder may commit it in either Battle Plan card slot. It is neither a weapon
|
||||
nor a defense: Prescience of a category receives **None**, while the physical
|
||||
slot stays occupied and hidden until reveal. A named-card inspection still
|
||||
fixes the exact card. Harass & Withdraw and Stone Burner cannot share this
|
||||
plan; Homeworld and other optional-module combinations remain gated.
|
||||
|
||||
The [combined-army follow-up](ECAZ_OCCUPY_RULES.md#independent-cards-with-combined-armies--2-october-2026)
|
||||
retains own-holder reserve cost and selected lead card/payment ownership.
|
||||
It does not revise the provisional outcome accounting below.
|
||||
|
||||
The holder must have three own reserve counters when sealing the plan. The owner-only battle offer displays availability and the exact provisional cost. The current prototype deterministically takes ordinary reserves first, then elite reserves if needed, transferring precisely three physical counters to the corresponding Tanks subpools when the battle settles. There is no spice payment or on-board arrival. The +2 changes the calculated normal-outcome battle score, **not** the committed physical dial, support payment, casualty count or leader survival. The card is discarded after any revealed result, including an own, opposing or mutual Traitor call and Lasgun/Shield explosion. The cost is likewise paid on each of those outcomes. A successful Traitor call still supersedes the normal score; the modifier never overrides it. Public history records the transfer; the sealed card and owner reserve mix stay private until the reveal. JSON-restored decisions and transactional room updates cannot charge the same cost twice.
|
||||
|
||||
**Provisional interpretations, not publisher rulings:** The card says “increase the dialed number by 2” and transfer three reserves, but no retrieved combined ruling answers whether a sole successful Traitor caller instead keeps their reserves, how the transfer orders against an explosion, whether +2 adds Advanced support or physical losses, which reserve types the holder may select, or whether the three spent reserves count as battle losses for Atreides. For this bounded prototype, payment is at battle settlement before on-board casualties on every outcome; the engine counts the three as battle losses, chooses normal-first rather than offering a type selection, and keeps the score bonus separate from physical dial. [The source review](ECAZ_TREACHERY_RULES.md#14-september-reinforcements-cost-review) records the competing reading and pending user question. These choices are visible so they can be revised without changing prior hands or inventing hidden information.
|
||||
|
||||
@@ -111,6 +111,13 @@ donor income and whole Ecaz co-side FaceDance return with original lead rewards.
|
||||
Exact selected E3/E1/E2 decks retain33/47/35 cards; Richese mixed planning,
|
||||
other overlays and full Ecaz acceptance remain open. See the
|
||||
[source comparison and exact cutover](ECAZ_OCCUPY_RULES.md#authorized-advanced-cutover--2-october-2026).
|
||||
Explicit `--ecaz-treachery` selects the independent three-card variant before
|
||||
the original setup, adding3 to each family deck. The printed own-only Harass
|
||||
FAQ composes with original fixed Ecaz commitment or selected ally variable
|
||||
forces; returned reserves are outside later loss/FaceDance. Reinforcements
|
||||
keeps its existing provisional own-reserve cost/+2-score policy rather than
|
||||
claiming a new outcome ruling. Basic/unprofiled co-side card use remains guarded.
|
||||
See [combined-card boundaries](ECAZ_OCCUPY_RULES.md#independent-cards-with-combined-armies--2-october-2026).
|
||||
Comprehensive recovery/privacy/custody review follows all rules rather than
|
||||
becoming another prototype assurance wave.
|
||||
|
||||
|
||||
Reference in new issue
Block a user