diff --git a/components/bribe-promises.tsx b/components/bribe-promises.tsx index d0b30c73..971755b2 100644 --- a/components/bribe-promises.tsx +++ b/components/bribe-promises.tsx @@ -60,6 +60,11 @@ export function BribePromiseGuideButton(props: BribePromiseProps) { export function BribePromises(props: BribePromiseProps) { const own = props.game.bribePromises.filter(promise => promise.player === props.game.me); if (!own.length) return null; + const live = liveBribePromises(own, props.game.me, props.game.turn).length > 0; + const pendingChoamIncome = live && props.game.status === 'playing' && + props.game.players.find(player => player.id === props.game.me)?.faction === 'choam' && + Number.isSafeInteger(props.game.phase) && props.game.phase >= 0 && props.game.phase <= 2 && + props.game.charity.incomePending && !props.game.charity.incomeCanceled && props.game.charity.multiplier > 0; const name = (id: string) => props.game.players.find(player => player.id === id)?.name ?? 'the named recipient'; return

Your bribe promises

@@ -74,6 +79,10 @@ export function BribePromises(props: BribePromiseProps) { No forbids reaching that minimum during the rest of this turn. Smaller payments to the named recipient add together. Prior payments, gifts and ally aid do not count.

+ {pendingChoamIncome &&

+ Automatic CHOAM income resolves at the Charity opening. It is not current spendable cash. + Your ordinary Charity claim is separate. Karama or opposing claims can change the funding. + Current payment guides may still offer legal prepayments.

}

The sender pays immediately. The recipient collects the payment at the start of Mentat Pause. Payments made during Mentat Pause wait until the start of next turn's Mentat Pause. @@ -82,6 +91,6 @@ export function BribePromises(props: BribePromiseProps) { The future claim is not current spendable spice; only actual payments add to the recorded total. {' '}Bribe promise rules.

- {liveBribePromises(own, props.game.me, props.game.turn).length > 0 && } + {live && }
; } diff --git a/components/turn-action-promises.tsx b/components/turn-action-promises.tsx index 4d4f9563..66c94f46 100644 --- a/components/turn-action-promises.tsx +++ b/components/turn-action-promises.tsx @@ -361,6 +361,10 @@ export function TurnActionPromises(props: TurnActionProps) { const game = props.game, own = game.turnActionPromises.filter(promise => promise.player === game.me); if (!own.length) return null; const live = own.some(promise => promise.turn === game.turn && !promise.fulfilled && !promise.released); + const pendingChoamIncome = live && game.status === 'playing' && + game.players.find(player => player.id === game.me)?.faction === 'choam' && + Number.isSafeInteger(game.phase) && game.phase >= 0 && game.phase <= 2 && + game.charity.incomePending && !game.charity.incomeCanceled && game.charity.multiplier > 0; return

Your battle and turn-action promises