From b854c11cedaa43a3768e03a3f680e43b97905246 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Thu, 9 Nov 2023 18:31:54 +0100 Subject: Vodian Treachery -- don't allow conquering conquered forts. --- rules.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/rules.js b/rules.js index 6db7903..cb00bc0 100644 --- a/rules.js +++ b/rules.js @@ -2739,9 +2739,13 @@ states.pogost = { } function can_play_vodian_treachery() { - if (is_fort(LOC_KAIBOLOVO) && is_teuton_closer_than_russian(LOC_KAIBOLOVO)) + if (is_fort(LOC_KAIBOLOVO) && + !has_conquered_marker(LOC_KAIBOLOVO) && + is_teuton_closer_than_russian(LOC_KAIBOLOVO)) return true - if (is_fort(LOC_KOPORYE) && is_teuton_closer_than_russian(LOC_KOPORYE)) + if (is_fort(LOC_KOPORYE) && + !has_conquered_marker(LOC_KOPORYE) && + is_teuton_closer_than_russian(LOC_KOPORYE)) return true return false } @@ -2766,9 +2770,9 @@ states.vodian_treachery = { inactive: "Vodian Treachery", prompt() { view.prompt = "Vodian Treachery: Conquer Kaibolovo or Koporye Fort." - if (is_fort(LOC_KAIBOLOVO) && is_teuton_closer_than_russian(LOC_KAIBOLOVO)) + if (is_fort(LOC_KAIBOLOVO) && !has_conquered_marker(LOC_KAIBOLOVO) && is_teuton_closer_than_russian(LOC_KAIBOLOVO)) gen_action_locale(LOC_KAIBOLOVO) - if (is_fort(LOC_KOPORYE) && is_teuton_closer_than_russian(LOC_KOPORYE)) + if (is_fort(LOC_KOPORYE) && !has_conquered_marker(LOC_KOPORYE) && is_teuton_closer_than_russian(LOC_KOPORYE)) gen_action_locale(LOC_KOPORYE) }, locale(loc) { -- cgit v1.2.3