Connect expansion faction setup and saved Ixian auction decline
Add a local faction-only prototype profile for all seven nonempty expansion selections, genuine Basic/Advanced initialization and existing private setup, controls, AI and saved continuation. Ecaz allocates six forces across Imperial Basin sectors and retains fourteen reserves before later setup; preserve Fremen, Advanced BG and Moritani ordering with printed and inferred boundaries explicit. Keep optional Ecaz Treachery cards separate, ordinary deck counts 33/35/47, and Richese cache separate. Public start and publication gates remain closed. Replace the Advanced Ixian/Richese pre-offer stop with an explicit per-lot Ixian decline. Bind the saved original offer to its round, turn, owner, independent event, exact card custody and terms before view/action/normalization. Decline resumes that unchanged lot once without using Technology; later normal lots still offer the exchange. Protect reserved cards across transfers, spending and random Harkonnen exchange, and preserve legitimate Gift/Truthtrance interruptions. The actual special-lot exchange still awaits replacement-custody interpretation. Validation: focused setup, rules, UI/bot, private JSON/SQLite reload and concurrent CAS tests and independent custody/persistence review passed. Typecheck, lint, 4573 offline tests, production build and 43 HTTP tests passed. Browser Ecaz setup rejected an incomplete total, saved a 2/2/2 split, and refreshed to fourteen reserves and unchanged private cards. A separate genuine Advanced QA game restored the Ixian choice; explicit decline opened the unchanged cache lot with legal bidding and retained private hand, spice, pool count and unused Technology after refresh. Five of six genuine four-profile samples finish: CHOAM Basic 1054 actions/28 JSON restores, CHOAM Advanced 225/6, Ecaz Basic 91/2, Ecaz Advanced 523/14, all-three Basic 476/12. Combined Advanced passes three former auction stops and reaches turn three/action614 with 16 restores, then hits an existing CHOAM movement/Ambassador arrival guard. Ecaz samples also include guarded arrival candidates with legal alternatives. Full combined play is not certified; arrival integration is the next gap. Retain initial failed logs, including a corrected private harness sold-card receipt alias. After the outage, all 597 opening rooms and original seat/recovery records were preserved (632 after QA/HTTP). A stale development module cache required restart after a fresh 598-room backup; all 598 matched afterward and the QA seat restored. Final integrity and foreign keys passed. No database reset, recurring automation or publication. Verified source tree: 5e2ff244a1167f2834bb46d609b8de914a34f7049ff7b06046243068c0935131
This commit is contained in:
1 parent
f067950f5e
commit
cab2f1c42d
26 files changed
+3001
-58
No files matched your search
@@ -1,4 +1,6 @@
|
||||
'use client';
|
||||
import { EcazSetup } from './ecaz-setup';
|
||||
import { IxRicheseTechnology } from './ix-richese-technology';
|
||||
import { nexusGuildCunningAction, nexusGuildCunningActive, nexusGuildMovementAvailable, nexusGuildShipmentAvailable, nexusGuildSkipShipmentAction } from '@/game/nexus-guild-cunning-options';
|
||||
import {
|
||||
matchesShipment,
|
||||
@@ -206,6 +208,7 @@ export function GameTable({
|
||||
const turnOwnerName = g.players.find((p) => p.id === turnOwner)?.name;
|
||||
const setupStage = g.setupStage;
|
||||
const setupFremen = g.players.find((p) => p.faction === 'fremen');
|
||||
const setupEcaz = g.players.find((p) => p.faction === 'ecaz');
|
||||
const setupSisterhood = g.players.find((p) => p.faction === 'beneGesserit');
|
||||
const setupPendingNames = (g.setupPending ?? [])
|
||||
.filter((id) => id !== me.id)
|
||||
@@ -213,6 +216,7 @@ export function GameTable({
|
||||
.filter(Boolean)
|
||||
.join(', ');
|
||||
const waitingForFremen = !!setupFremen && setupFremen.reserves !== 10;
|
||||
const waitingForEcaz = setupStage === 'forces' && !!setupEcaz && setupEcaz.reserves === 20;
|
||||
const setupStatus =
|
||||
setupStage === 'leaderSkills'
|
||||
? g.leaderSkills?.offer
|
||||
@@ -235,6 +239,10 @@ export function GameTable({
|
||||
? 'Place your ten starting forces. Bene Gesserit places its advisor afterward.'
|
||||
: g.leaderSkills ? 'Place your ten starting forces. Starting cards were already dealt before skill assignment.' : 'Place your ten starting forces. Starting cards are dealt automatically after placement.'
|
||||
: `Waiting for ${setupFremen.name} to place the Fremen starting forces.`
|
||||
: waitingForEcaz
|
||||
? setupEcaz.id === me.id
|
||||
? 'Place your six starting forces among the sectors of Imperial Basin. Fourteen remain in reserves.'
|
||||
: `Waiting for ${setupEcaz.name} to place the Ecaz starting forces.`
|
||||
: g.advanced && setupSisterhood && !setupSisterhood.advisorSetup
|
||||
? setupSisterhood.id === me.id
|
||||
? 'Choose a printed board territory and sector for your starting advisor.'
|
||||
@@ -1643,20 +1651,21 @@ export function GameTable({
|
||||
: 'Setup order: prediction, traitors, starting forces, then the automatic treachery-card deal and Storm phase.'}
|
||||
</p>
|
||||
)}
|
||||
<EcazSetup game={g} act={act} busy={busy} />
|
||||
{(!setupStage || setupStage === 'forces') &&
|
||||
g.advanced &&
|
||||
me.faction === 'beneGesserit' &&
|
||||
!me.advisorSetup && (
|
||||
<>
|
||||
<p className="muted">
|
||||
After Fremen placement, choose a territory and sector on
|
||||
After the other starting force choices, choose a territory and sector on
|
||||
the map for your starting advisor. It becomes a fighter if
|
||||
alone.
|
||||
</p>
|
||||
{destination}
|
||||
{waitingForFremen && (
|
||||
{(waitingForFremen || waitingForEcaz) && (
|
||||
<p className="fine" id="advisor-setup-wait">
|
||||
{setupFremen.name} must finish placing the Fremen forces
|
||||
{waitingForFremen ? setupFremen!.name : setupEcaz!.name} must finish placing starting forces
|
||||
before you place an advisor.
|
||||
</p>
|
||||
)}
|
||||
@@ -1670,9 +1679,10 @@ export function GameTable({
|
||||
'Place starting advisor',
|
||||
{ type: 'advisorSetup', territory: selected, sector },
|
||||
waitingForFremen ||
|
||||
waitingForEcaz ||
|
||||
me.reserves !== 20 ||
|
||||
selected === MOBILE_STRONGHOLD,
|
||||
waitingForFremen ? 'advisor-setup-wait' : undefined,
|
||||
waitingForFremen || waitingForEcaz ? 'advisor-setup-wait' : undefined,
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
@@ -2124,7 +2134,9 @@ export function GameTable({
|
||||
<>
|
||||
<span className="eyebrow">Player decision</span>
|
||||
<h2>
|
||||
{g.decision.kind === 'caladanReinforcement'
|
||||
{g.decision.kind === 'ixRicheseTechnology'
|
||||
? 'Ixian Technology · Richese lot'
|
||||
: g.decision.kind === 'caladanReinforcement'
|
||||
? 'Caladan victory reinforcement'
|
||||
: g.decision.kind === 'grummanCollection'
|
||||
? 'Grumman Collection'
|
||||
@@ -2373,6 +2385,8 @@ export function GameTable({
|
||||
act={act}
|
||||
busy={busy}
|
||||
/>
|
||||
) : g.decision.kind === 'ixRicheseTechnology' ? (
|
||||
<IxRicheseTechnology game={g} act={act} busy={busy} />
|
||||
) : g.decision.kind === 'richeseBlackMarket' ||
|
||||
g.decision.kind === 'richeseDeclaration' ||
|
||||
g.decision.kind === 'richeseCache' ||
|
||||
|
||||
Reference in new issue
Block a user