Fix Event 9 - Demande Obedience

2 files changed, 16 insertions, 14 deletions

diff --git a/events.txt b/events.txt
index 3147520..a190471 100644
--- a/events.txt
+++ b/events.txt
@@ -77,7 +77,7 @@ SHADED 3
 EVENT 4
 	stay_eligible
 	current REBEL_FACTIONS
-	prompt `Replace 1 Governor with an Obedient or Rebelling ${PIECE_FACTION_TYPE_NAME[game.current][ELITE]}.`
+	prompt `Replace a Governor with an Obedient or Rebelling ${PIECE_FACTION_TYPE_NAME[game.current][ELITE]}.`
 	piece 1 is_governor(p)
 		replace_choice (game.current) ELITE
 	endpiece
@@ -182,10 +182,11 @@ EVENT 9
 SHADED 9
 	current DS
 	resources (game.current) 3
-	prompt "Add up to 4 Troops and 1 Governor in one Province adjacent to Warangal."
+	prompt "Place up to 4 Troops and a Governor in a Province adjacent to Warangal and Demand Obedience there."
 	space 1 is_adjacent_to_city(C_WARANGAL, s)
 		place_undo_opt 4 DS TROOPS
 		place_undo_opt 1 DS ELITE
+		demand_obedience
 	endspace
 
 EVENT 10
@@ -251,7 +252,7 @@ SHADED 12
 			asm (game.vm.count += 1)
 		endspace
 	endrepeat
-	prompt "Make a free Attack in one Province adjacent to Warangal."
+	prompt "Make a free Attack in a Province adjacent to Warangal."
 	space 1 (is_adjacent_to_city(C_WARANGAL, s) && can_attack_in_space(s))
 		free_attack
 	endspace
@@ -324,7 +325,7 @@ EVENT 15
 		replace_rebel BK ELITE
 		set_space -1
 	endpiece
-	prompt "Remove a Tributary marker in one Province."
+	prompt "Remove a Tributary marker in a Province."
 	space_opt 1 is_tributary(s) && set_has(game.vm.m, s)
 		remove_tributary
 	endspace
@@ -384,7 +385,7 @@ EVENT 17
 SHADED 17
 	prompt "Remove a Fort and up to 2 Amirs from one Province."
 	space_opt 1 has_piece_faction(s, BK)
-		prompt "Remove 1 Fort from selected Province."
+		prompt "Remove a Fort from selected Province."
 		piece_undo_opt 1 is_piece_in_event_space(p) && is_fort(p)
 			remove
 		endpiece
@@ -448,7 +449,7 @@ EVENT 20
 
 SHADED 20
 	current DS
-	prompt "In Orissa, remove an enemy Structure, add 1 Governor, 1 Qasbah, 2 Troops and a Tributary marker."
+	prompt "In Orissa, remove an enemy Structure, add a Governor, a Qasbah, 2 Troops and a Tributary marker."
 	space 1 (s === S_ORISSA)
 		piece_opt 1 ((is_temple(p) || is_fort(p)) && is_piece_in_event_space(p))
 			remove
@@ -485,7 +486,7 @@ EVENT 22
 SHADED 22
 	stay_eligible
 	current DS
-	prompt "Place 1 Troops in one space."
+	prompt "Place a Troop in one space."
 	space_opt 1 can_place_piece(s, DS, TROOPS)
 		place_opt 1 DS TROOPS
 	endspace
diff --git a/rules.js b/rules.js
index 6b60f5a..71401ec 100644
--- a/rules.js
+++ b/rules.js
@@ -5765,7 +5765,7 @@ CODE[3 * 2 + 1] = [
 CODE[4 * 2 + 0] = [
 	[ vm_stay_eligible ],
 	[ vm_current, REBEL_FACTIONS ],
-	[ vm_prompt, ()=>`Replace 1 Governor with an Obedient or Rebelling ${PIECE_FACTION_TYPE_NAME[game.current][ELITE]}.` ],
+	[ vm_prompt, ()=>`Replace a Governor with an Obedient or Rebelling ${PIECE_FACTION_TYPE_NAME[game.current][ELITE]}.` ],
 	[ vm_piece, false, 1, 1, (p,s)=>is_governor(p) ],
 	[ vm_replace, ()=>(game.current), ELITE, false, true ],
 	[ vm_endpiece ],
@@ -5903,10 +5903,11 @@ CODE[9 * 2 + 0] = [
 CODE[9 * 2 + 1] = [
 	[ vm_current, DS ],
 	[ vm_resources, false, ()=>(game.current), 3 ],
-	[ vm_prompt, "Add up to 4 Troops and 1 Governor in one Province adjacent to Warangal." ],
+	[ vm_prompt, "Place up to 4 Troops and a Governor in a Province adjacent to Warangal and Demand Obedience there." ],
 	[ vm_space, true, 1, 1, (s)=>is_adjacent_to_city(C_WARANGAL, s) ],
 	[ vm_place, true, 1, 4, DS, TROOPS ],
 	[ vm_place, true, 1, 1, DS, ELITE ],
+	[ vm_demand_obedience ],
 	[ vm_endspace ],
 	[ vm_return ],
 ]
@@ -5990,7 +5991,7 @@ CODE[12 * 2 + 1] = [
 	[ vm_asm, ()=>(game.vm.count += 1) ],
 	[ vm_endspace ],
 	[ vm_endrepeat ],
-	[ vm_prompt, "Make a free Attack in one Province adjacent to Warangal." ],
+	[ vm_prompt, "Make a free Attack in a Province adjacent to Warangal." ],
 	[ vm_space, true, 1, 1, (s)=>(is_adjacent_to_city(C_WARANGAL, s) && can_attack_in_space(s)) ],
 	[ vm_free_attack ],
 	[ vm_endspace ],
@@ -6078,7 +6079,7 @@ CODE[15 * 2 + 0] = [
 	[ vm_replace, BK, ELITE, true, false ],
 	[ vm_set_space, -1 ],
 	[ vm_endpiece ],
-	[ vm_prompt, "Remove a Tributary marker in one Province." ],
+	[ vm_prompt, "Remove a Tributary marker in a Province." ],
 	[ vm_space, true, 0, 1, (s)=>is_tributary(s) && set_has(game.vm.m, s) ],
 	[ vm_remove_tributary ],
 	[ vm_endspace ],
@@ -6153,7 +6154,7 @@ CODE[17 * 2 + 0] = [
 CODE[17 * 2 + 1] = [
 	[ vm_prompt, "Remove a Fort and up to 2 Amirs from one Province." ],
 	[ vm_space, true, 0, 1, (s)=>has_piece_faction(s, BK) ],
-	[ vm_prompt, "Remove 1 Fort from selected Province." ],
+	[ vm_prompt, "Remove a Fort from selected Province." ],
 	[ vm_piece, true, 0, 1, (p,s)=>is_piece_in_event_space(p) && is_fort(p) ],
 	[ vm_remove ],
 	[ vm_endpiece ],
@@ -6235,7 +6236,7 @@ CODE[20 * 2 + 0] = [
 // SHADED 20
 CODE[20 * 2 + 1] = [
 	[ vm_current, DS ],
-	[ vm_prompt, "In Orissa, remove an enemy Structure, add 1 Governor, 1 Qasbah, 2 Troops and a Tributary marker." ],
+	[ vm_prompt, "In Orissa, remove an enemy Structure, add a Governor, a Qasbah, 2 Troops and a Tributary marker." ],
 	[ vm_space, true, 1, 1, (s)=>(s === S_ORISSA) ],
 	[ vm_piece, false, 0, 1, (p,s)=>((is_temple(p) || is_fort(p)) && is_piece_in_event_space(p)) ],
 	[ vm_remove ],
@@ -6284,7 +6285,7 @@ CODE[22 * 2 + 0] = [
 CODE[22 * 2 + 1] = [
 	[ vm_stay_eligible ],
 	[ vm_current, DS ],
-	[ vm_prompt, "Place 1 Troops in one space." ],
+	[ vm_prompt, "Place a Troop in one space." ],
 	[ vm_space, true, 0, 1, (s)=>can_place_piece(s, DS, TROOPS) ],
 	[ vm_place, false, 1, 1, DS, TROOPS ],
 	[ vm_endspace ],