Merge remote-tracking branch 'origin/main'

N3OW/common/dynasties/NEOW_dynasties.txt

@@ -247,6 +247,27 @@ lindenbrock_dynasty = {
 	culture = occitan
 }
 
+chitteaux_dynasty = {
+	name = dynn_Chitteaux
+	culture = bourguignon
+}
+
+sade_dynasty = {
+	prefix = "dynnp_de"
+	name = dynn_Sade
+	culture = provencal
+}
+
+grimaldi_dynasty = {
+	name = dynn_Grimaldi
+	culture = provencal
+}
+
+clement_dynasty = {
+	name = dynn_Clement
+	culture = patoues
+}
+
 # e_britannia dynasties
 dynn_britannia_cyflymarhyan = {
 	name = dynn_cyflymarhyan
@@ -799,6 +820,136 @@ are_dynasty = {
 	culture = low_saxon
 }
 
+winzenburg_dynasty = {
+	name = dynn_winzenburg
+	culture = NEOW_pomeranian
+}
+
+seeburg_dynasty = {
+	name = dynn_seeburg
+	culture = NEOW_pomeranian
+}
+
+ney_dynasty = {
+	name = dynn_Ney
+	culture = rottisch
+}
+
+kreile_dynasty={
+	name="dynn_Kreile"
+	culture="bavarian"
+}
+leeb_dynasty={
+	name="dynn_Leeb"
+	culture="bavarian"
+}
+vohburg_dynasty={
+	prefix="dynnp_von"
+	name="dynn_Vohburg"
+	culture="bavarian"
+}
+burkhardinger_dynasty={
+	name="dynn_Burkhardinger"
+	culture="franconian"
+}
+hartmann_dynasty={
+	name="dynn_Hartmann"
+	culture="bavarian"
+}
+vigauner_dynasty={
+	name="dynn_Vigauner"
+	culture="austrian"
+}
+bludenzer_dynasty={
+	name="dynn_Bludenzer"
+	culture="aleman"
+}
+stromer_dynasty={
+	name="dynn_Stromer"
+	culture="bavarian"
+}
+sonntag_dynasty={
+	name="dynn_Sonntag"
+	culture="bavarian"
+}
+seydlitz_dynasty = {
+	name = dynn_seydlitz
+}
+lochner_dynasty={
+	name="dynn_Lochner"
+	culture="franconian"
+}
+fugger_dynasty={
+	name="dynn_Fugger"
+	culture="swabian"
+}
+reger_dynasty={
+	name="dynn_Reger"
+	culture="bavarian"
+}
+bagen_dynasty={
+	name="dynn_Bagen"
+	culture="bavarian"
+}
+lahm_dynasty={
+	name="dynn_Lahm"
+	culture="bavarian"
+}
+mann_dynasty={
+	name="dynn_Mann"
+	culture="bavarian"
+}
+dworschak_dynasty={
+	name="dynn_Dworschak"
+	culture="austrian"
+}
+jager_dynasty={
+	name="dynn_J_a_uml_ger"
+	culture="austrian"
+}
+werndl_dynasty={
+	name="dynn_Werndl"
+	culture="austrian"
+}
+lechge_dynasty={
+	prefix="dynnp_von"
+	name="dynn_Lechge"
+	culture="swabian"
+}
+wendlenger_dynasty={
+	name="dynn_Wendlenger"
+	culture="swabian"
+}
+bruderle_dynasty={
+	name="dynn_Br_u_uml_derle"
+	culture="palatinate"
+}
+pfeiffer_dynasty={
+	name="dynn_Pfeiffer"
+	culture="swabian"
+}
+weissbronner_dynasty={
+	name="dynn_Weissbronner"
+	culture="swabian"
+}
+dornier_dynasty={
+	name="dynn_Dornier"
+	culture="swabian"
+}
+hohenheim_dynasty={
+	prefix="dynnp_von"
+	name="dynn_Hohenheim"
+	culture="swabian"
+}
+nguyen_bloch_dynasty={
+	name="dynn_Nguyen_dsh_Bloch"
+	culture="elsasse"
+}
+barthold_dynasty={
+	name="dynn_Barthold"
+	culture="elsasse"
+}
+
 #e_hispania
 
 boatswain_dynasty = {
@@ -1272,143 +1423,9 @@ dynn_britannia_harhman = {
 	culture = soueyrneg
 }
 
-chitteaux_dynasty = {
+# e_scandinavia 
-	name = dynn_Chitteaux
-	culture = bourguignon
-}
-ney_dynasty = {
-	name = dynn_Ney
-	culture = rottisch
-}
 
-kreile_dynasty={
+loon_dynasty = {
-	name="dynn_Kreile"
+	name = dynn_loon
-	culture="bavarian"
+	culture = frisian
 }
-leeb_dynasty={
-	name="dynn_Leeb"
-	culture="bavarian"
-}
-vohburg_dynasty={
-	prefix="dynnp_von"
-	name="dynn_Vohburg"
-	culture="bavarian"
-}
-burkhardinger_dynasty={
-	name="dynn_Burkhardinger"
-	culture="franconian"
-}
-hartmann_dynasty={
-	name="dynn_Hartmann"
-	culture="bavarian"
-}
-vigauner_dynasty={
-	name="dynn_Vigauner"
-	culture="austrian"
-}
-bludenzer_dynasty={
-	name="dynn_Bludenzer"
-	culture="aleman"
-}
-stromer_dynasty={
-	name="dynn_Stromer"
-	culture="bavarian"
-}
-sonntag_dynasty={
-	name="dynn_Sonntag"
-	culture="bavarian"
-}
-seydlitz_dynasty = {
-	name = dynn_seydlitz
-}
-lochner_dynasty={
-	name="dynn_Lochner"
-	culture="franconian"
-}
-fugger_dynasty={
-	name="dynn_Fugger"
-	culture="swabian"
-}
-reger_dynasty={
-	name="dynn_Reger"
-	culture="bavarian"
-}
-bagen_dynasty={
-	name="dynn_Bagen"
-	culture="bavarian"
-}
-lahm_dynasty={
-	name="dynn_Lahm"
-	culture="bavarian"
-}
-mann_dynasty={
-	name="dynn_Mann"
-	culture="bavarian"
-}
-dworschak_dynasty={
-	name="dynn_Dworschak"
-	culture="austrian"
-}
-jager_dynasty={
-	name="dynn_J_a_uml_ger"
-	culture="austrian"
-}
-werndl_dynasty={
-	name="dynn_Werndl"
-	culture="austrian"
-}
-lechge_dynasty={
-	prefix="dynnp_von"
-	name="dynn_Lechge"
-	culture="swabian"
-}
-wendlenger_dynasty={
-	name="dynn_Wendlenger"
-	culture="swabian"
-}
-bruderle_dynasty={
-	name="dynn_Br_u_uml_derle"
-	culture="palatinate"
-}
-pfeiffer_dynasty={
-	name="dynn_Pfeiffer"
-	culture="swabian"
-}
-weissbronner_dynasty={
-	name="dynn_Weissbronner"
-	culture="swabian"
-}
-dornier_dynasty={
-	name="dynn_Dornier"
-	culture="swabian"
-}
-hohenheim_dynasty={
-	prefix="dynnp_von"
-	name="dynn_Hohenheim"
-	culture="swabian"
-}
-nguyen_bloch_dynasty={
-	name="dynn_Nguyen_dsh_Bloch"
-	culture="elsasse"
-}
-barthold_dynasty={
-	name="dynn_Barthold"
-	culture="elsasse"
-}
-
-sade_dynasty = {
-	prefix = "dynnp_de"
-	name = dynn_Sade
-	culture = provencal
-}
-
-grimaldi_dynasty = {
-	name = dynn_Grimaldi
-	culture = provencal
-}
-
-clement_dynasty = {
-	name = dynn_Clement
-	culture = patoues
-}
-

N3OW/history/characters/NEOW_e_germania.txt

@@ -977,6 +977,44 @@ germany0056 = {
 	}
 }
 
+germany0057 = { 
+	name = "Hatto"
+	dynasty = winzenburg_dynasty
+	religion = "lutheran"
+	culture = NEOW_pomeranian
+	trait = education_martial_1
+	trait = cautious_leader
+	trait = athletic
+	trait = intellect_bad_1
+	trait = lazy
+	trait = paranoid
+	trait = ambitious
+	2520.3.2 = {
+    	birth = yes
+	}
+	2600.1.1 = {
+    	death = yes
+	}
+}
+
+germany0058 = { 
+	name = "Thomas"
+	dynasty = seeburg_dynasty
+	religion = "lutheran"
+	culture = NEOW_pomeranian
+	trait = education_martial_3
+	trait = logistician
+	trait = diligent
+	trait = shy
+	trait = callous
+	2519.12.5 = {
+    	birth = yes
+	}
+	2600.1.1 = {
+    	death = yes
+	}
+}
+
 ### Leeb dynasty
 thaddaus_leeb={
 	name="Thadd_a_uml_us"

N3OW/history/characters/NEOW_e_scandinavia.txt

@@ -130,3 +130,20 @@ scandinavia0007 = {
     	death = yes
 	}
 }
+
+scandinavia0008 = {
+	name = "Douwe"
+	dynasty = loon_dynasty
+	religion = "lutheran"
+	culture = frisian
+	trait = education_diplomacy_3
+	trait = paranoid
+	trait = arrogant
+	trait = craven
+	2522.3.13 = {
+    	birth = yes
+	}
+	2600.1.1 = {
+    	death = yes
+	}
+}

N3OW/history/titles/k_schleswig_holstein.txt

@@ -4,9 +4,38 @@ k_schleswig_holstein = {
 	}
 }
 
+c_north_frisia = {
+	2554.1.1 =  {
+		holder = scandinavia0008
+		liege = k_schleswig_holstein
+	}
+}
+
 d_holstein = {
 	2554.1.1 = {
-		holder = germany0016 #Franz BONW
+		holder = germany0057 #Franz BONW
+		liege = k_schleswig_holstein
+	}
+}
+
+c_lubeck = {
+	2554.1.1 = {
+		holder = germany0057 #Franz BONW
+		liege = k_schleswig_holstein
+	}
+}
+
+c_lauenberg = {
+	2554.1.1 = {
+		holder = germany0057 #Franz BONW
+		liege = k_schleswig_holstein
+	}
+}
+
+c_ditmarschen = {
+	2554.1.1 = {
+		holder = germany0058
+		liege =  d_holstein
 	}
 }
 
@@ -27,6 +56,6 @@ c_hamburg = {
 c_wismar = {
 	2554.1.1 = {
 		holder = germany0022
-		liege = d_holstein
+		liege = k_schleswig_holstein
 	}
 }

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

@@ -461,6 +461,8 @@
  dynn_plauen:0 "Plauen"
  dynn_friesack:0 "Friesack"
  dynn_are:0 "Are"
+ dynn_winzenburg:0 "Winzenburg"
+ dynn_seeburg:0 "Seeburg"
 
  dynn_clausewitz:0 "Clausewitz"
  dynn_dorn:0 "Dörn"
@@ -468,6 +470,8 @@
  dynn_goltern:0 "Goltern"
  dynn_steinfurt:0 "Steinfurt"
 
+ dynn_loon:0 "Loon"
+
 
  # PATRONYMS — PREFIXES AND SUFFIXES