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

N3OW/common/dynasties/NEOW_dynasties.txt

@@ -163,6 +163,22 @@ voigt_dynasty = {
 	name = dynn_voigt
 	culture = rottisch
 }
+bayrou_dynasty = {
+	name = dynn_bayrou
+	culture = gascon
+}
+andrieu_dynasty = {
+	name = dynn_andrieu
+	culture = occitan
+}
+djerassi_dynasty = {
+	name = dynn_djerassi
+	culture = sephardi
+}
+atika_dynasty = {
+	name = dynn_atika
+	culture = beur
+}
 
 # e_britannia dynasties
 dynn_britannia_cyflymarhyan = {

N3OW/history/characters/NEOW_e_france.txt

@@ -735,4 +735,68 @@ france_evrard_voigt = {
 	2600.1.1 = {
 		death = yes
 	}
+}
+france_saris_bayrou = {
+	name = "Saris"
+	dynasty = bayrou_dynasty
+	religion = "rocambolist"
+	culture = gascon
+	trait = education_diplomacy_3
+	trait = fickle
+	trait = lustful
+	trait = wrathful
+	2525.8.19 = {
+		birth = yes
+	}
+	2600.1.1 = {
+		death = yes
+	}
+}
+france_ferrand_andrieu = {
+	name = "Ferrand"
+	dynasty = andrieu_dynasty
+	religion = "carolingian"
+	culture = occitan
+	trait = education_learning_4
+	trait = brave
+	trait = humble
+	trait = forgiving
+	2522.12.12 = {
+		birth = yes
+	}
+	2600.1.1 = {
+		death = yes
+	}
+}
+france_malachi_djerassi = {
+	name = "Malachi"
+	dynasty = djerassi_dynasty
+	religion = "congregationist"
+	culture = sephardi
+	trait = education_diplomacy_2
+	trait = content
+	trait = ambitious
+	trait = calm
+	2526.2.21 = {
+		birth = yes
+	}
+	2600.1.1 = {
+		death = yes
+	}
+}
+france_marouane_atika = {
+	name = "Marouane"
+	dynasty = atika_dynasty
+	religion = "simurghi"
+	culture = beur
+	trait = education_intrigue_2
+	trait = ambitious
+	trait = greedy
+	trait = chaste
+	2523.9.12 = {
+		birth = yes
+	}
+	2600.1.1 = {
+		death = yes
+	}
 }

N3OW/history/titles/k_aquitaine.txt

@@ -20,21 +20,7 @@ d_aquitaine = {
 		holder = france_edmond_daunte #Edmond Daunte
 	}
 }
-c_armagnac = {
-	2540.1.1 = {
-		holder = france_edmond_daunte #Edmond Daunte
-	}
-}
-c_comminges = {
-	2540.1.1 = {
-		holder = france_edmond_daunte #Edmond Daunte
-	}
-}
-c_foix = {
-	2540.1.1 = {
-		holder = france_edmond_daunte #Edmond Daunte
-	}
-}
+
 c_toulouse = {
 	2540.1.1 = {
 		holder = france_edmond_daunte #Edmond Daunte
@@ -45,11 +31,6 @@ c_agenais = {
 		holder = france_edmond_daunte #Edmond Daunte
 	}
 }
-c_carcassonne = {
-	2540.1.1 = {
-		holder = france_edmond_daunte #Edmond Daunte
-	}
-}
 c_beziers = {
 	2540.1.1 = {
 		holder = france_edmond_daunte #Edmond Daunte
@@ -65,9 +46,37 @@ c_rouergue = {
 		holder = france_edmond_daunte #Edmond Daunte
 	}
 }
-c_montpellier = {
+
+
+c_comminges = { # gasc
 	2540.1.1 = {
-		holder = france_edmond_daunte #Edmond Daunte
+		holder = france_saris_bayrou #Saris Bayrou
+		liege = d_aquitaine
+	}
+}
+
+c_armagnac = { # gasc
+	2540.1.1 = {
+		holder = france_saris_bayrou #Saris Bayrou
+		liege = d_aquitaine
+	}
+}
+c_foix = { # occ
+	2540.1.1 = {
+		holder = france_ferrand_andrieu #Ferrand Andrieu
+		liege = d_aquitaine
+	}
+}
+c_montpellier = { # beur
+	2540.1.1 = {
+		holder = france_marouane_atika #Marouane Atika
+		liege = d_aquitaine
+	}
+}
+c_carcassonne = { # seph
+	2540.1.1 = {
+		holder = france_malachi_djerassi #Malachi Djerassi
+		liege = d_aquitaine
 	}
 }
 

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

@@ -57,6 +57,10 @@
  dynn_clemence:0 "Clemence"
  dynn_amouroux:0 "Amouroux"
  dynn_voigt:0 "Voigt"
+ dynn_bayrou:0 "Bayrou"
+ dynn_andrieu:0 "Andrieu"
+ dynn_djerassi:0 "Djerassi"
+ dynn_atika:0 "Atika"
 
  #e_britannia
  dynn_André:0 "André"