Diff to HTML by rtfpessoa

Files changed (74) hide show

common/advisortypes/00_advisortypes.txt +21 -21
common/alerts.txt +3 -0
common/buildings/00_buildings.txt +1 -1
common/cb_types/00_cb_types.txt +0 -1
common/church_aspects/00_church_aspects.txt +1 -1
common/decrees/00_china.txt +24 -21
common/defines.lua +10 -4
common/diplomatic_actions/00_diplomatic_actions.txt +12 -1
common/disasters/castilian_civil_war.txt +1 -0
common/disasters/dutch_revolt.txt +1 -0
common/disasters/ottoman_power_struggle.txt +2 -1
common/disasters/time_of_troubles.txt +6 -3
common/estate_agendas/0002_rajput_agendas.txt +4 -4
common/estate_agendas/001_brahmin_agendas.txt +1 -0
common/estate_agendas/002_maratha_agendas.txt +4 -4
common/estate_agendas/02_noble_agendas.txt +5 -4
common/estate_agendas/04_cossack_agendas.txt +4 -4
common/estate_agendas/05_nomadic_tribe_agendas.txt +5 -4
common/estate_agendas/08_janissary_agendas.txt +4 -4
common/estate_privileges/0002_rajput_privileges.txt +1 -1
common/estate_privileges/02_noble_privileges.txt +9 -60
common/estate_privileges/03_burgher_privileges.txt +0 -1
common/estate_privileges/04_cossack_privileges.txt +2 -2
common/event_modifiers/00_event_modifiers.txt +2 -2
common/event_modifiers/01_mission_modifiers.txt +6 -5
common/government_mechanics/00_cossacks.txt +36 -28
common/government_mechanics/01_feudal_theocracy.txt +28 -28
common/government_mechanics/02_iqta.txt +26 -26
common/government_mechanics/03_mamluk.txt +10 -10
common/government_mechanics/04_russian.txt +9 -9
common/government_mechanics/05_tribal_federation.txt +25 -24
common/government_mechanics/06_devshirme.txt +18 -18
common/government_mechanics/08_perfectionism.txt +12 -12
common/government_mechanics/09_russian_modernization.txt +27 -24
common/government_mechanics/10_hessian_militarization.txt +1 -1
common/government_mechanics/12_militarization.txt +16 -8
common/government_mechanics/13_system_of_councils.txt +9 -0
common/government_mechanics/16_prussian_militarization.txt +75 -44
common/government_mechanics/17_shogunate.txt +28 -33
common/government_mechanics/18_parliament_vs_monarchy.txt +4 -0
common/government_mechanics/readme.txt +20 -2
common/government_names/01_government_names.txt +7 -3
common/government_reforms/01_government_reforms_monarchies.txt +28 -23
common/government_reforms/02_government_reforms_republics.txt +1 -1
common/government_reforms/03_government_reforms_theocracies.txt +38 -1
common/government_reforms/06_government_reforms_common.txt +3 -39
common/governments/00_governments.txt +2 -1
common/great_projects/01_monuments.txt +11 -8
common/holy_orders/00_holy_orders.txt +1 -1
common/ideas/00_country_ideas.txt +12 -11
common/mercenary_companies/00_mercenaries.txt +2 -2
common/new_diplomatic_actions/00_diplomatic_actions.txt +10 -7
common/on_actions/00_on_actions.txt +157 -53
common/opinion_modifiers/00_opinion_modifiers.txt +1 -1
common/parliament_issues/01_english_parliament_actions.txt +11 -1
common/peace_treaties/00_establish_eyalet.txt +6 -2
common/peace_treaties/01_force_border_changes.txt +40 -0
common/province_names/croatian_new.txt +94 -0
common/province_names/czech_new.txt +344 -0
common/province_names/polish_new.txt +198 -0
common/province_names/schlesian_new.txt +188 -0
common/province_names/serbian_new.txt +35 -0
common/province_names/slavic.txt +119 -0
common/province_names/slovak_new.txt +94 -0
common/province_names/slovene_new.txt +34 -0
common/province_names/sorbian_new.txt +1 -0
common/rebel_types/anti_tax.txt +6 -0
common/religions/00_religion.txt +1 -0
common/revolution/00_revolution.txt +1 -1
common/scripted_effects/01_scripted_effects_for_on_actions.txt +53 -1
common/scripted_triggers/00_scripted_triggers_FR.txt +7 -7
common/scripted_triggers/00_scripted_triggers_estates.txt +4 -1
common/subject_types/00_subject_types.txt +19 -10
common/wargoal_types/00_wargoal_types.txt +2 -0

common/advisortypes/00_advisortypes.txt CHANGED Viewed

@@ -18,7 +18,7 @@ philosopher = {
 	skill_scaled_modifier = {
 		trigger = {
 			owner = {
-				has_government_mechanic = russian_modernization
+				has_government_mechanic = russian_modernization_mechanic
 				NOT = { culture_group = PREV }
 			}
 		}
@@ -104,7 +104,7 @@ natural_scientist = {
 	skill_scaled_modifier = {
 		trigger = {
 			owner = {
-				has_government_mechanic = russian_modernization
+				has_government_mechanic = russian_modernization_mechanic
 				NOT = { culture_group = PREV }
 			}
 		}
@@ -190,7 +190,7 @@ artist = {
 	skill_scaled_modifier = {
 		trigger = {
 			owner = {
-				has_government_mechanic = russian_modernization
+				has_government_mechanic = russian_modernization_mechanic
 				NOT = { culture_group = PREV }
 			}
 		}
@@ -284,7 +284,7 @@ treasurer = {
 	skill_scaled_modifier = {
 		trigger = {
 			owner = {
-				has_government_mechanic = russian_modernization
+				has_government_mechanic = russian_modernization_mechanic
 				NOT = { culture_group = PREV }
 			}
 		}
@@ -370,7 +370,7 @@ theologian = {
 	skill_scaled_modifier = {
 		trigger = {
 			owner = {
-				has_government_mechanic = russian_modernization
+				has_government_mechanic = russian_modernization_mechanic
 				NOT = { culture_group = PREV }
 			}
 		}
@@ -465,7 +465,7 @@ master_of_mint = {
 	skill_scaled_modifier = {
 		trigger = {
 			owner = {
-				has_government_mechanic = russian_modernization
+				has_government_mechanic = russian_modernization_mechanic
 				NOT = { culture_group = PREV }
 			}
 		}
@@ -555,7 +555,7 @@ inquisitor = {
 	skill_scaled_modifier = {
 		trigger = {
 			owner = {
-				has_government_mechanic = russian_modernization
+				has_government_mechanic = russian_modernization_mechanic
 				NOT = { culture_group = PREV }
 			}
 		}
@@ -670,7 +670,7 @@ statesman = {
 	skill_scaled_modifier = {
 		trigger = {
 			owner = {
-				has_government_mechanic = russian_modernization
+				has_government_mechanic = russian_modernization_mechanic
 				NOT = { culture_group = PREV }
 			}
 		}
@@ -736,7 +736,7 @@ naval_reformer = {
 	skill_scaled_modifier = {
 		trigger = {
 			owner = {
-				has_government_mechanic = russian_modernization
+				has_government_mechanic = russian_modernization_mechanic
 				NOT = { culture_group = PREV }
 			}
 		}
@@ -810,7 +810,7 @@ trader = {
 	skill_scaled_modifier = {
 		trigger = {
 			owner = {
-				has_government_mechanic = russian_modernization
+				has_government_mechanic = russian_modernization_mechanic
 				NOT = { culture_group = PREV }
 			}
 		}
@@ -890,7 +890,7 @@ spymaster = {
 	skill_scaled_modifier = {
 		trigger = {
 			owner = {
-				has_government_mechanic = russian_modernization
+				has_government_mechanic = russian_modernization_mechanic
 				NOT = { culture_group = PREV }
 			}
 		}
@@ -956,7 +956,7 @@ colonial_governor = {
 	skill_scaled_modifier = {
 		trigger = {
 			owner = {
-				has_government_mechanic = russian_modernization
+				has_government_mechanic = russian_modernization_mechanic
 				NOT = { culture_group = PREV }
 			}
 		}
@@ -1030,7 +1030,7 @@ diplomat = {
 	skill_scaled_modifier = {
 		trigger = {
 			owner = {
-				has_government_mechanic = russian_modernization
+				has_government_mechanic = russian_modernization_mechanic
 				NOT = { culture_group = PREV }
 			}
 		}
@@ -1096,7 +1096,7 @@ navigator = {
 	skill_scaled_modifier = {
 		trigger = {
 			owner = {
-				has_government_mechanic = russian_modernization
+				has_government_mechanic = russian_modernization_mechanic
 				NOT = { culture_group = PREV }
 			}
 		}
@@ -1171,7 +1171,7 @@ army_reformer = {
 	skill_scaled_modifier = {
 		trigger = {
 			owner = {
-				has_government_mechanic = russian_modernization
+				has_government_mechanic = russian_modernization_mechanic
 				NOT = { culture_group = PREV }
 			}
 		}
@@ -1218,7 +1218,7 @@ army_organiser = {
 	skill_scaled_modifier = {
 		trigger = {
 			owner = {
-				has_government_mechanic = russian_modernization
+				has_government_mechanic = russian_modernization_mechanic
 				NOT = { culture_group = PREV }
 			}
 		}
@@ -1265,7 +1265,7 @@ commandant = {
 	skill_scaled_modifier = {
 		trigger = {
 			owner = {
-				has_government_mechanic = russian_modernization
+				has_government_mechanic = russian_modernization_mechanic
 				NOT = { culture_group = PREV }
 			}
 		}
@@ -1312,7 +1312,7 @@ quartermaster = {
 	skill_scaled_modifier = {
 		trigger = {
 			owner = {
-				has_government_mechanic = russian_modernization
+				has_government_mechanic = russian_modernization_mechanic
 				NOT = { culture_group = PREV }
 			}
 		}
@@ -1363,7 +1363,7 @@ recruitmaster = {
 	skill_scaled_modifier = {
 		trigger = {
 			owner = {
-				has_government_mechanic = russian_modernization
+				has_government_mechanic = russian_modernization_mechanic
 				NOT = { culture_group = PREV }
 			}
 		}
@@ -1414,7 +1414,7 @@ fortification_expert = {
 	skill_scaled_modifier = {
 		trigger = {
 			owner = {
-				has_government_mechanic = russian_modernization
+				has_government_mechanic = russian_modernization_mechanic
 				NOT = { culture_group = PREV }
 			}
 		}
@@ -1462,7 +1462,7 @@ grand_captain = {
 	skill_scaled_modifier = {
 		trigger = {
 			owner = {
-				has_government_mechanic = russian_modernization
+				has_government_mechanic = russian_modernization_mechanic
 				NOT = { culture_group = PREV }
 			}
 		}

common/alerts.txt CHANGED Viewed

@@ -409,4 +409,7 @@ alerts = {
 	can_celebrate_festival = {
 		category = LOW
 	}
+	has_slacken_on = {
+		category = MEDIUM
+	}
 }

common/buildings/00_buildings.txt CHANGED Viewed

@@ -1935,7 +1935,7 @@ farm_estate = {
 		remove_development_from_building = {
 			building = manufactory
 			type = production
-			value = 1
+			value = 2
 		}
 		remove_dev_from_building = {
 			building = manufactory

common/cb_types/00_cb_types.txt CHANGED Viewed

@@ -1404,7 +1404,6 @@ cb_chinese_unification = {
 			NOT = { has_country_modifier = the_mandate_of_heaven }
 			is_emperor_of_china = no
 		}
-		is_neighbor_of = FROM
 	}
 	attacker_disabled_po = {

common/church_aspects/00_church_aspects.txt CHANGED Viewed

@@ -393,7 +393,7 @@ anglican_aspect = {
 		}
 	}
 	modifier = {
-		global_autonomy = -0.025
+		tolerance_of_heretics_capacity = 1
 	}
 	ai_will_do = {
 		factor = 2

common/decrees/00_china.txt CHANGED Viewed

@@ -25,7 +25,7 @@ expand_bureaucracy_decree = {
 	}
 	removed_effect = {}
 	ai_will_do = {
-		factor = 100
+		factor = 10
 	}
 }
@@ -50,7 +50,7 @@ improved_expand_bureaucracy_decree = {
 	}
 	removed_effect = {}
 	ai_will_do = {
-		factor = 100
+		factor = 10
 	}
 }
@@ -71,7 +71,7 @@ improved_conduct_census_decree = {
 	}
 	removed_effect = {}
 	ai_will_do = {
-		factor = 100
+		factor = 10
 		modifier = {
 			factor = 0.1
 			NOT = { tax_income_percentage = 0.25 }
@@ -130,7 +130,7 @@ conduct_census_decree = {
 	}
 	removed_effect = {}
 	ai_will_do = {
-		factor = 100
+		factor = 10
 		modifier = {
 			factor = 0.1
 			NOT = { tax_income_percentage = 0.25 }
@@ -185,6 +185,10 @@ promote_naval_officers_decree = {
 			factor = 3
 			navy_tradition = 50
 		}
+		modifier = {
+			factor = 0
+			NOT = { imperial_mandate = 90 }
+		}
 	}
 }
@@ -202,7 +206,7 @@ increase_tariff_control_decree = {
 	effect = {}
 	removed_effect = {}
 	ai_will_do = {
-		factor = 100
+		factor = 10
 		modifier = {
 			factor = 0.1
 			NOT = { trade_income_percentage = 0.25 }
@@ -274,7 +278,7 @@ boost_officer_corps_decree = {
 	effect = {}
 	removed_effect = {}
 	ai_will_do = {
-		factor = 100
+		factor = 10
 		modifier = {
 			factor = 0.1
 			is_at_war = no
@@ -305,7 +309,7 @@ fund_new_centers_of_education_decree = {
 	effect = {}
 	removed_effect = {}
 	ai_will_do = {
-		factor = 100
+		factor = 10
 	}
 }
@@ -341,7 +345,7 @@ issue_the_great_warnings_decree = {
 	effect = {}
 	removed_effect = {}
 	ai_will_do = {
-		factor = 100
+		factor = 10
 	}
 }
@@ -353,7 +357,7 @@ issue_the_great_warnings_decree = {
 		# global_ship_cost = -0.1
 	# }
 	# ai_will_do = {
-		# factor = 100
+		# factor = 10
 	# }
 # }
@@ -371,7 +375,7 @@ six_ordinances_decree = {
 	effect = {}
 	removed_effect = {}
 	ai_will_do = {
-		factor = 100
+		factor = 10
 	}
 }
@@ -390,7 +394,7 @@ sacred_edict_of_confucianism_decree = {
 	effect = {}
 	removed_effect = {}
 	ai_will_do = {
-		factor = 100
+		factor = 10
 	}
 }
@@ -408,7 +412,7 @@ promote_taoist_studies_decree = {
 	effect = {}
 	removed_effect = {}
 	ai_will_do = {
-		factor = 100
+		factor = 10
 	}
 }
@@ -426,7 +430,7 @@ appoint_entrusted_eunuchs_decree = {
 	effect = {}
 	removed_effect = {}
 	ai_will_do = {
-		factor = 100
+		factor = 10
 	}
 }
@@ -438,7 +442,7 @@ appoint_entrusted_eunuchs_decree = {
 		# trade_efficiency = 0.15
 	# }
 	# ai_will_do = {
-		# factor = 100
+		# factor = 10
 	# }
 # }
@@ -456,7 +460,7 @@ increase_trade_cooperation_decree = {
 	effect = {}
 	removed_effect = {}
 	ai_will_do = {
-		factor = 100
+		factor = 10
 	}
 }
@@ -474,7 +478,7 @@ reinforce_the_inner_guard_decree = {
 	effect = {}
 	removed_effect = {}
 	ai_will_do = {
-		factor = 100
+		factor = 10
 	}
 }
@@ -486,7 +490,7 @@ reinforce_the_inner_guard_decree = {
 		# colonist_placement_chance = 0.15
 	# }
 	# ai_will_do = {
-		# factor = 100
+		# factor = 10
 	# }
 # }
@@ -498,7 +502,7 @@ reinforce_the_inner_guard_decree = {
 		# culture_conversion_speed = 0.5
 	# }
 	# ai_will_do = {
-		# factor = 100
+		# factor = 10
 	# }
 # }
@@ -516,7 +520,6 @@ issue_bureaucratic_imperial_seal = {
 	effect = {}
 	removed_effect = {}
 	ai_will_do = {
-		factor = 100
+		factor = 10
 	}
-}
+}

common/defines.lua CHANGED Viewed

@@ -132,7 +132,7 @@ NDiplomacy = {
 	JOIN_HRE_DEVELOPMENT_CAP_VASSAL = 200,			-- Max cap of development of vassals to join the empire
 	IMPERIAL_REFORM_COST = 50,						-- Minium Cost of enacting a new reform.
 	IMPERIAL_REFORM_AUTHORITY_ACCEPTANCE = 1,		-- How much acceptance for each authority above IMPERIAL_REFORM_COST
-	CELESTIAL_EMPIRE_REFORM_COST = 80,				-- Mandate cost of enacting a new reform for the Emperor of China.
+	CELESTIAL_EMPIRE_REFORM_COST = 70,				-- Mandate cost of enacting a new reform for the Emperor of China.
 	CELESTIAL_EMPIRE_REFORM_STABILITY_COST = 1,		-- Stability cost of enacting a new reform for the Emperor of China
 	CELESTIAL_EMPIRE_REFORM_MIN_VALUE = 80,		-- Minimum value of Mandate above which new reforms can be enacted.
 	DEFENDER_OF_FAITH_COST = 500, 					-- _DDEF_DEFENDER_OF_FAITH_COST_
@@ -502,7 +502,7 @@ NCountry = {
 	SPLENDOR_ABILITY_COST = 800,
 	PROSPERITY_MONTHLY_DECLINE = -2,				-- monthly tick
 	PROSPERITY_INCREASE_SIZE= 1,				-- if diceroll of d20< monarch stat, while possible ot increase
-	CORRUPTION_FROM_BANNERS = 5,
+	CORRUPTION_FROM_BANNERS = 0.1,
 	FORCE_CONVERT_COOLDOWN_DURATION = 10,				-- Years
@@ -845,8 +845,8 @@ NCountry = {
 	POPULATION_GROWTH = 0.03, 						-- _CDEF_POPULATION_GROWTH_; Base population growth.
 	COLONIAL_GROWTH_PENALTY = 100, 					-- growth penalty for low colonial maintenance
 	BANKRUPTCY_COLONIAL_GROWTH_PENALTY = -200, 		-- growth penalty for bankruptcy
-	MAX_NATIONALISM = 10,
-	MIN_NATIONALISM = -30,
+	MAX_NATIONALISM = 30,							-- how much extra nationalism can there be in a province, added with the effect, not by conquering
+	MIN_NATIONALISM = -30,							-- how much extra negative nationalism can there be in a province, added with the effect, not by conquering
 	YEARS_OF_NATIONALISM = 30, 						-- _CDEF_YEARS_OF_NATIONALISM_; Years of Nationalism
 	YEARS_UNTIL_BROKEN = 2, 						-- _CDEF_YEARS_UNTIL_BROKEN_; Years until rebel held capital results in broken country.
 	BASE_HEIR_BIRTH = 120, 							-- _CDEF_BASE_HEIR_BIRTH_
@@ -916,6 +916,12 @@ NCountry = {
 	LIBERTY_DESIRE_SCUTAGE_OFF = 25,				-- Liberty desire from turning off scutage
 	LOST_INDEPENDANCE_WAR_LIBERTY_DESIRE = -50,		-- How much liberty desire is decreased when an independance war ends
+	REQUEST_EXTRA_LEVIES_MAX_LIBERTY_DESIRE = 25,
+	REQUEST_EXTRA_LEVIES_COOLDOWN_MONTHS = 60,
+	SEIZE_COURT_RESOURCES_MAX_LIBERTY_DESIRE = 25,
+	SEIZE_COURT_RESOURCES_COOLDOWN_MONTHS = 60,
 	MIN_LIBERTY_DESIRE = 0,							-- Min total (effective) liberty desire
 	MAX_LIBERTY_DESIRE = 100,						-- Max total (effective) liberty desire
 	MIN_LIBERTY_DESIRE_INFLUENCE = -100,			-- Min influence of a single modifier (e.g. paid of debt)

common/diplomatic_actions/00_diplomatic_actions.txt CHANGED Viewed

@@ -144,6 +144,17 @@ declarewar = {
 			}
 		}
 	}
+	condition = {
+		tooltip = CANNOT_DECLARE_WARS_TEUTONS_HRE
+		potential = {
+			ai = yes
+			has_country_flag = teu_joined_the_hre
+			FROM = { is_part_of_hre = yes }
+		}
+		allow = {
+			FROM = { is_part_of_hre = no }
+		}
+	}
 	effect = {
 		on_war_declaration_effect = yes
 		if = {
@@ -499,7 +510,7 @@ form_coalition = {
 				has_opinion_modifier = {
 					modifier = aggressive_expansion
 					who = FROM
-					value = -50
+					value = -49
 				}
 			}
 		}

common/disasters/castilian_civil_war.txt CHANGED Viewed

@@ -103,6 +103,7 @@ castilian_civil_war = {
 	on_start = castilian_civil_war.1
 	on_end = castilian_civil_war.100
+	ended_by_country_breaking_to_rebels = no
 	on_monthly = {
 		events = {

common/disasters/dutch_revolt.txt CHANGED Viewed

@@ -27,6 +27,7 @@ dutch_revolt_disaster = {
 		NOT = { capital_scope = { region = low_countries_region } }
 		is_free_or_tributary_trigger = yes
 		num_of_cities = 6
+		NOT = { has_government_attribute = no_more_dutch_revolt }
 	}
 	can_start = {

common/disasters/ottoman_power_struggle.txt CHANGED Viewed

@@ -579,7 +579,8 @@ tur_disaster_plot_of_the_harem = {
 		}
 	}
 	modifier = {
-		heir_chance = -1
+		# heir_chance = -1
+		# Heir chance has no effect on harem countries
 		monarch_lifespan = -0.75
 		female_advisor_chance = 0.33
 	}

common/disasters/time_of_troubles.txt CHANGED Viewed

@@ -25,9 +25,12 @@ time_of_troubles = {
 		has_any_disaster = no
 		OR = {
 			has_new_dynasty = yes
-			NOT = {
-				ruler_total_stats = {
-					stats = 9
+			custom_trigger_tooltip = {
+				tooltip = less_than_9_total_stats
+				NOT = {
+					ruler_total_stats = {
+						stats = 9
+					}
 				}
 			}
 		}

common/estate_agendas/0002_rajput_agendas.txt CHANGED Viewed

@@ -1325,7 +1325,7 @@ estate_rajput_expand_into_x = {
 					area_for_scope_province = {
 						OR = {
 							is_empty = yes
-							owned_by = root
+							country_or_subject_holds = ROOT
 						}
 					}
 				}
@@ -1404,7 +1404,7 @@ estate_rajput_expand_into_x = {
 						area_for_scope_province = {
 							OR = {
 								is_empty = yes
-								owned_by = root
+								country_or_subject_holds = ROOT
 							}
 						}
 					}
@@ -1491,7 +1491,7 @@ estate_rajput_expand_into_x = {
 		else = {
 			event_target:agenda_province = {
 				area_for_scope_province = {
-					owned_by = root
+					country_or_subject_holds = ROOT
 				}
 			}
 		}
@@ -1502,7 +1502,7 @@ estate_rajput_expand_into_x = {
 				type = all
 				NOT = { is_claim = root }
 				NOT = { is_core = root }
-				NOT = { owned_by = root }
+				NOT = { country_or_subject_holds = ROOT }
 			}
 		}
 	}

common/estate_agendas/001_brahmin_agendas.txt CHANGED Viewed

@@ -861,6 +861,7 @@ estate_brahmins_befriend_rival_of_rival = {
 				NOT = { is_rival = root }
 				NOT = { ROOT = { is_rival = prev } }
 				NOT = { alliance_with = root }
+				NOT = { war_with = root }
 				has_opinion = {
 					who = root
 					value = -50

common/estate_agendas/002_maratha_agendas.txt CHANGED Viewed

@@ -1325,7 +1325,7 @@ estate_maratha_expand_into_x = {
 					area_for_scope_province = {
 						OR = {
 							is_empty = yes
-							owned_by = root
+							country_or_subject_holds = ROOT
 						}
 					}
 				}
@@ -1404,7 +1404,7 @@ estate_maratha_expand_into_x = {
 						area_for_scope_province = {
 							OR = {
 								is_empty = yes
-								owned_by = root
+								country_or_subject_holds = ROOT
 							}
 						}
 					}
@@ -1491,7 +1491,7 @@ estate_maratha_expand_into_x = {
 		else = {
 			event_target:agenda_province = {
 				area_for_scope_province = {
-					owned_by = root
+					country_or_subject_holds = ROOT
 				}
 			}
 		}
@@ -1502,7 +1502,7 @@ estate_maratha_expand_into_x = {
 				type = all
 				NOT = { is_claim = root }
 				NOT = { is_core = root }
-				NOT = { owned_by = root }
+				NOT = { country_or_subject_holds = ROOT }
 			}
 		}
 	}

common/estate_agendas/02_noble_agendas.txt CHANGED Viewed

@@ -235,6 +235,7 @@ estate_nobles_befriend_rival_of_rival = {
 				NOT = { is_rival = root }
 				NOT = { ROOT = { is_rival = prev } }
 				NOT = { alliance_with = root }
+				NOT = { war_with = root }
 				has_opinion = {
 					who = root
 					value = -50
@@ -2052,7 +2053,7 @@ estate_nobles_expand_into_x = {
 					area_for_scope_province = {
 						OR = {
 							is_empty = yes
-							owned_by = root
+							country_or_subject_holds = ROOT
 						}
 					}
 				}
@@ -2131,7 +2132,7 @@ estate_nobles_expand_into_x = {
 						area_for_scope_province = {
 							OR = {
 								is_empty = yes
-								owned_by = root
+								country_or_subject_holds = ROOT
 							}
 						}
 					}
@@ -2218,7 +2219,7 @@ estate_nobles_expand_into_x = {
 		else = {
 			event_target:agenda_province = {
 				area_for_scope_province = {
-					owned_by = root
+					country_or_subject_holds = ROOT
 				}
 			}
 		}
@@ -2229,7 +2230,7 @@ estate_nobles_expand_into_x = {
 				type = all
 				NOT = { is_claim = root }
 				NOT = { is_core = root }
-				NOT = { owned_by = root }
+				NOT = { country_or_subject_holds = ROOT }
 			}
 		}
 	}

common/estate_agendas/04_cossack_agendas.txt CHANGED Viewed

@@ -387,7 +387,7 @@ estate_cossacks_expand_into_x = {
 					area_for_scope_province = {
 						OR = {
 							is_empty = yes
-							owned_by = root
+							country_or_subject_holds = ROOT
 						}
 					}
 				}
@@ -473,7 +473,7 @@ estate_cossacks_expand_into_x = {
 						area_for_scope_province = {
 							OR = {
 								is_empty = yes
-								owned_by = root
+								country_or_subject_holds = ROOT
 							}
 						}
 					}
@@ -567,7 +567,7 @@ estate_cossacks_expand_into_x = {
 		else = {
 			event_target:agenda_province = {
 				area_for_scope_province = {
-					owned_by = root
+					country_or_subject_holds = ROOT
 				}
 			}
 		}
@@ -578,7 +578,7 @@ estate_cossacks_expand_into_x = {
 				type = all
 				NOT = { is_claim = root }
 				NOT = { is_core = root }
-				NOT = { owned_by = root }
+				NOT = { country_or_subject_holds = ROOT }
 			}
 		}
 	}

common/estate_agendas/05_nomadic_tribe_agendas.txt CHANGED Viewed

@@ -669,6 +669,7 @@ estate_nomadic_tribes_befriend_rival_of_rival = {
 				NOT = { is_rival = root }
 				NOT = { ROOT = { is_rival = prev } }
 				NOT = { alliance_with = root }
+				NOT = { war_with = root }
 				has_opinion = {
 					who = root
 					value = -50
@@ -1987,7 +1988,7 @@ estate_nomadic_tribes_expand_into_x = {
 					area_for_scope_province = {
 						OR = {
 							is_empty = yes
-							owned_by = root
+							country_or_subject_holds = ROOT
 						}
 					}
 				}
@@ -2066,7 +2067,7 @@ estate_nomadic_tribes_expand_into_x = {
 						area_for_scope_province = {
 							OR = {
 								is_empty = yes
-								owned_by = root
+								country_or_subject_holds = ROOT
 							}
 						}
 					}
@@ -2153,7 +2154,7 @@ estate_nomadic_tribes_expand_into_x = {
 		else = {
 			event_target:agenda_province = {
 				area_for_scope_province = {
-					owned_by = root
+					country_or_subject_holds = ROOT
 				}
 			}
 		}
@@ -2164,7 +2165,7 @@ estate_nomadic_tribes_expand_into_x = {
 				type = all
 				NOT = { is_claim = root }
 				NOT = { is_core = root }
-				NOT = { owned_by = root }
+				NOT = { country_or_subject_holds = ROOT }
 			}
 		}
 	}

common/estate_agendas/08_janissary_agendas.txt CHANGED Viewed

@@ -1636,7 +1636,7 @@ estate_janissaries_expand_into_x = {
 					area_for_scope_province = {
 						OR = {
 							is_empty = yes
-							owned_by = root
+							country_or_subject_holds = ROOT
 						}
 					}
 				}
@@ -1717,7 +1717,7 @@ estate_janissaries_expand_into_x = {
 						area_for_scope_province = {
 							OR = {
 								is_empty = yes
-								owned_by = root
+								country_or_subject_holds = ROOT
 							}
 						}
 					}
@@ -1804,7 +1804,7 @@ estate_janissaries_expand_into_x = {
 		else = {
 			event_target:agenda_province = {
 				area_for_scope_province = {
-					owned_by = root
+					country_or_subject_holds = ROOT
 				}
 			}
 		}
@@ -1815,7 +1815,7 @@ estate_janissaries_expand_into_x = {
 				type = all
 				NOT = { is_claim = root }
 				NOT = { is_core = root }
-				NOT = { owned_by = root }
+				NOT = { country_or_subject_holds = ROOT }
 			}
 		}
 	}

common/estate_privileges/0002_rajput_privileges.txt CHANGED Viewed

@@ -197,7 +197,7 @@ estate_rajput_rajput_regiments = {
 	on_granted = {
 	}
 	modifier_by_land_ownership = {
-		special_unit_forcelimit = 0.5
+		allowed_rajput_fraction = 0.5
 	}
 	penalties = {
 	}

common/estate_privileges/02_noble_privileges.txt CHANGED Viewed

@@ -1018,12 +1018,6 @@ estate_nobles_strong_duchies = {
 			}
 		}
 		NOT = { has_estate_privilege = estate_nobles_french_strong_duchies }
-		NOT = {
-			AND = {
-				tag = FRA
-				NOT = { has_estate_privilege = estate_nobles_strong_duchies }
-			}
-		}
 	}
 	can_select = {
 		custom_trigger_tooltip = {
@@ -1201,12 +1195,7 @@ estate_nobles_nieszawa_privileges = {
 	is_valid = {
 		has_estate_privilege = estate_nobles_nieszawa_privileges #event privilege for Poland
 	}
-	can_revoke = {
-		custom_trigger_tooltip = { #revoke Golden Liberty or do it via event
-			tooltip = estate_privilege_cannot_be_revoked
-			always = no
-		}
-	}
+	can_revoke = no
 	penalties = {
 		technology_cost = 0.05
 	}
@@ -1227,12 +1216,7 @@ estate_nobles_pacta_conventa = {
 	is_valid = {
 		has_estate_privilege = estate_nobles_pacta_conventa #event privilege for Poland
 	}
-	can_revoke = {
-		custom_trigger_tooltip = { #revoke Golden Liberty or do it via event
-			tooltip = estate_privilege_cannot_be_revoked
-			always = no
-		}
-	}
+	can_revoke = no
 	penalties = {
 		war_exhaustion_cost = 0.5
 		inflation_action_cost = 0.5
@@ -2398,12 +2382,7 @@ estate_nobles_early_serfdom = {
 	can_select = {
 		NOT = { has_estate_privilege = estate_nobles_increased_peasant_freedom }
 	}
-	can_revoke = {
-		custom_trigger_tooltip = {
-			tooltip = estate_privilege_cannot_be_revoked
-			always = no
-		}
-	}
+	can_revoke = no
 	on_granted = {
 		custom_tooltip = estate_privilege_cannot_be_revoked
 		block_estate_removing_reforms = {
@@ -2485,12 +2464,7 @@ estate_nobles_legalized_serfdom = {
 		NOT = { has_country_flag = level_three_serfdom_privileges }
 		NOT = { has_country_flag = final_serfdom_privileges }
 	}
-	can_revoke = {
-		custom_trigger_tooltip = {
-			tooltip = estate_privilege_cannot_be_revoked
-			always = no
-		}
-	}
+	can_revoke = no
 	on_granted = {
 		custom_tooltip = estate_privilege_cannot_be_revoked
 		block_estate_removing_reforms = {
@@ -2568,12 +2542,7 @@ estate_nobles_total_serfdom = {
 		NOT = { has_country_flag = liberated_peasants }
 		NOT = { has_country_flag = final_serfdom_privileges }
 	}
-	can_revoke = {
-		custom_trigger_tooltip = {
-			tooltip = estate_privilege_cannot_be_revoked
-			always = no
-		}
-	}
+	can_revoke = no
 	on_granted = {
 		custom_tooltip = estate_privilege_cannot_be_revoked
 		block_estate_removing_reforms = {
@@ -2647,12 +2616,7 @@ estate_nobles_restricted_serfdom = {
 		has_estate_privilege = estate_nobles_restricted_serfdom
 		NOT = { has_country_flag = liberated_peasants }
 	}
-	can_revoke = {
-		custom_trigger_tooltip = {
-			tooltip = estate_privilege_cannot_be_revoked
-			always = no
-		}
-	}
+	can_revoke = no
 	on_granted = {
 		custom_tooltip = estate_privilege_cannot_be_revoked
 		block_estate_removing_reforms = {
@@ -2726,12 +2690,7 @@ estate_nobles_devastating_serfdom = {
 		has_estate_privilege = estate_nobles_devastating_serfdom
 		NOT = { has_country_flag = liberated_peasants }
 	}
-	can_revoke = {
-		custom_trigger_tooltip = {
-			tooltip = estate_privilege_cannot_be_revoked
-			always = no
-		}
-	}
+	can_revoke = no
 	on_granted = {
 		custom_tooltip = estate_privilege_cannot_be_revoked
 		block_estate_removing_reforms = {
@@ -2810,12 +2769,7 @@ estate_nobles_increased_peasant_freedom = {
 	can_select = {
 		NOT = { has_estate_privilege = estate_nobles_early_serfdom }
 	}
-	can_revoke = {
-		custom_trigger_tooltip = {
-			tooltip = estate_privilege_cannot_be_revoked
-			always = no
-		}
-	}
+	can_revoke = no
 	on_granted = {
 		custom_tooltip = estate_privilege_cannot_be_revoked
 		block_estate_removing_reforms = {
@@ -2892,12 +2846,7 @@ estate_nobles_peasant_liberation = {
 		has_country_flag = level_two_serfdom_privileges
 		NOT = { has_country_flag = enserfed_peasants }
 	}
-	can_revoke = {
-		custom_trigger_tooltip = {
-			tooltip = estate_privilege_cannot_be_revoked
-			always = no
-		}
-	}
+	can_revoke = no
 	on_granted = {
 		custom_tooltip = estate_privilege_cannot_be_revoked
 		block_estate_removing_reforms = {

common/estate_privileges/03_burgher_privileges.txt CHANGED Viewed

@@ -2178,7 +2178,6 @@ estate_burghers_the_new_middle_class = {
 	}
 	on_granted = {
 		add_mercantilism = -5
-		custom_tooltip = estate_privilege_only_revoked_by_republics
 		set_country_flag = rus_enacted_early_disconnection_flag
 		clr_country_flag = rus_enacted_early_serfdom_flag
 		set_country_flag = liberated_peasants

common/estate_privileges/04_cossack_privileges.txt CHANGED Viewed

@@ -337,7 +337,7 @@ estate_cossacks_establish_the_cossack_regiments = {
 	on_granted = {
 	}
 	modifier_by_land_ownership = {
-		special_unit_forcelimit = 0.5
+		allowed_cossack_fraction = 0.5
 	}
 	penalties = {
 	}
@@ -426,7 +426,7 @@ estate_cossacks_expand_the_cossack_regiments = {
 		}
 	}
 	modifier_by_land_ownership = {
-		special_unit_forcelimit = 0.5
+		allowed_cossack_fraction = 0.5
 	}
 	penalties = {
 	}

common/event_modifiers/00_event_modifiers.txt CHANGED Viewed

@@ -7609,7 +7609,7 @@ head_of_the_church_aspect_modifier = {
 	yearly_absolutism = 1
 }
 anglican_aspect_aspect_modifier = {
-	yearly_absolutism = 1
+	tolerance_heretic = 1
 }
 #Parliament Events
@@ -13748,7 +13748,7 @@ expand_the_army_mod_5 = {
 }
 gov_buffed_parliament_seat = {
-	local_monthly_devastation = -0.005
+	local_monthly_devastation = -0.05
 	local_autonomy = -0.02
 }

common/event_modifiers/01_mission_modifiers.txt CHANGED Viewed

@@ -2555,13 +2555,12 @@ rus_steppe_conversion = {
 }
 rus_west_slavic_union = {	#Permanent, gets lost when either West Slavic culture gets demoted
-	manpower_in_accepted_culture_provinces = 0.1
-	num_accepted_cultures = 4
+	num_accepted_cultures = 5
 }
 rus_carpathian_union = {	#Permanent, gets lost when either Carpathian culture gets demoted
 	manpower_in_true_faith_provinces = 0.1
-	num_accepted_cultures = 4
+	num_accepted_cultures = 3
 }
 rus_south_slavic_union = {	#Permanent, gets lost when either South Slavic culture gets demoted
@@ -5475,6 +5474,9 @@ pru_german_confederation = {
 empowered_junkers = {
 	monthly_militarized_society = 0.02
+	monthly_prussian_militarized_society_1 = 0.02
+	monthly_prussian_militarized_society_2 = 0.03
+	monthly_prussian_militarized_society_3 = 0.04
 	army_tradition_decay = -0.01
 }
@@ -9647,8 +9649,7 @@ jap_20_years_devving_tax_yields_twice_bonus_1_burgher_loyalt_modifier = { } #Emp
 jap_protectors_east_catholicism = {
 	curia_powers_cost = -0.25
-	papal_influence = 2
-	religion = yes
+	papal_influence = 2
 }
 jap_shinto_warriors_modifier = {

common/government_mechanics/00_cossacks.txt CHANGED Viewed

@@ -51,21 +51,24 @@ cossacks_mechanic = {
 						save_event_target_as = source_country
 					}
 				}
-				random_owned_province = {
-					limit = {
-						OR = {
-							not = { religion = event_target:source_country }
-							AND = {
-								not = {
-									event_target:source_country = {
-										accepted_culture = prev
+				custom_tooltip = fleeing_serfs_tt
+				hidden_effect = {
+					random_owned_province = {
+						limit = {
+							OR = {
+								not = { religion = event_target:source_country }
+								AND = {
+									not = {
+										event_target:source_country = {
+											accepted_culture = prev
+										}
 									}
+									not = { culture = event_target:source_country }
 								}
-								not = { culture = event_target:source_country }
 							}
 						}
+						add_random_development = 1
 					}
-					add_random_development = 1
 				}
 				event_target:source_country = {
 					add_country_modifier = {
@@ -76,7 +79,7 @@ cossacks_mechanic = {
 			}
 			cooldown_years = 0
 			ai_chance = {
-				factor = 100
+				factor = 7
 			}
 		}
 		cossacks_ability_raiding_parties = {
@@ -95,11 +98,11 @@ cossacks_mechanic = {
 			ai_chance = {
 				factor = 1
 				modifier = {
-					factor = 20
+					factor = 10
 					is_at_war = yes
 				}
 				modifier = {
-					factor = 100
+					factor = 10
 					is_in_important_war = yes
 				}
 			}
@@ -120,27 +123,18 @@ cossacks_mechanic = {
 				create_unit_forcelimit_percentage = {
 					type = infantry
 					special_unit_category = cossacks
-					force_limit_percentage = 0.2
+					force_limit_percentage = 0.15
+				}
+				create_unit_forcelimit_percentage = {
+					type = cavalry
+					special_unit_category = cossacks
+					force_limit_percentage = 0.5
 				}
 				add_war_exhaustion = -2
 			}
 			cooldown_years = 0
 			ai_chance = {
 				factor = 1
-				modifier = {
-					factor = 100
-					needs_regiment_type = cossacks
-				}
-				modifier = {
-					factor = 100
-					is_at_war = yes
-					NOT = { army_size_percentage = 0.8 }
-				}
-				modifier = {
-					factor = 100
-					is_in_important_war = yes
-					NOT = { army_size_percentage = 1 }
-				}
 				modifier = {
 					factor = 0
 					is_at_war = no
@@ -153,6 +147,20 @@ cossacks_mechanic = {
 					factor = 0
 					is_bankrupt = yes
 				}
+				modifier = {
+					factor = 10
+					needs_regiment_type = cossacks
+				}
+				modifier = {
+					factor = 10
+					is_at_war = yes
+					NOT = { army_size_percentage = 0.8 }
+				}
+				modifier = {
+					factor = 10
+					is_in_important_war = yes
+					NOT = { army_size_percentage = 1 }
+				}
 			}
 		}
 	}

common/government_mechanics/01_feudal_theocracy.txt CHANGED Viewed

@@ -25,23 +25,6 @@ feudal_theocracy_mechanic = {
 					factor = 0
 					is_at_war = yes
 				}
-				modifier = {
-					factor = 20
-					treasury = 95
-				}
-				modifier = {
-					factor = 50
-					treasury = 300
-				}
-				modifier = {
-					factor = 50
-					NOT = {
-						has_global_modifier_value = {
-							which = build_cost
-							value = -0.1
-						}
-					}
-				}
 				modifier = {
 					factor = 0
 					NOT = {
@@ -59,6 +42,23 @@ feudal_theocracy_mechanic = {
 					NOT = { adm_power_cost = 650 }
 					NOT = { monthly_adm = 10 }
 				}
+				modifier = {
+					factor = 2
+					treasury = 95
+				}
+				modifier = {
+					factor = 5
+					treasury = 300
+				}
+				modifier = {
+					factor = 5
+					NOT = {
+						has_global_modifier_value = {
+							which = build_cost
+							value = -0.1
+						}
+					}
+				}
 			}
 		}
 		invite_minorities = {
@@ -157,22 +157,22 @@ feudal_theocracy_mechanic = {
 			}
 			cooldown_years = 0
 			ai_chance = {
-				factor = 100
-				modifier = {
-					factor = 0.1
-					is_at_war = yes
-				}
-				modifier = {
-					factor = 0.1
-					any_neighbor_country = {
-						tech_difference = 2
-					}
-				}
+				factor = 10
 				modifier = {
 					factor = 0
 					NOT = { mil_power_cost = 650 }
 					NOT = { monthly_mil = 10 }
 				}
+				modifier = {
+					factor = 0.1
+					is_at_war = yes
+				}
+				modifier = {
+					factor = 0.1
+					any_neighbor_country = {
+						tech_difference = 2
+					}
+				}
 			}
 		}
 	}

common/government_mechanics/02_iqta.txt CHANGED Viewed

@@ -77,28 +77,7 @@ iqta_mechanic = {
 			cooldown_token = iqta_mechanic
 			cooldown_desc = AN_IQTA_TAXATION_POLICY
 			ai_chance = {
-				factor = 20
-				modifier = {
-					factor = 20
-					not = { manpower_percentage = 0.3 }
-				}
-				modifier = {
-					factor = 20
-					not = { manpower_percentage = 0.2 }
-				}
-				modifier = {
-					factor = 20
-					not = { manpower_percentage = 0.1 }
-				}
-				modifier = {
-					factor = 100
-					is_in_important_war = yes
-				}
-				modifier = {
-					factor = 30
-					is_at_war = yes
-					is_in_deficit = no
-				}
+				factor = 2
 				modifier = {
 					factor = 0
 					is_at_war = no
@@ -111,6 +90,27 @@ iqta_mechanic = {
 						manpower_percentage = 0.9
 					}
 				}
+				modifier = {
+					factor = 1.5
+					not = { manpower_percentage = 0.3 }
+				}
+				modifier = {
+					factor = 1.5
+					not = { manpower_percentage = 0.2 }
+				}
+				modifier = {
+					factor = 1.5
+					not = { manpower_percentage = 0.1 }
+				}
+				modifier = {
+					factor = 10
+					is_in_important_war = yes
+				}
+				modifier = {
+					factor = 3
+					is_at_war = yes
+					is_in_deficit = no
+				}
 			}
 		}
 		lenient_taxation = {
@@ -127,7 +127,7 @@ iqta_mechanic = {
 			cooldown_token = iqta_mechanic
 			cooldown_desc = AN_IQTA_TAXATION_POLICY
 			ai_chance = {
-				factor = 10
+				factor = 5
 				modifier = {
 					factor = 0
 					NOT = {
@@ -137,19 +137,19 @@ iqta_mechanic = {
 					}
 				}
 				modifier = {
-					factor = 20
+					factor = 2
 					any_subject_country = {
 						liberty_desire = 45
 					}
 				}
 				modifier = {
-					factor = 50
+					factor = 5
 					any_subject_country = {
 						liberty_desire = 50
 					}
 				}
 				modifier = {
-					factor = 100
+					factor = 10
 					any_subject_country = {
 						liberty_desire = 60
 					}

common/government_mechanics/03_mamluk.txt CHANGED Viewed

@@ -41,7 +41,7 @@ mamluk_mechanic = {
 			}
 			cooldown_years = 1
 			ai_chance = {
-				factor = 100	#Never a reason to say no to this either
+				factor = 5	#Never a reason to say no to this either
 			}
 		}
 		sell_off_culture_slaves = {
@@ -72,21 +72,21 @@ mamluk_mechanic = {
 			}
 			cooldown_years = 1
 			ai_chance = {
-				factor = 100	#There is never a reason to say no to money
+				factor = 2	#There is never a reason to say no to money
 				modifier = {
-					factor = 20
+					factor = 2
 					num_of_loans = 1
 				}
 				modifier = {
-					factor = 20
+					factor = 2
 					num_of_loans = 3
 				}
 				modifier = {
-					factor = 20
+					factor = 2
 					num_of_loans = 5
 				}
 				modifier = {
-					factor = 20
+					factor = 2
 					num_of_loans = 7
 				}
 			}
@@ -119,17 +119,17 @@ mamluk_mechanic = {
 			}
 			cooldown_years = 1
 			ai_chance = {
-				factor = 100	#Say yes to manpower
+				factor = 2	#Say yes to manpower
 				modifier = {
-					factor = 20
+					factor = 2
 					not = { manpower_percentage = 0.3 }
 				}
 				modifier = {
-					factor = 20
+					factor = 2
 					not = { manpower_percentage = 0.2 }
 				}
 				modifier = {
-					factor = 20
+					factor = 2
 					not = { manpower_percentage = 0.1 }
 				}
 			}

common/government_mechanics/04_russian.txt CHANGED Viewed

@@ -63,13 +63,13 @@ russian_mechanic = {
 			}
 			cooldown_years = 0
 			ai_chance = {
-				factor = 10
+				factor = 1
 				modifier = {
-					factor = 100
+					factor = 10
 					average_autonomy_above_min = 20
 				}
 				modifier = {
-					factor = 100
+					factor = 10
 					average_autonomy_above_min = 10
 					has_government_power = {
 						mechanic_type = russian_mechanic
@@ -102,13 +102,13 @@ russian_mechanic = {
 			}
 			cooldown_years = 0
 			ai_chance = {
-				factor = 10
+				factor = 1
 				modifier = {
-					factor = 100
+					factor = 10
 					rebel_progress_at_least = { value = 80 }
 				}
 				modifier = {
-					factor = 100
+					factor = 10
 					rebel_progress_at_least = { value = 30 }
 					has_government_power = {
 						mechanic_type = russian_mechanic
@@ -165,13 +165,13 @@ russian_mechanic = {
 			}
 			cooldown_years = 0
 			ai_chance = {
-				factor = 10
+				factor = 1
 				modifier = {
-					factor = 100
+					factor = 10
 					is_in_important_war = yes
 				}
 				modifier = {
-					factor = 100
+					factor = 10
 					is_at_war = yes
 				}
 			}

common/government_mechanics/05_tribal_federation.txt CHANGED Viewed

@@ -10,7 +10,8 @@ tribal_federation_mechanic = {
 			max = 100
 			reset_on_new_ruler = no
 			base_monthly_growth = 0
-			development_scaled_monthly_growth = -0.25
+			development_scaled_capped_monthly_growth = -0.25
+			development_scale_cap = 1
 			scaled_modifier = {
 				modifier = {
@@ -35,9 +36,13 @@ tribal_federation_mechanic = {
 			}
 			cooldown_years = 0
 			ai_chance = {
-				factor = 10
+				factor = 1
 				modifier = {
-					factor = 100
+					factor = 0
+					is_at_war = no
+				}
+				modifier = {
+					factor = 10
 					is_in_important_war = yes
 					has_government_power = {
 						mechanic_type = tribal_federation_mechanic
@@ -46,7 +51,7 @@ tribal_federation_mechanic = {
 					}
 				}
 				modifier = {
-					factor = 20
+					factor = 2
 					not = {
 						has_leaders = {
 							value = 1
@@ -57,7 +62,7 @@ tribal_federation_mechanic = {
 					}
 				}
 				modifier = {
-					factor = 20
+					factor = 2
 					not = {
 						has_leaders = {
 							value = 2
@@ -68,7 +73,7 @@ tribal_federation_mechanic = {
 					}
 				}
 				modifier = {
-					factor = 20
+					factor = 2
 					not = {
 						has_leader_with = {
 							general = yes
@@ -83,10 +88,6 @@ tribal_federation_mechanic = {
 						total_pips = 11
 					}
 				}
-				modifier = {
-					factor = 0
-					is_at_war = no
-				}
 			}
 		}
@@ -104,24 +105,11 @@ tribal_federation_mechanic = {
 			}
 			cooldown_years = 10
 			ai_chance = {
-				factor = 100
-				modifier = {
-					factor = 100
-					is_in_important_war = yes
-					has_government_power = {
-						mechanic_type = tribal_federation_mechanic
-						power_type = tribal_allegiance
-						value = 95
-					}
-				}
+				factor = 1
 				modifier = {
 					factor = 0
 					not = { cavalry_fraction = 0.1 }
 				}
-				modifier = {
-					factor = 0.1
-					not = { cavalry_fraction = 0.2 }
-				}
 				modifier = {
 					factor = 0
 					is_at_war = no
@@ -130,6 +118,19 @@ tribal_federation_mechanic = {
 					factor = 0
 					NOT = { manpower_percentage = 0.8 }
 				}
+				modifier = {
+					factor = 10
+					is_in_important_war = yes
+					has_government_power = {
+						mechanic_type = tribal_federation_mechanic
+						power_type = tribal_allegiance
+						value = 95
+					}
+				}
+				modifier = {
+					factor = 0.1
+					not = { cavalry_fraction = 0.2 }
+				}
 			}
 		}

common/government_mechanics/06_devshirme.txt CHANGED Viewed

@@ -45,14 +45,6 @@ devshirme_mechanic = {
 			cooldown_years = 20
 			ai_chance = {
 				factor = 1
-				modifier = {
-					factor = 100
-					overextension_percentage = 0.01
-				}
-				modifier = {
-					factor = 20
-					personality = ai_militarist
-				}
 				modifier = {
 					factor = 0
 					is_at_war = no
@@ -65,7 +57,15 @@ devshirme_mechanic = {
 					}
 				}
 				modifier = {
-					factor = 15
+					factor = 10
+					overextension_percentage = 0.01
+				}
+				modifier = {
+					factor = 2
+					personality = ai_militarist
+				}
+				modifier = {
+					factor = 1.5
 					is_at_war = no
 					NOT = { overextension_percentage = 0.01 }
 					any_owned_province = {
@@ -118,27 +118,27 @@ devshirme_mechanic = {
 			}
 			cooldown_years = 20
 			ai_chance = {
-				factor = 100
+				factor = 5
 				modifier = {
-					factor = 20
+					factor = 0
+					is_at_war = no
+				}
+				modifier = {
+					factor = 2
 					not = { manpower_percentage = 0.3 }
 				}
 				modifier = {
-					factor = 20
+					factor = 2
 					not = { manpower_percentage = 0.2 }
 				}
 				modifier = {
-					factor = 20
+					factor = 2
 					not = { manpower_percentage = 0.1 }
 				}
 				modifier = {
-					factor = 100
+					factor = 10
 					is_in_important_war = yes
 				}
-				modifier = {
-					factor = 0
-					is_at_war = no
-				}
 			}
 		}
 	}

common/government_mechanics/08_perfectionism.txt CHANGED Viewed

@@ -27,21 +27,21 @@ perfectionism_mechanic = {
 			cooldown_token = perfectionism_mechanic
 			cooldown_desc = PERFECTIONISM_POLICY
 			ai_chance = {
-				factor = 20
+				factor = 10
+				modifier = {
+					factor = 0
+					NOT = { tag = KOR }
+					NOT = { personality = ai_militarist }
+				}
+				modifier = {
+					factor = 0
+					NOT = { tag = KOR }
+					is_at_war = yes
+				}
 				modifier = {
 					factor = 1000	#kinda hardcoded because Korea is expected to be isolationist
 					tag = KOR
 				}
-				modifier = {
-					factor = 0
-					NOT = { tag = KOR }
-					NOT = { personality = ai_militarist }
-				}
-				modifier = {
-					factor = 0
-					NOT = { tag = KOR }
-					is_at_war = yes
-				}
 			}
 		}
 		outward_focus = {
@@ -65,7 +65,7 @@ perfectionism_mechanic = {
 			cooldown_token = perfectionism_mechanic
 			cooldown_desc = PERFECTIONISM_POLICY
 			ai_chance = {
-				factor = 20
+				factor = 10
 				modifier = {
 					factor = 0
 					personality = ai_militarist

common/government_mechanics/09_russian_modernization.txt CHANGED Viewed

@@ -119,12 +119,8 @@ russian_rule_mechanic = {
 			ai_chance = {
 				factor = 1
 				modifier = {
-					factor = 100
-					OR = {
-						has_any_active_estate_agenda = yes
-						has_active_debate = yes
-					}
-					NOT = { personality = ai_militarist }
+					factor = 0
+					overextension_percentage = 0.01
 				}
 				modifier = {
 					factor = 0
@@ -133,14 +129,18 @@ russian_rule_mechanic = {
 					NOT = { average_autonomy_above_min = 20 }
 					personality = ai_militarist	#CCR from the passive buff > autonomy reduction
 				}
+				modifier = {
+					factor = 100
+					OR = {
+						has_any_active_estate_agenda = yes
+						has_active_debate = yes
+					}
+					NOT = { personality = ai_militarist }
+				}
 				modifier = {
 					factor = 10
 					average_autonomy_above_min = 20
 				}
-				modifier = {
-					factor = 0
-					overextension_percentage = 0.01
-				}
 			}
 		}
 		enforce_cultural_revolution = {
@@ -173,19 +173,22 @@ russian_rule_mechanic = {
 			}
 			cooldown_years = 0
 			ai_chance = {
-				factor = 0
+				factor = 10
 				modifier = {
-					factor = 100
-					has_government_power = {
-						mechanic_type = russian_rule_mechanic
-						power_type = russian_diplomatic_rule
-						value = 50
-					}
-					OR = {
-						rebel_progress_at_least = { value = 30 }
-						NOT = { has_country_modifier = cultural_revolution }
+					factor = 0
+					not = {
+						has_government_power = {
+							mechanic_type = russian_rule_mechanic
+							power_type = russian_diplomatic_rule
+							value = 50
+						}
 					}
 				}
+				modifier = {
+					factor = 0
+					not = { rebel_progress_at_least = { value = 30 } }
+					has_country_modifier = cultural_revolution
+				}
 			}
 		}
 		mobilize_new_order_regiments = {
@@ -233,9 +236,9 @@ russian_rule_mechanic = {
 			}
 			cooldown_years = 0
 			ai_chance = {
-				factor = 10
+				factor = 1
 				modifier = {
-					factor = 100
+					factor = 10
 					is_at_war = yes
 					OR = {
 						war_exhaustion = 3
@@ -243,11 +246,11 @@ russian_rule_mechanic = {
 					}
 				}
 				modifier = {
-					factor = 100
+					factor = 10
 					is_in_important_war = yes
 				}
 				modifier = {
-					factor = 100
+					factor = 10
 					is_at_war = yes
 				}
 			}

common/government_mechanics/10_hessian_militarization.txt CHANGED Viewed

@@ -51,7 +51,7 @@ hessian_militarization_mechanic = {
 				}
 			}
 			ai_chance = {
-				factor = 100
+				factor = 10
 				modifier = {
 					factor = 0
 					is_at_war = no

common/government_mechanics/12_militarization.txt CHANGED Viewed

@@ -46,16 +46,24 @@ militarization_mechanic = {
 			cooldown_years = 0
 			ai_chance = {
 				factor = 10
+				modifier = {
+					factor = 0
+					has_government_power = {
+						mechanic_type = militarization_mechanic
+						power_type = militarized_society
+						value = 90
+					}
+				}
+				modifier = {
+					factor = 0
+					neighbors_tech_discount = 0.05
+				}
+				modifier = {
+					factor = 0
+					not = { mil_power_cost = 500 }
+				}
 				modifier = {
 					factor = 10
-					not = {
-						has_government_power = {
-							mechanic_type = militarization_mechanic
-							power_type = militarized_society
-							value = 90
-						}
-					}
-					mil_power_cost = 500
 					is_at_war = yes
 				}
 			}

common/government_mechanics/13_system_of_councils.txt CHANGED Viewed

@@ -22,6 +22,9 @@ system_of_councils_mechanic = {
 			icon = GFX_system_of_councils_adm_button
 			cost_type = council_consensus
 			cost = 50
+			trigger = {
+                NOT = { has_country_modifier = royal_council_meeting_mod }
+            }
 			effect = {
 				add_country_modifier = {
 					name = royal_council_meeting_mod
@@ -40,6 +43,9 @@ system_of_councils_mechanic = {
 			icon = GFX_system_of_councils_dip_button
 			cost_type = council_consensus
 			cost = 50
+			trigger = {
+                NOT = { has_country_modifier = state_council_meeting_mod }
+            }
 			effect = {
 				add_country_modifier = {
 					name = state_council_meeting_mod
@@ -58,6 +64,9 @@ system_of_councils_mechanic = {
 			icon = GFX_system_of_councils_mil_button
 			cost_type = council_consensus
 			cost = 50
+			trigger = {
+                NOT = { has_country_modifier = war_council_meeting_mod }
+            }
 			effect = {
 				add_country_modifier = {
 					name = war_council_meeting_mod

common/government_mechanics/16_prussian_militarization.txt CHANGED Viewed

@@ -3,7 +3,12 @@ prussian_militarization_mechanic_1 = {
 	alert_icon_index = 10
 	available = {
 		has_dlc = "Domination"
-		tag = PRU
+		OR = {
+			tag = PRU
+			tag = GER
+			has_reform = prussian_monarchy
+			has_country_flag = access_to_prussian_militarization_flag #For the modders
+		}
 		NOT = { has_country_flag = enable_second_mil_level_flag }
 		NOT = { has_country_flag = enable_third_mil_level_flag }
 	}
@@ -47,17 +52,22 @@ prussian_militarization_mechanic_1 = {
 			}
 			cooldown_years = 0
 			ai_chance = {
-				factor = 0
+				factor = 10
 				modifier = {
-					factor = 10
-					not = {
-						has_government_power = {
-							mechanic_type = prussian_militarization_mechanic_1
-							power_type = prussian_militarized_society_1
-							value = 90
-						}
+					factor = 0
+					has_government_power = {
+						mechanic_type = prussian_militarization_mechanic_1
+						power_type = prussian_militarized_society_1
+						value = 90
 					}
-					mil_power = 500
+				}
+				modifier = {
+					factor = 0
+					not = { mil_power = 600 }
+				}
+				modifier = {
+					factor = 0
+					not = { mil = 4 }
 				}
 			}
 		}
@@ -69,7 +79,12 @@ prussian_militarization_mechanic_2 = {
 	alert_icon_index = 10
 	available = {
 		has_dlc = "Domination"
-		tag = PRU
+		OR = {
+			tag = PRU
+			tag = GER
+			has_reform = prussian_monarchy
+			has_country_flag = access_to_prussian_militarization_flag #For the modders
+		}
 		has_country_flag = enable_second_mil_level_flag
 	}
@@ -114,17 +129,22 @@ prussian_militarization_mechanic_2 = {
 			}
 			cooldown_years = 0
 			ai_chance = {
-				factor = 0
+				factor = 10
 				modifier = {
-					factor = 10
-					not = {
-						has_government_power = {
-							mechanic_type = prussian_militarization_mechanic_2
-							power_type = prussian_militarized_society_2
-							value = 90
-						}
+					factor = 0
+					has_government_power = {
+						mechanic_type = prussian_militarization_mechanic_2
+						power_type = prussian_militarized_society_2
+						value = 90
 					}
-					mil_power = 500
+				}
+				modifier = {
+					factor = 0
+					not = { mil_power = 600 }
+				}
+				modifier = {
+					factor = 0
+					not = { mil = 4 }
 				}
 			}
 		}
@@ -136,7 +156,12 @@ prussian_militarization_mechanic_3 = {
 	alert_icon_index = 10
 	available = {
 		has_dlc = "Domination"
-		tag = PRU
+		OR = {
+			tag = PRU
+			tag = GER
+			has_reform = prussian_monarchy
+			has_country_flag = access_to_prussian_militarization_flag #For the modders
+		}
 		has_country_flag = enable_third_mil_level_flag
 	}
@@ -182,17 +207,18 @@ prussian_militarization_mechanic_3 = {
 			}
 			cooldown_years = 5
 			ai_chance = {
-				factor = 0
+				factor = 10
 				modifier = {
-					factor = 10
-					not = {
-						has_government_power = {
-							mechanic_type = prussian_militarization_mechanic_3
-							power_type = prussian_militarized_society_3
-							value = 90
-						}
+					factor = 0
+					has_government_power = {
+						mechanic_type = prussian_militarization_mechanic_3
+						power_type = prussian_militarized_society_3
+						value = 90
 					}
-					mil_power = 500
+				}
+				modifier = {
+					factor = 0
+					not = { mil_power = 500 }
 				}
 			}
 		}
@@ -257,20 +283,25 @@ prussian_militarization_mechanic_3 = {
 				add_mil_power = -50
 			}
 			cooldown_years = 0
-			# ai_chance = {
-				# factor = 0
-				# modifier = {
-					# factor = 10
-					# not = {
-						# has_government_power = {
-							# mechanic_type = militarization_mechanic
-							# power_type = militarized_society
-							# value = 90
-						# }
-					# }
-					# mil_power = 500
-				# }
-			# }
+			ai_chance = {
+				factor = 10
+				modifier = {
+					factor = 0
+					has_government_power = {
+						mechanic_type = prussian_militarization_mechanic_3
+						power_type = prussian_militarized_society_3
+						value = 90
+					}
+				}
+				modifier = {
+					factor = 0
+					not = { mil_power = 600 }
+				}
+				modifier = {
+					factor = 0
+					not = { mil = 4 }
+				}
+			}
 		}
 	}
 }

common/government_mechanics/17_shogunate.txt CHANGED Viewed

@@ -38,9 +38,9 @@ shogunate_mechanic = {
 			}
 			cooldown_years = 10
 			ai_chance = {
-				factor = 0
+				factor = 5
 				modifier = {
-					factor = 50
+					factor = 2
 					num_subjects_of_type_with_liberty_desire = {
 						type = daimyo_vassal
 						liberty_desire = 50
@@ -49,7 +49,7 @@ shogunate_mechanic = {
 					legitimacy = 99
 				}
 				modifier = {
-					factor = 25
+					factor = 1.5
 					num_subjects_of_type_with_liberty_desire = {
 						type = daimyo_vassal
 						liberty_desire = 50
@@ -58,7 +58,7 @@ shogunate_mechanic = {
 					legitimacy = 99
 				}
 				modifier = {
-					factor = 25
+					factor = 1.5
 					num_subjects_of_type_with_liberty_desire = {
 						type = daimyo_vassal
 						liberty_desire = 50
@@ -67,7 +67,7 @@ shogunate_mechanic = {
 					legitimacy = 99
 				}
 				modifier = {
-					factor = 25
+					factor = 1.5
 					num_subjects_of_type_with_liberty_desire = {
 						type = daimyo_vassal
 						liberty_desire = 50
@@ -109,41 +109,38 @@ shogunate_mechanic = {
 			}
 			cooldown_years = 10
 			ai_chance = {
-				factor = 0
+				factor = 6
 				modifier = {
-					factor = 28
+					factor = 0
+					not = { legitimacy = 99 }
+				}
+				modifier = {
+					factor = 1.5
 					not = { diplomatic_reputation = 0 }
-					legitimacy = 99
 				}
 				modifier = {
-					factor = 8
+					factor = 1.2
 					not = { diplomatic_reputation = -0.5 }
-					legitimacy = 99
 				}
 				modifier = {
-					factor = 9
+					factor = 1.2
 					not = { diplomatic_reputation = -1 }
-					legitimacy = 99
 				}
 				modifier = {
-					factor = 10
+					factor = 1.2
 					not = { diplomatic_reputation = -1.5 }
-					legitimacy = 99
 				}
 				modifier = {
-					factor = 11
+					factor = 1.2
 					not = { diplomatic_reputation = -2 }
-					legitimacy = 99
 				}
 				modifier = {
-					factor = 12
+					factor = 1.2
 					not = { diplomatic_reputation = -2.5 }
-					legitimacy = 99
 				}
 				modifier = {
-					factor = 13
+					factor = 1.2
 					not = { diplomatic_reputation = -3 }
-					legitimacy = 99
 				}
 			}
 		}
@@ -183,36 +180,34 @@ shogunate_mechanic = {
 			}
 			cooldown_years = 10
 			ai_chance = {
-				factor = 0
+				factor = 6
 				modifier = {
-					factor = 30
+					factor = 0
+					not = { legitimacy = 99 }
+				}
+				modifier = {
+					factor = 1.5
 					not = { manpower_percentage = 0.6 }
-					legitimacy = 99
 				}
 				modifier = {
-					factor = 7.5
+					factor = 1.2
 					not = { manpower_percentage = 0.5 }
-					legitimacy = 99
 				}
 				modifier = {
-					factor = 7.5
+					factor = 1.2
 					not = { manpower_percentage = 0.4 }
-					legitimacy = 99
 				}
 				modifier = {
-					factor = 7.5
+					factor = 1.2
 					not = { manpower_percentage = 0.3 }
-					legitimacy = 99
 				}
 				modifier = {
-					factor = 7.5
+					factor = 1.2
 					not = { manpower_percentage = 0.2 }
-					legitimacy = 99
 				}
 				modifier = {
-					factor = 7.5
+					factor = 1.2
 					not = { manpower_percentage = 0.1 }
-					legitimacy = 99
 				}
 			}
 		}

common/government_mechanics/18_parliament_vs_monarchy.txt CHANGED Viewed

@@ -22,6 +22,8 @@ parliament_vs_monarchy_mechanic = {
 					global_autonomy = -0.2
 					global_unrest = 4
 				}
+				start_value = 0
+				end_value = 100
 			}
 			reverse_scaled_modifier = {
 				trigger = {
@@ -39,6 +41,8 @@ parliament_vs_monarchy_mechanic = {
 					yearly_absolutism = -1
 					global_unrest = 4
 				}
+				start_value = -100
+				end_value = 0
 			}
 			on_max_reached = {
 				custom_tooltip = parliament_vs_monarchy_mechanic_at

common/government_mechanics/readme.txt CHANGED Viewed

@@ -13,8 +13,26 @@
 #   base_monthly_growth = <float> #Defines the base amount of progress growing. At default, it is 0.
 #   development_scaled_monthly_growth = <float> #defines the amount of monthly growth you get from development scaled by Development/COUNTRY_DEVELOPMENT_SCALE (i.e. was in country_development)
 #   monarch_power = <adm/mil/dip> #specify if the power also gains from the ruler's skill value. Don't specify if you don't want this feature
-#   scaled_modifier = <conditional modifier> #optional country modifier that scales with the percentage of power. You can have n of them in the power.
-#   reverse_scaled_modifier = <conditional modifier> #optional country modifier that scales with ( 1 - percentage of power ). You can have n of them in the power.
+#   scaled_modifier = { #optional country modifier that scales with the percentage of power. You can have n of them in the power.
+#   	trigger = <trigger>
+#       modifier = <modifier>
+#       start_value = <int> #Optional, default is 0. Determines from which value modifier should start applying. I.e. if set to 5, it will scale to 0% for anything below 5. If set to a value higher than end_value it will work like a reverse_scaled_modifier
+#       end_value = <int> #Optional, default is 100. Determines to which value modifier should still be applying/scaling. I.e. if set to 90, it will scale to 100% for anything above 90. If set to a value lower than start_value it will work like a reverse_scaled_modifier
+#       extend_beyond_value = <yes/no> #Optional, default is 'yes'. Determines if a modifier should still be applying outside of the start_value - end_value range. In other words if set to 'no', if the modifier goes 'outside' 100% (it's capped at 100% still), it will set it to 0%. This way you can create independent value ranges.
+#   }
+#   reverse_scaled_modifier = { #optional country modifier that scales with ( 1 - percentage of power ). You can have n of them in the power.
+#   	trigger = <trigger>
+#       modifier = <modifier>
+#       start_value = <int> #Optional, default is 0.
+#       end_value = <int> #Optional, default is 100.
+#       extend_beyond_value = <yes/no> #Optional, default is 'yes'.
+#   }
+#   range_modifier = { #optional country modifier that doesn't scale but is applied fully when in range.
+#   	trigger = <trigger>
+#       modifier = <modifier>
+#       start_value = <int> #Optional, default is 0. Must be lower or equal to end_value
+#       end_value = <int> #Optional, default is 100. Must be bigger or equal to start_value
+#   }
 #   on_max_reached = <effect> #effect when you get to full power
 #   on_min_reached = <effect> #effect when you get to the least available power
 #   is_good = <yes/no> #is this power....desirable?

common/government_names/01_government_names.txt CHANGED Viewed

@@ -1720,9 +1720,13 @@ sisters_crusader_state = {
 	}
 	trigger = {
-		religion = catholic
-		has_reform = holy_state_reform
-		has_country_modifier = sisters_takeover
+		OR = {
+			AND = {
+				has_reform = holy_state_reform
+				has_country_modifier = sisters_takeover
+			}
+			has_reform = sisterhood_of_jeanne_darc_reform
+		}
 	}
 }

common/government_reforms/01_government_reforms_monarchies.txt CHANGED Viewed

@@ -796,6 +796,7 @@ english_monarchy = {
 			have_had_reform = english_monarchy
 			tag = ENG
 			was_tag = ENG
+			tag = GBR
 		}
 	}
 	lock_level_when_selected = yes
@@ -4327,6 +4328,7 @@ quash_noble_power_reform = {
 		nobles_influence_modifier = -0.1
 		maratha_exclusive_influence_modifier = -0.1
 		rajput_exclusive_influence_modifier = -0.1
+		#parliament_effect_duration = -2
 	}
 	ai = {
 		factor = 1
@@ -4785,6 +4787,7 @@ separation_of_boyars_from_court_reform = {
 	modifiers = {
 		yearly_government_power = 1.25
 		nobles_influence_modifier = -0.1
+		global_tax_modifier = 0.05
 		maratha_exclusive_influence_modifier = -0.1
 		rajput_exclusive_influence_modifier = -0.1
 	}
@@ -6391,6 +6394,7 @@ qng_grand_council_reform = {
 absolute_shogunate_reform = {
 	icon = "absolute_shogunate_reform"
 	allow_normal_conversion = no
+	lock_level_when_selected = yes
 	potential = {
 		OR = {
 			AND = {
@@ -6419,6 +6423,7 @@ absolute_shogunate_reform = {
 japanese_divine_empire = {
 	icon = "japanese_divine_empire"
 	allow_normal_conversion = no
+	lock_level_when_selected = yes
 	potential = {
 		OR = {
 			AND = {
@@ -6431,29 +6436,29 @@ japanese_divine_empire = {
 		}
 		NOT = { has_reform = absolute_shogunate_reform }
 	}
-	trigger = {
-		if = {
-			limit = { has_estate = estate_nobles }
-			num_of_estate_privileges = {
-				estate = estate_nobles
-				value = 6
-			}
-		}
-		if = {
-			limit = { has_estate = estate_burghers }
-			num_of_estate_privileges = {
-				estate = estate_burghers
-				value = 6
-			}
-		}
-		if = {
-			limit = { has_estate = estate_church }
-			num_of_estate_privileges = {
-				estate = estate_church
-				value = 6
-			}
-		}
-	}
+	#trigger = {
+	#	if = {
+	#		limit = { has_estate = estate_nobles }
+	#		num_of_estate_privileges = {
+	#			estate = estate_nobles
+	#			value = 6
+	#		}
+	#	}
+	#	if = {
+	#		limit = { has_estate = estate_burghers }
+	#		num_of_estate_privileges = {
+	#			estate = estate_burghers
+	#			value = 6
+	#		}
+	#	}
+	#	if = {
+	#		limit = { has_estate = estate_church }
+	#		num_of_estate_privileges = {
+	#			estate = estate_church
+	#			value = 6
+	#		}
+	#	}
+	#}
 	valid_for_nation_designer = yes
 	nation_designer_cost = 100
 	nation_designer_trigger = {

common/government_reforms/02_government_reforms_republics.txt CHANGED Viewed

@@ -1942,7 +1942,7 @@ cossacks_reform = {
 		cavalry_cost = -0.2
 		cav_to_inf_ratio = 0.25
 		governing_capacity = 50
-		special_unit_forcelimit = 0.25
+		allowed_cossack_fraction = 0.25
 	}
 	conditional = {

common/government_reforms/03_government_reforms_theocracies.txt CHANGED Viewed

@@ -874,7 +874,44 @@ bureaucratic_rule_reform = {
 		reform_progress_growth = 0.15
 		core_creation = -0.05
 		yearly_harmony = 0.1
-		harmonization_speed = -0.1
+		harmonization_speed = 0.1
+	}
+}
+# Sisterhood of Jeanne d'Arc
+sisterhood_of_jeanne_darc_reform = {
+	allow_normal_conversion = no
+	icon = "sisterhood"
+	valid_for_nation_designer = yes
+	nation_designer_trigger = {
+		religion_group = christian
+	}
+	potential = {
+		OR = {
+			has_reform = sisterhood_of_jeanne_darc_reform
+			have_had_reform = sisterhood_of_jeanne_darc_reform
+			has_country_modifier = sisters_takeover
+		}
+	}
+	trigger = {
+		religion_group = christian
+	}
+	nation_designer_cost = 100
+	modifiers = {
+		cb_on_religious_enemies = yes
+		monarch_military_power = 1
+		may_recruit_female_generals = yes
+		female_advisor_chance = 1.0
+		fire_damage = 0.1
+		discipline = 0.05
+	}
+	rulers_can_be_generals = yes
+	heirs_can_be_generals = yes
+	custom_attributes = {
+		monastic_order = yes
+	}
+	ai = {
+		factor = 10
 	}
 }

common/government_reforms/06_government_reforms_common.txt CHANGED Viewed

@@ -515,43 +515,6 @@ holy_state_reform = {
 	}
 }
-# Sisterhood of Jeanne d'Arc
-sisterhood_of_jeanne_darc_reform = {
-	allow_normal_conversion = no
-	icon = "sisterhood"
-	valid_for_nation_designer = yes
-	nation_designer_trigger = {
-		religion_group = christian
-	}
-	potential = {
-		OR = {
-			has_reform = sisterhood_of_jeanne_darc_reform
-			have_had_reform = sisterhood_of_jeanne_darc_reform
-			has_country_modifier = sisters_takeover
-		}
-	}
-	trigger = {
-		religion_group = christian
-	}
-	nation_designer_cost = 100
-	modifiers = {
-		cb_on_religious_enemies = yes
-		monarch_military_power = 1
-		may_recruit_female_generals = yes
-		female_advisor_chance = 1.0
-		fire_damage = 0.1
-		discipline = 0.05
-	}
-	rulers_can_be_generals = yes
-	heirs_can_be_generals = yes
-	custom_attributes = {
-		monastic_order = yes
-	}
-	ai = {
-		factor = 10
-	}
-}
 # State and Religion
 papal_embassy_reform = {
 	icon = "pope"
@@ -2480,7 +2443,7 @@ rajput_military_leadership_reform = {
 		rajput_loyalty_modifier = 0.1
 		rajput_influence_modifier = 0.1
 		rajput_privilege_slots = 1
-		special_unit_forcelimit = 0.1
+		allowed_rajput_fraction = 0.1
 	}
 	ai = {
@@ -2527,6 +2490,7 @@ subutais_strategies_reform = {
 		OR = {
 			culture_group = altaic
 			culture_group = tartar
+			primary_culture = altaic_new
 		}
 	}
 	trigger = {
@@ -2786,7 +2750,7 @@ ordennancas_reform = {
 	}
 	modifiers = {
 		leader_land_shock = 1
-		army_tradition_decay = -0.0005
+		army_tradition_decay = -0.005
 	}
 	custom_attributes = {
 		can_raise_manpower_from_home_region = yes

common/governments/00_governments.txt CHANGED Viewed

@@ -108,7 +108,6 @@ monarchy = {
 				courts_of_navarra
 				league_of_lezhe_reform
 				tibetan_dual_government_reform
-				sisterhood_of_jeanne_darc_reform
 			}
 		}
 		hereditary_vs_nobility = {
@@ -577,6 +576,7 @@ republic = {
 				parliamentary_republic_reform
 				absolute_shogunate_reform
 				japanese_divine_empire
+				land_christian_sun_reform
 			}
 		}
 		republican_virtues = {
@@ -1112,6 +1112,7 @@ theocracy = {
 				absolute_shogunate_reform
 				japanese_divine_empire
 				sisterhood_of_jeanne_darc_reform
+				land_christian_sun_reform
 			}
 		}
 		internal_vs_external_mission = {

common/great_projects/01_monuments.txt CHANGED Viewed

@@ -9520,6 +9520,7 @@ potosi = {
 						alliance_with = MNG
 						overlord = { alliance_with = MNG }
 						any_ally = { is_emperor_of_china = yes }
+						is_subject_of = MNG
 					}
 				}
 				MNG = {
@@ -9571,6 +9572,7 @@ potosi = {
 						alliance_with = MNG
 						overlord = { alliance_with = MNG }
 						any_ally = { is_emperor_of_china = yes }
+						is_subject_of = MNG
 					}
 				}
 				MNG = {
@@ -9622,6 +9624,7 @@ potosi = {
 						alliance_with = MNG
 						overlord = { alliance_with = MNG }
 						any_ally = { is_emperor_of_china = yes }
+						is_subject_of = MNG
 					}
 				}
 				MNG = {
@@ -10951,8 +10954,8 @@ brandenburg_gate = {
 		country_modifiers = {
 			monthly_militarized_society = 0.01
 			monthly_prussian_militarized_society_1 = 0.01
-			monthly_prussian_militarized_society_2 = 0.02
-			monthly_prussian_militarized_society_3 = 0.03
+			monthly_prussian_militarized_society_2 = 0.01
+			monthly_prussian_militarized_society_3 = 0.01
 			prestige_from_land = 0.5
 		}
 		on_upgraded = {
@@ -10974,9 +10977,9 @@ brandenburg_gate = {
 			monthly_militarized_society = 0.02
 			prestige_from_land = 1
 			army_tradition_from_battle = 0.25
-			monthly_prussian_militarized_society_1 = 0.04
-			monthly_prussian_militarized_society_2 = 0.05
-			monthly_prussian_militarized_society_3 = 0.06
+			monthly_prussian_militarized_society_1 = 0.02
+			monthly_prussian_militarized_society_2 = 0.02
+			monthly_prussian_militarized_society_3 = 0.02
 		}
 		on_upgraded = {
 		}
@@ -10997,9 +11000,9 @@ brandenburg_gate = {
 			monthly_militarized_society = 0.05
 			prestige_from_land = 1.5
 			army_tradition_from_battle = 0.5
-			monthly_prussian_militarized_society_1 = 0.07
-			monthly_prussian_militarized_society_2 = 0.08
-			monthly_prussian_militarized_society_3 = 0.09
+			monthly_prussian_militarized_society_1 = 0.05
+			monthly_prussian_militarized_society_2 = 0.05
+			monthly_prussian_militarized_society_3 = 0.05
 		}
 		conditional_modifier = {
 			trigger = { owner = { mission_completed = emp_brapru_the_balance_of_power } }

common/holy_orders/00_holy_orders.txt CHANGED Viewed

@@ -655,7 +655,7 @@ bektashi_order = {
     }
     modifier = {
         local_unrest = -1
-        production_efficiency = 0.1
+        local_production_efficiency = 0.1
     }
     ai_priority = {
         factor = 1

common/ideas/00_country_ideas.txt CHANGED Viewed

@@ -16760,22 +16760,26 @@ MSA_ideas = {
 SIA_ideas = {
     start = {
-        diplomatic_reputation = 2
-        global_manpower_modifier = 0.25
-    }
-    bonus = {
         land_morale = 0.1
+        global_manpower_modifier = 0.25
+    }
+    bonus = {
+		discipline = 0.05
     }
     trigger = {
         tag = SIA
     }
     free = yes
     sia_royal_poets = {
-        monthly_splendor = 1
+		prestige = 0.5
+		adm_advisor_cost = -0.15
+    }
+    sia_advanced_elephant_warfare = {
+		cavalry_power = 0.15
+		cavalry_fire = 1
     }
     sia_experienced_ambassadors = {
-        diplomats = 1
-        improve_relation_modifier = 0.3
+        diplomatic_reputation = 2
     }
     sia_encourage_immigration = {
         development_cost = -0.1
@@ -16786,10 +16790,7 @@ SIA_ideas = {
     }
     sia_royal_absolutism = {
         global_autonomy = -0.05
-    }
-    sia_advanced_elephant_warfare = {
-        fire_damage = 0.05
-        artillery_power = 0.05
+		yearly_absolutism = 0.5
     }
     sia_education_reform = {
         idea_cost = -0.1

common/mercenary_companies/00_mercenaries.txt CHANGED Viewed

@@ -2053,7 +2053,7 @@ merc_gascon_musket_company = {
     regiments_per_development = 0.025
     home_province = 175
     cost_modifier = 1.2
-	sprites = { dlc119_TOU_sprite_pack dlc001_amg_sprite_pack dlc049_FRA_sprite_pack dlc028_fra_sprite_pack dlc054_fra_sprite_pack fra_base_sprite_pack }
+	sprites = { dlc120_TOU_sprite_pack dlc001_amg_sprite_pack dlc049_FRA_sprite_pack dlc028_fra_sprite_pack dlc054_fra_sprite_pack fra_base_sprite_pack }
     trigger = {
 		is_allowed_to_recruit_mercenaries = yes
 		capital_scope = { superregion = europe_superregion }
@@ -2151,7 +2151,7 @@ merc_militant_order_of_saint_joan = {
 	cavalry_cap = 2
     home_province = 184
 	cost_modifier = 0.5
-	sprites = { dlc119_CHP_sprite_pack dlc001_orl_sprite_pack dlc049_FRA_sprite_pack dlc028_fra_sprite_pack dlc054_fra_sprite_pack fra_base_sprite_pack }
+	sprites = { dlc120_CHP_sprite_pack dlc001_orl_sprite_pack dlc049_FRA_sprite_pack dlc028_fra_sprite_pack dlc054_fra_sprite_pack fra_base_sprite_pack }
     trigger = {
 		is_allowed_to_recruit_mercenaries = yes
 		has_country_flag = militant_order_of_saint_joan

common/new_diplomatic_actions/00_diplomatic_actions.txt CHANGED Viewed

@@ -487,6 +487,9 @@ fabricate_ottoman_invasion_cb = {
 			type = cb_ottoman_subjugation_war
 			months = 60
 		}
+		FROM = {
+			set_country_flag = got_invasion_cb_fabricated_by_@ROOT
+		}
 	}
 	on_decline = {
 	}
@@ -527,10 +530,10 @@ reign_in_eyalet = {
 		}
 	}
 	on_accept = {
-		FROM = { grant_independence = yes }
 		create_subject = {
 			subject_type = core_eyalet
 			subject = FROM
+			keep_liberty_desire = yes
 		}
 	}
 	on_decline = {
@@ -1171,12 +1174,12 @@ dissolve_protectorate = {
 				is_subject_of = FROM
 				is_subject_of_type = trade_protectorate
 			}
-			FROM = {
-				release = ROOT
-			}
+			grant_independence = yes
 		}
 		else = {
-			release = FROM
+			FROM = {
+				grant_independence = yes
+			}
 		}
 		if = {
 			limit = {
@@ -1669,10 +1672,10 @@ grant_autonomy_to_core_eyalet = {
 		}
 	}
 	on_accept = {
-		FROM = { grant_independence = yes }
 		create_subject = {
 			subject_type = eyalet
 			subject = FROM
+			keep_liberty_desire = yes
 		}
 	}
 	on_decline = {
@@ -1711,10 +1714,10 @@ promote_vassal_to_eyalet = {
 		}
 	}
 	on_accept = {
-		FROM = { grant_independence = yes }
 		create_subject = {
 			subject_type = eyalet
 			subject = FROM
+			keep_liberty_desire = yes
 		}
 		FROM = {
 			if = {

common/on_actions/00_on_actions.txt CHANGED Viewed

@@ -1367,54 +1367,9 @@ on_diplomatic_annex = {
 # country
 on_heir_death = {
-	if = {
-		limit = { has_country_flag = heir_dip_education }
-		clr_country_flag = heir_dip_education
-	}
-	if = {
-		limit = { has_country_flag = heir_mil_education }
-		clr_country_flag = heir_mil_education
-	}
-	if = {
-		limit = { has_country_flag = heir_adm_education }
-		clr_country_flag = heir_adm_education
-	}
-	if = {
-		limit = { has_ruler_flag = well_advised_tutored_heir }
-		clr_ruler_flag = well_advised_tutored_heir
-	}
-	if = {
-		limit = { has_ruler_flag = heir_went_on_grand_tour }
-		clr_ruler_flag = heir_went_on_grand_tour
-	}
-	if = {
-		limit = { has_country_flag = albrecht_achilles_flag }
-		clr_country_flag = albrecht_achilles_flag #Death of original Albrecht Achilles
-	}
-	if = {
-		limit = { has_ruler_flag = sancaga_cikma }
-		clr_ruler_flag = sancaga_cikma
-		every_owned_province = {
-			limit = {
-				has_province_modifier = heir_in_training
-			}
-			remove_province_modifier = heir_in_training
-		}
-	}
-	if = {
-		limit = { has_ruler_flag = returned_from_sancaga_sikma_province }
-		clr_ruler_flag = returned_from_sancaga_sikma_province
-	}
+	on_heir_disinherited_or_death_effect = yes
 	ladislaus_postumus_heir_died_effect = yes
 	joan_de_trastamara_heir_died_effect = yes
-	if = {
-		limit = { primary_culture = maori }
-		country_event = { id = polynesian.26 }
-	}
-	if = {
-		limit = { has_any_heir_cult_active = yes }
-		remove_heir_cult = yes
-	}
 }
 # country
@@ -4416,10 +4371,110 @@ on_lose_great_power_status = {
 on_province_religion_converted = {
 	on_province_religion_changed_effect = yes
 	on_province_religion_converted_effect = yes
+	if = {
+		limit = {
+			owner = {
+				has_government_attribute = more_25_tax_in_true_faith_provinces
+			}
+			religion_group = owner
+			NOT = { has_province_modifier = ottoman_siyasah_tax_reform_tax }
+		}
+		add_province_modifier = {
+			name = ottoman_siyasah_tax_reform_tax
+			duration = -1
+		}
+	}
+	if = {
+		limit = {
+			OR = {
+				NOT = {
+					owner = { has_government_attribute = more_25_tax_in_true_faith_provinces }
+				}
+				NOT = { religion_group = owner }
+			}
+			has_province_modifier = ottoman_siyasah_tax_reform_tax
+		}
+		remove_province_modifier = ottoman_siyasah_tax_reform_tax
+	}
+	if = {
+		limit = {
+			owner = {
+				has_government_attribute = more_15_manpower_in_heathen_provinces
+			}
+			NOT ={ religion_group = owner }
+			NOT = { has_province_modifier = ottoman_siyasah_tax_reform_manpower }
+		}
+		add_province_modifier = {
+			name = ottoman_siyasah_tax_reform_manpower
+			duration = -1
+		}
+	}
+	if = {
+		limit = {
+			OR = {
+				NOT = {
+					owner = { has_government_attribute = more_15_manpower_in_heathen_provinces }
+				}
+				religion_group = owner
+			}
+			has_province_modifier = ottoman_siyasah_tax_reform_manpower
+		}
+		remove_province_modifier = ottoman_siyasah_tax_reform_manpower
+	}
 }
 on_province_religion_changed = {
 	on_province_religion_changed_effect = yes
+	if = {
+		limit = {
+			owner = {
+				has_government_attribute = more_25_tax_in_true_faith_provinces
+			}
+			religion_group = owner
+			NOT = { has_province_modifier = ottoman_siyasah_tax_reform_tax }
+		}
+		add_province_modifier = {
+			name = ottoman_siyasah_tax_reform_tax
+			duration = -1
+		}
+	}
+	if = {
+		limit = {
+			OR = {
+				NOT = {
+					owner = { has_government_attribute = more_25_tax_in_true_faith_provinces }
+				}
+				NOT = { religion_group = owner }
+			}
+			has_province_modifier = ottoman_siyasah_tax_reform_tax
+		}
+		remove_province_modifier = ottoman_siyasah_tax_reform_tax
+	}
+	if = {
+		limit = {
+			owner = {
+				has_government_attribute = more_15_manpower_in_heathen_provinces
+			}
+			NOT ={ religion_group = owner }
+			NOT = { has_province_modifier = ottoman_siyasah_tax_reform_manpower }
+		}
+		add_province_modifier = {
+			name = ottoman_siyasah_tax_reform_manpower
+			duration = -1
+		}
+	}
+	if = {
+		limit = {
+			OR = {
+				NOT = {
+					owner = { has_government_attribute = more_15_manpower_in_heathen_provinces }
+				}
+				religion_group = owner
+			}
+			has_province_modifier = ottoman_siyasah_tax_reform_manpower
+		}
+		remove_province_modifier = ottoman_siyasah_tax_reform_manpower
+	}
 }
 # province, manually conversion
@@ -4573,6 +4628,32 @@ on_province_owner_change = {
 		}
 		remove_province_modifier = jap_gokaido_modifier
 	}
+	if = {
+		limit = {
+			owner = {
+				has_government_attribute = more_15_manpower_in_heathen_provinces
+			}
+			NOT ={ religion_group = owner }
+			NOT = { has_province_modifier = ottoman_siyasah_tax_reform_manpower }
+		}
+		add_province_modifier = {
+			name = ottoman_siyasah_tax_reform_manpower
+			duration = -1
+		}
+	}
+	if = {
+		limit = {
+			owner = {
+				has_government_attribute = more_15_manpower_in_heathen_provinces
+			}
+			NOT ={ religion_group = owner }
+			NOT = { has_province_modifier = ottoman_siyasah_tax_reform_manpower }
+		}
+		add_province_modifier = {
+			name = ottoman_siyasah_tax_reform_manpower
+			duration = -1
+		}
+	}
 }
 # country
@@ -4679,10 +4760,13 @@ on_consecrate_patriarch = {
 		limit = {
 			owner = { has_country_flag = has_improved_consecration }
 		}
-		add_province_modifier = {
-			name = consecrated_ground
-			duration = -1
-			hidden = yes
+		every_province_in_state = {
+			limit = { has_state_patriach = yes }
+			add_province_modifier = {
+				name = consecrated_ground
+				duration = -1
+				hidden = yes
+			}
 		}
 	}
 }
@@ -5027,7 +5111,10 @@ on_dependency_lost = {
 	if = {
 		limit = {
 			has_country_modifier = tur_tatar_vanguard_modifier
-			FROM = { tag = CRI }
+			FROM = {
+				tag = CRI
+				NOT = { is_subject_of = ROOT }
+			}
 		}
 		remove_country_modifier = tur_tatar_vanguard_modifier
 	}
@@ -5201,6 +5288,17 @@ on_country_released = {
 on_trade_good_changed = {
 	on_trade_good_changed_estate_privileges_effect = yes
 	on_trade_good_changed_government_effect = yes
+	ROOT = {
+		if = {
+			limit = {
+				trade_goods = coal
+				FROM = { economic_ideas = 3 }
+				has_manufactory_trigger = yes
+				base_production = 2
+			}
+		}
+		add_base_production = -1
+	}
 }
 # this = country
@@ -5340,6 +5438,7 @@ on_conquest = {
 			owner = {
 				has_country_flag = pru_dom_hre_flag
 				NOT = { alliance_with = emperor }
+				is_emperor = no
 			}
 		}
 		owner = {
@@ -5353,9 +5452,10 @@ on_conquest = {
 		limit = {
 			is_part_of_hre = no
 			owner = { is_emperor = yes }
+			development = 25
 		}
-		owner = {
-			add_imperial_influence = 0.5
+		emperor = {
+			add_imperial_influence = 1
 		}
 	}
 }
@@ -5864,4 +5964,8 @@ on_alliance_created = { #ROOT - Alliance sender, FROM - Alliance accepter
 on_royal_marriage = { #ROOT - Marraige sender, FROM - marriage accepter
+}
+on_heir_disinherited = {
+	on_heir_disinherited_or_death_effect = yes
 }

common/opinion_modifiers/00_opinion_modifiers.txt CHANGED Viewed

@@ -1953,7 +1953,7 @@ opinion_annex_part_of_empire = {
 }
 opinion_annex_vassal = {
-	opinion = 1
+	opinion = -1
 	years = 20
 	yearly_decay = 1
 }

common/parliament_issues/01_english_parliament_actions.txt CHANGED Viewed

@@ -74,7 +74,17 @@ english_french_act_of_union = {
 		change_tag = AVE
 		hidden_effect = {
 			on_change_tag_effect = yes
-			restore_country_name = yes
+			if = {
+				limit = {
+					OR = {
+						NOT = { has_country_flag = ave_theocracy_name }
+						NOT = { has_country_flag = ave_republic_name }
+						NOT = { has_country_flag = ave_state_name }
+						NOT = { has_country_flag = ave_empire_name }
+					}
+				}
+				restore_country_name = yes
+			}
 			remove_non_electors_emperors_from_empire_effect = yes
 			if = {
 				limit = {

common/peace_treaties/00_establish_eyalet.txt CHANGED Viewed

@@ -26,7 +26,10 @@ po_establish_eyalet = {
 		always = yes
 	}
 	is_allowed = { # Defaults to equivalent of "always = yes"
-		always = yes
+		custom_trigger_tooltip = {
+			tooltip = IS_INVASION_TARGET_TT
+			# FROM = { has_country_flag = got_invasion_cb_fabricated_by_@ROOT }
+		}
 	}
 	effect = { # Defaults to empty effect (which makes error log entry but is safe)
 		create_subject = {
@@ -34,6 +37,7 @@ po_establish_eyalet = {
 			subject_type = eyalet
 		}
 		FROM = {
+			# clr_country_flag = got_invasion_cb_fabricated_by_@ROOT
 			if = {
 				limit = {
 					NOT = { has_reform = papacy_reform }
@@ -73,4 +77,4 @@ po_establish_eyalet = {
 			value = 50
 		}
 	}
-}
+}

common/peace_treaties/01_force_border_changes.txt ADDED Viewed

@@ -0,0 +1,40 @@
+# Adds a special "Force Border Changes" treaty in case that the original war target is no longer the war leader.
+#po_force_border_changes = {
+#	category = 6
+#	power_projection = humiliated_rival
+#	power_cost_base = 0.0
+#	prestige_base = 1.0 # Base factor for prestige gain and loss. Scales with war score cost.
+#	ae_base = 0.0
+#	warscore_cost = {
+#		# Which of the giver's provinces' war score costs are included and by how much. All entries default to 0. Any combination of entries can be used. Try negative values at your own risk.
+#		all_provinces = 0.0 # All the giver's provinces
+#		no_provinces = 10.0 # This is just a constant. Equivalent to a single province with with war score cost 1
+#		owner_keeps = 0.0 # The provinces that are not of any of the types below
+#		conquered = 0.0 # Provinces that are selected by a Demand Province treaty
+#		returned_core = 0.0 # Provinces that are selected by a Return Core treaty
+#		released_nation = 0.0 # Provinces that will become a part of a selected released-to-be nation
+#		cancelled_subject = 0.0 # This one should not be relevant here since Giver can't be a cancelled subject. Including anyway for completeness
+#		concede_colonial_region = 0.0 # Ditto
+#	}
+#	warscore_cap = 10 # Warscore cost will never go above this value. Only enabled if non-negative. This value defaults to -1.
+#	requires_demand_independence = yes # Whether this can be demanded by the former subject in an independence war without also demanding independence.
+#	is_make_subject = yes # This will make the treaty mutually exclusive with other treaties that makes the giver a subject, or that explicitly frees the giver from their current overlord.
+#	requires_is_allowed = yes # If set to "yes", treaty will only be visible when explicitly allowed by casus belli. If not, it will be available but cost diplomatic power.
+#
+#	is_visible = { # Defaults to equivalent of "always = yes"
+#		# FROM = { NOT = { has_country_flag = got_invasion_cb_fabricated_by_@ROOT } }
+#	}
+#	is_allowed = { # Defaults to equivalent of "always = yes"
+#		always = yes
+#	}
+#	effect = { # Defaults to empty effect (which makes error log entry but is safe)
+#		add_prestige = 20
+#		FROM = { add_prestige = -20 }
+#	}
+#	ai_weight = { # Defaults to always evaluate to 0
+#		export_to_variable = {
+#			variable_name = ai_value # Mandatory to have entry called "ai_value". Its value at the end of the ai_weight scope is what will be used
+#			value = 50
+#		}
+#	}
+#}

common/province_names/croatian_new.txt ADDED Viewed

@@ -0,0 +1,94 @@
+36 = "Estonija"
+37 = "Livonija"
+43 = "Gdanjsk"
+89 = "Pikardija"
+90 = "Brugge"
+94 = "Luksemburg"
+96 = "Zeland"
+97 = "Holandija"
+100 = "Frizija"
+101 = "Genova"
+102 = "Nica"
+104 = "Milano"
+110 = "Trident"
+111 = "Furlanija"
+112 = "Mleci"
+116 = "Firenca"
+118 = "Rim"
+121 = "Napulj"
+122 = "Apulija"
+123 = "Kalabrija"
+128 = "Celovac"
+129 = "Kranjska"
+130 = "Istra"
+132 = "shtajerska"
+134 = "Bec"
+135 = "Shopron"
+137 = "Dubrovnik"
+138 = "Crna Gora"
+140 = "Bosna"
+142 = "Krf"
+144 = "Epir"
+145 = "Moreja"
+146 = "Atina"
+147 = "Tesalija"
+148 = "Solun"
+149 = "Drinopolje"
+150 = "Trnovo"
+151 = "Carigrad"
+152 = "Varazdin"
+153 = "Peshta"
+156 = "Temishvar"
+157 = "Veliki Varadin"
+159 = "Drastar"
+160 = "Oltenija"
+161 = "Trgovishte"
+162 = "Koshice"
+163 = "Kreta"
+164 = "Cikladi"
+168 = "Normandija"
+183 = "Pariz"
+189 = "Lorena"
+261 = "Galic"
+262 = "Krakov"
+264 = "Vratislavija"
+266 = "Prag"
+267 = "Plzen"
+268 = "Moldavija"
+271 = "Samogitija"
+272 = "Litva"
+273 = "Latgalija"
+279 = "Volinj"
+280 = "Kijev"
+282 = "Jedisan"
+283 = "Zaporoshka"
+284 = "Krim"
+286 = "Azov"
+289 = "Cernjihiv"
+291 = "Harkiv"
+292 = "Mogiljov"
+297 = "Brjansk"
+299 = "Voronjez"
+301 = "Rjazan"
+302 = "Tambov"
+303 = "Saratov"
+320 = "Rod"
+321 = "Cipar"
+1318 = "Spish"
+1765 = "Sofija"
+1769 = "Gorica"
+1853 = "Kostur"
+1954 = "Vojvodina"
+2978 = "Areco"
+3000 = "Nish"
+3001 = "Skoplje"
+4173 = "Srijem"
+4174 = "Drac"
+4728 = "Pavija"
+4738 = "Trst"
+4750 = "Kroja"
+4751 = "Celje"
+4754 = "Kotor"
+4759 = "Beljak"
+1986 = "Nova Kaledonija"

common/province_names/czech_new.txt ADDED Viewed

@@ -0,0 +1,344 @@
+13 = "Slesvicko"
+40 = "Klajpeda"
+41 = "Kr�lovec"
+42 = "Varmie"
+43 = "Gdansk"
+44 = "Hamburk"
+45 = "Lubek"
+46 = "Roztoky"
+48 = "Kolobreh"
+49 = "Nov� Marka"
+52 = "Dev�n"
+55 = "Oldenburk"
+57 = "Brunsvik"
+59 = "Wittenberk"
+60 = "Budys�n"
+61 = "Dr�zdany"
+62 = "Lipsko"
+63 = "Jarobrod"
+65 = "Mnichov"
+66 = "Bamberk"
+67 = "Norimberk"
+69 = "Horn� Svabsko"
+72 = "Breisgavsko"
+73 = "Tyrolsko"
+74 = "Badensko"
+75 = "Strasburk"
+76 = "Solnohrad"
+78 = "Mohuc"
+79 = "Vircpurk"
+80 = "Trev�r"
+81 = "Hesensko"
+82 = "Vestfalsko"
+83 = "Nasavsko"
+85 = "Kol�n"
+89 = "Pikardie"
+90 = "Bruggy"
+91 = "Henegavsko"
+93 = "Lutych"
+94 = "Lucembursko"
+96 = "Zeland"
+97 = "Holandsko"
+99 = "Geldern"
+100 = "Fr�sko"
+101 = "Janov"
+110 = "Tridentsko"
+111 = "Furlansko"
+112 = "Ben�tky"
+116 = "Florencie"
+118 = "R�m"
+121 = "Neapol"
+123 = "Kal�brie"
+128 = "Korutany"
+129 = "Kransko"
+130 = "Istrie"
+131 = "Z�hreb"
+132 = "St�rsko"
+133 = "Linec"
+134 = "V�den"
+137 = "Dubrovnik"
+140 = "Bosna"
+141 = "Srbsko"
+142 = "Korfu"
+143 = "Alb�nie"
+146 = "Ath�ny"
+147 = "Thes�lie"
+148 = "Makedonie"
+149 = "Drinopol"
+151 = "Carihrad"
+152 = "Varazdin"
+154 = "Nov� Z�mky"
+158 = "Maruse"
+160 = "Oltenie"
+161 = "Trhoviste"
+163 = "Kr�ta"
+168 = "Normandie"
+174 = "Akvit�nie"
+175 = "Armanak"
+183 = "Pariz"
+184 = "Orle�n"
+188 = "Mety"
+189 = "Lotrinsko"
+192 = "Burgundsko"
+193 = "Svobodn� hrabstv�"
+201 = "Provens�lsko"
+203 = "Lyon"
+207 = "Asturie"
+209 = "Biskajsko"
+220 = "Valencie"
+227 = "Lisabon"
+236 = "Lond�n"
+253 = "Zapadn� ostrovy"
+255 = "Kalis"
+257 = "Varsava"
+259 = "Sandomer"
+261 = "Halic"
+262 = "Krakov"
+264 = "Vratislav"
+266 = "Praha"
+268 = "Mold�vie"
+269 = "Podles�"
+270 = "Troky"
+271 = "Zmud"
+272 = "Vilno"
+279 = "Volyn"
+280 = "Kyjev"
+285 = "Feodosija"
+288 = "Doln� Don"
+289 = "Cernihiv"
+291 = "Charkov"
+292 = "Mohylev"
+299 = "Voronez"
+301 = "Rjazan"
+306 = "Doln� Novgorod"
+308 = "Jaroslavl"
+320 = "Rhodos"
+321 = "Kypr"
+333 = "Bale�ry"
+334 = "Tanger"
+344 = "Marrak�s"
+358 = "Alexandrie"
+361 = "K�hira"
+365 = "Sinaj"
+366 = "Kan�ry"
+367 = "Azory"
+369 = "Orkneje"
+379 = "Jeruzal�m"
+382 = "Damasek"
+395 = "Katar"
+396 = "Bahrajn"
+400 = "Maskat"
+410 = "Bagd�d"
+419 = "Jerevan"
+481 = "Bermudy"
+482 = "Bahamy"
+487 = "Jamajka"
+492 = "Portoriko"
+493 = "Svat� Tom�s"
+494 = "Svat� Krystof"
+498 = "Martinik"
+499 = "Svat� Lucie"
+500 = "Svat� Vincent"
+522 = "Dill�"
+524 = "Stredn� Doab"
+529 = "Severn� Konkan"
+530 = "Jizn� Konkan"
+531 = "Severn� Kanara"
+546 = "Vychodn� Berar"
+548 = "Zapadn� Berar"
+556 = "Doln� Doab"
+561 = "Beng�lsk� delta"
+574 = "Andamany"
+635 = "Zapadn� Timor"
+636 = "Brunej"
+667 = "Kanton"
+668 = "Macao"
+669 = "Fu-cou"
+670 = "Kan-cou"
+671 = "Cchang-sa"
+674 = "Kuej-jang"
+676 = "Zikace"
+679 = "Ccheng-tu"
+680 = "Cchung-cching"
+681 = "I-cchang"
+683 = "Nan-cchang"
+684 = "Chang-cou"
+685 = "Jang-cou"
+686 = "An-cching"
+687 = "Nan-jang"
+688 = "Kchaj-feng"
+689 = "Chan-cung"
+690 = "Cching-cou"
+691 = "Ti-nan"
+696 = "Pao-ting"
+697 = "Ta-tchung"
+698 = "Ning-sia"
+699 = "Lan-cou"
+700 = "Si-an"
+703 = "Ccheng-te"
+708 = "Cang-jie"
+726 = "Sen-jang"
+727 = "Ajgun"
+762 = "Svat� Tom�s"
+767 = "Ortelsburk"
+770 = "Braslav"
+1020 = "Kjoto"
+1032 = "Kurily"
+1033 = "Sachalin"
+1034 = "Kamcatka"
+1059 = "V�chodn� Tunguska"
+1061 = "Z�padn� Tunguska"
+1095 = "Falklandy"
+1096 = "Kapverdy"
+1098 = "Svat� Helena"
+1099 = "Sokotra"
+1102 = "Mauricius"
+1119 = "Peprov� pobrez�"
+1126 = "Pobrez� Slonoviny"
+1139 = "Zlat� pobrez�"
+1164 = "Kamerun"
+1173 = "Nam�bie"
+1177 = "Mys"
+1195 = "Mosambik"
+1205 = "Mogadisu"
+1238 = "Salamounovy ostrovy"
+1240 = "Havaj"
+1242 = "Fidzi"
+1244 = "Gambierovy ostrovy"
+1247 = "Korsika"
+1248 = "Maledivy"
+1306 = "Svat� Tom�s"
+1724 = "Limburk"
+1744 = "Antverpy"
+1745 = "Kantabrie"
+1752 = "Rzev"
+1756 = "Besar�bie"
+1757 = "Horni Falc"
+1759 = "Postupim"
+1760 = "Koblenc"
+1761 = "Falc"
+1763 = "Dolni Luzice"
+1765 = "Sofie"
+1767 = "Slavonie"
+1768 = "Linec"
+1769 = "Gorice"
+1770 = "Rakusy"
+1771 = "Rudohori"
+1772 = "Presporok"
+1773 = "Achaja"
+1775 = "Holstynsko"
+1816 = "Peking"
+1821 = "Nanking"
+1822 = "Su-cou"
+1824 = "Wen-cou"
+1827 = "Raska"
+1828 = "Doln� Kraj"
+1833 = "Ti-an"
+1836 = "Luo-jang"
+1838 = "Che-fej"
+1840 = "Kuej-lin"
+1841 = "Malbork"
+1856 = "Abch�zie"
+1857 = "Lauenburk"
+1858 = "Stetin"
+1859 = "Chlumno"
+1863 = "Styrsky Hradec"
+1865 = "Gent"
+1868 = "Auspurk"
+1869 = "Curych"
+1870 = "Svaty Havel"
+1871 = "Valais"
+1874 = "Bremy"
+1878 = "Cachy"
+1881 = "Svat� Martin"
+1931 = "V�chodn� Fr�sko"
+1935 = "Mitava"
+1944 = "Cerkasy"
+1945 = "Severie"
+1957 = "Kalis"
+1978 = "Shetlandy"
+1979 = "Faerske ostrovy"
+1986 = "Nov� Kaledonie"
+1987 = "Spolecensk� ostrovy"
+1988 = "Velikonocn� ostrov"
+1991 = "Gilbertovy ostrovy"
+1993 = "Marshallovy ostrovy"
+1995 = "Mikron�sie"
+1998 = "V�nocn� ostrov"
+1999 = "Kokosov� ostrov"
+2002 = "Galap�gy"
+2025 = "Jizn� Georgie"
+2029 = "Jizn� Kanara"
+2060 = "Horni Doab"
+2124 = "Jarkend"
+2129 = "Changthang"
+2131 = "Chamdo"
+2137 = "Ta-ming"
+2139 = "Lan-cou"
+2140 = "Jang-cou"
+2142 = "Chuaj-an"
+2143 = "Feng-jang"
+2144 = "Fu-jang"
+2145 = "Cen-tiang"
+2147 = "Chuej-cou"
+2149 = "Ning-po"
+2150 = "Tin-chua"
+2163 = "Liou-cou"
+2164 = "Nan-nin"
+2165 = "Pchu-er"
+2167 = "Li-tiang"
+2168 = "Po-cou"
+2171 = "Siang-jang"
+2172 = "Ting-cou"
+2174 = "Cheng-jang"
+2176 = "Sang-cchiou"
+2179 = "Jen-an"
+2180 = "Tchien-suej"
+2181 = "Pching-liang"
+2184 = "Si-ning"
+2313 = "Antiochie"
+2424 = "Premysl"
+2954 = "Dzerba"
+2956 = "Strubina"
+2957 = "Rezno"
+2958 = "Ostroda"
+2959 = "Tarnov"
+2960 = "Novy Sadec"
+2961 = "Lvov"
+2962 = "Rovn�"
+2964 = "Stara Marka"
+2965 = "Fojtsko"
+2966 = "Hlohov"
+2967 = "Cheb"
+2969 = "Sternberk"
+2975 = "Kl�vsko"
+2982 = "Syrakusy"
+2995 = "Slupsk"
+4020 = "Komory"
+4124 = "Kar�lie"
+4238 = "Lehnice"
+4239 = "Belehrad"
+4708 = "Frisinky"
+4712 = "Kostnice"
+4717 = "Barout"
+4720 = "�eneva"
+4744 = "Cvikov"
+4760 = "Innsk� Bavory"
+4762 = "V�densky les"
+4765 = "Mylh�zy"
+4778 = "Zhorelec"

common/province_names/polish_new.txt ADDED Viewed

@@ -0,0 +1,198 @@
+13 = "Szlezwik"
+32 = "Prioziersk"
+33 = "Newa"
+34 = "Ingria"
+35 = "Ozylia"
+36 = "Rewal"
+37 = "Liwlandia"
+38 = "Ryga"
+39 = "Goldynga"
+41 = "Kr�lewiec"
+42 = "Warmia"
+43 = { "Gdansk" "Gdansk" }
+45 = "Lubeka"
+46 = "Roztoka"
+47 = "Strzal�w"
+48 = "Kolobrzeg"
+49 = "Santok"
+50 = "Rypin"
+52 = "Dziewin"
+53 = "Glain" # Polabian
+57 = "Brunszwik"
+58 = "Desawa"
+59 = "Biala Gora"
+60 = "Budziszyn"
+61 = "Drezno"
+62 = "Lipsk"
+63 = "Jarobr�d"
+65 = "Monachium"
+67 = "Norymberga"
+69 = "G�rna Szwabia"
+72 = "Bryzgowia"
+75 = "Strasburg"
+78 = "Moguncja"
+80 = "Trewir"
+81 = "Hesja"
+82 = "Westfalia"
+83 = "Nassawa"
+85 = "Kolonia"
+86 = "Monastyr"
+110 = "Trydent"
+128 = "Dolna Karyntia"
+129 = "Kraina"
+133 = "Linec"
+134 = "Wieden"
+151 = "Konstantynopol"
+162 = "Zemplin"
+165 = "Berno"
+262 = "Krak�w"
+263 = "Racib�rz"
+264 = "Wroclaw"
+266 = "Praga"
+267 = "Pilzno"
+268 = "Suczawa"
+270 = "Troki"
+271 = "Zmudz"
+272 = "Wilno"
+273 = "Inflanty"
+274 = "Psk�w"
+275 = "Polock"
+277 = "Brzesc"
+279 = "Wolyn"
+280 = "Kij�w"
+281 = "Podole"
+282 = "Jedysan"
+283 = "Zaporoze"
+284 = "Krym"
+285 = "Kaffa"
+286 = "Azow"
+289 = "Czernich�w"
+290 = "Poltawa"
+291 = "Chark�w"
+292 = "Mohylew"
+294 = "Twer"
+295 = "Moskwa"
+297 = "Briansk"
+299 = "Woronez"
+301 = "Riazan"
+303 = "Sarat�w"
+302 = "Tambow"
+306 = "Nizny Nowogr�d"
+307 = "Wlodzimierz"
+308 = "Jaroslaw"
+309 = "Oloniec"
+310 = "Nowogr�d"
+311 = "Cholm"
+312 = "Bieloziero"
+313 = "Archangielsk"
+314 = "Wologda"
+464 = "Astrachan"
+466 = "Saraj"
+468 = "Manycz"
+475 = "Baszkortostan"
+767 = "Szczytno"
+771 = "Witebsk"
+1079 = "Wiatka"
+1081 = "Symbirsk"
+1083 = "Wietluga"
+1177 = { "Przyladek Dobrej Nadziei" "Kapsztad" }
+1318 = "Spisz"
+1752 = "Rzew"
+1755 = "Ustiug"
+1756 = "Besarabia"
+1757 = "Gorny Palatynat"
+1758 = "Hanower"
+1759 = "Postapin"
+1760 = "Koblencja"
+1761 = "Palatynat"
+1763 = "Luzyce"
+1769 = "Gorycja"
+1771 = "Rudawy"
+1772 = "Bratyslawa"
+1772 = "Pozon"
+1775 = "Holsztyn"
+1778 = "Kasimow"
+1837 = "Dorpat"
+1841 = "Malbork"
+1842 = "Narwa"
+1858 = "Szczecin"
+1863 = "Grodziec"
+1869 = "Zurych"
+1873 = "Gryzonia"
+1874 = "Brema"
+1878 = "Akwizgran"
+1935 = "Mitawa"
+1936 = "Kowno"
+1941 = "Tur�w"
+1942 = "Zytomierz"
+1943 = "Braclaw"
+1944 = "Czerkasy"
+1945 = "Siewierszczyzna"
+1952 = "Marmarosz"
+1955 = "Cholmogory"
+1957 = "Galicz"
+1959 = "Torzok"
+1960 = "Ostr�w"
+1966 = "Czelabinsk"
+1971 = "Carycyn"
+1972 = "Udmurcja"
+1974 = "Cherson"
+2405 = "Tehinia"
+2406 = "Oczak�w"
+2407 = "Perejaslaw"
+2408 = "Lipieck"
+2409 = "Bachmut"
+2410 = "Teodoro"
+2411 = "Kudak"
+2412 = "Melitopol"
+2414 = "Tichorieck"
+2415 = "Chopior"
+2419 = "Syzran"
+2420 = "Agidel"
+2421 = "Czystopol"
+2422 = "Czeboksary"
+2424 = "Przemysl"
+2427 = "Bielojarskij"
+2444 = "Zlatoust"
+2749 = "Tichwin"
+2956 = "Strubina"
+2957 = "Ratyzbona"
+2958 = "Ostr�da"
+2959 = "Tarn�w"
+2961 = "Lw�w"
+2962 = "R�wne"
+2963 = "Naklo"
+2964 = "Hawolin"
+2966 = "Glog�w"
+2967 = "Cheb"
+2968 = "Budziejowice"
+2969 = "Lubusz"
+2970 = "Hradec"
+2993 = "Przeslaw"
+2994 = "Wologoszcz"
+2995 = "Slupsk"
+2996 = "Wyszomierz"
+2997 = "Tuchola"
+4115 = "Mozyrz"
+4117 = "Biezeck"
+4122 = "Szenkursk"
+4129 = "Stary Perm"
+4236 = "Trenczyn"
+4237 = "Olomuniec"
+4238 = "Lignica"
+4241 = "Kies"
+4243 = "Toropiec"
+4244 = "Trubczewsk"
+4245 = "Wiazma"
+4246 = "Mscislaw"
+4260 = "Wysnij Woloczok"
+4708 = "Fryzynga"
+4709 = "Pasawa"
+4712 = "Konstancja"
+4720 = "Genewa"
+4744 = "Cwik�w"
+4747 = "Drawsko"
+4759 = "G�rna Karyntia"
+4765 = "Miluza"
+4773 = "Getynga"
+4778 = "Zgorzelice"

common/province_names/schlesian_new.txt ADDED Viewed

@@ -0,0 +1,188 @@
+13 = "Szlezwik"
+32 = "Prioziersk"
+33 = "Newa"
+34 = "Ingria"
+35 = "Ozylia"
+36 = "Rewal"
+37 = "Liwlandia"
+38 = "Ryga"
+39 = "Goldynga"
+41 = "Kr�lewiec"
+42 = "Warmia"
+43 = "Gdansk"
+45 = "Lubeka"
+46 = "Roztoka"
+47 = "Strzal�w"
+48 = "Kolobrzeg"
+49 = "Santok"
+50 = "Rypin"
+52 = "Dziewin"
+57 = "Brunszwik"
+58 = "Desawa"
+59 = "Biala Gora"
+60 = "Budziszyn"
+61 = "Drezno"
+62 = "Lipsk"
+63 = "Jarobr�d"
+65 = "Monachium"
+67 = "Norymberga"
+69 = "G�rna Szwabia"
+72 = "Bryzgowia"
+75 = "Strasburg"
+78 = "Moguncja"
+80 = "Trewir"
+81 = "Hesja"
+82 = "Westfalia"
+85 = "Kolonia"
+86 = "Monastyr"
+110 = "Trydent"
+128 = "Dolna Karyntia"
+4759 = "G�rna Karyntia"
+129 = "Kraina"
+133 = "Linec"
+134 = "Wieden"
+151 = "Carogr�d"
+162 = "Zemplin"
+165 = "Berno"
+262 = "Krak�w"
+263 = "Racib�rz"
+264 = "Wroclaw"
+266 = "Praga"
+267 = "Pilzno"
+268 = "Suczawa"
+270 = "Troki"
+271 = "Zmudz"
+272 = "Wilno"
+273 = "Inflanty"
+274 = "Psk�w"
+275 = "Polock"
+277 = "Brzesc"
+279 = "Wolyn"
+280 = "Kij�w"
+281 = "Podole"
+282 = "Jedysan"
+283 = "Zaporoze"
+284 = "Krym"
+285 = "Kaffa"
+286 = "Azow"
+289 = "Czernich�w"
+290 = "Poltawa"
+291 = "Chark�w"
+292 = "Mohylew"
+294 = "Twer"
+295 = "Moskwa"
+297 = "Briansk"
+299 = "Woronez"
+301 = "Riazan"
+303 = "Sarat�w"
+302 = "Tambow"
+306 = "Nizny Nowogr�d"
+307 = "Wlodzimierz"
+308 = "Jaroslaw"
+309 = "Oloniec"
+310 = "Nowogr�d"
+311 = "Cholm"
+312 = "Bieloziero"
+313 = "Archangielsk"
+314 = "Wologda"
+464 = "Astrachan"
+466 = "Saraj"
+468 = "Manycz"
+475 = "Baszkortostan"
+767 = "Szczytno"
+771 = "Witebsk"
+1079 = "Wiatka"
+1081 = "Symbirsk"
+1083 = "Wietluga"
+1318 = "Spisz"
+1752 = "Rzew"
+1755 = "Ustiug"
+1756 = "Besarabia"
+1757 = "Gorny Palatynat"
+1758 = "Hanower"
+1759 = "Postapin"
+1760 = "Koblencja"
+1761 = "Palatynat"
+1763 = "Luzyce"
+1769 = "Gorycja"
+1771 = "Rudawy"
+1772 = "Bratyslawa"
+1772 = "Pozon"
+1775 = "Holsztyn"
+1778 = "Kasimow"
+1837 = "Dorpat"
+1841 = "Malbork"
+1842 = "Narwa"
+1858 = "Szczecin"
+1863 = "Grodziec"
+1869 = "Zurych"
+1873 = "Gryzonia"
+1874 = "Brema"
+1878 = "Akwizgran"
+1935 = "Mitawa"
+1936 = "Kowno"
+1941 = "Tur�w"
+1942 = "Zytomierz"
+1943 = "Braclaw"
+1944 = "Czerkasy"
+1945 = "Siewierszczyzna"
+1952 = "Marmarosz"
+1955 = "Cholmogory"
+1957 = "Galicz"
+1959 = "Torzok"
+1960 = "Ostr�w"
+1966 = "Czelabinsk"
+1971 = "Carycyn"
+1972 = "Udmurcja"
+1974 = "Cherson"
+2405 = "Tehinia"
+2406 = "Oczak�w"
+2407 = "Perejaslaw"
+2408 = "Lipieck"
+2409 = "Bachmut"
+2410 = "Teodoro"
+2411 = "Kudak"
+2412 = "Melitopol"
+2414 = "Tichorieck"
+2415 = "Chopior"
+2419 = "Syzran"
+2420 = "Agidel"
+2421 = "Czystopol"
+2422 = "Czeboksary"
+2424 = "Przemysl"
+2427 = "Bielojarskij"
+2444 = "Zlatoust"
+2749 = "Tichwin"
+2956 = "Strubina"
+2957 = "Ratyzbona"
+2958 = "Ostr�da"
+2959 = "Tarn�w"
+2961 = "Lw�w"
+2962 = "R�wne"
+2964 = "Hawolin"
+2966 = "Glog�w"
+2967 = "Cheb"
+2968 = "Budziejowice"
+2969 = "Lubusz"
+2970 = "Hradec"
+2993 = "Przeslaw"
+2994 = "Wologoszcz"
+2995 = "Slupsk"
+2996 = "Wyszomierz"
+2997 = "Tuchola"
+4115 = "Mozyrz"
+4117 = "Biezeck"
+4122 = "Szenkursk"
+4129 = "Stary Perm"
+4236 = "Trenczyn"
+4237 = "Olomuniec"
+4238 = "Lignica"
+4241 = "Kies"
+4243 = "Toropiec"
+4244 = "Trubczewsk"
+4245 = "Wiazma"
+4246 = "Mscislaw"
+4260 = "Wysnij Woloczok"
+4747 = "Drawsko"
+4778 = "Zgorzelice"
+4720 = "Genewa"

common/province_names/serbian_new.txt ADDED Viewed

@@ -0,0 +1,35 @@
+118 = "Rim"
+137 = "Dubrovnik"
+140 = "Bosna"
+142 = "Krf"
+143 = "Valona"
+144 = "Epir"
+145 = "Moreja"
+146 = "Atina"
+147 = "Tesalija"
+148 = "Solun"
+149 = "Jedrinje"
+150 = "Nikopolj"
+151 = "Carigrad"
+152 = "Varazdin"
+156 = "Temisvar"
+159 = "Silistra"
+160 = "Oltenija"
+161 = "Trgoviste"
+164 = "Naksos"
+320 = "Rodos"
+1765 = "Sofija"
+1767 = "Slavonija"
+1769 = "Gorica"
+1773 = "Ahaja"
+1853 = "Kostur"
+1954 = "Vojvodina"
+2978 = "Areco"
+3003 = "Evbeja"
+4173 = "Srem"
+4174 = "Drac"
+4728 = "Pavija"
+4738 = "Trst"
+4750 = "Kroja"
+4751 = "Celje"
+4754 = "Kotor"

common/province_names/slavic.txt ADDED Viewed

@@ -0,0 +1,119 @@
+19 = "Nikolaistadt"
+27 = "Abo"
+28 = "Helsingfors"
+29 = "Tammerfors"
+30 = "Vyborg"
+31 = "Sankt Michel"
+32 = "Priozersk"
+35 = "Ezel"
+37 = "Pernov"
+151 = "Tsargrad"
+162 = "Prashev"
+272 = "Vilno"
+282 = "Ochakov"
+283 = "Krivoi Rog"
+285 = "Feodosia"
+287 = "Ekaterinodar"
+288 = "Ust-Medveditskaya"
+315 = "Pechenga"
+419 = "Erivan"
+421 = "Baku"
+422 = "Kutais"
+423 = "Tiflis"
+425 = "Derbent"
+459 = "Pishpek"
+461 = "Vernyi"
+463 = "Maikop"
+465 = "Nizhny-Embinsk"
+466 = "Kamyshin"
+469 = "Guriev"
+470 = "Kalmykov"
+471 = "Aralsk"
+472 = "Aktubinsk"
+478 = "Semipalatinsk"
+479 = "Atbasarsk"
+480 = "Novosibirsk"
+716 = "Belotsarsk"
+2113 = "Port-Artur"
+2188 = "Harbin"
+1037 = "Oimakon"
+1047 = "Ayan"
+729 = "Habarovsk"
+1050 = "Nikolayev-on-Amur"
+1049 = "Blagoveshensk"
+1071 = "Tara"
+1074 = "Tobolsk"
+1078 = "Ekaterinburg"
+1080 = "Serov"
+1055 = "Verhneangarsk"
+1057 = "Verhneudinsk"
+1834 = "Uriev"
+2106 = "Vladivostok"
+1936 = "Kovno"
+1952 = "Zakarpathia"
+1962 = "Izhevsk"
+1966 = "Chelabinsk"
+1972 = "Glazov"
+1963 = "Troitsko-Pechersk"
+1970 = "Perovsk"
+1971 = "Tsaritsyn"
+1974 = "Cherson"
+2125 = "Przhevalsk"
+2126 = "Naryn"
+2195 = "Novorissiysk"
+2196 = "Batum"
+2197 = "Pyatigorsk"
+2198 = "Grozny"
+2199 = "Petrovsk"
+2201 = "Vladikavkaz"
+2203 = "Elisavetpol"
+2349 = "Krasnovodsk"
+2350 = "Ashabad"
+2351 = "Irghiz"
+2352 = "Kazalinsk"
+2354 = "Akmolinsk"
+2355 = "Sergiopol"
+2356 = "Chimkent"
+2357 = "Kokchetav"
+2359 = "Kiyinsk"
+2360 = "Karkaralinsk"
+2361 = "Golodnaya steppe"
+2364 = "Fergana"
+2365 = "Aleksandrov-gay"
+2366 = "Ilets"
+2367 = "Glinanskaya"
+2369 = "Kustanay"
+2370 = "Kungrad"
+2406 = "Nikolaev"
+2409 = "Vyoshenskaya"
+2410 = "Sevastopol"
+2411 = "Ekaterinoslav"
+2412 = "Mariupol"
+2413 = "Novocherkassk"
+2414 = "Tichoretsk"
+2415 = "Atkarsk"
+2416 = "Stavropol"
+2417 = "Elista"
+2418 = "Pokrovsk"
+2419 = "Syzran"
+2420 = "Orenburg"
+2421 = "Berezhnye"
+2422 = "Cheboksary"
+2427 = "Beloyarskiy"
+2429 = "Variegansk"
+2430 = "Troitskiy"
+2431 = "Uchaminskiy"
+2432 = "Yeniseysk"
+2433 = "Kemerovo"
+2435 = "Olyokminsk"
+2436 = "Vanavara"
+2437 = "Vilyisk"
+2438 = "Zhigansk"
+2442 = "Kirensk"
+2443 = "Krasnoyarsk"
+2444 = "Zlatoust"
+2446 = "Chita"
+2447 = "Taman"
+4687 = "Koryakovsky"
+4689 = "Omsk"
+4691 = "Ob"

common/province_names/slovak_new.txt ADDED Viewed

@@ -0,0 +1,94 @@
+1772 = { "Pre�porok" "Pre�porok" }
+154 = { "Nitra" "Nitra" }
+4236 = { "Trenc�n" "Trenc�n" }
+1318 = { "Spi�" "Levoca" }
+162 = { "Zempl�n" "Ko�ice" }
+1952 = { "Podkarpatie" "Chust" }
+135 = { "�opron" "�opron" }
+4240 = { "Stolicn� Belehrad" "Stolicn� Belehrad" }
+153 = { "Pe�tbud�n" "Pe�tbud�n" }
+1864 = { "P�tkostolie" "P�tkostolie" }
+4125 = { "Soln�k" "Soln�k" }
+1953 = { "Debrec�n" "Debrec�n" }
+155 = { "B�ke�" "B�ke�" }
+4126 = { "B�c" "B�c" }
+1954 = { "Vojvodina" "Velk� Beckerek" }
+4173 = { "Sriem" "Sriemska Mitrovica" }
+4953 = { "Bystrica" "Bystrica" }
+158 = { "Maru�a" "Maru�sk� Trhovi�te" }
+1951 = { "Balhrad" "Balhrad" }
+4127 = { "Klu�" "Klu�" }
+4128 = { "Sibin" "Sibin" }
+157 = { "Velk� Varad�n" "Velk� Varad�n" }
+156 = { "Teme�v�r" "Teme�v�r" }
+4239 = { "Belehrad" "Belehrad" }
+4954 = { "Satm�r" "Satm�r" }
+264 = { "Vratislav" "Vratislav" }
+4759 = { "Horn� Korut�nsko" "Biel�k" }
+128 = { "Doln� Korut�nsko" "Celovec" }
+133 = { "Linec" "Linec" }
+134 = { "Vieden" "Vieden" }
+1770 = { "Krem�a" "Krem�a" }
+4762 = { "Sv�t� Hypolit" "Sv�t� Hypolit" }
+1863 = { "�tajersk� Hradec" "�tajersk� Hradec" }
+2960 = { "Nov� Sonc" "Nov� Sonc" }
+262 = { "Krakov" "Krakov" }
+263 = { "Ratibor" "Ratibor" }
+4238 = { "Lehnica" "Lehnica" }
+2966 = { "Hlohov" "Hlohov" }
+4778 = { "Zhorelec" "Zhorelec" }
+60 = { "Budys�n" "Budys�n" }
+1763 = { "Chotebuz" "Chotebuz" }
+2959 = { "Tarnov" "Tarnov" }
+2424 = { "Premysl" "Premysl" }
+4541 = { "Drohobyc" "Drohobyc" }
+2961 = { "Lvov" "Lvov" }
+261 = { "Halic" "Halic" }
+1767 = { "Slav�nsko" "Osijek" }
+4756 = { "Belovar" "Belovar" }
+152 = { "Varazd�n" "Varazd�n" }
+131 = { "Z�hreb" "Z�hreb" }
+4752 = { "Rijeka" "Rijeka" }
+1826 = { "Lika" "Gospic" }
+4753 = { "Zadar" "Zadar" }
+136 = { "Split" "Split" }
+137 = { "Dubrovn�k" "Dubrovn�k" }
+129 = { "Kransko" "Lublana" }
+4751 = { "Celje" "Celje" }
+4738 = { "Terst" "Terst" }
+1769 = { "Gorica" "Gorica" }
+4725 = { "Vysocina" "Jihlava" }
+266 = { "Praha" "Praha" }
+1771 = { "Litomerice" "Litomerice" }
+2967 = { "Cheb" "Cheb" }
+132 = "�tajersko"
+4761 = "Travensko"
+76 = { "Solnohrad" "Solnohrad" }
+259 = { "Sandomier" "Sandomier" }
+4533 = { "Vielun" "Vielun" }
+258 = { "Syr�dia" "Syr�dia" }
+255 = { "Kali�" "Kali�" }
+1939 = { "Lecyca" "Lecyca" }
+4526 = { "Hnezdno" "Hnezdno" }
+4528 = { "Kujavy" "Kujavy" }
+1938 = { "Lomza" "Lomza" }
+4525 = { "R�va" "R�va" }
+257 = { "Var�ava" "Var�ava" }
+4523 = { "Inovratislav" "Inovratislav" }
+1859 = { "Chlemno" "Chlemno" }
+43 = { "Gdansk" "Gdansk" }
+41 = { "Kr�lovec" "Kr�lovec" }
+42 = { "Varmia" "Olyst�n" }
+767 = { "Scytno" "Scytno" }
+2958 = { "Ostr�da" "Ostr�da" }
+1841 = { "Malbork" "Malbork" }
+49 = { "Horov" "Horov" }
+2995 = { "Stlp" "Stlp" }
+48 = { "Kolobreh" "Kolobreh" }
+4747 = { "Dr�vsko" "Dr�vsko" }
+2969 = { "Tozim" "Tozim" }
+1858 = { "Stet�n" "Stet�n" }
+2994 = { "Volohost" "Volohost" }
+47 = { "Strela" "Strela" }
+4745 = { "Rujana" "Rujana" }
+50 = { "Berl�n" "Berl�n" }

common/province_names/slovene_new.txt ADDED Viewed

@@ -0,0 +1,34 @@
+111 = "Furlanija"	# Friuli
+112 = "Benetke"		# Venezia
+114 = "Ravena"		# Ravenna
+118 = "Rim"			# Roma
+120 = "Abruci"		# Abruzzi
+128 = "Celovec"		# Klagenfurt
+129 = "Kranjska"	# Krain
+130 = "Istra"		# Istria
+131 = "Zagreb"		# Zagreb
+132 = "Stajerska"	# Steiermark
+133 = "Linec"		# Linz
+134 = "Dunaj"		# Wien
+142 = "Krf"			# Corfu
+146 = "Atene"		# Athens
+148 = "Solun"		# Salonik
+149 = "Adrianopel"	# Edirne/Adrianople
+153 = "Pesta"		# Pest
+1768 = "Lijents"	# Lienz
+1769 = "Gorica"		# Gorz
+1772 = "Bratislava"	# Pozsony/Pressburg
+1773 = "Ahaja"		# Achaea
+1774 = "Trbiz"		# Treviso
+1863 = "Gradec"		# Graz
+1864 = "Somodska"	# Somogy
+4126 = "Bac"		# Bacs
+4174 = "Drac"		# Durres
+4239 = "Beograd"	# Nandorfehervar
+4701 = "Korint"		# Corinth
+4733 = "Molize"		# Molise
+4738 = "Trst"		# Trieste
+4751 = "Celje"		# Cilli
+4752 = "Reka"		# Rijeka
+4753 = "Zadar"		# Zadar
+4759 = "Beljak"		# Villach

common/province_names/sorbian_new.txt ADDED Viewed

	@@ -0,0 +1 @@
1	+ 4778 = "Zhorjelc"

common/rebel_types/anti_tax.txt CHANGED Viewed

@@ -164,6 +164,12 @@ anti_tax_rebels = {
 			remove_country_modifier = isolate_rebels
 			add_prestige = -50
 		}
+		if = {
+			limit = { has_disaster = castilian_civil_war }
+			set_country_flag = cas_civil_war_rebels_won
+			country_event = { id = castilian_civil_war.100 }
+			end_disaster = castilian_civil_war
+		}
 		if = {
 			limit = {
 				OR = {

common/religions/00_religion.txt CHANGED Viewed

@@ -424,6 +424,7 @@ christian = {
 			justified_religious_war_aspect
 			war_preaches_aspect
 			head_of_the_church_aspect
+			anglican_aspect
 		}
 		aspects_name = PROTESTANT_ASPECTS

common/revolution/00_revolution.txt CHANGED Viewed

@@ -198,7 +198,7 @@ revolution = {
 	# Values at 100 Revolutionary Zeal
 	zeal_modifiers = {
 		administrative_efficiency = 0.3
-		special_unit_forcelimit = 0.2
+		allowed_rev_guard_fraction = 0.2
 		discipline = 0.05
 	}
 }

common/scripted_effects/01_scripted_effects_for_on_actions.txt CHANGED Viewed

@@ -1926,6 +1926,10 @@ on_battle_won_country_effect = {
 			ROOT = { has_government_attribute = manpower_from_defeating_armies }
 		}
 		ROOT = {
+			set_variable = {
+				which = land_units_killed_var
+				which = land_units_killed
+			}
 			multiply_variable = {
 				which = land_units_killed_var
 				value = 0.1
@@ -2155,6 +2159,7 @@ on_culture_demoted_effect = {
 				NOT = { accepted_culture = sorbian }
 				NOT = { accepted_culture = schlesian }
 				NOT = { accepted_culture = polish }
+				NOT = { accepted_culture = slovak }
 			}
 		}
 		remove_country_modifier = rus_west_slavic_union
@@ -2165,7 +2170,6 @@ on_culture_demoted_effect = {
 			OR = {
 				NOT = { accepted_culture = hungarian }
 				NOT = { accepted_culture = romanian }
-				NOT = { accepted_culture = slovak }
 				NOT = { accepted_culture = transylvanian }
 			}
 		}
@@ -3374,4 +3378,52 @@ on_seize_land_effect = {
 			}
 		}
 	}
+}
+on_heir_disinherited_or_death_effect = {
+	if = {
+		limit = { has_country_flag = heir_dip_education }
+		clr_country_flag = heir_dip_education
+	}
+	if = {
+		limit = { has_country_flag = heir_mil_education }
+		clr_country_flag = heir_mil_education
+	}
+	if = {
+		limit = { has_country_flag = heir_adm_education }
+		clr_country_flag = heir_adm_education
+	}
+	if = {
+		limit = { has_ruler_flag = well_advised_tutored_heir }
+		clr_ruler_flag = well_advised_tutored_heir
+	}
+	if = {
+		limit = { has_ruler_flag = heir_went_on_grand_tour }
+		clr_ruler_flag = heir_went_on_grand_tour
+	}
+	if = {
+		limit = { has_country_flag = albrecht_achilles_flag }
+		clr_country_flag = albrecht_achilles_flag #Death of original Albrecht Achilles
+	}
+	if = {
+		limit = { has_ruler_flag = sancaga_cikma }
+		clr_ruler_flag = sancaga_cikma
+		every_owned_province = {
+			limit = {
+				has_province_modifier = heir_in_training
+			}
+			remove_province_modifier = heir_in_training
+		}
+	}
+	if = {
+		limit = { has_ruler_flag = returned_from_sancaga_sikma_province }
+		clr_ruler_flag = returned_from_sancaga_sikma_province
+	}
+	if = {
+		limit = { primary_culture = maori }
+		country_event = { id = polynesian.26 }
+	}
+	if = {
+		limit = { has_any_heir_cult_active = yes }
+		remove_heir_cult = yes
+	}
 }

common/scripted_triggers/00_scripted_triggers_FR.txt CHANGED Viewed

@@ -2700,19 +2700,19 @@ frloc_ruler_fem_vow_1043_gov_religious_order_COMMANDER_EMPRESS = { # "Imp
 	AND = { government_rank = 3 OR = { has_reform = monastic_order_reform AND = { government = theocracy tag = KOJ } } }
 }
 frloc_ruler_masc_cons_1044_sisters_crusader_state_GRAND_MASTER = { # "Grand ma�tre"
-	AND = { OR = { government_rank = 1 government_rank = 2 } NOT = { government_rank = 3 } religion = catholic has_reform = holy_state_reform has_country_modifier = sisters_takeover }
+	AND = { OR = { government_rank = 1 government_rank = 2 } NOT = { government_rank = 3 } OR = { AND = { has_reform = holy_state_reform has_country_modifier = sisters_takeover } has_reform = sisterhood_of_jeanne_darc_reform } }
 }
 frloc_ruler_masc_vow_1044_sisters_crusader_state_COMMANDER_EMPEROR = { # "Empereur-commandeur"
-	AND = { government_rank = 3 religion = catholic has_reform = holy_state_reform has_country_modifier = sisters_takeover }
+	AND = { government_rank = 3 OR = { AND = { has_reform = holy_state_reform has_country_modifier = sisters_takeover } has_reform = sisterhood_of_jeanne_darc_reform } }
 }
 frloc_ruler_fem_vow_1044_sisters_crusader_state_ABBESS = { # "Abbesse"
-	AND = { government_rank = 1 NOT = { OR = { government_rank = 2 government_rank = 3 } } religion = catholic has_reform = holy_state_reform has_country_modifier = sisters_takeover }
+	AND = { government_rank = 1 NOT = { OR = { government_rank = 2 government_rank = 3 } } OR = { AND = { has_reform = holy_state_reform has_country_modifier = sisters_takeover } has_reform = sisterhood_of_jeanne_darc_reform } }
 }
 frloc_ruler_fem_cons_1044_sisters_crusader_state_MOTHER_SUPERIOR = { # "M�re sup�rieure"
-	AND = { government_rank = 2 NOT = { government_rank = 3 } religion = catholic has_reform = holy_state_reform has_country_modifier = sisters_takeover }
+	AND = { government_rank = 2 NOT = { government_rank = 3 } OR = { AND = { has_reform = holy_state_reform has_country_modifier = sisters_takeover } has_reform = sisterhood_of_jeanne_darc_reform } }
 }
 frloc_ruler_fem_cons_1044_sisters_crusader_state_GRAND_MISTRESS = { # "Grande ma�tresse"
-	AND = { government_rank = 3 religion = catholic has_reform = holy_state_reform has_country_modifier = sisters_takeover }
+	AND = { government_rank = 3 OR = { AND = { has_reform = holy_state_reform has_country_modifier = sisters_takeover } has_reform = sisterhood_of_jeanne_darc_reform } }
 }
 frloc_ruler_masc_cons_1045_gov_jarldom_JARL = { # "Jarl"
 	AND = { government_rank = 1 NOT = { OR = { government_rank = 2 government_rank = 3 } } government = monarchy OR = { religion = norse_pagan_reformed culture = norse } }
@@ -3709,10 +3709,10 @@ frloc_heir_fem_vow_1043_gov_religious_order_HEIR_fem = { # "H
 	AND = { OR = { government_rank = 1 government_rank = 2 government_rank = 3 } OR = { has_reform = monastic_order_reform AND = { government = theocracy tag = KOJ } } }
 }
 frloc_heir_masc_vow_1044_sisters_crusader_state_HEIR = { # "H�ritier"
-	AND = { OR = { government_rank = 1 government_rank = 2 government_rank = 3 } religion = catholic has_reform = holy_state_reform has_country_modifier = sisters_takeover }
+	AND = { OR = { government_rank = 1 government_rank = 2 government_rank = 3 } OR = { AND = { has_reform = holy_state_reform has_country_modifier = sisters_takeover } has_reform = sisterhood_of_jeanne_darc_reform } }
 }
 frloc_heir_fem_vow_1044_sisters_crusader_state_HEIR_fem = { # "H�riti�re"
-	AND = { OR = { government_rank = 1 government_rank = 2 government_rank = 3 } religion = catholic has_reform = holy_state_reform has_country_modifier = sisters_takeover }
+	AND = { OR = { government_rank = 1 government_rank = 2 government_rank = 3 } OR = { AND = { has_reform = holy_state_reform has_country_modifier = sisters_takeover } has_reform = sisterhood_of_jeanne_darc_reform } }
 }
 frloc_heir_masc_vow_1045_gov_jarldom_HEIR = { # "H�ritier"
 	AND = { OR = { government_rank = 1 government_rank = 2 government_rank = 3 } government = monarchy OR = { religion = norse_pagan_reformed culture = norse } }

common/scripted_triggers/00_scripted_triggers_estates.txt CHANGED Viewed

@@ -51,6 +51,8 @@ has_exempt_from_seize_land_for_estate_nobles = {
 		has_estate_privilege = estate_nobles_nobles_instead_of_royal_court
 		#England's starting privilege
 		has_estate_privilege = estate_nobles_english_villeinage
+		#Prussia's privilege
+		has_estate_privilege = estate_nobles_consolidated_noble_contracts
 	}
 }
 has_exempt_from_seize_land_for_estate_brahmins = {
@@ -87,7 +89,8 @@ has_exempt_from_seize_land_for_estate_maratha = {
 	}
 }
 has_exempt_from_seize_land_for_estate_nomadic_tribes = {
-	has_estate_privilege = estate_nomadic_tribes_autonomy_of_the_tribes
+	#has_estate_privilege = estate_nomadic_tribes_autonomy_of_the_tribes
+	always = no
 }
 has_exempt_from_seize_land_for_estate_rajput = {
 	has_estate_privilege = estate_rajput_rajput_regiments

common/subject_types/00_subject_types.txt CHANGED Viewed

@@ -63,13 +63,13 @@ default = {
 	transfer_trade_if_merchant_republic = no
 	joins_overlords_wars = yes
 	can_be_co_belligerented =  no    #Enemies can force this subject to join its overlord into the defense war. Only used when the subject has the "joins_overlords_wars = no". By default it's "no".
-	can_be_called_to_wars =  no    #Overlord can ask subject to join wars like it could ask allies to join. You would require favors  to call them to wars. Only used when the subject has the "joins_overlords_wars = no". By default it's "no"
+	must_accept_cta_from_overlord =  no    #Overlord can ask subject to join wars like it could ask allies to join. You would require favors  to call them to wars. Only used when the subject has the "joins_overlords_wars = no". By default it's "no"
 	favors_cost_to_join_offensive_wars = 0   #Defines how much favors the overlord need to invest to call the subject into an offensive war
 	favors_cost_to_join_defensive_wars = 0   #Defines how much favors the overlord need to invest to call the subject into a defensive war
 	opinion_cost_to_join_offensive_wars = 0   #Defines how much opinion the subject loses of the overlord to call the subject into an offensive war. Applied if you do not have Leviathan
 	opinion_cost_to_join_defensive_wars = 0   #Defines how much opinion the subject loses of the overlord to call the subject into a defensive war. Applied if you do not have Leviathan
 	opinion_cost_instead_of_favors_cost = no   #Determines if the subject requires favors or opinion to join a the war. If set "yes" then it requires the aforementioned opinion costs - regardless if Leviathan is active or not. "No" is the default setting
-	opinion_on_subject_integration = -30 #Determines how much opinion they actually lose when a fellow subject gets integrated.
+	opinion_on_subject_integration = 30 #Determines how much opinion they actually lose when a fellow subject gets integrated.
 	joins_colonial_wars = no
 	can_be_integrated = no
 	can_release_and_play = no							# "Release Colony" in SubjectView
@@ -461,6 +461,14 @@ appanage = {
 	modifier_subject = {
 		modifier = appanage_subject
 	}
+	modifier_subject = {
+		modifier = subject_tax_modifier
+		trigger = {
+			overlord = {
+				has_government_attribute = subject_tax_modifier_25
+			}
+		}
+	}
 	modifier_overlord = {
 		modifier = appanage_overlord
 	}
@@ -897,15 +905,16 @@ eyalet = {
 	gets_help_with_rebels = yes
 	forms_trade_companies = no
 	takes_diplo_slot = no
-	can_be_co_belligerented = yes
-	can_be_called_to_wars = yes
 	extend_trading_range = yes
-	opinion_cost_instead_of_favors_cost = yes
-	opinion_cost_to_join_offensive_wars = 40
-	opinion_cost_to_join_defensive_wars = 20
-	opinion_on_subject_integration = 0
 	counts_for_borders = yes
 	max_government_rank = 2
+	can_be_co_belligerented = yes
+	must_accept_cta_from_overlord = yes
+	favors_cost_to_join_offensive_wars = 20   #Defines how much favors the overlord need to invest to call the subject into an offensive war
+	favors_cost_to_join_defensive_wars = 10   #Defines how much favors the overlord need to invest to call the subject into a defensive war
+	opinion_cost_to_join_offensive_wars = 40   #Defines how much opinion the subject loses of the overlord to call the subject into an offensive war. Applied if you do not have Leviathan
+	opinion_cost_to_join_defensive_wars = 20   #Defines how much opinion the subject loses of the overlord to call the subject into a defensive war. Applied if you do not have Leviathan
+	opinion_on_subject_integration = 0
 	liberty_desire_development_ratio = 0.1
 	liberty_desire_same_dynasty = -5.0
@@ -977,7 +986,7 @@ core_eyalet = {
 	manpower_to_overlord = 0.33							# Percent of subject FL to use as base for modifiers
 	sailors_to_overlord = 0.33							# Percent of subject FL to use as base for modifiers
 	annex_cost_per_development = 6.0					# annex/integrate cost per development
+	must_accept_cta_from_overlord = no
 	relative_power_class = 2
 	should_quit_wars_on_activation = yes
@@ -1146,7 +1155,7 @@ trade_protectorate = {
 	joins_overlords_wars = no
 	joins_colonial_wars = no
 	can_be_co_belligerented = yes    #Enemies can force this subject to join its overlord into the defense war. Only used when the subject has the "joins_overlords_wars = no". By default it's "no".
-	can_be_called_to_wars = yes    #Overlord can ask subject to join wars like it could ask allies to join. You would require favors  to call them to wars. Only used when the subject has the "joins_overlords_wars = no". By default it's "no"
+	must_accept_cta_from_overlord = yes    #Overlord can ask subject to join wars like it could ask allies to join. You would require favors  to call them to wars. Only used when the subject has the "joins_overlords_wars = no". By default it's "no"
 	opinion_cost_to_join_offensive_wars = 100   #Defines how much opinion the subject loses of the overlord to call the subject into an offensive war. Applied if you do not have Leviathan
 	opinion_cost_to_join_defensive_wars = 50   #Defines how much opinion the subject loses of the overlord to call the subject into a defensive war. Applied if you do not have Leviathan
 	opinion_cost_instead_of_favors_cost = yes   #Determines if the subject requires favors or opinion to join a the war. If set "yes" then it requires the aforementioned opinion costs - regardless if Leviathan is active or not. "No" is the default setting

common/wargoal_types/00_wargoal_types.txt CHANGED Viewed

@@ -2871,11 +2871,13 @@ take_capital_eyalet_war = {
 		required_treaty_to_take_provinces = {
 			po_establish_eyalet
+			#po_force_border_changes
 		}
 		peace_options = {
 			po_demand_provinces
 			po_establish_eyalet
+			#po_force_border_changes
 		}
 	}