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

common/coat_of_arms/coat_of_arms/NEOW_dynasties.txt

@@ -12685,3 +12685,66 @@ bleimor_dynasty={
 		instance={position={0.59 0.48} scale={0.08 0.08}}
 	}
 }
+
+delunsch_dynasty={
+	pattern="pattern_horizontal_split_01.dds"
+	color1=red
+	color2=red
+	color3=red
+	colored_emblem={
+		color1=yellow
+		texture="ce_baglama.dds"
+		instance={
+			position={ 0.500000 0.680000 }
+			scale={ 0.350000 0.350000 }
+			depth=3.010000
+		}
+
+	}
+
+	colored_emblem={
+		color1=white
+		texture="ce_border_shield.dds"
+		instance={
+			depth=5.010000
+		}
+
+	}
+
+	colored_emblem={
+		color1=yellow
+		color2=yellow
+		texture="NEOW_ce_hammer.dds"
+		instance={
+			position={ 0.500000 0.430000 }
+			scale={ -0.450000 -0.450000 }
+			depth=1.010000
+		}
+
+		instance={
+			position={ 0.45000 0.350000 }
+			scale={ -0.450000 0.450000 }
+			depth=2.010000
+			rotation=315
+		}
+
+		instance={
+			position={ 0.550000 0.350000 }
+			scale={ 0.450000 0.450000 }
+			depth=4.010000
+			rotation=45
+		}
+
+	}
+
+	colored_emblem={
+		color1=blue_light
+		texture="ce_mena_double_bow.dds"
+		instance={
+			position={ 0.500000 0.370000 }
+			scale={ 0.210000 0.210000 }
+		}
+
+	}
+
+}

common/landed_titles/germany.txt

@@ -2269,13 +2269,6 @@ e_germany = {
 				cultural_names = {
 					name_list_bavarian = cn_allgai
 				}
-				b_kempten = {
-					province = 2783
-					color = { 25 25 25 }
-					cultural_names = {
-						name_list_swabian = cn_kempte
-					}
-				}
 				b_kaufbeuren = {
 					province = 2784
 
@@ -2283,6 +2276,13 @@ e_germany = {
 					cultural_names = {
 						name_list_bavarian = cn_kaufbeiren
 					}
+				}				
+				b_kempten = {
+					province = 2783
+					color = { 25 25 25 }
+					cultural_names = {
+						name_list_swabian = cn_kempte
+					}
 				}
 				b_memmingen = {
 					province = 2776

common/religion/holy_sites/00_holy_sites.txt

@@ -162,26 +162,25 @@ kyffhauser = {
 
 neuschwanstein = {
 	county = c_allgau 
-	barony = b_kempten
+	barony = b_kaufeuren
 	character_modifier = {
-		monthly_piety_gain_mult = 0.1
-		legitimacy_gain_mult = 0.05
+		monthly_prestige_gain_mult = 0.1
+		monthly_lifestyle_xp_gain_mult = 0.1
 	}
 }
 
 leipzig = {
 	county = c_leipzig  
 	character_modifier = {
-		monthly_piety_gain_mult = 0.1
-		legitimacy_gain_mult = 0.05
+		monthly_prestige_gain_mult = 0.05
+		personal_scheme_phase_duration_add = -10
 	}
 }
 
 bremen = {
 	county = c_bremen 
 	character_modifier = {
-		monthly_piety_gain_mult = 0.1
-		legitimacy_gain_mult = 0.05
+		tax_mult = 0.5
 	}
 }
 

common/religion/religions/NEOW_hermetic.txt

@@ -184,6 +184,7 @@
 			doctrine = tenet_scientific_discourse
 			doctrine = tenet_esotericism
 			doctrine = tenet_gnosticism
+			doctrine = special_doctrine_christian_hermetic
 
 			holy_order_names = { #placeholder
 			}
@@ -293,6 +294,7 @@
 			doctrine = tenet_scientific_discourse
 			doctrine = tenet_inner_journey
 			doctrine = tenet_pacifism
+			doctrine = special_doctrine_nobelian_hermetic 
 
 			holy_order_names = { #placeholder
 			}

history/characters/NEOW_e_france.txt

@@ -555,8 +555,8 @@ france_joachim_murat = {
 france_axel_lindenbrock = {
 	name = "Axel"
 	dynasty = lindenbrock_dynasty
-	religion = "rocambolist"
-	culture = "occitan"
+	religion = "genevan"
+	culture = "rottisch"
 	trait = education_stewardship_3
 	trait = scholar
 	trait = humble

history/provinces/e_germany.txt

@@ -1787,7 +1787,9 @@
 	holding = castle_holding
 }
 2784 = {
-	holding = city_holding
+	culture = aleman
+	religion = volksmarchen
+	holding = castle_holding
 }
 2776 = {
 	holding = church_holding

localization/english/replace/religion/zz_NEOW_holy_sites_l_english.yml

@@ -220,4 +220,7 @@
  
  holy_site_teutoburger_name:0 "Teutoburger Forest"
  holy_site_teutoburger_effect_name:0 "From [holy_site|E] #weak ($holy_site_teutoburger_name$)#!"
- 
+ holy_site_kyffhauser_name:0 "Kyffhauser"		
+ holy_site_leipzig_name:0 "Leipzig"
+ holy_site_bremen_name:0 "Bremen"	
+ holy_site_neuschwanstein_name:0 "Neuschwanstein"

localization/english/replace/titles_l_english.yml

@@ -16511,6 +16511,7 @@
  holy_lombard_league:0 "Holy Lombard League"
  anglian_league:0 "Anglican League"
  sinn_fein:0 "Free Ireland"
+ rhine_confederation:0 "League of Frankfurt" 
  e_carpathia:0 "Carpathia"
  e_carpathia_adj:0 "Carpathian"
  e_chagatai_article:0 "the "
@@ -25281,8 +25282,8 @@
  d_palatinate_adj:0 "Palatine"
  c_mannheim:0 "Mannheim"
  c_mannheim_adj:0 "Mannheimer"
- c_adenau:0 "Adenau"
- c_adenau_adj:0 "Adenauer"
+ c_adenau:0 "Koblenz"
+ c_adenau_adj:0 "Koblenzian"
  c_bitburg:0 "Bitburg"
  c_bitburg_adj:0 "Bitburger"