Preserve revealed traitor income and No-Field timing
Verify and publish checkpoint container / container (push) Successful in 11m12s

This commit is contained in:
Quintine committed 2026-11-16 21:19:53 +11:00
1 parent a2e7029a72
commit e81725e4b2
12 files changed
+497 -4

No files matched your search

+5 -1
View File
@@ -152,6 +152,9 @@ export type BattleResolutionInput = {
called: boolean;
traitors: readonly string[];
}[];
/** Engine-derived same-battle Nexus receipt: a publicly revealed Harkonnen
* Traitor was canceled after declaration, even though its vote is now false. */
nexusCanceledTraitorRevealed?: true;
participants: readonly ResolutionParticipant[];
/** Live physical zones only, excluding historical receipts and knowledge aliases. */
physicalCards: readonly { id: string }[];
@@ -373,6 +376,7 @@ function calculate(input: BattleResolutionInput): BattleResolutionQuote {
d = input.defender;
requireQuote(
typeof input.advanced === 'boolean' &&
(input.nexusCanceledTraitorRevealed === undefined || input.nexusCanceledTraitorRevealed === true) &&
whole(input.turn) &&
input.turn > 0 &&
id(input.territory) &&
@@ -677,7 +681,7 @@ function calculate(input: BattleResolutionInput): BattleResolutionQuote {
// CHOAM's prepaid ally contribution is excluded from this receipt. The
// adopted Advanced source rounds once after totaling the eligible support.
const choamAmount =
input.advanced && choam && !ac && !dc
input.advanced && choam && !ac && !dc && !input.nexusCanceledTraitorRevealed
? Math.floor(
[a, d].reduce(
(sum, s) =>