From 92aa8db31fd79df18bd0fc1947b85f600788a2a2 Mon Sep 17 00:00:00 2001 From: Joël Simoneau Date: Tue, 1 Apr 2025 16:25:37 -0400 Subject: Remove end cavalry --- rules.js | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'rules.js') diff --git a/rules.js b/rules.js index e6acad5..c0c51b8 100644 --- a/rules.js +++ b/rules.js @@ -706,21 +706,17 @@ states.main_phase = { states.cavalry = { inactive: "Gain Cavalry tokens", prompt() { - if (game.cav.n > 0) { - view.prompt = `Gain Cavalry: Take ${game.cav.n} Calvary token${game.cav.n > 1 ? "s" : ""}.` - gen_take_cavalry(game.current) - } else { - view.prompt = "Gain Cavalry: Done." - view.actions.end_cavalry = 1 - } + view.prompt = `Gain Cavalry: Take ${game.cav.n} Calvary token${game.cav.n > 1 ? "s" : ""}.` + gen_take_cavalry(game.current) }, token(c) { push_undo() game.cav.n -= 1 log_summary_cavalry(c) set_cavalry_faction(c, game.current) - }, - end_cavalry: end_cavalry + if (game.cav.n === 0) + end_cavalry() + } } states.compromising_gifts = { @@ -5688,7 +5684,7 @@ const PIECE_FACTION_TYPE_SYMBOL = [ [ null, null, null ], [ null, null, null ], [ null, null, null ], - [ null, null, CMI ] + [ null, null, "CMI" ] ] const LAST_CAVALRY = 9 -- cgit v1.2.3