From 53965f0f71892e3aabffbf37c31ebe15f7652505 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Thu, 23 May 2024 21:51:41 +0200 Subject: allow use of Irishmen in ireland exile box --- rules.js | 5 ++--- rules.ts | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/rules.js b/rules.js index e451346..68b373e 100644 --- a/rules.js +++ b/rules.js @@ -2890,9 +2890,8 @@ function can_add_troops_beloved_warwick(lord, here) { lord_has_capability(lord, AOW_YORK_BELOVED_WARWICK)); } function can_add_troops_irishmen(lord, here) { - return (can_add_troops(here) && - lord_has_capability(lord, AOW_YORK_IRISHMEN) && - (here === LOC_IRELAND || is_adjacent_irish_sea(here))); + return ((here === LOC_IRELAND || (is_adjacent_irish_sea(here) && can_add_troops(here))) && + lord_has_capability(lord, AOW_YORK_IRISHMEN)); } function count_available_mercenaries() { let n = 0; diff --git a/rules.ts b/rules.ts index 0473b25..3e038f4 100644 --- a/rules.ts +++ b/rules.ts @@ -3547,9 +3547,8 @@ function can_add_troops_beloved_warwick(lord: Lord, here: Locale) { function can_add_troops_irishmen(lord: Lord, here: Locale) { return ( - can_add_troops(here) && - lord_has_capability(lord, AOW_YORK_IRISHMEN) && - (here === LOC_IRELAND || is_adjacent_irish_sea(here)) + (here === LOC_IRELAND || (is_adjacent_irish_sea(here) && can_add_troops(here))) && + lord_has_capability(lord, AOW_YORK_IRISHMEN) ) } -- cgit v1.2.3