Assorted smallish vanilla fixes from Tianxia

CleanSlate/common/cb_types/adventurer_cbs.txt

@@ -28,7 +28,12 @@ duchy_adventure = {
 
 			hidden_effect = {
 				clr_character_flag = duchy_adventurer
-				give_nickname = nick_the_conqueror
+				if = {
+					limit = {
+						can_apply_average_nickname_trigger = yes
+					}
+					give_nickname = nick_the_conqueror
+				}
 			}
 		}
 

CleanSlate/common/combat_tactics/00_combat_tactics.txt

@@ -439,13 +439,15 @@ swarm_volley_tactic = {
 			flank_has_leader = yes
 			leader = { martial >= 8 }
 
-			light_troops = {
-				who = archers
-				value >= 0.7
-			}
-			light_troops = {
-				who = horse_archers
-				value >= 0.3
+			OR = {
+				light_troops = {
+					who = archers
+					value >= 0.7
+				}
+				light_troops = {
+					who = horse_archers
+					value >= 0.3
+				}
 			}
 		}
 
@@ -455,13 +457,15 @@ swarm_volley_tactic = {
 			flank_has_leader = yes
 			leader = { martial >= 12 }
 
-			light_troops = {
-				who = archers
-				value >= 0.6
-			}
-			light_troops = {
-				who = horse_archers
-				value >= 0.3
+			OR = {
+				light_troops = {
+					who = archers
+					value >= 0.6
+				}
+				light_troops = {
+					who = horse_archers
+					value >= 0.3
+				}
 			}
 		}
 
@@ -471,13 +475,15 @@ swarm_volley_tactic = {
 			flank_has_leader = yes
 			leader = { martial >= 16 }
 
-			light_troops = {
-				who = archers
-				value >= 0.5
-			}
-			light_troops = {
-				who = horse_archers
-				value >= 0.3
+			OR = {
+				light_troops = {
+					who = archers
+					value >= 0.5
+				}
+				light_troops = {
+					who = horse_archers
+					value >= 0.3
+				}
 			}
 		}
 	}
@@ -1223,13 +1229,15 @@ awesome_advance_tactic = {
 			flank_has_leader = yes
 			leader = { martial >= 9 }
 
-			heavy_troops = {
-				who = heavy_infantry
-				value >= 0.7
-			}
-			heavy_troops = {
-				who = knights
-				value >= 0.3
+			OR = {
+				heavy_troops = {
+					who = heavy_infantry
+					value >= 0.7
+				}
+				heavy_troops = {
+					who = knights
+					value >= 0.3
+				}
 			}
 		}
 
@@ -1239,13 +1247,15 @@ awesome_advance_tactic = {
 			flank_has_leader = yes
 			leader = { martial >= 13 }
 
-			heavy_troops = {
-				who = heavy_infantry
-				value >= 0.6
-			}
-			heavy_troops = {
-				who = knights
-				value >= 0.3
+			OR = {
+				heavy_troops = {
+					who = heavy_infantry
+					value >= 0.6
+				}
+				heavy_troops = {
+					who = knights
+					value >= 0.3
+				}
 			}
 		}
 
@@ -1255,13 +1265,15 @@ awesome_advance_tactic = {
 			flank_has_leader = yes
 			leader = { martial >= 17 }
 
-			heavy_troops = {
-				who = heavy_infantry
-				value >= 0.5
-			}
-			heavy_troops = {
-				who = knights
-				value >= 0.3
+			OR = {
+				heavy_troops = {
+					who = heavy_infantry
+					value >= 0.6
+				}
+				heavy_troops = {
+					who = knights
+					value >= 0.3
+				}
 			}
 		}
 	}
@@ -1357,13 +1369,15 @@ slow_advance_tactic = {
 			flank_has_leader = yes
 			leader = { martial >= 8 }
 
-			heavy_troops = {
-				who = pikemen
-				value >= 0.7
-			}
-			heavy_troops = {
-				who = heavy_infantry
-				value >= 0.3
+			OR = {
+				heavy_troops = {
+					who = pikemen
+					value >= 0.7
+				}
+				heavy_troops = {
+					who = heavy_infantry
+					value >= 0.3
+				}
 			}
 		}
 
@@ -1373,13 +1387,15 @@ slow_advance_tactic = {
 			flank_has_leader = yes
 			leader = { martial >= 12 }
 
-			heavy_troops = {
-				who = pikemen
-				value >= 0.6
-			}
-			heavy_troops = {
-				who = heavy_infantry
-				value >= 0.3
+			OR = {
+				heavy_troops = {
+					who = pikemen
+					value >= 0.6
+				}
+				heavy_troops = {
+					who = heavy_infantry
+					value >= 0.3
+				}
 			}
 		}
 
@@ -1389,13 +1405,15 @@ slow_advance_tactic = {
 			flank_has_leader = yes
 			leader = { martial >= 16 }
 
-			heavy_troops = {
-				who = pikemen
-				value >= 0.5
-			}
-			heavy_troops = {
-				who = heavy_infantry
-				value >= 0.3
+			OR = {
+				heavy_troops = {
+					who = pikemen
+					value >= 0.5
+				}
+				heavy_troops = {
+					who = heavy_infantry
+					value >= 0.3
+				}
 			}
 		}
 	}
@@ -1490,13 +1508,15 @@ awesomer_charge_tactic = {
 			flank_has_leader = yes
 			leader = { martial >= 9 }
 
-			heavy_troops = {
-				who = knights
-				value >= 0.7
-			}
-			heavy_troops = {
-				who = pikemen
-				value >= 0.3
+			OR = {
+				heavy_troops = {
+					who = knights
+					value >= 0.7
+				}
+				heavy_troops = {
+					who = pikemen
+					value >= 0.3
+				}
 			}
 		}
 
@@ -1506,13 +1526,15 @@ awesomer_charge_tactic = {
 			flank_has_leader = yes
 			leader = { martial >= 13 }
 
-			heavy_troops = {
-				who = knights
-				value >= 0.6
-			}
-			heavy_troops = {
-				who = pikemen
-				value >= 0.3
+			OR = {
+				heavy_troops = {
+					who = knights
+					value >= 0.6
+				}
+				heavy_troops = {
+					who = pikemen
+					value >= 0.3
+				}
 			}
 		}
 
@@ -1522,13 +1544,15 @@ awesomer_charge_tactic = {
 			flank_has_leader = yes
 			leader = { martial >= 17 }
 
-			heavy_troops = {
-				who = knights
-				value >= 0.5
-			}
-			heavy_troops = {
-				who = pikemen
-				value >= 0.3
+			OR = {
+				heavy_troops = {
+					who = knights
+					value >= 0.5
+				}
+				heavy_troops = {
+					who = pikemen
+					value >= 0.3
+				}
 			}
 		}
 	}
@@ -2721,11 +2745,11 @@ clever_ambush_tactic = {
 
 	trigger = {
 		phase = melee
-		light_cavalry = 0.1
+		light_infantry = 0.1
 		flank_has_leader = yes
 
 		OR = {
-			light_infantry = 0.1
+			light_cavalry = 0.1
 			camel_cavalry = 0.1
 		}
 

CleanSlate/common/cultures/00_chinese_group.txt

@@ -67,6 +67,14 @@ chinese_group = {
 		}
 
 		from_dynasty_prefix = ""
+
+		pat_grf_name_chance = 0
+		mat_grf_name_chance = 0
+		father_name_chance = 0
+
+		pat_grm_name_chance = 0
+		mat_grm_name_chance = 0
+		mother_name_chance = 0
 
 		dynasty_name_first = yes
 		dynasty_title_names = no

CleanSlate/common/death_text/00_death_text.txt

@@ -82,7 +82,7 @@ death_text_sponsor_king = {
 		factor = 60
 
 		trigger = {
-			has_character_flag = flag_sponsored_baptist
+			has_character_flag = flag_sponsored_baptism
 		}
 	}
 }

CleanSlate/common/event_modifiers/00_event_modifiers.txt

@@ -1315,7 +1315,7 @@ religious_tract = {
 
 rats_in_cell = {
 	health = -3
-	icon = 38
+	icon = 90
 }
 
 # Drunkard events
@@ -1519,11 +1519,17 @@ marshal_improves_capital = {
 }
 
 lovers_retreat = {
+	is_visible = {
+		character = FROM
+	}
 	fertility = 0.1
 	icon = 13
 }
 
 lovers_entertainment = {
+	is_visible = {
+		character = FROM
+	}
 	fertility = 0.2
 	icon = 15
 }
@@ -3509,6 +3515,9 @@ guide_dog = {
 }
 
 lovers_memento = {
+	is_visible = {
+		character = FROM
+	}
 	health = 0.5
 	icon = 59
 }

CleanSlate/common/execution_methods/00_execution_methods.txt

@@ -107,7 +107,10 @@ execution_method = {
 
 	trigger = {
 		FROM = {
-			NOT = { is_nomadic = yes }
+			NOR = {
+				is_nomadic = yes
+				religion = zoroastrian
+			}
 		}
 	}
 }

CleanSlate/common/landed_titles/01_holy_orders.txt

@@ -575,6 +575,8 @@ d_myrmidons = {
 
 	holy_order = yes
 
+	short_name = yes
+
 	culture = greek
 
 	# Parent Religion

CleanSlate/common/landed_titles/01_special.txt

@@ -283,6 +283,8 @@ e_roman_empire = {
 
 	culture = roman
 	#religion = orthodox
+
+	dynasty_title_names = no
 
 	allow = {
 		always = no # Only created through special event