Counter incoming advisor matching before normal movement and shipment
Preserve residents and unused actions when one selected packet cannot match. Bind public matching receipts to private declarations and share packet-opportunity denials with legal bot filtering.
This commit is contained in:
Quintine committed
1 parent
abf0305ddf
commit
438a5692a6
14 files changed
+992
-10
No files matched your search
@@ -0,0 +1,97 @@
|
||||
# Matching incoming Bene Gesserit groups
|
||||
|
||||
## Normal movement and reserve shipment — 24 October 2026
|
||||
|
||||
**Prototyped / Partial.** The supplied revised
|
||||
Advanced rulebook physical28/printed26, E, explicitly marks its matching-type
|
||||
shipping/movement bullet with the Karama icon. Physical17/printed15 identifies
|
||||
the canceled operation as flipping one group to or from advisors. The same
|
||||
physical28 section requires a single BG type throughout each territory. The
|
||||
selected incoming packet matches the residents; this grants no permission to
|
||||
flip the resident group or leave mixed types after arrival.
|
||||
|
||||
An opposite-type ground group now receives a counter before physical movement.
|
||||
The packet may be a selected subset across sectors of its one origin. Existing
|
||||
same-type movement has no flip and no extra matching response. The source gives
|
||||
no fixed ordinary reserve side. Under the 14 October recommended policy,
|
||||
provisionally retain the existing normal-fighter shipment default: ordinary
|
||||
reserves joining resident advisors need matching, while reserves joining
|
||||
fighters are ordinary placement. Basic is unchanged.
|
||||
|
||||
Neither source specifies the remedy for preventing this mandatory matching.
|
||||
The selected provisional composition stops the one declaration before transfer,
|
||||
shipment payment or action use. Residents and the incoming packet keep their
|
||||
original location/type. Permit a legal replacement; do not invent a consumed
|
||||
shipment/movement or a turn-wide ban. Prevent the same packet from matching in
|
||||
that destination territory in the same owned opportunity. A different sector
|
||||
in that destination is not a new packet. A different packet/destination or
|
||||
later earned movement/turn is independent. Do not reuse the continuously-alone
|
||||
hold from [already committed conversions](ADVISOR_AUTOMATIC_FLIPS.md).
|
||||
|
||||
The public ten-field source selects a fresh event, kind, owner, turn, native
|
||||
movement index, origin, destination, sector, resident stance and selected
|
||||
physical group. The original order and its exact signature remain in a private
|
||||
parent. The shared pure quote owns current held groups, resident matching and
|
||||
scoped denial; existing native code retains route, fresh-advisor locks,
|
||||
occupancy, funding, card preparation and actual physical commitment. Consume
|
||||
the private parent before resuming the original CHOAM movement or normal
|
||||
shipment suffix once. Existing declaration card uses stay in their original
|
||||
state; no new refund is invented.
|
||||
|
||||
Humans retain the standard Karama/Allow controls, with a persistent explanation
|
||||
that this arrival has not happened. The personalized bot adapter uses the same
|
||||
pure quote to omit prevented packets, keeping only minimal legal participation.
|
||||
No strategic refinement or difficulty calibration is added.
|
||||
|
||||
[Native fixture](../tests/fixture-advisor-matching-move.ts) earns public Advanced
|
||||
BG/Atreides/Emperor setup with original base33 and Atreides' original Karama.
|
||||
BG's original advisor shares Arrakeen with ten Atreides. Actual first phases
|
||||
and declined preparation precede a real one-force shipment into empty Basin9
|
||||
for2, earning a separate fighter. Both directions between those original groups
|
||||
are actual movement declarations. The recorded pre-shipment prefix also owns
|
||||
a normal one-force reserve shipment into the Arrakeen advisors for1. No played
|
||||
force, phase, wallet, hand, stance or counter is installed.
|
||||
|
||||
[Connected cases](../tests/advisor-matching-engine.test.ts) cover both outcomes,
|
||||
unchanged precommit state, same-sector retry restraint, legal replacements,
|
||||
already-matching movement and original-parent mismatch. Frozen **19
|
||||
files244/244**, types/lint/build and seven native declaration/response/GameTable
|
||||
SSR journeys pass, alongside twelve existing-profile responses and twelve
|
||||
accepted legal replacements after prevention. Ground sources take34 actual
|
||||
actions; the original pre-shipment prefix takes33. Both ground directions and
|
||||
normal reserves preserve original residents and held packets while waiting.
|
||||
Allowance moves the selected counter once; normal shipment pays1 and spends
|
||||
its slot once. Prevention preserves forces, payment and the unused action,
|
||||
rejects the same packet/destination and permits the earned same-type sector
|
||||
reposition or an empty-territory shipment. Same-type movement creates no
|
||||
matching response and retains the original Karama.
|
||||
|
||||
The focused first native allowance and final frozen batch pass. Standard
|
||||
controls render; this is not a new callback/browser/mobile/deployed certificate.
|
||||
Private proof and original-source HTML:
|
||||
`/home/quintine/.local/share/dune/checkpoints/20261024-advisor-matching-groups/`.
|
||||
`frozen-integrated/report.json` binds tree
|
||||
`f1dc33ab54b8f74e98c7c6e7950fddf9dfd2a16cf0e4648cb2c0617cda23a061`,
|
||||
2752 files on base `abf0305ddfe6883f49b9f34c1d4e879c47dcf4f2`.
|
||||
Checkpoint prose/reference overlays are separately reviewed and hashed after
|
||||
proof. Existing-mode completeness, special relocation, Guild/Homeworld,
|
||||
Planetologist gathering and Spiritual Advisor matching remain open. No saved-
|
||||
room/D1, reset, restart or deployment operation was performed.
|
||||
|
||||
## Spiritual Advisor source cutover still due
|
||||
|
||||
Complete physical28 review also requires Polar Sink or decline when the
|
||||
original shipment destination retains BG fighters, unless Intrusion changes
|
||||
them first. Existing fighter-child ordering is provisional, not a specific
|
||||
user override of that destination restriction. Preserve Basic. Target
|
||||
availability must be shared by ordinary declarations, settlement, Guild
|
||||
Ambassador quotes, projected controls and bots; keep Homeworld resource quotes
|
||||
independent of destination legality.
|
||||
|
||||
The source does not expressly resolve the original destination itself being
|
||||
Polar Sink with resident fighters. The recommended provisional composition
|
||||
keeps the named Polar fallback and lets the incoming advisor packet match those
|
||||
fighters under its own precommit matching counter, after the distinct Spiritual
|
||||
Advisor shipping counter. The other faction's shipment is already committed
|
||||
and cannot be undone. That separate parent/projection integration is pending;
|
||||
this normal movement/shipment prototype does not certify it.
|
||||
@@ -16,6 +16,40 @@ open mode gates.
|
||||
|
||||
|
||||
## Current checkpoint and work
|
||||
**Matching incoming BG groups — 24 October. Prototyped / Partial.**
|
||||
Normal opposite-type ground arrivals and reserve-to-advisor shipments now offer
|
||||
Karama before physical transfer/payment. Supplied physical28 E explicitly marks
|
||||
matching; physical17 identifies one incoming packet. Residents never change.
|
||||
The ordinary reserve fighter default and precommit remedy are explicit
|
||||
provisional compositions. Prevention retains the unused action while denying
|
||||
that same packet/destination in the same opportunity; same-type movement needs
|
||||
no flip. A public receipt owns a private original order; consume the parent
|
||||
before one original movement/shipment suffix. Personalized legal bot filtering
|
||||
reuses the shared quote.
|
||||
[Source, normal native paths and limits](ADVISOR_MATCHING.md).
|
||||
|
||||
Disjoint helper/native-fixture lanes, complete-page source review and root
|
||||
integration pass **19 files244/244**, types/lint/build and seven native
|
||||
normal declaration/response/GameTable SSR journeys, with twelve existing-profile
|
||||
responses and twelve accepted replacements. Genuine34/33-action public Advanced
|
||||
base33 sources earn the original advisor, paid Basin fighter and original
|
||||
Karama. Both directions and normal shipment preserve state while waiting.
|
||||
Allowed shipment pays1 once; prevention keeps payment/action unused, rejects
|
||||
same-packet retry and admits the earned same-type or empty-territory replacement.
|
||||
No AI refinement, comprehensive/browser/deployed assurance or saved-room/D1/
|
||||
reset/restart/deployment operation. Wider transport, gathering and mode acceptance
|
||||
remain open.
|
||||
|
||||
Bounded complete-page review also identifies a remaining Advanced Spiritual
|
||||
Advisor source cutover: retained fighters at the original shipment destination
|
||||
require Polar Sink or decline unless Intrusion changes them first. Polar Sink
|
||||
fallback with resident fighters provisionally needs its own incoming matching
|
||||
counter after the distinct shipping counter. Ordinary/Guild Ambassador target
|
||||
quotes, projected choices and bots must share that restriction; do not apply
|
||||
it to ordinary paid shipments. That independent Spiritual-parent integration
|
||||
and special relocation/gather matching remain explicitly open after the normal
|
||||
arrival prototype. Full rule/mode acceptance is still unfinished.
|
||||
|
||||
**Special-relocation advisor conversion — 24 October. Prototyped / Partial.**
|
||||
Fremen Ambassador and Discovery free-entry transfers now capture surviving alone
|
||||
advisors before original arrivals. Preserve an empty Ambassador advisor arrival
|
||||
|
||||
@@ -1,5 +1,52 @@
|
||||
# Dune implementation status
|
||||
|
||||
## 24 October 2026 — Matching incoming advisor packets before arrival
|
||||
|
||||
Supplied physical28 E explicitly marks matching shipping/moving into resident
|
||||
BG forces as counterable; physical17 names the incoming group, not the
|
||||
residents. Normal opposite-type ground packets and ordinary reserves joining
|
||||
advisors now receive a precommit counter. Same-type movement has no flip.
|
||||
Ordinary reserves' fighter default is a stated provisional composition because
|
||||
the supplied source gives no fixed reserve side.
|
||||
|
||||
The source does not specify the remedy when matching is prevented. Under the
|
||||
14 October authority, stop only that declaration before transfer/payment/use,
|
||||
retain original resident/incoming types and allow a legal replacement. Deny
|
||||
the same packet/destination territory in the same owned opportunity; sector or
|
||||
response UUID changes cannot retry it. Different packets/destinations and later
|
||||
opportunities stay independent. Do not import a turn-wide ban, action loss or
|
||||
the continuously-alone hold. Already-played declaration cards retain original
|
||||
use. A strict public ten-field receipt selects physical matching facts; keep
|
||||
the exact original order/signature private and consume its parent before one
|
||||
original CHOAM movement or normal shipment suffix. Personalized minimal bots
|
||||
reuse the same quote to remove prevented packets.
|
||||
|
||||
Disjoint helper/native-fixture lanes, complete-page source review and root
|
||||
integration pass **19 files244/244**, types/lint/build and seven native
|
||||
normal declaration/response/GameTable SSR journeys, plus twelve existing-profile
|
||||
counter responses and twelve accepted replacement actions. Genuine34-action
|
||||
public Advanced BG/Atreides/Emperor base33 sources earn the original Arrakeen
|
||||
advisor and paid Basin fighter, retaining originally dealt Karama. The real
|
||||
33-action prefix owns normal reserve-to-advisor shipment. Both ground directions
|
||||
and shipment retain original board/funds/allowances while waiting. Allowance
|
||||
commits once; shipment pays1 once. Prevention leaves the unused action and
|
||||
payment, rejects the same packet and admits an earned same-type sector move
|
||||
or an empty-territory shipment. Same-type movement keeps the original Karama.
|
||||
No played force, phase, wallet, hand, stance or counter is installed.
|
||||
|
||||
The focused first native allowance and final frozen batch pass. Private proof:
|
||||
`/home/quintine/.local/share/dune/checkpoints/20261024-advisor-matching-groups/`.
|
||||
`frozen-integrated/report.json` binds tree
|
||||
`f1dc33ab54b8f74e98c7c6e7950fddf9dfd2a16cf0e4648cb2c0617cda23a061`,
|
||||
2752 files on base `abf0305ddfe6883f49b9f34c1d4e879c47dcf4f2`.
|
||||
Prose/reference overlays are separately reviewed/hashed. Standard controls render;
|
||||
no new callback/browser/mobile/deployed or complete-mode claim. Source review
|
||||
also identifies an Advanced Spiritual target cutover and its separate Polar
|
||||
matching parent still due; special relocation, Guild/Homeworld, gathering,
|
||||
complete modes and final assurance remain open. No strategic AI work or saved-
|
||||
room/D1/reset/restart/deployment operation.
|
||||
[Connected source and limits](ADVISOR_MATCHING.md).
|
||||
|
||||
## 24 October 2026 — Advisor conversion after independent relocation
|
||||
|
||||
Supplied physical17/28 E's counter now composes Fremen Ambassador and Discovery
|
||||
|
||||
@@ -1,5 +1,20 @@
|
||||
# Rule decision index
|
||||
|
||||
## Matching incoming advisor groups — 24 October 2026
|
||||
|
||||
Supplied physical28 E directly marks matching into resident BG forces as
|
||||
counterable; physical17 names one incoming group's flip. Residents retain their
|
||||
type. Opposite-type normal ground arrivals need a counter; same-type movement
|
||||
does not flip. Ordinary reserves have no printed fixed side, so using the
|
||||
existing normal-fighter default for reserve-to-advisor matching is explicit
|
||||
provisional composition. Preventing matching provisionally stops that arrival
|
||||
before transfer/payment/action use, while allowing a legal replacement. Prevent
|
||||
the same packet/destination in the same opportunity, not all flips for the turn
|
||||
or the continuously-alone duration. Existing card preparation retains its use.
|
||||
Spiritual destinations/matching and special transport/gather combinations remain
|
||||
separate open scope; do not certify them from these normal paths.
|
||||
[Exact source, contracts and outstanding Spiritual cutover](ADVISOR_MATCHING.md).
|
||||
|
||||
## Advisor conversion after special relocation — 24 October 2026
|
||||
|
||||
Compose supplied Advanced physical17/28 E with actual Fremen Ambassador and
|
||||
|
||||
Reference in new issue
Block a user