From 91ed031f500e18f13ac90a3f54b47fbc77d07bd3 Mon Sep 17 00:00:00 2001 From: teisuru <31881306+teisuru@users.noreply.github.com> Date: Thu, 7 Nov 2024 21:28:52 +0100 Subject: fix Welshmen, Northmen and Southmen Fix Welshmen, Northmen and Southmen to only apply during Tides of War. This fixes the behavior of Jack Cade when it checks domination during Muster. --- rules.js | 6 +++--- rules.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rules.js b/rules.js index eb29ff5..1cb8a64 100644 --- a/rules.js +++ b/rules.js @@ -1473,7 +1473,7 @@ function is_lancaster_dominating_north() { if (has_lancaster_favour(loc)) n++; let cap_lord = find_lord_with_capability_card(AOW_LANCASTER_NORTHMEN); - if (is_lancaster_lord(cap_lord) && is_north(get_lord_locale(cap_lord))) + if (!is_levy_phase() && is_lancaster_lord(cap_lord) && is_north(get_lord_locale(cap_lord))) return n >= 3; return n >= all_north_locales.length; } @@ -1483,7 +1483,7 @@ function is_york_dominating_south() { if (has_york_favour(loc)) n++; let cap_lord = find_lord_with_capability_card(AOW_YORK_SOUTHERNERS); - if (is_york_lord(cap_lord) && is_south(get_lord_locale(cap_lord))) + if (!is_levy_phase() && is_york_lord(cap_lord) && is_south(get_lord_locale(cap_lord))) return n >= 5; return n >= all_south_locales.length; } @@ -1500,7 +1500,7 @@ function is_york_dominating_wales() { if (has_york_favour(loc)) n++; let cap_lord = find_lord_with_capability_card(AOW_YORK_WELSHMEN); - if (is_york_lord(cap_lord) && is_wales(get_lord_locale(cap_lord))) + if (!is_levy_phase() && is_york_lord(cap_lord) && is_wales(get_lord_locale(cap_lord))) return n >= 3; return n >= all_wales_locales.length; } diff --git a/rules.ts b/rules.ts index 7f45b6e..964c82c 100644 --- a/rules.ts +++ b/rules.ts @@ -1946,7 +1946,7 @@ function is_lancaster_dominating_north() { if (has_lancaster_favour(loc)) n++ let cap_lord = find_lord_with_capability_card(AOW_LANCASTER_NORTHMEN) - if (is_lancaster_lord(cap_lord) && is_north(get_lord_locale(cap_lord))) + if (!is_levy_phase() && is_lancaster_lord(cap_lord) && is_north(get_lord_locale(cap_lord))) return n >= 3 return n >= all_north_locales.length } @@ -1957,7 +1957,7 @@ function is_york_dominating_south() { if (has_york_favour(loc)) n++ let cap_lord = find_lord_with_capability_card(AOW_YORK_SOUTHERNERS) - if (is_york_lord(cap_lord) && is_south(get_lord_locale(cap_lord))) + if (!is_levy_phase() && is_york_lord(cap_lord) && is_south(get_lord_locale(cap_lord))) return n >= 5 return n >= all_south_locales.length } @@ -1976,7 +1976,7 @@ function is_york_dominating_wales() { if (has_york_favour(loc)) n++ let cap_lord = find_lord_with_capability_card(AOW_YORK_WELSHMEN) - if (is_york_lord(cap_lord) && is_wales(get_lord_locale(cap_lord))) + if (!is_levy_phase() && is_york_lord(cap_lord) && is_wales(get_lord_locale(cap_lord))) return n >= 3 return n >= all_wales_locales.length } -- cgit v1.2.3