Sequence Advanced Charity from the First Player
This commit is contained in:
Quintine committed
1 parent
84fdd404c9
commit
54787c7f7b
23 files changed
+1016
-62
No files matched your search
@@ -0,0 +1,76 @@
|
||||
# Advanced Charity player order
|
||||
|
||||
27 October 2026. **Prototyped / Partial.** This is a core source correction;
|
||||
complete Advanced, optional combinations and final acceptance remain open.
|
||||
|
||||
## Source and cutover
|
||||
|
||||
The user-authorized `UNOFFICIAL_Revised_Dune_Rulebook_v.2.3_web.pdf`,
|
||||
physical8/printed6, starts Charity with the First Player and proceeds
|
||||
counterclockwise. This is the supplied Advanced authority bound by the
|
||||
[source amendment](RULE_DECISIONS.md#authorized-source-amendment--1-october-2026),
|
||||
not a newly located publisher ruling. The bounded source read is:
|
||||
|
||||
```sh
|
||||
pdftotext -f 8 -l 8 -layout UNOFFICIAL_Revised_Dune_Rulebook_v.2.3_web.pdf -
|
||||
```
|
||||
|
||||
New Advanced Charity phases retain the actual First Player order established
|
||||
by Storm. Basic and already-opened unstamped Advanced phases keep concurrent
|
||||
readiness; viewing or claiming does not manufacture a new order midway.
|
||||
|
||||
## Connected behavior
|
||||
|
||||
- A version1 public `charityOrder` retains the original turn, full order and
|
||||
remaining suffix. Only its current seat may make an ordinary Charity claim
|
||||
or use **Finish Charity turn**. Claiming is optional; finishing without a
|
||||
claim passes that opportunity. Wealth and entitlement remain private.
|
||||
- CHOAM opening income resolves before any claim or finish. A wealthy Advanced
|
||||
Bene Gesserit claim retains its native Karama response. Neither the claim nor
|
||||
a response advances the player order; required interactions finish first.
|
||||
- Finish consumes one opportunity and records its completed prefix. Closing
|
||||
market/Nexus decisions retain the frame until the phase actually ends.
|
||||
No second claim, replayed Finish or new Truthtrance answer reopens a completed
|
||||
ordered turn. Existing Basic/unstamped readiness reopening remains.
|
||||
- Detached Truthtrance witnesses may quote one remaining owned future Charity
|
||||
preparation. They neither claim early at the real table nor replay a closed
|
||||
opportunity. Guidance and minimal AI wait for the actual current seat.
|
||||
- Inflation, Homeworld additions, Production and the existing provisional
|
||||
[CHOAM shortfall funding](CHOAM_CHARITY_FUNDING.md) retain their calculations.
|
||||
Other cards and faction responses keep their own timing and authorized actor.
|
||||
|
||||
`game/charity-order.ts` owns the immutable order calculation. The engine owns
|
||||
phase lifecycle, claims and projection; `components/charity-claim.tsx` supplies
|
||||
persistent current/wait/completed guidance and the existing `charity`/`ready`
|
||||
packets. No database migration or saved-game conversion is added.
|
||||
|
||||
Juice of Sapho first/last composition for this newly ordered phase remains
|
||||
missing and is recorded for the later interaction pass. This version does not
|
||||
pretend an unavailable card interaction is complete.
|
||||
|
||||
## Focused evidence
|
||||
|
||||
Frozen **15 files, 147/147**, types/lint/build and four native start programmes
|
||||
pass. Three explicit Advanced previews exercise allowed income, original Karama
|
||||
cancellation of income or wealthy BG; Basic uses two concurrent low claimants.
|
||||
Actual pre-Charity bribes create poverty and defer incoming money normally.
|
||||
Runtime records 11 GameTable SSR, 26 claim-panel renders, 8 actual claim
|
||||
callbacks and 9 actual Finish callbacks, with source/further action arrays
|
||||
101/30 across programmes. Native response/cancellation/closing actions are
|
||||
applied directly; browser callbacks for those separate controls were not operated.
|
||||
|
||||
Nineteen new pure/native/control/Truth cases cover order, optional claims,
|
||||
responses, Basic/labelled unstamped compatibility, legal policies and future or
|
||||
completed Charity entitlement. A genuine final-owner case caught commitment
|
||||
evasion when Finish immediately opened a later phase; preflight now checks the
|
||||
closed opportunity before its voluntary actor can disappear behind that opening.
|
||||
Older payment, Production and Inflation sources finish preceding native turns.
|
||||
The cancelled-income smoke correctly accepts automatic wealthy BG settlement
|
||||
once the sole original Karama is spent. No game money, phase or queue is installed.
|
||||
|
||||
Proof: `/home/quintine/.local/share/dune/checkpoints/20261027-advanced-charity-order-proof-v4/`;
|
||||
HTML/journeys: adjacent `20261027-advanced-charity-order-runtime/run-v2/`.
|
||||
Tests/types/lint carry from v3 under exactly the same source snapshot; only the
|
||||
private smoke harness changed. The existing server returned HTTP200 unchanged.
|
||||
This is local native/SSR/callback evidence. Sapho, full modes, wider interactions,
|
||||
final rules/recovery/privacy and deployed acceptance remain due.
|
||||
@@ -1,5 +1,10 @@
|
||||
# CHOAM Charity funding
|
||||
|
||||
The [27 October Advanced player-order cutover](ADVANCED_CHARITY_ORDER.md)
|
||||
now sequences fresh Advanced claims and Finish. Basic/old unstamped phases
|
||||
retain concurrent timing. The funding calculations and provisional shortfall
|
||||
policy below are unchanged; earlier evidence does not certify the new order.
|
||||
|
||||
## Source and selected prototype policy — 24 October 2026
|
||||
|
||||
Publisher E2 physical p7 says CHOAM collects two spice per faction before
|
||||
|
||||
+38
-8
@@ -20,6 +20,32 @@ open mode gates.
|
||||
Keep identified Basic-function gaps ahead of Advanced and wider interactions.
|
||||
Prototype labels and final acceptance gates remain.
|
||||
|
||||
**Advanced Charity player order — 27 October. Prototyped / Partial.**
|
||||
New Advanced phases proceed from the First Player counterclockwise. Only the
|
||||
current seat may claim or Finish; CHOAM income and wealthy BG responses retain
|
||||
their original timing. Basic/old unstamped phases stay concurrent. A completed
|
||||
turn cannot reopen through Truthtrance; remaining future entitlement remains
|
||||
quotable, with executable guidance waiting for the actual owner. A native case
|
||||
found and repaired last-Finish evasion before a phase-opening interruption.
|
||||
|
||||
Frozen **15 affected files, 147/147**, types/lint/build and 4 fresh native
|
||||
start programmes pass: three explicit Advanced previews (allowed income,
|
||||
canceled income, canceled wealthy BG) and a Basic concurrent low-claim control.
|
||||
Runtime records 11 GameTable SSR, 26 claim-panel renders, 8 actual claim
|
||||
callbacks and 9 Finish callbacks. Recorded source/further arrays total
|
||||
101/30 across programmes. Original unopened deal/Spice positions and scalar
|
||||
lotteries are selected; actual bribes create poverty. Responses/card cancellation
|
||||
and closing packets use native actions directly, without a clicked-control claim.
|
||||
Nineteen new helper/native/control/Truth cases pass; old payment and Inflation
|
||||
sources now finish actual preceding turns. Sapho composition remains missing.
|
||||
|
||||
Proof: `/home/quintine/.local/share/dune/checkpoints/20261027-advanced-charity-order-proof-v4/`;
|
||||
journeys/HTML: adjacent `20261027-advanced-charity-order-runtime/run-v2/`.
|
||||
Passed tests/types/lint carry from v3 under an identical source hash; v4 repairs
|
||||
only a private smoke assumption about automatic uncontested BG resolution.
|
||||
The existing server returned HTTP200 without restart. Browser/deployed,
|
||||
complete modes and final assurance remain. [Contract](ADVANCED_CHARITY_ORDER.md).
|
||||
|
||||
**Ixian Advanced starting draft — 27 October. Prototyped / Partial.**
|
||||
Fresh Advanced setup with Harkonnen now includes its extra starting card in the
|
||||
original Ixian pool; both Harkonnen cards come from the shuffled remainder.
|
||||
@@ -46,14 +72,18 @@ Proof: `/home/quintine/.local/share/dune/checkpoints/20261027-ix-starting-pool-p
|
||||
journeys/HTML: adjacent `20261027-ix-starting-pool-runtime/run/`.
|
||||
[Source contract](IX_PROTOTYPE.md#advanced-starting-draft-source-cutover--27-october-2026).
|
||||
|
||||
**Next source-identified functions:** Advanced Charity's First Player claim
|
||||
order (supplied physical8), CHOAM's total-support rounding (physical29; final
|
||||
eligibility composition still needs its source check), and Family Atomics'
|
||||
full timing/sector/removal contract (physical39; the revision's stricter
|
||||
requirements remain Advanced-only after the bounded Basic source comparison).
|
||||
These are concrete remaining code/source divergences, not a complete rules
|
||||
audit. The bounded six-classic-faction pass found connected independent
|
||||
functions; optional modules, interactions and final acceptance remain open.
|
||||
**Next source-identified functions:** CHOAM's total-support rounding
|
||||
(supplied physical29 F) and Family Atomics' full timing/sector/removal contract
|
||||
(physical39; the revision's stricter requirements remain Advanced-only after
|
||||
bounded Basic comparison). The bounded CHOAM source comparison supports a
|
||||
rounding-only correction: retain eligible `support - allyPayment`, including
|
||||
Arrakeen's expressly sourced Bank contribution; preserve CHOAM-own/CHOAM-aid
|
||||
exclusions and free-force support. Aggregate before flooring; unrelated
|
||||
Banker/Bureaucrat per-invoice rulings stay distinct. This is next implementation,
|
||||
not a passed new effect. Charity Sapho composition waits for the interaction pass.
|
||||
These findings are concrete divergences, not a complete rules audit. The bounded
|
||||
six-classic-faction pass found connected independent functions; optional modules,
|
||||
interactions and final acceptance remain open.
|
||||
|
||||
**Native E3 trained capture — 27 October. Prototyped / Partial.**
|
||||
Fresh bare Advanced E3/all14 setups now connect Harkonnen with actual Ecaz
|
||||
|
||||
@@ -1,5 +1,32 @@
|
||||
# Dune implementation status
|
||||
|
||||
## 27 October 2026 — Ordered Advanced Charity
|
||||
|
||||
Prototyped / Partial. New Advanced phases proceed from the First Player counterclockwise. Only the
|
||||
current seat may claim or Finish; CHOAM income and wealthy BG responses retain
|
||||
their original timing. Basic/old unstamped phases stay concurrent. A completed
|
||||
turn cannot reopen through Truthtrance; remaining future entitlement remains
|
||||
quotable, with executable guidance waiting for the actual owner. A native case
|
||||
found and repaired last-Finish evasion before a phase-opening interruption.
|
||||
|
||||
Frozen **15 affected files, 147/147**, types/lint/build and 4 fresh native
|
||||
start programmes pass: three explicit Advanced previews (allowed income,
|
||||
canceled income, canceled wealthy BG) and a Basic concurrent low-claim control.
|
||||
Runtime records 11 GameTable SSR, 26 claim-panel renders, 8 actual claim
|
||||
callbacks and 9 Finish callbacks. Recorded source/further arrays total
|
||||
101/30 across programmes. Original unopened deal/Spice positions and scalar
|
||||
lotteries are selected; actual bribes create poverty. Responses/card cancellation
|
||||
and closing packets use native actions directly, without a clicked-control claim.
|
||||
Nineteen new helper/native/control/Truth cases pass; old payment and Inflation
|
||||
sources now finish actual preceding turns. Sapho composition remains missing.
|
||||
|
||||
Proof: `/home/quintine/.local/share/dune/checkpoints/20261027-advanced-charity-order-proof-v4/`;
|
||||
journeys/HTML: adjacent `20261027-advanced-charity-order-runtime/run-v2/`.
|
||||
Passed tests/types/lint carry from v3 under an identical source hash; v4 repairs
|
||||
only a private smoke assumption about automatic uncontested BG resolution.
|
||||
The existing server returned HTTP200 without restart. Browser/deployed,
|
||||
complete modes and final assurance remain. [Contract](ADVANCED_CHARITY_ORDER.md).
|
||||
|
||||
## 27 October 2026 — Source-aligned Advanced Ixian starting draft
|
||||
|
||||
Prototyped / Partial. Fresh Advanced setup with Harkonnen now includes its extra starting card in the
|
||||
|
||||
@@ -1,5 +1,17 @@
|
||||
# Rule decision index
|
||||
|
||||
## Advanced Charity player order — 27 October 2026
|
||||
|
||||
Supplied physical8/printed6 expressly begins Charity with the First Player and
|
||||
proceeds counterclockwise. New Advanced phases stamp that native order; only
|
||||
the current seat claims or finishes. CHOAM opening income and wealthy Bene
|
||||
Gesserit responses precede completion. Basic/old unstamped phases retain their
|
||||
procedure. Completed ordered turns cannot reopen through Truthtrance, while
|
||||
remaining owned future entitlements can still supply detached witnesses.
|
||||
The claim-then-Finish control is explicit software composition of the optional
|
||||
claim and printed order. Sapho composition and broader interactions remain.
|
||||
[Source, lifecycle and boundaries](ADVANCED_CHARITY_ORDER.md).
|
||||
|
||||
## Ixian starting draft with Harkonnen — 27 October 2026
|
||||
|
||||
Supplied Advanced physical34/printed32 A explicitly draws N+1 when Harkonnen
|
||||
|
||||
@@ -262,8 +262,12 @@ agreement must fit before the future phase and retain recipient restrictions.
|
||||
No chosen branch, timeline or prospective income is installed in a real game.
|
||||
|
||||
Bare, grouped, mixed and combined payment questions use guarded current-phase
|
||||
payment/Charity packets. Positive acceptance reopens owned Charity readiness;
|
||||
own Ready cannot forfeit the necessary claim. After an actual claim or phase
|
||||
payment/Charity packets. Positive acceptance reopens Basic/unstamped Charity
|
||||
readiness. The [new ordered Advanced phase](ADVANCED_CHARITY_ORDER.md) instead
|
||||
retains a remaining owned entitlement while guides wait for its real turn;
|
||||
completed turns cannot reopen. Own Finish checks commitments before advancing,
|
||||
including the last player whose Finish immediately opens another phase.
|
||||
Own Ready cannot forfeit the necessary claim. After an actual claim or phase
|
||||
expiry it cannot be reserved again. Cumulative No caps and original history
|
||||
persist. Four profiles consume legal guides; strategy and calibration remain
|
||||
deferred. Native phase controls handle waiting before the actual Charity phase.
|
||||
|
||||
Reference in new issue
Block a user