Compose explicit native Leader Skills with Semuta continuations

game/engine.ts

@@ -5528,8 +5528,10 @@ function suspendedControlsIntegrity(
 function treacheryDiscardIntegrity(g: Game) {
   requireRule(g.semutaPreview === undefined || g.semutaPreview === true &&
     g.expansions.includes('choam') && !!byFaction(g, 'richese') &&
-    !g.homeworlds && !g.nexusCards && !g.leaderSkills && !g.discoveries &&
-    !g.discoveryEnabled && (!g.techTokens || nativeFactionTechProfile(g, true)) &&
+    !g.homeworlds && !g.nexusCards &&
+    (!g.leaderSkills || ordinaryLeaderSkillModeSupported(g)) && !g.discoveries &&
+    !g.discoveryEnabled && (!g.techTokens || (g.leaderSkills
+      ? nativeTechLeaderSkillsProfile(g) : nativeFactionTechProfile(g, true))) &&
     (!g.strongholdCards || nativeStrongholdFactionRoster(g)),
   'This Semuta preview no longer matches its original Richese profile.');
   const pending = g.pendingTreacheryDiscard;
@@ -9602,9 +9604,9 @@ export function initializeMoritaniAssassinateGameForAudit(state: Game): Game {
   initializeMoritaniAssassinateState(g);
   return g;
 }
-/** Development-only Semuta in fresh Richese games: original native Tech and
- * Advanced Stronghold compositions, or bounded Basic Moritani/E3. Public starts stay gated. */
-export function initializeSemutaGameForAudit(state: Game): Game {
+/** Development-only Semuta with original native Tech/Advanced Strongholds and
+ * explicit native skills, or bounded Basic Moritani/E3. Public starts stay gated. */
+export function initializeSemutaGameForAudit(state: Game, skills = false): Game {
   const nativeTerror = !state.advanced && state.expansions.length === 2 &&
     state.expansions.includes('choam') && state.expansions.includes('ecaz') &&
     state.players.some(p => p.faction === 'moritani') &&
@@ -9614,9 +9616,9 @@ export function initializeSemutaGameForAudit(state: Game): Game {
     state.expansions.includes('choam') &&
     (state.expansions.every(id => id === 'choam' || id === 'ix') || nativeTerror) &&
     state.players.some(p => p.faction === 'richese'),
-  'Semuta needs a fresh Richese faction game: CHOAM with optional Ix, original native Tech prerequisites and Advanced Stronghold Cards, or Basic native Moritani with CHOAM and Ecaz decks and classic opponents; other optional modules remain excluded.');
-  const g = state.strongholdCards
-    ? initializeStrongholdFactionsGameForAudit(state)
+  'Semuta needs a fresh Richese faction game: CHOAM with optional Ix, original Tech/Advanced Strongholds, and explicit native Basic Richese or Advanced E1/E2 Leader Skills; separate Basic Moritani uses CHOAM/Ecaz and classics without modules. Other overlays remain excluded.');
+  const g = skills ? initializeLeaderSkillsGameForAudit(state)
+    : state.strongholdCards ? initializeStrongholdFactionsGameForAudit(state)
     : initializeFactionExpansionsGameForAudit(state);
   g.semutaPreview = true;
   return g;

game/leader-skill-profile.ts

@@ -192,6 +192,12 @@ function discoveryLeaderSkillModulesSupported(game: LeaderSkillProfile): boolean
     !game.spiceBankerIncomePreview;
 }
 
+/** Recognize only the explicit overlay; native predicates still own roster/module legality. */
+function semutaLeaderSkillContext(game: LeaderSkillProfile): boolean {
+  return game.semutaPreview === true && !game.spiceBankerIncomePreview &&
+    game.expansions.includes('choam') && !!game.players?.some(p => p.faction === 'richese');
+}
+
 /** E1/E2 native skills may add Tech and Advanced Strongholds; original roster/decks remain. */
 function nativeLeaderSkillModulesSupported(game: LeaderSkillProfile): boolean {
   if (game.homeworlds) return homeworldLeaderSkillModulesSupported(game);
@@ -204,7 +210,7 @@ function nativeLeaderSkillModulesSupported(game: LeaderSkillProfile): boolean {
     (game.strongholdCards && game.advanced !== true) ||
     game.expansions.length < 1 || game.expansions.length > 2 ||
     game.homeworlds || game.nexusCards || game.discoveries || game.discoveryEnabled ||
-    game.ecazTreachery || game.semutaPreview ||
+    game.ecazTreachery || (game.semutaPreview && !semutaLeaderSkillContext(game)) ||
     game.moritaniAssassinatePreview || game.advancedPreview || game.kullPreview ||
     game.nexusKullPreview || game.guildBetrayalPreview || game.richeseBetrayalPreview ||
     game.nexusIxianReplacementPreview || game.nexusIxianBetrayalPreview ||
@@ -372,7 +378,8 @@ export function basicRicheseLeaderSkillsProfile(game: LeaderSkillProfile): boole
   const players = game.players;
   if (game.advanced !== false || game.expansions.length !== 1 ||
     game.expansions[0] !== 'choam' || !players || players.length < 2 || players.length > 6 ||
-    !nativeLeaderSkillModulesSupported(game) || game.semutaPreview || game.moritaniAssassinatePreview ||
+    !nativeLeaderSkillModulesSupported(game) ||
+    (game.semutaPreview && !semutaLeaderSkillContext(game)) || game.moritaniAssassinatePreview ||
     game.advancedPreview || game.kullPreview || game.nexusKullPreview ||
     game.guildBetrayalPreview || game.richeseBetrayalPreview ||
     game.nexusIxianReplacementPreview || game.nexusIxianBetrayalPreview ||
@@ -404,7 +411,8 @@ export function advancedNativeLeaderSkillsProfile(game: LeaderSkillProfile): boo
     game.expansions.length < 1 || game.expansions.length > 2 ||
     (game.expansions.length === 2 && game.expansions[0] === game.expansions[1]) ||
     !nativeLeaderSkillModulesSupported(game) ||
-    game.semutaPreview || game.moritaniAssassinatePreview || game.advancedPreview ||
+    (game.semutaPreview && !semutaLeaderSkillContext(game)) ||
+    game.moritaniAssassinatePreview || game.advancedPreview ||
     game.kullPreview || game.nexusKullPreview ||
     game.guildBetrayalPreview || game.richeseBetrayalPreview ||
     game.nexusIxianReplacementPreview || game.nexusIxianBetrayalPreview ||

game/reference.ts

@@ -1176,10 +1176,11 @@ export const RULE_TOPICS: RuleTopic[] = [
           'Mandatory and winner battle discards also pause before native Tleilaxu Face Dance. Claim or Continue preserves the original winner’s casualties and card cleanup, then restores the same private Face Dancer opportunity. Replacement, leader death and force sources remain native; the claimed Treachery card stays with its claimant, and no Face Dancer card becomes a Semuta target.',
           'Mandatory and winner battle discards also pause before quoted Advanced CHOAM force-payment income. Claim or Continue leaves the original amount unpaid through casualties and card cleanup, then opens the same allow/Karama response. Allow pays once; cancellation sends that income to the bank without refunding the original force payments. The original post-battle market still completes afterward.',
           'Mandatory and winner battle discards also pause before a native Auditor opportunity. Claim or Continue preserves the original survival limit and opponent-used card identities, then eligibility and the full cancellation price use the current opposing hand. A card acquired from the other combatant can be eligible if the audited player did not use it. Payment or private inspection resumes once; only CHOAM receives the historical snapshot.',
-          'Fresh three-through-six-seat Basic/Advanced Richese games with CHOAM and optional Ix may retain original unused Tech Tokens under the existing native roster prerequisites. Mandatory and winner discards now offer Semuta before the original winner takes one loser-owned token. Claim or Continue leaves every token and income ledger in place until original cleanup finishes; the winner’s selected award still precedes Face Dance. Advanced may additionally retain original unused Stronghold Cards at two through six seats; combining Tech requires three through six. The six separate public module cards remain unowned until the actual final Mentat assignment, using the board after effects such as Gamont. Neither Semuta claim nor its original closing CHOAM continuation awards a Stronghold Card early. Skills, other overlays and the separate Basic Moritani entry remain excluded.',
+          'Fresh three-through-six-seat Basic/Advanced Richese games with CHOAM and optional Ix may retain original unused Tech Tokens under the existing native roster prerequisites. Mandatory and winner discards now offer Semuta before the original winner takes one loser-owned token. Claim or Continue leaves every token and income ledger in place until original cleanup finishes; the winner’s selected award still precedes Face Dance. Advanced may additionally retain original unused Stronghold Cards at two through six seats; combining Tech requires three through six. The six separate public module cards remain unowned until the actual final Mentat assignment, using the board after effects such as Gamont. Neither Semuta claim nor its original closing CHOAM continuation awards a Stronghold Card early. Original Leader Skills require the explicit entry described below; other overlays and the separate Basic Moritani entry remain excluded.',
           'A mandatory loser-card discard may also offer Semuta while the original winner’s compulsory used card remains reserved. For native Ixians, claim or Continue settles the original casualties, then restores the one-for-one Suboid/Cyborg substitution and its Karama response. The winning used Poison Tooth is not discarded until substitution or decline finishes; only then is that physical Tooth a separate fresh target before optional winner cleanup.',
           'In the Basic native Moritani entry, winner compulsory/optional card discards may pause before the losing ally’s original retention choice. After that ally chooses one eligible played card or declines, native Karama finishes first; the completed unkept-card batch then offers Semuta. A kept or unrelated hand card is never a target. Multiple fresh cards require commitment and one private selection; taking a winner’s card does not add it to the original retention pool. Advanced Moritani, Nexus retention and unresolved casualty parents remain separate.',
           'A printed Karama canceling native Harkonnen capture, CHOAM Auditor or quoted battle income, Ixian casualty substitution, or Basic Moritani allied retention now offers that exact public cost before the original cancellation finishes. Claim or Continue restores the saved response and cancels once. Acquiring the cost card cannot restore a captive, inspect a hand, pay the canceled income, exchange casualties or keep the proposed allied card. Later native card cleanup and markets still finish; Worthless conversion, other cancellations and module combinations remain separate.',
+          'The explicit fresh Leader Skills entry composes Semuta with original all-fourteen-card native Basic Richese/CHOAM or Advanced E1/E2 setup, retaining original Tech and Advanced Stronghold prerequisites. Actual offers train original living discs; the native Auditor remains ineligible. A completed Hajr discard can resume the same Movement owner before an original private Mentat question. Mandatory loser disposal can resume trained Suk casualty rescue or Rihani’s normal private inspection and optional skilled exchange before winner cleanup. Winning compulsory Artillery stays held through the original skill, then becomes its own fresh Treachery discard. Traitor/Face Dancer movement is never a Semuta target; no rescue, question, inspection or exchange repeats. Basic Ix mixtures, E3, other module/Banker overlays and public starts stay separate.',
           'An ordinary Ghola played during battle also offers its consumed card after revival. Claim or Continue preserves the revived leader or forces and the opposing sealed plan, then normal planning resumes. It cannot revive again by resuming the receipt.',
           'A completed paid Nullentropy Box search during battle offers only the used Box. Claim or Continue preserves the two-spice payment, private recovered card, already-shuffled pile and sealed opposing plan. The recovered card may be used in normal legal planning; the search is not repeated.',
           'A clean Distrans transfer during battle also offers only the used Distrans. The private card has already reached its recipient; claim or Continue cannot repeat the gift or change a sealed plan. A recipient holding Semuta may claim the used Distrans and keep the already-transferred card.',