Cleaning Govern

2 files changed, 7 insertions, 6 deletions

diff --git a/events.txt b/events.txt
index 0ce6de7..375692f 100644
--- a/events.txt
+++ b/events.txt
@@ -171,7 +171,7 @@ SHADED 8
 	current DS
 	prompt `In each Province, free Govern and then add a Troop.`
 	space_opt all (is_adjacent_to_city(C_DEVAGIRI, s) || is_adjacent_to_city(C_GULBARGA, s)) && can_govern_in_space(s)
-		govern_in_space
+		free_govern_in_space
 		place_opt 1 DS TROOPS
 	endspace
 
@@ -575,7 +575,7 @@ SHADED 25
 	endspace
 	prompt "Govern in one of the selected Province."
 	space 1 (can_govern_in_space(s) && set_has(game.vm.m, s))
-		free_govern
+		free_govern_in_space
 	endspace
 
 EVENT 26
diff --git a/rules.js b/rules.js
index 5a8a9ab..7f2efc0 100644
--- a/rules.js
+++ b/rules.js
@@ -4748,19 +4748,20 @@ function vm_demand_obedience() {
 
 // VM: GOVERN
 
-function vm_free_govern() {
+function vm_free_govern_in_space() {
 	init_free_command_in_space("Govern", game.vm.s)
 	goto_govern_space()
 }
 
 function vm_govern_in_space() {
 	init_free_command_in_space("Govern", game.vm.s)
-	game.cmd.free = 0
+	select_cmd_space(game.vm.s, 1)
 	goto_govern_space()
 }
 
 function vm_govern() {
 	game.cmd = {
+		type: "Govern",
 		limited: 0,
 		free: 0,
 		spaces: [],
@@ -5414,7 +5415,7 @@ CODE[8 * 2 + 1] = [
 	[ vm_current, DS ],
 	[ vm_prompt, ()=>`In each Province, free Govern and then add a Troop.` ],
 	[ vm_space, true, 0, 999, (s)=>(is_adjacent_to_city(C_DEVAGIRI, s) || is_adjacent_to_city(C_GULBARGA, s)) && can_govern_in_space(s) ],
-	[ vm_govern_in_space ],
+	[ vm_free_govern_in_space ],
 	[ vm_place, false, 1, 1, DS, TROOPS ],
 	[ vm_endspace ],
 	[ vm_return ],
@@ -5920,7 +5921,7 @@ CODE[25 * 2 + 1] = [
 	[ vm_endspace ],
 	[ vm_prompt, "Govern in one of the selected Province." ],
 	[ vm_space, true, 1, 1, (s)=>(can_govern_in_space(s) && set_has(game.vm.m, s)) ],
-	[ vm_free_govern ],
+	[ vm_free_govern_in_space ],
 	[ vm_endspace ],
 	[ vm_return ],
 ]