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
@@ -1,5 +1,6 @@
|
||||
import { homeworldLeaderSkillsProfile, independentTreacheryLeaderSkillsProfile, classicNexusLeaderSkillsProfile, classicTechLeaderSkillsProfile, guildBetrayalNexusLeaderSkillsProfile, mixedE1E2NexusLeaderSkillsProfile, mixedE3NexusLeaderSkillsProfile, nativeDiscoveryLeaderSkillsProfile, nativeExpansionLeaderSkillsProfile, nativeTechLeaderSkillsProfile, noOtherLeaderSkillModules, pairedE3NexusLeaderSkillsProfile, pairedNexusLeaderSkillsProfile, selectedNexusLeaderSkillsProfile, standaloneE3NexusLeaderSkillsProfile, strongholdLeaderSkillsProfile, type LeaderSkillProfile } from './leader-skill-profile';
|
||||
import { classicDiscoveryLeaderSkillsProfile } from './discovery-module-profile';
|
||||
import { nexusKullLeaderSkillsProfile } from './faction-module-profile';
|
||||
export type BureaucratPaymentKind = 'auction' | 'shipment' | 'bribe' | 'revival';
|
||||
export type BureaucratPaymentSource = {
|
||||
event: string;
|
||||
@@ -43,7 +44,7 @@ export function bureaucratPaymentSignature(value: object): string {
|
||||
return JSON.stringify({ ...value, signature: undefined });
|
||||
}
|
||||
export function bureaucratPaymentModeSupported(game: LeaderSkillProfile): boolean {
|
||||
return independentTreacheryLeaderSkillsProfile(game) || (!game.homeworlds && game.expansions.length === 1 &&
|
||||
return nexusKullLeaderSkillsProfile(game) || independentTreacheryLeaderSkillsProfile(game) || (!game.homeworlds && game.expansions.length === 1 &&
|
||||
(game.expansions[0] === 'choam' || game.expansions[0] === 'ix') &&
|
||||
pairedNexusLeaderSkillsProfile(game)) ||
|
||||
selectedNexusLeaderSkillsProfile(game) || mixedE3NexusLeaderSkillsProfile(game) || mixedE1E2NexusLeaderSkillsProfile(game) || pairedE3NexusLeaderSkillsProfile(game) ||
|
||||
|
||||
+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);
|
||||
|
||||
@@ -117,6 +117,34 @@ function basicNativeNexusCore(game: NexusCoreConfiguration): boolean {
|
||||
return true;
|
||||
}
|
||||
|
||||
/** Basic Nexus/Kull with original Leader Skills. Recognize the fresh setup
|
||||
* before its Kull stamps and live games after both stamps alike. */
|
||||
export function nexusKullLeaderSkillsProfile(game: NexusCoreConfiguration): boolean {
|
||||
const players = game.players;
|
||||
if (game.advanced !== false || !game.nexusCards || !game.leaderSkills || !players ||
|
||||
players.length < 2 || players.length > 6 ||
|
||||
(game.expansions.length !== 2 && game.expansions.length !== 3) ||
|
||||
!game.expansions.includes('ix') || !game.expansions.includes('choam') ||
|
||||
game.expansions.some(id => id !== 'ix' && id !== 'choam' && id !== 'ecaz') ||
|
||||
new Set(game.expansions).size !== game.expansions.length ||
|
||||
!players.some(player => player.faction === 'choam') ||
|
||||
game.homeworlds || game.techTokens || game.strongholdCards ||
|
||||
game.discoveryEnabled || game.discoveries || game.discoveryStash || game.greatMaker ||
|
||||
game.advancedPreview || game.richeseBetrayalPreview || game.moritaniAssassinatePreview ||
|
||||
(game.semutaPreview && (game.semutaPreview !== true ||
|
||||
!players.some(player => player.faction === 'richese'))) ||
|
||||
((game.kullPreview || game.nexusKullPreview) &&
|
||||
(game.kullPreview !== true || game.nexusKullPreview !== true))) return false;
|
||||
const factions = new Set<string>();
|
||||
for (const player of players) {
|
||||
if (factions.has(player.faction)) return false;
|
||||
factions.add(player.faction);
|
||||
const faction = FACTIONS.find(candidate => candidate.id === player.faction);
|
||||
if (!faction || (faction.expansion !== 'base' && !game.expansions.includes(faction.expansion))) return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/** Original selected decks do not require their native factions or the
|
||||
* independent three-card variant. Hidden E3/Harkonnen compositions retain
|
||||
* their existing separately scoped paths. */
|
||||
@@ -132,7 +160,7 @@ export function selectedNexusWithoutCardsProfile(game: NexusCoreConfiguration):
|
||||
|
||||
/** Common consumers of supported classic and selected-deck Nexus games. */
|
||||
export function nexusCoreProfile(game: NexusCoreConfiguration): boolean {
|
||||
return classicNexusCoreProfile(game) || selectedIndependentNexusProfile(game) ||
|
||||
return nexusKullLeaderSkillsProfile(game) || classicNexusCoreProfile(game) || selectedIndependentNexusProfile(game) ||
|
||||
independentDiscoveryNexusProfile(game) || selectedNexusWithoutCardsProfile(game);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { FACTIONS } from './catalog';
|
||||
import { independentDiscoveryProfile, independentNexusProfile, classicNexusCoreProfile, nexusCoreProfile, mixedE3NexusRosterProfile, selectedNexusWithoutCardsProfile } from './faction-module-profile';
|
||||
import { independentDiscoveryProfile, independentNexusProfile, classicNexusCoreProfile, nexusCoreProfile, nexusKullLeaderSkillsProfile, mixedE3NexusRosterProfile, selectedNexusWithoutCardsProfile } from './faction-module-profile';
|
||||
import { classicDiscoveryLeaderSkillsProfile, selectedDiscoveryLeaderSkillsProfile } from './discovery-module-profile';
|
||||
|
||||
/** Public configuration only; never gate a skill on a hidden card or random deal. */
|
||||
@@ -534,7 +534,7 @@ export function independentTreacheryLeaderSkillsProfile(game: LeaderSkillProfile
|
||||
|
||||
/** Shared by rule quotes, controls and minimal legal bot participation. */
|
||||
export function ordinaryLeaderSkillModeSupported(game: LeaderSkillProfile): boolean {
|
||||
return independentTreacheryLeaderSkillsProfile(game) || (noOtherLeaderSkillModules(game) &&
|
||||
return nexusKullLeaderSkillsProfile(game) || independentTreacheryLeaderSkillsProfile(game) || (noOtherLeaderSkillModules(game) &&
|
||||
(!game.expansions.length || nativeExpansionLeaderSkillsProfile(game) ||
|
||||
(game.expansions.length === 1 && game.expansions[0] === 'choam'))) ||
|
||||
classicTechLeaderSkillsProfile(game) || nativeTechLeaderSkillsProfile(game) ||
|
||||
|
||||
+2
-2
@@ -1746,7 +1746,7 @@ export const RULE_TOPICS: RuleTopic[] = [
|
||||
'The mobile stronghold can receive a non-Ixian group only from the territory it points to. Ecaz and its ally may co-occupy under Occupy. Advisors keep their applicable stance and accompaniment locks; an eligible arrival can request fighters. CHOAM may use Baliset during Shipment and Movement; if allowed, choose another legal destination. Intrusion or Terror resolves before the original entrant continues. A destination that causes both settles the Intrusion first and then offers the committed Terror entry; no payment or force transfer replays. There is no extra decline after triggering; if no legal move remains, the effect finishes without moving pieces and its token stays consumed.',
|
||||
'The Guild Ambassador grants an immediate free shipment of zero through four physical reserve forces for Ecaz or its ally, including typed elites. Choose a clear territory and sector; this does not spend ordinary shipment or movement, ally aid or a retained rate card. Fremen may use destinations outside their ordinary reinforcement radius, but their southern reserves stay on-planet and this effect never permits storm entry. Only Ixians may ship directly into their placed mobile stronghold.',
|
||||
'During Shipment and Movement, Guild can use its special Karama to stop another eligible off-planet Ambassador shipment before forces arrive; it does not stop this grant during a phase-one worm sequence. A successful off-planet shipment may invite Bene Gesserit accompaniment and accrues applicable phase-five Heighliner income once. BG can accompany Ixians into the mobile stronghold. Projected accompaniment choices show blocked sectors and keep Polar Sink and decline available when legal. Intrusion, separate Terror and accompanying fighter-triggered Ambassadors finish before the original entrant or worm rider resumes.',
|
||||
'In bare Basic Richese/Ecaz tables, No-Field may replace the whole Guild grant under an explicit provisional policy: concealed native0/3/5 counts as one and ships free; allied use reveals immediately within four available counters and keeps the one/two-spice transport payment to Guild or Bank. Richese chooses its token/payer and the beneficiary must accept before transfer. Prior native revelation, shared token history and physical fallback after scoped prevention remain; ordinary allowances are unchanged. Advanced/optional profiles remain separate. In bounded classic plus Ecaz/Moritani games, a shared Ambassador/Terror entry gives both owners saved optional prompts in current storm order without repeating the committed entry; this is a provisional table order, not a printed publisher priority. A Terror entry now waits for the arrival’s own interaction — Guild income, a Bene Gesserit fighter Intrusion or advisor choice, or Fremen storm protection — and then opens without replaying payment or force transfer. Ambassador-created child arrivals retain their own contracts. The native-module extension now composes ordinary paid arrival order with Atomics, Homeworlds and Nexus; other combinations and complete rules remain unfinished.',
|
||||
'In supported plain Basic and Advanced Richese/Ecaz tables, No-Field may replace the whole Guild grant under an explicit provisional policy: concealed native0/3/5 counts as one and ships free; allied use reveals immediately within four available counters and keeps the one/two-spice transport payment to Guild or Bank. Richese chooses its token/payer and the beneficiary must accept before transfer. Prior native revelation, shared token history and physical fallback after scoped prevention remain; ordinary allowances are unchanged. Other optional profiles remain separate. In bounded classic plus Ecaz/Moritani games, a shared Ambassador/Terror entry gives both owners saved optional prompts in current storm order without repeating the committed entry; this is a provisional table order, not a printed publisher priority. A Terror entry now waits for the arrival’s own interaction — Guild income, a Bene Gesserit fighter Intrusion or advisor choice, or Fremen storm protection — and then opens without replaying payment or force transfer. Ambassador-created child arrivals retain their own contracts. The native-module extension now composes ordinary paid arrival order with Atomics, Homeworlds and Nexus; other combinations and complete rules remain unfinished.',
|
||||
'The Tleilaxu Ambassador returns one eligible own leader or up to four physical forces free. First-death leaders and the first-killed Atreides KH need not wait for the ordinary cohort. Under the provisional repeat interpretation, later native leaders must satisfy their ordinary death condition, and later KH returns must meet their saved next-cohort marker. Preserve the actual opening before resurrection; KH advances its marker beyond both owner and old KH cycles without resetting activation losses or adding a native disc. Ecaz retains native identity bookkeeping. Ecaz may instead return the shared Duke alive and unclaimed under his independent permission; its ally cannot inherit that permission. Native and BG copied grants share eligibility and exclusive alternatives. A positive return provisionally earns seated Tleilaxu one bank spice per beneficiary/turn, sharing ordinary free revival; Ghola stays separate. Canceling income keeps the return and spent entitlement. Ordinary allowance independence and wider custody/module combinations remain provisional.',
|
||||
'All eleven effect guides are readable. Emperor, Atreides, Harkonnen, CHOAM, Ixian, Richese, Fremen and Guild entry effects are integrated, together with Bene Gesserit copies of those eight effects and direct Duke acquisition or consensual alliance through the reusable Ecaz token. Advanced combined Occupy has a separate bounded Development Verified guide, and Basic even-force Occupy now composes the same shared controls. Remaining effects, exceptional Duke custody and complete Ecaz rules remain unfinished. Ambassadors can be placed on the genuinely placed Hidden Mobile Stronghold, including when its pointer is in storm: the interior is sheltered. Its face-up marker stays attached through Ixian movement. Placement still pays the increasing fee and can be prevented by Karama. This supplies no Terror or direct-shipment permission. Normal public Ecaz starts remain development previews; complete rules and unsupported combinations stay gated.',
|
||||
],
|
||||
@@ -5997,7 +5997,7 @@ export const RULE_TOPICS: RuleTopic[] = [
|
||||
developmentStage: 'Verified',
|
||||
summary: 'In the explicit Nexus Kull preview, choose one actual Treachery fuel card at a Karama attempt; the CHOAM Nexus is spent when the declaration is accepted, even if Kull is prevented.',
|
||||
steps: [
|
||||
'Fresh Basic CHOAM games with selected Ix and CHOAM decks and Nexus alone enable this preview by default, including selected Ecaz and Moritani factions with their deck; the host may turn it off. Original Ix Sandtrout stays in the Spice deck. Semuta remains active with Richese even when Kull is turned off. The separate local Advanced audit remains available; other optional modules and Richese Betrayal remain outside this profile.',
|
||||
'Fresh Basic CHOAM games with selected Ix and CHOAM decks and Nexus alone enable this preview by default, including selected Ecaz and Moritani factions with their deck; the host may turn it off. The host may explicitly combine Nexus Kull with Leader Skills and optional independent Ecaz Treachery cards. Original Ix Sandtrout stays in the Spice deck. Semuta remains active with Richese even when Kull is turned off. The separate local Advanced audit remains available; other optional modules and Richese Betrayal remain outside this profile.',
|
||||
'In this Basic Richese profile, a successful printed Kull or distinct Karama counter offers its public discard to Semuta. Successful Nexus-fueled Kull offers the actual private fuel only after the physical Nexus has been spent and the effect committed; claim or pass retains the original Karama continuation.',
|
||||
'The native Ixian Bidding counter remains bound while Kull resolves, then its original Ixian Nexus opportunity and auction proceed. A waiting Sandtrout does not disable an earned Emperor Nexus ordinary bank-auction benefit; other Sandtrout purchase sources retain their separate limits.',
|
||||
'The CHOAM Nexus face says: Discard any Treachery Card to obtain a Worthless Card special effect of your choice. Basic uses the CHOAM phase-wide scope; new Advanced attempts use the supplied specific-effect scope with provisional phase expiry. Cunning changes the fuel identity, not the effect, target or timing. Neither text supplies a nested counter priority: distinct counters and BG-before-conversion custody are the recorded user-selected policy, not a publisher clarification.',
|
||||
|
||||
Reference in new issue
Block a user