Coordinate Fremen grants in ordered revival
Verify and publish checkpoint container / container (push) Canceled after 0s

This commit is contained in:
Quintine committed 2026-10-29 09:19:17 +11:00
1 parent 64706cc7e0
commit 220d78c779
11 files changed
+429 -12

No files matched your search

+9 -4
View File
@@ -11,7 +11,8 @@ export type FremenRevivalGrantContext = Pick<
Game,
'status' | 'phase' | 'turn' | 'players' | 'freeRevival' | 'revivalRules' | 'recruits'
> & Partial<Pick<Game, 'coalitionState' | 'advanced' | 'expansions' | 'homeworlds' |
'nexusCards' | 'leaderSkills' | 'techTokens' | 'strongholdCards' | 'ecazTreachery' | 'discoveryEnabled'>>;
'nexusCards' | 'leaderSkills' | 'techTokens' | 'strongholdCards' | 'ecazTreachery' | 'discoveryEnabled' |
'fremenRevivalWaitRelease'>>;
export class FremenRevivalGrantError extends Error {
constructor(message: string) {
@@ -118,7 +119,7 @@ export function validateFremenRevivalGrant(
export function projectFremenGroupRevivalGrant(
g: FremenRevivalGrantContext,
viewer: string,
): Array<{recipient: string; granted: boolean; blocked: string | null}> | null {
): Array<{recipient: string; granted: boolean; blocked: string | null; waitReleased?: boolean}> | null {
if (!id(viewer) || !Array.isArray(g.players) ||
g.players.filter(player => player.id === viewer && player.faction === 'fremen').length !== 1)
return null;
@@ -126,7 +127,9 @@ export function projectFremenGroupRevivalGrant(
if (!recipients) return null;
return recipients.map(recipient => ({recipient,
granted: Array.isArray(g.freeRevival) && g.freeRevival.includes(recipient),
blocked: fremenRevivalGrantBlock(g, viewer, recipient)}));
blocked: fremenRevivalGrantBlock(g, viewer, recipient),
...(g.fremenRevivalWaitRelease?.turn === g.turn &&
g.fremenRevivalWaitRelease.recipients.includes(recipient) ? {waitReleased: true} : {})}));
}
/** Owner-only status. No wallet, Tanks, prior counts or quoted free amount is
@@ -134,7 +137,7 @@ export function projectFremenGroupRevivalGrant(
export function projectFremenRevivalGrant(
g: FremenRevivalGrantContext,
viewer: string,
): { recipient: string; granted: boolean; blocked: string | null } | null {
): { recipient: string; granted: boolean; blocked: string | null; waitReleased?: boolean } | null {
if (!id(viewer) || !Array.isArray(g.players)) return null;
const owners = g.players.filter(player => player.id === viewer);
const owner = owners[0];
@@ -146,5 +149,7 @@ export function projectFremenRevivalGrant(
recipient: owner.ally,
granted: Array.isArray(g.freeRevival) && g.freeRevival.includes(owner.ally),
blocked: fremenRevivalGrantBlock(g, viewer),
...(g.fremenRevivalWaitRelease?.turn === g.turn &&
g.fremenRevivalWaitRelease.recipients.includes(owner.ally) ? {waitReleased: true} : {}),
};
}