Support group Guild-rate reserve shipments
Verify and publish checkpoint container / container (push) Canceled after 0s

This commit is contained in:
Quintine committed 2026-10-28 23:27:49 +11:00
1 parent 1eeeb32566
commit b89c225d5b
9 files changed
+297 -26

No files matched your search

+3 -2
View File
@@ -218,7 +218,7 @@ import {
import { kullPurposeBlock, kullSpecialPurpose, type KullPurpose } from '@/game/kull-purpose';
import { LeaderPortrait } from './leader-portrait';
import { ShipmentQuote } from './shipment-quote';
import { reserveShipmentCost } from '@/game/shipment-price';
import { groupGuildShipmentRate, reserveShipmentCost } from '@/game/shipment-price';
import { quoteSmugglerShipment } from '@/game/smuggler-shipment';
import { SmugglerShipmentChoice } from './smuggler-shipment';
import { nexusGuildSecretAllyAction, nexusGuildSecretAllyQuote } from '@/game/nexus-guild-secret-ally-options';
@@ -759,11 +759,12 @@ export function GameTable({
`Choose ${minimum} to ${maximum} elite forces from reserves.`,
);
}
const groupGuildRate = groupGuildShipmentRate(g.players, me.id, g.coalitionState);
const shipmentRate = {
faction: me.faction,
halfRate: g.karamaShipping?.player === me.id ||
(!g.guildRateCanceled &&
(me.faction === 'guild' ||
(me.faction === 'guild' || groupGuildRate ||
g.players.some((p) => p.faction === 'guild' && p.id === me.ally))),
};
const smugglerOffer = validShipmentAmount && !useGuildSecret && !useRicheseShipment