From d7d0f8962516a34bd5e730185780f92125fb965d Mon Sep 17 00:00:00 2001 From: Quintine <15965533+Quintine@users.noreply.github.com> Date: Mon, 16 Nov 2026 15:19:10 +1100 Subject: [PATCH] Support multiple travel terms in public deals --- components/public-deals.tsx | 128 +++++++++++++-- components/travel-promises.tsx | 12 +- docs/CURRENT_STATUS.md | 9 ++ docs/PUBLIC_DEALS.md | 24 +++ game/engine.ts | 83 ++++++---- game/public-deals.ts | 57 ++++++- game/reference.ts | 4 +- game/travel-expression-promises.ts | 4 + ...blic-deals-additional-travel-model.test.ts | 82 ++++++++++ ...ic-deals-multiple-travel-controls.test.tsx | 120 ++++++++++++++ .../public-deals-multiple-travel-http.test.ts | 70 ++++++++ ...ic-deals-multiple-travel-integrity.test.ts | 95 +++++++++++ tests/public-deals-multiple-travel.test.ts | 153 ++++++++++++++++++ 13 files changed, 790 insertions(+), 51 deletions(-) create mode 100644 tests/public-deals-additional-travel-model.test.ts create mode 100644 tests/public-deals-multiple-travel-controls.test.tsx create mode 100644 tests/public-deals-multiple-travel-http.test.ts create mode 100644 tests/public-deals-multiple-travel-integrity.test.ts create mode 100644 tests/public-deals-multiple-travel.test.ts diff --git a/components/public-deals.tsx b/components/public-deals.tsx index 5cf9b1ad..64eb763f 100644 --- a/components/public-deals.tsx +++ b/components/public-deals.tsx @@ -14,8 +14,11 @@ type DeferredBribe = { kind: 'deferredBribe'; payer: string; recipient: string; type DealPayment = ImmediateBribe | DeferredBribe; type DealTravel = { kind: 'ship' | 'move'; territory: string; minimum: number; answer: boolean; actor?: string; dueTurn?: number }; type DealTravelStatus = 'scheduled' | 'pending' | 'fulfilled' | 'void' | 'released'; -type TravelDeal = Deal & { travel?: DealTravel }; -type TravelProjection = GameView & { dealTravelStatus?: Record }; +type TravelDeal = Deal & { travel?: DealTravel; additionalTravel?: DealTravel[] }; +type TravelProjection = GameView & { dealTravelStatus?: Record; + dealAdditionalTravelStatus?: Record }; +type AdditionalTravelDraft = {key:number; actor:string; kind:'ship'|'move'; territory:string; + minimum:string; answer:boolean; dueTurn:string}; type DeferredPaymentStatus = 'pending' | 'paid' | 'void' | 'released'; type AdditionalPayment = { payment: DeferredBribe; paymentStatus?: DeferredPaymentStatus }; type AdditionalPaymentDraft = { key: number; payer: string; recipient: string; amount: string; dueTurn: string }; @@ -31,6 +34,18 @@ function allied(game: GameView, a: GameView['players'][number], b: GameView['pla !!game.coalitionState && areCoalitionAllies(game.players, game.coalitionState, a.id, b.id); } +/** Additional travelers consent after non-traveling invitees, without making + * multiple travelers wait on each other. Single-term offers retain their + * existing final-traveler rule. */ +function travelVoteWaiting(deal: Deal, actor: string, parties: string[], accepted: string[]): boolean { + const {travel,additionalTravel = []} = deal as TravelDeal; + if (!travel || parties.length <= 2 || actor === deal.from) return false; + if (!additionalTravel.length) return publicDealTravelActor(deal) === actor && + parties.some(id => id !== actor && !accepted.includes(id)); + const travelers = new Set([publicDealTravelActor(deal), ...additionalTravel.map(term => term.actor)]); + return travelers.has(actor) && parties.some(id => id !== deal.from && !travelers.has(id) && !accepted.includes(id)); +} + /** Requests are local to the active seat; an owed payment is as important to * surface as a pending invitation or a request to release an agreement. */ export function publicDealRequests(game: GameView): string[][] { @@ -40,10 +55,11 @@ export function publicDealRequests(game: GameView): string[][] { const parties = publicDealParticipants(deal), accepted = publicDealAcceptVotes(deal); const participant = parties.includes(game.me); const travel = (deal as TravelDeal).travel; - const waitingForOtherVotes = !!travel && parties.length > 2 && publicDealTravelActor(deal) === game.me && - parties.some(id => id !== game.me && !accepted.includes(id)); + const extraTravel = (deal as TravelDeal).additionalTravel ?? []; + const waitingForOtherVotes = travelVoteWaiting(deal,game.me,parties,accepted); if (deal.status === 'offered' && participant && deal.from !== game.me && !accepted.includes(game.me)) { - const groupTraveler = !!travel && parties.length > 2 && publicDealTravelActor(deal) === game.me; + const groupTraveler = !!travel && parties.length > 2 && + (publicDealTravelActor(deal) === game.me || extraTravel.some(term => term.actor === game.me)); requests.push(groupTraveler ? ['offer', deal.id, waitingForOtherVotes ? 'waiting' : 'ready'] : ['offer', deal.id]); } if (deal.status === 'active' && participant && !deal.releaseVotes.includes(game.me) && deal.releaseVotes.length > 0) @@ -60,12 +76,16 @@ export function publicDealRequests(game: GameView): string[][] { if (deal.status === 'active' && travel && publicDealTravelActor(deal) === game.me && (game as TravelProjection).dealTravelStatus?.[deal.id] === 'pending') requests.push(['travel', deal.id]); + if (deal.status === 'active') extraTravel.forEach((term,index) => { + if (term.actor === game.me && (game as TravelProjection).dealAdditionalTravelStatus?.[deal.id]?.[index] === 'pending') + requests.push(['travel',deal.id,String(index)]); + }); return requests; }); } /** Keep the legacy single-recipient wire packet when only one seat is chosen. */ -export function publicDealOfferAction(targets: readonly string[], terms: string, payment?: DealPayment, proposer?: string, currentTurn?: number, travel?: DealTravel, additionalPayments?: readonly DeferredBribe[], additionalImmediatePayments?: readonly ImmediateBribe[]): Action | null { +export function publicDealOfferAction(targets: readonly string[], terms: string, payment?: DealPayment, proposer?: string, currentTurn?: number, travel?: DealTravel, additionalPayments?: readonly DeferredBribe[], additionalImmediatePayments?: readonly ImmediateBribe[], additionalTravel?: readonly DealTravel[]): Action | null { const text = terms.trim(); if (!targets.length || targets.length > 5 || new Set(targets).size !== targets.length || !text || text.length > 500) return null; if (payment && (!proposer || (payment.kind !== 'immediateBribe' && payment.kind !== 'deferredBribe') || payment.payer === payment.recipient || @@ -95,6 +115,14 @@ export function publicDealOfferAction(targets: readonly string[], terms: string, !['ship', 'move'].includes(travel.kind) || !TERRITORIES.some(territory => territory.id === travel.territory) || !Number.isSafeInteger(travel.minimum) || travel.minimum < 1 || travel.minimum > 20 || typeof travel.answer !== 'boolean')) return null; + if (additionalTravel?.length && (!travel || !proposer || additionalTravel.length > 12 || additionalTravel.some(term => { + const keys = Object.keys(term).filter(key => key !== 'dueTurn').sort().join(','); + return keys !== 'actor,answer,kind,minimum,territory' || !term.actor || ![proposer,...targets].includes(term.actor) || + !['ship','move'].includes(term.kind) || !TERRITORIES.some(territory => territory.id === term.territory) || + !Number.isSafeInteger(term.minimum) || term.minimum < 1 || term.minimum > 20 || typeof term.answer !== 'boolean' || + Object.hasOwn(term,'dueTurn') && (!Number.isSafeInteger(term.dueTurn) || term.dueTurn! < 1 || + currentTurn !== undefined && term.dueTurn! < currentTurn); + }))) return null; const offeredPayment = payment ? { payment } : {}; const offeredAdditional = additionalPayments?.length ? { additionalPayments: additionalPayments.map(term => ({kind:term.kind, payer:term.payer, @@ -105,9 +133,14 @@ export function publicDealOfferAction(targets: readonly string[], terms: string, const normalizedTravel = travel ? {...travel} : undefined; if (normalizedTravel && travelDeadline === currentTurn) delete normalizedTravel.dueTurn; const offeredTravel = normalizedTravel ? { travel: normalizedTravel } : {}; + const offeredExtraTravel = additionalTravel?.length ? { additionalTravel: additionalTravel.map(term => { + const result = {...term}; + if (result.dueTurn === currentTurn) delete result.dueTurn; + return result; + }) } : {}; return targets.length === 1 - ? { type: 'dealOffer', target: targets[0], terms: text, ...offeredPayment, ...offeredAdditional, ...offeredImmediate, ...offeredTravel } - : { type: 'dealOffer', targets: [...targets], terms: text, ...offeredPayment, ...offeredAdditional, ...offeredImmediate, ...offeredTravel }; + ? { type: 'dealOffer', target: targets[0], terms: text, ...offeredPayment, ...offeredAdditional, ...offeredImmediate, ...offeredTravel, ...offeredExtraTravel } + : { type: 'dealOffer', targets: [...targets], terms: text, ...offeredPayment, ...offeredAdditional, ...offeredImmediate, ...offeredTravel, ...offeredExtraTravel }; } /** The whole table can read an offer and its history; only its parties act. */ @@ -138,14 +171,15 @@ export function PublicDealList({ game, act, disabled }: { const additional = (deal as unknown as { additionalPayments?: AdditionalPayment[] }).additionalPayments ?? []; const additionalImmediate = (deal as unknown as { additionalImmediatePayments?: ImmediateBribe[] }).additionalImmediatePayments ?? []; const travel = (deal as TravelDeal).travel; + const extraTravel = (deal as TravelDeal).additionalTravel ?? []; const travelActor = travel ? publicDealTravelActor(deal) : undefined; const travelStatus = (game as TravelProjection).dealTravelStatus?.[deal.id]; const travelTurn = travel ? publicDealTravelDueTurn(deal) : undefined; - const travelExpired = travelTurn !== undefined && game.turn > travelTurn; + const travelExpired = travelTurn !== undefined && game.turn > travelTurn || + extraTravel.some(term => game.turn > (term.dueTurn ?? deal.turn)); const travelDestination = travel && TERRITORIES.find(territory => territory.id === travel.territory)?.name; const finalAcceptance = recipient && !accepted.includes(game.me) && accepted.length === participants.length - 1; - const travelActorWaiting = !!travel && participants.length > 2 && game.me === travelActor && - participants.some(participant => participant !== travelActor && !accepted.includes(participant)); + const travelActorWaiting = travelVoteWaiting(deal,game.me,participants,accepted); const paymentBlocked = finalAcceptance && (payment?.kind === 'immediateBribe' && payment.payer === game.me || additionalImmediate.some(term => term.payer === game.me)) ? game.bribeOptions?.blocked : null; const paymentExpired = payment?.kind === 'deferredBribe' && game.turn > payment.dueTurn || @@ -175,7 +209,15 @@ export function PublicDealList({ game, act, disabled }: { })} {travel &&

{travelTurn === deal.turn ? 'Current-turn travel term:' : 'Travel term:'} {name(travelActor!)} {deal.status === 'offered' || deal.status === 'declined' || deal.status === 'withdrawn' ? 'would' : 'agrees to'} {travel.answer ? 'make' : 'avoid'} {travel.kind === 'ship' ? 'a reserve shipment' : 'a ground movement'} of at least {travel.minimum} physical forces in one action to {travelDestination ?? travel.territory} during turn {travelTurn}. {travelStatus ? `Travel status: ${travelStatus}.` : deal.status === 'offered' ? 'The term becomes binding on final acceptance.' : deal.status === 'declined' || deal.status === 'withdrawn' ? 'The term did not become binding.' : 'Travel status is unavailable.'}

} {travel && travelTurn !== undefined && travelTurn > deal.turn &&

Before turn {travelTurn}, this term reserves no forces or spice. Its status and legal options update during that turn.

} - {travel && participants.length > 2 && deal.status === 'offered' && (travelActor === deal.from + {extraTravel.map((term,index) => { + const turn = term.dueTurn ?? deal.turn; + const destination = TERRITORIES.find(territory => territory.id === term.territory)?.name ?? term.territory; + const status = (game as TravelProjection).dealAdditionalTravelStatus?.[deal.id]?.[index]; + return

Additional travel {index + 1}: {name(term.actor!)} {deal.status === 'offered' || deal.status === 'declined' || deal.status === 'withdrawn' ? 'would' : 'agrees to'} {term.answer ? 'make' : 'avoid'} {term.kind === 'ship' ? 'a reserve shipment' : 'a ground movement'} of at least {term.minimum} physical forces in one action to {destination} during turn {turn}. {status ? `Travel status: ${status}.` : deal.status === 'offered' ? 'The term becomes binding on final acceptance.' : deal.status === 'declined' || deal.status === 'withdrawn' ? 'The term did not become binding.' : 'Travel status is unavailable.'}{turn > deal.turn ? ` Before turn ${turn}, this term reserves no forces or spice.` : ''}

; + })} + {travel && extraTravel.length > 0 && participants.length > 2 && deal.status === 'offered' && +

Invited participants without a travel term accept first. Invited travelers may then accept in any order. The proposer consents by making the offer; anyone invited may decline at any time.

} + {travel && extraTravel.length === 0 && participants.length > 2 && deal.status === 'offered' && (travelActor === deal.from ?

The proposer already consented to their own travel term by making this offer. All invited participants must accept; anyone invited may decline at any time.

:

{name(travelActor!)} must accept last, after the other recipients. Anyone invited may decline at any time.

)} {deal.status === 'offered' &&

@@ -230,6 +272,8 @@ export function PublicDeals({ game, act, busy }: { const nextAdditionalKey = useRef(0); const [additionalImmediateDrafts, setAdditionalImmediateDrafts] = useState([]); const nextAdditionalImmediateKey = useRef(0); + const [additionalTravelDrafts, setAdditionalTravelDrafts] = useState([]); + const nextAdditionalTravelKey = useRef(0); const [deadlineDraft, setDeadlineDraft] = useState(() => ({ value: String(game.turn), turn: game.turn })); const [travelDeadlineDraft, setTravelDeadlineDraft] = useState(() => ({ value: String(game.turn), turn: game.turn })); const previousDeadline = Number(deadlineDraft.value); @@ -280,8 +324,12 @@ export function PublicDeals({ game, act, busy }: { minimum:Number(travelMinimum), answer:travelAnswer, ...(selected.length > 1 ? {actor:travelActor} : travelActor === me?.id ? {actor:travelActor} : {}), ...(travelTurn > game.turn ? {dueTurn:travelTurn} : {})} : undefined; + const additionalTravel: DealTravel[] = additionalTravelDrafts.map(draft => ({ + actor:draft.actor, kind:draft.kind, territory:draft.territory, minimum:Number(draft.minimum), + answer:draft.answer, dueTurn:Number(draft.dueTurn), + })); const offer = legalSelection && paymentValid && (!includeTravel || travelDueValid) - ? publicDealOfferAction(selected, terms, payment, me?.id, game.turn, travel, additionalPayments, additionalImmediatePayments) : null; + ? publicDealOfferAction(selected, terms, payment, me?.id, game.turn, travel, additionalPayments, additionalImmediatePayments, additionalTravel) : null; const disabled = busy || !!game.roomControl?.paused || !!game.roomControl?.closed || !!me?.autopilot; const mayOffer = game.status === 'playing' && me && !me.bot; return

@@ -431,13 +479,13 @@ export function PublicDeals({ game, act, busy }: { {additionalDrafts.length > 0 &&

Each additional payment has its own deadline and pay control. The recipient collects its share at the next Mentat opening.

} {!includeTravel && selected.length === 0 &&

Select at least one human recipient to add a travel term.

} {includeTravel &&
Travel term -

This term concerns one physical action during the selected turn. Choose a participant to commit. An invited traveler accepts last after all other recipients; a proposer consents to their own travel by making the offer. Written terms remain player-managed.

+

This term concerns one physical action during the selected turn. Choose a participant to commit. {additionalTravelDrafts.length ? 'Invited participants without a travel term accept first, then invited travelers may accept in any order.' : 'An invited traveler accepts last after all other recipients.'} A proposer consents to their own travel by making the offer. Written terms remain player-managed.

A travel term may include an immediate payment or a payment due by the end of a selected turn. Payment and travel may have different participants and turns. The payment recipient collects their share at the next Mentat opening and can use it after collection. All invited parties must accept.

{selected.length > 1 && + + + + + + {!valid &&

Choose a participant, destination, force count and current or future turn.

} + +
; + })} + {includeTravel && }