Misc fixes and improvements

CleanSlate/common/cb_types/claim_cbs.txt

@@ -29,17 +29,10 @@ claim = {
 			# Gender requirements
 			trigger_if = {
 				limit = { is_female = yes }
-
-				NOR = {
-					has_religion_feature = religion_patriarchal
-					PREV = { succ_law_title = { has_law = agnatic_succession } }
-				}
+				NOT = { has_religion_feature = religion_patriarchal }
 			}
 			trigger_else = {
-				NOR = {
-					has_religion_feature = religion_matriarchal
-					PREV = { succ_law_title = { has_law = enatic_succession } }
-				}
+				NOT = { has_religion_feature = religion_matriarchal }
 			}
 
 			OR = {
@@ -1420,7 +1413,7 @@ other_claim = {
 			# claimant requirements
 			trigger_if = {
 				limit = {
-					NOT = {	has_strong_claim = PREV	}
+					NOT = { has_strong_claim = PREV }
 				}
 
 				has_weak_claim = PREV

CleanSlate/common/cb_types/other_cbs.txt

@@ -1,3 +1,8 @@
+# force_vassalization
+# great_realm_conflict
+# ducal_county_conquest
+# unjust_conquest
+
 force_vassalization = {
 	name = CB_NAME_FORCE_VASSALIZATION
 	war_name = WAR_NAME_FORCE_VASSALIZATION

CleanSlate/common/cb_types/shattered_world_cbs.txt

@@ -1,3 +1,7 @@
+# shattered_world_county_conquest
+# shattered_world_duchy_conquest
+# shattered_invasion
+
 shattered_world_county_conquest = {
 	name = CB_NAME_SHATTERED_COUNTY_CONQUEST
 	war_name = WAR_NAME_SHATTERED_COUNTY_CONQUEST

CleanSlate/common/disease/00_disease.txt

@@ -101,7 +101,7 @@ consumption = {
 				}
 				mult_modifier = {
 					factor = 50
-					is_unimportant_trigger = no
+					is_unimportant_trigger = yes
 				}
 
 				clr_character_flag = disease_not_serious

CleanSlate/common/event_modifiers/00_event_modifiers.txt

@@ -2975,7 +2975,7 @@ depopulated_1 = {
 	levy_size = -0.2
 	garrison_size = -0.2
 	supply_limit = -2
-	icon = 1
+	icon = 1 # CleanSlate: Refers to the frame on major_modifiers_strip
 	major = yes
 	disease_defence = 0.05
 }
@@ -2988,7 +2988,7 @@ depopulated_2 = {
 	levy_size = -0.4
 	garrison_size = -0.4
 	supply_limit = -4
-	icon = 3
+	icon = 2 # CleanSlate: Refers to the frame on major_modifiers_strip
 	major = yes
 	disease_defence = 0.1
 }
@@ -3001,7 +3001,7 @@ depopulated_3 = {
 	levy_size = -0.6
 	garrison_size = -0.6
 	supply_limit = -6
-	icon = 5
+	icon = 3 # CleanSlate: Refers to the frame on major_modifiers_strip
 	major = yes
 	disease_defence = 0.25
 }
@@ -3355,7 +3355,7 @@ prosperity_modifier_1 = {
 	disease_defence = -0.1
 
 	major = yes
-	icon = 7
+	icon = 4 # CleanSlate: Refers to the frame on major_modifiers_strip
 }
 
 prosperity_modifier_2 = {
@@ -3368,7 +3368,7 @@ prosperity_modifier_2 = {
 	disease_defence = -0.15
 
 	major = yes
-	icon = 9
+	icon = 5 # CleanSlate: Refers to the frame on major_modifiers_strip
 }
 
 prosperity_modifier_3 = {
@@ -3381,7 +3381,7 @@ prosperity_modifier_3 = {
 	disease_defence = -0.20
 
 	major = yes
-	icon = 11
+	icon = 6 # CleanSlate: Refers to the frame on major_modifiers_strip
 }
 
 bad_person = {

CleanSlate/common/execution_methods/00_execution_methods.txt

@@ -842,7 +842,7 @@ execution_method = {
 	trigger = {
 		FROM = {
 			any_realm_wonder_upgrade = {
-				has_wonder_upgrade = upgrade_spikes
+				has_wonder_upgrade_flag = spikes
 				is_active = yes
 			}
 		}
@@ -859,7 +859,7 @@ execution_method = {
 	trigger = {
 		FROM = {
 			any_realm_wonder_upgrade = {
-				has_wonder_upgrade = upgrade_moat_spike
+				has_wonder_upgrade_flag = moat_spike
 				is_active = yes
 			}
 		}
@@ -876,7 +876,7 @@ execution_method = {
 	trigger = {
 		FROM = {
 			any_realm_wonder_upgrade = {
-				has_wonder_upgrade = upgrade_moat_pit
+				has_wonder_upgrade_flag = moat_pit
 				is_active = yes
 			}
 		}
@@ -893,7 +893,7 @@ execution_method = {
 	trigger = {
 		FROM = {
 			any_realm_wonder_upgrade = {
-				has_wonder_upgrade = upgrade_moat_water
+				has_wonder_upgrade_flag = moat_water
 				is_active = yes
 			}
 		}

CleanSlate/common/job_actions/00_job_actions.txt

@@ -84,12 +84,92 @@ action_fabricate_claims = {
 		has_owner = yes
 		is_within_diplo_range = FROM
 
-		owner = {
-			NOT = { character = FROM }
+		OR = {
+			county = {
+				NOT = { claimed_by = FROM } # liege
+
+				holder_scope = {
+					NOR = {
+						character = FROM
+
+						FROM = {
+							job_chancellor = {
+								character = PREVPREV # Not the chancellor's own titles
+							}
+						}
+
+						# Not the Pope if liege is catholic
+						trigger_if = {
+							limit = { controls_religion = yes }
+							religion = catholic
+							religion = FROM
+						}
+					}
+				}
+			}
 
-			FROM = {
-				job_chancellor = {
-					NOT = { character = PREVPREV } # Not the chancellor's own titles
+			trigger_if = {
+				limit = {
+					FROM = {
+						job_chancellor = { diplomacy >= 15 }
+					}
+				}
+
+				duchy = {
+					NOT = { claimed_by = FROM } # liege
+
+					holder_scope = {
+						NOR = {
+							character = FROM
+
+							FROM = {
+								job_chancellor = {
+									character = PREVPREV # Not the chancellor's own titles
+								}
+							}
+
+							# Not the Pope if liege is catholic
+							trigger_if = {
+								limit = { controls_religion = yes }
+								religion = catholic
+								religion = FROM
+							}
+						}
+					}
+				}
+			}
+
+			trigger_if = {
+				limit = {
+					FROM = {
+						has_ambition = obj_become_king
+						NOT = { has_character_flag = kingdom_claimed_with_ambition }
+					}
+				}
+
+				kingdom = {
+					NOT = { claimed_by = FROM }
+
+					holder_scope = {
+						owns = ROOT
+
+						NOR = {
+							character = FROM
+
+							FROM = {
+								job_chancellor = {
+									character = PREVPREV # Not the chancellor's own titles
+								}
+							}
+
+							# Not the Pope if liege is catholic
+							trigger_if = {
+								limit = { controls_religion = yes }
+								religion = catholic
+								religion = FROM
+							}
+						}
+					}
 				}
 			}
 		}

CleanSlate/common/laws/succession_laws.txt

@@ -1003,13 +1003,9 @@ succession_laws = {
 				holder_scope = {
 					show_scope_change = no
 
-					primary_title = {
-						show_scope_change = no
-
-						OR = {
-							has_law = ze_administration_laws_1
-							has_law = ze_administration_laws_2
-						}
+					OR = {
+						has_law = ze_administration_laws_1
+						has_law = ze_administration_laws_2
 					}
 				}
 			}

CleanSlate/common/minor_titles/00_minor_titles.txt

@@ -307,7 +307,7 @@ title_commander = {
 	allowed_to_hold = {
 		trigger_if = {
 			limit = {
-				NOT = {	has_character_flag = special_marshal }
+				NOT = { has_character_flag = special_marshal }
 			}
 
 			is_adult = yes
@@ -327,6 +327,7 @@ title_commander = {
 			}
 		}
 
+		mercenary = no
 		prisoner = no
 		is_incapable = no
 		is_inaccessible_trigger = no
@@ -346,12 +347,14 @@ title_commander = {
 		}
 
 		trigger_if = {
-			limit = { FROM = { government = roman_imperial_government } }
+			limit = {
+				liege = { government = roman_imperial_government } # CleanSlate: liege is used here rather than FROM because it also needs to be valid for the "Appoint Commander" decision description
+			}
 
 			OR = {
 				higher_real_tier_than = BARON
 
-				FROM = {
+				liege = {
 					show_scope_change = no
 					byzantines_can_grant_commander_trigger = yes
 				}