From 5e294215bed6266794b76bce89f3e43965b50175 Mon Sep 17 00:00:00 2001
From: Quintine <15965533+Quintine@users.noreply.github.com>
Date: Mon, 16 Nov 2026 14:17:48 +1100
Subject: [PATCH] Support deferred payments with travel deals
---
components/public-deals.tsx | 12 +-
docs/CURRENT_STATUS.md | 10 +
docs/PUBLIC_DEALS.md | 30 +++
game/engine.ts | 25 +-
game/public-deals.ts | 14 +-
game/reference.ts | 2 +-
tests/public-deals-controls.test.tsx | 26 ++-
.../public-deals-deferred-travel-http.test.ts | 81 +++++++
tests/public-deals-deferred-travel.test.ts | 220 ++++++++++++++++++
...blic-deals-future-deferred-runtime.test.ts | 80 +++----
.../public-deals-group-travel-runtime.test.ts | 34 ++-
.../public-deals-paid-travel-runtime.test.ts | 19 +-
tests/public-deals-travel-controls.test.tsx | 29 ++-
tests/public-deals-travel-runtime.test.ts | 21 +-
tests/public-deals-travel-schema.test.ts | 32 ++-
tests/truth-phase-bid-revival-bots.test.ts | 68 ++++++
16 files changed, 603 insertions(+), 100 deletions(-)
create mode 100644 tests/public-deals-deferred-travel-http.test.ts
create mode 100644 tests/public-deals-deferred-travel.test.ts
create mode 100644 tests/truth-phase-bid-revival-bots.test.ts
diff --git a/components/public-deals.tsx b/components/public-deals.tsx
index a1fe0613..a2a2f33a 100644
--- a/components/public-deals.tsx
+++ b/components/public-deals.tsx
@@ -69,10 +69,9 @@ export function publicDealOfferAction(targets: readonly string[], terms: string,
const travelKeys = travel ? Object.keys(travel).filter(key => key !== 'dueTurn').sort().join(',') : '';
const travelDeadline = travel && Object.hasOwn(travel, 'dueTurn') ? travel.dueTurn : undefined;
if (travel && (!proposer || targets.includes(proposer) ||
- (groupTravel ? !!payment && payment.kind !== 'immediateBribe' || travelKeys !== 'actor,answer,kind,minimum,territory' ||
+ (groupTravel ? travelKeys !== 'actor,answer,kind,minimum,territory' ||
typeof travel.actor !== 'string' || !targets.includes(travel.actor) :
- travelKeys !== 'answer,kind,minimum,territory' ||
- !!payment && payment.kind !== 'immediateBribe') ||
+ travelKeys !== 'answer,kind,minimum,territory') ||
(Object.hasOwn(travel, 'dueTurn') && (!Number.isSafeInteger(travelDeadline) || (travelDeadline as number) < 1 ||
(currentTurn !== undefined && (!Number.isSafeInteger(currentTurn) || currentTurn < 1 || (travelDeadline as number) < currentTurn)))) ||
!['ship', 'move'].includes(travel.kind) || !TERRITORIES.some(territory => territory.id === travel.territory) ||
@@ -226,8 +225,6 @@ export function PublicDeals({ game, act, busy }: {
minimum:Number(travelMinimum), answer:travelAnswer,
...(selected.length > 1 ? {actor:travelActor} : {}),
...(travelTurn > game.turn ? {dueTurn:travelTurn} : {})} : undefined;
- const combinedPaymentValid = !includeTravel || !payment || payment.kind === 'immediateBribe' &&
- paymentPeopleAndAmountValid;
const offer = legalSelection && paymentValid && (!includeTravel || travelDueValid)
? publicDealOfferAction(selected, terms, payment, me?.id, game.turn, travel) : null;
const disabled = busy || !!game.roomControl?.paused || !!game.roomControl?.closed || !!me?.autopilot;
@@ -308,8 +305,7 @@ export function PublicDeals({ game, act, busy }: {
{includeTravel &&