Merge branch 'next-version-dev' of https://forgejo.damimani-alex.org/damimani/N3OW into next-version-dev

common/culture/cultures/NEOW_greek.txt

@@ -200,7 +200,7 @@ NEOW_cypriot = {
 NEOW_pindusian = {
 	color = { 40 149 204 }
 	
-	ethos = ethos_bureaucratic
+	ethos = ethos_communal
 	heritage = heritage_greek
 	language = language_greek
 	martial_custom = martial_custom_male_only

common/culture/cultures/NEOW_kipchak.txt

@@ -11,7 +11,11 @@ kumyk = {
 		tradition_diasporic
 		tradition_zealous_people
 	}
-	
+	dlc_tradition = {
+		trait = tradition_staunch_traditionalists
+		requires_dlc_flag = hybridize_culture
+		fallback = tradition_faith_bound
+	}	
 	name_list = name_list_NEOW_turkish
 	
 	coa_gfx = { turkic_group_coa_gfx steppe_coa_gfx }
@@ -40,7 +44,11 @@ nogai = {
 		tradition_diasporic
 		tradition_horse_breeder
 	}
-	
+	dlc_tradition = {
+		trait = tradition_staunch_traditionalists
+		requires_dlc_flag = hybridize_culture
+		fallback = tradition_faith_bound
+	}	
 	name_list = name_list_NEOW_turkish
 	
 	coa_gfx = { turkic_group_coa_gfx steppe_coa_gfx }
@@ -96,7 +104,11 @@ karachay = {
 		tradition_hill_dwellers
 		tradition_pastoralists
 	}
-	
+	dlc_tradition = {
+		trait = tradition_staunch_traditionalists
+		requires_dlc_flag = hybridize_culture
+		fallback = tradition_faith_bound
+	}	
 	name_list = name_list_NEOW_turkish
 	
 	coa_gfx = { turkic_group_coa_gfx steppe_coa_gfx }

common/culture/cultures/NEOW_northeast_caucasian.txt

@@ -1,121 +0,0 @@
-lezgin = {
-	color = {0.3 0.8 0.7}
-	
-	ethos = ethos_stoic
-	heritage = heritage_northeast_caucasian
-	language = NEOW_language_lezgin
-	martial_custom = martial_custom_male_only
-	traditions = {
-		tradition_caucasian_wolves
-		tradition_tribe_unity
-		tradition_religion_blending
-		tradition_music_theory
-	}
-	
-	name_list = name_list_NEOW_turkish
-	
-	coa_gfx = { steppe_coa_gfx western_coa_gfx }
-	building_gfx = { steppe_building_gfx }
-	clothing_gfx = { byzantine_clothing_gfx }
-	unit_gfx = { mongol_unit_gfx }
-	
-	ethnicities = {
-		20 = slavic_blond
-		20 = slavic_brown_hair
-		20 = slavic_dark_hair
-		15 = mediterranean_byzantine
-		25 = mediterranean
-	}
-}
-avar = {
-	color = {0.2 0.6 0.2}
-	
-	ethos = ethos_bellicose
-	heritage = heritage_northeast_caucasian
-	language = NEOW_language_avar
-	martial_custom = martial_custom_male_only
-	traditions = {
-		tradition_caucasian_wolves
-		tradition_warrior_culture
-		tradition_zealous_people
-		tradition_stalwart_defenders
-	}
-	
-	name_list = name_list_NEOW_turkish
-	
-	coa_gfx = { steppe_coa_gfx western_coa_gfx }
-	building_gfx = { steppe_building_gfx }
-	clothing_gfx = { byzantine_clothing_gfx }
-	unit_gfx = { mongol_unit_gfx }
-	
-	ethnicities = {
-		20 = slavic_blond
-		20 = slavic_brown_hair
-		20 = slavic_dark_hair
-		15 = mediterranean_byzantine
-		25 = mediterranean
-	}
-}
-dargin = {
-	color = {0.5 1.0 0.5}
-	
-	ethos = ethos_bellicose
-	heritage = heritage_northeast_caucasian
-	language = NEOW_language_dargwa
-	martial_custom = martial_custom_male_only
-	traditions = {
-		tradition_caucasian_wolves
-		tradition_warrior_culture
-		tradition_tribe_unity
-		tradition_medicinal_plants
-	}
-	
-	name_list = name_list_NEOW_turkish
-	
-	coa_gfx = { steppe_coa_gfx western_coa_gfx }
-	building_gfx = { steppe_building_gfx }
-	clothing_gfx = { byzantine_clothing_gfx }
-	unit_gfx = { mongol_unit_gfx }
-	
-	ethnicities = {
-		20 = slavic_blond
-		20 = slavic_brown_hair
-		20 = slavic_dark_hair
-		15 = mediterranean_byzantine
-		25 = mediterranean
-	}
-}
-nakh = {
-	color = {0.3 0.8 0.8}
-	
-	ethos = ethos_bellicose
-	heritage = heritage_northeast_caucasian
-	language = NEOW_language_vainakh
-	martial_custom = martial_custom_male_only
-	traditions = {
-		tradition_caucasian_wolves
-		tradition_warrior_culture
-		tradition_quarrelsome
-		tradition_romanticised_banditry
-	}
-	dlc_tradition = {
-		trait = tradition_staunch_traditionalists
-		requires_dlc_flag = hybridize_culture
-		fallback = tradition_faith_bound
-	}
-	
-	name_list = name_list_NEOW_turkish
-	
-	coa_gfx = { steppe_coa_gfx western_coa_gfx }
-	building_gfx = { steppe_building_gfx }
-	clothing_gfx = { byzantine_clothing_gfx }
-	unit_gfx = { mongol_unit_gfx }
-	
-	ethnicities = {
-		20 = slavic_blond
-		20 = slavic_brown_hair
-		20 = slavic_dark_hair
-		15 = mediterranean_byzantine
-		25 = mediterranean
-	}
-}

common/culture/cultures/NEOW_northwest_caucasian.txt

@@ -11,7 +11,11 @@ kabardian = {
 		tradition_zealous_people
 		tradition_mountain_homes
 	}
-	
+	dlc_tradition = {
+		trait = tradition_staunch_traditionalists
+		requires_dlc_flag = hybridize_culture
+		fallback = tradition_faith_bound
+	}	
 	name_list = name_list_NEOW_turkish
 	
 	coa_gfx = { steppe_coa_gfx western_coa_gfx }
@@ -40,9 +44,12 @@ adyghean = {
 		tradition_mountain_homes
 		tradition_hill_dwellers
 		tradition_language_scholars
-		tradition_mountain_homes
 	}
-	
+	dlc_tradition = {
+		trait = tradition_staunch_traditionalists
+		requires_dlc_flag = hybridize_culture
+		fallback = tradition_faith_bound
+	}	
 	name_list = name_list_NEOW_turkish
 	
 	coa_gfx = { steppe_coa_gfx western_coa_gfx }
@@ -58,3 +65,137 @@ adyghean = {
 		25 = mediterranean
 	}
 }
+
+lezgin = {
+	color = {0.3 0.8 0.7}
+	
+	ethos = ethos_stoic
+	heritage = heritage_northwest_caucasian
+	language = NEOW_language_lezgin
+	martial_custom = martial_custom_male_only
+	traditions = {
+		tradition_caucasian_wolves
+		tradition_tribe_unity
+		tradition_religion_blending
+		tradition_music_theory
+	}
+	dlc_tradition = {
+		trait = tradition_staunch_traditionalists
+		requires_dlc_flag = hybridize_culture
+		fallback = tradition_faith_bound
+	}	
+	name_list = name_list_NEOW_turkish
+	
+	coa_gfx = { steppe_coa_gfx western_coa_gfx }
+	building_gfx = { steppe_building_gfx }
+	clothing_gfx = { byzantine_clothing_gfx }
+	unit_gfx = { mongol_unit_gfx }
+	
+	ethnicities = {
+		20 = slavic_blond
+		20 = slavic_brown_hair
+		20 = slavic_dark_hair
+		15 = mediterranean_byzantine
+		25 = mediterranean
+	}
+}
+avar = {
+	color = {0.2 0.6 0.2}
+	
+	ethos = ethos_bellicose
+	heritage = heritage_northwest_caucasian
+	language = NEOW_language_avar
+	martial_custom = martial_custom_male_only
+	traditions = {
+		tradition_caucasian_wolves
+		tradition_warrior_culture
+		tradition_zealous_people
+		tradition_stalwart_defenders
+	}
+	dlc_tradition = {
+		trait = tradition_staunch_traditionalists
+		requires_dlc_flag = hybridize_culture
+		fallback = tradition_faith_bound
+	}	
+	name_list = name_list_NEOW_turkish
+	
+	coa_gfx = { steppe_coa_gfx western_coa_gfx }
+	building_gfx = { steppe_building_gfx }
+	clothing_gfx = { byzantine_clothing_gfx }
+	unit_gfx = { mongol_unit_gfx }
+	
+	ethnicities = {
+		20 = slavic_blond
+		20 = slavic_brown_hair
+		20 = slavic_dark_hair
+		15 = mediterranean_byzantine
+		25 = mediterranean
+	}
+}
+dargin = {
+	color = {0.5 1.0 0.5}
+	
+	ethos = ethos_bellicose
+	heritage = heritage_northwest_caucasian
+	language = NEOW_language_dargwa
+	martial_custom = martial_custom_male_only
+	traditions = {
+		tradition_caucasian_wolves
+		tradition_warrior_culture
+		tradition_tribe_unity
+		tradition_medicinal_plants		
+	}
+	dlc_tradition = {
+		trait = tradition_staunch_traditionalists
+		requires_dlc_flag = hybridize_culture
+		fallback = tradition_faith_bound
+	}	
+	name_list = name_list_NEOW_turkish
+	
+	coa_gfx = { steppe_coa_gfx western_coa_gfx }
+	building_gfx = { steppe_building_gfx }
+	clothing_gfx = { byzantine_clothing_gfx }
+	unit_gfx = { mongol_unit_gfx }
+	
+	ethnicities = {
+		20 = slavic_blond
+		20 = slavic_brown_hair
+		20 = slavic_dark_hair
+		15 = mediterranean_byzantine
+		25 = mediterranean
+	}
+}
+nakh = {
+	color = {0.3 0.8 0.8}
+	
+	ethos = ethos_bellicose
+	heritage = heritage_northwest_caucasian
+	language = NEOW_language_vainakh
+	martial_custom = martial_custom_male_only
+	traditions = {
+		tradition_caucasian_wolves
+		tradition_warrior_culture
+		tradition_quarrelsome
+		tradition_romanticised_banditry
+	}
+	dlc_tradition = {
+		trait = tradition_staunch_traditionalists
+		requires_dlc_flag = hybridize_culture
+		fallback = tradition_faith_bound
+	}
+	
+	name_list = name_list_NEOW_turkish
+	
+	coa_gfx = { steppe_coa_gfx western_coa_gfx }
+	building_gfx = { steppe_building_gfx }
+	clothing_gfx = { byzantine_clothing_gfx }
+	unit_gfx = { mongol_unit_gfx }
+	
+	ethnicities = {
+		20 = slavic_blond
+		20 = slavic_brown_hair
+		20 = slavic_dark_hair
+		15 = mediterranean_byzantine
+		25 = mediterranean
+	}
+}

common/landed_titles/alps.txt

@@ -1575,15 +1575,6 @@ e_alps = {
 					name_list_occitan=cn_vauclusa
 					name_list_NEOW_provencal=cn_vau_cluso
 				}
-				
-				b_carpentras = {
-					province = 2068
-					color = { 139 72 20 }
-					
-					cultural_names = {
-						name_list_occitan=cn_carpentr_a_grv_s
-					}
-				}
 					b_apt = {
 					province = 2069
 					color = { 139 72 20 }
@@ -1593,6 +1584,14 @@ e_alps = {
 						name_list_NEOW_provencal=cn_ate
 					}
 				}			
+				b_carpentras = {
+					province = 2068
+					color = { 139 72 20 }
+					
+					cultural_names = {
+						name_list_occitan=cn_carpentr_a_grv_s
+					}
+				}				
 				b_avignon = {
 					province = 2067
 					color = { 139 72 20 }

common/province_terrain/00_province_terrain.txt

@@ -40,7 +40,7 @@ default_coastal_sea=coastal_sea
 37=farmlands
 38=farmlands
 39=hills
-40=forest
+40=hills
 41=forest
 42=plains
 43=farmlands
@@ -1260,7 +1260,7 @@ default_coastal_sea=coastal_sea
 1543=forest
 1544=forest
 1545=forest
-1546=forest
+1546=plains
 1547=plains
 1548=plains
 1549=plains
@@ -1320,7 +1320,7 @@ default_coastal_sea=coastal_sea
 1603=plains
 1604=forest
 1605=tells
-1606=forest
+1606=tells
 1607=hills
 1608=forest
 1609=forest
@@ -1816,7 +1816,7 @@ default_coastal_sea=coastal_sea
 2099=plains
 2100=plains
 2101=tells
-2102=farmlands
+2102=tells
 2103=forest
 2104=farmlands
 2105=plains
@@ -2387,7 +2387,7 @@ default_coastal_sea=coastal_sea
 2670=plains
 2671=plains
 2672=plains
-2673=plains
+2673=tells
 2674=plains
 2675=plains
 2676=plains
@@ -2396,13 +2396,13 @@ default_coastal_sea=coastal_sea
 2679=plains
 2680=forest
 2681=forest
-2682=farmlands
-2683=farmlands
+2682=tells
+2683=plains
 2684=plains
 2685=plains
 2686=hills
 2687=hills
-2688=plains
+2688=tells
 2689=plains
 2690=forest
 2691=forest
@@ -8921,7 +8921,7 @@ default_coastal_sea=coastal_sea
 9681=forest
 9682=plains
 9683=wetlands
-9684=wetlands
+9684=hills
 9685=wetlands
 9686=plains
 9687=forest
@@ -8951,8 +8951,8 @@ default_coastal_sea=coastal_sea
 9711=mountains
 9712=mountains
 9713=mountains
-9714=farmlands
-9715=hills
+9714=tells
+9715=forest
 9716=hills
 9717=hills
 9718=hills

history/characters/NEOW_e_germania.txt

@@ -673,6 +673,7 @@ stephanie_wilsberg={
 	2512.3.24={birth=yes}
 	2553.1.6={death=yes}
 }
+
 germany0010 = {
 	name = "Georg"
 	dynasty = wilsberg_dynasty
@@ -708,11 +709,11 @@ germany00010 = {
 	2523.11.14 = {
     	birth = yes
 	}
+	2540.1.1={effect={set_relation_friend={reason=friend_generic_history target=character:germany0010}}} # Friends with both his siblings
+	2540.1.1={effect={set_relation_friend={reason=friend_generic_history target=character:sonja_wilsberg}}} 	
 	2544.1.1 = {
 		add_matrilineal_spouse = benelux_oranje_nassau_weilburg_philippe
 	}
-	2540.1.1={effect={set_relation_friend={reason=friend_generic_history target=character:germany0010}}} # Friends with both his siblings
-	2540.1.1={effect={set_relation_friend={reason=friend_generic_history target=character:sonja_wilsberg}}} 
 	2554.12.31={set_relation_rival={target=character:benelux_oranje_nassau_weilburg_hendrick reason=rival_historical}} # hates Hendrik for breaking his sister's heart
 	2600.1.1 = {
     	death = yes

history/provinces/e_alps.txt

@@ -454,12 +454,12 @@
 }
 ###c_vaucluse
 2068 = {
-	holding = castle_holding
-	culture = provencal
-	religion = simurghi	
+	holding = city_holding
 }
 2069 = {
-	holding = city_holding
+	culture = provencal
+	religion = simurghi	
+	holding = castle_holding
 }
 2067 = {
 	holding = church_holding