Connect Basic Revival gift and arrival continuations
Verify and publish checkpoint container / container (push) Successful in 11m37s

This commit is contained in:
Quintine committed 2026-11-16 16:52:13 +11:00
1 parent 6acf2c200c
commit 2cea251afd
10 files changed
+520 -6

No files matched your search

+14 -2
View File
@@ -7294,6 +7294,7 @@ function kullSemutaParentSupported(g: Game, frame?: NonNullable<Game['pendingKul
let guildSupported = false;
let saleSupported = false;
let marketSupported = false;
let giftSupported = false;
if (nativeResponse && frame && use?.kind === 'cancel') {
// Success has just installed this very Kull restriction. Validate the
// suspended source as it stood before that restriction, without changing
@@ -7305,6 +7306,11 @@ function kullSemutaParentSupported(g: Game, frame?: NonNullable<Game['pendingKul
revivalSupported = !!g.pendingRevival && semutaRevivalKaramaResponse(source, use.response, frame.owner);
guildSupported = (!!g.pendingShipment || !!g.pendingGuildTransport) &&
semutaGuildShipmentKaramaResponse(source, use.response);
if (g.pendingRicheseGift && use.response.kind === 'richeseGift' &&
semutaRicheseKaramaResponse(source, use.response)) {
validateKaramaUse(source, getPlayer(source, frame.owner), use);
giftSupported = true;
}
if (g.pendingChoamMarketGhola && semutaMarketGholaIncome(source, use.response)) {
validateKaramaUse(source, getPlayer(source, frame.owner), use);
marketSupported = true;
@@ -7336,7 +7342,7 @@ function kullSemutaParentSupported(g: Game, frame?: NonNullable<Game['pendingKul
use?.kind === 'cancel' && ['voice', 'prescience'].includes(use.response.kind) &&
JSON.stringify(use.response) === JSON.stringify(frame.resume.response) &&
!frame.resume.decision && !frame.resume.pendingKarama && !frame.resume.phaseOpening;
return battleSupported && !g.truthtrance && !g.pendingRicheseGift && !g.pendingNullentropy &&
return battleSupported && !g.truthtrance && (!g.pendingRicheseGift || giftSupported) && !g.pendingNullentropy &&
!g.pendingAmbassador && (!g.pendingIxAlly || saleSupported && use?.kind === 'cancel' &&
use.response.kind === 'ixAllyCard') && (!g.pendingRevival || revivalSupported) &&
(!g.pendingShipment || guildSupported) && (!g.pendingGuildTransport || guildSupported) &&
@@ -8345,6 +8351,10 @@ function treacheryDiscardIntegrity(g: Game) {
(continuation?.kind === 'karamaNoFieldDiscard' && continuation.use.response.source === 'ambassadorNoField') ||
((continuation?.kind === 'karamaAdvisorFlipDiscard' || continuation?.kind === 'karamaTerminalDiscard') &&
semutaAdvisorAmbassadorParent(g,continuation.use.response));
const kullGift = (continuation?.kind === 'kullSuccessDiscard' || continuation?.kind === 'kullCounterDiscard') &&
continuation.frame.intent.kind === 'ordinary' && continuation.frame.intent.use.kind === 'cancel' &&
continuation.frame.intent.use.response.kind === 'richeseGift' &&
kullSemutaParentSupported(kullSource(g, continuation.frame), continuation.frame);
requireRule(
(g.status === 'playing' || (truth && g.status === 'setup')) &&
pending.sequence === sequence &&
@@ -8358,7 +8368,7 @@ function treacheryDiscardIntegrity(g: Game) {
!g.decision &&
!g.truthtrance &&
!g.phaseOpening &&
(!g.pendingRicheseGift || box || truth || continuation?.kind === 'karamaRicheseGiftDiscard') &&
(!g.pendingRicheseGift || box || truth || kullGift || continuation?.kind === 'karamaRicheseGiftDiscard') &&
!g.pendingKarama &&
(!g.pendingNullentropy || continuation?.kind === 'karamaRicheseGiftDiscard') &&
(!g.pendingAmbassador || box || truth || ambassadorTerror || ambassadorCost || continuation?.kind === 'karamaRicheseGiftDiscard') &&
@@ -25671,6 +25681,8 @@ function ambassadorEffectBlock(
function bareBasicNativeArrivalOverlap(g: Game): boolean {
// Native Basic faction decks share the same ordered arrival queue. A deck
// selection alone is not an optional phase module or a new arrival effect.
if (byFaction(g, 'ecaz') && byFaction(g, 'moritani') &&
(basicKullLeaderSkillsProfile(g) || nexusKullLeaderSkillsProfile(g))) return true;
return !g.advanced && selectedPhaseModuleRoster(g) && !!byFaction(g, 'ecaz') && !!byFaction(g, 'moritani') &&
!g.homeworlds && !g.nexusCards && !g.leaderSkills && !g.techTokens && !g.strongholdCards &&
!g.discoveryEnabled && !g.discoveries && !g.discoveryStash && !g.greatMaker &&