Offer Semuta before ordinary CHOAM Trip force return

tests/choam-gamont.test.ts

@@ -5,6 +5,7 @@ import {
   createGame,
   newPlayer,
   viewGame,
+  normalizeAutomaticGame,
   RuleError,
   type Game,
   type Action,
@@ -13,6 +14,8 @@ import { baseDeck } from '../game/cards';
 import { TERRITORIES, MOBILE_LOCATION } from '../game/board';
 import { botActions } from '../game/bots';
 import { DIFFICULTIES } from '../game/bot-profiles';
+import { richeseCards } from '../game/richese-cards';
+import { SEMUTA_DRUG_ID } from '../game/semuta-drug';
 const key = (id: string) =>
   `${id}:${TERRITORIES.find((t) => t.id === id)!.sectors[0]}`;
 const player = (g: Game, id: string) => g.players.find((p) => p.id === id)!;
@@ -149,6 +152,75 @@ void test('Trip may be played during ordinary Mentat and clears readiness before
   g = done(closing(g));
   assert.equal(g.turn, 2);
 });
+void test('clean proactive ordinary Trip discard offers Semuta before one force returns', () => {
+  const initial = fixture();
+  initial.players[1] = newPlayer('e', 'Richese', 'richese');
+  player(initial, 'e').forces = Object.fromEntries(
+    ['arrakeen', 'carthag', 'sietch_tabr'].map(t => [key(t), 1]));
+  player(initial, 'e').reserves = 17;
+  initial.richeseCache = richeseCards();
+  initial.semutaPreview = true;
+  const index = initial.richeseCache.findIndex(card => card.id === SEMUTA_DRUG_ID);
+  assert.ok(index >= 0);
+  const semuta = initial.richeseCache.splice(index, 1)[0];
+  player(initial, 'e').hand.push(semuta);
+  contest(initial, 'b');
+  const card = player(initial, 'c').hand.find(card => card.name === 'Trip to Gamont')!.id;
+  const physical = (state: Game) => [
+    ...state.deck, ...state.discard, ...state.richeseCache!,
+    ...state.players.flatMap(p => p.hand),
+  ].map(card => card.id).sort();
+  const original = physical(initial);
+  const absent = structuredClone(initial);
+  player(absent, 'e').hand = [absent.richeseCache!.splice(0, 1)[0]];
+  absent.richeseCache!.push(semuta);
+  const pending = allow(trip(mentat(initial)));
+  const neutral = allow(trip(mentat(absent)));
+  const event = pending.pendingTreacheryDiscard!.batch.event;
+  assert.equal(pending.pendingTreacheryDiscard?.continuation.kind, 'choamGamontDiscard');
+  assert.equal(pending.pendingTreacheryDiscard?.reaction?.stage, 'offer');
+  assert.equal(neutral.pendingTreacheryDiscard?.reaction?.stage, 'offer');
+  assert.equal(player(pending, 'e').forces[key('arrakeen')], 1);
+  assert.equal(player(pending, 'e').reserves, 17);
+  assert.equal(pending.discard.filter(used => used.id === card).length, 1);
+  for (const id of ['c', 'b', 'g'])
+    assert.deepEqual(viewGame(pending, id), viewGame(neutral, id));
+  assert.equal(viewGame(pending, 'e').semutaReaction?.canCommit, true);
+  assert.equal(botActions(viewGame(pending, 'e'))[0]?.type, 'semutaCommit');
+  assert.deepEqual(normalizeAutomaticGame(JSON.parse(JSON.stringify(pending))), pending);
+  for (const change of [
+    (state: Game) => {
+      const c = state.pendingTreacheryDiscard!.continuation;
+      if (c.kind === 'choamGamontDiscard') c.target = 'b';
+    },
+    (state: Game) => { delete player(state, 'e').forces[key('arrakeen')]; },
+    (state: Game) => { state.pendingTreacheryDiscard!.batch.entries[0].card.name = 'Forgery'; },
+  ]) {
+    const corrupt: Game = JSON.parse(JSON.stringify(pending));
+    change(corrupt);
+    const before = JSON.stringify(corrupt);
+    assert.throws(() => send(corrupt, 'e', { type: 'semutaCommit', event }));
+    assert.equal(JSON.stringify(corrupt), before);
+  }
+  let declined: Game = JSON.parse(JSON.stringify(pending));
+  for (const id of ['c', 'b', 'g', 'e'])
+    declined = send(declined, id, { type: 'semutaPass', event });
+  const claimed = send(JSON.parse(JSON.stringify(pending)), 'e',
+    { type: 'semutaCommit', event });
+  for (const state of [declined, claimed]) {
+    assert.equal(state.pendingTreacheryDiscard, null);
+    assert.equal(player(state, 'e').forces[key('arrakeen')], undefined);
+    assert.equal(player(state, 'e').reserves, 18);
+    assert.deepEqual(state.ready, []);
+    assert.deepEqual(physical(state), original);
+    assert.equal(done(closing(state)).turn, 2);
+    assert.throws(() => send(state, 'e', { type: 'semutaCommit', event }));
+  }
+  assert.equal(declined.discard.filter(used => used.id === card).length, 1);
+  assert.equal(player(claimed, 'e').hand.filter(used => used.id === card).length, 1);
+  assert.equal(claimed.discard.filter(used => used.id === semuta.id).length, 1);
+});
+
 void test('a Karama cancellation keeps both the selected force and Trip card and does not skip the victory opportunity', () => {
   const initial = fixture();
   const karama = hold(initial, 'e', 'Karama');

tests/semuta-recovery.test.ts

@@ -1045,6 +1045,81 @@ void test('authenticated proactive Baliset Semuta claim restores only the select
   } finally { f.sqlite.close(); }
 });
 
+void test('authenticated ordinary Trip Semuta claim returns one force after saved offer', async () => {
+  const f = unitStore();
+  try {
+    const made = await f.rooms.createRoom('Semuta Trip', 'choam', false, ['choam']);
+    const code = made.view.code;
+    const richese = await f.rooms.joinRoom(code, 'Richese', 'richese');
+    const bg = await f.rooms.joinRoom(code, 'BG', 'beneGesserit');
+    const auths = await Promise.all([made.token!, richese.token!, bg.token!]
+      .map(token => f.restart().authenticate(code, token)));
+    const existing = await f.restart().readRoom(code);
+    const g = createGame(code, newPlayer(auths[0].playerId, 'CHOAM', 'choam'), false, ['choam']);
+    g.players.push(newPlayer(auths[1].playerId, 'Richese', 'richese'),
+      newPlayer(auths[2].playerId, 'BG', 'beneGesserit'));
+    Object.assign(g, { status: 'playing', phase: 8, turn: 2, storm: 18,
+      active: auths[0].playerId, order: auths.map(auth => auth.playerId),
+      deck: baseDeck(), richeseCache: richeseCards(), semutaPreview: true });
+    for (const p of g.players) {
+      p.spice = 10;
+      p.hand = [];
+      p.traitors = p.leaders.length ? [p.leaders[0].id] : [];
+      p.traitorChoices = [];
+    }
+    const semuta = take(g, SEMUTA_DRUG_ID), karama = take(g, 'karama');
+    const index = g.deck.findIndex(card => card.name === 'Trip to Gamont');
+    assert.ok(index >= 0);
+    const used = g.deck.splice(index, 1)[0];
+    g.players[0].hand.push(used);
+    g.players[1].hand.push(semuta);
+    g.players[1].forces = { 'arrakeen:10': 1 };
+    g.players[1].reserves = 19;
+    g.players[2].hand.push(karama);
+    g.version = existing.version + 1;
+    assert.equal(f.sqlite.prepare('UPDATE rooms SET state=?,version=? WHERE code=? AND version=?')
+      .run(JSON.stringify(g), g.version, code, existing.version).changes, 1);
+    const seats = f.sqlite.prepare('SELECT * FROM seats').all();
+    const act = async (index: number, action: Action) => {
+      const current = await f.restart().readRoom(code);
+      await f.restart().act(code, auths[index], current.version, action, clock);
+      return f.restart().readRoom(code);
+    };
+    let current = await act(0, {
+      type: 'card', mode: 'choam', card: used.id, target: auths[1].playerId,
+      from: 'arrakeen:10', elite: 0,
+    });
+    assert.equal(current.response?.kind, 'choamWorthless');
+    for (let i = 0; current.response?.kind === 'choamWorthless' && i < 3; i++) {
+      const index = auths.findIndex(auth =>
+        !viewGame(current, auth.playerId).responseControls?.hasPassed &&
+        !!viewGame(current, auth.playerId).responseControls?.cancelCards.length);
+      assert.ok(index >= 0);
+      current = await act(index, { type: 'passResponse' });
+    }
+    const event = current.pendingTreacheryDiscard!.batch.event;
+    assert.equal(current.pendingTreacheryDiscard?.continuation.kind, 'choamGamontDiscard');
+    assert.equal(current.pendingTreacheryDiscard?.reaction?.stage, 'offer');
+    assert.equal(current.players[1].forces['arrakeen:10'], 1);
+    assert.equal(current.players[1].reserves, 19);
+    assert.equal(current.discard.filter(card => card.id === used.id).length, 1);
+    await f.restart().continueRoomAutomatic(code, clock);
+    assert.equal((await f.restart().readRoom(code)).version, current.version);
+    assert.equal((await f.restart().readSeatView(code, auths[1])).semutaReaction?.canCommit, true);
+    const claimed = await act(1, { type: 'semutaCommit', event });
+    assert.equal(claimed.pendingTreacheryDiscard, null);
+    assert.equal(claimed.players[1].forces['arrakeen:10'], undefined);
+    assert.equal(claimed.players[1].reserves, 20);
+    assert.equal(claimed.players[1].hand.filter(card => card.id === used.id).length, 1);
+    assert.equal(claimed.discard.filter(card => card.id === semuta.id).length, 1);
+    await assert.rejects(f.restart().act(code, auths[1], current.version,
+      { type: 'semutaCommit', event }, clock));
+    assert.deepEqual(f.sqlite.prepare('SELECT * FROM seats').all(), seats);
+    for (const auth of auths)
+      assert.deepEqual(await f.restart().readSeatView(code, auth), viewGame(claimed, auth.playerId));
+  } finally { f.sqlite.close(); }
+});
+
 void test('authenticated CHOAM sale retains paid spice and market after a saved Semuta claim', async () => {
   const f = unitStore();
   try {