Allow battle cards while Sandtrout waits
Verify and publish checkpoint container / container (push) Successful in 10m47s

This commit is contained in:
Quintine committed 2026-11-16 17:02:50 +11:00
1 parent 2cea251afd
commit 338f2d8980
13 files changed
+471 -19

No files matched your search

+1 -1
View File
@@ -19871,7 +19871,7 @@ function reinforcementsModeSupported(g: Game) {
const nativeFamilies = !g.discoveries && !g.discoveryStash && !g.greatMaker &&
!g.semutaPreview && !g.kullPreview && !g.ecazOccupyPreview &&
g.expansions.length > 0 && independentCardRoster(g);
return !!g.ecazTreachery && recruitsModeSupported(g) && !g.sandtrout &&
return !!g.ecazTreachery && recruitsModeSupported(g) &&
(nativeFamilies || (g.ecazOccupyPreview === true && ecazOccupyCompositionSupported(g)) ||
((g.expansions.length === 0 || pairedEcaz) && g.players.every(player => {
const expansion = faction(player.faction).expansion;
+1 -1
View File
@@ -26,7 +26,7 @@ export function mirrorWeaponModeBlock(g: {
if (g.expansions.includes('ecaz') && (!g.advanced || g.expansions.includes('ix')) &&
(g.techTokens || g.strongholdCards))
return 'This E3 Stone/Mirror combination with Tech Tokens or Stronghold Cards remains outside this profile.';
if (g.homeworlds || g.nexusCards || g.leaderSkills || g.discoveries || g.sandtrout)
if (g.homeworlds || g.nexusCards || g.leaderSkills || g.discoveries)
return 'Mirror Weapon with combined optional modules is still being integrated.';
return null;
}
+6 -1
View File
@@ -1132,6 +1132,7 @@ export const RULE_TOPICS: RuleTopic[] = [
'Richese has three No-Fields, numbered zero, three and five. A concealed token counts as one force. Only one may be deployed on Arrakis, and consecutive own or allied shipments cannot use the same token.',
'In Basic play, your own single concealed No-Field may provisionally ship into an ally’s territory if it can legally enter; move it and any paid accompanying forces out before your turn ends. Paid companions require the High Richese Homeworld power. If the marker remains, reveal it and send its newly materialized forces to Tanks under the provisional no-departure policy. A zero marker reveals but contributes no casualties. Existing physical forces and the ally are not part of that new-visitor loss. Paired markers keep their separate guards.',
'A normal No-Field shipment pays the one-force price. The concealed token moves like a force. Before Battle, Richese may reveal it voluntarily; a token involved in battle is revealed with the Battle Plan. Revelation brings the indicated forces from reserves, limited by what remains there.',
'In supported Basic interruptions, a current-turn history of factual Truthtrance answers does not by itself block your reveal. Live promises and questions about future actions retain their existing safeguards.',
'In supported Basic games the voluntary reveal can also occur while CHOAM decides whether to prevent an already-declared free Revival. Reveal uses current reserves; the original Revival and CHOAM decision then continue once.',
'In supported Basic native games, voluntary revelation is also available during an Ix phase opening or selected auction and market decisions without replacing that decision. Other interruption windows remain unfinished.',
'In supported Basic games, your voluntary reveal can also interrupt a clean Emperor allied spice gift or extra-revival response, Tleilaxu revival-income response, Atreides Movement-phase Spice forecast without Bene Gesserit, or Guild’s own ordinary reserve-shipment rate response when the shipment enters a different territory from the marker. If Richese receives the extra revival, reveal from current reserves before that return. The original response and payment continue once; other interruptions remain guarded.',
@@ -1359,7 +1360,10 @@ export const RULE_TOPICS: RuleTopic[] = [
: definition.card.effect === 'semutaDrug'
? 'In the explicit Richese development preview, every seat sees a neutral response to supported clean discards. A CHOAM & Richese game may include the Ix deck: Thumper pauses before worm/spice draw; Amal pauses after halving spice before opening resumes. Other public sources include ordinary cards, paid Box, Ornithopter, Distrans, definite ordinary Truthtrance answers including queued questions, supported shipment promises and battle answers before or after plan submission/reveal, four clean Sapho scopes, pre-leader Residual Poison, printed Karama canceling clean CHOAM Charity, Inflation or Bene Gesserit Charity, a clean printed Karama normal-auction purchase or winning-bid payment before lot settlement, a completed CHOAM card sale after its bank income, clean Kulon Worthless disposal before its movement bonus, proactive or reactive La La La disposal before blocking free revival, proactive or reactive Baliset before restricting movement, proactive Trip to Gamont before its ordinary/elite return or native No-Field reveal and capped recall, accepted Jubba Cloak before storm protection, and three battle batches. A private normal-auction or Black Market Ixian ally replacement also pauses before drawing, without showing its face until a holder commits; original payment and seller income settle once. Cache purchases cannot use native Ixian allied replacement. Ordinary definite Truthtrance answers pause even when another question stays reserved or the answer bound a supported shipment or unsubmitted battle-plan promise. Submitted/revealed plans bind no new promise, but their answers still offer Semuta without changing the plan. Under the user-selected exchange ruling, Commit may replace Semuta even at your faction hand limit: acquisition and Semuta disposal settle atomically, without increasing your completed hand. Reserved incoming cards still need room. For multiple eligible cards, inspect and select exactly one after commitment. Saved effects resume once. Other private discards, Karama uses, other reactive Worthless uses, inspected Residual Poison battles, nested responses, other pending rewards and wider interactions remain unfinished.'
: 'Reference component only: this Richese card’s game actions are not enabled.',
...(definition.card.effect === 'semutaDrug' ? [
...(['mirrorWeapon', 'stoneBurner'].includes(definition.card.effect ?? '') ? [
'A waiting Sandtrout does not prevent this card in an otherwise supported battle.',
] : []),
...(definition.card.effect === 'semutaDrug' ? [
'In supported Basic Kull and Leader Skills games, with or without Nexus, the original Semuta claim or pass also follows a CHOAM or Ixian Ambassador discard, a clean Terror discard during a Fremen worm ride, or a completed Box search during an unsettled ordinary or Richese cache auction. The original Ambassador effect, worm queue or auction resumes once; other nested interactions remain provisional.',
'In supported Basic Moritani arrivals, Atomics may discard excess cards from Moritani and its ally. Semuta can privately select one card discarded by another player from that fresh batch. Losses, hand limits and Aftermath stay committed; the arrival resumes after claim or pass.',
'In fresh Basic games with Richese, classic opponents, the CHOAM deck and Tech Tokens, the existing Semuta preview is also enabled. Other module combinations remain separate; existing started games are not retrofitted.',
@@ -6734,6 +6738,7 @@ export const RULE_TOPICS: RuleTopic[] = [
summary: 'Add two to battle strength while paying three own reserve counters into the Tanks when the physical card is revealed.',
steps: [
'In the independent Ecaz Treachery Cards variant, place your held Reinforcements card in either battle-card slot; it is neither a weapon nor a defense. A category Prescience answer is None, not the name of this card. One physical card cannot fill both slots.',
'A waiting Sandtrout does not prevent Reinforcements in an otherwise supported battle.',
'Have three own forces in reserves when sealing. Classic/paired Ecaz/Moritani Basic/Advanced, clean selected Ix/CHOAM native/base rosters and explicitly selected native Advanced Occupy prototypes spend ordinary reserves first and then elite reserves, moving exactly three to corresponding Tanks subpools at resolution. These are the actual card holder’s reserves, not the variable ally’s pool; no extra forces arrive.',
'The normal-outcome score gains 2 without adding to the physical dial, spice support or on-board casualties. The card and its reserve cost are consumed even on a Traitor victory, a mutual Traitor result or a Lasgun/Shield explosion; successful Traitor calls still decide the outcome directly.',
'All-outcome payment and reserve transfer counting as battle losses remain provisional, not publisher rulings. The holder chooses an available ordinary/special reserve mix; older sealed plans without a choice retain normal-first payment. Same-plan Harass pays the original three-reserve fee before returns; returned reserves cannot fund it. In native Advanced Occupy, original/copied Stone ignores +2 normal score but still charges the fee. Basic Ecaz/Richese mixed-marker co-sides support the card; unprofiled armies and other card-specific limits remain guarded.',
+8 -4
View File
@@ -29,12 +29,16 @@ export function richeseRevealInterruptSupported(g: Game): boolean {
g.bureaucratPayments?.pending) return false;
// A mixed Truthtrance answer can create a private residual only for some
// hidden facts. Fence the whole public turn's history uniformly before
// examining those ledgers, so this projected availability cannot reveal
// which private branch was required.
// hidden facts. Fence non-fact questions uniformly before examining those
// ledgers, so this projected availability cannot reveal which private branch
// was required. A publicly identified pure fact creates no future residual.
// Historical saves without a complete public history retain their existing
// interruption behavior; fresh games initialize an explicit empty history.
if (!Array.isArray(g.truthHistory) || g.truthHistory.some(entry => entry.turn === g.turn)) return false;
if (!Array.isArray(g.truthHistory) || g.truthHistory.some(entry => {
if (entry.turn !== g.turn) return false;
const question = entry.question;
return question?.kind !== 'fact' && !(question?.kind === 'freeform' && question.scope === 'fact');
})) return false;
// An ordinary Guild reserve shipment is independent of Richese's reserves
// and marker when its destination is in a different territory. Its exact