Connect native paired E2 Bureaucrat funding
This commit is contained in:
1 parent
c3d1896673
commit
b207dd0479
13 files changed
+998
-49
No files matched your search
@@ -66,13 +66,15 @@ The earlier question is now resolved by the 11 October ruling above.
|
||||
Gift classification stays separate from the connected ordinary
|
||||
[bribe controls](BRIBE_CONTROLS.md).
|
||||
|
||||
For native income, the prototype resolves the existing Karama income window
|
||||
For native income windows, the prototype resolves the existing Karama response
|
||||
first, then offers Bureaucrat before crediting the eligible recipient and
|
||||
continuing the original auction or shipment. A canceled income payment goes to
|
||||
the Bank, so creates no player-directed trigger. This is an outcome-based
|
||||
composition inference. The rulebook's skill-before-faction sentence occurs in
|
||||
its battle paragraph and does not expressly order this economic reaction.
|
||||
The implementation does not settle Bureaucrat-before-Karama consumption.
|
||||
Richese-directed auction proceeds use their original seller-credit callback;
|
||||
no additional Richese-income Karama window is invented.
|
||||
|
||||
In the Basic Tleilaxu skill profile, a paid revival first commits its force or
|
||||
leader custody and deducts the actual price. Its native income response still
|
||||
@@ -91,13 +93,13 @@ Allied funding is evaluated per actual payer, not by adding different payers'
|
||||
shares to create the five-spice trigger. A three-plus-three payment, or
|
||||
four-plus-three, has no eligible payer and proceeds through original funding,
|
||||
payment, card/force commitment and recipient income without a Bureaucrat offer.
|
||||
In supported classic profiles without Homeworlds, individually qualifying
|
||||
In supported classic and E2 profiles without Homeworlds, individually qualifying
|
||||
allied-funded auction and shipment receipts now offer one optional redirection:
|
||||
five-plus-three, three-plus-five, five-plus-five and fully ally-funded five.
|
||||
The receipt loses exactly two, never two per contributing payer. A share paid
|
||||
by the trainer or recipient cannot qualify, but does not mask a different
|
||||
eligible payer. Qualifying expansion-faction funding and split-recipient
|
||||
Homeworld income retain their separate integration guards.
|
||||
eligible payer. Qualifying E1/E3 funding and Homeworld allied/split-recipient
|
||||
composition retain their separate integration boundaries.
|
||||
Independent Karama shipments paid entirely to the Bank bypass player-income
|
||||
guards. A successful use remains tied to the physical card's turn and phase,
|
||||
including same-phase ownership changes; that accounting is an implementation
|
||||
@@ -172,6 +174,56 @@ The native fixtures and consumer cases are
|
||||
`tests/fixture-bureaucrat-qualifying-auction.ts` and
|
||||
`tests/bureaucrat-qualifying-auction.test.ts`.
|
||||
|
||||
## Native paired E2 receipts — 13 October 2026
|
||||
|
||||
`tests/fixture-bureaucrat-paired-funding.ts` uses original six-seat
|
||||
CHOAM/Richese/Harkonnen/Fremen/Emperor/Guild setup with fourteen skills and
|
||||
Nexus. CHOAM actually trains Bureaucrat. Real first-turn bribe3, Mentat
|
||||
Fremen3→6, next worm and mutual alliance retain every original army/wallet.
|
||||
Before pledges: C26/R5/H7 Basic or9 Advanced/F6/E10/G5 Basic or6 Advanced.
|
||||
Two before shipment programs and five original auction branches (ordinary/cache
|
||||
both modes, Advanced Black Market) rejected immutably at the earlier Bureaucrat
|
||||
module guard after actual F pledge5. The original paired E2 Nexus profile is
|
||||
now admitted without Homeworlds; allied support is centralized and preserves
|
||||
the other profile and printed-price constraints.
|
||||
|
||||
Ordinary auctions retain Emperor income cancellation; canceled gross goes to
|
||||
Bank with no offer/use. Richese cache and Advanced Black Market retain their
|
||||
actual seller-credit and bonus/closing callbacks, not an invented cancellation
|
||||
response. Basic still has no Black Market, and free Karama purchases remain
|
||||
normal-only. Owner/payee exclusion, donor-only five, sub-five nonpooling and
|
||||
sealed-bid privacy use the same private receipt policy as classic funding.
|
||||
|
||||
The actual Advanced five-plus-five Guild after program retains interception,
|
||||
original Karama allowance, H4/F1/C26/R5/E10/G6 before credit, then G14 on
|
||||
redirect with one use and ten original reserves deployed beside Carthag10.
|
||||
Its original Finish advances to Fremen. The actual Advanced five-plus-five
|
||||
cache after program credits R5→13, H4/F1, one Residual Poison purchase and
|
||||
one native bonus, then the original five-card normal pool at index0.
|
||||
Four parent actual programs also cover Basic ordinary and cache payments,
|
||||
Advanced wholly donor-funded Black Market and an actual trainer-funded
|
||||
nonqualifying cache payment. Two actual cache-last programs retain the pending
|
||||
CHOAM market, then original Done reaches Revival without another debit,
|
||||
purchase or use.
|
||||
|
||||
Three actual390px GameTable flows retain C26 and original forces: Advanced
|
||||
three-plus-five Guild redirects2, G6→12/H6/F1, Finish→Fremen; Basic five-plus-three
|
||||
cache allows8, R5→13/H2/F3, one purchase/bonus and original normal lot0; Advanced
|
||||
fully F-funded Black Market redirects2, R5→8/H9/F1, one transferred original
|
||||
card/bonus and original Richese declaration. Its actual cache-first control
|
||||
reaches original cache selection without another cost. Browser errors are empty.
|
||||
Artifact outside Git: `/tmp/dune-paired-bureaucrat-3226.json`.
|
||||
|
||||
The frozen consumer union157/157 across eight files passes. Initial feedback
|
||||
removed an incorrect direct-to-Revival pin and replaced it with actual original
|
||||
closing progression. An exact sealed-log comparison wrongly coupled independent
|
||||
public Storm bidder order; that incidental pin is removed, not re-pinned.
|
||||
Private receipt fields and actual payment/acquisition outcomes remain checked.
|
||||
One fixture event narrowing is repaired. A bare-not-throw/shared-gate echo
|
||||
case is removed from the affected CHOAM integration file. No source rule,
|
||||
strategy, Homeworld funding, public-start, save/deployed or complete-mode claim
|
||||
is changed by this bounded proof.
|
||||
|
||||
## Saved choices and verification
|
||||
|
||||
Only the skill owner may redirect or allow the current payment. The saved event
|
||||
|
||||
@@ -29,6 +29,32 @@ optional skill bands, combinations and public expansion starts remain open.
|
||||
Rules implementation continues; comprehensive assurance and administration
|
||||
remain deferred until all rules are implemented.
|
||||
|
||||
**Bureaucrat / native paired E2 funding — 13 October.**
|
||||
Original six-seat CHOAM/Richese/Harkonnen/Fremen/Emperor/Guild Skills Nexus
|
||||
now admits qualifying allied normal/cache/Advanced Black Market and shipment
|
||||
receipts without Homeworlds. Native CHOAM trains Bureaucrat; real bribe3/Mentat,
|
||||
next worm and mutual alliance retain original armies and C26/R5/H7 Basic or9
|
||||
Advanced/F6/E10/G5 Basic or6 Advanced before pledges. Two shipment and five
|
||||
source-specific auction before programs rejected immutably at the earlier
|
||||
module guard. Existing native E2 profile and centralized allied support now
|
||||
connect original full costs, one flat2, private receipt fields and four legal bots.
|
||||
Native Guild/Emperor cancellation stays first; Richese proceeds use original
|
||||
seller credit with no invented cancellation. Basic no-Black-Market and normal-only
|
||||
free Karama purchase boundaries remain. E1/E3 and Homeworld funding stay separate.
|
||||
Three actual390px flows: Advanced3+5 Guild redirect G12/H6/F1/C26 and original
|
||||
Finish→Fremen; Basic5+3 cache allowance R13/H2/F3/C26, one purchase/bonus and
|
||||
normal lot0; Advanced wholly F-funded5 Black Market redirect R8/H9/F1/C26,
|
||||
one transfer/bonus then original declaration/cache-first selection, no extra cost.
|
||||
Artifact: `/tmp/dune-paired-bureaucrat-3226.json`; browser errors empty.
|
||||
Four parent actual source programs and two actual cache-last closings retain
|
||||
original CHOAM market→Revival, no additional debit/purchase/use. Final157/157
|
||||
across eight files pass. Initial direct-to-Revival and exact sealed-log order
|
||||
pins were removed, not re-pinned; independent public Storm order is not private
|
||||
funding. A fixture narrowing is repaired; one shared-gate/bare-not-throw echo
|
||||
case is removed. No rule, strategy, save/deployed/full-mode claim follows.
|
||||
Final types/lint and app build pass after removing the unused offer-initializer
|
||||
import left by that obsolete case. Existing build warnings are unchanged.
|
||||
|
||||
**Bureaucrat / qualifying classic allied receipts — 13 October.**
|
||||
Original Basic/Advanced five-plus-three, three-plus-five, five-plus-five and
|
||||
fully ally-funded five auction/shipment payments now offer one two-spice Bank
|
||||
|
||||
@@ -1,5 +1,69 @@
|
||||
# Dune implementation status
|
||||
|
||||
## 13 October 2026 — native paired E2 Bureaucrat funding
|
||||
|
||||
The earlier mode guard excluded genuine paired E2 Nexus skill games before
|
||||
their allied-funding guard. Existing original paired CHOAM/Richese Nexus
|
||||
profile is now admitted specifically without Homeworlds; allied funding
|
||||
support is centralized for supported classic or E2 profiles. Source receipts,
|
||||
single-payer signatures, physical card use and private projection are unchanged.
|
||||
Qualifying E1/E3 and Homeworld allied/split-recipient composition stay separate;
|
||||
no new public start, constructor prerequisite or recovery certification follows.
|
||||
|
||||
The new common fixture retains all native six-seat setup armies and wallets:
|
||||
C26/R5/H7 Basic or9 Advanced/F6/E10/G5 Basic or6 Advanced before actual pledges.
|
||||
Native C actually trains Bureaucrat; actual H→F bribe3, first Mentat F3→6,
|
||||
second worm and mutual alliance precede T2 funding. Only original unplayed
|
||||
cards/entropy/custody are controlled. Both shipment before programs and five
|
||||
auction before branches (normal/cache both modes, Advanced Black Market)
|
||||
rejected immutably after pledge5 at the original mode guard. The auction
|
||||
program initially expected the later funding guard; its expectation was wrong,
|
||||
and the final actual branches identify the earlier message rather than invent
|
||||
a different rejection.
|
||||
|
||||
One genuine Advanced5+5 Guild after program retains original interception,
|
||||
Karama allowance and payment order: C26/R5/H4/F1/E10/G6 before credit, G14
|
||||
after redirect, one use, original ten reserves at Habbanya17 beside Carthag10,
|
||||
then original Finish→Fremen. One Advanced5+5 silent cache after program uses
|
||||
the actual Richese seller-credit callback: H4/F1/R5→13/E10/C26; Residual Poison
|
||||
once plus native treachery-7 bonus, then original five-card normal pool index0.
|
||||
No Richese-income Karama window is fabricated. Ordinary Emperor cancellation
|
||||
banks the original gross; free Karama purchases stay normal-only, and Basic
|
||||
has no Black Market.
|
||||
|
||||
Four parent actual programs additionally cover Basic ordinary5+3 and cache3+5
|
||||
redirection, Advanced entirely F-funded5 Black Market allowance and a real
|
||||
H/C alliance where only excluded trainer5 funds an H3 cache payment.
|
||||
That last payment proceeds with no offer/use, C21/R13/H6/F6, one purchase/bonus.
|
||||
Two real last-cache programs preserve pending CHOAM market and actual Done:
|
||||
Revival4, R13/H2 Basic or4 Advanced/F1/C26, unchanged purchase/bonus, one prior
|
||||
use and renewed phase opportunity; no phase assignment or second debit occurs.
|
||||
|
||||
Three actual390px GameTable flows start after actual native commitment.
|
||||
Advanced Guild3+5 resolves printed allowance then redirect: G6→12/H6/F1/C26,
|
||||
eight reserves at Habbanya17, original Finish→Fremen. Basic cache5+3 allows8:
|
||||
R5→13/H2/F3/C26, original Residual Poison and one bonus, original normal lot0/R.
|
||||
Advanced wholly donor-funded5 Black Market redirects2: R5→8/H9/F1/C26,
|
||||
one original treachery-1 transfer and bonus7; original Richese declaration
|
||||
then actual cache-first control reaches cache selection without another cost.
|
||||
Browser errors are empty; artifact `/tmp/dune-paired-bureaucrat-3226.json`.
|
||||
Only owned isolated host/tab/scaffold is cleaned; existing games/services remain.
|
||||
|
||||
Initial frozen union157 cases had155 pass and two incorrect direct-to-Revival
|
||||
pins fail: original CHOAM market remains pending. The incidental pin is deleted,
|
||||
and that same consumer path now completes real closing with money/cards/use
|
||||
assertions. One fixture event narrowing is repaired; focused two-case iteration
|
||||
and types pass. The next union exposed an exact sealed-log comparison coupled
|
||||
to independent public Storm bidder order (156/157). It is removed, not re-pinned;
|
||||
private gross/payee/null-payer fields and actual acquisition/payment remain
|
||||
checked. Focused sealed privacy1/1 and final157/157 across eight files pass.
|
||||
The affected old shared-gate/bare-not-throw echo test and its dead imports are
|
||||
removed rather than replaced with another wiring assertion.
|
||||
Final types/lint and app build pass. The first lint run found the unused offer
|
||||
initializer left by that removed case; the import is deleted. Existing module
|
||||
registration deprecation, chunk-size and static route-classification warnings
|
||||
remain unchanged. The app guide and source-ruling boundary match this scope.
|
||||
|
||||
## 13 October 2026 — qualifying classic allied Bureaucrat receipts
|
||||
|
||||
Supported classic no-Homeworlds auction and shipment funding now retains each
|
||||
|
||||
@@ -400,7 +400,7 @@ dedicated retrieved worked FAQs. [Contract and remaining limits](HOMEWORLD_OCCUP
|
||||
| Smuggler shipping | Optional free companion is included in the actual total; apply Guild rounding to the reduced priced count. Ordinary Fremen reserves are on planet. The officially permitted owned No-Field plus a separate free force is now prototyped at the unchanged one-marker price. Legacy unstamped ordinary declarations keep their quoted full price. | [Ordinary contract](SMUGGLER_SHIPMENT.md), [No-Field combination](SMUGGLER_NO_FIELD.md) |
|
||||
| Sandmaster movement | One optional board spice per distinct entered territory; source-only repositioning earns none. Per-movement Hajr reset is a documented grammatical inference. Canceled moves earn nothing. Native Fremen worm rides and physical Fremen Ambassador relocations collect optionally at the destination before arrival reactions, without an invented intermediate route. Owned one-pile-per-territory allocation now covers ground, direct destinations and native HMS relocation; sector allocation remains provisional and concealed No-Field movement stays separate. | [Ground/direct/HMS relocation](SANDMASTER_MOVEMENT.md), [worm rides](SANDMASTER_WORM.md) |
|
||||
| Diplomat defense | A committed Worthless copies the opponent's canonical printed defensive role: base/Ix Shield/Snooper, hybrid, defensive Weirding/Chemistry or sealed Portable. Named combat distinctions remain. Copying the used role, not activation or own-slot prerequisites, is a visibly qualified first version. Reveal-before-traitor timing and mandatory disposal remain implementation interpretations; existing base-only battle windows are not reopened. Late/mirror/numeric modifications remain separate. | [Source and connected prototype](DIPLOMAT_DEFENSE.md) |
|
||||
| Bureaucrat payments | Once per phase, optionally divert two when one third-party payer pays at least five; payer cost is unchanged. Different below-five allied shares never pool. Supported classic no-Homeworlds auction/shipment funding, including a fully qualifying ally, now offers one gross-receipt redirection; private shares and selected qualifying payer remain withheld. Owner/payee contributions cannot qualify but do not mask a different eligible payer. Bribes trigger at transfer to the shield, not later collection. Native income follows Karama allowance as an outcome-based inference; canceled gross income creates no offer/use. Qualifying expansion-faction funding, split recipients and remaining payment families need further integration. | [Source and connected boundary](BUREAUCRAT_PAYMENTS.md) |
|
||||
| Bureaucrat payments | Once per phase, optionally divert two when one third-party payer pays at least five; payer cost is unchanged. Different below-five allied shares never pool. Supported classic/E2 no-Homeworlds ordinary and Richese-source auctions/shipment funding, including a fully qualifying ally, offer one gross-receipt redirection; private shares and selected qualifying payer remain withheld. Owner/payee contributions cannot qualify but do not mask a different eligible payer. Bribes trigger at transfer to the shield, not later collection. Existing Guild/Emperor income follows Karama allowance as an outcome-based inference; canceled gross creates no offer/use. Richese uses its original seller-credit callback, not an invented income cancellation. Qualifying E1/E3 funding, Homeworld split recipients and remaining payment families need further integration. | [Source and connected boundary](BUREAUCRAT_PAYMENTS.md) |
|
||||
| Leader battle effects | Rihani normal peek and reshuffle precede a separate committed optional draw; ordering is an explicit printed-order inference. Unused excludes actual calls, not mere disclosure. Mentat/Bureaucrat change scores; Sandmaster adds board spice. Owned multi-pile Smuggler debits and Sandmaster victory placement are connected under provisional allocation policies; modifier and exceptional Face Dancer composition remain separate. | [Source contract and prototype](LEADER_BATTLE_EFFECTS.md), [Smuggler allocation](SMUGGLER_BATTLE.md) |
|
||||
| Source and readiness | Separate published rules, explicit implementation choices and unfinished interpretations; Advanced/expansion gates stay closed. | [Base/Advanced audit](BASE_ADVANCED_READINESS_20260907.md), [checklist](../game/reference.ts) |
|
||||
| Setup and Fremen movement | Preserve source-ordered setup and the distinct declared-movement cancellation; do not recreate fixed historical gaps. | [Setup contract](ADVANCED_SETUP_TEST_SEAM.md), [Fremen Karama](FREMEN_MOVEMENT_KARAMA_RULES.md) |
|
||||
|
||||
Reference in new issue
Block a user