reconquista: fix adventurers flags and clean up

Author: nbmsc

CleanSlate/events/HF_reconquista_events.txt

@@ -15,16 +15,20 @@ character_event = {
 
 	immediate = {
 		clr_character_flag = currently_reconquering_iberia
-		clr_global_flag = active_reconquista
+		clr_character_flag = reconquista_adventurer
 		disband_event_forces = conscripted_reconquista_ships
 		disband_event_forces = reconquista_event_troops_rabble
 
-		any_character = {
-			# clr_character_flag = reconquista_beneficiary_flag
+		any_playable_ruler = {
 			clr_character_flag = promised_reconquista_ally
-			clr_character_flag = reconquista_adventurer
 			clr_character_flag = reconquista_sponsor
 		}
+
+		# any_character = {
+		#	clr_character_flag = reconquista_beneficiary_flag
+		# }
+
+		clr_global_flag = active_reconquista
 	}
 }
 
@@ -46,7 +50,6 @@ character_event = {
 
 	immediate = {
 		disband_event_forces = reconquista_event_troops
-		disband_event_forces = reconquista_event_troops_rabble
 		character_event = { id = HF.49200 }
 	}
 }
@@ -155,8 +158,8 @@ character_event = {
 			limit = { ai = no }
 
 			remove_character_modifier = reconquista_preparation_left
-			character_event = { id = HF.49200 }
 			disband_event_forces = reconquista_event_troops
+			character_event = { id = HF.49200 }
 		}
 		else = {
 			set_character_flag = ai_reconquista_preparation_time_run_out
@@ -179,6 +182,7 @@ character_event = {
 	has_character_flag = ex_reconquistador
 
 	immediate = {
+		disband_event_forces = conscripted_reconquista_ships
 		disband_event_forces = reconquista_event_troops
 		disband_event_forces = reconquista_event_troops_rabble
 	}
@@ -1899,7 +1903,7 @@ character_event = {
 
 				# End the Reconquista
 				else = {
-					set_global_flag = reconquista_finished
+					#set_global_flag = reconquista_finished
 
 					primary_title = {
 						destroy_landed_title = THIS
@@ -2075,6 +2079,8 @@ character_event = {
 	}
 
 	immediate = {
+		set_global_flag = active_reconquista
+
 		create_character = {
 			culture = ROOT
 			religion = ROOT
@@ -2110,8 +2116,6 @@ character_event = {
 	}
 
 	after = {
-		set_global_flag = active_reconquista
-
 		add_character_modifier = {
 			name = reconquista_adventurer_cooldown
 			years = 15
@@ -2133,7 +2137,7 @@ character_event = {
 		set_character_flag = reconquista_adventurer
 		set_character_flag = ex_reconquistador
 		set_character_flag = currently_reconquering_iberia
-		set_global_flag = active_reconquista
+		#set_global_flag = active_reconquista
 
 		FROM = {
 			capital_scope = {