Merge pull request #60 from ck2plus/events/base---review

Events/base   review

Author: schwarherz

CleanSlate/common/cb_types/china_cbs.txt

@@ -194,7 +194,7 @@ offmap_submission = {
 							set_title_flag = rebel_general_title
 							adjective = e_china_west_governor_adj # Use WP adj as it is "Chinese" but also gives the right one in different languages
 
-							random_list = { #R andom Empire name that China doesn't have
+							random_list = { # Random Empire name that China doesn't have
 								1 = {
 									trigger = { offmap_china = { NOT = { has_offmap_name = tang_china } } }
 									set_name = "Tang Empire"
@@ -767,7 +767,7 @@ tributary_offmap_cb = {
 			}
 
 			hidden_effect = {
-				if = { #Makes China have a chance of leaving Expansionist policy...
+				if = { # Makes China have a chance of leaving Expansionist policy...
 					limit = {
 						is_offmap_tag = offmap_china
 
@@ -804,7 +804,7 @@ tributary_offmap_cb = {
 	}
 
 	on_attacker_leader_death = {
-		#end_war = invalid
+		# end_war = invalid
 	}
 
 	attacker_ai_victory_worth = {
@@ -1139,7 +1139,7 @@ force_open_china_cb = {
 			}
 
 			custom_tooltip = {
-				text = angered_china_tt #Scripter! Update this is you change the value below.
+				text = angered_china_tt # Scripter! Update this is you change the value below.
 
 				add_character_modifier = {
 					name = angered_china_modifier
@@ -1494,17 +1494,7 @@ invasion_of_china_cb = {
 							clr_character_flag = given_temple_name_by_script
 							set_name = ""
 
-							if = {
-								limit = { is_government_potential = muslim_government }
-								set_government_type = muslim_government
-							}
-							else_if = {
-								limit = { is_government_potential = theocratic_feudal_government }
-								set_government_type = theocratic_feudal_government
-							}
-							else = {
-								set_government_type = feudal_government
-							}
+							set_correct_feudal_government_type_effect = yes
 						}
 					}
 
@@ -1635,7 +1625,7 @@ invasion_of_china_cb = {
 			}
 
 			custom_tooltip = {
-				text = angered_china_tt #Scripter! Update this is you change the value below.
+				text = angered_china_tt # Scripter! Update this is you change the value below.
 
 				add_character_modifier = {
 					name = angered_china_modifier
@@ -1716,7 +1706,7 @@ invasion_of_china_cb = {
 			}
 
 			custom_tooltip = {
-				text = angered_china_tt #Scripter! Update this is you change the value below.
+				text = angered_china_tt # Scripter! Update this is you change the value below.
 
 				add_character_modifier = {
 					name = angered_china_modifier

CleanSlate/common/objectives/00_ambitions.txt

@@ -1267,7 +1267,6 @@ obj_have_a_daughter = {
 	}
 }
 
-
 obj_have_a_son = {
 	type = character
 
@@ -2030,7 +2029,10 @@ obj_lower_decadence = {
 	}
 
 	abort = {
-		is_incapable = yes
+		OR = {
+			is_incapable = yes
+			uses_decadence = no
+		}
 	}
 
 	abort_effect = {
@@ -2843,12 +2845,10 @@ obj_gain_any_title = {
 			is_landed = no
 			independent = yes
 			is_incapable = yes
-			has_character_flag = obj_gain_any_title_abandoned
 		}
 	}
 
 	abort_effect = {
-		clr_character_flag = obj_gain_any_title_abandoned
 	}
 
 	chance = {