Extend conditional battle questions across previews
Verify and publish checkpoint container / container (push) Canceled after 0s

This commit is contained in:
Quintine committed 2026-10-29 02:21:12 +11:00
1 parent 0e52c25355
commit 50703664cf
13 files changed
+336 -24

No files matched your search

+4 -1
View File
@@ -36658,6 +36658,9 @@ function finishResponse(g: Game, canceled: boolean, settlement?: BureaucratSettl
!Object.keys(b.plans).length, 'Resolve Occupy before native powers and plans.');
occupy.canceled = canceled;
ecazBattleProfile(g);
// The chosen plan owner and final Occupy force profile are now fixed.
// A nonleading ally keeps its waiting receipt for its own later battle.
bindFutureBattleLeaderQuestions(g);
createMentatQuestion(g);
beginStrongholdBattle(g);
log(g, canceled ? 'Karama canceled the combined dial: the selected lead now dials only their own forces; the other allied army contributes zero.' : 'Ecaz Occupy proceeds with its mandatory free contribution and the ally’s physical force pool.', { faction: 'ecaz', name: 'Occupy' });
@@ -46114,7 +46117,7 @@ function applyActionInner(
revealed: false,
traitorCalls: {},
};
bindFutureBattleLeaderQuestions(g);
if (!combined) bindFutureBattleLeaderQuestions(g);
if (combined) {
g.battle.ecazOccupy = { event: battleEvent, ecaz: ecaz!.id, ally: ally!.id, lead: null, canceled: false };
const opponent = [choice.attacker, choice.defender].find(id => id !== ecaz!.id && id !== ally!.id)!;