Better replace

1 files changed, 18 insertions, 39 deletions

diff --git a/events.txt b/events.txt
index daad089..37d2134 100644
--- a/events.txt
+++ b/events.txt
@@ -79,10 +79,7 @@ EVENT 4
 	current REBEL_FACTIONS
 	prompt `Replace 1 Governor with an Obedient or Rebelling ${PIECE_FACTION_TYPE_NAME[game.current][ELITE]}.`
 	piece 1 is_governor(p)
-		set_piece_space
-		remove
-		auto_place (game.current) ELITE
-		event_4
+		replace_choice (game.current) ELITE
 	endpiece
 
 SHADED 4
@@ -95,11 +92,8 @@ EVENT 5
 	stay_eligible
 	current REBEL_FACTIONS
 	prompt `Replace up to 2 Delhi Sultanate Units with Rebelling ${PIECE_FACTION_TYPE_NAME[game.current][ELITE]}.`
-	piece_undo_opt 2 (is_adjacent_to_city(C_CHITTOR, piece_space(p)) && can_place_piece(piece_space(p), game.current, ELITE) && is_ds_unit(p))
-		set_piece_space
-		remove
-		auto_place_rebel (game.current) ELITE
-		set_space -1
+	piece_undo_opt 2 (is_adjacent_to_city(C_CHITTOR, piece_space(p)) && is_ds_unit(p))
+		replace_rebel (game.current) ELITE
 	endpiece
 	prompt `Place a ${PIECE_FACTION_TYPE_NAME[game.current][DISC]} in Rajput Kingdoms.`
 	space_opt 1 (s === S_RAJPUT_KINGDOMS && can_place_piece(s, game.current, DISC))
@@ -110,11 +104,8 @@ SHADED 5
 	stay_eligible
 	current DS
 	prompt "Replace up to 3 opposing Units adjacent to Chittor."
-	piece_undo_opt 3 (is_adjacent_to_city(C_CHITTOR, piece_space(p)) && can_place_piece(piece_space(p), DS, TROOPS) && is_enemy_piece(p))
-		set_piece_space
-		remove
-		auto_place DS TROOPS
-		set_space -1
+	piece_undo_opt 3 (is_adjacent_to_city(C_CHITTOR, piece_space(p)) && is_enemy_piece(p))
+		replace DS TROOPS
 	endpiece
 	prompt "Place a Qasbah in Rajput Kingdoms."
 	space_opt 1 (s === S_RAJPUT_KINGDOMS && can_place_piece(s, DS, DISC))
@@ -160,10 +151,10 @@ SHADED 7
 EVENT 8
 	current REBEL_FACTIONS
 	prompt `In each Province, replace a Delhi Sultanate Unit with a ${PIECE_FACTION_TYPE_NAME[game.current][ELITE]}.`
-	space_opt all (is_adjacent_to_city(C_DEVAGIRI, s) || is_adjacent_to_city(C_GULBARGA, s)) && has_ds_unit(s) && can_place_piece(s, game.current, ELITE)
+	space_opt all (is_adjacent_to_city(C_DEVAGIRI, s) || is_adjacent_to_city(C_GULBARGA, s)) && has_ds_unit(s)
+		prompt `In each Province, replace a Delhi Sultanate Unit with a ${PIECE_FACTION_TYPE_NAME[game.current][ELITE]}.`
 		piece 1 is_ds_unit(p) && is_piece_in_event_space(p)
-			remove
-			auto_place (game.current) ELITE
+			replace (game.current) ELITE
 		endpiece
 	endspace
 
@@ -323,11 +314,10 @@ SHADED 14
 EVENT 15
 	stay_eligible
 	prompt "Replace Governors with Rebelling Amirs in Provinces adjacent to Devagiri."
-	piece_undo_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)) && is_governor(p)
 		set_piece_space
 		mark_space
-		remove
-		auto_place_rebel BK ELITE
+		replace_rebel BK ELITE
 		set_space -1
 	endpiece
 	prompt "Remove a Tributary marker in one Province."
@@ -338,10 +328,9 @@ EVENT 15
 SHADED 15
 	stay_eligible
 	prompt "Replace an Amir with a Governor and place a Tributary marker in a Province adjacent to Devagiri."
-	space 1 is_adjacent_to_city(C_DEVAGIRI, s) && can_place_piece(s, DS, ELITE) && !is_tributary(s)
+	space 1 is_adjacent_to_city(C_DEVAGIRI, s) && !is_tributary(s)
 		asm game.vm.p = find_piece(game.vm.s, BK, ELITE)
-		remove
-		auto_place DS ELITE
+		replace DS ELITE
 		place_tributary
 	endspace
 
@@ -416,11 +405,8 @@ SHADED 18
 	stay_eligible
 	current [DS VE]
 	prompt `Replace an Amir with a ${PIECE_FACTION_TYPE_NAME[game.current][ELITE]}.`
-	piece_opt 1 is_amir(p) && can_place_piece(s, game.current, ELITE) && is_piece_on_map(p)
-		set_piece_space
-		remove
-		auto_place (game.current) ELITE
-		set_space -1
+	piece_opt 1 is_amir(p) && is_piece_on_map(p)
+		replace (game.current) ELITE
 	endpiece
 	remove_influence BK
 
@@ -518,8 +504,7 @@ EVENT 23
 	prompt "In each Province with a Temple, replace a Unit with a Raja."
 	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
+			replace VE ELITE
 		endpiece
 	endspace
 
@@ -545,11 +530,8 @@ EVENT 24
 	log_br
 	prompt "Replace a Unit with a Raja."
 	clean_p
-	piece_opt 1 (can_place_piece(0, VE, ELITE) && set_has(game.vm.m, piece_space(p)) && is_enemy_unit(p))
-		set_piece_space
-		remove
-		auto_place (game.current) ELITE
-		set_space -1
+	piece_opt 1 (set_has(game.vm.m, piece_space(p)) && is_enemy_unit(p))
+		replace (game.current) ELITE
 	endpiece
 
 SHADED 24
@@ -706,10 +688,7 @@ EVENT 32
 	remove_influence (other_rebel_faction(game.current))
 	prompt `Replace up to 2 ${PIECE_FACTION_TYPE_NAME[game.current][ELITE]}s with 2 ${PIECE_FACTION_TYPE_NAME[other_rebel_faction(game.current)][ELITE]}s.`
 	piece_opt 2 is_enemy_piece(p) && is_rebel_faction_elite(p) && is_piece_on_map(p)
-		set_piece_space
-		remove
-		auto_place (game.current) ELITE
-		set_space -1
+		replace (game.current) ELITE
 	endpiece
 
 SHADED 32