Settle multiple immediate deal payments
Verify and publish checkpoint container / container (push) Successful in 10m59s
Verify and publish checkpoint container / container (push) Successful in 10m59s
This commit is contained in:
1 parent
cacc88906c
commit
b03efd2371
11 files changed
+652
-18
No files matched your search
@@ -19,6 +19,7 @@ type TravelProjection = GameView & { dealTravelStatus?: Record<string, DealTrave
|
||||
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 AdditionalImmediateDraft = { key: number; payer: string; recipient: string; amount: string };
|
||||
type DeferredPaymentProjection = GameView & {
|
||||
deferredDealPaymentOptions?: Record<string, { blocked: string | null }>;
|
||||
};
|
||||
@@ -64,7 +65,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, additionalPayments?: readonly DeferredBribe[]): Action | null {
|
||||
export function publicDealOfferAction(targets: readonly string[], terms: string, payment?: DealPayment, proposer?: string, currentTurn?: number, travel?: DealTravel, additionalPayments?: readonly DeferredBribe[], additionalImmediatePayments?: readonly ImmediateBribe[]): 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 ||
|
||||
@@ -77,6 +78,10 @@ export function publicDealOfferAction(targets: readonly string[], terms: string,
|
||||
![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;
|
||||
if (additionalImmediatePayments && (additionalImmediatePayments.length > 12 || additionalImmediatePayments.some(term =>
|
||||
!proposer || term.kind !== 'immediateBribe' || term.payer === term.recipient ||
|
||||
![proposer, ...targets].includes(term.payer) || ![proposer, ...targets].includes(term.recipient) ||
|
||||
!Number.isSafeInteger(term.amount) || term.amount < 1))) 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;
|
||||
@@ -93,12 +98,15 @@ export function publicDealOfferAction(targets: readonly string[], terms: string,
|
||||
const offeredAdditional = additionalPayments?.length
|
||||
? { additionalPayments: additionalPayments.map(term => ({kind:term.kind, payer:term.payer,
|
||||
recipient:term.recipient, amount:term.amount, dueTurn:term.dueTurn})) } : {};
|
||||
const offeredImmediate = additionalImmediatePayments?.length
|
||||
? { additionalImmediatePayments: additionalImmediatePayments.map(term => ({kind:term.kind, payer:term.payer,
|
||||
recipient:term.recipient, amount:term.amount})) } : {};
|
||||
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, ...offeredAdditional, ...offeredTravel }
|
||||
: { type: 'dealOffer', targets: [...targets], terms: text, ...offeredPayment, ...offeredAdditional, ...offeredTravel };
|
||||
? { type: 'dealOffer', target: targets[0], terms: text, ...offeredPayment, ...offeredAdditional, ...offeredImmediate, ...offeredTravel }
|
||||
: { type: 'dealOffer', targets: [...targets], terms: text, ...offeredPayment, ...offeredAdditional, ...offeredImmediate, ...offeredTravel };
|
||||
}
|
||||
|
||||
/** The whole table can read an offer and its history; only its parties act. */
|
||||
@@ -127,6 +135,7 @@ export function PublicDealList({ game, act, disabled }: {
|
||||
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 additionalImmediate = (deal as unknown as { additionalImmediatePayments?: ImmediateBribe[] }).additionalImmediatePayments ?? [];
|
||||
const travel = (deal as TravelDeal).travel;
|
||||
const travelActor = travel ? publicDealTravelActor(deal) : undefined;
|
||||
const travelStatus = (game as TravelProjection).dealTravelStatus?.[deal.id];
|
||||
@@ -136,7 +145,8 @@ export function PublicDealList({ game, act, disabled }: {
|
||||
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 paymentBlocked = payment?.kind === 'immediateBribe' && finalAcceptance && payment.payer === game.me ? game.bribeOptions?.blocked : null;
|
||||
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 ||
|
||||
additional.some(term => game.turn > term.payment.dueTurn);
|
||||
const deferredOption = (game as DeferredPaymentProjection).deferredDealPaymentOptions?.[deal.id];
|
||||
@@ -146,6 +156,7 @@ export function PublicDealList({ game, act, disabled }: {
|
||||
<p><strong>{name(deal.from)} → {participants.filter(id => id !== deal.from).map(name).join(', ')}</strong> · Turn {deal.turn} · {deal.status}</p>
|
||||
<p>{deal.terms}</p>
|
||||
{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>}
|
||||
{additionalImmediate.map((term, index) => <p key={`immediate-${index}`}><strong>Additional immediate payment {index + 1}:</strong> {name(term.payer)} pays {term.amount} spice to {name(term.recipient)} on final acceptance. The recipient collects their share at the next Mentat opening; a Bureaucrat may redirect two spice to the bank.</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) => {
|
||||
@@ -214,6 +225,8 @@ export function PublicDeals({ game, act, busy }: {
|
||||
const [paymentAmount, setPaymentAmount] = useState('1');
|
||||
const [additionalDrafts, setAdditionalDrafts] = useState<AdditionalPaymentDraft[]>([]);
|
||||
const nextAdditionalKey = useRef(0);
|
||||
const [additionalImmediateDrafts, setAdditionalImmediateDrafts] = useState<AdditionalImmediateDraft[]>([]);
|
||||
const nextAdditionalImmediateKey = 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);
|
||||
@@ -255,6 +268,9 @@ export function PublicDeals({ game, act, busy }: {
|
||||
kind:'deferredBribe', payer:draft.payer, recipient:draft.recipient,
|
||||
amount:Number(draft.amount), dueTurn:Number(draft.dueTurn),
|
||||
}));
|
||||
const additionalImmediatePayments: ImmediateBribe[] = additionalImmediateDrafts.map(draft => ({
|
||||
kind:'immediateBribe', payer:draft.payer, recipient:draft.recipient, amount:Number(draft.amount),
|
||||
}));
|
||||
const travelTurn = Number(travelDueTurn);
|
||||
const travelDueValid = travelDueTurn.trim() !== '' && Number.isSafeInteger(travelTurn) && travelTurn >= game.turn;
|
||||
const travel: DealTravel | undefined = includeTravel ? {kind:travelKind, territory:travelTerritory,
|
||||
@@ -262,7 +278,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, additionalPayments) : null;
|
||||
? publicDealOfferAction(selected, terms, payment, me?.id, game.turn, travel, additionalPayments, additionalImmediatePayments) : 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">
|
||||
@@ -332,6 +348,42 @@ 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>}
|
||||
{additionalImmediateDrafts.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;
|
||||
const update = (change: Partial<AdditionalImmediateDraft>) => setAdditionalImmediateDrafts(current =>
|
||||
current.map(row => row.key === draft.key ? {...row,...change} : row));
|
||||
return <fieldset key={draft.key}>
|
||||
<legend>Additional immediate 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>
|
||||
{legalSelection && !valid && <p>Choose two different participants and a positive whole spice amount.</p>}
|
||||
<Button type="button" variant="outline" disabled={disabled}
|
||||
onClick={() => setAdditionalImmediateDrafts(current => current.filter(row => row.key !== draft.key))}>Remove immediate payment {index + 1}</Button>
|
||||
</fieldset>;
|
||||
})}
|
||||
<Button type="button" variant="outline" disabled={disabled || additionalImmediateDrafts.length >= 12 || selected.length === 0}
|
||||
onClick={() => {
|
||||
const key = nextAdditionalImmediateKey.current++;
|
||||
setAdditionalImmediateDrafts(current => [...current, {key,payer:'',recipient:'',amount:'1'}]);
|
||||
}}>Add immediate payment</Button>
|
||||
{additionalImmediateDrafts.length > 0 && <p className="fine">Immediate payments are processed on final acceptance. A qualifying Bureaucrat may respond to each payment.</p>}
|
||||
{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)) &&
|
||||
|
||||
Reference in new issue
Block a user