Make Fremen allied revival grants cancelable

Bind the original Fremen/ally/turn grant before Karama allowance or prevention.
A prevented grant leaves intrinsic free rates and prior payments intact. Permit
late grants under the explicit provisional Recruits current-rate policy, with
shared controls, minimal bot support and native public chronology evidence.
Complete rules and browser/deployed acceptance remain open.
This commit is contained in:
Quintine committed 2026-10-24 18:16:03 +11:00
1 parent d63efccb55
commit 0e3d6a250e
23 files changed
+1183 -44

No files matched your search

+12 -11
View File
@@ -52,6 +52,7 @@ import { NexusSardaukar } from './nexus-sardaukar';
import { TerrorBoardMarkers } from './terror-board-markers';
import { AmbassadorBoardMarkers } from './ambassador-board-markers';
import { CharityClaim } from './charity-claim';
import { FremenRevivalGrant } from './fremen-revival-grant';
import { homeworldRevivalActionBlock } from '@/game/homeworld-revival-deployment-options';
import { GuildHomeworldShipment } from './guild-homeworld-shipment';
import { JunctionTransport } from './junction-transport';
@@ -2423,6 +2424,7 @@ export function GameTable({
advisor: 'Spiritual advisor',
emperorGift: 'Emperor spice gift',
emperorRevival: 'Emperor extra revival',
fremenRevivalGrant: 'Fremen allied free revival',
bgCharity: 'Bene Gesserit charity',
choamCharity: 'CHOAM charity income',
choamInflation: 'CHOAM Inflation placement',
@@ -2546,6 +2548,14 @@ export function GameTable({
allow five forces.
</p>
)}
{g.response.kind === 'fremenRevivalGrant' && (
<p className="notice">
Fremen offered their current ally the ordinary free-revival rate of three.
Karama can prevent this grant before it takes effect. Recruits uses the
current valid rate after settlement, with prior returns and payments retained.
Response timing and prevention of this grant for the current Revival are provisional.
</p>
)}
{g.response.kind === 'choamCharity' && (
<p className="muted">
CHOAM receives{' '}
@@ -4367,19 +4377,10 @@ export function GameTable({
? ' · Tleilaxu half-price discount'
: ''}
</p>
{me.faction === 'fremen' &&
me.ally &&
!g.freeRevival.includes(me.ally) &&
actionButton('Grant ally three free revivals', {
type: 'grantRevival',
}, !!g.recruitsPreview?.grantRevivalBlocked,
g.recruitsPreview?.grantRevivalBlocked ? 'recruits-grant-unavailable' : undefined)}
{me.faction === 'fremen' && me.ally && !g.freeRevival.includes(me.ally) && g.recruitsPreview?.grantRevivalBlocked && (
<p className="notice" id="recruits-grant-unavailable">{g.recruitsPreview.grantRevivalBlocked}</p>
)}
<FremenRevivalGrant game={g} act={act} busy={busy} />
{g.freeRevival.includes(me.id) && !g.revival.freeBlocked && (
<p className="muted">
Fremen allow you up to {g.recruitsPreview?.active ? 'six' : 'three'} free force revivals this phase.
Fremen’s grant is active. Your current free allowance above includes Recruits and any applicable bonuses.
</p>
)}
{amountInput}