allow shout TOCMs and add test for that

Author: downvoid

src/conventions/h-group/interpret-discard.js

@@ -269,7 +269,30 @@ export function interpret_discard(game, action) {
 				state.dda = state.deck[order].identity();
 		}
 	}
-
+	// Check if a Trash Order Chop Move happened.
+	if (game.level >= LEVEL.TRASH_PUSH && !state.inEndgame()) {
+		const leftmost_kt = before_trash.sort((a, b) => b - a)[0];
+		if (order !== leftmost_kt) {
+			// check for the Shout Trash Order cm
+			const shout = (common.thinksPlayables(state, playerIndex).length) > 0 ? 1 : 0;
+			const players_after = before_trash.indexOf(order) + shout;
+			// make sure the discarded card is actually known trash
+			if (players_after === -1 || players_after >= game.players.length) {
+				resolve_discard(game, action, DISCARD_INTERP.NONE);
+				return game;
+			}
+			const player_to_cm = (players_after + playerIndex) % game.players.length;
+			const player_chop = common.chop(state.hands[player_to_cm]);
+			// make sure the player has a chop
+			if (player_chop === undefined) {
+				resolve_discard(game, action, DISCARD_INTERP.NONE);
+				return game;
+			}
+			// chop move
+			console.log(player_to_cm);
+			perform_cm(state, common, [player_chop]);
+		}
+	}
 	if (game.level >= LEVEL.LAST_RESORTS && !action.failed && !state.inEndgame()) {
 		let interp = check_sdcm(game, action, before_trash, old_chop);
 
@@ -344,28 +367,7 @@ export function interpret_discard(game, action) {
 			return game;
 		}
 	}
-	// Check if a Trash Order Chop Move happened.
-	if (game.level >= LEVEL.TRASH_PUSH && !state.inEndgame()) {
-		const leftmost_kt = before_trash.sort((a, b) => b - a)[0];
-		if (order !== leftmost_kt) {
-			const players_after = before_trash.indexOf(order);
-			// make sure the discarded card is actually known trash
-			if (players_after === -1 || players_after >= game.players.length) {
-				resolve_discard(game, action, DISCARD_INTERP.NONE);
-				return game;
-			}
-			const player_to_cm = (players_after + playerIndex) % game.players.length;
-			const player_chop = common.chop(state.hands[player_to_cm]);
-			// make sure the player has a chop
-			if (player_chop === undefined) {
-				resolve_discard(game, action, DISCARD_INTERP.NONE);
-				return game;
-			}
-			// chop move
-			console.log(player_to_cm);
-			perform_cm(state, common, [player_chop]);
-		}
-	}
+	
 	resolve_discard(game, action, DISCARD_INTERP.NONE);
 	return game;
 }

test/h-group/level-14.js

@@ -218,4 +218,23 @@ describe('trash order chop move', () => {
 		const action = await game.take_action();
 		ExAsserts.objHasProperties(action, { type: ACTION.DISCARD, target: game.state.hands[PLAYER.ALICE][2] }, `Expected (Discard slot 3) but got ${logPerformAction(action)}`);
 	});
+
+	it('recognizes a Shout TOCM', async () => {
+		const game = setup(HGroup, [
+			['xx', 'xx', 'xx', 'xx', 'xx'],
+			['y1', 'p3', 'g4', 'p4', 'r1'],
+			['r1', 'y1', 'g1', 'p2', 'b5']
+		], {
+			level: { min: 14 },
+			play_stacks: [2, 2, 5, 0, 4],
+			starting: PLAYER.BOB
+		});
+		takeTurn(game, 'Bob clues green to Alice (slots 2,3)');
+		takeTurn(game, 'Cathy clues blue to Alice (slot 1)');
+		takeTurn(game, 'Alice discards g2 (slot 3)', 'r5');
+
+		// Cathy should chop move.
+		const action = await game.take_action();
+		assert.ok(game.common.thoughts[game.state.hands[PLAYER.CATHY][4]].chop_moved);
+	});
 });