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

common/culture/cultures/00_central_germanic.txt

@@ -1,16 +1,15 @@
 saxon = {
 	color = saxon
-	created = 843.1.1
-	parents = { old_saxon }
 	
 	ethos = ethos_stoic
 	heritage = heritage_central_germanic
 	language = language_saxon
 	martial_custom = martial_custom_male_only
 	traditions = {
-		tradition_stand_and_fight
+		tradition_ancient_miners
-		tradition_ruling_caste
+		tradition_staunch_traditionalists
 		tradition_religious_patronage
+		tradition_hard_working
 	}
 	
 	name_list = name_list_saxon
@@ -30,17 +29,16 @@
 
 franconian = {
 	color = { 0.5 0.5 0.5 }
-	created = 640.1.1 # Frankish settlements appeared along the Rhine during the 7th century
-	parents = { frankish }
 	
 	ethos = ethos_courtly
 	heritage = heritage_central_germanic
 	language = language_high_german
 	martial_custom = martial_custom_male_only
 	traditions = {
-		tradition_hereditary_hierarchy
+		tradition_swords_for_hire
-		tradition_astute_diplomats
+		tradition_zealous_people
-		tradition_castle_keepers
+		tradition_artisans
+		tradition_brewery
 	}
 	
 	name_list = name_list_franconian
@@ -66,11 +64,19 @@ swabian = {
 	language = language_high_german
 	martial_custom = martial_custom_male_only
 	traditions = {
-		tradition_mountain_homes
-		tradition_parochialism
 		tradition_hard_working
+		tradition_brewery
+		tradition_metal_craftsmanship
+		tradition_swords_for_hire
+		tradition_mystical_ancestors
 	}
 	
+	dlc_tradition = {
+		trait = tradition_fp3_beacon_of_learning
+		requires_dlc_flag = legacy_of_persia
+		fallback = tradition_philosopher_culture
+	}
+
 	name_list = name_list_swabian
 
 	coa_gfx = { german_group_coa_gfx western_coa_gfx } 
@@ -118,14 +124,16 @@ rottisch = {
 bavarian = {
 	color = { 0.55 0.55 0.55 }
 	
-	ethos = ethos_spiritual
+	ethos = ethos_courtly
 	heritage = heritage_central_germanic
 	language = language_high_german
 	martial_custom = martial_custom_male_only
 	traditions = {
-		tradition_zealous_people
+		tradition_brewery
-		tradition_stand_and_fight
+		tradition_astute_diplomats
 		tradition_hereditary_hierarchy
+		tradition_ruling_caste
+		tradition_castle_keepers
 	}
 	
 	name_list = name_list_bavarian
@@ -211,9 +219,11 @@ austrian = {
 	language = language_high_german
 	martial_custom = martial_custom_male_only
 	traditions = {
-		tradition_zealous_people
+		tradition_mountain_homes
-		tradition_stand_and_fight
+		tradition_artisans
-		tradition_hereditary_hierarchy
+		tradition_storytellers
+		tradition_festivities
+		tradition_staunch_traditionalists
 	}
 	
 	name_list = name_list_bavarian
@@ -239,9 +249,11 @@ NEOW_pomeranian = {
 	language = language_saxon
 	martial_custom = martial_custom_male_only
 	traditions = {
-		tradition_stand_and_fight
+		tradition_seafaring
-		tradition_ruling_caste
+		tradition_maritime_mercantilism
-		tradition_religious_patronage
+		tradition_republican_legacy
+		tradition_music_theory
+		tradition_city_keepers
 	}
 	
 	name_list = name_list_saxon
@@ -267,9 +279,10 @@ brandenburger = {
 	language = language_saxon
 	martial_custom = martial_custom_male_only
 	traditions = {
-		tradition_stand_and_fight
 		tradition_ruling_caste
-		tradition_religious_patronage
+		tradition_legalistic
+		tradition_formation_fighting
+		tradition_city_keepers
 	}
 	
 	name_list = name_list_saxon
@@ -295,8 +308,8 @@ low_saxon = {
 	language = language_saxon
 	martial_custom = martial_custom_male_only
 	traditions = {
-		tradition_stand_and_fight
+		tradition_agrarian
-		tradition_ruling_caste
+		tradition_artisans
 		tradition_religious_patronage
 	}
 	
@@ -323,11 +336,15 @@ hessian = {
 	language = language_high_german
 	martial_custom = martial_custom_male_only
 	traditions = {
-		tradition_hereditary_hierarchy
+		tradition_metal_craftsmanship
-		tradition_astute_diplomats
+		tradition_hard_working
-		tradition_castle_keepers
+		tradition_parochialism
+	}
+		dlc_tradition = {
+		trait = tradition_fp3_beacon_of_learning
+		requires_dlc_flag = legacy_of_persia
+		fallback = tradition_philosopher_culture
 	}
-	
 	name_list = name_list_franconian
 
 	coa_gfx = { german_group_coa_gfx western_coa_gfx } 
@@ -351,9 +368,11 @@ palatine = {
 	language = language_high_german
 	martial_custom = martial_custom_male_only
 	traditions = {
-		tradition_hereditary_hierarchy
+		tradition_metal_craftsmanship
-		tradition_astute_diplomats
+		tradition_hard_working
-		tradition_castle_keepers
+		tradition_religious_patronage
+		tradition_fervent_temple_builders
+		tradition_maritime_mercantilism
 	}
 	
 	name_list = name_list_franconian
@@ -374,14 +393,15 @@ palatine = {
 kuhjung = {
 	color = { 0.6 0.7 0.5 }
 	
-	ethos = ethos_courtly
+	ethos = ethos_bellicose
 	heritage = heritage_central_germanic
 	language = language_high_german
 	martial_custom = martial_custom_male_only
 	traditions = {
-		tradition_hereditary_hierarchy
+		tradition_martial_admiration
-		tradition_astute_diplomats
+		tradition_reverence_for_veterans
 		tradition_castle_keepers
+		tradition_diasporic
 	}
 	
 	name_list = name_list_franconian
@@ -407,9 +427,9 @@ turkisch = {
 	language = language_high_german
 	martial_custom = martial_custom_male_only
 	traditions = {
-		tradition_hereditary_hierarchy
+		tradition_diasporic
-		tradition_astute_diplomats
+		tradition_culinary_art
-		tradition_castle_keepers
+		tradition_culture_blending
 	}
 	
 	name_list = name_list_franconian

common/culture/cultures/NEOW_west_slavic.txt

@@ -7,9 +7,9 @@
 	martial_custom = martial_custom_male_only
 	head_determination = head_determination_domain
 	traditions = {
-		tradition_mountaineer_ruralism
+		tradition_culture_blending
-		tradition_hard_working
+		tradition_festivities
-		tradition_castle_keepers
+		tradition_stalwart_defenders
 		tradition_life_is_just_a_joke
 	}
 	

common/landed_titles/benelux.txt

@@ -485,76 +485,7 @@ e_benelux = {
 				}
 			}
 		}
-
+		
-		d_upper_lorraine = { # Upper Lotharingia
-			color = { 90 90 125 }
-
-			capital = c_trier #Trier
-
-			cultural_names = {
-				name_list_french = cn_upper_lorraine
-				name_list_norman = cn_upper_lorraine
-			}
-
-			c_nancy = {
-				color = { 65 65 100 }
-
-				b_nancy = {
-					province = 2709
-
-					color = { 65 65 100 }
-				}
-				b_epinal = {
-					province = 2078
-
-					color = { 65 65 100 }
-				}
-				b_blankenberg = { #L<>nstadt
-					province = 2713
-
-					color = { 65 65 100 }
-				}
-			}
-			c_metz = {
-				color = { 85 85 140 }
-
-				b_metz = {
-					province = 2708
-
-					color = { 85 85 140 }
-				}
-				b_saarburg = {
-					province = 2698
-
-					color = { 85 85 140 }
-				}
-				b_forbach = {
-					province = 2705
-
-					color = { 85 85 140 }
-				}
-				b_faulquemont = {
-					province = 2711
-
-					color = { 85 85 140 }
-				}
-			}
-			c_puttlingen = {
-				color = { 80 80 115 }
-
-				b_puttlingen = {
-					province = 2710
-
-					color = { 80 80 115 }
-				}
-				b_finstigen = { #Finstingen
-					province = 2712
-
-					color = { 80 80 115 }
-				}
-			}
-		}
-
 		d_bar = {
 			color = { 24 95 226 }
 
@@ -578,6 +509,11 @@ e_benelux = {
 
 					color = { 24 95 226 }
 				}
+				b_vaucouleurs = {
+					province = 2387
+
+					color = { 15 80 220 }
+				}
 			}
 			c_briey = {
 				color = { 53 132 226 }
@@ -593,21 +529,6 @@ e_benelux = {
 					color = { 53 132 226 }
 				}
 			}
-
-			c_vaucouleurs = {
-				color = { 15 80 220 }
-
-				b_vaucouleurs = {
-					province = 2387
-
-					color = { 15 80 220 }
-				}
-				b_toul = {
-					province = 2079
-
-					color = { 15 80 220 }
-				}
-			}
 			c_neufchateau = {
 				color = { 75 75 125 }
 
@@ -621,6 +542,54 @@ e_benelux = {
 
 					color = { 75 75 125 }
 				}
+				b_epinal = {
+					province = 2078
+
+					color = { 65 65 100 }
+				}
+			}
+			c_nancy = {
+				color = { 65 65 100 }
+
+				b_nancy = {
+					province = 2709
+
+					color = { 65 65 100 }
+				}
+				b_blankenberg = { #L<>nstadt
+					province = 2713
+
+					color = { 65 65 100 }
+				}
+				b_toul = {
+					province = 2079
+
+					color = { 15 80 220 }
+				}
+			}
+			c_metz = {
+				color = { 85 85 140 }
+
+				b_metz = {
+					province = 2708
+
+					color = { 85 85 140 }
+				}
+				b_saarburg = {
+					province = 2698
+
+					color = { 85 85 140 }
+				}
+				b_faulquemont = {
+					province = 2711
+
+					color = { 85 85 140 }
+				}
+				b_finstigen = { #Finstingen
+					province = 2712
+
+					color = { 80 80 115 }
+				}
 			}
 		}
 	}

common/landed_titles/france.txt

@@ -1039,7 +1039,7 @@ e_france = {
 
 					color = { 40 85 145 }
 				}
-				b_chaumont = {
+				b_chatillon_sur_seine = {
 					province = 2381
 
 					color = { 40 85 145 }

common/landed_titles/germany.txt

@@ -1352,16 +1352,11 @@ e_germany = {
 		}
     }
 
+
     k_rhineland = {
         color = { 17 178 17 }
 
         capital = c_mainz
-	}
-	k_alsace = { 
-		color = { 205 205 230 }
-
-		capital = c_strassburg #Strassburg
-		
 		d_alsace = {
 			color = { 205 205 230 }
 
@@ -1380,15 +1375,10 @@ e_germany = {
 
 					color = { 205 205 230 }
 				}
-				b_lichtberg = {
+				b_weissenburg = {
-					province = 2723
+					province = 2724
 
-					color = { 205 205 230 }
+					color = { 145 145 160 }
-				}
-				b_bitsch = {
-					province = 2725
-
-					color = { 90 90 110 }
 				}
 			}
 			c_colmar = {
@@ -1424,13 +1414,26 @@ e_germany = {
 					color = { 215 200 215 }
 				}
 			}
+			c_puttlingen = {
+				color = { 80 80 115 }
+
+				b_puttlingen = {
+					province = 2710
+
+					color = { 80 80 115 }
+				}
+				b_lichtberg = {
+					province = 2723
+
+					color = { 205 205 230 }
+				}
+				b_bitsch = {
+					province = 2725
+
+					color = { 90 90 110 }
+				}
+			}
 		}
-	}
-    k_koln = {
-		color = { 150 145 180 }
-
-		capital = c_cologne # Cologne
-
 		d_lower_lorraine = { # Koln
 			color = { 150 145 180 }
 
@@ -1523,11 +1526,6 @@ e_germany = {
 				}
 			}
 		}
-	}
-	k_trier = {
-		color = { 255 255 255 }
-		
-		capital = c_trier
         d_trier = {
             color = { 255 255 255 }
 
@@ -1593,14 +1591,13 @@ e_germany = {
 
 					color = { 145 140 153 }
 				}
+				b_forbach = {
+					province = 2705
+
+					color = { 85 85 140 }
+				}
 			}
         }
-	}
-	k_mainz = {
-		color = { 195 20 30 }
-
-        capital = c_mainz
-	
         d_mainz = {
             color = { 195 20 30 }
 
@@ -1685,11 +1682,6 @@ e_germany = {
 
 					color = { 145 145 160 }
 				}
-				b_weissenburg = {
-					province = 2724
-
-					color = { 145 145 160 }
-				}
 				b_pirmasens = {
 					province = 2730
 
@@ -1728,6 +1720,31 @@ e_germany = {
         }
     }
 
+	k_mainz = {
+		color = { 195 20 30 }
+
+        capital = c_mainz
+	
+	}
+	k_trier = {
+		color = { 255 255 255 }
+		
+		capital = c_trier
+	}
+	k_alsace = { 
+		color = { 205 205 230 }
+
+		capital = c_strassburg #Strassburg
+		
+	}
+    k_koln = {
+		color = { 150 145 180 }
+
+		capital = c_cologne # Cologne
+
+	}
+
+
     k_saxony_proper = {
         color = { 229 201 22 }