Fix campaign problems

2 files changed, 9 insertions, 2 deletions

diff --git a/events.txt b/events.txt
index 5508655..392ca53 100644
--- a/events.txt
+++ b/events.txt
@@ -493,7 +493,9 @@ EVENT 21
 SHADED 21
 	stay_eligible
 	current DS
-	campaign
+	if (can_campaign())
+		campaign
+	endif
 	prompt "Govern, Attack or Demand Obedience in selected Province."
 	space 1 ([S_MALWA, S_MADHYADESH, S_JAUNPUR, S_GONDWANA].includes(s) && can_govern_attack_demande_in_space(s))
 		govern_attack_demand
diff --git a/rules.js b/rules.js
index 4650206..8fa8b23 100644
--- a/rules.js
+++ b/rules.js
@@ -5290,7 +5290,10 @@ function vm_to_rebel() {
 // VM: CAMPAIGN
 
 function vm_campaign() {
-	goto_campaign()
+	init_free_decree("Campaign")
+	game.decree.campaign = []
+	game.decree.selected = []
+	game.state = "campaign"
 }
 
 // VM: CONTROL
@@ -6501,7 +6504,9 @@ CODE[21 * 2 + 0] = [
 CODE[21 * 2 + 1] = [
 	[ vm_stay_eligible ],
 	[ vm_current, DS ],
+	[ vm_if, ()=>(can_campaign()) ],
 	[ vm_campaign ],
+	[ vm_endif ],
 	[ 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) && can_govern_attack_demande_in_space(s)) ],
 	[ vm_govern_attack_demand ],