summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Andersson <tor@ccxvii.net>2024-05-23 21:51:41 +0200
committerTor Andersson <tor@ccxvii.net>2024-05-23 21:51:41 +0200
commit53965f0f71892e3aabffbf37c31ebe15f7652505 (patch)
tree4ddf628f55f66885e7b728ef35b188cb4ec4731b
parent44a474bd5bd9f6fd5b6362a0e97cb462901252af (diff)
downloadplantagenet-53965f0f71892e3aabffbf37c31ebe15f7652505.tar.gz
allow use of Irishmen in ireland exile box
-rw-r--r--rules.js5
-rw-r--r--rules.ts5
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)
)
}