Merge pull request #62 from ck2plus/beta2fixes

Beta2fixes
ck2plus · Jun 30, 2021 · 553d802 · 553d802
2 parents 70f612c + 30254e5
commit 553d802
Show file tree

Hide file tree

Showing 130 changed files with 31,396 additions and 42,264 deletions.
diff --git a/CleanSlate/common/disease/00_disease.txt b/CleanSlate/common/disease/00_disease.txt
@@ -914,7 +914,7 @@ bubonic_plague = {
 			}
 
 			excluded_regions = {
-				world_europe_west_brittania
+				world_europe_west_britannia
 			}
 		}
 
@@ -1033,7 +1033,7 @@ bubonic_plague = {
 			}
 
 			excluded_regions = {
-				world_europe_west_brittania
+				world_europe_west_britannia
 			}
 		}
 
@@ -1153,7 +1153,7 @@ bubonic_plague = {
 			}
 
 			excluded_regions = {
-				world_europe_west_brittania
+				world_europe_west_britannia
 			}
 		}
 
@@ -1268,7 +1268,7 @@ bubonic_plague = {
 			}
 
 			excluded_regions = {
-				world_europe_west_brittania
+				world_europe_west_britannia
 			}
 		}
 

diff --git a/CleanSlate/common/on_actions/11_conclave.txt b/CleanSlate/common/on_actions/11_conclave.txt
@@ -202,6 +202,6 @@ on_mercenary_captain_replacement = {
 # new_character is empty or a third party
 GRANT_LANDED_TITLE_INTERACTION_ACCEPT_EVENT = {
 	events = {
-		# ZE.7000 # Check for Gain Any Title ambition
+		ZE.7000 # Check for Gain Any Title ambition
 	}
 }
diff --git a/CleanSlate/common/scripted_effects/00_scripted_effects.txt b/CleanSlate/common/scripted_effects/00_scripted_effects.txt
@@ -6983,7 +6983,7 @@ princely_elective_apply_elector_setup_effect = {
 				world_europe_west_iberia = {
 					princely_elective_spain_elector_setup_effect = yes
 				}
-				world_europe_west_brittania = {
+				world_europe_west_britannia = {
 					princely_elective_britannia_elector_setup_effect = yes
 				}
 				fallback = { # If outside usual borders, default to Germania

diff --git a/CleanSlate/common/traits/00_leadership_traits.txt b/CleanSlate/common/traits/00_leadership_traits.txt
@@ -194,24 +194,6 @@ organizer = {
 	}
 }
 
-peasant_leader = {
-	leader = yes
-	rebel_inherited = yes
-	customizer = no
-
-	diplomacy = -5
-	combat_rating = 3 #new value!
-
-	same_opinion = 25
-
-	vassal_opinion = -10
-
-	male_insult = INSULT_PEASANT
-	male_insult_adj = INSULT_LOWBORN
-	female_insult = INSULT_PEASANT_WOMAN
-	female_insult_adj = INSULT_LOWBORN
-}
-
 rough_terrain_expert = {
 	leader = yes
 	random = no

diff --git a/CleanSlate/common/traits/00_special.txt b/CleanSlate/common/traits/00_special.txt
@@ -153,3 +153,20 @@ malnourished = {
 
 	ai_zeal = -20
 }
+
+peasant_leader = {
+	rebel_inherited = yes
+	customizer = no
+
+	diplomacy = -5
+	combat_rating = 3 #new value!
+
+	same_opinion = 25
+
+	vassal_opinion = -10
+
+	male_insult = INSULT_PEASANT
+	male_insult_adj = INSULT_LOWBORN
+	female_insult = INSULT_PEASANT_WOMAN
+	female_insult_adj = INSULT_LOWBORN
+}
diff --git a/CleanSlate/decisions/settlement_decisions.txt b/CleanSlate/decisions/settlement_decisions.txt
@@ -912,9 +912,15 @@ settlement_decisions = {
 				}
 			}
 
-			if = {
-				limit = { NOT = { holder = FROM } }
-				usurp_title = FROM
+			county = {
+				show_scope_change = no
+
+				save_event_target_as = base_title
+
+				if = {
+					limit = { NOT = { holder = FROM } }
+					usurp_title = FROM
+				}
 			}
 
 			if = {
@@ -928,31 +934,10 @@ settlement_decisions = {
 				capital = PREV
 			}
 
-			custom_tooltip = {
-				text = TT_BUILD_TRIBAL_HOLDINGS
-			}
-
-			location = {
-				county = {
-					save_event_target_as = primary_title
-				}
-			}
+			custom_tooltip = { text = TT_BUILD_TRIBAL_HOLDINGS }
 
 			FROM = {
 				show_scope_change = no
-			#	primary_title = {
-			#		ROOT = {
-			#			custom_tooltip = {
-			#				text = TT_KHAN_INDEPENDENCE
-			#			}
-			#
-			#			most_prestigious_clan_vassal = {
-			#				custom_tooltip = {
-			#					text = TT_NEW_KHAN
-			#				}
-			#			}
-			#		}
-			#	}
 
 				if = {
 					limit = { ai = no }
@@ -963,18 +948,18 @@ settlement_decisions = {
 					}
 				}
 
-				any_vassal = {
-					limit = { government = nomadic_government }
-					set_government_type = tribal_government
+				hidden_effect = {
+					any_vassal = {
+						limit = { government = nomadic_government }
+						set_government_type = tribal_government
+					}
 				}
 
 				set_government_type = tribal_government
 
 				if = {
 					limit = { lower_real_tier_than = KING }
 
-					save_event_target_as = title_name_target
-
 					create_title = {
 						tier = KING
 						landless = no
@@ -983,13 +968,13 @@ settlement_decisions = {
 						culture = ROOT_FROM
 						holder = ROOT_FROM
 						name = TRIBAL_CUSTOM
-						base_title = event_target:primary_title
+						base_title = event_target:base_title
 						copy_title_laws = yes
 					}
 				}
 
 				if = {
-					limit = { higher_tier_than = count }
+					limit = { higher_real_tier_than = COUNT }
 
 					primary_title = {
 						show_scope_change = no
@@ -1010,11 +995,7 @@ settlement_decisions = {
 				location = {
 					FROM = {
 						any_realm_province = {
-							limit = {
-								any_province_holding = {
-									holding_type = tribal
-								}
-							}
+							limit = { has_tribal = yes }
 
 							ROOT_FROM = {
 								spawn_unit = {
@@ -1139,6 +1120,8 @@ settlement_decisions = {
 		effect = {
 			# Change culture and religion of new capital province and possibly more provinces depending on nomad population_and_manpower
 			location = {
+				show_scope_change = no
+
 				if = {
 					limit = {
 						NOT = { culture = FROM }
@@ -1314,7 +1297,7 @@ settlement_decisions = {
 				if = {
 					limit = {
 						FROM = {
-							dynasty = 708 #Ýrpád
+							dynasty = 708 # Árpád
 							has_landed_title = k_hungary
 						}
 					}
@@ -1371,37 +1354,32 @@ settlement_decisions = {
 				}
 			}
 
-			if = {
-				limit = { NOT = { holder = FROM } }
-				usurp_title = FROM
+			dejure_liege_title = {
+				show_scope_change = no
+
+				if = {
+					limit = { NOT = { holder = FROM } }
+					usurp_title = FROM
+				}
 			}
 
-			hidden_tooltip = {
+			hidden_effect = {
 				if = {
 					limit = { is_capital = no }
 					make_capital_holding = yes
 				}
 			}
 
 			FROM = {
+				show_scope_change = no
+
 				capital = PREV
+				custom_tooltip = { text = TT_KHAN_INDEPENDENCE }
 
-				primary_title = {
+				most_prestigious_clan_vassal = {
 					show_scope_change = no
 
-					ROOT_FROM = {
-						show_scope_change = no
-
-						custom_tooltip = {
-							text = TT_KHAN_INDEPENDENCE
-						}
-
-						most_prestigious_clan_vassal = {
-							custom_tooltip = {
-								text = TT_NEW_KHAN
-							}
-						}
-					}
+					custom_tooltip = { text = TT_NEW_KHAN }
 				}
 
 				if = {
@@ -1463,16 +1441,13 @@ settlement_decisions = {
 
 						primary_title = {
 							show_scope_change = no
-
 							add_law = centralization_0
 						}
 					}
 				}
 
 				any_player = {
-					limit = {
-						NOT = { character = ROOT_FROM }
-					}
+					limit = { NOT = { character = ROOT_FROM } }
 					narrative_event = { id = HL.1 }
 				}
 			}
@@ -1509,6 +1484,7 @@ settlement_decisions = {
 							has_landed_title = e_mongol_empire
 							has_landed_title = e_golden_horde
 							has_landed_title = e_chagatai
+							has_landed_title = e_il-khanate
 						}
 					}
 				}
@@ -1517,7 +1493,7 @@ settlement_decisions = {
 			mult_modifier = {
 				factor = 100
 				FROM = {
-					dynasty = 708 # Ýrpád
+					dynasty = 708 # Árpád
 				}
 			}
 		}
@@ -1767,24 +1743,12 @@ settlement_decisions = {
 				show_scope_change = no
 
 				capital = PREV
+				custom_tooltip = { text = TT_KHAN_INDEPENDENCE }
 
-				primary_title = {
+				most_prestigious_clan_vassal = {
 					show_scope_change = no
 
-					FROM = {
-						show_scope_change = no
-
-						custom_tooltip = {
-							text = TT_KHAN_INDEPENDENCE
-						}
-
-						most_prestigious_clan_vassal = {
-							show_scope_change = no
-							custom_tooltip = {
-								text = TT_NEW_KHAN
-							}
-						}
-					}
+					custom_tooltip = { text = TT_NEW_KHAN }
 				}
 			}