From c3a9f0f58cf379f8fccc07d6a2038a4d11e070ec Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Tue, 23 Jul 2024 15:53:54 +0200 Subject: disallow mustering lords in exile --- rules.js | 4 ++-- rules.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rules.js b/rules.js index aa3fccf..2c577b0 100644 --- a/rules.js +++ b/rules.js @@ -851,7 +851,7 @@ function is_lord_on_calendar(lord) { return loc >= CALENDAR && loc <= CALENDAR_EXILE + 16; } function is_lord_ready(lord) { - return (is_lord_on_calendar(lord) && get_lord_calendar(lord) <= current_turn()); + return (is_lord_on_calendar(lord) && get_lord_calendar(lord) <= current_turn() && !is_lord_in_exile(lord)); } function get_lord_capability(lord, n) { return map2_get(game.pieces.capabilities, lord, n, NOCARD); @@ -2491,7 +2491,7 @@ function end_muster() { goto_levy_discard_events(); } function can_lord_muster(lord) { - return is_lord_on_map(lord) && !get_lord_moved(lord); + return is_lord_on_map(lord) && !get_lord_moved(lord) && !is_lord_in_exile(lord); } function has_locale_to_muster(lord) { // Can muster at own seat without enemy lord. diff --git a/rules.ts b/rules.ts index 90db8b4..e15dc7f 100644 --- a/rules.ts +++ b/rules.ts @@ -1209,7 +1209,7 @@ function is_lord_on_calendar(lord: Lord) { } function is_lord_ready(lord: Lord) { - return (is_lord_on_calendar(lord) && get_lord_calendar(lord) <= current_turn()) + return (is_lord_on_calendar(lord) && get_lord_calendar(lord) <= current_turn() && !is_lord_in_exile(lord)) } function get_lord_capability(lord: Lord, n: 0 | 1): Card { @@ -3082,7 +3082,7 @@ function end_muster() { } function can_lord_muster(lord: Lord) { - return is_lord_on_map(lord) && !get_lord_moved(lord) + return is_lord_on_map(lord) && !get_lord_moved(lord) && !is_lord_in_exile(lord) } function has_locale_to_muster(lord: Lord) { -- cgit v1.2.3