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

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

@@ -229,24 +229,6 @@ b_wrexham = {
 		instance = { position = { 0.75 0.75 }	scale = { 0.3 0.3 }	}
 	}
 }
-c_aargau = {
-	pattern = "pattern_solid.dds"
-	color1 = "white"
-	color2 = "red"
-	colored_emblem = {
-		texture = "ce_ordinary_fess_5.dds"
-		color1 = "red"
-		color2 = "red"
-		instance = { position = { 0.5 0.1 }	}
-	}
-	colored_emblem = {
-		texture = "ce_eagle.dds"
-		color1 = "black"
-		color2 = "red"
-		color3 = "white"
-		instance = { position = { 0.5 0.6 } scale = { 0.7 0.7 }  }
-	}
-}
 c_abauj = {
 	pattern = "pattern_vertical_split_01.dds"
 	colored_emblem = {
@@ -2973,23 +2955,23 @@ c_ikonion = {
 		instance = { position = { 0.73 0.18 } scale = { 0.28 0.28 }  }
 	}
 }
-c_innsbruck = {
-	pattern = "pattern_shield_03_small.dds"
-	color1 = "white"
-	color2 = "red"
-	colored_emblem = {
-		texture = "ce_eagle.dds"
-		color1 = "black"
-		color2 = "red"
-		color3 = "white"
-		mask = { 1 }
-		instance = { position = { 0.5 0.45 } scale = { 1.0 1.0 }  }
+c_vaduz={
+	pattern="pattern_checkers_02.dds"
+	color1=red
+	color2=white
+	colored_emblem={
+		color1=white
+		color2=red
+		texture="NEOW_ce_crown_french_closed.dds"
+		instance={position={0.275 0.25} scale={0.7 0.7}}
+		instance={position={0.725 0.675} scale={0.6 0.6}}
 	}
-	colored_emblem = {
-		texture = "ce_ordinary_cross_5.dds"
-		color1 = "white"
-		mask = { 2 }
-		instance = { position = { 0.5 0.4 } scale = { 0.4 0.4 }  }
+	colored_emblem={
+		color1=white
+		color2=red
+		texture="ce_gonfanon.dds"
+		instance={position={0.725 0.265} scale={0.5 0.5}}
+		instance={position={0.295 0.725} scale={0.45 0.45}}
 	}
 }
 c_innse_gall = {
@@ -4500,19 +4482,6 @@ c_thouars = {
 		instance = { position = { 0.5 0.5 } scale = { 1.0 1.0 } }
 	}
 }
-c_geneva = {
-	pattern = "pattern_solid.dds"
-	color1 = "blue"
-	colored_emblem = {
-		texture = "ce_block_02.dds"
-		color1 = "yellow"
-		instance = { position = { 0.166 0.126 } scale = { 0.33 0.33 }  }
-		instance = { position = { 0.833 0.126 } scale = { 0.33 0.33 }  }
-		instance = { position = { 0.5 0.459 } scale = { 0.33 0.33 }  }
-		instance = { position = { 0.146 0.813 } scale = { 0.374 0.374 }  }
-		instance = { position = { 0.854 0.813 } scale = { 0.374 0.374 }  }
-	}
-}
 
 c_lusignan = {
 
@@ -8147,18 +8116,6 @@ k_austria = {
 	}
 }
 
-k_switzerland = {
-	pattern = "pattern_solid.dds"
-	color1 = "red"
-	color2 = "white"
-	colored_emblem = {
-		texture = "ce_cross_09.dds"
-		color1 = "white"
-		color2 = "white"
-		instance = { position = { 0.5 0.45 } scale = { 0.8 0.8 }  }
-	}
-}
-
 ## Existing entries, no change
 
 # I like those, they are more unique than the attributed arms for Widukind and the saxons (horse salient)
@@ -12817,19 +12774,6 @@ d_wielkopolska = {
 	}
 }
 
-d_currezia = {
-	pattern = "pattern_solid.dds"
-	color1 = "white"
-	color2 = "black"
-	colored_emblem = {
-		texture = "ce_goat.dds" # Goat rampant
-		color1 = "black"
-		color2 = "black"
-		color3 = "white"
-		instance = { position = { 0.5 0.48 } scale = { 0.9 0.9 }  }
-	}
-}
-
 d_augsburg = {
 	pattern = "pattern_solid.dds"
 	color1 = "red"
@@ -12907,47 +12851,6 @@ c_genoa = {
 	}
 }
 
-d_tyrol = {
-	pattern="pattern_solid.dds"
-	color1=white
-	color2=red
-	colored_emblem={
-		color1=yellow
-		color2=yellow
-		texture="ce_crescent_bone.dds"
-		instance={
-			position={ 0.500000 0.460000 }
-			scale={ 0.450000 0.440000 }
-		}
-
-	}
-
-	colored_emblem={
-		color1=red
-		color2=yellow
-		color3=white
-		texture="ce_eagle.dds"
-		instance={
-			position={ 0.500000 0.620000 }
-			scale={ 1.000000 0.880000 }
-			depth=1.010000
-		}
-
-	}
-
-	colored_emblem={
-		color1=green
-		texture="ce_laurels.dds"
-		instance={
-			position={ 0.500000 0.300000 }
-			scale={ 0.430000 0.430000 }
-			depth=2.010000
-		}
-
-	}
-
-}
-
 d_ancona = {
 	pattern = "pattern_solid.dds"
 	color1 = "red"
@@ -19291,19 +19194,6 @@ c_eschenlohe = {
 	}
 }
 
-c_innsbruck = {
-	pattern = "pattern_solid.dds"
-	color1 = "blue"
-	color2 = "white"
-	colored_emblem = {
-		texture = "ce_eagle.dds"
-		color1 = "white"
-		color2 = "yellow"
-		color3 = "black"
-		instance = { position = { 0.5 0.52 } scale = { 1.1 1.1 }  }
-	}
-}
-
 c_leuchtenburg = {
 	pattern = "pattern_solid.dds"
 	color1 = "white"
@@ -19661,25 +19551,6 @@ c_besancon = {
 	}
 }
 
-c_bern = {
-	pattern = "pattern_solid.dds"
-	color1 = "red"
-	color2 = "yellow"
-	colored_emblem = {
-		texture = "ce_mena_bend.dds"
-		color1 = "yellow"
-		color2 = "yellow"
-		instance = { position = { 0.5 0.5 } scale = { 1.25 1.25 }  }
-	}
-	colored_emblem = {
-		texture = "ce_bear_passant.dds"
-		color1 = "black"
-		color2 = "red"
-		color3 = "white"
-		instance = { position = { 0.44 0.5 } rotation = 45 scale = { 0.8 0.8 }  }
-	}
-}
-
 c_neuchatel = {
 	pattern = "pattern_solid.dds"
 	color1 = "red"
@@ -19760,18 +19631,6 @@ c_brixen = {
 	}
 }
 
-c_lienz = {
-	pattern = "pattern_solid.dds"
-	color1 = "blue"
-	color2 = "yellow"
-	colored_emblem = {
-		texture = "ce_flower.dds"
-		color1 = "yellow"
-		color2 = "green_light"
-		instance = { position = { 0.5 0.48 } scale = { 0.9 0.9 }  }
-	}
-}
-
 c_schaumberg = {
 	pattern = "pattern_solid.dds"
 	color1 = "blue"
@@ -19997,43 +19856,6 @@ c_gleichenstein = {
 	}
 }
 
-c_sankt_gallen = {
-	pattern = "pattern_solid.dds"
-	color1 = "yellow"
-	color2 = "black"
-	colored_emblem = {
-		texture = "ce_bear_rampant.dds"
-		color1 = "black"
-		color2 = "black"
-		color3 = "white"
-		instance = { position = { 0.5 0.51 } scale = { 1.0 1.0 }  }
-	}
-}
-
-c_zurich = {
-	pattern = "pattern_solid.dds"
-	color1 = "white"
-	color2 = "blue"
-	colored_emblem = {
-		texture = "ce_per_bend.dds"
-		color1 = "white"
-		color2 = "blue"
-		instance = { position = { 0.5 0.5 } scale = { 1.0 1.0 }  }
-	}
-}
-
-c_grisons = {
-	pattern = "pattern_solid.dds"
-	color1 = "black"
-	color2 = "white"
-	colored_emblem = {
-		texture = "ce_pattern_vertical_split_01.dds"
-		color1 = "black"
-		color2 = "white"
-		instance = { position = { 0.5 0.5 } scale = { 1.0 1.0 }  }
-	}
-}
-
 c_furstenberg = {
 	pattern = "pattern_solid.dds"
 	color1 = "yellow"
@@ -32745,97 +32567,3 @@ e_yugoslavia_christian={
 	}
 
 }
-
-d_monaco={
-	pattern="pattern_horizontal_split_01.dds"
-	color1=red
-	color2=white
-	color3=green
-	colored_emblem={
-		color1=white
-		texture="ce_block_02.dds"
-		instance={
-			position={ 0.500000 0.000000 }
-			scale={ 1.000000 0.040000 }
-		}
-
-	}
-
-	colored_emblem={
-		color1=red
-		texture="ce_block_02.dds"
-		instance={
-			position={ 0.780000 0.710000 }
-			scale={ 0.090000 0.090000 }
-			depth=1.010000
-		}
-
-		instance={
-			position={ 0.640000 0.730000 }
-			scale={ 0.070000 0.070000 }
-			depth=2.010000
-		}
-
-		instance={
-			position={ 0.360000 0.730000 }
-			scale={ 0.080000 0.080000 }
-			depth=3.010000
-		}
-
-		instance={
-			position={ 0.220000 0.720000 }
-			scale={ 0.070000 0.070000 }
-			depth=4.010000
-		}
-
-		instance={
-			position={ 0.500000 0.730000 }
-			scale={ 0.080000 0.060000 }
-			depth=5.010000
-		}
-
-	}
-
-	colored_emblem={
-		color1=red
-		color2=white
-		texture="ce_lozengy.dds"
-		instance={
-			position={ 0.500000 0.380000 }
-			scale={ 0.750000 0.750000 }
-			depth=6.010000
-		}
-
-		instance={
-			position={ 0.500000 0.920000 }
-			scale={ 0.750000 0.750000 }
-			depth=7.010000
-		}
-
-		instance={
-			position={ 0.080000 0.940000 }
-			scale={ 0.750000 0.750000 }
-			depth=8.010000
-		}
-
-		instance={
-			position={ 0.920000 0.930000 }
-			scale={ 0.750000 0.750000 }
-			depth=9.010000
-		}
-
-		instance={
-			position={ 0.080000 0.380000 }
-			scale={ 0.750000 0.750000 }
-			depth=10.010000
-		}
-
-		instance={
-			position={ 0.920000 0.380000 }
-			scale={ 0.750000 0.750000 }
-			depth=11.010000
-		}
-
-	}
-
-}

N3OW/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt

@@ -240,45 +240,6 @@ d_novelist_high_king = {
 		texture = "flag_novelist_hof.dds"
 	}
 }
-k_tirol = {
-	pattern="pattern_horizontal_split_01.dds"
-	color1=white
-	color2=red
-	colored_emblem={
-		color1=black
-		color2=black
-		texture="ce_shield_02.dds"
-		instance={
-			scale={ 0.780000 0.780000 }
-			depth=2.010000
-		}
-
-	}
-
-	colored_emblem={
-		color1=red
-		color2=yellow
-		color3=white
-		texture="ce_eagle_crown_boned.dds"
-		instance={
-			position={ 0.500000 0.530000 }
-			scale={ 0.780000 0.780000 }
-		}
-
-	}
-
-	colored_emblem={
-		color1=white
-		color2=white
-		texture="ce_shield_02.dds"
-		instance={
-			scale={ 0.710000 0.710000 }
-			depth=1.010000
-		}
-
-	}
-
-}
 k_sapmi={
 	pattern="pattern_vertical_split_01.dds"
 	color1=red
@@ -511,75 +472,6 @@ k_sicily={
 }
 
 
-d_south_tyrol={
-	pattern="pattern_horizontal_split_01.dds"
-	color1=white
-	color2=blue
-	color3=blue
-	colored_emblem={
-		color1=white
-		texture="ce_block_02.dds"
-		instance={
-			depth=3.010000
-		}
-
-	}
-
-	colored_emblem={
-		color1=red
-		color2=yellow
-		color3=black
-		texture="ce_eagle_crown_boned.dds"
-		instance={
-			position={ 0.290000 0.270000 }
-			scale={ 0.560000 0.560000 }
-		}
-		instance={
-			position={ 0.710000 0.270000 }
-			scale={ 0.560000 0.560000 }
-		}
-		instance={
-			position={ 0.290000 0.750000 }
-			scale={ 0.560000 0.560000 }
-		}
-		instance={
-			position={ 0.710000 0.750000 }
-			scale={ 0.560000 0.560000 }
-		}		
-	}
-	colored_emblem={
-		color1=black
-		color2=yellow
-		color3=yellow
-		texture="ce_eagle_crown_boned.dds"
-		instance={
-			position={ 0.290000 0.270000 }
-			scale={ 0.50000 0.50000 }
-		}
-		instance={
-			position={ 0.710000 0.750000 }
-			scale={ 0.500000 0.500000 }
-		}	
-	}
-	colored_emblem={
-		color1=black
-		texture="ce_block_05.dds"
-		instance={
-			scale={ 0.400000 1.000000 }
-			depth=1.010000
-			rotation=90
-		}
-
-		instance={
-			scale={ 1.000000 0.350001 }
-			depth=2.010000
-		}
-
-	}
-
-}
-
-
 k_lombaro_veneto={
 	custom=yes
 	pattern="pattern_checkers_02.dds"
@@ -919,47 +811,6 @@ k_lichtenstein = {
 		texture = "flag_lichtenstein.dds"
 	}
 }
-d_lictenstein = {
-	custom=yes
-	pattern="pattern_horizontal_split_01.dds"
-	color1=yellow_light
-	color2=red
-	color3=red
-}
-c_farduzes = {
-	custom=yes
-	pattern="pattern__solid_designer.dds"
-	color1=black
-	color2=white
-	color3=red
-	colored_emblem={
-		color1=yellow_light
-		color2=black
-		texture="ce_barry_04.dds"
-		instance={
-			rotation=90
-		}
-
-	}
-
-}
-c_chur = {
-	custom=yes
-	pattern="pattern__solid_designer.dds"
-	color1=red
-	color2=white
-	color3=red
-	colored_emblem={
-		color1=white
-		color2=black
-		texture="ce_block_03.dds"
-		instance={
-			position={ 0.390000 0.500000 }
-			rotation=90
-		}
-
-	}
-}
 
 # k_saxony_proper = {	
 	# custom=yes

N3OW/common/culture/cultures/NEOW_rhaeto_helvetic.txt

@@ -16,7 +16,7 @@
 		tradition_faith_bound
 	}
 	
-	name_list = name_list_swabian
+	name_list = name_list_NEOW_swabian
 	
 	coa_gfx = { german_group_coa_gfx western_coa_gfx } 
 	building_gfx = { western_building_gfx } 

N3OW/common/culture/name_equivalency/00_NEOW_female_names.txt

@@ -19,7 +19,7 @@ anastasia_female = { Anastasi_e_act_ }
 andrea_female = { Andrea Andriveto }
 angela_female = { Aela Aelia Aelig Ang_e_grv_lo_female }
 angelica_female = { Angelico_female }
-anna_female = { Ana Ana_i_uml_s Aneto Anita Anja Anna Annaig Annette Annick Ano Hanne Naig }
+anna_female = { Ana Ana_i_uml_s Aneto Anita Anja Anna Annaig Annette Annick Ano Hannah Hanne Naig }
 annaclara_female = { Ano-Claro }
 annaeleonora_female = { Hannelore }
 annalaura_female = { Ano-Lauro }
@@ -182,14 +182,14 @@ kulthum_female = { Kalthoum }
 laetitia_female = { Leticio }
 lamia_female = { Lamia Lamya }
 latifa_female = { Latifa }
-laura_female = { Laure Laureto Lauro_female }
+laura_female = { Laura Laure Laureto Lauro_female }
 laurence_female = { Laur_e_grv_n_c_ced_o Laurence }
 layla_female = { La_i_uml_la Leila Leyla }
-lea_female = { Le_a_grv }
+lea_female = { Le_a_grv Lea }
 leonie_female = { Leonie Leoun_i_grv_o Leountino }
 liliana_female = { Liliano }
 linda_female = { Lindo_female Lynda }
-lisa_female = { Liseto Liso_female }
+lisa_female = { Lisa Liseto Liso_female }
 lorraine_female = { Lourreno }
 louise_female = { Lizig Lo_i_uml_za Loeiza Lou_i_uml_so_female Lou_i_uml_sono Louisa Zaig }
 lubna_female = { Lobna }

N3OW/common/culture/name_equivalency/00_NEOW_male_names.txt

@@ -20,7 +20,7 @@ adrian_male = { Adrian Adrien }
 ahmad_male = { Ahmad Ahmed Amadou }
 alan_male = { Alain Alan Allan }
 albanus_male = { Alban Auban }
-albert_male = { Albert Alberzh Aubert }
+albert_male = { Adalbert Albert Alberzh Albrecht Aubert }
 albinus_male = { Aubin }
 alexander_male = { Aleissandre Aleksandr Alexander Alexandre }
 alexis_male = { Al_e_grv_ssi Alexis }
@@ -46,7 +46,7 @@ arnold_male = { Arend Arnaud Arnault Arno Arnold }
 arnulf_male = { Arnulf }
 arsenius_male = { Arsena }
 arthur_male = { _A_grv_rtus Arthur }
-augustine_male = { Agustin }
+augustine_male = { Agustin Augustinus }
 augustus_male = { Aguste August }
 aurelian_male = { Aurelian }
 axel_male = { Assel Axel }
@@ -57,7 +57,7 @@ baldwin_male = { Baudouin }
 balthazar_male = { Balthasar }
 baptist_male = { Batisto }
 barnaby_male = { Barnab_e_grv_u }
-bartholomew_male = { Barth_e_act_l_e_act_my Bartoumi_e_act_u }
+bartholomew_male = { Barth_e_act_l_e_act_my Bartholom_a_uml_us Bartoumi_e_act_u }
 bashir_male = { B_e_act_chir }
 basil_male = { Basile }
 bassam_male = { Bassem }
@@ -65,7 +65,7 @@ benedict_male = { Benead Benedikt Benet Benezet Beno_i_hat_t }
 benjamin_male = { Benjamin }
 berengar_male = { B_e_act_renger Berengui_e_act_ }
 bernard_male = { Bernard Bernat Bernhard Bernez }
-bertrand_male = { Beltram Bertrand }
+bertrand_male = { Beltram Bertram Bertrand }
 bilal_male = { Bilal }
 blasius_male = { Bl_a_grv_si }
 boniface_male = { Bounif_a_grv_ci }
@@ -81,7 +81,7 @@ caetano_male = { Gaietan }
 calixtus_male = { Calist }
 camillus_male = { Camihe Camill }
 casimir_male = { Casim_e_grv_r Casimir }
-caspar_male = { Gaspard }
+caspar_male = { Gaspard Kaspar }
 cedric_male = { C_e_act_dric Cedric }
 celestine_male = { Celestin }
 charles_male = { Carl Carle Charle Charles Charlez Karl }
@@ -93,9 +93,9 @@ clement_male = { Cl_e_act_ment Clem_e_grv_nt Clemens Klement }
 clovis_male = { Clouvis Clovis }
 conan_male = { Kenan }
 conrad_male = { Konrad Kurt }
-corbinian_male = { Korbinian }
-constantine_male = { Coustantin }
+constantine_male = { Coustantin Konstantin }
 constantius_male = { Coustant }
+corbinian_male = { Korbinian }
 corentin_male = { Courentin }
 cyprian_male = { Ciprian }
 cyril_male = { Cerile Cyril Cyrille }
@@ -116,13 +116,14 @@ ekkehard_male = { Eike Ekkehard }
 eligius_male = { Aloi }
 elijah_male = { El_i_grv_o Elias Eliaz Ilyes Lyes }
 elouan_male = { Elouan Elouann }
-emeric_male = { Aimery Eimeri }
+emeric_male = { Aimery Eimeri Emich }
 emil_male = { _E_act_mile Emil Emile Milio }
 emilian_male = { Emilian }
-emmanuel_male = { Emmanuel Enmanu_e_grv_l Manu_e_grv_ Manuel }
+emmanuel_male = { Emanuel Emmanuel Enmanu_e_grv_l Manu_e_grv_ Manuel }
 engelbert_male = { Engelbert }
 eric_male = { _E_act_ric Eri Erich Erik }
 ernest_male = { Ernest Ernst }
+erwin_male = { Erwein Erwin }
 eugene_male = { _E_act_ug_e_grv_ni Eugen Eujen }
 eustace_male = { Eustache }
 fabian_male = { Fabian }
@@ -157,7 +158,7 @@ gilbert_male = { Gibert Gilbert Jilberzh }
 gildas_male = { Gildas Gweltaz }
 giles_male = { Gile Jil Jili }
 graham_male = { Graham }
-gregory_male = { Greg_o_grv_ri }
+gregory_male = { Greg_o_grv_ri Gregor }
 gunther_male = { G_u_uml_nter G_u_uml_nther }
 guntram_male = { Guntram }
 gustav_male = { Gust_a_grv_vi Gustav }
@@ -172,16 +173,16 @@ harvey_male = { Erv_e_act_ Herve }
 hashim_male = { Hachim }
 hassan_male = { Hassan Hassen }
 hector_male = { Eitor }
-helmut_male = { Helmut }
+helmut_male = { Helmut Helmuth }
 henry_male = { Enri Enzo Heinrich Heinz Herri }
-herbert_male = { Herbert }
+herbert_male = { Herbert Heribert }
 hermann_male = { Armand Hermann }
 hieronymus_male = { J_e_act_r_o_hat_me Jirome Yerom }
 hilarius_male = { Il_a_grv_ri }
 hilmi_male = { Helmi }
-hippolyte_male = { Ipoulite }
+hippolyte_male = { Hippolyt Ipoulite }
 hisham_male = { Hicham Hichem }
-hubert_male = { Huberzh Ubert }
+hubert_male = { Hubert Huberzh Ubert }
 hugh_male = { Hugo Ugue }
 humbert_male = { Umbert }
 husni_male = { Housni }
@@ -192,6 +193,7 @@ hywel_male = { Hoel Howel }
 idris_male = { Driss Idriss }
 ignatius_male = { Ignaz }
 irenaeus_male = { Ireni_e_act_u }
+isidore_male = { Isidor }
 ismail_male = { Isma_e_uml_l Isma_i_uml_l }
 izzuddin_male = { Azzedine }
 jamal_male = { Djamel Jamel }
@@ -239,7 +241,7 @@ justin_male = { Justin }
 justus_male = { Justus }
 kamil_male = { Camel Kamel }
 karim_male = { Karim }
-kevin_male = { K_e_act_vin Quevin }
+kevin_male = { K_e_act_vin Kevin Quevin }
 khalid_male = { Khaled Khalid }
 khalifa_male = { Halifa }
 khalil_male = { Khalil }
@@ -250,12 +252,12 @@ latif_male = { Latuf }
 lawrence_male = { Laora_n_tld_s Laur_e_grv_ns Lorenz }
 lenaig_male = { L_e_act_na_i_uml_c Lenaig }
 leo_male = { Leo Leon Leoun }
-leonard_male = { Lienard Lienhardt }
-leopold_male = { Leopold Leoupold }
+leonard_male = { Leonhard Lienard Lienhardt }
+leopold_male = { Leopold Leoupold Luitpold }
 linus_male = { Linus }
 lionel_male = { Lionel Liounel }
 lothar_male = { Clotaire Lothar }
-louis_male = { Aloys Lo_i_uml_c Lo_i_uml_g Lo_i_uml_s Loeiz Lou_i_uml_s Ludwig Luis }
+louis_male = { Alois Aloys Lo_i_uml_c Lo_i_uml_g Lo_i_uml_s Loeiz Lou_i_uml_s Ludwig Luis }
 lucian_male = { Lucian Lucien }
 luke_male = { Lu Lucas Lukas }
 lutfi_male = { Lotfi }
@@ -271,7 +273,7 @@ martial_male = { Marciau }
 martin_male = { Martin }
 marwan_male = { Marouane Marwan }
 mathurin_male = { Mathurin Matilin }
-matthew_male = { Mah_e_act_ Maho Mati_e_act_u Matias Matthias Mazhev }
+matthew_male = { Mah_e_act_ Maho Mati_e_act_u Matias Matth_a_uml_us Matthias Mazhev }
 maurice_male = { Maoris Maurise Moritz }
 mawlud_male = { Miloud Mouloud }
 maxentius_male = { Meiss_e_grv_ns }
@@ -336,7 +338,7 @@ reuben_male = { Ruben }
 riad_male = { Riad Riadh }
 richard_male = { Ricard Richard Richarzh }
 ridwan_male = { Redouane }
-robert_male = { Robert Roparzh Roubert Rupert }
+robert_male = { Robert Roparzh Roubert Rupert Rupprecht }
 roch_male = { Rochus }
 roderick_male = { Roudrigo }
 roger_male = { R_u_uml_diger Roje Rougi_e_act_ }
@@ -347,7 +349,7 @@ ronan_male = { Renan Ronan }
 rudolf_male = { Rolf Roud_o_grv_u Rudolf }
 said_male = { Sa_i_uml_d }
 salim_male = { Salim Selim Slim }
-salvador_male = { Sauvaire }
+salvador_male = { Salvator Sauvaire }
 samir_male = { Samir }
 samuel_male = { Samu_e_grv_l Samuel }
 sebastian_male = { Bastian Sebastian }
@@ -356,6 +358,7 @@ severinus_male = { Severin }
 shamsuddin_male = { Chems-Eddine }
 shaykh_male = { Cheikh }
 siegfried_male = { Siegfried }
+siegmund_male = { Sigismund Sigmund }
 simon_male = { Simon Simoun }
 solomon_male = { Slimane Souleymane }
 stanislaus_male = { Estanislau }
@@ -368,7 +371,7 @@ tanguy_male = { Tangi Tanguy }
 tariq_male = { Tarek Tareq Tarik }
 thaddaeus_male = { Thadd_a_uml_us }
 theo_male = { Theo }
-theobald_male = { Tepot Tibaud }
+theobald_male = { Tepot Theobald Tibaud }
 theodore_male = { Teoudor Theodor }
 theodoric_male = { Dieter Dietrich Terris Thierry }
 theophilus_male = { Teoufile Theophil }

N3OW/common/culture/name_lists/NEOW_bavarian.txt

@@ -208,43 +208,65 @@ name_list_bavarian_wip = {
 	
 	male_names = {
 		2 = {
-			Albert Alexander Andreas Anton 
+			Albert Alexander Alfons Alois Andreas Anton 
 			Bernhard 
-			Christian 
+			Christian Christoph 
 			Daniel David Dieter 
-			Eduard Ernst 
+			Eduard Erich Ernst Ewald 
 			Ferdinand Florian Franz Friedrich 
-			G_u_uml_nter G_u_uml_nther Georg Gerald Gottfried 
-			Helmut Herbert Horst 
+			G_u_uml_nter G_u_uml_nther Georg Gerald Gerhard Gernot Gottfried 
+			Harald Heinrich Helmut Herbert Hermann Horst Hubert 
 			J_u_uml_rgen Jakob Joachim Johann Johannes 
-			Karl Klaus Klement Kurt 
+			Karl Klaus Klement Konrad Kurt 
 			Leopold Lothar Ludwig 
-			Manfred Markus Martin Matthias Max Michael 
+			Manfred Manuel Markus Martin Matthias Max Michael 
+			Norbert 
 			Otto 
-			Paul Peter Philipp 
-			Rainer Reinhard Reinhold Richard Robert Roland Rolf Rupert 
-			Sebastian Siegfried Stephan 
+			Patrick Paul Peter Philipp 
+			Rainer Reinhard Reinhold Richard Robert Roland Rolf Roman Rudolf Rupert 
+			Sebastian Siegfried Stefan Stephan 
 			Thomas Tobias 
 			Ulrich 
-			Walter Werner Wolfgang 
+			Walter Werner Wilhelm Wolfgang 
 		}
 		1 = {
-			Adam Adrian Alexis 
-			Balthasar Benedikt Benjamin Berthold 
+			Adalbert Adam Adrian Alban Albrecht Alexis Arnold Arnulf Arthur Augustinus 
+			Balthasar Bartholom_a_uml_us Benedikt Benjamin Berthold Bertram 
 			Dominik 
-			Elias Emil 
+			Elias Emanuel Emich Emil Erwein Eugen 
 			Fabian Felix Franz_spc_Josef 
-			Gabriel Guido 
-			Jonas Jonathan 
-			Kilian Korbinian 
-			Leo Leon Linus Lukas 
-			Marcel Maximilian Moritz 
-			Niklas Nikolaus 
+			Gabriel Gregor Guido Guntram 
+			Hartmann Helmuth Heribert Hippolyt 
+			Ignaz Isidor 
+			Jonas Jonathan Julius 
+			Kaspar Kevin Kilian Konstantin Korbinian 
+			Leo Leon Leonhard Liborius Linus Lorenz Ludwig-Maximilian Luitpold Lukas 
+			Marcel Matth_a_uml_us Max-Emanuel Maximilian Max-Ludwig Meinrad Moritz 
+			Nepomuk Niklas Nikolaus 
 			Oskar Otmar 
-			Raphael Rochus 
-			Samuel Simon 
-			Theodor 
+			Pius 
+			Raimund Raphael Rochus Rupprecht 
+			Salvator Samuel Sigismund Sigmund Simon 
+			Tassilo Thadd_a_uml_us Theobald Theodor 
 			Valentin 
 			Wilfried 
 		}
+	}
+	female_names = {
+		2 = {
+			Anna 
+			Christine 
+			Franziska 
+			Ilse 
+			Julia 
+			Katharina 
+			Paula 
+		}
+		1 = {
+			Antonia 
+			Hannah 
+			Laura Lea Lisa 
+			Sarah Sophia Sophie 
+		}
+	}
 }

N3OW/common/landed_titles/alps.txt

@@ -9,7 +9,7 @@ e_alps = {
         
 	    capital = c_bern
         
-		d_currezia = {
+		d_mittelland = {
 			color = { 255 220 220 }
 
 			capital = c_zurich #Zurich
@@ -51,7 +51,7 @@ e_alps = {
 					color = { 255 215 205 }
 				}				
 			}		
-			c_aargau = {
+			c_aargau = { # Lucerne
 				color = { 150 70 15 }
 
 				b_lucerne = {
@@ -68,8 +68,8 @@ e_alps = {
 		}
 		d_transjurania = {
 			color = { 159 40 10 }
-
 			capital = c_bern
+
 			c_bern = {
 				color = { 139 30 10 }
 
@@ -116,9 +116,10 @@ e_alps = {
 					color = { 90 5 15 }
 				}
 			}	
-			c_sion = {
-				color = { 139 30 10 }			
-				b_thusis = {
+			c_valais = {
+				color = { 139 30 10 }
+
+				b_thusis = { # Sion
 					province = 9700
 
 					color = { 139 30 10 }
@@ -133,10 +134,11 @@ e_alps = {
 		d_rhaetia = {
 			color = { 215 190 220 }
 
-			capital = c_chur
+			capital = c_grisons
 		
- 			c_chur = {
+ 			c_grisons = {
 				color = { 255 220 220 }
+				
 				b_chur = {
 					province = 2055
 
@@ -155,6 +157,7 @@ e_alps = {
 			}
 			c_ticino = {
 				color = { 139 30 10 }
+				
 				b_bellinzona = {
 					province = 2478
 
@@ -373,13 +376,15 @@ e_alps = {
 	
     k_tirol = {
         color = { 102 33 20 }
-			can_be_named_after_dynasty = no
         capital = c_innsbruck
+		
+		can_be_named_after_dynasty = no
 
 		d_tyrol = {
 			color = { 75 65 75 }
-				can_be_named_after_dynasty = no
 			capital = c_innsbruck #De-facto only, actually Tirol
+			
+			can_be_named_after_dynasty = no
 
 			c_innsbruck = {
 				color = { 75 65 75 }
@@ -437,7 +442,7 @@ e_alps = {
 					color = { 170 150 190 }
 				}
 			}
-			c_vorarlberg= {
+			c_vorarlberg = {
 				color = { 250 150 220 }
 				
 				b_bregenz = {
@@ -473,6 +478,7 @@ e_alps = {
 			}
 			c_bozan= {
 				color = { 60 50 60 }
+				
 				b_bolzano = {
 					province = 2498
 
@@ -505,12 +511,13 @@ e_alps = {
         d_lictenstein = {
 			color = { 3 55 245 }
 
-			capital = c_farduzes
- 			c_farduzes = {
+			capital = c_vaduz
+			
+ 			c_vaduz = {
 				color = { 255 220 220 }
-				b_farduzes = {
+				
+				b_vaduz = {
 					province = 2052
-
 					color = { 255 220 220 }
 				}
 			}			
@@ -791,8 +798,8 @@ e_alps = {
 		d_provence_fr = {
 			color = { 150 161 32 }
 			color2 = { 255 255 255 }
-			
 			capital = c_bouches_du_rhone
+			
 			cultural_names = {
 				name_list_occitan=cn_proven_c_ced_a
 				name_list_NEOW_provencal=cn_prouv_e_grv_n_c_ced_o
@@ -1017,22 +1024,26 @@ e_alps = {
 			}
 		}
 		d_monaco= {
-		color = { 229 27 34 }
-		color2 = { 255 255 255 }
-		capital = c_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
 			}	
+			
 			c_monaco = {
-			color = { 229 27 34 }
-			color2 = { 255 255 255 }			
+				color = { 229 27 34 }
+				color2 = { 255 255 255 }
+				
 				b_monaco = {
 					province = 8719
 					color = { 229 27 34 }
 					color2 = { 255 255 255 }
+					
 					cultural_names = {
 						name_list_occitan=cn_m_o_act_negue
 						name_list_arpitan=cn_monac_o_hat_

N3OW/common/province_terrain/01_province_properties.txt

@@ -3394,13 +3394,13 @@
 2857 ={
 	winter_severity_bias = 0.50
 }
-### d_currezia 
+### d_mittelland 
 ## c_grisons 
 # b_chur 
 2055 ={
 	winter_severity_bias = 0.90
 }
-# b_farduzes 
+# b_vaduz 
 2052 ={
 	winter_severity_bias = 0.70
 }

N3OW/common/scripted_effects/00_major_decisions_scripted_effects.txt

@@ -937,7 +937,7 @@ form_switzerland_scripted_effect = {
 	title:d_savoie = { save_scope_as = savoy }
 	title:k_switzerland = { save_scope_as = switzerland }
 	#De jure shifts.
-	title:d_currezia = { set_de_jure_liege_title = title:k_switzerland }
+	title:d_mittelland = { set_de_jure_liege_title = title:k_switzerland }
 	title:d_transjurania = { set_de_jure_liege_title = title:k_switzerland }
 	if = {
 		limit = { completely_controls = title:d_savoie }

N3OW/gfx/coat_of_arms/colored_emblems/NEOW_coa_designer_emblems.txt

@@ -94,14 +94,17 @@ NEOW_ce_woman_01.dds = { colors = 3 category = manmade }
 NEOW_ce_armillary_sphere.dds = { colors = 1 category = manmade }
 NEOW_ce_arnor_crown.dds = { colors = 1 category = manmade }
 NEOW_ce_arnor_sceptre.dds = { colors = 1 category = manmade }
+NEOW_ce_barrel.dds = { colors = 2 category = manmade }
 NEOW_ce_bishops_mitre.dds = { colors = 3 category = manmade }
 NEOW_ce_bohemia_crown.dds = { colors = 3 category = manmade }
 NEOW_ce_boot.dds = { colors = 1 category = manmade }
 NEOW_ce_bosphorus.dds = { colors = 1 category = manmade }
 NEOW_ce_bridge_3.dds = { colors = 1 category = manmade }
 NEOW_ce_crown_french_closed.dds = { colors = 2 category = manmade }
+NEOW_ce_bridge_innsbruck.dds = { colors = 1 category = manmade }
 NEOW_ce_crown_koln.dds = { colors = 2 category = manmade }
 NEOW_ce_crown_koln_imperial.dds = { colors = 3 category = manmade }
+NEOW_ce_fasces.dds = { colors = 2 category = manmade }
 NEOW_ce_gondor_crown.dds = { colors = 1 category = manmade }
 NEOW_ce_guillotine.dds = { colors = 1 category = manmade }
 NEOW_ce_guinness_logo.dds = { colors = 1 category = manmade }
@@ -137,6 +140,7 @@ NEOW_ce_orange_branch.dds = { colors = 2 category = nature }
 NEOW_ce_paektu.dds = { colors = 1 category = nature }
 NEOW_ce_rosa_camuna.dds = { colors = 1 category = nature }
 NEOW_ce_taiwan_star.dds = { colors = 1 category = nature }
+NEOW_ce_tree_fir.dds = { colors = 2 category = nature }  
 NEOW_ce_trefoil.dds = { colors = 1 category = nature }  
 NEOW_ce_vergina.dds = { colors = 1 category = nature } 
 NEOW_ce_zanzibar.dds = { colors = 1 category = nature }

N3OW/history/provinces/e_alps.txt

@@ -1,6 +1,6 @@
 
 #k_switzerland
-##d_currezia
+##d_mittelland
 ###c_sankt_gallen
 2053 = {
 	culture = romansch
@@ -96,7 +96,7 @@
 9701 = {
 	holding = church_holding
 }
-###c_sion
+###c_valais
 9700 = {
 	culture = patoues
 	religion = helvetic
@@ -110,13 +110,13 @@
 
 #k_lichtenstein
 ##d_lictenstein
-###c_farduzes
+###c_vaduz
 2052 = {
 	culture = aleman
 	religion = helvetic
 	holding = castle_holding
 }
-###c_chur
+###c_grisons
 2055 = {
 	culture = romansch
 	religion = helvetic

N3OW/localization/english/names/NEOW_character_names_l_english.yml

@@ -284,7 +284,21 @@
  Eleno:0 "Eleno"
  Eliano:0 "Eliano"
  Eloud_i_grv_o:0 "Eloudìo"
+ Emanuel:0 "Emanuel"
+ Ludwig-Maximilian:0 "Ludwig-Maximilian"
+ Max-Ludwig:0 "Max-Ludwig"
+ Max-Emanuel:0 "Max-Emanuel"
  Emanuelo_female:0 "Emanuelo"
+ Konstantin:0 "Konstantin"
+ Bartholom_a_uml_us:0 "Bartholomäus"
+ Salvator:0 "Salvator"
+ Gregor:0 "Gregor"
+ Leonhard:0 "Leonhard"
+ Theobald:0 "Theobald"
+ Liborius:0 "Liborius"
+ Sigismund:0 "Sigismund"
+ Adalbert:0 "Adalbert"
+ Tassilo:0 "Tassilo"
  Emil_i_grv_o_female:0 "Emilìo"
  Estello:0 "Estello"
  Fabiano_female:0 "Fabiano"
@@ -1410,12 +1424,20 @@
  Enzo:0 "Enzo"
  Eudes:0 "Eudes"
  Eustache:0 "Eustache"
+ Nepomuk:0 "Nepomuk"
+ Kaspar:0 "Kaspar"
+ Isidor:0 "Isidor"
+ Sigmund:0 "Sigmund"
+ Matth_a_uml_us:0 "Matthäus"
  Thadd_a_uml_us:0 "Thaddäus"
  Franz_spc_Michael:0 "Franz Michael"
  Johann_spc_Baptist:0 "Johann Baptist"
  Maria_spc_Elisabeth:0 "Maria Elisabeth"
  Johann:0 "Johann"
  J_u_uml_rgen:0 "Jürgen"
+ Helmuth:0 "Helmuth"
+ Augustinus:0 "Augustinus"
+ Hubert:0 "Hubert"
  Wigul_a_uml_us:0 "Wiguläus"
  Erich_spc_Maria:0 "Erich Maria"
  Paul_spc_Johannes:0 "Paul Johannes"
@@ -1538,6 +1560,7 @@
  Lorenz:0 "Lorenz"
  Manuel:0 "Manuel"
  Maximilian:0 "Maximilian"
+ Alois:0 "Alois"
  Meinrad:0 "Meinrad"
  Moritz:0 "Moritz"
  Balthasar:0 "Balthasar"
@@ -1548,9 +1571,20 @@
  Samuel:0 "Samuel"
  Oswald:0 "Oswald"
  Ottmar:0 "Ottmar"
+ Albrecht:0 "Albrecht"
+ Rupprecht:0 "Rupprecht"
+ Luitpold:0 "Luitpold"
  Patrick:0 "Patrick"
  Philipp:0 "Philipp"
  Reinhold:0 "Reinhold"
+ Bertram:0 "Bertram"
+ Erwein:0 "Erwein"
+ Gernot:0 "Gernot"
+ Ewald:0 "Ewald"
+ Heribert:0 "Heribert"
+ Emich:0 "Emich"
+ Hartmann:0 "Hartmann"
+ Hippolyt:0 "Hippolyt"
  Pius:0 "Pius"
  R_u_uml_diger:0 "Rüdiger"
  Raimund:0 "Raimund"
@@ -1694,7 +1728,11 @@
  Isabella:0 "Isabella"
  Jeannette:0 "Jeannette"
  Jessica:0 "Jessica"
+ Lisa:0 "Lisa"
+ Hannah:0 "Hannah"
+ Lea:0 "Lea"
  Josefine:0 "Josefine"
+ Laura:0 "Laura"
  Julia:0 "Julia"
  Juliane:0 "Juliane"
  Karoline:0 "Karoline"

N3OW/localization/english/titles_l_english.yml

@@ -919,8 +919,8 @@
  c_piacenza_adj:0 "Piacenzan"
  c_vorarlberg:0 "Vorarlberg"
  c_vorarlberg_adj:0 "Vorarlberger"
- c_sion:0 "Sion"
- c_sion_adj:0 "Sioner"
+ c_valais:0 "Valais"
+ c_valais_adj:0 "Valaisan"
  c_domodossola:0 "Domodossola"
  c_domodossola_adj:0 "Domodossolan"
  c_sondrio:0 "Sondrio"
@@ -933,8 +933,8 @@
  k_lichtenstein_adj:0 "Liechtensteiner"
  d_lictenstein:0 "Liechtenstein"
  d_lictenstein_adj:0 "Liechtensteiner"
- c_farduzes:0 "Farduzes"
- c_farduzes_adj:0 "Farduzer"
+ c_vaduz:0 "Vaduz"
+ c_vaduz_adj:0 "Vaduzer"
  k_andorra:0 "Andorra"
  k_andorra_adj:0 "Andorran"
  k_tirol:0 "Tirol"
@@ -4087,7 +4087,7 @@
  b_faras:0 "Pakhoras"
  b_farata:0 "Farata"
  b_farava:0 "Farava"
- b_farduzes:0 "Farduzes"
+ b_vaduz:0 "Vaduz"
  b_fareskur:0 "Fareskur"
  b_farfa:0 "Farfa"
  b_farhajird:0 "Farhajird"
@@ -12588,7 +12588,8 @@
  c_chud_adj:0 "Chudian"
  c_chunar:0 "Chunar"
  c_chunar_adj:0 "Chunar"
- c_chur:0 "Churian"
+ c_grisons:0 "Grisons"
+ c_grisons_adj:0 "Grison"
  c_chuvash:0 "Chuvash"
  c_chuvash_adj:0 "Chuvashian"
  c_chuy:0 "Chuy"
@@ -13008,8 +13009,6 @@
  c_grassland_cheremisa_adj:0 "Cheremisan"
  c_graz:0 "Graz"
  c_graz_adj:0 "Grazian"
- c_grisons:0 "Grisons"
- c_grisons_adj:0 "Grisonian"
  c_grobin:0 "Grobin"
  c_grobin_adj:0 "Grobinian"
  c_grodno:0 "Grodno"
@@ -15022,8 +15021,6 @@
  c_vairata_adj:0 "Vairatan"
  c_valabhi:0 "Valabhi"
  c_valabhi_adj:0 "Valabhi"
- c_valais:0 "Valais"
- c_valais_adj:0 "Valaisian"
  c_valence:0 "Valence"
  c_valence_adj:0 "Valence"
  c_valencia:0 "Valencia"
@@ -15539,8 +15536,8 @@
  d_cumberland_adj:0 "Cumberlander"
  d_curonian:0 "Curonians"
  d_curonian_adj:0 "Curonian"
- d_currezia:0 "Currezia"
- d_currezia_adj:0 "Currezian"
+ d_mittelland:0 "Mittelland"
+ d_mittelland_adj:0 "Mittellander"
  d_cyprus:0 "Cyprus"
  d_cyprus_adj:0 "Cypriot"
  d_cyprus_pre:0 "Cypro"
@@ -24927,8 +24924,8 @@
  
  #### Netherlands ####
  
- d_weserems:0 "Weserems"
- d_weserems_adj:0 "Weserems"
+ d_weserems:0 "Weser-Ems"
+ d_weserems_adj:0 "Weser-Ems"
  
 ###Italy
 ##Sardinia and Corsica

N3OW/map_data/definition.csv

@@ -2050,7 +2050,7 @@
 2049;170;183;152;BIEL;x
 2050;2;186;25;BASEL;x
 2051;44;189;153;ZURICH;x
-2052;86;192;26;FARDUZES;x
+2052;86;192;26;VADUZ;x
 2053;128;195;154;SANKT GALLEN;x
 2054;170;198;27;KONSTANZ;x
 2055;2;201;155;CHUR;x

N3OW/map_data/geographical_regions/geographical_region.txt

@@ -131,7 +131,7 @@ world_europe_west_germania = {
 		# Bavaria
 		d_bavaria d_nordgau d_salzburg d_augsburg d_steyermark d_lower_austria d_upper_austria d_tyrol d_carinthia
 		# East Francia
-		d_west_franconia d_east_franconia d_hesse d_currezia d_alsace d_swabia
+		d_west_franconia d_east_franconia d_hesse d_mittelland d_alsace d_swabia
 		# Bohemia
 		d_bohemia d_moravia
 		# Pomerania
@@ -879,7 +879,7 @@ material_woods_yew = {
 		d_upper_silesia d_lower_silesia d_lesser_poland
 
 		#Alps
-		d_provence d_savoie d_piedmonte d_genoa d_transjurania d_currezia
+		d_provence d_savoie d_piedmonte d_genoa d_transjurania d_mittelland
 		d_tyrol d_carinthia d_salzburg
 
 		#Caucasia
@@ -1269,7 +1269,7 @@ custom_bavaria = {
 }
 custom_germany = {
 	duchies = {
-		d_east_franconia d_west_franconia d_hesse d_currezia d_alsace d_swabia
+		d_east_franconia d_west_franconia d_hesse d_mittelland d_alsace d_swabia
 	}
 }
 custom_rhineland = {
@@ -1593,7 +1593,7 @@ custom_europe_western_germany = {
 		# East Francia
 		d_westfalen d_angria d_ostfalen d_anhalt
 		d_west_franconia d_east_franconia d_hesse d_thuringia
-		d_currezia d_alsace d_swabia
+		d_mittelland d_alsace d_swabia
 		# Bavaria
 		d_nordgau d_bavaria d_augsburg d_salzburg d_tyrol
 	}
@@ -1944,7 +1944,7 @@ custom_carolingian_iberia = {
 custom_carolingian_germany = {
 	duchies = {
 		#k_east_francia
-		d_east_franconia d_west_franconia d_hesse d_currezia d_alsace d_swabia
+		d_east_franconia d_west_franconia d_hesse d_mittelland d_alsace d_swabia
 		#k_saxony (west)
 		d_westfalen d_angria d_ostfalen d_thuringia d_holstein
 	}
@@ -1953,7 +1953,7 @@ custom_carolingian_germany = {
 custom_core_switzerland = {
 	duchies = {
 		#k_burgundy
-		d_currezia
+		d_mittelland
 		#k_germany
 		d_transjurania
 	}
@@ -2852,7 +2852,7 @@ ghw_region_germany = {
 		#Saxony
 		d_anhalt d_angria d_westfalen d_ostfalen d_meissen d_lausitz d_holstein d_thuringia
 		#Germany
-		d_west_franconia d_east_franconia d_hesse d_currezia d_alsace d_swabia
+		d_west_franconia d_east_franconia d_hesse d_mittelland d_alsace d_swabia
 		#Bavaria
 		d_bavaria d_nordgau d_salzburg d_augsburg d_steyermark d_lower_austria d_upper_austria d_tyrol d_carinthia d_krain d_istria
 	}