Merge branch 'main' of https://gitlab.com/new-era-team/N3OW

common/buildings/NEOW_special_buildings.txt

@@ -1367,6 +1367,8 @@ statue_isildur_01 = {
 		alw ays = yes
 	}
 
+	constrcution_time = very_slow_construction_time
+
 	cost = {
 		gold = 1000
 	}
@@ -1374,7 +1376,7 @@ statue_isildur_01 = {
 	character_modifier = {
 		glory_hound_opinion = 5
 		glory_hound_tax_contribution_mult = 0.05
-		monthly_dynasty_prestige_mult = 0.05
+		monthly_dynasty_prestige_mult = 0.1
 		monthly_prestige_gain_mult = 0.2
 	}
 
@@ -1384,7 +1386,7 @@ statue_isildur_01 = {
 
 	province_modifier = {
 		stationed_maa_damage_add = 20
-		stationed_maa_damage_mult = 0.1
+		stationed_maa_damage_mult = 0.15
 	}
 
 	ai_value = {
@@ -1399,3 +1401,546 @@ statue_isildur_01 = {
 
 	flag = travel_point_of_interest_martial
 }
+
+##########
+# Fourvière - historic core of the city of Lyon
+##########
+
+fourviere_01 = {
+
+	constrcution_time = very_slow_construction_time
+
+	type_icon = "icon_structure_jvari_monastery.dds"
+
+	can_construct_potential = {
+		building_requirement_tribal = no
+	}
+
+	cost_gold = 500
+
+	county_holder_character_modifier = {
+		monthly_piety = 0.25
+		monthly_prestige = 0.25
+	}
+
+	county_modifier = {
+		development_growth = 0.2
+		development_growth_factor = 0.2
+		tax_mult = 0.25
+	}
+
+	province_modifier = {
+		monthly_income = 1
+	}
+
+	ai_value = {
+		base = 100
+		modifier = { # Fill all building slots before going for special buildings
+			factor = 0
+			free_building_slots > 0
+		}
+	}
+
+	type = special
+
+	flag = travel_point_of_interest_learning
+}
+
+##########
+# Capitole de Toulouse - administrative center of Southern France
+##########
+
+capitole_toulouse_01 = {
+
+	construction_time = very_slow_construction_time
+
+	type_icon = "icon_structure_palace_of_achen.dds"
+
+	can_construct_potential = {
+		building_requirement_tribal = no
+	}
+
+	effect_desc = feast_cost_discount_max_desc
+
+	cost_gold = 1000
+
+	county_holder_character_modifier = {
+		diplomacy_per_prestige_level = 1
+		monthly_prestige = 0.35
+		legitimacy_gain_mult = 0.05
+	}
+
+	county_modifier = {
+		tax_mult = 0.15
+		development_growth = 0.15
+		development_growth_factor = 0.20
+	}
+
+	province_modifier = {
+		monthly_income = 1.50
+		garrison_size = 0.15
+	}
+
+	ai_value = {
+		base = 100
+		ai_general_building_modifier = yes
+		modifier = { # Fill all building slots before going for special buildings
+			factor = 0
+			free_building_slots > 0
+		}
+	}
+	type = special
+
+	flag = travel_point_of_interest_diplomatic
+}
+
+##########
+# Château de Bretagne - center of Britanny ; post event
+##########
+
+chateau_bretagne_01 = {
+
+	constrcution_time = very_slow_construction_time
+
+	type_icon = "icon_building_leisure_palace.dds"
+
+	can_construct_potential = {
+		building_requirement_tribal = no
+	}
+
+	effect_desc = feast_cost_discount_max_desc
+
+	cost_gold = 500
+
+	county_holder_character_modifier = {
+		monthly_dynasty_prestige_mult = 0.05
+		monthly_prestige_gain_mult = 0.05
+	}
+
+	county_modifier = {
+		tax_mult = 0.10
+		development_growth = 0.10
+		development_growth_factor = 0.15
+	}
+
+	province_modifier = {
+		monthly_income = 1
+	}
+
+	next_building = chateau_bretagne_02
+
+	ai_value = {
+		base = 100
+		modifier = { # Fill all building slots before going for special buildings
+			factor = 0
+			free_building_slots > 0
+		}
+	}
+
+	type = special
+
+	flag = travel_point_of_interest_diplomatic
+}
+
+chateau_bretagne_02 = {
+
+	constrcution_time = very_slow_construction_time
+
+	type_icon = "icon_building_leisure_palace.dds"
+
+	can_construct_potential = {
+		building_requirement_castle_city_church = { LEVEL = 03 }
+		scope:holder = {
+			prestige_level >= 4
+			highest_held_title_tier >= tier_duchy
+		}
+		scope:holder.culture = { has_innovation = innovation_guilds }
+		building_requirement_tribal = no
+	}
+
+	effect_desc = feast_cost_discount_max_desc
+
+	cost_gold = 1000
+
+	county_holder_character_modifier = {
+		monthly_dynasty_prestige = 0.10
+		monthly_dynasty_prestige_mult = 0.15
+		monthly_prestige_gain_mult = 0.15
+		monthly_prestige = 0.25
+		courtly_tax_contribution_mult = 0.05
+	}
+
+	county_modifier = {
+		tax_mult = 0.20
+		development_growth = 0.15
+		development_growth_factor = 0.20
+	}
+
+	province_modifier = {
+		monthly_income = 2
+	}
+
+	ai_value = {
+		base = 100
+		modifier = { # Fill all building slots before going for special buildings
+			factor = 0
+			free_building_slots > 0
+		}
+	}
+
+	type = special
+
+	flag = travel_point_of_interest_diplomatic
+}
+
+##########
+# Fort de Bordeaux - post-event, large fort/naval fort
+##########
+
+fort_de_bordeaux_01 = {
+
+	construction_time = very_slow_construction_time
+
+	type_icon = "icon_structure_walls_of_genoa.dds"
+
+	can_construct_potential = {
+		building_requirement_tribal = no
+	}
+
+	cost_gold = 1500
+
+    county_holder_character_modifier = {
+		martial_per_prestige_level = 1
+	}
+
+	county_modifier = {
+		tax_mult = 0.25
+		development_growth = 0.20
+		development_growth_factor = 0.25
+		hostile_raid_time = 0.50
+		defender_holding_advantage = 5
+	}
+
+	province_modifier = {
+		monthly_income = 2.50
+		fort_level = 4
+		garrison_size = 0.20
+		travel_danger = -15
+	}
+
+	ai_value = {
+		base = 100
+		ai_general_building_modifier = yes
+		modifier = { # Fill all building slots before going for special buildings
+			factor = 0
+			free_building_slots > 0
+		}
+	}
+
+	type = special
+
+	flag = travel_point_of_interest_martial
+}
+
+
+##########
+# Fortified Port of Monaco
+##########
+
+fortified_port_of_monaco_01 = {
+
+	construction_time = very_slow_construction_time
+
+	type_icon = "icon_structure_drassanes.dds"
+
+	can_construct_potential = {
+		scope:holder.culture = { has_innovation = innovation_manorialism }
+		scope:holder = { highest_held_title_tier >= tier_duchy }
+	}
+
+	cost_gold = 350
+
+	county_holder_character_modifier = {
+		embarkation_cost_mult = -0.05
+		naval_movement_speed_mult = 0.05
+	}
+
+	county_modifier = {
+		tax_mult = 0.10
+		development_growth = 0.10
+		development_growth_factor = 0.10
+		hostile_raid_time = 0.25
+		defender_holding_advantage = 2
+	}
+
+	province_modifier = {
+		monthly_income = 1
+		fort_level = 1
+		garrison_size = 0.10
+		travel_danger = -10
+	}
+
+	next_building = fortified_port_of_monaco_02
+
+	ai_value = {
+		base = 100
+		ai_general_building_modifier = yes
+		directive_to_build_economy_modifier = yes
+		ai_economical_building_preference_modifier = yes
+		modifier = { # Fill all building slots before going for special buildings
+			factor = 0
+			free_building_slots > 0
+		}
+	}
+
+	type = special
+
+	flag = travel_point_of_interest_economic
+}
+
+fortified_port_of_monaco_02 = {
+
+	construction_time = very_slow_construction_time
+
+	type_icon = "icon_structure_drassanes.dds"
+
+	can_construct_potential = {
+		scope:holder.culture = { has_innovation = innovation_windmills }
+		scope:holder = { highest_held_title_tier >= tier_duchy }
+		building_requirement_castle_city_church = { LEVEL = 02 }
+	}
+
+	cost_gold = 800
+
+	county_holder_character_modifier = {
+		embarkation_cost_mult = -0.10
+		naval_movement_speed_mult = 0.10
+	}
+
+	county_modifier = {
+		tax_mult = 0.20
+		development_growth = 0.15
+		development_growth_factor = 0.20
+		hostile_raid_time = 0.35
+		defender_holding_advantage = 3
+	}
+
+	province_modifier = {
+		monthly_income = 3
+		fort_level = 2
+		garrison_size = 0.15
+		travel_danger = -15
+	}
+
+	next_building = fortified_port_of_monaco_03
+
+	ai_value = {
+		base = 100
+		ai_general_building_modifier = yes
+		directive_to_build_economy_modifier = yes
+		ai_economical_building_preference_modifier = yes
+		modifier = { # Fill all building slots before going for special buildings
+			factor = 0
+			free_building_slots > 0
+		}
+	}
+
+	type = special
+
+	flag = travel_point_of_interest_economic
+}
+
+fortified_port_of_monaco_03 = {
+
+	construction_time = very_slow_construction_time
+
+	type_icon = "icon_structure_drassanes.dds"
+
+	can_construct_potential = {
+		scope:holder.culture = { has_innovation = innovation_windmills }
+		scope:holder = { highest_held_title_tier >= tier_duchy }
+		building_requirement_castle_city_church = { LEVEL = 03 }
+	}
+
+	cost_gold = 1500
+
+    county_holder_character_modifier = {
+		stewardship_per_prestige_level = 1
+		embarkation_cost_mult = -0.20
+		naval_movement_speed_mult = 0.20
+	}
+
+	county_modifier = {
+		tax_mult = 0.35
+		development_growth = 0.25
+		development_growth_factor = 0.35
+		hostile_raid_time = 0.50
+		defender_holding_advantage = 5
+	}
+
+	province_modifier = {
+		monthly_income = 7.50
+		fort_level = 4
+		garrison_size = 0.25
+		travel_danger = -20
+	}
+
+	ai_value = {
+		base = 100
+		ai_general_building_modifier = yes
+		directive_to_build_economy_modifier = yes
+		ai_economical_building_preference_modifier = yes
+		modifier = { # Fill all building slots before going for special buildings
+			factor = 0
+			free_building_slots > 0
+		}
+	}
+
+	type = special
+
+	flag = travel_point_of_interest_economic
+}
+
+
+##########
+# Port of La Rochelle
+##########
+
+port_of_la_rochelle_01 = {
+
+	construction_time = very_slow_construction_time
+
+	type_icon = "icon_building_tradeport.dds"
+
+	can_construct_potential = {
+		scope:holder.culture = { has_innovation = innovation_manorialism }
+		scope:holder = { highest_held_title_tier >= tier_duchy }
+	}
+
+	cost_gold = 350
+
+	county_holder_character_modifier = {
+		embarkation_cost_mult = -0.05
+		naval_movement_speed_mult = 0.05
+	}
+
+	county_modifier = {
+		tax_mult = 0.10
+		development_growth = 0.10
+		development_growth_factor = 0.10
+	}
+
+	province_modifier = {
+		monthly_income = 1
+	}
+
+	next_building = port_of_la_rochelle_02
+
+	ai_value = {
+		base = 100
+		ai_general_building_modifier = yes
+		directive_to_build_economy_modifier = yes
+		ai_economical_building_preference_modifier = yes
+		modifier = { # Fill all building slots before going for special buildings
+			factor = 0
+			free_building_slots > 0
+		}
+	}
+
+	type = special
+
+	flag = travel_point_of_interest_economic
+}
+
+port_of_la_rochelle_02 = {
+
+	construction_time = very_slow_construction_time
+
+	type_icon = "icon_building_tradeport.dds"
+
+	can_construct_potential = {
+		scope:holder.culture = { has_innovation = innovation_windmills }
+		scope:holder = { highest_held_title_tier >= tier_duchy }
+		building_requirement_castle_city_church = { LEVEL = 02 }
+	}
+
+	cost_gold = 800
+
+	county_holder_character_modifier = {
+		embarkation_cost_mult = -0.10
+		naval_movement_speed_mult = 0.10
+	}
+
+	county_modifier = {
+		tax_mult = 0.20
+		development_growth = 0.15
+		development_growth_factor = 0.20
+	}
+
+	province_modifier = {
+		monthly_income = 3
+	}
+
+	next_building = port_of_la_rochelle_03
+
+	ai_value = {
+		base = 100
+		ai_general_building_modifier = yes
+		directive_to_build_economy_modifier = yes
+		ai_economical_building_preference_modifier = yes
+		modifier = { # Fill all building slots before going for special buildings
+			factor = 0
+			free_building_slots > 0
+		}
+	}
+
+	type = special
+
+	flag = travel_point_of_interest_economic
+}
+
+port_of_la_rochelle_03 = {
+
+	construction_time = very_slow_construction_time
+
+	type_icon = "icon_building_tradeport.dds"
+
+	can_construct_potential = {
+		scope:holder.culture = { has_innovation = innovation_windmills }
+		scope:holder = { highest_held_title_tier >= tier_duchy }
+		building_requirement_castle_city_church = { LEVEL = 03 }
+	}
+
+	cost_gold = 1500
+
+    county_holder_character_modifier = {
+		stewardship_per_prestige_level = 1
+		embarkation_cost_mult = -0.20
+		naval_movement_speed_mult = 0.20
+	}
+
+	county_modifier = {
+		tax_mult = 0.35
+		development_growth = 0.25
+		development_growth_factor = 0.35
+	}
+
+	province_modifier = {
+		monthly_income = 7.50
+	}
+
+	ai_value = {
+		base = 100
+		ai_general_building_modifier = yes
+		directive_to_build_economy_modifier = yes
+		ai_economical_building_preference_modifier = yes
+		modifier = { # Fill all building slots before going for special buildings
+			factor = 0
+			free_building_slots > 0
+		}
+	}
+
+	type = special
+
+	flag = travel_point_of_interest_economic
+}

common/defines/00_defines.txt

@@ -1085,10 +1085,10 @@ NPathFinding = {
 }
 
 NCulture = {
-	MINIMUM_INNOVATIONS_TO_NEXT_ERA = 6									# Raw number of innovations needed to be able to go to the next era. If an era has less innovations than this number, the lowest is used.
+	MINIMUM_INNOVATIONS_TO_NEXT_ERA = 8										# Raw number of innovations needed to be able to go to the next era. If an era has less innovations than this number, the lowest is used.
 	ERA_PROGRESS_GAIN_BASE_MONTHLY = 0.1									# Base percentage gain every month for era spread
-	ERA_PROGRESS_GAIN_MONTHLY_PER_AVERAGE_DEVELOPMENT_LEVEL = 0.08			# How much extra per average development level
 	FIRST_ERA_START_YEAR = 2300												# When did the first era start?
+	ERA_PROGRESS_GAIN_MONTHLY_PER_AVERAGE_DEVELOPMENT_LEVEL = 0.05			# How much extra per average development level
 
 	# Regional spread will start with the minimum number of regions from any of the next percentages
 	INNOVATION_REGIONAL_PERCENTAGE = 0.1									# Minimum percentage of region for regional innovations to get regional spread
@@ -1097,9 +1097,9 @@ NCulture = {
 
 	# Chance (0..100) to advance with the innovation each month:
 	# base + from spread + from fascination
-	INNOVATION_PROGRESS_CHANCE_BASE = 10
+	INNOVATION_PROGRESS_CHANCE_BASE = 5
-	INNOVATION_PROGRESS_CHANCE_FROM_SPREAD = 65 						# chance bonus to innovation if there is any spread by nearby cultures
+	INNOVATION_PROGRESS_CHANCE_FROM_SPREAD = 40 						# chance bonus to innovation if there is any spread by nearby cultures
-	INNOVATION_PROGRESS_CHANCE_SPREAD_AND_FASCINATION_MULTIPLIER = 1.5	# multiply Cultural Acceptance (100-based) by this as bonus multiplier if the current spread innovation is ALSO a fascination
+	INNOVATION_PROGRESS_CHANCE_SPREAD_AND_FASCINATION_MULTIPLIER = 2	# multiply Cultural Acceptance (100-based) by this as bonus multiplier if the current spread innovation is ALSO a fascination
 	# from fascination = base + SKILL_LEVEL_BONUS( max( 0, head relevant skill - HEAD_SKILL_BASE ) )
 	# SKILL_LEVEL_BONUS( SKILL_MOD ) is computed as a sum of contributions that get smaller the higher the skill modifier.
 	# The first 10 (SECTION_SIZE) points may give +1 each, the second 10 may give +0.8 and so on. With these numbers:
@@ -1107,10 +1107,10 @@ NCulture = {
 	# Skill mod 37 -> 1 * 10 + 0.9 * 10 + 0.8 * 10 + 0.7 * 7 = 27.4
 	# trailing points after the highest section take the last multiplier of the PER_SKILL_SECTION array, which should have at minimum 2 entries
 	# this skill level bonus will not exceed the SKILL_CAP, so a Skill 100 character will still get at most (for example) 30% progress chance from their skill.
-	INNOVATION_PROGRESS_CHANCE_FROM_FASCINATION_BASE = 5						# base progress chance bonus if fascination
+	INNOVATION_PROGRESS_CHANCE_FROM_FASCINATION_BASE = 10						# base progress chance bonus if fascination
-	INNOVATION_PROGRESS_CHANCE_FROM_FASCINATION_HEAD_SKILL_BASE = 1				# skill level below which no bonus is given
+	INNOVATION_PROGRESS_CHANCE_FROM_FASCINATION_HEAD_SKILL_BASE = 0				# skill level below which no bonus is given
-	INNOVATION_PROGRESS_CHANCE_FROM_FASCINATION_SKILL_LEVEL_SECTION_SIZE = 1	# size of each multiplier chunk. with 10, the first 10 bonus point will get the first multiplier and so on
+	INNOVATION_PROGRESS_CHANCE_FROM_FASCINATION_SKILL_LEVEL_SECTION_SIZE = 10	# size of each multiplier chunk. with 10, the first 10 bonus point will get the first multiplier and so on
-	INNOVATION_PROGRESS_CHANCE_FROM_FASCINATION_SKILL_CAP = 20					# how high can the skill bonus be at most (BASE included)
+	INNOVATION_PROGRESS_CHANCE_FROM_FASCINATION_SKILL_CAP = 45					# how high can the skill bonus be at most (BASE included)
 	INNOVATION_PROGRESS_CHANCE_FROM_FASCINATION_PER_SKILL_SECTION = { 1 0.9 0.8 0.7 0.6 }
 	INNOVATION_PROGRESS_CHANCE_FROM_FASCINATION_NO_HEAD_SKILL = 10				# used as the skill value if there is no cultural head
 
@@ -1118,8 +1118,8 @@ NCulture = {
 
 	# If the random roll succeeds, the innovation will progress by:
 	# base + from development + from eras ahead
-	INNOVATION_PROGRESS_GAIN_BASE = 0.4
+	INNOVATION_PROGRESS_GAIN_BASE = 0.3
-	INNOVATION_PROGRESS_GAIN_PER_AVERAGE_DEVELOPMENT_LEVEL = 0.1
+	INNOVATION_PROGRESS_GAIN_PER_AVERAGE_DEVELOPMENT_LEVEL = 0.02
 	INNOVATION_PROGRESS_GAIN_PER_ERA_AHEAD = 0.2
 	INNOVATION_PROGRESS_DIVIDE_FACTOR_IF_ERA_BEHIND = 5				# the overall progress is divided by this number to achieve a way slower progress for future innovations. 10 would divide the total progress by 10, and this is further divided by the number of eras the culture is behind - so the progress may end up being divided by 30 at most. Set to 0 to disable this behavior.
 	INNOVATION_PROGRESS_MIN_MULTIPLIER_IF_ERA_BEHIND = 0.01			# the division from the define above may not go lower than this. Ranges between 0 and 1.

common/dna_data/NEOW_dna.txt

@@ -1604,3 +1604,230 @@ dna_bookwyrm={
 	enabled=yes
 }
 
+dna_alfonso={
+	portrait_info = {
+	genes={ 		hair_color={ 80 252 80 252 }
+ 		skin_color={ 180 101 145 107 }
+ 		eye_color={ 22 223 26 173 }
+ 		gene_chin_forward={ "chin_forward_neg" 95 "chin_forward_neg" 125 }
+ 		gene_chin_height={ "chin_height_neg" 116 "chin_height_neg" 116 }
+ 		gene_chin_width={ "chin_width_neg" 118 "chin_width_neg" 118 }
+ 		gene_eye_angle={ "eye_angle_pos" 95 "eye_angle_pos" 136 }
+ 		gene_eye_depth={ "eye_depth_neg" 76 "eye_depth_neg" 116 }
+ 		gene_eye_height={ "eye_height_neg" 213 "eye_height_neg" 115 }
+ 		gene_eye_distance={ "eye_distance_neg" 132 "eye_distance_neg" 118 }
+ 		gene_eye_shut={ "eye_shut_pos" 141 "eye_shut_pos" 212 }
+ 		gene_forehead_angle={ "forehead_angle_neg" 173 "forehead_angle_neg" 126 }
+ 		gene_forehead_brow_height={ "forehead_brow_height_neg" 73 "forehead_brow_height_neg" 121 }
+ 		gene_forehead_roundness={ "forehead_roundness_pos" 137 "forehead_roundness_pos" 137 }
+ 		gene_forehead_width={ "forehead_width_neg" 121 "forehead_width_neg" 121 }
+ 		gene_forehead_height={ "forehead_height_neg" 123 "forehead_height_neg" 123 }
+ 		gene_head_height={ "head_height_pos" 178 "head_height_pos" 178 }
+ 		gene_head_width={ "head_width_neg" 83 "head_width_neg" 106 }
+ 		gene_head_profile={ "head_profile_neg" 30 "head_profile_neg" 30 }
+ 		gene_head_top_height={ "head_top_height_neg" 105 "head_top_height_neg" 118 }
+ 		gene_head_top_width={ "head_top_width_neg" 44 "head_top_width_neg" 109 }
+ 		gene_jaw_angle={ "jaw_angle_neg" 73 "jaw_angle_neg" 120 }
+ 		gene_jaw_forward={ "jaw_forward_pos" 207 "jaw_forward_pos" 139 }
+ 		gene_jaw_height={ "jaw_height_pos" 114 "jaw_height_pos" 137 }
+ 		gene_jaw_width={ "jaw_width_pos" 99 "jaw_width_pos" 155 }
+ 		gene_mouth_corner_depth={ "mouth_corner_depth_neg" 255 "mouth_corner_depth_neg" 107 }
+ 		gene_mouth_corner_height={ "mouth_corner_height_pos" 83 "mouth_corner_height_pos" 138 }
+ 		gene_mouth_forward={ "mouth_forward_pos" 128 "mouth_forward_pos" 128 }
+ 		gene_mouth_height={ "mouth_height_pos" 176 "mouth_height_pos" 136 }
+ 		gene_mouth_width={ "mouth_width_pos" 127 "mouth_width_pos" 127 }
+ 		gene_mouth_upper_lip_size={ "mouth_upper_lip_size_neg" 156 "mouth_upper_lip_size_neg" 108 }
+ 		gene_mouth_lower_lip_size={ "mouth_lower_lip_size_neg" 88 "mouth_lower_lip_size_neg" 88 }
+ 		gene_mouth_open={ "mouth_open_neg" 186 "mouth_open_neg" 53 }
+ 		gene_neck_length={ "neck_length_neg" 83 "neck_length_neg" 85 }
+ 		gene_neck_width={ "neck_width_neg" 70 "neck_width_neg" 38 }
+ 		gene_bs_cheek_forward={ "cheek_forward_neg" 57 "cheek_forward_pos" 15 }
+ 		gene_bs_cheek_height={ "cheek_height_pos" 25 "cheek_height_neg" 4 }
+ 		gene_bs_cheek_width={ "cheek_width_pos" 45 "cheek_width_pos" 13 }
+ 		gene_bs_ear_angle={ "ear_angle_pos" 25 "ear_angle_pos" 25 }
+ 		gene_bs_ear_inner_shape={ "ear_inner_shape_pos" 20 "ear_inner_shape_pos" 20 }
+ 		gene_bs_ear_bend={ "ear_lower_bend_pos" 39 "ear_lower_bend_pos" 39 }
+ 		gene_bs_ear_outward={ "ear_outward_pos" 17 "ear_outward_pos" 17 }
+ 		gene_bs_ear_size={ "ear_size_neg" 41 "ear_size_neg" 41 }
+ 		gene_bs_eye_corner_depth={ "eye_corner_depth_neg" 123 "eye_corner_depth_pos" 39 }
+ 		gene_bs_eye_fold_shape={ "eye_fold_shape_pos" 81 "eye_fold_shape_pos" 81 }
+ 		gene_bs_eye_size={ "eye_size_pos" 255 "eye_size_pos" 46 }
+ 		gene_bs_eye_upper_lid_size={ "eye_upper_lid_size_neg" 195 "eye_upper_lid_size_pos" 15 }
+ 		gene_bs_forehead_brow_curve={ "forehead_brow_curve_neg" 137 "forehead_brow_curve_neg" 113 }
+ 		gene_bs_forehead_brow_forward={ "forehead_brow_forward_pos" 99 "forehead_brow_forward_pos" 6 }
+ 		gene_bs_forehead_brow_inner_height={ "forehead_brow_inner_height_neg" 93 "forehead_brow_inner_height_pos" 96 }
+ 		gene_bs_forehead_brow_outer_height={ "forehead_brow_outer_height_pos" 43 "forehead_brow_outer_height_pos" 4 }
+ 		gene_bs_forehead_brow_width={ "forehead_brow_width_neg" 20 "forehead_brow_width_neg" 20 }
+ 		gene_bs_jaw_def={ "jaw_def_pos" 15 "jaw_def_pos" 165 }
+ 		gene_bs_mouth_lower_lip_def={ "mouth_lower_lip_def_pos" 205 "mouth_lower_lip_def_pos" 123 }
+ 		gene_bs_mouth_lower_lip_full={ "mouth_lower_lip_full_pos" 111 "mouth_lower_lip_full_pos" 13 }
+ 		gene_bs_mouth_lower_lip_pad={ "mouth_lower_lip_pad_pos" 117 "mouth_lower_lip_pad_neg" 99 }
+ 		gene_bs_mouth_lower_lip_width={ "mouth_lower_lip_width_pos" 83 "mouth_lower_lip_width_pos" 83 }
+ 		gene_bs_mouth_philtrum_def={ "mouth_philtrum_def_pos" 153 "mouth_philtrum_def_pos" 38 }
+ 		gene_bs_mouth_philtrum_shape={ "mouth_philtrum_shape_pos" 5 "mouth_philtrum_shape_pos" 40 }
+ 		gene_bs_mouth_philtrum_width={ "mouth_philtrum_width_pos" 14 "mouth_philtrum_width_pos" 14 }
+ 		gene_bs_mouth_upper_lip_def={ "mouth_upper_lip_def_pos" 255 "mouth_upper_lip_def_pos" 9 }
+ 		gene_bs_mouth_upper_lip_full={ "mouth_upper_lip_full_pos" 20 "mouth_upper_lip_full_pos" 20 }
+ 		gene_bs_mouth_upper_lip_profile={ "mouth_upper_lip_profile_pos" 255 "mouth_upper_lip_profile_pos" 42 }
+ 		gene_bs_mouth_upper_lip_width={ "mouth_upper_lip_width_pos" 51 "mouth_upper_lip_width_pos" 59 }
+ 		gene_bs_nose_forward={ "nose_forward_pos" 255 "nose_forward_pos" 4 }
+ 		gene_bs_nose_height={ "nose_height_pos" 71 "nose_height_neg" 99 }
+ 		gene_bs_nose_length={ "nose_length_pos" 13 "nose_length_neg" 87 }
+ 		gene_bs_nose_nostril_height={ "nose_nostril_height_pos" 98 "nose_nostril_height_pos" 98 }
+ 		gene_bs_nose_nostril_width={ "nose_nostril_width_pos" 105 "nose_nostril_width_neg" 40 }
+ 		gene_bs_nose_profile={ "nose_profile_pos" 19 "nose_profile_neg" 6 }
+ 		gene_bs_nose_ridge_angle={ "nose_ridge_angle_neg" 135 "nose_ridge_angle_neg" 7 }
+ 		gene_bs_nose_ridge_width={ "nose_ridge_width_pos" 213 "nose_ridge_width_neg" 43 }
+ 		gene_bs_nose_size={ "nose_size_pos" 131 "nose_size_neg" 49 }
+ 		gene_bs_nose_tip_angle={ "nose_tip_angle_pos" 17 "nose_tip_angle_neg" 16 }
+ 		gene_bs_nose_tip_forward={ "nose_tip_forward_pos" 1 "nose_tip_forward_neg" 162 }
+ 		gene_bs_nose_tip_width={ "nose_tip_width_neg" 51 "nose_tip_width_neg" 51 }
+ 		face_detail_cheek_def={ "cheek_def_01" 122 "cheek_def_01" 19 }
+ 		face_detail_cheek_fat={ "cheek_fat_04_pos" 255 "cheek_fat_01_neg" 75 }
+ 		face_detail_chin_cleft={ "chin_cleft" 255 "chin_cleft" 14 }
+ 		face_detail_chin_def={ "chin_def" 254 "chin_def" 125 }
+ 		face_detail_eye_lower_lid_def={ "eye_lower_lid_def" 255 "eye_lower_lid_def" 232 }
+ 		face_detail_eye_socket={ "eye_socket_color_02" 255 "eye_socket_03" 10 }
+ 		face_detail_nasolabial={ "nasolabial_03" 247 "nasolabial_03" 17 }
+ 		face_detail_nose_ridge_def={ "nose_ridge_def_pos" 163 "nose_ridge_def_pos" 4 }
+ 		face_detail_nose_tip_def={ "nose_tip_def" 150 "nose_tip_def" 63 }
+ 		face_detail_temple_def={ "temple_def" 199 "temple_def" 243 }
+ 		expression_brow_wrinkles={ "brow_wrinkles_04" 255 "brow_wrinkles_04" 35 }
+ 		expression_eye_wrinkles={ "eye_wrinkles_02" 255 "eye_wrinkles_01" 59 }
+ 		expression_forehead_wrinkles={ "forehead_wrinkles_01" 0 "forehead_wrinkles_01" 98 }
+ 		expression_other={ "cheek_wrinkles_both_01" 0 "cheek_wrinkles_both_01" 0 }
+ 		complexion={ "complexion_6" 255 "complexion_3" 217 }
+ 		gene_height={ "normal_height" 121 "normal_height" 121 }
+ 		gene_bs_body_type={ "body_fat_head_fat_low" 120 "body_fat_head_fat_full" 120 }
+ 		gene_bs_body_shape={ "body_shape_pear_full" 236 "body_shape_pear_full" 52 }
+ 		gene_bs_bust={ "bust_clothes" 80 "bust_shape_3_full" 100 }
+ 		gene_age={ "old_2" 220 "old_2" 220 }
+ 		gene_eyebrows_shape={ "avg_spacing_low_thickness" 198 "close_spacing_high_thickness" 216 }
+ 		gene_eyebrows_fullness={ "layer_2_low_thickness" 210 "layer_2_low_thickness" 204 }
+ 		gene_body_hair={ "body_hair_dense_lower_stubble" 94 "body_hair_sparse" 94 }
+ 		gene_hair_type={ "hair_wavy" 186 "hair_wavy" 186 }
+ 		gene_baldness={ "male_pattern_baldness" 191 "male_pattern_baldness" 191 }
+ 		eye_accessory={ "normal_eyes" 50 "normal_eyes" 50 }
+ 		teeth_accessory={ "normal_teeth" 0 "normal_teeth" 0 }
+ 		eyelashes_accessory={ "normal_eyelashes" 15 "normal_eyelashes" 15 }
+ 		hairstyles={ "tgp_southeast_hairstyles" 255 "all_hairstyles" 0 }
+ 		beards={ "fp3_iranian_beards_straight" 255 "no_beard" 0 }
+ 		clothes={ "western_bedchamber" 79 "most_clothes" 0 }
+	}
+	enabled=yes
+	}
+}
+
+dna_freddiemercury={
+	portrait_info = {
+			genes={ 		hair_color={ 15 252 68 247 }
+			skin_color={ 151 117 192 127 }
+			eye_color={ 57 234 65 194 }
+			gene_chin_forward={ "chin_forward_pos" 108 "chin_forward_pos" 149 }
+			gene_chin_height={ "chin_height_pos" 95 "chin_height_pos" 136 }
+			gene_chin_width={ "chin_width_neg" 152 "chin_width_neg" 117 }
+			gene_eye_angle={ "eye_angle_neg" 89 "eye_angle_neg" 118 }
+			gene_eye_depth={ "eye_depth_pos" 78 "eye_depth_pos" 133 }
+			gene_eye_height={ "eye_height_pos" 176 "eye_height_pos" 139 }
+			gene_eye_distance={ "eye_distance_neg" 132 "eye_distance_neg" 112 }
+			gene_eye_shut={ "eye_shut_pos" 78 "eye_shut_pos" 136 }
+			gene_forehead_angle={ "forehead_angle_neg" 124 "forehead_angle_neg" 124 }
+			gene_forehead_brow_height={ "forehead_brow_height_pos" 80 "forehead_brow_height_pos" 141 }
+			gene_forehead_roundness={ "forehead_roundness_pos" 179 "forehead_roundness_pos" 150 }
+			gene_forehead_width={ "forehead_width_neg" 64 "forehead_width_neg" 122 }
+			gene_forehead_height={ "forehead_height_pos" 136 "forehead_height_pos" 129 }
+			gene_head_height={ "head_height_neg" 220 "head_height_neg" 106 }
+			gene_head_width={ "head_width_pos" 154 "head_width_pos" 177 }
+			gene_head_profile={ "head_profile_neg" 126 "head_profile_neg" 108 }
+			gene_head_top_height={ "head_top_height_pos" 146 "head_top_height_pos" 127 }
+			gene_head_top_width={ "head_top_width_pos" 144 "head_top_width_pos" 173 }
+			gene_jaw_angle={ "jaw_angle_pos" 108 "jaw_angle_pos" 137 }
+			gene_jaw_forward={ "jaw_forward_neg" 131 "jaw_forward_neg" 105 }
+			gene_jaw_height={ "jaw_height_neg" 165 "jaw_height_neg" 87 }
+			gene_jaw_width={ "jaw_width_neg" 112 "jaw_width_neg" 90 }
+			gene_mouth_corner_depth={ "mouth_corner_depth_pos" 0 "mouth_corner_depth_pos" 136 }
+			gene_mouth_corner_height={ "mouth_corner_height_neg" 194 "mouth_corner_height_neg" 118 }
+			gene_mouth_forward={ "mouth_forward_pos" 137 "mouth_forward_pos" 137 }
+			gene_mouth_height={ "mouth_height_neg" 116 "mouth_height_neg" 116 }
+			gene_mouth_width={ "mouth_width_pos" 176 "mouth_width_pos" 133 }
+			gene_mouth_upper_lip_size={ "mouth_upper_lip_size_pos" 128 "mouth_upper_lip_size_pos" 128 }
+			gene_mouth_lower_lip_size={ "mouth_lower_lip_size_neg" 115 "mouth_lower_lip_size_neg" 94 }
+			gene_mouth_open={ "mouth_open_neg" 57 "mouth_open_neg" 22 }
+			gene_neck_length={ "neck_length_neg" 100 "neck_length_neg" 113 }
+			gene_neck_width={ "neck_width_pos" 151 "neck_width_pos" 132 }
+			gene_bs_cheek_forward={ "cheek_forward_pos" 135 "cheek_forward_neg" 6 }
+			gene_bs_cheek_height={ "cheek_height_pos" 133 "cheek_height_neg" 181 }
+			gene_bs_cheek_width={ "cheek_width_pos" 97 "cheek_width_pos" 16 }
+			gene_bs_ear_angle={ "ear_angle_pos" 49 "ear_angle_neg" 64 }
+			gene_bs_ear_inner_shape={ "ear_inner_shape_pos" 186 "ear_inner_shape_pos" 54 }
+			gene_bs_ear_bend={ "ear_upper_bend_pos" 83 "ear_lower_bend_pos" 36 }
+			gene_bs_ear_outward={ "ear_outward_neg" 9 "ear_outward_pos" 2 }
+			gene_bs_ear_size={ "ear_size_neg" 12 "ear_size_neg" 12 }
+			gene_bs_eye_corner_depth={ "eye_corner_depth_neg" 104 "eye_corner_depth_neg" 104 }
+			gene_bs_eye_fold_shape={ "eye_fold_shape_neg" 225 "eye_fold_shape_pos" 49 }
+			gene_bs_eye_size={ "eye_size_pos" 111 "eye_size_neg" 192 }
+			gene_bs_eye_upper_lid_size={ "eye_upper_lid_size_pos" 215 "eye_upper_lid_size_pos" 98 }
+			gene_bs_forehead_brow_curve={ "forehead_brow_curve_neg" 141 "forehead_brow_curve_neg" 40 }
+			gene_bs_forehead_brow_forward={ "forehead_brow_forward_pos" 85 "forehead_brow_forward_pos" 11 }
+			gene_bs_forehead_brow_inner_height={ "forehead_brow_inner_height_neg" 7 "forehead_brow_inner_height_pos" 1 }
+			gene_bs_forehead_brow_outer_height={ "forehead_brow_outer_height_pos" 17 "forehead_brow_outer_height_neg" 2 }
+			gene_bs_forehead_brow_width={ "forehead_brow_width_neg" 47 "forehead_brow_width_neg" 15 }
+			gene_bs_jaw_def={ "jaw_def_pos" 37 "jaw_def_pos" 108 }
+			gene_bs_mouth_lower_lip_def={ "mouth_lower_lip_def_pos" 116 "mouth_lower_lip_def_pos" 145 }
+			gene_bs_mouth_lower_lip_full={ "mouth_lower_lip_full_pos" 111 "mouth_lower_lip_full_pos" 33 }
+			gene_bs_mouth_lower_lip_pad={ "mouth_lower_lip_pad_neg" 47 "mouth_lower_lip_pad_neg" 68 }
+			gene_bs_mouth_lower_lip_width={ "mouth_lower_lip_width_pos" 41 "mouth_lower_lip_width_neg" 114 }
+			gene_bs_mouth_philtrum_def={ "mouth_philtrum_def_pos" 0 "mouth_philtrum_def_pos" 46 }
+			gene_bs_mouth_philtrum_shape={ "mouth_philtrum_shape_pos" 199 "mouth_philtrum_shape_neg" 72 }
+			gene_bs_mouth_philtrum_width={ "mouth_philtrum_width_pos" 69 "mouth_philtrum_width_pos" 69 }
+			gene_bs_mouth_upper_lip_def={ "mouth_upper_lip_def_pos" 25 "mouth_upper_lip_def_pos" 25 }
+			gene_bs_mouth_upper_lip_full={ "mouth_upper_lip_full_neg" 79 "mouth_upper_lip_full_pos" 34 }
+			gene_bs_mouth_upper_lip_profile={ "mouth_upper_lip_profile_pos" 255 "mouth_upper_lip_profile_pos" 238 }
+			gene_bs_mouth_upper_lip_width={ "mouth_upper_lip_width_neg" 171 "mouth_upper_lip_width_neg" 42 }
+			gene_bs_nose_forward={ "nose_forward_pos" 79 "nose_forward_neg" 30 }
+			gene_bs_nose_height={ "nose_height_pos" 145 "nose_height_pos" 18 }
+			gene_bs_nose_length={ "nose_length_pos" 63 "nose_length_neg" 51 }
+			gene_bs_nose_nostril_height={ "nose_nostril_height_neg" 199 "nose_nostril_height_neg" 51 }
+			gene_bs_nose_nostril_width={ "nose_nostril_width_neg" 99 "nose_nostril_width_pos" 15 }
+			gene_bs_nose_profile={ "nose_profile_pos" 41 "nose_profile_hawk_pos" 24 }
+			gene_bs_nose_ridge_angle={ "nose_ridge_angle_neg" 255 "nose_ridge_angle_neg" 105 }
+			gene_bs_nose_ridge_width={ "nose_ridge_width_pos" 93 "nose_ridge_width_neg" 45 }
+			gene_bs_nose_size={ "nose_size_neg" 3 "nose_size_pos" 79 }
+			gene_bs_nose_tip_angle={ "nose_tip_angle_neg" 139 "nose_tip_angle_neg" 29 }
+			gene_bs_nose_tip_forward={ "nose_tip_forward_pos" 143 "nose_tip_forward_pos" 78 }
+			gene_bs_nose_tip_width={ "nose_tip_width_neg" 165 "nose_tip_width_neg" 34 }
+			face_detail_cheek_def={ "cheek_def_01" 190 "cheek_def_02" 177 }
+			face_detail_cheek_fat={ "cheek_fat_01_pos" 84 "cheek_fat_01_neg" 55 }
+			face_detail_chin_cleft={ "chin_cleft" 89 "chin_dimple" 23 }
+			face_detail_chin_def={ "chin_def" 122 "chin_def" 10 }
+			face_detail_eye_lower_lid_def={ "eye_lower_lid_def" 172 "eye_lower_lid_def" 84 }
+			face_detail_eye_socket={ "eye_socket_02" 0 "eye_socket_02" 185 }
+			face_detail_nasolabial={ "nasolabial_01" 149 "nasolabial_01" 13 }
+			face_detail_nose_ridge_def={ "nose_ridge_def_pos" 182 "nose_ridge_def_pos" 141 }
+			face_detail_nose_tip_def={ "nose_tip_def" 76 "nose_tip_def" 218 }
+			face_detail_temple_def={ "temple_def" 0 "temple_def" 148 }
+			expression_brow_wrinkles={ "brow_wrinkles_04" 177 "brow_wrinkles_04" 4 }
+			expression_eye_wrinkles={ "eye_wrinkles_01" 90 "eye_wrinkles_01" 90 }
+			expression_forehead_wrinkles={ "forehead_wrinkles_01" 226 "forehead_wrinkles_01" 226 }
+			expression_other={ "cheek_wrinkles_both_01" 0 "cheek_wrinkles_both_01" 0 }
+			complexion={ "complexion_3" 237 "complexion_3" 135 }
+			gene_height={ "normal_height" 134 "normal_height" 134 }
+			gene_bs_body_type={ "body_fat_head_fat_full" 133 "body_fat_head_fat_full" 109 }
+			gene_bs_body_shape={ "body_shape_hourglass_half" 174 "body_shape_apple_half" 0 }
+			gene_bs_bust={ "bust_clothes" 83 "bust_shape_4_full" 81 }
+			gene_age={ "old_3" 4 "old_2" 4 }
+			gene_eyebrows_shape={ "far_spacing_lower_thickness" 255 "avg_spacing_avg_thickness" 223 }
+			gene_eyebrows_fullness={ "layer_2_avg_thickness" 255 "layer_2_avg_thickness" 206 }
+			gene_body_hair={ "body_hair_dense" 53 "body_hair_sparse" 89 }
+			gene_hair_type={ "hair_wavy" 107 "hair_wavy" 107 }
+			gene_baldness={ "no_baldness" 127 "no_baldness" 127 }
+			eye_accessory={ "normal_eyes" 135 "normal_eyes" 135 }
+			teeth_accessory={ "normal_teeth" 0 "normal_teeth" 0 }
+			eyelashes_accessory={ "normal_eyelashes" 84 "normal_eyelashes" 84 }
+			hairstyles={ "fp2_hairstyles_iberian_christian_wavy" 127 "all_hairstyles" 0 }
+			beards={ "western_beards_straight" 110 "no_beard" 0 }
+			clothes={ "western_bedchamber" 79 "most_clothes" 0 }
+		}
+	}
+	enabled=yes
+}

common/landed_titles/germany.txt

@@ -2989,4 +2989,3 @@ e_germany = {
 	#	}
 	#}
 
-}

common/landed_titles/italy.txt

@@ -452,6 +452,11 @@ e_italy = {
 
 					color = { 215 120 130 }
 				}
+				b_luni = {
+					province = 2531
+
+					color = { 215 120 130 }
+				}	
 
 			}
 
@@ -1521,11 +1526,6 @@ e_italy = {
 				b_casentino = {
 					province = 2553
 
-					color = { 209 125 105 }
-				}
-				b_camaldoli = {
-					province = 2551
-
 					color = { 209 125 105 }
 				}
 			}			
@@ -1572,15 +1572,15 @@ e_italy = {
 
 					color = { 232 190 25 }
 				}
-				b_prato = {
+				b_camaldoli = {
-					province = 2545
+					province = 2551
 
-					color = { 235 210 65 }
+					color = { 209 125 105 }
 				}
-				b_vallombrosa = {
+				b_empoli = {
-					province = 2544
+					province = 2563
 
-					color = { 230 155 15 }
+					color = { 232 190 25 }
 				}		
 			}
 			c_lucca = {
@@ -1592,15 +1592,10 @@ e_italy = {
 
 					color = { 235 210 65 }
 				}
-				b_pistorja = { #Pistoia
+				b_piombino = {
-					province = 2538
+					province = 2561
 
-					color = { 235 210 65 }
+					color = { 180 186 30 }
-				}
-				b_luni = {
-					province = 2531
-
-					color = { 215 120 130 }
 				}			
 			}
 			c_arezzo = {
@@ -1622,6 +1617,11 @@ e_italy = {
 
 					color = { 240 225 150 }
 				}	
+				b_vallombrosa = {
+					province = 2544
+
+					color = { 230 155 15 }
+				}	
 			}
 			c_siena = {
 				color = { 255 213 201 }
@@ -1632,11 +1632,6 @@ e_italy = {
 
 					color = { 205 175 25 }
 				}
-				b_montalcino = {
-					province = 2567
-
-					color = { 205 175 25 }
-				}
 				b_chiusi = {
 					province = 2565
 
@@ -1647,60 +1642,62 @@ e_italy = {
 
 					color = { 205 175 25 }
 				}
-			}
-			c_pisa = {
-				color = { 178 123 107 }
-				#can_be_named_after_dynasty = no
 				b_volterra = {
 					province = 2558
 
 					color = { 232 190 25 }
 				}
+			}
+			c_pisa = {
+				b_livorno = {
+					province = 2557
+
+					color = { 180 186 30 }
+				}
 				b_pisa = {
 					province = 2536
 
 					color = { 180 186 30 }
 				}	
-				b_empoli = {
-					province = 2563
-
-					color = { 232 190 25 }
-				}				
-		
 			}	
-			c_livorno = {
+			c_prato = {
 				color = { 255 196 178 }
 				#can_be_named_after_dynasty = no	
-				b_livorno = {
-					province = 2557
 
-					color = { 180 186 30 }
+				b_pistorja = { #Pistoia
+					province = 2538
+
+					color = { 235 210 65 }
 				}	
-				b_piombino = {
+				b_prato = {
-					province = 2561
+					province = 2545
 
-					color = { 180 186 30 }
+					color = { 235 210 65 }
 				}
-				
 			}
 			c_orbetello = {
 				color = { 153 106 91 }
 				#can_be_named_after_dynasty = no
 
-				b_orbetello = {
+				b_grosseto = {
 					province = 2569
 
 					color = { 250 210 5 }
 				}
+				b_orbetello = {
+					province = 2562
+
+					color = { 250 210 5 }
+				}
 				b_soana = {
 					province = 2570
 
 					color = { 250 210 5 }
 				}
-				b_grosseto = {
+				b_montalcino = {
-					province = 2562
+					province = 2567
 
-					color = { 250 210 5 }
+					color = { 205 175 25 }
 				}
 			}			
 		}		

common/religion/religions/NEOW_catholic.txt

@@ -1,7 +1,7 @@
 catholic_religion = {
 	family = rf_abrahamic
 
-	doctrine_background_icon = core_tenet_banner_catholic.dds
+	doctrine_background_icon = core_tenet_banner_christian.dds
 	doctrine = abrahamic_hostility_doctrine
 
 	#Main Group | placeholder

common/religion/religions/NEOW_orthodox.txt

@@ -1,7 +1,7 @@
 eastern_orthodox_religion = {
 	family = rf_abrahamic
 
-	doctrine_background_icon = core_tenet_banner_orthodox.dds
+	doctrine_background_icon = core_tenet_banner_christian.dds
 	doctrine = abrahamic_hostility_doctrine
 
 	#Main Group | placeholder

common/religion/religions/NEOW_protestant.txt

@@ -1,7 +1,7 @@
 protestant_religion = {
 	family = rf_abrahamic
 
-	doctrine_background_icon = core_tenet_banner_protestant.dds
+	doctrine_background_icon = core_tenet_banner_christian.dds
 	doctrine = abrahamic_hostility_doctrine
 
 	#Main Group

history/characters/NEOW_e_britannia.txt

@@ -4,6 +4,7 @@ britannia_cyflymarhyan_frydyryk = {
 	dynasty = dynn_britannia_cyflymarhyan
 	religion = "victorian"
 	culture = soueyrneg
+	dna = dna_freddiemercury
 	trait = education_intrigue_4
 	trait = shrewd
 	#trait = just
@@ -11,6 +12,12 @@ britannia_cyflymarhyan_frydyryk = {
 	trait = compassionate
 	trait = brave
 	trait = lifestyle_poet
+	portrait_override={
+		portrait_modifier_overrides={
+			custom_hair=male_hair_fp2_iberian_christian_01
+			custom_beards=male_beard_western_05
+		}
+	}
 	sexuality = bisexual
 	2509.1.1 = {
     	birth = yes

history/characters/NEOW_e_hispania.txt

@@ -29,11 +29,18 @@ hispania0002 = {
 	dynasty_house = house_bourbon_anjou
 	religion = "sevillian"
 	culture = castilian
+	dna = dna_alfonso
 	trait = education_stewardship_2
 	trait = compassionate
 	trait = diligent
 	trait = temperate
 	trait = strong
+	portrait_override={
+		portrait_modifier_overrides={
+		custom_hair=male_hair_fp2_iberian_muslim_03
+			custom_beards=male_beard_indian_01
+		}
+	}
 	2501.10.7 = {
     	birth = yes
 	}

history/provinces/e_alps.txt

@@ -1,35 +1,19 @@
 
 #k_switzerland
 ##d_mittelland
-###c_sankt_gallen
-2053 = {
-	culture = romansch
-	religion = helvetic
-	holding = church_holding
-}
-2789 = {
-	holding = none
-}
-2788 = {
-	holding = none
-}
 ###c_zurich
 2051 = {
-	culture = swiss
+	holding = none
-	religion = helvetic
-	holding = castle_holding
-}
-2054 = {
-	holding = castle_holding
 }
 2461 = {
-	holding = city_holding
+	holding = none
 }
 ###c_basel
 2050 = {
-	culture = swiss
+	holding = none
-	religion = helvetic
+}
-	holding = castle_holding
+9784 = {
+	holding = none
 }
 9763 = {
 	holding = none
@@ -39,245 +23,252 @@
 }
 ###c_aargau
 2048 = {
-	culture = swiss
-	religion = helvetic
-	holding = castle_holding
-}
-3107 = {
 	holding = none
 }
-9784 = {
+3107 = {
 	holding = none
 }
 ##d_transjurania
 ###c_bern
 2046 = {
-	culture = swiss
+	holding = none
-	religion = helvetic
-	holding = castle_holding
-}
-2074 = {
-	holding = city_holding
 }
 2049 = {
-	culture = swabian
+	holding = none
-	religion = helvetic
-	holding = castle_holding
 }
 2047 = {
 	holding = none
 }
 2460 = {
-	culture = swabian
+	holding = none
-	religion = helvetic
-	holding = castle_holding
-}
-###c_geneva
-2035 = {
-	culture = swiss
-	religion = helvetic
-	holding = castle_holding
-}
-2037 = {
-	holding = church_holding
-}
-2038 = {
-	holding = city_holding
 }
 9782 = {
 	holding = none
 }
-###c_ticino
+###c_geneva
-2478 = {
+2035 = {
-	culture = romansch
+	holding = none
-	religion = helvetic
-	holding = castle_holding
 }
-9701 = {
+2037 = {
-	holding = church_holding
+	holding = none
+}
+2038 = {
+	holding = none
 }
 ###c_valais
 9700 = {
-	culture = patoues
+	holding = none
-	religion = helvetic
-	holding = church_holding
 }
 2039 = {
-	culture = patoues
+	holding = none
-	religion = helvetic
-	holding = castle_holding
-}
-
-#k_lichtenstein
-##d_lictenstein
-###c_vaduz
-2052 = {
-	culture = aleman
-	religion = helvetic
-	holding = castle_holding
 }
+##d_rhaetia
 ###c_grisons
-2055 = {
-	culture = romansch
-	religion = helvetic
-	holding = church_holding
-}
 9704 = {
-	holding = castle_holding
+	holding = none
-	culture = romansch
+}
-	religion = helvetic	
+2055 = {
+	holding = none
 }
 9786 = {
-	holding = church_holding
+	holding = none
+}
+###c_ticino
+2478 = {
+	holding = none
+}
+9701 = {
+	holding = none
+}
+###c_sankt_gallen
+2053 = {
+	holding = none
+}
+2789 = {
+	holding = none
+}
+2788 = {
+	holding = none
+}
+2054 = {
+	holding = none
+}
+##d_savoie
+###c_savoy
+8721 = {
+	holding = none
+}
+9711 = {
+	holding = none
+}
+9712 = {
+	holding = none
+}
+9797 = {
+	holding = none
+}
+###c_upper_savoy
+13276 = {
+	holding = none
+}
+13277 = {
+	holding = none
+}
+13278 = {
+	holding = none
+}
+##d_upper_burgundy
+###c_vesoul
+2077 = {
+	holding = none
+}
+2383 = {
+	holding = none
+}
+2076 = {
+	holding = none
+}
+2192 = {
+	holding = none
+}
+###c_besancon
+2459 = {
+	holding = none
+}
+2075 = {
+	holding = none
+}
+2057 = {
+	holding = none
+}
+9768 = {
+	holding = none
+}
+2074 = {
+	holding = none
+}
+###c_dole
+2191 = {
+	holding = none
+}
+2073 = {
+	holding = none
+}
+2072 = {
+	holding = none
+}
+2457 = {
+	holding = none
 }
 
 #k_tirol
-##d_vorarlberg
-###c_vorarlberg
-2787 = {
-	culture = aleman
-	religion = roman_catholic
-	holding = tribal_holding
-}
-2790 = {
-	holding = none
-}
 ##d_tyrol
 ###c_innsbruck
 2950 = {
-	culture = austrian
-	religion = roman_catholic
-	holding = castle_holding
-	special_building_slot = schwaz_mines_01
-}
-2953 = {
-	holding = tribal_holding
-	culture = austrian
-	religion = roman_catholic
-}
-2976 = {
-	holding = city_holding
-}
-9774 = {
-	holding = none
-}
-2948 = {
-	holding = none
-}
-###c_imst
-2782 = {
-	culture = aleman
-	religion = roman_catholic
 	holding = none
 }
 9706 = {
 	holding = none
 }
+9774 = {
+	holding = none
+}
+###c_kufstein
+2953 = {
+	holding = none
+}
+2976 = {
+	holding = none
+}
+2948 = {
+	holding = none
+}
+###c_reutte
 2781 = {
-	holding = tribal_holding
+	holding = none
-	culture = aleman
+}
-	religion = roman_catholic
+2782 = {
+	holding = none
 }
 9705 = {
 	holding = none
 }
+###c_vorarlberg
+2787 = {
+	holding = none
+}
+2790 = {
+	holding = none
+}
+##d_south_tyrol
 ###c_lienz
 3134 = {
-	culture = austrian
-	religion = roman_catholic
-	holding = castle_holding
-}
-2951 = {
 	holding = none
-	1170.1.1 = {
-	holding = city_holding
-	}
 }
 9709 = {
 	holding = none
 }
-##d_south_tyrol
-###c_trent
-2499 = {
-	culture = austrian
-	religion = roman_catholic
-	holding = castle_holding
-	1066.1.1 = {
-	buildings = {
-	quarries_01
-	pastures_01
-	}
-	}
-}
-2495 = {
-	holding = city_holding
-}
-8761 = {
-	holding = none
-}
 ###c_bozan
 2498 = {
-	culture = austrian
+	holding = none
-	religion = roman_catholic
-	holding = castle_holding
 }
 2954 = {
-	holding = city_holding
+	holding = none
 }
 2955 = {
-	culture = bavarian
+	holding = none
-	religion = roman_catholic
-	holding = castle_holding
 }
 2952 = {
 	holding = none
 }
-#k_rhodania ###################################
+##d_lictenstein
-##d_lyonnais ###################################
+###c_vaduz
+2052 = {
+	holding = none
+}
+
+#k_rhodania
+##d_lyonnais
 ###c_rhone
 2017 = {	# Lyon
 	culture = pelonais
 	religion = helvetic
 	holding = castle_holding
+	special_building = fourviere_01
 }
-2018 = {	# Villefranche-sur-Saône
+2018 = {
-	holding = church_holding
-}
-###c_loire
-2019 = {	# Saint-Étienne
-	culture = rottisch
-	religion = genevan
-	holding = church_holding
-}
-2020 = {	# Roanne
-	holding = city_holding
-}
-2021 = {	# Montbrison
-	culture = rottisch
-	religion = genevan
-	holding = castle_holding
-}
-###c_ain
-2023 = {	# Bourg-en-Bresse
-	culture = pelonais
-	religion = helvetic
-	holding = castle_holding
-}
-2024 = {	# Ambérieu-en-Bugey
-	holding = church_holding
-}
-2025 = {	# Oyonnax
-	holding = city_holding
-}
-2026 = {	# Belley
 	holding = none
 }
-##d_dauphine_fr ###################################
+###c_ain
+2023 = {
+	holding = none
+}
+2024 = {
+	holding = none
+}
+2025 = {
+	holding = none
+}
+2026 = {
+	holding = none
+}
+###c_loire
+2021 = {
+	holding = none
+}
+2019 = {
+	holding = none
+}
+2020 = {
+	holding = none
+}
+##d_dauphine_fr
 ###c_isere
 2027 = {	# Grenoble
 	culture = patoues
 	religion = rocambolist
 	holding = castle_holding
+	special_building_slot = generic_university
 }
 2028 = {	# Vienne
 	holding = city_holding
@@ -288,96 +279,54 @@
 2030 = {	# Voiron
 	holding = none
 }
-2031 = {	# La Mure
+2028 = {
+	holding = none
+}
+2029 = {
+	holding = none
+}
+2030 = {
+	holding = none
+}
+2031 = {
 	holding = none
 }
 ###c_drome
-2032 = {	# Valence
+2032 = {
-	culture = provencal
+	holding = none
-	religion = rocambolist
-	holding = castle_holding
 }
-2033 = {	# Montélimar
+2033 = {
-	holding = city_holding
+	holding = none
 }
-2034 = {	# Nyons
+2034 = {
-	holding = church_holding
+	holding = none
 }
-2036 = {	# Die
+2036 = {
 	holding = none
 }
 ###c_upper_alps
-2059 = {	# Gap
+2059 = {
-	culture = provencal
-	religion = rocambolist
-	holding = castle_holding
-}
-2060 = {	# Briançon
 	holding = none
 }
-2061 = {	# Embrun
+2060 = {
 	holding = none
 }
-##d_provence_fr ###################################
+2061 = {
+	holding = none
+}
+##d_provence_fr
 ###c_bouches_du_rhone
-2062 = {	# Marseille
+2062 = {
-	culture = beur
+	holding = none
-	religion = simurghi
-	holding = castle_holding
-	special_building = statue_isildur_01
 }
-2064 = {	# Aix-en-Provence
+2064 = {
-	holding = city_holding
+	holding = none
 }
 ###c_camargue
-2066 = {	# Arles
+2066 = {
-	culture = provencal
-	religion = simurghi
-	holding = castle_holding
-}
-2065 = {	# Saintes-Maries-de-la-Mer
-	holding = church_holding
-}
-###c_vaucluse
-2067 = {	# Avignon
-	culture = provencal
-	religion = rocambolist
-	holding = castle_holding
-}
-2068 = {	# Carpentras
-	holding = city_holding
-}
-2069 = {	# Apt
-	holding = church_holding
-}
-###c_lower_alps
-2070 = {	# Forcalquier
-	culture = provencal
-	religion = rocambolist
-	holding = castle_holding
-}
-2071 = {	# Digne-les-Bains
-	holding = church_holding
-}
-2297 = {	# Castellane
 	holding = none
 }
-2298 = {	# Barcelonette
+2065 = {
-	holding = none
-}
-###c_var
-2301 = {	# Toulon
-	culture = azurrano
-	religion = simurghi
-	holding = castle_holding
-}
-2305 = {	# Fréjus
-	holding = city_holding
-}
-2455 = {	# Draguignan
-	holding = church_holding
-}
-3256 = {	# Brignoles
 	holding = none
 }
 ###c_alpes_maritimes
@@ -393,35 +342,55 @@
 	culture = azurrano
 	religion = fraticelli
 	holding = castle_holding
+	special_building = fortified_port_of_monaco_01
 }
 8720 = {	# Tende
 	holding = none
 }
-##d_savoie ###################################
+8718 = {
-###c_savoy
-8721 = {	# Chambéry
-	culture = patoues
-	religion = helvetic
-	holding = castle_holding
-}
-9711 = {	# Albertville
-	holding = church_holding
-}
-9712 = {	# Saint-Jean-de-Maurienne
 	holding = none
 }
-9797 = {	# Bourg-Saint-Maurice
+8720 = {
 	holding = none
 }
-###c_upper_savoy
+###c_lower_alps
-13276 = {	# Annecy
+2070 = {
-	culture = patoues
+	holding = none
-	religion = helvetic
-	holding = castle_holding
 }
-13277 = {	# Thonon-les-Bains
+2071 = {
-	holding = city_holding
+	holding = none
 }
-13278 = {	# Bonneville
+2297 = {
-	holding = church_holding
+	holding = none
+}
+2298 = {
+	holding = none
+}
+###c_var
+2301 = {
+	holding = none
+}
+2305 = {
+	holding = none
+}
+2455 = {
+	holding = none
+}
+3256 = {
+	holding = none
+}
+###c_vaucluse
+2067 = {
+	holding = none
+}
+2068 = {
+	holding = none
+}
+2069 = {
+	holding = none
+}
+##d_monaco
+###c_monaco
+8719 = {
+	holding = none
 }

history/provinces/e_britannia.txt

@@ -72,24 +72,25 @@
 1540 = {
 	holding = church_holding
 }
-###c_cambridgeshire
+###c_essex
-1534 = {
+1514 = {
-	culture = easlander
-	religion = victorian
-	holding = castle_holding
-}
-1536 = {
-	holding = city_holding
-}
-1541 = {
 	culture = soueyrneg
 	religion = victorian
-	holding = church_holding
+	holding = castle_holding
+	1100.11.11 = {
+	culture = soueyrneg
+	}
 }
-1543 = {
+1515 = {
+	holding = city_holding
+}
+1517 = {
+	holding = city_holding
+}
+1516 = {
 	holding = none
 }
-1542 = {
+9733 = {
 	holding = none
 }
 ###c_hertfordshire
@@ -135,25 +136,24 @@
 1537 = {
 	holding = church_holding
 }
-###c_essex
+###c_cambridgeshire
-1514 = {
+1534 = {
-	culture = soueyrneg
+	culture = easlander
 	religion = victorian
 	holding = castle_holding
-	1100.11.11 = {
+}
+1536 = {
+	holding = city_holding
+}
+1541 = {
 	culture = soueyrneg
-	}
+	religion = victorian
+	holding = church_holding
 }
-1515 = {
+1543 = {
-	holding = city_holding
-}
-1517 = {
-	holding = city_holding
-}
-1516 = {
 	holding = none
 }
-9733 = {
+1542 = {
 	holding = none
 }
 ###c_suffolk
@@ -207,35 +207,22 @@
 9732 = {
 	holding = none
 }
-##d_gloucester
+##d_buckingham
-###c_gloucestershire
+###c_berkshire
-1580 = {
+1555 = {
-	culture = prytoneg
+	culture = soueyrneg
-	religion = avalonian
+	religion = victorian
 	holding = castle_holding
-	767.1.1 = {
+}
-	special_building = dean_mines_01
+1556 = {
+	holding = none
+	1066.1.1 = {
+	holding = city_holding
 	}
 }
-1582 = {
+1557 = {
 	holding = church_holding
 }
-9730 = {
-	holding = none
-}
-###c_avon
-1581 = {
-	culture = weslander
-	religion = victorian
-	holding = city_holding
-}
-1577 = {
-	holding = none
-}
-1576 = {
-	holding = church_holding
-}
-##d_buckingham
 ###c_oxfordshire
 1558 = {
 	culture = soueyrneg
@@ -252,21 +239,6 @@
 1560 = {
 	holding = none
 }
-1557 = {
-	holding = church_holding
-}
-###c_berkshire
-1555 = {
-	culture = soueyrneg
-	religion = victorian
-	holding = castle_holding
-}
-1556 = {
-	holding = none
-	1066.1.1 = {
-	holding = city_holding
-	}
-}
 ###c_buckinghamshire
 1554 = {
 	culture = soueyrneg
@@ -282,7 +254,6 @@
 	holding = city_holding
 	}
 }
-
 ##d_canterbury
 ###c_kent
 1502 = {
@@ -332,20 +303,21 @@
 9735 = {
 	holding = none
 }
-###c_sussex
+###c_west_sussex
-1506 = {
-	culture = soueyrneg
-	religion = victorian
-	holding = city_holding
-}
-1507 = {
-	holding = church_holding
-}
 1508 = {
 	culture = souflander
 	religion = victorian
 	holding = castle_holding
 }
+1507 = {
+	holding = church_holding
+}
+###c_east_sussex
+1506 = {
+	culture = soueyrneg
+	religion = victorian
+	holding = city_holding
+}
 1509 = {
 	holding = castle_holding
 }
@@ -386,6 +358,18 @@
 	holding = castle_holding
 }
 ##d_somerset
+###c_avon
+1581 = {
+	culture = weslander
+	religion = victorian
+	holding = city_holding
+}
+1577 = {
+	holding = none
+}
+1576 = {
+	holding = church_holding
+}
 ###c_wiltshire
 1561 = {
 	culture = souflander
@@ -443,6 +427,39 @@
 9729 = {
 	holding = city_holding
 }
+##d_lincoln
+###c_lincolnshire
+1583 = {
+	culture = easlander
+	religion = anglican_england
+	holding = castle_holding
+	1066.1.1 = {
+	buildings = {
+	cereal_fields_01
+	barracks_01
+	}
+	}
+}
+1586 = {
+	holding = none
+}
+1587 = {
+	holding = city_holding
+}
+###c_stamford
+1584 = {
+	holding = castle_holding
+	culture = easlander
+	religion = anglican_england
+}
+1601 = {
+	holding = city_holding
+	culture = easlander
+	religion = victorian
+}
+1585 = {
+	holding = none
+}
 ##d_cornwall
 ###c_devon
 1569 = {
@@ -527,16 +544,16 @@
 	holding = none
 }
 ###c_tyne_and_wear
-9714 = {
-	culture = norflander
-	religion = anglican_england
-	holding = castle_holding
-}
 1606 = {
 	holding = city_holding
 	culture = norflander
 	religion = anglican_england
 }
+9714 = {
+	culture = norflander
+	religion = anglican_england
+	holding = castle_holding
+}
 ###c_durham
 9716 = {
 	culture = norflander
@@ -552,21 +569,51 @@
 	religion = anglican_england
 }
 ##d_lancaster
+###c_liverpool
+9720 = {
+	culture = scouseg
+	religion = victorian
+	holding = city_holding
+}
+1643 = {
+	culture = prytoneg
+	religion = victorian
+	holding = castle_holding
+	767.1.1 = {
+	special_building = offas_dyke_01
+	}
+}
+1644 = {
+	holding = city_holding
+}
 ###c_lancashire
 1639 = {
 	culture = scouseg
 	religion = victorian
 	holding = castle_holding
 }
-1640 = {
-	holding = city_holding
-}
 1641 = {
 	holding = none
 }
 9719 = {
 	holding = none
 }
+###c_cheshire
+9721 = {
+	holding = castle_holding
+	culture = scouseg
+	religion = trenchsinger
+}
+1645 = {
+	holding = none
+	950.1.1 = {
+	holding = church_holding
+	}
+}
+1640 = {
+	holding = city_holding
+}
+##d_cumbria
 ###c_cumberland
 1635 = {
 	culture = scouseg
@@ -606,35 +653,6 @@
 9718 = {
 	holding = none
 }
-###c_cheshire
-9721 = {
-	holding = castle_holding
-	culture = scouseg
-	religion = trenchsinger
-}
-1645 = {
-	holding = none
-	950.1.1 = {
-	holding = church_holding
-	}
-}
-1644 = {
-	holding = city_holding
-}
-###c_liverpool
-9720 = {
-	culture = scouseg
-	religion = victorian
-	holding = city_holding
-}
-1643 = {
-	culture = prytoneg
-	religion = victorian
-	holding = castle_holding
-	767.1.1 = {
-	special_building = offas_dyke_01
-	}
-}
 ##d_york
 ###c_north_riding
 1595 = {
@@ -670,11 +688,6 @@
 	holding = none
 }
 ###c_east_riding
-1588 = {
-	culture = norflander
-	religion = anglican_england
-	holding = city_holding
-}
 1589 = {
 	holding = none
 	1000.1.1 = {
@@ -683,6 +696,11 @@
 	religion = old_thelema
 	}
 }
+1588 = {
+	culture = norflander
+	religion = anglican_england
+	holding = city_holding
+}
 1590 = {
 	holding = church_holding
 }
@@ -713,39 +731,6 @@
 	holding = castle_holding
 	}
 }
-##d_lincoln
-###c_lincolnshire
-1583 = {
-	culture = easlander
-	religion = anglican_england
-	holding = castle_holding
-	1066.1.1 = {
-	buildings = {
-	cereal_fields_01
-	barracks_01
-	}
-	}
-}
-1586 = {
-	holding = none
-}
-1587 = {
-	holding = city_holding
-}
-###c_stamford
-1584 = {
-	holding = castle_holding
-	culture = easlander
-	religion = anglican_england
-}
-1601 = {
-	holding = city_holding
-	culture = easlander
-	religion = victorian
-}
-1585 = {
-	holding = none
-}
 ##d_nottingham
 ###c_nottinghamshire
 1618 = {
@@ -798,6 +783,21 @@
 
 #k_wales
 ##d_hereford
+###c_gloucestershire
+1580 = {
+	culture = prytoneg
+	religion = avalonian
+	holding = castle_holding
+	767.1.1 = {
+	special_building = dean_mines_01
+	}
+}
+1582 = {
+	holding = church_holding
+}
+9730 = {
+	holding = none
+}
 ###c_shropshire
 1646 = {
 	culture = prytoneg
@@ -846,21 +846,6 @@
 1624 = {
 	holding = church_holding
 }
-###c_worcestershire
-1625 = {
-	culture = prytoneg
-	religion = arcane
-	holding = castle_holding
-}
-1626 = {
-	holding = church_holding
-}
-9724 = {
-	holding = city_holding
-}
-9725 = {
-	holding = none
-}
 ##d_gwynedd
 ###c_caernarfonshire
 1667 = {
@@ -920,6 +905,11 @@
 	holding = none
 }
 ###c_warwickshire
+1605 = {
+	culture = prytoneg
+	religion = arcane
+	holding = city_holding
+}
 1603 = {
 	culture = prytoneg
 	religion = arcane
@@ -928,12 +918,22 @@
 1604 = {
 	holding = church_holding
 }
-1605 = {
+9727 = {
+	holding = none
+}
+###c_worcestershire
+1625 = {
 	culture = prytoneg
 	religion = arcane
+	holding = castle_holding
+}
+1626 = {
+	holding = church_holding
+}
+9724 = {
 	holding = city_holding
 }
-9727 = {
+9725 = {
 	holding = none
 }
 ##d_powys
@@ -1071,6 +1071,9 @@
 1726 = {
 	holding = church_holding
 }
+1736 = {
+	holding = none
+}
 ###c_strathearn
 1734 = {
 	culture = scottish
@@ -1086,8 +1089,8 @@
 1733 = {
 	holding = church_holding
 }
-1736 = {
+1697 = {
-	holding = none
+	holding = castle_holding
 }
 ###c_atholl
 1743 = {
@@ -1098,62 +1101,19 @@
 1744 = {
 	holding = none
 }
-1710 = {
-	holding = none
-}
-###c_angus
-1720 = {
-	culture = scottish
-	religion = old_thelema
-	holding = tribal_holding
-}
-1721 = {
-	holding = church_holding
-}
-1719 = {
-	holding = none
-}
 ##d_strathclyde
 ###c_lennox
-1695 = {
-		holding = castle_holding
-}
 1696 = {
 	holding = city_holding
 	culture = strafclideg
 	religion = old_thelema
 }
-1697 = {
-	holding = castle_holding
-}
-###c_ayrshire
-1686 = {
-	culture = strafclideg
-	religion = old_thelema
-	holding = castle_holding
-}
 1687 = {
 	holding = none
 }
-1688 = {
+1695 = {
-	holding = none
+	holding = castle_holding
 }
-###c_argyll
-1700 = {
-	culture = gaelic
-	religion = presbyterian
-	holding = tribal_holding
-}
-1701 = {
-	holding = none
-}
-1702 = {
-	holding = none
-}
-9695 = {
-	holding = none
-}
-##d_galloway
 ###c_lanarkshire
 1737 = {
 	culture = strafclideg
@@ -1169,6 +1129,30 @@
 	holding = city_holding
 	}
 }
+###c_ayrshire
+1686 = {
+	culture = strafclideg
+	religion = old_thelema
+	holding = castle_holding
+}
+1688 = {
+	holding = none
+}
+1690 = {
+	holding = none
+}
+1680 = {
+	culture = strafclideg
+	religion = presbyterian
+	holding = castle_holding
+}
+1685 = {
+	holding = none
+}
+9694 = {
+	holding = none
+}
+##d_galloway
 ###c_galloway
 1682 = {
 	culture = strafclideg
@@ -1181,18 +1165,6 @@
 1684 = {
 	holding = none
 }
-###c_carrick
-1680 = {
-	culture = strafclideg
-	religion = presbyterian
-	holding = castle_holding
-}
-1685 = {
-	holding = none
-}
-9694 = {
-	holding = none
-}
 ###c_annandale
 1679 = {
 	culture = strafclideg
@@ -1203,12 +1175,6 @@
 	holding = city_holding
 }
 ##d_highlands
-###c_orkney
-8 = {
-	culture = scottish
-	religion = jack_tar
-	holding = tribal_holding
-}
 ###c_inverness
 1709 = {
 	culture = gaelic
@@ -1223,10 +1189,10 @@
 	culture = gaelic
 	religion = presbyterian
 }
-8776 = {
+1701 = {
 	holding = none
 }
-35 = {
+1710 = {
 	holding = none
 }
 ###c_ross
@@ -1238,6 +1204,9 @@
 1704 = {
 	holding = none
 }
+8776 = {
+	holding = none
+}
 8777 = {
 	holding = none
 }
@@ -1266,13 +1235,25 @@
 	holding = church_holding
 }
 ##d_western_isles
+###c_argyll
+1700 = {
+	culture = gaelic
+	religion = presbyterian
+	holding = tribal_holding
+}
+1702 = {
+	holding = none
+}
+9695 = {
+	holding = none
+}
 ###c_inner_hebrides
 1689 = {
 	culture = gaelic
 	religion = celtic
 	holding = tribal_holding
 }
-1690 = {
+35 = {
 	holding = none
 }
 1691 = {
@@ -1346,7 +1327,7 @@
 	religion = old_thelema
 	holding = tribal_holding
 	935.1.1 = {
-		holding = castle_holding
+	holding = castle_holding
 	}
 }
 1732 = {
@@ -1368,6 +1349,18 @@
 1717 = {
 	holding = none
 }
+###c_angus
+1720 = {
+	culture = scottish
+	religion = old_thelema
+	holding = tribal_holding
+}
+1721 = {
+	holding = church_holding
+}
+1719 = {
+	holding = none
+}
 ###c_buchan
 1714 = {
 	holding = tribal_holding
@@ -1392,6 +1385,29 @@
 1723 = {
 	holding = none
 }
+##d_northern_isles
+###c_orkney
+8 = {
+	culture = scottish
+	religion = jack_tar
+	holding = tribal_holding
+}
+###c_shetland
+7 = {
+	culture = pictish
+	religion = lutheran
+	holding = tribal_holding
+	855.1.1 = {
+	culture = norse
+	religion = norse_pagan
+	}
+	1000.1.1 = {
+	religion = jack_tar
+	holding = tribal_holding
+	}
+	1066.1.1 = { culture = vestsk }
+	1334.1.1 = { culture = scottish }
+}
 
 #k_ireland
 ##d_meath

history/provinces/e_europa.txt

@@ -179,33 +179,6 @@
 2419 = {
 	holding = city_holding
 }
-###c_ostfriesland
-2418 = {
-	culture = dutch
-	religion = lutheran
-	holding = castle_holding
-	1178.1.1 = {
-	culture = frisian
-	}
-}
-2437 = {
-	holding = none
-}
-2436 = {
-	holding = church_holding
-}
-###c_oldenburg
-2438 = {
-	culture = low_saxon
-	religion = lutheran
-	holding = castle_holding
-}
-2454 = {
-	holding = none
-	1144.1.1 = {
-	holding = church_holding
-	}
-}
 ###c_frisia
 2413 = {
 	culture = dutch
@@ -242,6 +215,206 @@
 	religion = corsair
 }
 
+#k_westphalia
+##d_weserems
+###c_osnabruck
+2440 = {
+	culture = low_saxon
+	religion = illuminated
+	holding = castle_holding
+}
+2445 = {
+	holding = church_holding
+}
+2444 = {
+	holding = none
+	1070.1.1 = {
+	holding = city_holding
+	}
+}
+###c_tecklenburg
+2439 = {
+	culture = low_saxon
+	religion = genevan
+	holding = castle_holding
+}
+2441 = {
+	holding = none
+}
+2430 = {
+	holding = none
+	1050.1.1 = {
+	holding = city_holding
+	}
+}
+###c_ostfriesland
+2418 = {
+	culture = dutch
+	religion = lutheran
+	holding = castle_holding
+	1178.1.1 = {
+	culture = frisian
+	}
+}
+2437 = {
+	holding = none
+}
+2436 = {
+	holding = church_holding
+}
+###c_oldenburg
+2438 = {
+	culture = low_saxon
+	religion = lutheran
+	holding = castle_holding
+}
+2454 = {
+	holding = none
+	1144.1.1 = {
+	holding = church_holding
+	}
+}
+2442 = {
+	holding = none
+}
+##d_lower_lorraine
+###c_dortmund
+2673 = {
+	culture = kleverlandish
+	religion = concordianist
+	holding = castle_holding
+}
+2677 = {
+	holding = church_holding
+}
+2675 = {
+	holding = none
+	1000.1.1 = {
+	holding = city_holding
+	}
+}
+2435 = {
+	holding = none
+}
+###c_dusseldorf
+2433 = {
+	culture = rhinelander
+	religion = roman_catholic
+	holding = castle_holding
+}
+2679 = {
+	culture = franconian
+	religion = roman_catholic
+	holding = castle_holding
+}
+2678 = {
+	holding = none
+}
+2676 = {
+	holding = none
+	1066.1.1 = {
+	holding = city_holding
+	}
+}
+2688 = {
+	holding = city_holding
+}
+###c_nassau
+2692 = {
+	culture = rhinelander
+	religion = roman_catholic
+	holding = castle_holding
+}
+2851 = {
+	holding = none
+}
+2689 = {
+	culture = turkisch
+	religion = concordianist
+	holding = castle_holding
+}
+2691 = {
+	culture = hessian
+	religion = concordianist
+	holding = castle_holding
+}
+2690 = {
+	holding = none
+}
+##d_westfalen
+###c_munster
+2670 = {
+	culture = low_saxon
+	religion = illuminated
+	holding = tribal_holding
+}
+2671 = {
+	holding = none
+}
+2672 = {
+	holding = none
+}
+2446 = {
+	holding = none
+}
+###c_paderborn
+2847 = {
+	culture = low_saxon
+	religion = volksmarchen
+	holding = tribal_holding
+}
+2848 = {
+	culture = low_saxon
+	holding = none
+}
+2841 = {
+	holding = none
+}
+2842 = {
+	holding = none
+}
+###c_lippe
+2844 = {
+	culture = low_saxon
+	religion = volksmarchen
+	holding = castle_holding
+}
+2909 = {
+	holding = city_holding
+}
+2910 = {
+	holding = none
+}
+2840 = {
+	holding = none
+}
+2443 = {
+	holding = none
+	1066.1.1 = {
+	holding = castle_holding
+	}
+}
+###c_arnsberg
+2674 = {
+	culture = hessian
+	religion = illuminated
+	holding = tribal_holding
+}
+2680 = {
+	holding = none
+}
+2681 = {
+	holding = none
+}
+2843 = {
+	holding = none
+}
+2852 = {
+	culture = franconian
+	religion = concordianist
+	holding = castle_holding
+}
+
 #k_lotharingia
 ##d_luxembourg
 ###c_luxembourg
@@ -262,6 +435,12 @@
 2090 = {
 	holding = city_holding
 }
+###c_bitburg
+2089 = {
+	culture = rhinelander
+	religion = carolingian
+	holding = castle_holding
+}
 ###c_verviers
 2448 = {
 	culture = limburgisch
@@ -328,12 +507,92 @@
 2684 = {
 	holding = church_holding
 }
-###c_bitburg
+###c_cologne
-2089 = {
+2088 = {
+	culture = rhinelander
+	religion = roman_catholic
+	holding = castle_holding
+	special_building_slot = holy_site_cologne_cathedral_01
+	867.1.1 = {
+	buildings = {
+	cereal_fields_01
+	}
+	}
+	1066.1.1 = {
+	buildings = {
+	cereal_fields_01
+	farm_estates_01
+	}
+	}
+}
+2087 = {
+	holding = city_holding
+}
+2682 = {
 	culture = rhinelander
 	religion = carolingian
 	holding = castle_holding
 }
+###c_cleves
+2104 = {
+	culture = kleverlandish
+	religion = concordianist
+	holding = castle_holding
+}
+2101 = {
+	holding = none
+	1150.1.1 = {
+	holding = city_holding
+	}
+}
+##d_trier
+###c_trier
+2085 = {
+	culture = rhinelander
+	religion = carolingian
+	holding = castle_holding
+	1066.1.1 = {
+	buildings = {
+	cereal_fields_01
+	pastures_01
+	}
+	}
+}
+2083 = {
+	holding = church_holding
+}
+2700 = {
+	holding = city_holding
+}
+###c_adenau
+2084 = {
+	culture = rhinelander
+	religion = carolingian
+	holding = castle_holding
+}
+2086 = {
+	culture = rhinelander
+	religion = carolingian
+	holding = castle_holding
+}
+2697 = {
+	holding = city_holding
+}
+2696 = {
+	holding = none
+}
+2685 = {
+	holding = none
+}
+###c_saarbrucken
+2704 = {
+	culture = palatine
+	religion = roman_catholic
+	holding = castle_holding
+}
+2703 = {
+	holding = city_holding
+}
 ##d_bar
 ###c_bar
 2388 = {
@@ -406,6 +665,12 @@
 2711 = {
 	holding = church_holding
 }
+2705 = {
+	holding = none
+	1066.1.1 = {
+	holding = city_holding
+	}
+}
 2712 = {
 	holding = none
 }
@@ -509,45 +774,6 @@
 	religion = trenchsinger
 	holding = castle_holding
 }
-##d_flanders
-###c_brugge
-2115 = {
-	culture = belge
-	religion = trenchsinger
-	holding = castle_holding
-	1066.1.1 = {
-	buildings = {
-	common_tradeport_02
-	farm_estates_01
-	}
-	}
-}
-2124 = {
-	holding = city_holding
-}
-2125 = {
-	culture = belge
-	religion = trenchsinger
-	holding = castle_holding
-}
-2128 = {
-	holding = none
-	877.1.1 = {
-	holding = church_holding
-	}
-}
-2123 = {
-	holding = city_holding
-}
-###c_gent
-2114 = {
-	holding = castle_holding
-	culture = belge
-	religion = concordianist
-}
-9739 = {
-	holding = none
-}
 ###c_lille
 2126 = {
 	culture = belge
@@ -610,7 +836,7 @@
 	holding = castle_holding
 	special_building = zone_rouge_01
 }
-###c_vermandois # Aisne
+###c_vermandois
 2400 = {
 	culture = picard
 	religion = trenchsinger
@@ -621,8 +847,46 @@
 	holding = city_holding
 	special_building = zone_rouge_01
 }
-
 2397 = {
 	holding = church_holding
 	special_building = zone_rouge_01
 }
+##d_flanders
+###c_brugge
+2115 = {
+	culture = belge
+	religion = trenchsinger
+	holding = castle_holding
+	1066.1.1 = {
+	buildings = {
+	common_tradeport_02
+	farm_estates_01
+	}
+	}
+}
+2124 = {
+	holding = city_holding
+}
+2125 = {
+	culture = belge
+	religion = trenchsinger
+	holding = castle_holding
+}
+2128 = {
+	holding = none
+	877.1.1 = {
+	holding = church_holding
+	}
+}
+2123 = {
+	holding = city_holding
+}
+###c_gent
+2114 = {
+	holding = castle_holding
+	culture = belge
+	religion = concordianist
+}
+9739 = {
+	holding = none
+}

history/provinces/e_france.txt

@@ -1,3 +1,4 @@
+
 #k_brittany
 ##d_brittany
 ###c_french_leon
@@ -39,18 +40,19 @@
 	religion = numenorian
 	holding = castle_holding
 }
-2155 = {
-	holding = city_holding
-}
 2160 = {
 	holding = none
 }
+2155 = {
+	holding = city_holding
+}
 ##d_upper_brittany
 ###c_rennes
 2165 = {
 	culture = galo
 	religion = numenorian
 	holding = castle_holding
+	special_building_slot = generic_university
 	1066.1.1 = {
 	buildings = {
 	ramparts_01
@@ -69,13 +71,13 @@
 	culture = galo
 	religion = numenorian
 	holding = castle_holding
+	special_building = chateau_bretagne_01
 }
 2153 = {
 	holding = church_holding
 }
 2166 = {
 	holding = city_holding
-	}
 }
 2151 = {
 	holding = none
@@ -86,6 +88,8 @@
 ###c_saint_malo
 2164 = {
 	holding = castle_holding
+	culture = galo
+	religion = numenorian
 }
 3222 = {
 	holding = church_holding
@@ -135,6 +139,11 @@
 	holding = castle_holding
 }
 ###c_coulommiers
+2359 = {
+	culture = metropolitain
+	religion = numenorian
+	holding = castle_holding
+}
 2364 = {
 	culture = metropolitain
 	religion = numenorian
@@ -143,11 +152,6 @@
 2361 = {
 	holding = castle_holding
 }
-2359 = {
-	culture = metropolitain
-	religion = numenorian
-	holding = castle_holding
-}
 ###c_yvelines
 2334 = {
 	culture = metropolitain
@@ -237,30 +241,6 @@
 	holding = church_holding
 }
 ##d_valois
-###c_eu
-2177 = {
-	holding = city_holding
-	culture = normaund
-	religion = numenorian
-}
-2178 = {
-	holding = castle_holding
-}
-2182 = {
-	holding = none
-	996.1.1 = {
-	holding = castle_holding
-	}
-}
-###c_creil
-2358 = {
-	culture = picard
-	religion = numenorian
-	holding = castle_holding
-}
-2360 = {
-	holding = city_holding
-}
 ###c_somme
 2184 = {
 	culture = picard
@@ -281,6 +261,18 @@
 2188 = {
 	holding = city_holding
 }
+###c_creil
+2358 = {
+	culture = picard
+	religion = numenorian
+	holding = castle_holding
+}
+2360 = {
+	holding = city_holding
+}
+2362 = {
+	holding = city_holding
+}
 ###c_clermont
 2189 = {
 	culture = picard
@@ -446,6 +438,21 @@
 2176 = {
 	holding = church_holding
 }
+###c_eu
+2177 = {
+	holding = city_holding
+	culture = normaund
+	religion = numenorian
+}
+2178 = {
+	holding = castle_holding
+}
+2182 = {
+	holding = none
+	996.1.1 = {
+	holding = castle_holding
+	}
+}
 ###c_evreux
 2329 = {
 	culture = normaund
@@ -462,16 +469,14 @@
 	holding = city_holding
 }
 ###c_bayeux
-2170 = {
-	#culture = normaund
-	#religion = victorian
-	holding = city_holding
-}
 2172 = {
 	culture = normaund
 	religion = orleaniste
 	holding = castle_holding
 }
+2170 = {
+	holding = city_holding
+}
 2173 = {
 	holding = none
 }
@@ -516,7 +521,7 @@
 2328 = {
 	holding = none
 }
-##d_orleans
+##d_orleanais
 ###c_orleans
 2338 = {
 	culture = metropolitain
@@ -543,7 +548,7 @@
 	religion = orleaniste
 	holding = castle_holding
 }
-###c_chartres
+###c_eure_et_loir
 2331 = {
 	culture = metropolitain
 	religion = numenorian
@@ -561,7 +566,7 @@
 2320 = {
 	holding = church_holding
 }
-###c_blois
+###c_loir_et_cher
 2319 = {
 	culture = metropolitain
 	religion = girondin
@@ -602,9 +607,6 @@
 2366 = {
 	holding = city_holding
 }
-2362 = {
-	holding = city_holding
-}
 2367 = {
 	holding = city_holding
 }
@@ -727,7 +729,6 @@
 2458 = {
 	holding = none
 }
-##d_lower_burgundy
 ###c_auxerre
 2346 = {
 	culture = bourguignon
@@ -756,7 +757,7 @@
 2341 = {
 	holding = castle_holding
 }
-###c_nevers
+###c_nievre
 2343 = {
 	culture = bourguignon
 	religion = girondin
@@ -788,6 +789,7 @@
 	culture = poitevin
 	religion = carolingian
 	holding = castle_holding
+	special_building_slot = generic_university
 	1066.1.1 = {
 	buildings = {
 	curtain_walls_01
@@ -848,7 +850,7 @@
 2257 = {
 	holding = church_holding
 }
-##d_la_rochelle
+##d_charentes
 ###c_angouleme
 2244 = {
 	culture = poitevin
@@ -886,6 +888,7 @@
 	culture = poitevin
 	religion = carolingian
 	holding = castle_holding
+	special_building_slot = port_of_la_rochelle_01
 }
 2243 = {
 	holding = none
@@ -893,60 +896,6 @@
 2146 = {
 	holding = none
 }
-##d_upper_burgundy
-###c_vesoul
-2077 = {
-	culture = bourguignon
-	religion = girondin
-	holding = castle_holding
-}
-2383 = {
-	holding = none
-}
-2076 = {
-	culture = pelonais
-	religion = girondin
-	holding = castle_holding
-}
-2192 = {
-	holding = church_holding
-}
-###c_besancon
-2459 = {
-	culture = pelonais
-	religion = helvetic
-	holding = castle_holding
-}
-2075 = {
-	holding = none
-}
-2057 = {
-	culture = elsasse
-	religion = volksmarchen
-	holding = castle_holding
-}
-9768 = {
-	holding = none
-}
-###c_dole
-2191 = {
-	culture = pelonais
-	religion = helvetic
-	holding = castle_holding
-}
-2073 = {
-	holding = city_holding
-}
-2072 = {
-	holding = none
-}
-2457 = {
-	holding = none
-	950.1.1 = {
-	holding = church_holding
-	}
-}
-
 
 #k_aquitaine
 ##d_gascogne
@@ -971,18 +920,7 @@
 2011 = {
 	holding = city_holding
 }
-2012 = {
+###c_bigorre
-	culture = basque
-	religion = sevillian
-	holding = castle_holding
-	1066.1.1 = {
-	buildings = {
-	hill_forts_01
-	common_tradeport_01
-	}
-	}
-}
-###c_comminges
 2009 = {
 	culture = gascon
 	religion = rocambolist
@@ -1026,6 +964,7 @@
 	culture = gascon
 	religion = rocambolist
 	holding = castle_holding
+	special_building = fort_de_bordeaux_01
 	867.1.1 = {
 	buildings = {
 	hunting_grounds_01
@@ -1130,38 +1069,22 @@
 	holding = castle_holding
 }
 ##d_languedoc
-###c_tarn
+###c_carcassonne
-2215 = {
+2006 = {
-	culture = axiton
+	culture = NEOW_sephardi
-	religion = carolingian
+	religion = congregationist
 	holding = castle_holding
 }
-2229 = {
+2005 = {
+	holding = city_holding
+}
+2212 = {
 	holding = none
+	1103.1.1 = {
+	holding = city_holding
+	}
 }
-2205 = {
+2007 = {
-	holding = none
-}
-2307 = {
-	culture = bourguignon
-	religion = rocambolist
-	holding = castle_holding
-}
-###c_rouergue
-2226 = {
-	culture = axiton
-	religion = carolingian
-	holding = castle_holding
-}
-2228 = {
-	holding = none
-}
-2222 = {
-	culture = axiton
-	religion = carolingian
-	holding = castle_holding
-}
-2220 = {
 	holding = none
 }
 ###c_gevaudan
@@ -1212,29 +1135,28 @@
 	holding = church_holding
 	}
 }
-###c_viviers
 ###c_ardeche
-2063 = {	# Privas
+2063 = {
 	culture = rottisch
 	religion = genevan
 	holding = castle_holding
 }
-2217 = {	# Annonay
+2217 = {
 	holding = city_holding
 }
-3258 = {	# Aubenas
+3258 = {
 	holding = church_holding
 }
-13279 = {	# Largentière
+13279 = {
 	holding = none
 }
-
 ##d_toulouse
 ###c_toulouse
 2214 = {
 	culture = axiton
 	religion = rocambolist
 	holding = castle_holding
+	special_building = capitole_toulouse_01
 	1066.1.1 = {
 	buildings = {
 	cereal_fields_01
@@ -1251,54 +1173,6 @@
 2008 = {
 	holding = church_holding
 }
-###c_carcassonne
-2006 = {
-	culture = NEOW_sephardi
-	religion = congregationist
-	holding = castle_holding
-}
-2005 = {
-	holding = city_holding
-}
-2212 = {
-	holding = none
-	1103.1.1 = {
-	holding = city_holding
-	}
-}
-2007 = {
-	holding = none
-}
-###c_foix
-2209 = {
-	culture = occitan
-	religion = iberian
-	holding = castle_holding
-}
-2210 = {
-	holding = city_holding
-}
-2211 = {
-	900.1.1 = {
-	holding = church_holding
-	}
-}
-###c_perpignan
-1866 = {
-	
-	religion = sevillian
-	holding = castle_holding
-	800.1.1 = { culture = catalan }
-}
-8798 = {
-	culture = catalan
-	religion = sevillian
-	holding = castle_holding
-}
-2447 = {
-	holding = church_holding
-}
-##d_quercy
 ###c_quercy
 2231 = {
 	holding = castle_holding
@@ -1328,6 +1202,40 @@
 	holding = castle_holding
 	}
 }
+###c_rouergue
+2226 = {
+	culture = axiton
+	religion = carolingian
+	holding = castle_holding
+}
+2228 = {
+	holding = none
+}
+2222 = {
+	culture = axiton
+	religion = carolingian
+	holding = castle_holding
+}
+2220 = {
+	holding = none
+}
+###c_tarn
+2215 = {
+	culture = axiton
+	religion = carolingian
+	holding = castle_holding
+}
+2229 = {
+	holding = none
+}
+2205 = {
+	holding = none
+}
+2307 = {
+	culture = bourguignon
+	religion = rocambolist
+	holding = castle_holding
+}
 ##d_auvergne
 ###c_auvergne
 2294 = {
@@ -1349,6 +1257,7 @@
 	culture = axiton
 	religion = girondin
 	holding = castle_holding
+	special_building_slot = generic_university
 }
 2288 = {
 	holding = none

history/provinces/e_iberia.txt

@@ -1,35 +1,8 @@
 
-#k_sevillian_state
-##d_sevillian_state
-###c_sevilla
-1981 = {
-	
-	religion = sevillian
-	holding = castle_holding
-	800.1.1 = { culture = andalusian }
-	867.1.1 = {
-	buildings = {
-	farm_estates_01
-	military_camps_01
-	}
-	}
-	1066.1.1 = {
-	buildings = {
-	farm_estates_01
-	curtain_walls_01
-	}
-	}
-	1263.1.1 = {
-	culture = NEOW_andalusian
-	religion = sevillian
-	}
-}
-
 #k_andalusia
 ##d_cordoba
 ###c_cordoba
 1995 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = andalusian }
@@ -63,7 +36,6 @@
 	}
 }
 1979 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = andalusian }
@@ -76,13 +48,11 @@
 	holding = church_holding
 }
 1986 = {
-	
 	religion = sevillian
 	holding = none
 }
 ###c_andujar
 1977 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = andalusian }
@@ -106,7 +76,6 @@
 ##d_murcia
 ###c_murcia
 1852 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = andalusian }
@@ -172,7 +141,6 @@
 }
 ###c_almeria
 1849 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = andalusian }
@@ -204,7 +172,6 @@
 	}
 }
 1845 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = andalusian }
@@ -214,39 +181,50 @@
 	}
 }
 ##d_sevilla
-###c_almonte
+###c_sevilla
+1981 = {
+	religion = sevillian
+	holding = castle_holding
+	800.1.1 = { culture = andalusian }
+	867.1.1 = {
+	buildings = {
+	farm_estates_01
+	military_camps_01
+	}
+	}
+	1066.1.1 = {
+	buildings = {
+	farm_estates_01
+	curtain_walls_01
+	}
+	}
+	1263.1.1 = {
+	culture = NEOW_andalusian
+	religion = sevillian
+	}
+}
+1841 = {
+	holding = city_holding
+}
+1994 = {
+	holding = city_holding
+}
 1993 = {
 	holding = castle_holding
 	culture = NEOW_andalusian
 	religion = sevillian
 }
-1841 = {
-	holding = city_holding
-}
 1980 = {
 	holding = castle_holding
 }
-1994 = {
-	holding = city_holding
-}
 1983 = {
 	holding = none
 	1066.1.1 = {
 	holding = church_holding
 	}
 }
-###c_gibraltar
-9769 = {
-	1.1.1 = {
-		special_building = rock_of_gibraltar_01
-	}
-	holding = castle_holding
-	culture = llanito
-	religion = jack_tar
-}
 ###c_cadiz
 1843 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = andalusian }
@@ -265,6 +243,11 @@
 	holding = city_holding
 }
 ###c_niebla
+1840 = {
+	holding = castle_holding
+	culture = NEOW_andalusian
+	religion = sevillian
+}
 1839 = {
 	culture = NEOW_andalusian
 	religion = sevillian
@@ -273,20 +256,24 @@
 1991 = {
 	holding = church_holding
 }
-1840 = {
-	holding = castle_holding
-	culture = NEOW_andalusian
-	religion = sevillian	
-}
 1992 = {
 	holding = none
 }
+##d_gibraltar
+###c_gibraltar
+9769 = {
+	1.1.1 = {
+	special_building = rock_of_gibraltar_01
+	}
+	holding = castle_holding
+	culture = llanito
+	religion = jack_tar
+}
 
 #k_castille_leon
 ##d_castilla
 ###c_burgos
 1906 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = castilian }
@@ -329,7 +316,6 @@
 }
 ###c_valladolid
 1897 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = castilian }
@@ -348,7 +334,6 @@
 	holding = church_holding
 }
 1912 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = andalusian }
@@ -374,7 +359,6 @@
 }
 ###c_cuellar
 1924 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = andalusian }
@@ -436,7 +420,6 @@
 }
 ###c_zamora
 1894 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = castilian }
@@ -445,7 +428,6 @@
 	holding = city_holding
 }
 1826 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = castilian }
@@ -476,7 +458,6 @@
 ##d_toledo
 ###c_toledo
 1919 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	650.1.1 = {
@@ -520,7 +501,6 @@
 }
 ###c_madrid
 1923 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = andalusian }
@@ -549,7 +529,6 @@
 }
 ###c_cuenca
 1947 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = andalusian }
@@ -571,7 +550,6 @@
 ##d_la_mancha
 ###c_calatrava
 1963 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = andalusian }
@@ -588,7 +566,6 @@
 	holding = church_holding
 }
 1987 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = andalusian }
@@ -617,7 +594,6 @@
 }
 ###c_mora
 1952 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = andalusian }
@@ -644,7 +620,6 @@
 ##d_badajoz
 ###c_badajoz
 1835 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = andalusian }
@@ -683,7 +658,6 @@
 }
 ###c_caceres
 1954 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = andalusian }
@@ -707,7 +681,6 @@
 }
 ###c_merida
 1834 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = andalusian }
@@ -740,7 +713,6 @@
 ##d_aragon
 ###c_zaragoza
 1887 = {
-	
 	religion = iberian
 	holding = castle_holding
 	special_building_slot = aljaferia_palace_01
@@ -779,7 +751,6 @@
 	holding = city_holding
 }
 1892 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = andalusian }
@@ -790,7 +761,6 @@
 	}
 }
 1936 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = andalusian }
@@ -836,7 +806,6 @@
 }
 ###c_calatayud
 1932 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = andalusian }
@@ -873,7 +842,6 @@
 ##d_valencia
 ###c_valencia
 1855 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = andalusian }
@@ -900,7 +868,6 @@
 }
 ###c_castellon
 1857 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = andalusian }
@@ -919,10 +886,8 @@
 	holding = city_holding
 	}
 }
-###c_denia
 ###c_alicante
 1853 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = andalusian }
@@ -936,7 +901,6 @@
 	holding = church_holding
 }
 1854 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = andalusian }
@@ -946,35 +910,9 @@
 	religion = sevillian
 	}
 }
-##d_mallorca
-###c_mallorca
-8735 = {
-	
-	religion = sevillian
-	holding = city_holding
-	800.1.1 = { culture = balearic }
-	928.1.1 = { religion = sevillian }
-	1245.1.1 = { religion = sevillian }
-}
-2001 = {
-	holding = castle_holding
-}
-###c_menorca
-2002 = {
-	culture = balearic
-	religion = sevillian
-	holding = city_holding
-}
-###c_iviza
-2000 = {
-	culture = sharoni
-	religion = congregationist
-	holding = city_holding
-}
 ##d_barcelona
 ###c_lleida
 1881 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = catalan }
@@ -996,7 +934,6 @@
 }
 ###c_barcelona
 1862 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = catalan }
@@ -1022,9 +959,22 @@
 1876 = {
 	holding = none
 }
+###c_perpignan
+1866 = {
+	religion = sevillian
+	holding = castle_holding
+	800.1.1 = { culture = catalan }
+}
+8798 = {
+	culture = catalan
+	religion = sevillian
+	holding = castle_holding
+}
+2447 = {
+	holding = church_holding
+}
 ###c_girona
 1864 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = catalan }
@@ -1043,7 +993,6 @@
 }
 ###c_tarragona
 1860 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = catalan }
@@ -1060,8 +1009,6 @@
 	holding = city_holding
 	}
 }
-
-#k_andorra
 ##d_andorra
 ###c_andorra
 1869 = {
@@ -1098,6 +1045,20 @@
 1870 = {
 	holding = castle_holding
 }
+###c_foix
+2209 = {
+	culture = occitan
+	religion = iberian
+	holding = castle_holding
+}
+2210 = {
+	holding = city_holding
+}
+2211 = {
+	900.1.1 = {
+	holding = church_holding
+	}
+}
 
 #k_navarra
 ##d_navarra
@@ -1145,6 +1106,18 @@
 	religion = sevillian
 	holding = castle_holding
 }
+###c_bayonne
+2012 = {
+	culture = basque
+	religion = sevillian
+	holding = castle_holding
+	1066.1.1 = {
+	buildings = {
+	hill_forts_01
+	common_tradeport_01
+	}
+	}
+}
 
 #k_asturias
 
@@ -1152,7 +1125,6 @@
 ##d_galicia
 ###c_coruna
 1787 = {
-	
 	religion = iberian
 	holding = castle_holding
 	98.1.1 = {
@@ -1167,7 +1139,6 @@
 	holding = none
 }
 1785 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = galician }
@@ -1189,7 +1160,6 @@
 }
 ###c_tui
 1781 = {
-	
 	religion = iberian
 	holding = castle_holding
 	800.1.1 = { culture = galician }
@@ -1205,7 +1175,6 @@
 }
 ###c_astorga
 1821 = {
-	
 	religion = iberian
 	holding = castle_holding
 	800.1.1 = { culture = galician }
@@ -1246,7 +1215,6 @@
 ##d_asturias
 ###c_asturias_de_oviedo
 1797 = {
-	
 	religion = penitente
 	holding = castle_holding
 	800.1.1 = { culture = asturleonese }
@@ -1259,7 +1227,6 @@
 }
 ###c_pravia
 1795 = {
-	
 	religion = penitente
 	holding = castle_holding
 	800.1.1 = { culture = asturleonese }
@@ -1301,7 +1268,6 @@
 }
 ###c_braganza
 1763 = {
-	
 	religion = iberian
 	holding = castle_holding
 	800.1.1 = { culture = galician }
@@ -1332,14 +1298,14 @@
 	religion = iberian
 	holding = castle_holding
 }
-1755 = {
-	holding = city_holding
-}
 1753 = {
 	holding = church_holding
 	culture = portuguese
 	religion = iberian
 }
+1755 = {
+	holding = city_holding
+}
 ###c_ribatejo
 1772 = {
 	culture = portuguese
@@ -1362,8 +1328,8 @@
 1751 = {
 	holding = city_holding
 }
+###c_moura
 1837 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = andalusian }
@@ -1409,7 +1375,6 @@
 ##d_algarve
 ###c_faro
 1748 = {
-	
 	religion = sevillian
 	holding = castle_holding
 	800.1.1 = { culture = andalusian }
@@ -1467,6 +1432,9 @@
 1771 = {
 	holding = city_holding
 }
+
+#k_canarias
+##d_canarias
 ###c_canarias
 8713 = {
 	culture = atlantannach
@@ -1476,7 +1444,7 @@
 849 = {
 	holding = city_holding
 }
-###c_fuertaventurea
+###c_fuerteventura
 8714 = {
 	culture = atlantannach
 	religion = iberian
@@ -1485,10 +1453,9 @@
 8715 = {
 	holding = city_holding
 }
-###c_maderia
+###c_madeira
 8716 = {
 	culture = atlantannach
 	religion = iberian
 	holding = castle_holding
 }
-

history/titles/k_sardinia_and_corsica.txt

@@ -47,13 +47,6 @@ d_siracusa = {
 #	}
 #}
 
-c_livorno = {
-	2550.1.1 = {
-		holder = italy_diana_bastia
-		liege = k_sardinia_and_corsica
-	}
-}
-
 c_lucca = {
 	2550.1.1 = {
 
@@ -63,7 +56,8 @@ c_lucca = {
 
 c_pisa = {
 	2550.1.1 = {
-		holder = italy_archibaldo_volterra
+		holder = italy_diana_bastia
+		liege = k_sardinia_and_corsica
 	}
 }
 c_parma = {
@@ -71,3 +65,8 @@ c_parma = {
 		holder = italy_riccardo_mastropiero
 	}
 }	
+c_prato = {
+	2550.1.1 = {
+		holder = italy_archibaldo_volterra
+	}
+}

localization/english/replace/NEOW_buildings_l_english.yml

@@ -119,3 +119,43 @@
  building_type_statue_isildur_01_desc:0 "$building_statue_isildur_01_desc$"
  building_statue_isildur_01:0 "Statue of Isildur Bonaparte"
  building_statue_isildur_01_desc:0 "WIP"
+
+ building_type_fourviere_01:1 "Fourvière"
+ building_type_fourviere_01_desc:0 "$building_fourviere_01_desc$"
+ building_fourviere_01:0 "Fourvière"
+ building_fourviere_01_desc:0 "WIP"
+
+ building_type_capitole_toulouse_01:1 "Capitole de Toulouse"
+ building_type_capitole_toulouse_01_desc:0 "$building_capitole_toulouse_01_desc$"
+ building_capitole_toulouse_01:0 "Capitole de Toulouse"
+ building_capitole_toulouse_01_desc:0 "WIP"
+
+ building_type_chateau_bretagne_01:1 "Château de Bretagne"
+ building_type_chateau_bretagne_01_desc:0 "$building_chateau_bretagne_01_desc$"
+ building_chateau_bretagne_01:0 "Château de Bretagne"
+ building_chateau_bretagne_01_desc:0 "WIP"
+ building_chateau_bretagne_02:0 "Château de Bretagne"
+ building_chateau_bretagne_02_desc:0 "WIP"
+
+ building_type_fort_de_bordeaux_01:1 "Fort de Bordeaux"
+ building_type_fort_de_bordeaux_01_desc:0 "$building_fort_de_bordeaux_01_desc$"
+ building_fort_de_bordeaux_01:0 "Fort de Bordeaux"
+ building_fort_de_bordeaux_01_desc:0 "WIP"
+
+ building_type_fortified_port_of_monaco_01:1 "Fortified Port of Monaco"
+ building_type_fortified_port_of_monaco_01_desc:0 "$building_fortified_port_of_monaco_01_desc$"
+ building_fortified_port_of_monaco_01:0 "Fortified Harbors"
+ building_fortified_port_of_monaco_01_desc:0 "WIP"
+ building_fortified_port_of_monaco_02:0 "Fortified Port"
+ building_fortified_port_of_monaco_02_desc:0 "WIP"
+ building_fortified_port_of_monaco_03:0 "Fortified Grand Port"
+ building_fortified_port_of_monaco_03_desc:0 "WIP"
+
+ building_type_port_of_la_rochelle_01:1 "Port of Calais"
+ building_type_port_of_la_rochelle_01_desc:0 "$building_port_of_la_rochelle_01$"
+ building_port_of_la_rochelle_01:0 "Extensive Harbour"
+ building_port_of_la_rochelle_01_desc:0 "A small port has been constructed in a trade-rich region to allow for easier transport of goods overseas. Several small harbors work together to bring goods in and out of the city, but the capacity is small while the opportunity is large."
+ building_port_of_la_rochelle_02:0 "Bustling Port"
+ building_port_of_la_rochelle_02_desc:0 "As trade grows, so does the port. With the influx of new merchants into the city, the port needs to grow too , harboring ships from faraway lands and trading goods never seen before."
+ building_port_of_la_rochelle_03:0 "Grand Port"
+ building_port_of_la_rochelle_03_desc:0 "As trade grew increasingly, several new docks were set up, covering almost the entire coastline of the city. New harbor storage and cargo cranes were needed. With the increased need for ships, several shipyards popped up to facilitate the new demand."

localization/english/replace/NEOW_succession_laws_l_english.yml

@@ -2,7 +2,7 @@
  theomonarchy_succession_law:0 "Pious Elective"
  theomonarchy_succession_law_effects:0 "The [ruler|E], all direct de facto [vassals|E] of one or two [ranks|E] below the [title|E] and all pious people in the realm can nominate a [title_heir|E] from among themselves and the [close_family|E] of the ruler."
  theomonarchy_elective_electors:0 "Ruler, Vassals and Pious People"
- theomonarchy_elective_electors_tooltip:0 "In order to be a valid [elector|E] under Pious Elective, a vassal must fulfill all the following conditions:\n$EFFECT_LIST_BULLET$Be a [de_jure|E] vassal of the title\n$EFFECT_LIST_BULLET$Be a direct vassal of the title\n$EFFECT_LIST_BULLET$Be only one or two [ranks|E] below the title\nOR as any courtier have atleast [piety_level|e] $piety_level_2$"
+ theomonarchy_elective_electors_tooltip:0 "In order to be a valid [elector|E] under Pious Elective, a vassal must fulfill all the following conditions:\n$EFFECT_LIST_BULLET$Be a [de_jure|E] vassal of the title\n$EFFECT_LIST_BULLET$Be a direct vassal of the title\n$EFFECT_LIST_BULLET$Be only one or two [ranks|E] below the title\nOR as any courtier have atleast [piety_level|e] [GetModifier( 'piety_level_2' ).GetNameWithTooltip|L]."
  theomonarchy_elective_candidates:0 "Close Family, Claimants, and Electors"
  theomonarchy_elective_candidates_tooltip:1 "In order to be a valid Candidate under Pious Elective, a character must fulfill one of the following conditions:\n$EFFECT_LIST_BULLET$Be a legitimate [close_family|E] member of the current ruler, who is not in line to inherit a Theocracy or Republic. Children of a candidate cannot be nominated\n$EFFECT_LIST_BULLET$Be a [claimant|E] to the title, who is not in line to inherit a Theocracy or Republic\n$EFFECT_LIST_BULLET$Be a valid Feudal [elector|E] to the title"
  

localization/english/replace/titles_l_english.yml

@@ -2835,7 +2835,7 @@
  b_caltavuturo:0 "Caltavuturo"
  b_calw:0 "Calw"
  b_camachus:0 "Camachus"
- b_camaldoli:0 "Camaldoli"
+ b_camaldoli:0 "Borgo San Lorenzo"
  b_camarda:0 "Camarda"
  b_camargo:0 "Camargo"
  b_cambrai:0 "Cambrai"
@@ -3151,7 +3151,7 @@
  b_chitrakut:0 "Chitrakut"
  b_chitrakuta:0 "Chitrakuta"
  b_chitral:0 "Chitral"
- b_chiusi:0 "Chiusi"
+ b_chiusi:0 "Sinalunga"
  b_chiva:0 "Chiva"
  b_chizha:0 "Chizha"
  b_chlifa:0 "Chlifa"
@@ -3204,7 +3204,7 @@
  b_cittadicastello:0 "Cittá di Castello"
  b_ciudadrodrigo:0 "Ciudad Rodrigo"
  b_ciutadella:0 "Ciutadella"
- b_civitas_castelli:0 "Civitas Castelli"
+ b_civitas_castelli:0 "Sansepolcro"
  b_civitavecchia:0 "Civitavecchia"
  b_civray:0 "Civray"
  b_cizre:0 "Cizre"
@@ -5119,7 +5119,7 @@
  b_ilza:0 "Iłża"
  b_imola:0 "Imola"
  b_imotski:0 "Imotski"
- b_impruneta:0 "Impruneta"
+ b_impruneta:0 "Scandicci"
  b_imst:0 "Imst"
  b_inari:0 "Inari"
  b_inchaffray:0 "Inchaffray"
@@ -7425,7 +7425,7 @@
  b_montagnana:0 "Montagnana"
  b_montaigu:0 "Challans"
  b_montalban:0 "Montalbán"
- b_montalcino:0 "Montalcino"
+ b_montalcino:0 "Follonica"
  b_montallegro:0 "Montallegro"
  b_montanejos:0 "Utiel"
  b_montaner:0 "Montaner"
@@ -8443,7 +8443,7 @@
  b_pinilla:0 "Pinilla"
  b_pinsk:0 "Pinsk"
  b_pinyug:0 "Pinyug"
- b_piombino:0 "Piombino"
+ b_piombino:0 "Massa"
  b_piotrkow:0 "Piotrków"
  b_piqan:0 "Piqan"
  b_piraeaus:0 "Piraeaus"
@@ -9909,7 +9909,7 @@
  b_smyadovo:0 "Smyadovo"
  b_smyrna:0 "Smyrna"
  b_snizort:0 "Snizort"
- b_soana:0 "Soana"
+ b_soana:0 "Manciano"
  b_soba:0 "Soba"
  b_sobeslav:0 "Sobeslav"
  b_sobinka:0 "Sobinka"
@@ -11147,7 +11147,7 @@
  b_vallapura:0 "Vallapura"
  b_valledebohi:0 "Vall de Boí"
  b_vallipuram:0 "Vallipuram"
- b_vallombrosa:0 "Vallombrosa"
+ b_vallombrosa:0 "Montevarchi"
  b_vallparadis:0 "Vallparadís"
  b_vallurapura:0 "Vallurapura"
  b_valmiera:0 "Valmiera"
@@ -11409,7 +11409,7 @@
  b_vologda:0 "Vologda"
  b_volos:0 "Volos"
  b_volosovo:0 "Volosovo"
- b_volterra:0 "Volterra"
+ b_volterra:0 "Colle di Val d'Elsa"
  b_volzhsk:0 "Volzhsk"
  b_vonitsa:0 "Vonitsa"
  b_vonitsza:0 "Vonitsza"
@@ -14086,8 +14086,8 @@
  c_orania:0 "Orania"
  c_orania_adj:0 "Oranian"
  c_orava:0 "Orava"
- c_orbetello:0 "Orbetello"
+ c_orbetello:0 "Grosseto"
- c_orbetello_adj:0 "Orbetellian"
+ c_orbetello_adj:0 "Grossetan"
  c_orhei:0 "Orhei"
  c_orhei_adj:0 "Orheian"
  c_orlamunde:0 "Orlamünde"
@@ -14242,6 +14242,8 @@
  c_praiva_adj:0 "Pravian"
  c_pratishthana:0 "Pratishthana"
  c_pratishthana_adj:0 "Pratishthanan"
+ c_prato:0 "Prato"
+ c_prato_adj:0 "Pratan"
  c_pravia:0 "Avilés"
  c_pravia_adj:0 "Avilésan"
  c_prayaga:0 "Prayaga"
@@ -24407,7 +24409,7 @@
  b_policastro:0 "Policastro"
  b_ariano:0 "Ariano"
  b_agnone:0 "Agnone"
- b_asciano:0 "Asciano"
+ b_asciano:0 "Montepulciano"
  b_tirano:0 "Tirano"
  b_chiari:0 "Chiari"
  b_mondovi:1 "Mondovì"