Update opt events

1 files changed, 33 insertions, 34 deletions

diff --git a/events.txt b/events.txt
index ec962e8..4012360 100644
--- a/events.txt
+++ b/events.txt
@@ -30,7 +30,7 @@ EVENT 2
 	prompt "Remove up to 2 Delhi Sultanate Units in both Mountain Passes and Punjab."
 	space 2 ((s === S_MOUNTAIN_PASSES || s === S_PUNJAB) && has_ds_unit(s))
 		prompt "Remove up to 2 Delhi Sultanate Units."
-		piece 2 is_ds_unit(p) && is_piece_in_event_space(p)
+		piece_undo_opt 2 is_ds_unit(p) && is_piece_in_event_space(p)
 			remove
 		endpiece
 	endspace
@@ -128,7 +128,7 @@ EVENT 6
 	space_opt 1 (is_adjacent_to_city(C_WARANGAL, s))
 		remove_tributary
 		prompt `Place up to 2 ${PIECE_FACTION_TYPE_NAME[game.current][ELITE]}.`
-		place_opt 2 (game.current) ELITE
+		place_undo_opt 2 (game.current) ELITE
 	endspace
 
 SHADED 6
@@ -143,7 +143,7 @@ EVENT 7
 	current REBEL_FACTIONS
 	prompt `Place up to 2 ${PIECE_FACTION_TYPE_NAME[game.current][ELITE]}s in Tamilakam.`
 	space 1 (s === S_TAMILAKAM)
-		place 2 (game.current) ELITE
+		place_undo_opt 2 (game.current) ELITE
 	endspace
 	cav_resources 3
 
@@ -152,8 +152,8 @@ SHADED 7
 	current DS
 	prompt `Place up to 4 Troops and a Governor in Tamilakam.`
 	space 1 (s === S_TAMILAKAM)
-		place 4 DS TROOPS
-		place 1 DS ELITE
+		place_undo_opt 4 DS TROOPS
+		place_undo_opt 1 DS ELITE
 	endspace
 	cav_resources 3
 
@@ -193,8 +193,8 @@ SHADED 9
 	resources (game.current) 3
 	prompt "Add up to 4 Troops and 1 Governor in one Province adjacent to Warangal."
 	space 1 is_adjacent_to_city(C_WARANGAL, s)
-		place_opt 4 DS TROOPS
-		place_opt 1 DS ELITE
+		place_undo_opt 4 DS TROOPS
+		place_undo_opt 1 DS ELITE
 	endspace
 
 EVENT 10
@@ -212,28 +212,28 @@ SHADED 10
 	stay_eligible
 	current DS
 	prompt "Move any Qasbah to Spaces containing Governors."
-	piece_opt all is_qasbah(p)
+	piece_undo_opt all is_qasbah(p)
 		space 1 has_governor(s) && !has_qasbah(s)
 			move
 		endspace
 	endpiece
 	prompt "Add up to 2 Troops in each Space with a Qasbah."
 	space_opt all has_qasbah(s)
-		place_opt 2 DS TROOPS
+		place_undo_opt 2 DS TROOPS
 	endspace
 
 EVENT 11
 	stay_eligible
 	prompt "Place up to two Mongol Invaders in each of Mtn Passes and Punjab."
 	space_opt 2 (s === S_PUNJAB || s === S_MOUNTAIN_PASSES)
-		place_opt 2 MI TROOPS
+		place_undo_opt 2 MI TROOPS
 	endspace
 
 SHADED 11
 	stay_eligible
 	current DS
 	prompt "Remove 4 Mongol Invaders."
-	piece 4 is_mongol_invader(p)
+	piece_undo_opt 4 is_mongol_invader(p)
 		remove
 	endpiece
 
@@ -241,7 +241,7 @@ EVENT 12
 	current REBEL_FACTIONS
 	gain_cavalry 2
 	prompt "Remove 4 Delhi Sultantes pieces from Provinces adjacent to Warangal."
-	piece 4 (is_adjacent_to_city(C_WARANGAL, piece_space(p)) && piece_faction(p) === DS)
+	piece_undo_opt 4 (is_adjacent_to_city(C_WARANGAL, piece_space(p)) && piece_faction(p) === DS)
 		remove
 	endpiece
 
@@ -297,6 +297,10 @@ SHADED 13
 EVENT 14
 	current VE
 	gain_cavalry 2
+	prompt "Remove a Tributary marker in a Province adjacent to Vijayanagara."
+	space_opt 1 is_adjacent_to_city(C_VIJAYANAGARA, s) && is_tributary(s)
+		remove_tributary
+	endspace
 	asm game.vm.count = 0
 	repeat 2
 		prompt `Place up to ${2-game.vm.count} Rajas adjacent to Vijayanagara.`
@@ -305,25 +309,21 @@ EVENT 14
 			asm (game.vm.count += 1)
 		endspace
 	endrepeat
-	prompt "Remove a Tributary marker in a Province adjacent to Vijayanagara."
-	space_opt 1 is_adjacent_to_city(C_VIJAYANAGARA, s) && is_tributary(s)
-		remove_tributary
-	endspace
 
 SHADED 14
 	current DS
 	gain_cavalry 3
 	prompt "Place up to 4 Troops and a Governor in a province adjacent to Vijayanagara and Demand Obedience there."
 	space_opt 1 is_adjacent_to_city(C_VIJAYANAGARA, s)
-		place_opt 4 DS TROOPS
-		place_opt 1 DS ELITE
+		place_undo_opt 4 DS TROOPS
+		place_undo_opt 1 DS ELITE
 		demand_obedience
 	endspace
 
 EVENT 15
 	stay_eligible
 	prompt "Replace Governors with Rebelling Amirs in Provinces adjacent to Devagiri."
-	piece_opt all is_adjacent_to_city(C_DEVAGIRI, piece_space(p)) && can_place_piece(piece_space(p), BK, ELITE)  && is_governor(p)
+	piece_undo_opt all is_adjacent_to_city(C_DEVAGIRI, piece_space(p)) && can_place_piece(piece_space(p), BK, ELITE)  && is_governor(p)
 		set_piece_space
 		mark_space
 		remove
@@ -357,7 +357,7 @@ EVENT 16
 		endspace
 	endrepeat
 	prompt "Place a Fort adjacent to Gulbarga."
-	space 1 is_adjacent_to_city(C_GULBARGA, s) && can_place_piece(s, BK, DISC)
+	space_opt 1 is_adjacent_to_city(C_GULBARGA, s) && can_place_piece(s, BK, DISC)
 		auto_place BK DISC
 	endspace
 
@@ -384,7 +384,7 @@ EVENT 17
 	current BK
 	add_influence BK
 	prompt "Remove up to 5 Delhi Sultanate Units from Provinces with you presence."
-	piece_opt 5 is_ds_unit(p) && has_piece_faction(piece_space(p), BK)
+	piece_undo_opt 5 is_ds_unit(p) && has_piece_faction(piece_space(p), BK)
 		remove
 	endpiece
 
@@ -392,11 +392,11 @@ 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."
-		piece_opt 1 is_piece_in_event_space(p) && is_fort(p)
+		piece_undo_opt 1 is_piece_in_event_space(p) && is_fort(p)
 			remove
 		endpiece
 		prompt "Remove up to 2 Amirs from selected Province."
-		piece_opt 2 is_piece_in_event_space(p) && is_amir(p)
+		piece_undo_opt 2 is_piece_in_event_space(p) && is_amir(p)
 			remove
 		endpiece
 	endspace
@@ -450,7 +450,7 @@ EVENT 20
 	current REBEL_FACTIONS
 	add_influence (game.current)
 	prompt "In Orissa or an adjacent Province, you may Migrate, Rally and then Build."
-	space 1 (is_adjacent_to_city(C_WARANGAL, s) || s === S_BENGAL)
+	space_opt 1 (is_adjacent_to_city(C_WARANGAL, s) || s === S_BENGAL)
 		free_migrate
 		free_rally
 		free_build
@@ -463,9 +463,9 @@ SHADED 20
 		piece_opt 1 ((is_temple(p) || is_fort(p)) && is_piece_in_event_space(p))
 			remove
 		endpiece
-		place 1 DS ELITE
-		place 1 DS DISC
-		place 2 DS TROOPS
+		place_opt 1 DS ELITE
+		place_opt 1 DS DISC
+		place_opt 2 DS TROOPS
 		place_tributary
 	endspace
 
@@ -512,12 +512,12 @@ EVENT 23
 	current VE
 	prompt "Build and then replace a Unit with a Raja in each Province with a Temple."
 	add_influence VE
-	space 1 can_build_in_space(s)
+	space_opt 1 can_build_in_space(s)
 		free_build
 	endspace
 	prompt "In each Province with a Temple, replace a Unit with a Raja."
-	space all has_temple(s) && has_units_enemy_faction(s)
-		piece 1 is_enemy_unit(p) && is_piece_in_event_space(p)
+	space_opt all has_temple(s) && has_units_enemy_faction(s)
+		piece_opt 1 is_enemy_unit(p) && is_piece_in_event_space(p)
 			remove
 			auto_place VE ELITE
 		endpiece
@@ -551,7 +551,6 @@ EVENT 24
 		set_space -1
 	endpiece
 
-
 SHADED 24
 	stay_eligible
 	current [DS BK]
@@ -675,7 +674,7 @@ SHADED 30
 EVENT 31
 	current REBEL_FACTIONS
 	prompt "Free Migrate in a Province adjacent to Vijayanagara."
-	space 1 (is_adjacent_to_city(C_VIJAYANAGARA, s))
+	space_opt 1 (is_adjacent_to_city(C_VIJAYANAGARA, s))
 		mark_space
 		free_migrate
 		clean_p
@@ -689,11 +688,11 @@ EVENT 31
 SHADED 31
 	current DS
 	prompt "Remove a Fort adjacent to Vijayanagara"
-	piece 1 (is_fort(p) && is_adjacent_to_city(C_VIJAYANAGARA, piece_space(p)))
+	piece_opt 1 (is_fort(p) && is_adjacent_to_city(C_VIJAYANAGARA, piece_space(p)))
 		remove
 	endpiece
 	prompt "Remove a Temple adjacent to Vijayanagara"
-	piece 1 (is_temple(p) && is_adjacent_to_city(C_VIJAYANAGARA, piece_space(p)))
+	piece_opt 1 (is_temple(p) && is_adjacent_to_city(C_VIJAYANAGARA, piece_space(p)))
 		remove
 	endpiece
 	remove_influence BK