Round CHOAM income after totaling eligible support
This commit is contained in:
1 parent
54787c7f7b
commit
dff0c77a5b
8 files changed
+161
-26
No files matched your search
@@ -0,0 +1,50 @@
|
||||
# CHOAM total support income
|
||||
|
||||
27 October 2026. **Prototyped / Partial.** The adopted Advanced source,
|
||||
supplied physical29/printed27 F, gives CHOAM half the total eligible support
|
||||
spice with one final rounding down. Two other combatants supporting with3 and5
|
||||
therefore yield4, and3 plus3 yield3. Earlier per-combatant flooring underpaid
|
||||
those battles. See the [source authority](RULE_DECISIONS.md#authorized-source-amendment--1-october-2026).
|
||||
|
||||
This correction changes aggregation only. Each non-CHOAM side still contributes
|
||||
`plan.support - plan.allyPayment`. That includes its own debit and the Arrakeen
|
||||
Bank contribution. Publisher E2 physical/printed10's Arrakeen Q&A explicitly
|
||||
includes the Bank's two support spice; replacing eligibility with wallet debits
|
||||
would incorrectly remove that benefit. The
|
||||
[publisher E2 book](https://www.gf9games.com/dune/wp-content/uploads/2021/11/CHOAM-Rulebook-low-res.pdf#page=10)
|
||||
supplies that omitted detail. No combined publisher worked example for every
|
||||
subsidy/funding mixture is claimed.
|
||||
|
||||
CHOAM's own side remains excluded. CHOAM-funded allied support goes entirely to
|
||||
the Bank under supplied G. Salusa free Sardaukar, Fremen free support, fixed
|
||||
Homeworld strength and separate Banker strength spending add no paid support.
|
||||
The current native pledge admits only a mutual CHOAM donor; future third-party
|
||||
funding or generic discounts are not certified by this correction. Existing
|
||||
Banker/Bureaucrat per-payer/per-invoice rulings remain separate.
|
||||
|
||||
The shared `game/battle-resolution-quote.ts` calculation supplies the original
|
||||
engine settlement. Native wallet debits, escrow, casualty/card cleanup, any
|
||||
revealed-Traitor suppression, explosion income, Karama redirection and once-only
|
||||
collection keep their paths. Basic has no Advanced force-payment income.
|
||||
Already queued income retains its recorded receipt; no saved field, migration,
|
||||
recalculation of settled payments or collection confirmation is added.
|
||||
|
||||
Focused quote and actual engine payment regressions cover odd totals. Runtime
|
||||
verification uses a clearly labelled controlled battle source with real native
|
||||
plan, Traitor, response and market actions; it is not a fresh setup/full-game
|
||||
claim. Full modes, wider compositions, comprehensive assurance and deployed
|
||||
acceptance remain open.
|
||||
|
||||
Frozen **4 affected files, 71/71**, types/lint/build and two controlled battle
|
||||
programmes pass. 13 actual native packets and 6 GameTable SSR renders verify
|
||||
one automatic4 receipt and one pending/canceled4 receipt, unchanged3/5 debits,
|
||||
original pending response text and once-only closing behavior. The explicit
|
||||
controlled fixture assigns phase, purses, armies and leader strength; it is not
|
||||
a genuine starting-game journey. No control callbacks are operated. Quote and
|
||||
engine regressions cover3+5/3+3; the existing subsidy, aid, own support, free
|
||||
support, Traitor, explosion and cancellation cases remain in the related union.
|
||||
|
||||
The existing server returned HTTP200 without restart. No saved-game/database operation.
|
||||
Proof: `/home/quintine/.local/share/dune/checkpoints/20261027-choam-support-income-proof-v1/`;
|
||||
HTML/journeys: adjacent `20261027-choam-support-income-runtime/run/`.
|
||||
Full modes, broader combinations and final assurance remain open.
|
||||
+29
-12
@@ -20,6 +20,29 @@ open mode gates.
|
||||
Keep identified Basic-function gaps ahead of Advanced and wider interactions.
|
||||
Prototype labels and final acceptance gates remain.
|
||||
|
||||
**CHOAM total support income — 27 October. Prototyped / Partial.**
|
||||
Advanced income now adds eligible support before rounding down once:3+5 yields4
|
||||
and3+3 yields3. Original `support - allyPayment` eligibility retains Arrakeen's
|
||||
Bank contribution and CHOAM-own/ally exclusions. Payments, free support, Traitor
|
||||
suppression, native aftermath and Karama paths are unchanged; this is separate
|
||||
from Banker/Bureaucrat per-invoice rules. Already queued receipts retain their
|
||||
recorded amounts. [Source and scope](CHOAM_SUPPORT_INCOME.md).
|
||||
|
||||
Frozen **4 affected files, 71/71**, types/lint/build and two controlled battle
|
||||
programmes pass. 13 actual choose/plan/Traitor/response/closing packets and
|
||||
6 GameTable SSR renders verify automatic4 once and cancelable4 with unchanged
|
||||
combatant debits3/5. The existing unit source assigns phase/wallets/forces and
|
||||
zero-strength leaders, with a conserved original Karama in one case; this is
|
||||
explicitly controlled evidence, not native original setup/full-game proof.
|
||||
No control callbacks are claimed. New quote/engine odd-total regressions retain
|
||||
the original subsidy, aid, Traitor, explosion and free-support scenarios.
|
||||
|
||||
The existing server returned HTTP200 without restart. No database or saved-game
|
||||
operation. Full modes, wider compositions and final rules/recovery/privacy/
|
||||
browser/deployed acceptance remain. Proof:
|
||||
`/home/quintine/.local/share/dune/checkpoints/20261027-choam-support-income-proof-v1/`;
|
||||
journeys/HTML: adjacent `20261027-choam-support-income-runtime/run/`.
|
||||
|
||||
**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
|
||||
@@ -72,18 +95,12 @@ 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:** 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.
|
||||
**Next source-identified function:** Family Atomics' full timing/sector/removal
|
||||
contract (supplied physical39). The revision's stricter requirements remain
|
||||
Advanced-only after bounded Basic comparison. Charity Sapho composition remains
|
||||
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,29 @@
|
||||
# Dune implementation status
|
||||
|
||||
## 27 October 2026 — CHOAM aggregate support rounding
|
||||
|
||||
Prototyped / Partial. Advanced income now adds eligible support before rounding down once:3+5 yields4
|
||||
and3+3 yields3. Original `support - allyPayment` eligibility retains Arrakeen's
|
||||
Bank contribution and CHOAM-own/ally exclusions. Payments, free support, Traitor
|
||||
suppression, native aftermath and Karama paths are unchanged; this is separate
|
||||
from Banker/Bureaucrat per-invoice rules. Already queued receipts retain their
|
||||
recorded amounts. [Source and scope](CHOAM_SUPPORT_INCOME.md).
|
||||
|
||||
Frozen **4 affected files, 71/71**, types/lint/build and two controlled battle
|
||||
programmes pass. 13 actual choose/plan/Traitor/response/closing packets and
|
||||
6 GameTable SSR renders verify automatic4 once and cancelable4 with unchanged
|
||||
combatant debits3/5. The existing unit source assigns phase/wallets/forces and
|
||||
zero-strength leaders, with a conserved original Karama in one case; this is
|
||||
explicitly controlled evidence, not native original setup/full-game proof.
|
||||
No control callbacks are claimed. New quote/engine odd-total regressions retain
|
||||
the original subsidy, aid, Traitor, explosion and free-support scenarios.
|
||||
|
||||
The existing server returned HTTP200 without restart. No database or saved-game
|
||||
operation. Full modes, wider compositions and final rules/recovery/privacy/
|
||||
browser/deployed acceptance remain. Proof:
|
||||
`/home/quintine/.local/share/dune/checkpoints/20261027-choam-support-income-proof-v1/`;
|
||||
journeys/HTML: adjacent `20261027-choam-support-income-runtime/run/`.
|
||||
|
||||
## 27 October 2026 — Ordered Advanced Charity
|
||||
|
||||
Prototyped / Partial. New Advanced phases proceed from the First Player counterclockwise. Only the
|
||||
|
||||
@@ -1,5 +1,15 @@
|
||||
# Rule decision index
|
||||
|
||||
## CHOAM total support rounding — 27 October 2026
|
||||
|
||||
Supplied Advanced physical29/printed27 F calls for half the total eligible
|
||||
force-support spice, rounded down once. Move the floor outside the existing
|
||||
non-CHOAM `support - allyPayment` sum. Retain Arrakeen's publisher-confirmed Bank
|
||||
contribution, CHOAM's own/ally exclusions, free support and original payment/
|
||||
Traitor/cancellation paths. This is the adopted source correction, distinct
|
||||
from existing Banker/Bureaucrat per-invoice rulings. Wider hypothetical funding
|
||||
and discount combinations remain unverified. [Source and scope](CHOAM_SUPPORT_INCOME.md).
|
||||
|
||||
## Advanced Charity player order — 27 October 2026
|
||||
|
||||
Supplied physical8/printed6 expressly begins Charity with the First Player and
|
||||
|
||||
Reference in new issue
Block a user