From 20cc6057e912de79ccd7c0e3d5fa6f42c54fc76a Mon Sep 17 00:00:00 2001
From: Quintine <15965533+Quintine@users.noreply.github.com>
Date: Sun, 20 Sep 2026 14:54:52 +1000
Subject: [PATCH] Connect unmodified Smuggler battle collection
New Leader Skills battles bind territory spice to the public plan reveal and automatically pay the controlling player once the selected Smuggler survives, including a loser or captive with no surviving forces. Cap collection at the original single pile and unmodified disc strength. Pending spice cannot fund a plan. Settlement before Sandmaster's after-win addition remains an explicitly documented timing inference; modified strength, multiple positive piles and other module combinations remain gated pending the existing rulings and integration.
Share pre-seal admission across server, controls and all four bot profiles. Expose the public Ecaz card-variant flag so its guard also works in private views. Normalize the selected Kwisatz value once for UI validation and submission. Fix AI selection of unavailable native face-up skilled discs. Show reveal-time pending guidance and an automatic collection notice/chronicle without a new confirmation. Keep unversioned saved battles on their existing behavior.
Bind saved receipts to the original battle, controller, leader, plans, posture and pile; project no internal binding frame. Void collection on leader death, opposing/mutual Traitors and explosion without restoring destroyed spice. Apply captured-leader settlement before normal custody cleanup. Existing room versioning prevents concurrent final votes from paying twice.
Twelve new engine/SQLite tests cover Basic/Advanced winners and losers, caps, empty piles, zero remaining forces, weapon/Traitor/explosion outcomes, captive survival/death custody, Sandmaster ordering, corrupted receipts, immutable pre-seal guards, legacy continuation, legal paths for four profiles and authenticated concurrent/restarted settlement. Independent review prompted the Ecaz gate and stale-Kwisatz corrections and found no further material defect in the bounded delta. A focused regression also identified the missing public Ecaz configuration field, now projected.
Types, lint, 4884 offline tests, production build and 43 HTTP tests passed on the unchanged source fingerprint. Two genuine four-profile Leader Skills samples completed in 265 Basic and 211 Advanced actions with no rejected candidates and 14 JSON/private-view restorations; neither sampled game naturally exercised Smuggler collection, so focused and browser evidence establish that effect.
In isolated browser room YWV8AGKS, the Emperor selected Smuggler, sealed a zero dial, saw six pending spice without early credit, refreshed the pending decision and submitted no Traitor. After the opponent's production-engine final action, the browser showed the 6-8 loss, automatic six-spice collection, explanatory chronicle and restored balance 26 after another refresh. Opponent/setup staging was private and confined to the new QA room. Screenshot acceptance remains open. An initial private verification script compared SQLite null-prototype rows with parsed JSON too strictly; the transaction rolled back and the corrected content comparison passed.
After the reported outage the server was healthy and the previous private QA seat restored. All 1106 baseline rooms, 2314 seats and every original recovery, entry and handover row remain byte-for-byte unchanged; the HTTP/browser checks added 34 rooms and 71 seats. SQLite integrity and foreign keys pass. No restart, migration, database reset or automation was needed. No mode, module or publication gate is opened.
Verified source tree: dc55a36f7bfe108d6529b2e42add019d212648e6c17772b36e06fe73f9443265
---
components/game-table.tsx | 24 ++-
components/leader-skill-battle-guide.tsx | 6 +-
docs/CURRENT_STATUS.md | 24 +--
docs/IMPLEMENTATION_STATUS.md | 16 ++
docs/LEADER_SKILLS_RULES.md | 5 +-
docs/LEADER_SKILLS_RUNTIME.md | 7 +-
docs/RULE_DECISIONS.md | 4 +-
docs/SMUGGLER_BATTLE.md | 66 +++++++++
game/bots.ts | 8 +-
game/engine.ts | 74 +++++++++-
game/reference.ts | 13 +-
game/smuggler-battle.ts | 79 ++++++++++
tests/fixture-smuggler-battle.ts | 34 +++++
tests/smuggler-battle-recovery.test.ts | 62 ++++++++
tests/smuggler-battle.test.ts | 179 +++++++++++++++++++++++
15 files changed, 564 insertions(+), 37 deletions(-)
create mode 100644 docs/SMUGGLER_BATTLE.md
create mode 100644 game/smuggler-battle.ts
create mode 100644 tests/fixture-smuggler-battle.ts
create mode 100644 tests/smuggler-battle-recovery.test.ts
create mode 100644 tests/smuggler-battle.test.ts
diff --git a/components/game-table.tsx b/components/game-table.tsx
index 4ca147eb..560ef210 100644
--- a/components/game-table.tsx
+++ b/components/game-table.tsx
@@ -51,6 +51,7 @@ import { Distrans } from './distrans';
import { JuiceOfSapho } from './juice-of-sapho';
import { LeaderSkillsPanel } from './leader-skills';
import { LeaderSkillBattleGuide } from './leader-skill-battle-guide';
+import { smugglerBattleModeSupported, smugglerBattlePlanBlock } from '@/game/smuggler-battle';
import { RihaniChoice, RihaniHistory } from './rihani-decipherer';
import { MentatQuestion, MentatHistory } from './mentat-question';
import { BureaucratPayment } from './bureaucrat-payment';
@@ -469,6 +470,14 @@ export function GameTable({
const selectedDefenseId = battlePlanCardValue(g, 'defense', defense);
const selectedBattleWeapon = me.hand?.find(c => c.id === selectedWeaponId);
const selectedBattleDefense = me.hand?.find(c => c.id === selectedDefenseId);
+ const selectedBattleKwisatz = kwisatz && !!me.kwisatz?.active &&
+ !me.kwisatz.dead && !g.battle?.kwisatzBlocked &&
+ (!me.kwisatz.usedAt || me.kwisatz.usedAt === g.battle?.territory);
+ const smugglerPlanReason = g.battle?.smugglerCollectionEnabled ? smugglerBattlePlanBlock({
+ assignments: g.leaderSkills?.assignments.filter(a => a.controller === me.id) ?? [],
+ leader: me.leaders.find(l => l.id === selectedBattleLeader), weapon: selectedBattleWeapon,
+ defense: selectedBattleDefense, kwisatz: selectedBattleKwisatz,
+ }, smugglerBattleModeSupported(g), { territory: g.battle.territory, spice: g.spice }) : null;
const battlePairValid = validBattleSlotPair(selectedBattleWeapon, selectedBattleDefense,
!!selectedBattleWeapon && planetologistSpecial(selectedBattleWeapon));
const harassControl = harassWithdrawControlState(g.battle?.harassWithdraw,
@@ -4415,6 +4424,10 @@ export function GameTable({
) : [g.battle.attacker, g.battle.defender].includes(me.id) ? (
g.battle.revealed ? (
<>
+ {g.battle.smugglerCollection &&
+ {g.players.find(p => p.id === g.battle!.smugglerCollection!.player)?.name}’s Smuggler has {g.battle.smugglerCollection.amount} spice pending from the reveal-time pile.
+ Collection is automatic if the leader survives, even after a defeat. That spice is not yet spendable.
+
}
{!g.battle.traitorSubmitted.includes(me.id) && (
<>
{actionButton(
@@ -4438,6 +4451,7 @@ export function GameTable({
) : (
<>
+ {smugglerPlanReason && {smugglerPlanReason}
}
{g.battle.insight && (
{committed[g.battle.insight.field]
@@ -4712,19 +4726,13 @@ export function GameTable({
!g.battle.fremenSupportBlocked
? 0
: battleSupport,
- kwisatz:
- kwisatz &&
- !!me.kwisatz?.active &&
- !me.kwisatz.dead &&
- !g.battle.kwisatzBlocked &&
- (!me.kwisatz.usedAt ||
- me.kwisatz.usedAt === g.battle.territory),
+ kwisatz: selectedBattleKwisatz,
dial: battleDial,
leader,
weapon,
defense,
}),
- !!stonePlanReason || !!harassControl.blocked || !battlePairValid,
+ !!stonePlanReason || !!harassControl.blocked || !!smugglerPlanReason || !battlePairValid,
)}
) : (
diff --git a/components/leader-skill-battle-guide.tsx b/components/leader-skill-battle-guide.tsx
index 87c565d1..35cfd4bc 100644
--- a/components/leader-skill-battle-guide.tsx
+++ b/components/leader-skill-battle-guide.tsx
@@ -12,12 +12,16 @@ export function LeaderSkillBattleGuide({ game, leader }: { game: GameView; leade
const bureaucrat = usesSurvivingSkilledLeader(assignments, 'bureaucrat', leader, true);
const sandmaster = usesSurvivingSkilledLeader(assignments, 'sandmaster', leader, true);
const rihani = usesSurvivingSkilledLeader(assignments, 'rihani-decipherer', leader, true);
- if (!mentat && !bureaucrat && !sandmaster && !rihani) return null;
+ const smuggler = usesSurvivingSkilledLeader(assignments, 'smuggler', leader, true);
+ if (!mentat && !bureaucrat && !sandmaster && !rihani && !smuggler) return null;
return
{mentat &&
Mentat adds 2 to this leader’s battle strength if the leader survives.
}
{bureaucrat &&
Bureaucrat subtracts {leaderSkillStrongholdCount(game, opponent)} from your opponent’s battle total if your leader survives. Count each occupied stronghold once, including contested strongholds. Advisors do not count.
}
{sandmaster &&
If this Sandmaster survives and wins, add 3 spice to the territory’s existing spice pile automatically. No spice is added when the territory has no spice.
}
{rihani &&
If this Rihani Decipherer survives and wins, you may draw two Traitors and exchange an unused old card for one of them. A native Rihani also privately inspects two deck cards first.
}
+ {smuggler &&
{game.battle!.smugglerCollectionEnabled
+ ? 'Smuggler records spice in this territory when both plans reveal, capped by this leader’s unmodified strength. If the leader survives, collect it automatically even if you lose or have no forces left. Pending spice cannot fund this plan. Strength modifiers and combined modules remain under review.'
+ : 'This saved battle predates automatic Smuggler collection. Its original battle behavior is preserved; new battles use the current collection flow.'}
}
{(mentat || bureaucrat) &&
These score effects resolve automatically. They do not change the leader’s printed value or spice bounty.
}