Expand Basic bribe windows and fix marker guidance
Verify and publish checkpoint container / container (push) Successful in 11m0s
Verify and publish checkpoint container / container (push) Successful in 11m0s
This commit is contained in:
1 parent
7fccd62814
commit
9dc339e726
8 files changed
+362
-26
No files matched your search
@@ -34,6 +34,11 @@ export function ShipmentPromises({
|
||||
: preparationCard ? `Play ${preparationCard.name}` : null;
|
||||
const blocked = busy || !!g.truthtrance || !!g.response || !!g.decision || !!g.phaseOpening;
|
||||
const shipping = next && (next.type === 'ship' || next.type === 'guildShip');
|
||||
const markerShipment = shipping && next.type === 'ship' && typeof next.noField === 'string';
|
||||
// A concealed marker is priced as one force, regardless of its value.
|
||||
// Optional physical companions have their own paid count; a Smuggler
|
||||
// companion is free and therefore does not add to this tariff.
|
||||
const pricedAmount = markerShipment ? 1 + Number(next?.noFieldReserves ?? 0) : Number(next?.amount);
|
||||
const halfRate = g.karamaShipping?.player === me.id ||
|
||||
(!g.guildRateCanceled &&
|
||||
(me.faction === 'guild' ||
|
||||
@@ -44,13 +49,13 @@ export function ShipmentPromises({
|
||||
String(next.territory) === 'reserves'
|
||||
? 'reserves'
|
||||
: territory(String(next.territory)).type,
|
||||
Number(next.amount),
|
||||
pricedAmount,
|
||||
g.karamaShipping?.player === me.id || !g.guildRateCanceled,
|
||||
)
|
||||
: reserveShipmentCost(
|
||||
{ faction: me.faction, halfRate },
|
||||
territory(String(next.territory)).type,
|
||||
Number(next.amount),
|
||||
pricedAmount,
|
||||
)
|
||||
: null;
|
||||
const share = shipping
|
||||
@@ -63,7 +68,11 @@ export function ShipmentPromises({
|
||||
: '';
|
||||
const description = next
|
||||
? shipping
|
||||
? `Ship ${Number(next.amount)} forces${allocation} to ${territory(String(next.territory)).name}, sector ${Number(next.sector)}`
|
||||
? markerShipment
|
||||
? `Ship your No-Field to ${territory(String(next.territory)).name}, sector ${Number(next.sector)}`
|
||||
: `Ship ${Number(next.amount)} forces${allocation} to ${territory(String(next.territory)).name}, sector ${Number(next.sector)}`
|
||||
: next.type === 'revealNoField'
|
||||
? 'Reveal your current No-Field'
|
||||
: next.type === 'pledgeAid'
|
||||
? 'Reclaim your unused ally pledge'
|
||||
: `Play ${me.hand?.find((c) => c.id === next.card)?.name ?? 'your preparation card'}${next.amount ? ` to revive ${Number(next.amount)} forces${allocation}` : ' for your shipment discount'}`
|
||||
|
||||
Reference in new issue
Block a user