Support multiple deferred payments in public deals
Verify and publish checkpoint container / container (push) Successful in 10m22s
Verify and publish checkpoint container / container (push) Successful in 10m22s
This commit is contained in:
1 parent
0b8a147388
commit
cacc88906c
12 files changed
+742
-50
No files matched your search
@@ -17,6 +17,8 @@ type DealTravelStatus = 'scheduled' | 'pending' | 'fulfilled' | 'void' | 'releas
|
||||
type TravelDeal = Deal & { travel?: DealTravel };
|
||||
type TravelProjection = GameView & { dealTravelStatus?: Record<string, DealTravelStatus> };
|
||||
type DeferredPaymentStatus = 'pending' | 'paid' | 'void' | 'released';
|
||||
type AdditionalPayment = { payment: DeferredBribe; paymentStatus?: DeferredPaymentStatus };
|
||||
type AdditionalPaymentDraft = { key: number; payer: string; recipient: string; amount: string; dueTurn: string };
|
||||
type DeferredPaymentProjection = GameView & {
|
||||
deferredDealPaymentOptions?: Record<string, { blocked: string | null }>;
|
||||
};
|
||||
@@ -49,6 +51,11 @@ export function publicDealRequests(game: GameView): string[][] {
|
||||
if (deal.status === 'active' && pending.payment?.kind === 'deferredBribe' &&
|
||||
pending.payment.payer === game.me && pending.paymentStatus === 'pending' && pending.payment.dueTurn <= game.turn)
|
||||
requests.push(['payment', deal.id]);
|
||||
const additional = (deal as unknown as { additionalPayments?: AdditionalPayment[] }).additionalPayments ?? [];
|
||||
if (deal.status === 'active') additional.forEach((term, index) => {
|
||||
if (term.payment.payer === game.me && term.paymentStatus === 'pending' && term.payment.dueTurn <= game.turn)
|
||||
requests.push(['payment', deal.id, String(index)]);
|
||||
});
|
||||
if (deal.status === 'active' && travel && publicDealTravelActor(deal) === game.me &&
|
||||
(game as TravelProjection).dealTravelStatus?.[deal.id] === 'pending')
|
||||
requests.push(['travel', deal.id]);
|
||||
@@ -57,7 +64,7 @@ export function publicDealRequests(game: GameView): string[][] {
|
||||
}
|
||||
|
||||
/** 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): Action | null {
|
||||
export function publicDealOfferAction(targets: readonly string[], terms: string, payment?: DealPayment, proposer?: string, currentTurn?: number, travel?: DealTravel, additionalPayments?: readonly DeferredBribe[]): 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 ||
|
||||
@@ -65,6 +72,11 @@ export function publicDealOfferAction(targets: readonly string[], terms: string,
|
||||
!Number.isSafeInteger(payment.amount) || payment.amount < 1 ||
|
||||
(payment.kind === 'deferredBribe' && (!Number.isSafeInteger(payment.dueTurn) || payment.dueTurn < 1 ||
|
||||
(currentTurn !== undefined && (!Number.isSafeInteger(currentTurn) || currentTurn < 1 || payment.dueTurn < currentTurn)))))) return null;
|
||||
if (additionalPayments && (additionalPayments.length > 12 || additionalPayments.some(term =>
|
||||
!proposer || term.kind !== 'deferredBribe' || term.payer === term.recipient ||
|
||||
![proposer, ...targets].includes(term.payer) || ![proposer, ...targets].includes(term.recipient) ||
|
||||
!Number.isSafeInteger(term.amount) || term.amount < 1 || !Number.isSafeInteger(term.dueTurn) || term.dueTurn < 1 ||
|
||||
currentTurn !== undefined && (!Number.isSafeInteger(currentTurn) || currentTurn < 1 || term.dueTurn < currentTurn)))) return null;
|
||||
const groupTravel = !!travel && targets.length > 1;
|
||||
const travelKeys = travel ? Object.keys(travel).filter(key => key !== 'dueTurn').sort().join(',') : '';
|
||||
const travelDeadline = travel && Object.hasOwn(travel, 'dueTurn') ? travel.dueTurn : undefined;
|
||||
@@ -78,12 +90,15 @@ export function publicDealOfferAction(targets: readonly string[], terms: string,
|
||||
!Number.isSafeInteger(travel.minimum) || travel.minimum < 1 || travel.minimum > 20 ||
|
||||
typeof travel.answer !== 'boolean')) return null;
|
||||
const offeredPayment = payment ? { payment } : {};
|
||||
const offeredAdditional = additionalPayments?.length
|
||||
? { additionalPayments: additionalPayments.map(term => ({kind:term.kind, payer:term.payer,
|
||||
recipient:term.recipient, amount:term.amount, dueTurn:term.dueTurn})) } : {};
|
||||
const normalizedTravel = travel ? {...travel} : undefined;
|
||||
if (normalizedTravel && travelDeadline === currentTurn) delete normalizedTravel.dueTurn;
|
||||
const offeredTravel = normalizedTravel ? { travel: normalizedTravel } : {};
|
||||
return targets.length === 1
|
||||
? { type: 'dealOffer', target: targets[0], terms: text, ...offeredPayment, ...offeredTravel }
|
||||
: { type: 'dealOffer', targets: [...targets], terms: text, ...offeredPayment, ...offeredTravel };
|
||||
? { type: 'dealOffer', target: targets[0], terms: text, ...offeredPayment, ...offeredAdditional, ...offeredTravel }
|
||||
: { type: 'dealOffer', targets: [...targets], terms: text, ...offeredPayment, ...offeredAdditional, ...offeredTravel };
|
||||
}
|
||||
|
||||
/** The whole table can read an offer and its history; only its parties act. */
|
||||
@@ -111,6 +126,7 @@ export function PublicDealList({ game, act, disabled }: {
|
||||
other && !allied(game, player, other)));
|
||||
const payment = (deal as unknown as { payment?: DealPayment }).payment;
|
||||
const paymentStatus = (deal as unknown as { paymentStatus?: DeferredPaymentStatus }).paymentStatus;
|
||||
const additional = (deal as unknown as { additionalPayments?: AdditionalPayment[] }).additionalPayments ?? [];
|
||||
const travel = (deal as TravelDeal).travel;
|
||||
const travelActor = travel ? publicDealTravelActor(deal) : undefined;
|
||||
const travelStatus = (game as TravelProjection).dealTravelStatus?.[deal.id];
|
||||
@@ -121,7 +137,8 @@ export function PublicDealList({ game, act, disabled }: {
|
||||
const travelActorWaiting = !!travel && participants.length > 2 && game.me === travelActor &&
|
||||
participants.some(participant => participant !== travelActor && !accepted.includes(participant));
|
||||
const paymentBlocked = payment?.kind === 'immediateBribe' && finalAcceptance && payment.payer === game.me ? game.bribeOptions?.blocked : null;
|
||||
const paymentExpired = payment?.kind === 'deferredBribe' && game.turn > payment.dueTurn;
|
||||
const paymentExpired = payment?.kind === 'deferredBribe' && game.turn > payment.dueTurn ||
|
||||
additional.some(term => game.turn > term.payment.dueTurn);
|
||||
const deferredOption = (game as DeferredPaymentProjection).deferredDealPaymentOptions?.[deal.id];
|
||||
const mayPay = payment?.kind === 'deferredBribe' && deal.status === 'active' && paymentStatus === 'pending' &&
|
||||
payment.payer === game.me && canAct;
|
||||
@@ -131,6 +148,19 @@ export function PublicDealList({ game, act, disabled }: {
|
||||
{payment?.kind === 'immediateBribe' && <p><strong>Immediate payment term:</strong> {name(payment.payer)} pays {payment.amount} spice to {name(payment.recipient)} on final acceptance. The payer loses the gross amount immediately; the recipient collects their share at the next Mentat opening. A Bureaucrat may divert two spice to the bank before that share is allocated. Releasing the deal later does not refund the payment.</p>}
|
||||
{payment?.kind === 'immediateBribe' && travel && <p>The recipient cannot spend this payment before its next Mentat collection; after collection it can fund travel in a later turn.</p>}
|
||||
{payment?.kind === 'deferredBribe' && <p><strong>Deferred payment term:</strong> {name(payment.payer)} pays exactly {payment.amount} spice to {name(payment.recipient)} on or before the end of turn {payment.dueTurn}. The recipient collects their share at the next Mentat opening; a Bureaucrat may divert two spice to the bank. {paymentStatus ? `Payment status: ${paymentStatus}.` : 'Payment becomes binding on final acceptance.'}</p>}
|
||||
{additional.map((term, index) => {
|
||||
const option = (game as DeferredPaymentProjection).deferredDealPaymentOptions?.[`${deal.id}:payment:${index}`];
|
||||
const canPay = deal.status === 'active' && term.paymentStatus === 'pending' &&
|
||||
term.payment.payer === game.me && canAct;
|
||||
return <div key={index}>
|
||||
<p><strong>Additional payment {index + 1}:</strong> {name(term.payment.payer)} pays exactly {term.payment.amount} spice to {name(term.payment.recipient)} on or before the end of turn {term.payment.dueTurn}. {term.paymentStatus ? `Payment status: ${term.paymentStatus}.` : 'Payment becomes binding on final acceptance.'}</p>
|
||||
{canPay && <div>
|
||||
{option?.blocked && <p>Payment is unavailable: {option.blocked}</p>}
|
||||
<Button type="button" disabled={disabled || !option || !!option.blocked}
|
||||
onClick={() => act({type:'dealPay',deal:deal.id,paymentIndex:index})}>Pay additional payment {index + 1}</Button>
|
||||
</div>}
|
||||
</div>;
|
||||
})}
|
||||
{travel && <p><strong>{travelTurn === deal.turn ? 'Current-turn travel term:' : 'Travel term:'}</strong> {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.'}</p>}
|
||||
{travel && travelTurn !== undefined && travelTurn > deal.turn && <p>Before turn {travelTurn}, this term reserves no forces or spice. Its status and legal options update during that turn.</p>}
|
||||
{travel && participants.length > 2 && deal.status === 'offered' && <p>{name(travelActor!)} must accept last, after the other recipients. Anyone invited may decline at any time.</p>}
|
||||
@@ -182,6 +212,8 @@ export function PublicDeals({ game, act, busy }: {
|
||||
const [payer, setPayer] = useState('');
|
||||
const [paymentRecipient, setPaymentRecipient] = useState('');
|
||||
const [paymentAmount, setPaymentAmount] = useState('1');
|
||||
const [additionalDrafts, setAdditionalDrafts] = useState<AdditionalPaymentDraft[]>([]);
|
||||
const nextAdditionalKey = 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);
|
||||
@@ -219,6 +251,10 @@ export function PublicDeals({ game, act, busy }: {
|
||||
parties.some(player => player.id === payer) && parties.some(player => player.id === paymentRecipient) &&
|
||||
Number.isSafeInteger(amount) && amount > 0;
|
||||
const paymentValid = !includePayment || paymentPeopleAndAmountValid && (paymentKind !== 'deferredBribe' || dueValid);
|
||||
const additionalPayments: DeferredBribe[] = additionalDrafts.map(draft => ({
|
||||
kind:'deferredBribe', payer:draft.payer, recipient:draft.recipient,
|
||||
amount:Number(draft.amount), dueTurn:Number(draft.dueTurn),
|
||||
}));
|
||||
const travelTurn = Number(travelDueTurn);
|
||||
const travelDueValid = travelDueTurn.trim() !== '' && Number.isSafeInteger(travelTurn) && travelTurn >= game.turn;
|
||||
const travel: DealTravel | undefined = includeTravel ? {kind:travelKind, territory:travelTerritory,
|
||||
@@ -226,7 +262,7 @@ export function PublicDeals({ game, act, busy }: {
|
||||
...(selected.length > 1 ? {actor:travelActor} : {}),
|
||||
...(travelTurn > game.turn ? {dueTurn:travelTurn} : {})} : undefined;
|
||||
const offer = legalSelection && paymentValid && (!includeTravel || travelDueValid)
|
||||
? publicDealOfferAction(selected, terms, payment, me?.id, game.turn, travel) : null;
|
||||
? publicDealOfferAction(selected, terms, payment, me?.id, game.turn, travel, additionalPayments) : null;
|
||||
const disabled = busy || !!game.roomControl?.paused || !!game.roomControl?.closed || !!me?.autopilot;
|
||||
const mayOffer = game.status === 'playing' && me && !me.bot;
|
||||
return <details ref={panel} className="notice public-deals-panel">
|
||||
@@ -296,6 +332,48 @@ export function PublicDeals({ game, act, busy }: {
|
||||
{legalSelection && !paymentPeopleAndAmountValid && <p>Choose two different participants and a positive whole spice amount.</p>}
|
||||
{paymentKind === 'deferredBribe' && !dueValid && <p role="alert">Choose a whole due turn no earlier than turn {game.turn}.</p>}
|
||||
</fieldset>}
|
||||
{additionalDrafts.map((draft, index) => {
|
||||
const valid = draft.payer !== draft.recipient && parties.some(player => player.id === draft.payer) &&
|
||||
parties.some(player => player.id === draft.recipient) && Number.isSafeInteger(Number(draft.amount)) &&
|
||||
Number(draft.amount) > 0 && draft.dueTurn.trim() !== '' && Number.isSafeInteger(Number(draft.dueTurn)) &&
|
||||
Number(draft.dueTurn) >= game.turn;
|
||||
const update = (change: Partial<AdditionalPaymentDraft>) => setAdditionalDrafts(current =>
|
||||
current.map(row => row.key === draft.key ? {...row,...change} : row));
|
||||
return <fieldset key={draft.key}>
|
||||
<legend>Additional payment {index + 1}</legend>
|
||||
<label>Paying participant
|
||||
<select value={parties.some(player => player.id === draft.payer) ? draft.payer : ''} disabled={disabled}
|
||||
onChange={event => update({payer:event.target.value})}>
|
||||
<option value="">Choose a payer</option>
|
||||
{parties.map(player => <option key={player.id} value={player.id}>{player.name} · {faction(player.faction).name}</option>)}
|
||||
</select>
|
||||
</label>
|
||||
<label>Receiving participant
|
||||
<select value={parties.some(player => player.id === draft.recipient) ? draft.recipient : ''} disabled={disabled}
|
||||
onChange={event => update({recipient:event.target.value})}>
|
||||
<option value="">Choose a recipient</option>
|
||||
{parties.filter(player => player.id !== draft.payer).map(player => <option key={player.id} value={player.id}>{player.name} · {faction(player.faction).name}</option>)}
|
||||
</select>
|
||||
</label>
|
||||
<label>Gross spice amount
|
||||
<input type="number" inputMode="numeric" min={1} step={1} value={draft.amount} disabled={disabled}
|
||||
onChange={event => update({amount:event.target.value})} />
|
||||
</label>
|
||||
<label>Payment due by the end of turn
|
||||
<input type="number" inputMode="numeric" min={game.turn} step={1} value={draft.dueTurn} disabled={disabled}
|
||||
required aria-invalid={!valid} onChange={event => update({dueTurn:event.target.value})} />
|
||||
</label>
|
||||
{legalSelection && !valid && <p>Choose two different participants, a positive whole amount and a current or future due turn.</p>}
|
||||
<Button type="button" variant="outline" disabled={disabled}
|
||||
onClick={() => setAdditionalDrafts(current => current.filter(row => row.key !== draft.key))}>Remove additional payment {index + 1}</Button>
|
||||
</fieldset>;
|
||||
})}
|
||||
<Button type="button" variant="outline" disabled={disabled || additionalDrafts.length >= 12 || selected.length === 0}
|
||||
onClick={() => {
|
||||
const key = nextAdditionalKey.current++;
|
||||
setAdditionalDrafts(current => [...current, {key,payer:'',recipient:'',amount:'1',dueTurn:String(game.turn)}]);
|
||||
}}>Add deferred payment</Button>
|
||||
{additionalDrafts.length > 0 && <p className="fine">Each additional payment has its own deadline and pay control. The recipient collects its share at the next Mentat opening.</p>}
|
||||
<label className="checkbox-row">
|
||||
<input type="checkbox" checked={includeTravel} disabled={disabled || !includeTravel && selected.length === 0}
|
||||
onChange={event => setIncludeTravel(event.target.checked)} />
|
||||
|
||||
Reference in new issue
Block a user