Support Sapho ordering for Great Maker votes
Verify and publish checkpoint container / container (push) Successful in 11m14s

This commit is contained in:
Quintine committed 2026-11-16 21:32:53 +11:00
1 parent e81725e4b2
commit 77d02b3231
18 files changed
+798 -21

No files matched your search

+7 -4
View File
@@ -1,6 +1,7 @@
'use client';
import { SaphoArrivalOrder } from './sapho-arrival-order';
import { SaphoStationPriority } from './sapho-station-priority';
import { SaphoGreatMakerPriority } from './sapho-great-maker-priority';
import { EmperorExtortionPriority } from './emperor-extortion-priority';
import { EmperorPhaseOpeningPriority } from './emperor-phase-opening-priority';
import { RicheseBidPromisePanel } from './richese-bid-promise-panel';
@@ -397,7 +398,7 @@ export function GameTable({
const harkonnenBetrayalOwnsControls = !!g.nexusHarkonnenBetrayalReaction &&
!g.response && !g.decision && !g.truthtrance && !g.phaseOpening &&
!g.automaticContinuationPending && !g.nexusCards?.waiting.length && !g.nexusTraitors?.pending;
const busy = reactionBusy || !!g.saphoStationPriority || !!g.saphoArrivalOrder || !!g.victoryContinuation || !!g.nexusFremenRideBetrayal || g.automaticContinuationPending || !!g.semutaReaction || !!g.kullReaction || !!g.richeseBetrayalReaction || !!g.guildBetrayalReaction || !!g.nexusIxianReplacement || ixianBetrayalOwnsControls || harkonnenBetrayalOwnsControls;
const busy = reactionBusy || !!g.saphoStationPriority || !!g.saphoGreatMakerPriority || !!g.saphoArrivalOrder || !!g.victoryContinuation || !!g.nexusFremenRideBetrayal || g.automaticContinuationPending || !!g.semutaReaction || !!g.kullReaction || !!g.richeseBetrayalReaction || !!g.guildBetrayalReaction || !!g.nexusIxianReplacement || ixianBetrayalOwnsControls || harkonnenBetrayalOwnsControls;
const reactionOwnsControls = !!g.saphoArrivalOrder || !!g.nexusFremenRideBetrayal || !!g.kullReaction || !!g.kullCounterEvent || !!g.richeseBetrayalReaction || !!g.guildBetrayalReaction || !!g.nexusIxianReplacement || ixianBetrayalOwnsControls || harkonnenBetrayalOwnsControls;
const canSpendKarama = (card: Card, purpose: KullPurpose) =>
!kullPurposeBlock(g, purpose) && canUseAsKaramaRole(g, me, card);
@@ -1545,6 +1546,8 @@ export function GameTable({
{g.emperorExtortionPriority && <EmperorExtortionPriority game={g} act={act} busy={reactionBusy} />}
{g.saphoStationPriority && <SaphoStationPriority game={g} act={act}
busy={transportBusy || !!g.roomControl?.paused || !!g.roomControl?.closed || !!me.autopilot} />}
{g.saphoGreatMakerPriority && <SaphoGreatMakerPriority game={g} act={act}
busy={transportBusy || !!g.roomControl?.paused || !!g.roomControl?.closed || !!me.autopilot} />}
{g.saphoArrivalOrder && <SaphoArrivalOrder view={g.saphoArrivalOrder} me={g.me}
busy={transportBusy || !!g.roomControl?.paused || !!g.roomControl?.closed || !!me.autopilot}
name={id => g.players.find(player => player.id === id)?.name ?? id} act={act} />}
@@ -4069,7 +4072,7 @@ export function GameTable({
) : g.decision.kind === 'discoveryDiscard' ? (
<DiscoveryDiscardDecision game={g} act={act} busy={transportBusy || (!!g.roomControl?.paused || !!g.roomControl?.closed) || !!me.autopilot} />
) : g.decision.kind === 'greatMakerVote' || g.decision.kind === 'greatMakerRide' ? (
<GreatMakerDecision game={g} act={act} busy={transportBusy || (!!g.roomControl?.paused || !!g.roomControl?.closed) || !!me.autopilot} />
<GreatMakerDecision game={g} act={act} busy={transportBusy || !!g.saphoGreatMakerPriority || (!!g.roomControl?.paused || !!g.roomControl?.closed) || !!me.autopilot} />
) : g.decision.kind === 'nexusFremenProtection' ? (
<section aria-label="Fremen Nexus worm protection" className="space-y-3">
<p className="muted">
@@ -6132,8 +6135,8 @@ export function GameTable({
<EcazSpecialKarama quote={g.ecazSpecialKarama ?? null} act={act} busy={busy} />
<RicheseGift game={g} act={act} busy={busy} />
<Distrans game={g} act={act} busy={busy} />
<JuiceOfSapho game={g} act={act} busy={g.saphoStationPriority
? transportBusy || !!g.roomControl?.paused || !!g.roomControl?.closed || !!me.autopilot || !g.saphoStationPriority.canPass
<JuiceOfSapho game={g} act={act} busy={g.saphoStationPriority || g.saphoGreatMakerPriority
? transportBusy || !!g.roomControl?.paused || !!g.roomControl?.closed || !!me.autopilot || !(g.saphoStationPriority?.canPass || g.saphoGreatMakerPriority?.canPass)
: busy} />
<NullentropyBox game={g} act={act} busy={busy} />
<ResidualPoison game={g} act={act} busy={busy} />