Merge remote-tracking branch 'origin/main'

N3OW/common/coat_of_arms/coat_of_arms/01_landed_titles.txt

@@ -6260,96 +6260,90 @@ d_muwalladi = {
 }
 
 d_bedford = {
-	pattern="pattern_horizontal_split_01.dds"
+	pattern="pattern_checkers_02.dds"
 	color1=red
 	color2=yellow
-	color3=black
+	color3=red
 	colored_emblem={
-		color1=brown
+		color1=white
-		color2=black
+		texture="ce_waves_04.dds"
-		color3=white
-		texture="ce_stag.dds"
 		instance={
-			position={ 0.250000 0.250000 }
+			position={ 0.500000 0.470000 }
-			scale={ 0.300000 0.300000 }
-			depth=5.010000
-		}
-
-		instance={
-			position={ 0.750000 0.750000 }
-			scale={ 0.300000 0.300000 }
 			depth=6.010000
 		}
 
 	}
 
 	colored_emblem={
-		color1=white
+		color1=brown
-		color2=yellow
+		texture="ce_seal_pictorial_vertical_deer.dds"
-		color3=grey
-		texture="ce_sabres.dds"
 		instance={
-			position={ 0.250000 0.750000 }
+			position={ 0.2000000 0.200000 }
-			scale={ 0.370000 0.370000 }
+			scale={ 0.250000 0.2500000 }
+			depth=2.010000
+		}
+		instance={
+			position={ 0.800000 0.80000 }
+			scale={ 0.250000 0.250000 }
+			depth=2.010000
+		}
+	}
+
+	colored_emblem={
+		color1=yellow
+		color2=red
+		texture="ce_quarterly.dds"
+		instance={
+			depth=8.010000
+		}
+
+	}
+
+	colored_emblem={
+		color1=white
+		texture="ce_escallop.dds"
+		instance={
+			position={ 0.500000 0.200000 }
+			scale={ 0.360000 0.360000 }
+			depth=2.010000
+		}
+
+		instance={
+			position={ 0.500000 0.800000 }
+			scale={ 0.360000 0.360000 }
+			depth=3.010000
+		}
+
+		instance={
+			scale={ 0.360000 0.360000 }
 			depth=4.010000
 		}
 
 	}
 
 	colored_emblem={
-		color1=red
+		color1=white
-		texture="ce_block_02.dds"
-		instance={
-			position={ 1.000000 0.000000 }
-			depth=8.010000
-		}
-
-		instance={
-			position={ 0.000000 1.000000 }
-			depth=9.010000
-		}
-
-	}
-
-	colored_emblem={
-		color1=grey
 		color2=yellow
 		color3=brown
 		texture="ce_sabres.dds"
 		instance={
-			position={ 0.750000 0.250000 }
+			position={ 0.800000 0.20000 }
-			scale={ 0.320000 0.320000 }
+			scale={ 0.250000 0.250000 }
-			depth=3.010000
+			depth=2.010000
-		}
+		}
-
+		instance={
-	}
+			position={ 0.200000 0.80000 }
-
+			scale={ 0.250000 0.250000 }
-	colored_emblem={
-		color1=white
-		texture="ce_clam.dds"
-		instance={
-			scale={ 0.240000 -0.240000 }
-		}
-
-		instance={
-			position={ 0.500000 0.200000 }
-			scale={ 0.240000 -0.240000 }
-			depth=1.010000
-		}
-
-		instance={
-			position={ 0.500000 0.800000 }
-			scale={ 0.240000 -0.240000 }
 			depth=2.010000
 		}
-
 	}
 
 	colored_emblem={
-		color1=yellow
+		color1=blue_light
-		texture="ce_block_02.dds"
+		texture="ce_waves_04.dds"
 		instance={
-			depth=10.010000
+			position={ 0.500000 0.530000 }
+			depth=7.010000
 		}
 
 	}
@@ -6358,8 +6352,8 @@ d_bedford = {
 		color1=black
 		texture="ce_block_02.dds"
 		instance={
-			scale={ 0.200000 1.000000 }
+			scale={ 0.280000 1.000000 }
-			depth=7.010000
+			depth=5.010000
 		}
 
 	}
@@ -27766,17 +27760,32 @@ d_bedford_norman = {
 		texture="ce_waves_04.dds"
 		instance={
 			position={ 0.500000 0.470000 }
-			depth=2.010000
+			depth=6.010000
 		}
 
 	}
 
+	colored_emblem={
+		color1=brown
+		texture="ce_seal_pictorial_vertical_deer.dds"
+		instance={
+			position={ 0.2500000 0.250000 }
+			scale={ 0.250000 0.250000 }
+			depth=2.010000
+		}
+		instance={
+			position={ 0.7500000 0.750000 }
+			scale={ 0.250000 0.250000 }
+			depth=2.010000
+		}
+	}
+
 	colored_emblem={
 		color1=yellow
 		color2=red
 		texture="ce_quarterly.dds"
 		instance={
-			depth=4.010000
+			depth=8.010000
 		}
 
 	}
@@ -27785,16 +27794,38 @@ d_bedford_norman = {
 		color1=white
 		texture="ce_escallop.dds"
 		instance={
-			scale={ 0.360000 0.360000 }
 			position={ 0.500000 0.200000 }
+			scale={ 0.360000 0.360000 }
+			depth=2.010000
 		}
+
+		instance={
+			position={ 0.500000 0.800000 }
+			scale={ 0.360000 0.360000 }
+			depth=3.010000
+		}
+
 		instance={
 			scale={ 0.360000 0.360000 }
-			position={ 0.500000 0.80000 }
+			depth=4.010000
+		}
+
+	}
+
+	colored_emblem={
+		color1=white
+		color2=yellow
+		color3=brown
+		texture="ce_sabres.dds"
+		instance={
+			position={ 0.2500000 0.250000 }
+			scale={ 0.750000 0.250000 }
+			depth=2.010000
 		}
 		instance={
-			scale={ 0.360000 0.360000 }
+			position={ 0.7500000 0.750000 }
-			position={ 0.500000 0.50000 }
+			scale={ 0.250000 0.750000 }
+			depth=2.010000
 		}
 	}
 
@@ -27803,7 +27834,7 @@ d_bedford_norman = {
 		texture="ce_waves_04.dds"
 		instance={
 			position={ 0.500000 0.530000 }
-			depth=3.010000
+			depth=7.010000
 		}
 
 	}
@@ -27813,7 +27844,7 @@ d_bedford_norman = {
 		texture="ce_block_02.dds"
 		instance={
 			scale={ 0.280000 1.000000 }
-			depth=1.010000
+			depth=5.010000
 		}
 
 	}
@@ -33330,7 +33361,7 @@ e_yugoslavia_christian={
 
 }
 
-k_monaco={
+d_monaco={
 	pattern="pattern_horizontal_split_01.dds"
 	color1=red
 	color2=white

N3OW/common/landed_titles/alps.txt

@@ -938,18 +938,6 @@ e_alps = {
 				}
 			}
 		}
-	}
-	k_monaco= {
-		color = { 229 27 34 }
-		color2 = { 255 255 255 }
-		
-		capital = c_monaco
-		cultural_names = {
-			name_list_occitan=cn_m_o_act_negue
-			name_list_arpitan=cn_monac_o_hat_
-			name_list_ligurian=cn_m_u_vrt_negu
-			name_list_NEOW_provencal=cn_m_o_act_nego
-		}		
 		d_monaco= {
 		color = { 229 27 34 }
 		color2 = { 255 255 255 }

N3OW/common/landed_titles/britannia.txt

@@ -813,7 +813,7 @@ e_britannia = {
 				}
 			}
 
-			capital = c_tyne_and_wear # Newcastle
+			capital = c_northumberland # Alnwick Castle
 
 			c_northumberland = {
 				color = { 223 1 80 }
@@ -880,12 +880,6 @@ e_britannia = {
 			c_tyne_and_wear = {
 				color = { 167 34 74 }
 
-				b_newcastle = {
-					province = 9714
-
-					color = { 167 34 74 }
-				}
-
 				b_sunderland = {
 					province = 1606
 
@@ -902,6 +896,11 @@ e_britannia = {
 
 					color = { 255 15 15 }
 				}
+				b_newcastle = {
+					province = 9714
+
+					color = { 167 34 74 }
+				}
 			}
 			c_durham = {
 				color = { 167 34 74 }

N3OW/common/landed_titles/france.txt

@@ -152,6 +152,29 @@ e_france = {
 					color = { 120 161 161 }
 				}
 			}
+			c_rennes = {
+				color = { 149 171 164 }
+
+				b_rennes = {
+					province = 2165
+
+					color = { 137 199 199 }
+
+					cultural_names = {
+						name_list_breton = cn_roazhon
+					}
+				}
+				b_combourg = {
+					province = 2282
+
+					color = { 137 199 199 }
+				}
+				b_fougeres = {
+					province = 9740
+
+					color = { 137 199 199 }
+				}
+			}			
 		}
 		d_upper_brittany = {
 			color = { 185 190 178 }
@@ -195,29 +218,6 @@ e_france = {
 					color = { 131 145 145 }
 				}
 			}
-			c_rennes = {
-				color = { 149 171 164 }
-
-				b_rennes = {
-					province = 2165
-
-					color = { 137 199 199 }
-
-					cultural_names = {
-						name_list_breton = cn_roazhon
-					}
-				}
-				b_combourg = {
-					province = 2282
-
-					color = { 137 199 199 }
-				}
-				b_fougeres = {
-					province = 9740
-
-					color = { 137 199 199 }
-				}
-			}
 		}
 	}
     k_france = {

N3OW/common/religion/holy_sites/00_holy_sites.txt

@@ -1,4 +1,4 @@
-#############
+ #############
 # Christian #
 #############
 
@@ -15,7 +15,7 @@ aachen = {
 }
 
 provence = {
-	county = c_provence
+	county = c_bouches_du_rhone
 	barony = b_marseille
 	
 	character_modifier = {
@@ -31,7 +31,7 @@ maastricht = {
 	barony = b_maastricht
 	
 	character_modifier = {
-		monthly_piety_gain_mult = 0.2
+		diplomacy_per_piety_level = 1
 	}
 	flag = jerusalem_conversion_bonus # +20% County Conversion
 }
@@ -41,8 +41,7 @@ frankfurt = {
 	
 	character_modifier = {
 		name = holy_site_rome_effect_name
-		development_growth_factor = 0.1
+		stewardship_per_piety_level = 1
-		stewardship = 1
 	}
 }
 
@@ -50,9 +49,8 @@ luxembourg = {
 	county = c_luxembourg
 	
 	character_modifier = {
-		name = holy_site_rome_effect_name
+		name = holy_site_schengen_effect_name
-		development_growth_factor = 0.1
+		different_culture_opinion = 10
-		stewardship = 1
 	}
 }
 
@@ -72,8 +70,8 @@ brussels = {
 	
 	character_modifier = {
 		name = holy_site_rome_effect_name
-		development_growth_factor = 0.1
+		development_growth_factor = 0.05
-		stewardship = 1
+		sway_scheme_phase_duration_add = minor_scheme_phase_duration_bonus_value
 	}
 }
 
@@ -84,19 +82,19 @@ cambrai = {
 	
 	character_modifier = {
 		name = holy_site_rome_effect_name
-		development_growth_factor = 0.1
+		clergy_opinion = 5
-		stewardship = 1
+		learning = 2
 	}
 }
 
 somme = {
-	county = c_amiens
+	county = c_somme
-	barony = b_courcy
+	barony = b_corbie
 	
 	character_modifier = {
 		name = holy_site_rome_effect_name
-		development_growth_factor = 0.1
+		learning_per_piety_level = 1
-		stewardship = 1
+		monthly_piety_gain_mult = 0.05
 	}
 }
 
@@ -105,9 +103,8 @@ verdun = {
 	barony = b_verdun
 	
 	character_modifier = {
-		name = holy_site_rome_effect_name
+		name = holy_site_verdun_effect_name
-		development_growth_factor = 0.1
+		controlled_province_advantage = 5
-		stewardship = 1
 	}
 }
 
@@ -116,9 +113,8 @@ ypres = {
 	barony = b_ypres
 	
 	character_modifier = {
-		name = holy_site_rome_effect_name
+		name = holy_site_ypres_effect_name
-		development_growth_factor = 0.1
+		defender_advantage = 5
-		stewardship = 1
 	}
 }
 
@@ -138,7 +134,7 @@ paris = {
 	barony = b_paris
 	character_modifier = {
 		learning_per_prestige_level = 1
-		monthly_piety_gain_mult = 0.2
+		monthly_piety_gain_mult = 0.1
 	}	
 }
 
@@ -147,7 +143,8 @@ cefalu = {
 	barony = b_cefalu
 	
 	character_modifier = {
-		fertility = 0.15
+		fertility = 0.10
+		stress_loss_mult = 0.1
 	}
 	flag = jerusalem_conversion_bonus # +20% County Conversion
 }
@@ -169,9 +166,9 @@ stonehenge = {
 	county = c_wiltshire
 	
 	character_modifier = {
-		monthly_piety_gain_mult = 0.2
+		monthly_piety_gain_mult = 0.1
+		stewardship_per_piety_level = 1
 	}
-	flag = jerusalem_conversion_bonus # +20% County Conversion
 }
 
 southhampton = {
@@ -179,18 +176,17 @@ southhampton = {
 	barony = b_southampton
 	
 	character_modifier = {
-		monthly_piety_gain_mult = 0.2
+		learning = 2
 	}
-	flag = jerusalem_conversion_bonus # +20% County Conversion
 }
 
 cornwall = {
 	county = c_cornwall
+	barony = b_tintgalel
 	
 	character_modifier = {
-		monthly_piety_gain_mult = 0.2
+		defender_advantage = 5
 	}
-	flag = jerusalem_conversion_bonus # +20% County Conversion
 }
 
 warwick = {
@@ -277,7 +273,7 @@ dublin = {
 	county = c_dublin
 	
 	character_modifier = {
-		martial = 1
+		martial = 2
 	}
 }
 
@@ -361,19 +357,28 @@ manchester = {
 
 	character_modifier = {
 		name = holy_site_manchester_effect_name
-		supply_duration = 0.2
+		monthly_county_control_growth_factor = 0.5
 		holy_order_hire_cost_mult = -0.1
 	}
 }
 
+sunderland = {
+	county = c_tyne_and_wear
+	barony = b_sunderland
+
+	character_modifier = {
+		name = holy_site_wallsey_effect_name
+		build_gold_cost = -0.10
+	}
+}
+
 lyme_regis = {
 	county = c_dorset
 	barony = b_lyme
 
 	character_modifier = {
 		name = holy_site_lyme_regis_effect_name
-		supply_duration = 0.2
+		learning_per_prestige_level = 1
-		holy_order_hire_cost_mult = -0.1
 	}
 }
 
@@ -383,11 +388,63 @@ cardiff = {
 
 	character_modifier = {
 		name = holy_site_cardiff_effect_name
-		supply_duration = 0.2
+		county_opinion_add = 5
-		holy_order_hire_cost_mult = -0.1
+		different_culture_opinion = 5
 	}
 }
 
+#Jack Tar, Royal Thelema, Victorian
+portsmouth = {
+	county = c_hampton
+
+	character_modifier = {
+		name = holy_site_portsmouth_effect_name
+		army_maintenance_mult = -0.05
+		martial_per_prestige_level = 1
+	}
+}
+
+scapa_flow = {
+	county = c_orkney
+
+	character_modifier = {
+		name = holy_site_portsmouth_effect_name
+		army_maintenance_mult = -0.10
+		supply_duration = 0.2
+	}
+}
+
+london_east_end = {
+	county = c_london
+	barony = b_east_end
+	character_modifier = {
+		name = holy_site_portsmouth_effect_name
+		army_maintenance_mult = -0.10
+		supply_duration = 0.2
+	}
+}
+gibraltar = {
+	county = c_gibraltar
+
+	character_modifier = {
+		name = holy_site_portsmouth_effect_name
+		coastal_advantage = 8
+	}
+}
+
+malta = {
+	county = c_malta
+
+	character_modifier = {
+		name = holy_site_portsmouth_effect_name
+		army_maintenance_mult = -0.10
+		supply_duration = 0.2
+	}
+}
+
+#Alexandria -  to do
+
+
 # Orthodox
 constantinople = {
 	county = c_byzantion

N3OW/common/religion/religions/NEOW_britannic.txt

@@ -243,9 +243,9 @@
 			#religious_head = d_united_grand_lodge 
 
 			#placeholder holy sites
-			holy_site = lochness
+			holy_site = edinburgh
-			holy_site = cefalu
+			holy_site = belfast
-			holy_site = paris
+			holy_site = cardiff
 			holy_site = london
 			#holy_site = cairo
 			#holy_site = segrada_familia
@@ -265,47 +265,17 @@
 			doctrine = special_doctrine_true_servants_of_the_queen_regents
 
 
-		}
-		glorian = {
-			color = { 229 22 57 }
-			icon = glorian
-
-			#religious_head = d_united_grand_lodge 
-
-			#placeholder holy sites
-			holy_site = lochness
-			holy_site = cefalu
-			holy_site = paris
-			holy_site = london
-			#holy_site = cairo
-			#holy_site = segrada_familia
-			
-			#Special Tolerance | placeholder
-
-			doctrine = doctrine_pluralism_righteous
-
-			#Tenets | WIP
-			doctrine = tenet_ancestor_worship
-			doctrine = tenet_human_sacrifice
-			doctrine = tenet_sacred_shadows
-
-			doctrine = special_doctrine_british_royalty
-			doctrine = special_doctrine_loyal_servants_of_the_queen
-
-			#Special/virtue | placeholder
-
-
 		}
 		jack_tar = {
 			color = { 23 35 89 }
 			icon = jack_tar
 			#placeholder holy sites
-			holy_site = lochness
+			holy_site = portsmouth
-			holy_site = cefalu
+			holy_site = scapa_flow
-			holy_site = paris
+			holy_site = gibraltar
-			holy_site = london
+			holy_site = malta
-			#holy_site = cairo
+			holy_site = london_east_end
-			#holy_site = segrada_familia
+			#holy_site = alexandria
 			
 			doctrine = doctrine_pluralism_pluralistic
 
@@ -382,7 +352,7 @@
 			holy_site = belfast
 			holy_site = lyme_regis
 			holy_site = cardiff
-			holy_site = manchester
+			holy_site = sunderland
 
 			#Tenets | Final for 0.1
 			doctrine = tenet_communal_possessions
@@ -586,5 +556,35 @@
 
 			}
 		}
+#		glorian = {
+#			color = { 229 22 57 }
+#			icon = glorian
+#
+#			#religious_head = d_united_grand_lodge 
+#
+#			#placeholder holy sites
+#			holy_site = lochness
+#			holy_site = cefalu
+#			holy_site = paris
+#			holy_site = london
+#			#holy_site = cairo
+#			#holy_site = segrada_familia
+#			
+#			#Special Tolerance | placeholder
+#
+#			doctrine = doctrine_pluralism_righteous
+#
+#			#Tenets | WIP
+#			doctrine = tenet_ancestor_worship
+#			doctrine = tenet_human_sacrifice
+#			doctrine = tenet_sacred_shadows
+#
+##			doctrine = special_doctrine_british_royalty
+#			doctrine = special_doctrine_loyal_servants_of_the_queen
+#
+##			#Special/virtue | placeholder
+#
+#
+		#}	
 	}
 }

N3OW/history/provinces/e_britannia.txt

@@ -534,6 +534,8 @@
 }
 1606 = {
 	holding = castle_holding
+	culture = norflander
+	religion = anglican_england
 }
 ###c_durham
 9716 = {
@@ -1200,7 +1202,7 @@
 ###c_orkney
 8 = {
 	culture = scottish
-	religion = presbyterian
+	religion = jack_tar
 	holding = castle_holding
 }
 ###c_inverness

N3OW/history/provinces/e_iberia.txt

@@ -240,7 +240,9 @@
 }
 ###c_gibraltar
 9769 = {
-	holding = none
+	holding = castle_holding
+	culture = llanito
+	religion = jack_tar
 }
 ###c_cadiz
 1843 = {

N3OW/history/provinces/e_scandinavia.txt

@@ -814,7 +814,14 @@
 	holding = none
 }
 367 = {
-	holding = none
+	holding = castle_holding
+	1066.1.1 = {
+	culture = svealandsk
+	holding = castle_holding
+	}
+	1085.1.1 = {
+	religion = folketro
+	}	
 }
 ##d_gavleborg
 ###c_gastrikland

N3OW/history/titles/k_rhodania.txt

@@ -40,11 +40,6 @@ c_lower_alps={
 		holder = france_bova_ivette
 	}
 }
-k_monaco{
-	2550.1.1 = {
-		holder = france_grimaldi_honore
-	}
-}
 
 
 d_monaco{

N3OW/history/titles/k_schleswig_holstein.txt

@@ -6,7 +6,7 @@ k_schleswig_holstein = {
 
 c_north_frisia = {
 	2554.1.1 =  {
-		holder = scandinavia0008
+		holder = scandinavia0012
 		liege = k_schleswig_holstein
 	}
 }

N3OW/localization/english/replace/dynasties/zz_NEOW_dynasty_names_l_english.yml

@@ -251,7 +251,7 @@
  dynn_Lean:0 "Lean"
  dynn_Gillmore:0 "Gillmore"
  dynn_Sinclair:0 "Sinclair"
- dynn_cyflymarhyan:0 "Cyflymarhyan"
+ dynn_cyflymarhyan:0 "Cyflymarian"
  dynn_said:0 "Said-Zanzibar"
  dynn_starr:0 "Starhrh"
  dynn_tudorh:0 "Tuddorh"