Offer Semuta on native Storm and worm cancellation costs

game/engine.ts

@@ -1,5 +1,6 @@
 import { ordinaryDiscardIncomeMatches } from './ordinary-discard-income';
 import { semutaTerminalArrivalSupported } from './semuta-terminal-arrival';
+import { semutaDisasterArrivalSupported } from './semuta-disaster-arrival';
 import { traitorDecisionChoices, bindTraitorDecisionPromise, settleTraitorDecisionPromises,
   reconcileTraitorDecisionPromises as reconcileTraitorDecisions, validateTraitorDecisionPromise,
   TraitorDecisionError, type TraitorDecisionContext, type TraitorDecisionPromise } from './traitor-decision-promises';
@@ -1576,7 +1577,7 @@ export type Game = {
           stateSignature: string;
         }
       | {
-          kind: 'karamaCharityDiscard' | 'karamaInflationDiscard' | 'karamaBgCharityDiscard' | 'karamaBattleDiscard' | 'karamaChoamWorthlessDiscard' | 'karamaEmperorShareDiscard' | 'karamaIncomeDiscard' | 'karamaShipmentDiscard' | 'karamaBgConversionCancelDiscard' | 'karamaRicheseAuctionDiscard' | 'karamaRicheseGiftDiscard' | 'karamaAuctionAdvantageDiscard' | 'karamaTerminalDiscard' | 'karamaMovementDiscard' | 'karamaRevivalDiscard';
+          kind: 'karamaCharityDiscard' | 'karamaInflationDiscard' | 'karamaBgCharityDiscard' | 'karamaBattleDiscard' | 'karamaChoamWorthlessDiscard' | 'karamaEmperorShareDiscard' | 'karamaIncomeDiscard' | 'karamaShipmentDiscard' | 'karamaBgConversionCancelDiscard' | 'karamaRicheseAuctionDiscard' | 'karamaRicheseGiftDiscard' | 'karamaAuctionAdvantageDiscard' | 'karamaTerminalDiscard' | 'karamaMovementDiscard' | 'karamaRevivalDiscard' | 'karamaDisasterDiscard';
           player: string;
           card: string;
           use: Extract<KaramaUse, { kind: 'cancel' }>;
@@ -5929,9 +5930,31 @@ function semutaRevivalKaramaResponse(g: Game, response: ResponseWindow, player:
     throw error;
   }
 }
+/** Keep traversal/devouring native and deferred. The spent card is no longer
+ * a held cost, and no allowed outcome or subsequent worm is executed here. */
+function semutaDisasterKaramaResponse(g: Game, response: ResponseWindow, player: string): boolean {
+  if (!['stormProtection','wormPlacement','wormAllyProtection','wormSurvival'].includes(response.kind) ||
+      g.battle || g.decision || g.phaseOpening || g.pendingKarama || g.truthtrance ||
+      g.pendingRevival || g.pendingShipment || g.pendingGuildTransport || g.pendingHomeworldShipment ||
+      g.pendingFremenMove || g.pendingIxMove || g.pendingMobileMove || g.pendingChoamMove ||
+      g.pendingSpiritualAdvisor || g.pendingAmbassador || g.pendingTerrorEntry ||
+      g.pendingArrivalOverlap || !semutaDisasterArrivalSupported(g,response) || g.ornithopter ||
+      (g.homeworldRevivalReturn && g.homeworldRevivalReturn.stage !== 'complete') ||
+      (g.ecologicalStorm && g.ecologicalStorm.stage !== 'complete') ||
+      (g.greatMaker && g.greatMaker.stage !== 'complete') ||
+      g.choamMarket || g.pendingChoamMarketGhola) return false;
+  const context: Game = {...g,pendingTreacheryDiscard:null,response};
+  try {
+    validateKaramaUse(context,getPlayer(context,player),{kind:'cancel',response});
+    return true;
+  } catch (error) {
+    if (error instanceof RuleError) return false;
+    throw error;
+  }
+}
 type KaramaResponseDiscardContinuation = Extract<
   NonNullable<Game['pendingTreacheryDiscard']>['continuation'],
-  { kind: 'karamaCharityDiscard' | 'karamaInflationDiscard' | 'karamaBgCharityDiscard' | 'karamaBattleDiscard' | 'karamaChoamWorthlessDiscard' | 'karamaEmperorShareDiscard' | 'karamaIncomeDiscard' | 'karamaShipmentDiscard' | 'karamaBgConversionCancelDiscard' | 'karamaRicheseAuctionDiscard' | 'karamaRicheseGiftDiscard' | 'karamaAuctionAdvantageDiscard' | 'karamaTerminalDiscard' | 'karamaMovementDiscard' | 'karamaRevivalDiscard' }
+  { kind: 'karamaCharityDiscard' | 'karamaInflationDiscard' | 'karamaBgCharityDiscard' | 'karamaBattleDiscard' | 'karamaChoamWorthlessDiscard' | 'karamaEmperorShareDiscard' | 'karamaIncomeDiscard' | 'karamaShipmentDiscard' | 'karamaBgConversionCancelDiscard' | 'karamaRicheseAuctionDiscard' | 'karamaRicheseGiftDiscard' | 'karamaAuctionAdvantageDiscard' | 'karamaTerminalDiscard' | 'karamaMovementDiscard' | 'karamaRevivalDiscard' | 'karamaDisasterDiscard' }
 >;
 function karamaResponseDiscardSignature(g: Game, c: KaramaResponseDiscardContinuation) {
   const battle = c.kind === 'karamaBattleDiscard';
@@ -5946,6 +5969,7 @@ function karamaResponseDiscardSignature(g: Game, c: KaramaResponseDiscardContinu
   const terminal = c.kind === 'karamaTerminalDiscard';
   const movement = c.kind === 'karamaMovementDiscard';
   const revival = c.kind === 'karamaRevivalDiscard';
+  const disaster = c.kind === 'karamaDisasterDiscard';
   return JSON.stringify({
     player: c.player, card: c.card, use: c.use,
     parent: nullentropyParentSignature(g, c.resume,
@@ -6070,12 +6094,33 @@ function karamaResponseDiscardSignature(g: Game, c: KaramaResponseDiscardContinu
         leaderRevived:p.leaderRevived, cycle:p.revivalCycle, ecazCohort:p.ecazRevivalCohort,
         gholaBlocked:p.gholaBlocked, leaders:p.leaders, kwisatz:p.kwisatz})),
     } : undefined,
+    disaster: disaster ? {
+      active:g.active, ready:g.ready, remaining:g.movementRemaining,
+      storm:g.storm, pending:g.stormPending, resolution:g.stormResolution,
+      dials:g.stormDials, dialers:g.stormDialers, card:g.stormCard, known:g.stormCardKnown,
+      source:g.stormMovementSource, wall:g.shieldWallDestroyed, spice:g.spice,
+      deck:g.spiceDeck, discard:g.spiceDiscard, sequence:g.spiceSequence,
+      deferred:g.spiceResolution, window:g.spiceWindow, nexus:g.nexus,
+      rides:g.wormRides, placementBlocked:g.wormPlacementCanceledTurn,
+      summoned:g.summonedWorm, beforeBlow:g.summonedBeforeBlow,
+      nexusBeforeRides:g.summonedNexusBeforeRides, sandtrout:g.sandtrout,
+      arrival:g.pendingArrivalReaction, alliedShipment:g.basicAlliedShipment,
+      positions:g.playerPositions, mobile:g.mobileStronghold,
+      ecological:g.ecologicalStorm, maker:g.greatMaker,
+      homeworlds:g.homeworlds, occupation:g.homeworldOccupationHistory,
+      homeworldProgress:g.homeworldRevivalProgress, tech:g.techTokens, skills:g.leaderSkills,
+      fremenProtection:g.nexusFremenProtection, cunningOffer:g.nexusFremenCunningOffer,
+      cunningRides:g.nexusFremenCunningRides, nexusCards:g.nexusCards,
+      players:g.players.map(p => ({id:p.id, leaders:p.leaders, kwisatz:p.kwisatz,
+        advisors:p.advisors, noField:p.noField, noFieldEvent:p.noFieldEvent,
+        wormBlocked:p.fremenNexusWormBlockedTurn})),
+    } : undefined,
     order: g.order,
     players: g.players.map(p => ({
       id: p.id, faction: p.faction, ally: p.ally,
       hand: p.hand.map(card => card.id), spice: p.spice,
-      shipped: income || shipment || conversion || terminal || movement ? p.shipped : undefined,
-      physical: battle || worthless || income || shipment || conversion || terminal || movement || revival
+      shipped: income || shipment || conversion || terminal || movement || disaster ? p.shipped : undefined,
+      physical: battle || worthless || income || shipment || conversion || terminal || movement || revival || disaster
         ? { forces: p.forces, reserves: p.reserves, tanks: p.tanks,
           elites: p.elites, leaders: battle ? p.leaders : undefined,
           noField: shipment ? p.noField : undefined,
@@ -6992,6 +7037,7 @@ function treacheryDiscardIntegrity(g: Game) {
     continuation?.kind === 'karamaTerminalDiscard' ||
     continuation?.kind === 'karamaMovementDiscard' ||
     continuation?.kind === 'karamaRevivalDiscard' ||
+    continuation?.kind === 'karamaDisasterDiscard' ||
     continuation?.kind === 'karamaShipmentDiscard' ||
     continuation?.kind === 'karamaBgConversionCancelDiscard') {
     const c = continuation, entry = batch.entries[0];
@@ -7028,6 +7074,8 @@ function treacheryDiscardIntegrity(g: Game) {
           semutaMovementKaramaResponse(g,c.use.response,c.player)) ||
         (c.kind === 'karamaRevivalDiscard' &&
           semutaRevivalKaramaResponse(g,c.use.response,c.player)) ||
+        (c.kind === 'karamaDisasterDiscard' &&
+          semutaDisasterKaramaResponse(g,c.use.response,c.player)) ||
         (c.kind === 'karamaShipmentDiscard' &&
           semutaGuildShipmentKaramaResponse(g, c.use.response)) ||
         (c.kind === 'karamaBgConversionCancelDiscard' &&
@@ -7934,6 +7982,7 @@ function semutaOfferSupported(
   const terminalDiscard = continuation.kind === 'karamaTerminalDiscard';
   const movementDiscard = continuation.kind === 'karamaMovementDiscard';
   const revivalDiscard = continuation.kind === 'karamaRevivalDiscard';
+  const disasterDiscard = continuation.kind === 'karamaDisasterDiscard';
   const bgDiscard = continuation.kind === 'bgKaramaCostDiscard' ||
     continuation.kind === 'karamaBgConversionCancelDiscard';
   const ambassadorDiscard = continuation.kind === 'ambassador';
@@ -7972,7 +8021,7 @@ function semutaOfferSupported(
     continuation.kind !== 'karamaChoamWorthlessDiscard' &&
     continuation.kind !== 'karamaEmperorShareDiscard' &&
     continuation.kind !== 'karamaIncomeDiscard' &&
-    !richeseDiscard && !auctionAdvantageDiscard && !terminalDiscard && !movementDiscard && !revivalDiscard &&
+    !richeseDiscard && !auctionAdvantageDiscard && !terminalDiscard && !movementDiscard && !revivalDiscard && !disasterDiscard &&
     continuation.kind !== 'karamaShipmentDiscard' &&
     continuation.kind !== 'karamaShipmentPriceDiscard' &&
     continuation.kind !== 'specialKaramaDiscard' &&
@@ -8009,7 +8058,7 @@ function semutaOfferSupported(
         continuation.promise.kind === 'shipment' ||
         continuation.promise.kind === 'movement' ||
         continuation.promise.kind === 'battle'))) return false;
-  if (g.homeworlds && !bgDiscard && !richeseDiscard && !auctionAdvantageDiscard && !terminalDiscard && !movementDiscard && !revivalDiscard && continuation.kind !== 'kaitainDiscard' &&
+  if (g.homeworlds && !bgDiscard && !richeseDiscard && !auctionAdvantageDiscard && !terminalDiscard && !movementDiscard && !revivalDiscard && !disasterDiscard && continuation.kind !== 'kaitainDiscard' &&
       continuation.kind !== 'tupileCleanupDiscard' &&
       continuation.kind !== 'karamaIncomeDiscard' &&
       continuation.kind !== 'karamaShipmentDiscard' &&
@@ -8116,6 +8165,7 @@ function semutaOfferSupported(
       terminalDiscard ||
       movementDiscard ||
       revivalDiscard ||
+      disasterDiscard ||
       continuation.kind === 'karamaShipmentDiscard'
       ? (continuation.kind === 'karamaBattleDiscard'
         ? semutaBattleKaramaResponse(g, continuation.use.response)
@@ -8135,6 +8185,8 @@ function semutaOfferSupported(
                 ? semutaMovementKaramaResponse(g,continuation.use.response,continuation.player)
               : revivalDiscard
                 ? semutaRevivalKaramaResponse(g,continuation.use.response,continuation.player)
+              : disasterDiscard
+                ? semutaDisasterKaramaResponse(g,continuation.use.response,continuation.player)
               : continuation.kind === 'karamaShipmentDiscard'
                 ? semutaGuildShipmentKaramaResponse(g, continuation.use.response)
                 : ['choamCharity', 'choamInflation', 'bgCharity'].includes(continuation.resume.response?.kind ?? '')) &&
@@ -8173,6 +8225,7 @@ function semutaOfferSupported(
         terminalDiscard ||
         movementDiscard ||
         revivalDiscard ||
+        disasterDiscard ||
         continuation.kind === 'karamaShipmentDiscard' ||
         ((continuation.kind === 'ordinaryCardDiscard'
           ? ordinaryDiscardIncomeMatches(g, continuation)
@@ -8532,6 +8585,7 @@ function finishTreacheryDiscard(g: Game, claim?: { player: string; card: string
     next.kind === 'karamaTerminalDiscard' ||
     next.kind === 'karamaMovementDiscard' ||
     next.kind === 'karamaRevivalDiscard' ||
+    next.kind === 'karamaDisasterDiscard' ||
     next.kind === 'karamaShipmentDiscard' ||
     next.kind === 'karamaBgConversionCancelDiscard' ||
     next.kind === 'karamaPurchaseDiscard' ||
@@ -15889,6 +15943,7 @@ function spendKarama(g: Game, p: Player, card: Card, use: KaramaUse, kullOffered
       semutaTerminalKaramaResponse(g,use.response,p.id) ||
       semutaMovementKaramaResponse(g,use.response,p.id) ||
       semutaRevivalKaramaResponse(g,use.response,p.id) ||
+      semutaDisasterKaramaResponse(g,use.response,p.id) ||
       guildShipmentDiscard || bgConversionCancelDiscard)) {
     const continuation: KaramaResponseDiscardContinuation = {
       kind: bgConversionCancelDiscard ? 'karamaBgConversionCancelDiscard'
@@ -15899,6 +15954,7 @@ function spendKarama(g: Game, p: Player, card: Card, use: KaramaUse, kullOffered
         : ['advisor','atreidesSpice','stormPeek','faceDancerReplacement'].includes(use.response.kind) ? 'karamaTerminalDiscard'
         : ['fremenMovement','ixMovement','mobileStronghold','guildTiming'].includes(use.response.kind) ? 'karamaMovementDiscard'
         : ['choamRevival','revivalLimit','revivalDiscount','earlyRevival','foreignGhola'].includes(use.response.kind) ? 'karamaRevivalDiscard'
+        : ['stormProtection','wormPlacement','wormAllyProtection','wormSurvival'].includes(use.response.kind) ? 'karamaDisasterDiscard'
         : use.response.kind === 'choamCharity' ? 'karamaCharityDiscard'
         : use.response.kind === 'choamInflation'
           ? 'karamaInflationDiscard'

game/reference.ts

@@ -1292,6 +1292,7 @@ export const RULE_TOPICS: RuleTopic[] = [
           'Printed-role Karama stopping Atreides auction inspection, Ixian auction preparation or Advanced Technology also offers its exact cost before prevention. Claim or Continue resumes the original lot or ordinary draw once, without new inspection, extra Ix choice or exchange. Technology stays used and its original unseen lot remains; the native Atreides peek follows. If outgoing Semuta was selected for that now-prevented exchange, only that reservation releases so Semuta can claim the counter’s cost. Other commitments and independent knowledge remain.',
           'Printed-role Karama stopping clean native Tleilaxu revival income offers that exact used cost before income prevention. The ordinary or Ghola revival has already completed: returned forces/leaders, actual payment, normal/free/elite allowance use and the free-income history stay unchanged. Claim or Continue withholds the original income once; taking its counter cannot repeat the revival or recover an already discarded Ghola. Ghola’s own earlier discard is a separate opportunity. Unfinished battle, Ambassador, market and arrival parents retain their separate boundaries.',
           'Printed-role Karama stopping a clean native CHOAM revival benefit, Tleilaxu granted force limit or discount, early leader revival or Advanced foreign Ghola also offers its exact used cost. The original request stays unpaid and its counters or leader stay in the Tanks through the offer. Claim or Continue finishes the original prevention once: native rules may abandon the request, reprice it, open its remaining response or complete an affordable return. Unfunded repricing returns nothing and consumes no allowance. Any income follows the actual return once; taking Karama cannot repeat the request. Other unfinished parents remain separate.',
+          'Printed-role Karama stopping native Fremen Storm protection, worm survival, allied worm protection or Advanced additional-worm placement offers its exact used cost before prevention. Claim or Continue finishes that cancellation once. Storm entry keeps its already-deposited cohort and queued arrival through the offer; denial then kills that original group without shipping again. Storm traversal, devouring, later survival responses, Spice draws and rides remain native. A summoned worm retains its own saved parent until native completion. Other unfinished parents retain their separate boundaries.',
           'Printed-role Karama stopping ordinary Basic Spiritual Advisors, Atreides Movement foresight, Advanced Fremen Storm knowledge or native Face Dancer replacement also offers its exact used cost. Claim or Continue finishes that original prevention once. The paid shipment and remaining turn stay intact; the stopped free packet is not placed. Foresight gains no new knowledge or draw. An original Bene Gesserit stance or Guild opening choice waits unchanged until the Atreides cost finishes. A stopped replacement retains the original Face Dancers and reserve, with its attempt still used. Storm opening acknowledgements must finish before cancellation; they are never bypassed or repeated. Complex Spiritual and arrival parents remain separate.',
           'Printed-role Karama stopping ordinary native Fremen range, Cyborg range, Advanced Guild timing or HMS movement/collection also offers its exact used cost. Claim or Continue completes the original denial once. Fremen and Ixian forces remain in place with their move unused and current-use restriction intact; choose a legal replacement. Guild follows the original remaining queue under its native timing lock. A canceled HMS route neither relocates nor collects; only after the fresh cost finishes does the original Storm turn begin, including its normal Advanced card handling. No declaration, payment, movement, collection or turn opening repeats. Card-flight and other complex parents retain their separate boundaries.',
           '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.',
@@ -1434,6 +1435,11 @@ export const RULE_TOPICS: RuleTopic[] = [
                   'tests/semuta-revival-benefits-forces-engine.test.ts',
                   'tests/fixture-semuta-revival-benefits-leaders.ts',
                   'tests/semuta-revival-benefits-leaders-engine.test.ts',
+                  'game/semuta-disaster-arrival.ts',
+                  'tests/fixture-semuta-disaster-storm.ts',
+                  'tests/semuta-disaster-storm-engine.test.ts',
+                  'tests/fixture-semuta-disaster-worm.ts',
+                  'tests/semuta-disaster-worm-engine.test.ts',
                   'tests/fixture-semuta-spiritual-foresight.ts',
                   'tests/semuta-spiritual-foresight-engine.test.ts',
                   'tests/fixture-semuta-storm-dancer.ts',

game/semuta-disaster-arrival.ts

@@ -0,0 +1,23 @@
+import type { Game, ResponseWindow } from './engine';
+import { location, validGameLocation } from './board';
+
+/** Native Fremen Storm entry is already deposited; its earned arrival waits
+ * behind protection. The disaster validator owns physical cohort validation. */
+export function semutaDisasterArrivalSupported(g: Game, response: ResponseWindow): boolean {
+  const arrivals = g.pendingArrivalReaction;
+  if (!arrivals?.length) return true;
+  if (response.kind !== 'stormProtection' || response.resume !== 'shipment' ||
+      !Array.isArray(arrivals) || arrivals.length !== 1 || !g.advanced || g.phase !== 5) return false;
+  const entry = arrivals[0];
+  if (!entry || Object.keys(entry).sort().join(',') !==
+      'amount,cause,elite,entrant,phase,resume,sector,territory,turn' ||
+      entry.turn !== g.turn || entry.phase !== g.phase ||
+      entry.cause !== 'shipment' || entry.resume !== 'none' ||
+      entry.entrant !== response.owner || entry.entrant !== g.active ||
+      entry.amount !== response.amount || entry.elite !== (response.elite ?? 0) ||
+      !validGameLocation(g,entry.territory,entry.sector) ||
+      location(entry.territory,entry.sector) !== response.location) return false;
+  const entrant = g.players.find(p => p.id === entry.entrant);
+  return entrant?.faction === 'fremen' && entrant.shipped === true &&
+    !!g.movementRemaining?.includes(entrant.id);
+}