Connect Nexus Skills and Advanced Ambassador markers
Verify and publish checkpoint container / container (push) Successful in 10m45s
Verify and publish checkpoint container / container (push) Successful in 10m45s
This commit is contained in:
1 parent
2660b10af0
commit
4270b36be7
14 files changed
+578
-41
No files matched your search
+11
-7
@@ -11446,9 +11446,8 @@ function startModules(state: Game): Game {
|
||||
delete g.lobbyOptions;
|
||||
if (lobbyKullEnabled(state)) {
|
||||
if (g.nexusCards && g.advanced === false) {
|
||||
requireRule(!options.leaderSkills, 'Kull with Nexus and Leader Skills is not supported yet.');
|
||||
if (options.ecazTreachery) g.ecazTreachery = true;
|
||||
return initializeNexusKullGameForAudit(g);
|
||||
return initializeNexusKullGameForAudit(g, !!options.leaderSkills);
|
||||
}
|
||||
const supportedBasic = g.advanced === false && (g.expansions.length === 2 ||
|
||||
g.expansions.length === 3 && g.expansions.includes('ecaz')) && g.expansions.includes('choam') &&
|
||||
@@ -13982,7 +13981,7 @@ export function initializeKullGameForAudit(state: Game): Game {
|
||||
return g;
|
||||
}
|
||||
/** Fresh native CHOAM Kull with Nexus and optional independent Ecaz cards. */
|
||||
export function initializeNexusKullGameForAudit(state: Game): Game {
|
||||
export function initializeNexusKullGameForAudit(state: Game, skills = false): Game {
|
||||
requireRule(!state.kullPreview && !state.nexusKullPreview && !state.pendingKull &&
|
||||
state.kullRestrictions === undefined && state.kullSequence === undefined &&
|
||||
!state.semutaPreview && !state.richeseBetrayalPreview && !state.richeseBetrayal &&
|
||||
@@ -13997,8 +13996,11 @@ export function initializeNexusKullGameForAudit(state: Game): Game {
|
||||
!state.advanced && (p.faction === 'richese' || p.faction === 'ixians' || p.faction === 'tleilaxu' ||
|
||||
state.expansions.includes('ecaz') && (p.faction === 'ecaz' || p.faction === 'moritani'))),
|
||||
'Nexus Kull requires a fresh supported CHOAM lobby with selected faction decks and supported Nexus and Ecaz cards.');
|
||||
requireRule(!skills || !state.advanced, 'Nexus Kull with Leader Skills currently requires Basic rules.');
|
||||
requireFreshBaseRuntime(state);
|
||||
const g = initializeSetupGameForAudit(state, false, true, false, false, false, false, true, state.ecazTreachery === true);
|
||||
const seed = structuredClone(state);
|
||||
if (skills) seed.leaderSkills = createLeaderSkills(random);
|
||||
const g = initializeSetupGameForAudit(seed, false, true, false, false, skills, false, true, state.ecazTreachery === true);
|
||||
g.kullPreview = true;
|
||||
g.nexusKullPreview = true;
|
||||
if (!g.advanced && byFaction(g, 'richese')) g.semutaPreview = true;
|
||||
@@ -20668,7 +20670,7 @@ function kullIntegrity(g: Game): void {
|
||||
g.players.every(p => p.faction === 'choam' || faction(p.faction).expansion === 'base' ||
|
||||
!g.advanced && (p.faction === 'richese' || p.faction === 'ixians' || p.faction === 'tleilaxu' ||
|
||||
g.expansions.includes('ecaz') && (p.faction === 'ecaz' || p.faction === 'moritani'))) &&
|
||||
!g.homeworlds && !g.leaderSkills && !g.discoveryEnabled && !g.discoveries &&
|
||||
!g.homeworlds && (!g.leaderSkills || !g.advanced) && !g.discoveryEnabled && !g.discoveries &&
|
||||
!g.discoveryStash && !g.greatMaker &&
|
||||
!g.techTokens && !g.strongholdCards && (!g.ecazTreachery || !g.advanced) &&
|
||||
(!g.semutaPreview || !g.advanced && !!byFaction(g, 'richese')) &&
|
||||
@@ -26418,7 +26420,8 @@ type GuildMarkerView = {
|
||||
decline?: Action; declineLabel?: string;
|
||||
};
|
||||
function guildMarkerAvailable(g: Game, beneficiary: string): boolean {
|
||||
return bareBasicSemutaProfile(g) && !g.pendingAmbassador?.guildMarkerBlocked && !!markerOwner(g, beneficiary);
|
||||
return (bareBasicSemutaProfile(g) || bareAdvancedEcazSemutaProfile(g)) &&
|
||||
!g.pendingAmbassador?.guildMarkerBlocked && !!markerOwner(g, beneficiary);
|
||||
}
|
||||
function quoteAmbassadorMarker(g: Game, beneficiary: string, fields: {
|
||||
tokenId: string; tokenEvent: string; territory: string; sector: number; payer?: string; elite?: number;
|
||||
@@ -40935,7 +40938,8 @@ function validateGuildShipmentDecision(
|
||||
decision.territory === shipment.territory &&
|
||||
decision.sector === shipment.sector &&
|
||||
decision.noFieldSkillProof === shipment.noFieldSkillProof &&
|
||||
decision.amount === (shipment.alliedNoField ? 1 : shipment.amount + (shipment.noFieldReserves ?? 0)),
|
||||
decision.amount === (shipment.alliedNoField || shipment.ambassadorMarker
|
||||
? 1 : shipment.amount + (shipment.noFieldReserves ?? 0)),
|
||||
'The Guild decision does not match the pending shipment.',
|
||||
);
|
||||
validatePhysicalShipment(g, shipment);
|
||||
|
||||
Reference in new issue
Block a user