Connect trained E3 leaders to Advanced Harkonnen capture

This commit is contained in:
Quintine committed 2026-10-27 09:59:28 +11:00
1 parent c56d9c85ef
commit e530d267a3
10 files changed
+700 -7

No files matched your search

+11 -1
View File
@@ -383,6 +383,16 @@ export function nativeEcazLeaderSkillsProfile(game: LeaderSkillProfile): boolean
return native;
}
/** Only the bare E3 capture composition gains admission; callers check its native roster. */
function bareAdvancedE3CaptureEnvelope(game: LeaderSkillProfile): boolean {
return game.advanced === true && game.expansions.length === 1 && game.expansions[0] === 'ecaz' &&
noOtherLeaderSkillModules(game) && !game.discoveryStash && !game.greatMaker &&
!game.semutaPreview && !game.advancedPreview && !game.kullPreview && !game.nexusKullPreview &&
!game.guildBetrayalPreview && !game.richeseBetrayalPreview &&
!game.nexusIxianReplacementPreview && !game.nexusIxianBetrayalPreview &&
!game.nexusHarkonnenBetrayalPreview;
}
/** Every registered seat uses its selected ordinary family; no faction or Nexus prerequisite. */
export function selectedDeckLeaderSkillsProfile(game: LeaderSkillProfile): boolean {
@@ -416,7 +426,7 @@ export function selectedDeckLeaderSkillsProfile(game: LeaderSkillProfile): boole
if (player.faction === 'harkonnen') harkonnen = true;
}
// E3's existing Nexus/Discovery/preview envelopes retain their original predicates.
if (nativeE3 && ((game.advanced && harkonnen) || game.nexusCards ||
if (nativeE3 && ((game.advanced && harkonnen && !bareAdvancedE3CaptureEnvelope(game)) || game.nexusCards ||
game.discoveries || game.discoveryEnabled || game.discoveryStash ||
game.greatMaker || game.semutaPreview)) return false;
return !game.moritaniAssassinatePreview || (game.advanced && moritani);
+3 -1
View File
@@ -4551,6 +4551,7 @@ export const RULE_TOPICS: RuleTopic[] = [
'When all native Harkonnen leaders are dead, return every unused captive immediately. A new captive retained in that situation also returns immediately.',
'Only Harkonnen and the original owner know a concealed living captive’s identity. Tleilaxu can inspect a concealed executed leader. Using a captive in a revealed battle makes its identity public.',
'In original standalone Ecaz/classic Nexus without Skills, the separate Duke can enter that capture pool without a sixth native leader or Traitor card. Execute pays the same two spice and returns the dead disc to Ecaz Tanks. The provisional return policy restores only unused valid prior tenure; otherwise Duke is set aside. Actual Ecaz Nexus liberation removes captivity permanently, ending after one battle or the current turn rather than restoring Harkonnen.',
'Fresh bare Advanced E3/all14 Skills admits Harkonnen with Ecaz and/or Moritani and classics, two through six seats. A captured trained leader remains identified by its known attached Skill. Only its lower battle effect is available to the captor when actually used; the original assignment returns with a survivor, or its physical card returns once when the trainer dies. Other optional-module envelopes retain their separate gates.',
'The capture engine and private views have focused tests. The six classic factions can start Advanced preview; remaining Advanced rules and expansion interactions are unfinished.',
],
related: [
@@ -6286,12 +6287,13 @@ export const RULE_TOPICS: RuleTopic[] = [
developmentStage: 'Prototyped',
summary: 'Fourteen physical skills, private assignment choices, five battle disciplines, Planetologist movement/battle effects and Suk Graduate rescues, Mentat/Bureaucrat scoring and Bureaucrat payment redirection, Sandmaster victory spice, Rihani exchanges, optional Smuggler shipping and provisional modifier-inclusive battle collection, Sandmaster route and worm-ride collection, sealed Spice Banker battle spending and optional Diplomat base-defense copying in development tables. All twenty-eight independent bands have connected first versions; full interaction review, polish and combined-module acceptance remain unfinished.',
steps: [
'Fresh bare Advanced E3/all14 Skills may include Harkonnen with Ecaz and/or Moritani and classics, two through six distinct seats. The actual native trainer/card follows a random capture; its normal band is unavailable during captivity and only its selected lower battle effect applies. Surviving use returns the same assignment, while death returns the physical Skill. Mandatory Banker and native Moritani state remain; World/Nexus/Discovery/independent/Tech/Stronghold/Semuta gates are separate.',
'Sandmaster may collect along physical Ornithopter and carried Discovery routes using their actual range, exact declared path and current piles. Each different card movement has its own one-per-entered-territory opportunity; a concealed No-Field counts as one moving force without materializing its value. Choose one pile or decline per entered territory. Original source cohorts and disposal remain; allocation/reset are provisional.',
'Planetologist may provisionally compose either movement alternative with physical Ornithopter or carried Discovery. Fixed flight stays three, including both gather origins. In two-group card mode, each action chooses boosted normal range or ordinary-range gathering; a gather counts as one card movement. Different original counters must supply the second movement, even after merging. Current trainer, source events, earlier-turn token ownership and one disposal remain.',
'Fresh all14 uses one selected-deck capability for every registered actual seat, Basic/Advanced, including mixed native Ecaz/Moritani with selected E1/E2 families. Neither an expansion faction, independent cards, Nexus nor one exact E3 family is required just to use selected ordinary decks. An unused deck creates no seated faction. Original World/phase envelopes retain components and native power bindings; original Nexus/Discovery/Semuta and Advanced role limits stay separate. Ix drafts before training; Auditor/shared Duke never train. No Advanced power, income, owner or played-save history is invented.',
'Classic Nexus core with base33 or selected36 permits optional all14, original Tech3+ and Advanced Strongholds2+. Offers, starting-card order, mandatory normal Banker and native reactions remain. Actual third-party Bureaucrat sees the real Guild-card recipient. Tech pays only at its matching phase end; Banker waits for Mentat. Earned local support does not become personal money or reserve fees. Selection/printed roles are public capabilities; other native/module envelopes stay separate.',
'Explicit guild-betrayal --leader-skills remains a bounded classic preset of the original all14 setup. It does not require independent cards or another overlay. Native Mentat private questions, skilled-disc posture, Sandmaster collection and normal income retain their shared quotes; exact payer/recipient and printed Bureaucrat third-party conditions remain. Native cards, paid forces, Use/Pass and movement/plan continuation stay physical. Wider combinations and complete-mode acceptance remain separate.',
'Basic Moritani keeps legal Terror but gains no Advanced assassination, including registered mixed native Skills seats. Ecaz/Moritani with selected E1/E2 or unused decks keeps original Worlds/Tech3+/Advanced Strongholds2+ and optional independent cards without requiring Nexus. Advanced E3/Harkonnen remains guarded. Winner Suk and Rihani precede a different unused trained-disc death, one skill return, printed bounty and one original Mentat replacement. Native card/force sources, normal-call forfeiture and shared-Duke exclusion remain; unrelated overlays retain their original envelopes.',
'Basic Moritani keeps legal Terror but gains no Advanced assassination, including registered mixed native Skills seats. Ecaz/Moritani with selected E1/E2 or unused decks keeps original Worlds/Tech3+/Advanced Strongholds2+ and optional independent cards without requiring Nexus. Advanced E3/Harkonnen remains guarded in those module envelopes; the fresh bare E3/all14 capture entry is separate. Winner Suk and Rihani precede a different unused trained-disc death, one skill return, printed bounty and one original Mentat replacement. Native card/force sources, normal-call forfeiture and shared-Duke exclusion remain; unrelated overlays retain their original envelopes.',
'Basic and Advanced selected-deck Skills admits registered base, Ixian/Tleilaxu, CHOAM/Richese and Ecaz/Moritani seats only when their family is selected. Unused decks neither create a seat nor require one. All14/native setup remain. Auditor is Advanced and unskilled; foreign-ghola authorization still explicitly requires Advanced, grants no new skill and retains original Duke/custody limits. Cyborg losses, native funding and capped markers stay physical. Supplied Advanced p34 excludes Richese auctions from Ixian Technology; existing capture/KH/copy/role guards keep their own rules.',
'Independent Recruits, Reinforcements and Harass compose registered selected-family all14 Basic/Advanced, including mixed E3, original Worlds and Tech3+/Advanced Strongholds2+. Bare E3 World cards keep their original roster envelope without requiring Skills. Original36/38/50, cache, native setup/prices and selected-hand capability stay. Own-World fee/dial pools are disjoint; visitor returns retain typed homes and Suk cannot rescue fees. Earned support is not personal money or reserve funding. Original Nexus/Discovery/Semuta, shared Duke and Advanced role/effect guards remain.',
'Fresh registered all14 keeps original Tech3–6 Basic/Advanced, optional independent cards and supported Worlds, including mixed E3 without a Nexus dependency. Starting hands/cache, offers/Traitors and printed/first-Storm owners stay genuine. Native rates use actual stock/population at acceptance; normal Banker records the accepted Bank invoice, not net wallet change after separate income. No token owner, premature spendable grant or victory credit is assigned to simulate earned play. Original Nexus/Discovery/Semuta and effect-specific envelopes remain; played games are not converted.',