From b8238aacafd983b0fd0c2bad4f5a497ad924b753 Mon Sep 17 00:00:00 2001 From: Frans Bongers Date: Thu, 20 Mar 2025 07:43:51 +0100 Subject: fix remove_blank_markers state when no blank markers on tracks --- rules.js | 10 ++++++++++ rules.ts | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/rules.js b/rules.js index fa93ae3..a213996 100644 --- a/rules.js +++ b/rules.js @@ -1625,6 +1625,10 @@ states.remove_blank_marker = { for (const b of game.triggered_track_effects) { gen_action_blank_marker(b); } + if (game.triggered_track_effects.length === 0) { + view.prompt = 'No Blank marker to remove.'; + gen_action('skip'); + } }, spend_hp() { resolve_spend_hp(); @@ -1639,6 +1643,9 @@ states.remove_blank_marker = { game.used_medallions.push(data_1.ARCHIVES_MEDALLION_ID); resolve_active_and_proceed(); }, + skip() { + resolve_active_and_proceed(); + }, }; states.remove_attack_from_fronts = { inactive: 'remove attacks', @@ -1757,6 +1764,9 @@ states.spend_hero_points = { gen_action('draw_card'); if (can_use_medallion(data_1.ARCHIVES_MEDALLION_ID, faction)) { gen_action('remove_blank_marker'); + if (game.triggered_track_effects.length === 0) { + view.actions['remove_blank_marker'] = 0; + } } if (can_use_medallion(data_1.VOLUNTEERS_MEDALLION_ID, faction)) { gen_action('add_to_front'); diff --git a/rules.ts b/rules.ts index aa555cc..04cd494 100644 --- a/rules.ts +++ b/rules.ts @@ -1991,6 +1991,10 @@ states.remove_blank_marker = { for (const b of game.triggered_track_effects) { gen_action_blank_marker(b); } + if (game.triggered_track_effects.length === 0) { + view.prompt = 'No Blank marker to remove.'; + gen_action('skip'); + } }, spend_hp() { resolve_spend_hp(); @@ -2008,6 +2012,9 @@ states.remove_blank_marker = { game.used_medallions.push(ARCHIVES_MEDALLION_ID); resolve_active_and_proceed(); }, + skip() { + resolve_active_and_proceed(); + }, }; /** @@ -2151,6 +2158,9 @@ states.spend_hero_points = { gen_action('draw_card'); if (can_use_medallion(ARCHIVES_MEDALLION_ID, faction)) { gen_action('remove_blank_marker'); + if (game.triggered_track_effects.length === 0) { + view.actions['remove_blank_marker'] = 0; + } } if (can_use_medallion(VOLUNTEERS_MEDALLION_ID, faction)) { gen_action('add_to_front'); -- cgit v1.2.3