From ed6a4ff81bc87062a54c99f0b184709f93bdc961 Mon Sep 17 00:00:00 2001 From: Joël Simoneau Date: Thu, 3 Apr 2025 08:55:46 -0400 Subject: Fuzzy event 21 space --- events.txt | 2 +- rules.js | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/events.txt b/events.txt index 7436ed2..98bb77a 100644 --- a/events.txt +++ b/events.txt @@ -491,7 +491,7 @@ SHADED 21 current DS campaign prompt "Govern, Attack or Demand Obedience in selected Province." - space 1 ([S_MALWA, S_MADHYADESH, S_JAUNPUR, S_GONDWANA].includes(s)) + space 1 ([S_MALWA, S_MADHYADESH, S_JAUNPUR, S_GONDWANA].includes(s) && can_govern_attack_demande_in_space(s)) govern_attack_demand endspace diff --git a/rules.js b/rules.js index e78b17d..b0797a0 100644 --- a/rules.js +++ b/rules.js @@ -5564,6 +5564,16 @@ states.vm_conspire_trade = { } } +function can_govern_attack_demande_in_space(s) { + if ( + (can_govern() && can_govern_in_space(s)) || + (can_attack() && can_attack_in_space(s)) || + (can_demand() && can_demand_in_space(s)) + ) + return true + return false +} + states.vm_govern_attack_demand = { prompt() { event_prompt("Govern, Attack or Demande Obedience in selected Province.") @@ -6413,7 +6423,7 @@ CODE[21 * 2 + 1] = [ [ vm_current, DS ], [ vm_campaign ], [ vm_prompt, "Govern, Attack or Demand Obedience in selected Province." ], - [ vm_space, true, 1, 1, (s)=>([S_MALWA, S_MADHYADESH, S_JAUNPUR, S_GONDWANA].includes(s)) ], + [ vm_space, true, 1, 1, (s)=>([S_MALWA, S_MADHYADESH, S_JAUNPUR, S_GONDWANA].includes(s) && can_govern_attack_demande_in_space(s)) ], [ vm_govern_attack_demand ], [ vm_endspace ], [ vm_return ], -- cgit v1.2.3