Compose the deferred Terror arrival and green the mixed E3 programmes

Queue a committed Terror entry whose arrival also opened its own
interaction — Guild income, a Bene Gesserit fighter Intrusion or advisor
choice, or Fremen storm protection — in the additive
Game.pendingArrivalReaction list, and open the oldest queued entry from
settleAutomaticContinuations once nothing is pending. Payment, force
transfer and the original movement never replay; a Terror entry already in
flight and every Ambassador combination still reject.

Both withdrawn mixed E3 programme pairs are green: Moritani 9/9 and Ecaz
14/14, stable across 20 consecutive full-file runs. Their recorded resume
constraints became real fixture repairs, and the two restored consumer
omissions were corrected against the engine rather than re-pinned.

Repair pre-existing failures inherited at 45e6084 against current engine
behavior: stale Discovery and module gates in the native skills, Ix and
expansion-faction prototypes, the advanced Moritani skill boundary, the
Richese Nexus betrayal sale-credit expectation, one incidental gate
message and one flaky Collection-readiness assertion that reproduced at
HEAD.

Offline suite 7,793/7,793 with typecheck and lint clean. No game, seat,
saved-state, deployment, public-start or played-save conversion changes.
This commit is contained in:
Quintine committed 2026-10-07 17:24:23 +11:00
1 parent 45e6084424
commit e05a205a47
30 files changed
+2467 -117

No files matched your search

+14 -12
View File
@@ -333,18 +333,20 @@ void test('simultaneous entry reactions fail atomically and stale CHOAM continua
'arrakeen',
1,
);
reject(
g,
'r',
{
type: 'ship',
noField: token(g, 5),
event: g.players[0].noFieldEvent,
territory: 'arrakeen',
sector: 10,
},
/Terror combined/,
);
const committed = applyAction(g, 'r', {
type: 'ship',
noField: token(g, 5),
event: g.players[0].noFieldEvent,
territory: 'arrakeen',
sector: 10,
});
// The committed shipment and its Terror entry both survive; the entry waits
// for the arrival's own reaction instead of rejecting the shipment.
assert.equal(committed.players[0].noField!.deployed!.tokenId, token(g, 5));
assert.equal(committed.players[0].shipped, true);
assert.ok((committed.pendingArrivalReaction?.length ?? 0) > 0 ||
committed.pendingTerrorEntry !== null || committed.decision?.kind === 'moritaniTerror',
'The committed Terror entry is offered or waits behind the arrival reaction.');
let moving = marker(fixture(), 3, 'imperial_basin', 10);
moving.players[1] = newPlayer('a', 'CHOAM', 'choam');
moving.players[1].forces = { 'arrakeen:10': 1 };