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

+24 -21
View File
@@ -261,11 +261,15 @@ void test('BG intrusion uses current opposing fighters, requires Advanced rules
quoteCompletedMovementArrival({ ...input, players: advisors }).intrusion,
false,
);
for (const tokens of [{ ambassadors: [ambassador] }, { terror: [terror] }])
assert.throws(
() => quoteCompletedMovementArrival({ ...input, players, ...tokens }),
/another arrival reaction/,
);
assert.throws(
() => quoteCompletedMovementArrival({ ...input, players, ambassadors: [ambassador] }),
/Ambassadors combined/,
);
// A Terror entry behind the pending Intrusion is now committed and deferred.
assert.equal(
quoteCompletedMovementArrival({ ...input, players, terror: [terror] }).reaction,
'terror',
);
});
void test('mover advisor stance is the declared resulting stance, not its stale destination map', () => {
@@ -295,14 +299,13 @@ void test('mover advisor stance is the declared resulting stance, not its stale
}).reaction,
null,
);
assert.throws(
() =>
quoteCompletedMovementArrival({
...base,
terror: [terror],
order: { ...base.order, advisors: true, wantsFighters: true },
}),
/Terror combined/,
assert.equal(
quoteCompletedMovementArrival({
...base,
terror: [terror],
order: { ...base.order, advisors: true, wantsFighters: true },
}).reaction,
'terror',
);
});
@@ -348,14 +351,14 @@ void test('current controls and the move-created fighter response are checked wi
/Ambassadors combined/,
);
for (const flag of ['response', 'decision'] as const)
assert.throws(
() =>
quoteCompletedMovementArrival({
...input,
terror: [terror],
controls: { ...input.controls, [flag]: true },
}),
/Terror combined/,
assert.equal(
quoteCompletedMovementArrival({
...input,
terror: [terror],
controls: { ...input.controls, [flag]: true },
}).reaction,
'terror',
`A committed ${flag} arrival defers its Terror entry instead of rejecting it.`,
);
assert.throws(
() =>