Support whole AND/OR future ground moves

This commit is contained in:
Quintine committed 2026-10-26 16:09:35 +11:00
1 parent 0e3c155876
commit d524642b65
20 files changed
+1803 -63

No files matched your search

+32
View File
@@ -16,6 +16,38 @@ open mode gates.
## Current checkpoint and work
**Truthtrance / whole AND/OR ground moves — 26 October. Prototyped / Partial.**
Full grouped questions now combine future physical ground-group minima at
printed Arrakis destinations. Maximum-per-destination progress never sums
smaller moves. Whole No retains all legal alternatives; the shared owned-action
search handles scalar/whole claims and real Hajr/other preparations. Actual
commitment, native counters, earlier funding and accepted release order remain.
Full authoring, private answers, own progress, exact nested event/phase guide
and four minimal profiles are connected. Online interval/search composition
stays provisional; modes and optional-module gates remain open.
Root integration with disjoint pure/search,control and native lanes passes
**22 files,177/177**, types/lint/build and **eight native paths**,33 GameTable SSR
renders/12 actual guide callbacks plus one editor callback followed by native
Ask. Original Basic20/Advanced23-action base33 sources add8: actual move/Hajr/
move completes AND and consumes that physical Hajr once. Edited OR accepts the
manual alternate route. No AND permits one qualifying move; No OR blocks either.
Two real one-force moves place2 at Basin but keep maximum1. A13-action Charity
source adds14 through actual phases/paid shipment and later ground moves.
Original Advanced Fremen27 adds8: pending range records nothing, then the actual
elite commits and fulfills. All33 original cards remain physical.
Eleven pure,five search-adapter,eight controlled and13 native cases retain
full-tree validation, real entitlements, prior exclusion, exact wire/stale
nested actions and four policies. One fixture-only String conversion resolves
lint feedback before the passing frozen v2 batch. Proof/manifest:
`/home/quintine/.local/share/dune/checkpoints/20261026-truth-movement-expression-proof-v2/`;
journeys/HTML: adjacent `20261026-truth-movement-expression-runtime/`.
No saved-game/database/server/reset/restart/deployment operation is performed.
Cross-family/current-fact expressions, wider optional/faction/card compositions,
browser/mobile/deployed and final assurance remain required.
[Authority, interval and evidence](TRUTHTRANCE_MOVEMENT_EXPRESSIONS.md).
**Truthtrance / whole AND/OR ordinary payments — 26 October. Prototyped / Partial.**
Full grouped questions now combine named cumulative future ordinary payments.
Whole No uses De Morgan; legal routes remain dynamic after actual payments.
+46
View File
@@ -1,5 +1,51 @@
# Dune implementation status
## 26 October 2026 — Whole AND/OR future ground moves
**Prototyped / Partial.** Full grouped questions bind actual future physical
movement minima at named printed Arrakis destinations. One group must meet a
leaf; maximum progress never adds smaller moves. Whole No negates the complete
expression. The existing owned-action search jointly retains scalar/whole
obligations, dynamic alternatives, original allowances and real preparations.
No question grants a move or fulfills through shipment, marker, HMS relocation
or Ambassador relocation. Physical advisors/elites retain native counting.
Pending range decisions record no event until actual physical commitment.
Full16/depth4 editing, guarded preview/Ask, target-only answers, own maximum
progress and exact event/phase native guides connect to the table/four minimal
policies. Nested force records compare by content over JSON transport. Native
Hajr timing and earlier funding/card preservation remain. New scalar and whole
movement questions share accepted release order; old unstamped records precede
new ones. No closes at actual owner finish; Yes cannot evade by Finish. The
source-backed general AND/OR authority and provisional online interval/search
composition remain explicit; no complete-mode gate opens.
Root integration with disjoint pure/search,control and native lanes passes
**22 files,177/177**, types/lint/build and **eight native paths**,33 actual
GameTable SSR renders/12 guide callbacks plus one editor meaning callback then
native Ask. Genuine base33 Basic20/Advanced23-action prefixes add8: real move,
physical Hajr and second move fulfill the whole AND. OR accepts a manually
chosen alternate destination. No AND permits one qualifying move and rejects
both; No OR rejects either. Two actual one-force moves leave2 tokens at Basin
but maximum1, so no two-force leaf is fulfilled. Earlier Charity13 adds14 actual
phase/readiness/shipment/movement steps. Advanced Fremen27 adds8: a live range
response preserves original forces/progress, then actual elite commitment
fulfills. All33 original cards remain physical. Four policies actually answer
and complete AND on both Basic/Advanced sources.
Eleven pure,five adapter,eight controlled and13 native cases include strict
validation, max-versus-sum, actual Hajr, unavailable second entitlement, prior
exclusion, optimistic OR/prior-progress bounds, wire/stale nested guides and
actual native counters. Initial quick passes types then flags one test-fixture
template conversion; String(sector) repairs lint before the frozen v2 batch.
Proof/report/manifest:
`/home/quintine/.local/share/dune/checkpoints/20261026-truth-movement-expression-proof-v2/`;
journeys/HTML: adjacent `20261026-truth-movement-expression-runtime/`.
No saved-game/database/server/reset/restart/deployment operation is performed.
Dedicated wider funding/cross-family/current-fact/module composition, final
rules/recovery/privacy/custody and browser/mobile/deployed acceptance remain.
[Contract](TRUTHTRANCE_MOVEMENT_EXPRESSIONS.md).
## 26 October 2026 — Whole AND/OR ordinary-bribe commitments
**Prototyped / Partial.** A full grouped question binds actual cumulative future
+12
View File
@@ -1,5 +1,17 @@
# Rule decision index
## Whole AND/OR future ground moves — 26 October 2026
Compose the recorded publisher November2020 FAQp8 current-turn/AND/OR authority
and supplied Advanced physical39 Truthtrance compliance/release text with the
existing ordinary ground-movement interval. Each leaf requires one actual
future physical group, not cumulative smaller moves; maximum progress records
that event. Whole No negates the complete expression. Native owned entitlements,
Hajr timing, preparations, counter responses and earlier funding remain.
The online opportunity interval/search/accepted-order release composition stays
provisional under standing14October priority. No mode or publication gate opens.
[Contract and evidence](TRUTHTRANCE_MOVEMENT_EXPRESSIONS.md).
## Whole AND/OR ordinary bribe payments — 26 October 2026
Apply publisher November2020 FAQp8 current-turn/AND/OR authority and supplied
+113
View File
@@ -0,0 +1,113 @@
# Truthtrance combined future ground moves
## Whole AND/OR prototype — 26 October 2026
**Prototyped / Partial.** A structured question combines future ordinary
physical ground moves to printed Arrakis territories. The packet is
`{kind:'movementExpression',target,turn,claim}`. Native Basic/Advanced phases0–5
use the same quiet unused opportunity and owned preparations as
[scalar movement](TRUTHTRANCE_MOVEMENT_PROMISES.md). No start gate opens.
## Authority and provisional event meaning
The recorded [nonbattle source audit](TRUTHTRANCE_NONBATTLE_READINESS_20260907.md#source-basis)
identifies publisher [November2020 FAQp8](https://www.gf9games.com/dune/wp-content/uploads/2020/11/Dune-FAQ-Nov-2020.pdf)
current-turn commitments and AND/OR authority. Supplied Advanced physical39/
printed37 Truthtrance errata records public answers, compliance, later
impossibility and unknown/save. Neither supplies an online solver. The existing
owned-action, ordinary-opportunity interval and accepted-order release remain
provisional composition under standing14October choose-recommended priority.
A leaf requires one actual matching physical ground group after this answer.
Repeated same-destination leaves share the largest qualifying future group.
Smaller separate moves never add together, even if the same tokens move twice.
Prior moves are excluded. AND requires all children; OR at least one. **No
negates the whole expression.** No to A AND B may permit either first group,
while No to A OR B forbids either qualifying group. No route is stored.
The native committed event owns the physical amount: each elite/advisor retains
its native physical counting, while a concealed No-Field marker contributes0.
Shipment may prepare but cannot fulfill a movement leaf. HMS relocation and
Ambassador relocation are separate producers. A pending Fremen/Ixian/CHOAM
range response records nothing until the real movement is committed; prevention
retains its native physical result and may release later impossibility.
Actual nonmatching destinations remain legal, including native HMS moves;
question leaves and recorded maxima remain printed Arrakis destinations.
## Search, funding and usable controls
`game/movement-expression-promises.ts` parses every subtree, evaluates the
whole answer and immutably records maximum-per-destination physical progress.
Sixteen leaves/depth4 are software input limits, not printed limits on questions.
`game/movement-promise-search.ts` jointly searches scalar and whole obligations,
including actual owned Hajr/Ornithopter/Ghola/Box/Kulon/native preparation paths.
It checks whole No before projected movement, includes whole progress in memo
state, and cannot finish while a positive whole answer remains incomplete.
Optimistic bounds never discard an OR because a different leaf is impossible,
or forget a leaf already fulfilled before later force losses.
The engine uses that same search for answers, own voluntary spending/card
preservation, current private guides and completed opposing impossibility.
Existing battle/bid/bribe/revival/shipment commitments keep their original
budgets. Accepted order is shared across new scalar and whole movement answers;
older unstamped scalar records precede new ones. No closes only at the actual
owner opportunity finish; Yes cannot evade by Finish. Earlier Charity/Revival
readiness reopens for original owned preparation. An answer moves nothing early
and grants no new movement entitlement. Advanced Hajr keeps its immediate
post-movement/required-arrival timing.
The full controlled editor adds/wraps/nests/removes/collapses groups and repairs
invalid numeric/destination drafts. Preview and native Ask keep the full tree.
Target-only answers, own maximum progress and one exact phase/event guide
connect to the real table and all four minimal policies. Nested force records
are compared by content across JSON transport; key order is immaterial. Stale,
modified or foreign guides reject. An alternative legal OR route may be moved
manually. The legacy scalar panel supplies the shared guide when both ledgers
exist, avoiding duplicate visible actions. AI strategy/calibration stay deferred.
## Evidence and remaining gates
Pure/search cases: `tests/movement-expression-promises.test.ts`.
Controlled editor/guide cases: `tests/truth-movement-expression-controls.test.tsx`.
Original native sources/cases: `tests/fixture-truth-movement-expression.ts` and
`tests/truth-movement-expression-runtime.test.ts`. Eleven pure,five search
adapter,eight controlled and13 native cases are included in the frozen
**22-file,177/177** union. Types/lint, production build and eight native paths
pass on the same unchanged source. Actual GameTable SSR renders33 times;
12 actual guide callbacks submit native packets. One actual editor meaning
callback retains the full tree through native Ask. Four minimal policies
actually answer and complete AND on both Basic/Advanced original sources.
| Original base33 source | Prefix actions | Further actions | Actual result |
| --- | ---: | ---: | --- |
| Basic AND | 20 | 8 | Real move/Hajr/move and owner finish; physical Hajr consumed once |
| Advanced AND | 23 | 8 | Same whole progress with original post-move Hajr timing |
| Basic edited OR | 20 | 6 | Actual AND→OR editor then Ask; manual alternate fulfills |
| Basic No AND | 20 | 7 | First qualifying move allowed; completing both rejects |
| Basic No OR | 20 | 5 | Either qualifying move rejects; actual owner finish closes No |
| Basic maximum versus sum | 20 | 8 | Two one-force groups place2 in Basin but record maximum1 |
| Basic early Charity | 13 | 14 | Real later phases/paid shipment and two physical ground moves |
| Advanced Fremen range | 27 | 8 | Pending response records nothing; actual elite commit fulfills |
A fixture-only template String conversion repairs initial lint feedback; the
passing v2 source snapshot is
`21af7718a11b4021df4b380d0d88613db71aa3ee47514bc9b95059da410cca9b`
(3145 files). Final evidence prose is a separate three-document overlay.
Frozen report/manifest:
`/home/quintine/.local/share/dune/checkpoints/20261026-truth-movement-expression-proof-v2/`;
journeys/HTML: adjacent `20261026-truth-movement-expression-runtime/`.
SSR/editor/guide callbacks are local engine/control evidence, not DOM,
hydration, browser/mobile or deployed acceptance.
The source adapters inherit original Basic/Advanced base33 setup, printed
armies, dealt Hajr/Truthtrance and paid Polar shipment. A separate earlier
source replays the original selected unopened setup/Spice prefix to real Charity;
a Fremen source retains its actual Advanced range response and typed forces.
No played clock, purse, hand, army or promise is installed by these adapters.
Controlled UI/search adapters retain those labels, not original acquisition proof.
Current-fact/cross-family expressions, optional modules, wider native card/
faction/skill compositions, final rules/recovery/privacy/custody review and
browser/mobile/deployed acceptance remain required. No complete mode is
certified. No saved-game/database/server/reset/restart/deployment operation is
performed by this batch.
+5
View File
@@ -1,5 +1,10 @@
# Truthtrance ground-movement promises
The [whole AND/OR movement follow-up](TRUTHTRANCE_MOVEMENT_EXPRESSIONS.md)
adds full grouped future destinations/minima to the same owned-action search.
Each leaf still requires one actual qualifying group, never a sum; the new
ledger retains whole No and dynamic alternatives without changing scalar claims.
## Native early Advanced and CHOAM opening — 26 October 2026
**Prototyped / Partial.** Both Basic and Advanced now admit clean current-round