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

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

@@ -2490,13 +2490,6 @@ c_firenze = {
 		color2 = "red"
 	}
 }
-c_foix = {
-	colored_emblem = {
-		texture = "ce_verticle_stripes_02.dds"
-		color1 = "yellow"
-		color2 = "red"
-	}
-}
 c_french_leon = {
 	pattern = "pattern_solid.dds"
 	color1 = "yellow"
@@ -18101,45 +18094,6 @@ c_labourd = {
 	}
 }
 
-c_rouergue = {
-	pattern = "pattern_solid.dds"
-	color1 = "red"
-	color2 = "yellow"
-	colored_emblem = {
-		texture = "ce_lion_guardant.dds"
-		color1 = "yellow"
-		color2 = "yellow"
-		color3 = "black"
-		instance = { position = { 0.5 0.5 } scale = { 1.0 1.0 }  }
-	}
-}
-
-c_quercy = {
-	pattern = "pattern_solid.dds"
-	color1 = "red"
-	color2 = "white"
-	colored_emblem = {
-		texture = "ce_lion_rampant.dds"
-		color1 = "white"
-		color2 = "white"
-		color3 = "black"
-		instance = { position = { 0.5 0.50 } scale = { 0.62 0.65 }  }
-	}
-	colored_emblem = {
-		texture = "ce_circle.dds"
-		color1 = "white"
-		color2 = "white"
-		instance = { position = { 0.20 0.140 } scale = { 0.18 0.18 }  }
-		instance = { position = { 0.500 0.140 } scale = { 0.18 0.18 }  }
-		instance = { position = { 0.80 0.140 } scale = { 0.18 0.18 }  }
-		instance = { position = { 0.20 0.430 } scale = { 0.18 0.18 }  }
-		instance = { position = { 0.80 0.430 } scale = { 0.18 0.18 }  }
-		instance = { position = { 0.22 0.720 } scale = { 0.18 0.18 }  }
-		instance = { position = { 0.78 0.720 } scale = { 0.18 0.18 }  }
-		instance = { position = { 0.500 0.870 } scale = { 0.18 0.18 }  }
-	}
-}
-
 c_millau = {
 	pattern = "pattern_solid.dds"
 	color1 = "yellow"

N3OW/common/coat_of_arms/coat_of_arms/france.txt

@@ -2292,4 +2292,136 @@ c_toulouse={
 		texture="ce_sheep.dds"
 		instance={position={0.5 0.75} scale={0.5 0.5}}
 	}
+}
+c_quercy={ #Tarn
+	pattern="pattern_solid.dds"
+	color1=red
+	colored_emblem={
+		color1=white
+		color2=red
+		texture="ce_tower.dds"
+		instance={scale={0.4 0.4} position={0.5 0.35}}
+		instance={scale={0.3 0.3} position={0.285 0.325}}
+		instance={scale={0.3 0.3} position={0.715 0.325}}
+		instance={scale={0.25 0.25} position={0.125 0.375}}
+		instance={scale={0.25 0.25} position={0.875 0.375}}
+	}
+	colored_emblem={
+		color1=white
+		texture="NEOW_ce_bridge_3.dds"
+		instance={scale={0.660000 0.660000} position={0.285 0.5}}
+		instance={scale={0.660000 0.660000} position={0.715 0.5}}
+	}
+	colored_emblem={
+		color1=yellow
+		texture="ce_fleur.dds"
+		instance={scale={0.15 0.15} position={0.5 0.1}}
+		instance={scale={0.15 0.15} position={0.285 0.1}}
+		instance={scale={0.15 0.15} position={0.715 0.1}}
+		instance={scale={0.15 0.15} position={0.125 0.1}}
+		instance={scale={0.15 0.15} position={0.875 0.1}}
+	}
+	colored_emblem={
+		color1=blue
+		color2=blue_light
+		texture="NEOW_ce_waves_05.dds"
+		instance={position={0.5 0.575}}
+	}
+}
+c_tarn-et-garonne={
+	pattern="pattern_solid.dds"
+	color1=red
+	color2=blue
+	colored_emblem={
+		color1=blue
+		texture="ce_block_02.dds"
+		instance={scale={0.25 0.25} position={0.625 0.125}}
+		instance={scale={0.25 0.25} position={0.875 0.375}}
+	}
+	colored_emblem={
+		color1=black
+		texture="ce_block_02.dds"
+		instance={scale={1 0.01} position={0.5 0.5}}
+		instance={scale={0.01 1} position={0.5 0.5}}
+	}
+	colored_emblem={
+		color1=yellow
+		color2=yellow
+		texture="ce_lion_guardant.dds"
+		instance={position={0.27 0.25} scale={0.455 0.455}}
+	}
+	colored_emblem={
+		color1=yellow
+		color2=yellow
+		texture="ce_lion_guardant.dds"
+		instance={position={0.27 0.25} scale={0.455 0.455}}
+	}
+	colored_emblem={
+		color1=white
+		color2=white
+		texture="ce_lion_rampant.dds"
+		instance={position={0.62 0.138} scale={0.225 0.225}}
+		instance={position={0.86 0.375} scale={0.225 0.225}}
+	}
+	colored_emblem={
+		color1=yellow
+		color2=blue
+		texture="ce_grain.dds"
+		instance={position={0.62 0.375} scale={0.225 0.225}}
+		instance={position={0.86 0.138} scale={0.225 0.225}}
+	}
+	colored_emblem={
+		color1=yellow
+		texture="ce_cross_occitan.dds"
+		instance={position={0.265 0.71} scale={0.46 0.46}}
+	}
+	colored_emblem={
+		color1=yellow
+		color2=blue
+		texture="ce_lion_passant_guardant.dds"
+		instance={position={0.725 0.715} scale={0.435 0.435}}
+	}
+}
+c_rouergue={ #Aveyron
+	pattern="pattern_solid.dds"
+	color1=red
+	color2=yellow
+	colored_emblem={
+		texture="ce_lion_guardant.dds"
+		color1=yellow
+		color2=yellow
+		color3=black
+		instance={position={0.5 0.5} scale={1 1}}
+	}
+}
+c_tarn={
+	pattern="pattern_horizontal_split_02.dds"
+	color1=yellow
+	color2=red
+	colored_emblem={
+		color1=red
+		texture="ce_block_02.dds"
+		instance={scale={0.3 1}}
+	}
+	colored_emblem={
+		color1=yellow
+		texture="ce_cross_occitan.dds"
+		instance={position={0.5 0.175} scale={0.4 0.4}}
+	}
+}
+c_foix={ #Ariège
+	pattern="pattern_shield_03_small.dds"
+	color1=yellow
+	color2=blue
+	colored_emblem={
+		color1=yellow
+		color2=red
+		mask={1}
+		texture="ce_verticle_stripes_02.dds"
+	}
+	colored_emblem={
+		color1=white
+		texture="ce_bell.dds"
+		instance={position={0.5 0.4} scale={0.3 0.3}}
+	}
 }

N3OW/common/landed_titles/france.txt

@@ -1791,22 +1791,48 @@ e_france = {
 				}
 			}
 			c_ardeche = {
-				color = { 195 70 95 }
+				color = { 158 11 11 }
-
+				color2 = { 255 255 255 }
-				b_viviers = {
+				cultural_names = {
+					name_list_arpitan=cn_ardecha
+					name_list_occitan=cn_ard_e_grv_cha
+					name_list_provencal=cn_ardecho
+				}
+				
+				b_privas = {
 					province = 2063
-
+					color = { 158 141 113 }
-					color = { 195 70 95 }
+					color2 = { 255 255 255 }
+					cultural_names = {
+						name_list_occitan=cn_priv_a_grv_s
+						name_list_provencal=cn_priva
+					}
 				}
 				b_annonay = {
-					province = 3258
-
-					color = { 195 70 95 }
-				}
-				b_montlaur = {
 					province = 2217
-
+					color = { 158 141 113 }
-					color = { 130 120 230 }
+					color2 = { 255 255 255 }
+					cultural_names = {
+						name_list_occitan=cn_anonai
+						name_list_provencal=cn_anounai
+					}
+				}
+				b_aubenas = {
+					province = 3258
+					color = { 158 141 113 }
+					color2 = { 255 255 255 }
+					cultural_names = {
+						name_list_occitan=cn_auben_a_grv_s
+					}
+				}
+				b_largentiere = {
+					province = 13279
+					color = { 158 141 113 }
+					color2 = { 255 255 255 }
+					cultural_names = {
+						name_list_provencal=cn_l_pst_argentiero
+						name_list_occitan=cn_l_pst_argenti_e_grv_ira
+					}
 				}
 			}
 		}
@@ -1839,7 +1865,7 @@ e_france = {
 					color = { 175 55 165 }
 				}
 			}
-			c_quercy = {
+			c_quercy = { #Lot
 				color = { 110 40 225 }
 
 				b_cahors = {
@@ -1877,7 +1903,7 @@ e_france = {
 					color = { 95 24 226 }
 				}
 			}
-			c_rouergue = {
+			c_rouergue = { #Aveyron
 				color = { 115 5 210 }
 
 				b_rodez = {

N3OW/common/province_terrain/00_province_terrain.txt

@@ -1777,7 +1777,7 @@ default_coastal_sea=coastal_sea
 2060=mountains
 2061=mountains
 2062=farmlands
-2063=hills
+2063=mountains
 2064=hills
 2065=wetlands
 2066=wetlands
@@ -1931,7 +1931,7 @@ default_coastal_sea=coastal_sea
 2214=plains
 2215=forest
 2216=mountains
-2217=mountains
+2217=hills
 2218=hills
 2219=forest
 2220=forest
@@ -2944,7 +2944,7 @@ default_coastal_sea=coastal_sea
 3227=plains
 3228=plains
 3256=forest
-3258=hills
+3258=mountains
 3266=jungle
 3267=jungle
 3268=jungle
@@ -11970,4 +11970,5 @@ default_coastal_sea=coastal_sea
 13275=mountains
 13276=mountains
 13277=mountains
-13278=mountains
+13278=mountains
+13279=mountains

N3OW/common/province_terrain/01_province_properties.txt

@@ -22889,14 +22889,15 @@
 	winter_severity_bias = 0.30
 }
 ## c_ardeche 
-# b_viviers 
+# b_privas
-2063 ={
+2063 = {winter_severity_bias = 0.20}
-	winter_severity_bias = 0.20
+# b_annonay
-}
+2217 = {winter_severity_bias = 0.20}
-# b_annonay 
+# b_aubenas
-3258 ={
+2217 = {winter_severity_bias = 0.20}
-	winter_severity_bias = 0.20
+# b_largentiere
-}
+13279 = {winter_severity_bias = 0.20}
+
 ## c_carcassonne 
 # b_carcassonne 
 2006 ={

N3OW/gfx/coat_of_arms/colored_emblems/NEOW_coa_designer_emblems.txt

@@ -92,6 +92,7 @@ NEOW_ce_arnor_sceptre.dds = { colors = 1 category = manmade }
 NEOW_ce_bishops_mitre.dds = { colors = 3 category = manmade }
 NEOW_ce_bohemia_crown.dds = { colors = 3 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_crown_koln.dds = { colors = 2 category = manmade }
 NEOW_ce_crown_koln_imperial.dds = { colors = 3 category = manmade }

N3OW/gfx/map/map_object_data/activities.txt

@@ -67787,5 +67787,11 @@
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=13279
+			position={ 6802.000000 0.000000 2244.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 	}
 }

N3OW/gfx/map/map_object_data/building_locators.txt

@@ -9913,8 +9913,8 @@
 		}
 		{
 			id=2063
-			position={ 1185.077637 0.000000 2740.085449 }
+			position={ 1197.321045 0.000000 2746.493896 }
-			rotation={ -0.000000 -0.469259 -0.000000 -0.883060 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -10837,8 +10837,8 @@
 		}
 		{
 			id=2217
-			position={ 1162.077637 0.000000 2740.085449 }
+			position={ 1201.259766 0.000000 2779.274902 }
-			rotation={ -0.000000 -0.580496 -0.000000 0.814263 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -16675,8 +16675,8 @@
 		}
 		{
 			id=3258
-			position={ 1194.077637 0.000000 2775.085449 }
+			position={ 1187.098511 0.000000 2732.436035 }
-			rotation={ -0.000000 -0.999781 -0.000000 0.020903 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
@@ -52543,7 +52543,7 @@
 		}
 		{
 			id=9648
-			position={ 435.077637 0.000000 3370.085571 }
+			position={ 435.077637 0.000000 3370.085449 }
 			rotation={ 0.000000 0.400196 0.000000 0.916429 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -52597,7 +52597,7 @@
 		}
 		{
 			id=9657
-			position={ 575.077637 0.000000 3604.085571 }
+			position={ 575.077637 0.000000 3604.085449 }
 			rotation={ 0.000000 0.790032 0.000000 -0.613065 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -52624,7 +52624,7 @@
 			position={ 824.077637 0.000000 3120.085449 }
 			rotation={ 0.000000 0.440934 0.000000 0.897540 }
 			scale={ 1.000000 1.000000 1.000000 }
-		}	
+		}
 		{
 			id=9664
 			position={ 798.077637 0.000000 3142.085449 }
@@ -52648,7 +52648,7 @@
 			position={ 600.077637 0.000000 3540.085449 }
 			rotation={ 0.000000 0.440934 0.000000 0.897540 }
 			scale={ 1.000000 1.000000 1.000000 }
-		}		
+		}
 		{
 			id=9668
 			position={ 650.077637 0.000000 3526.085449 }
@@ -52660,13 +52660,13 @@
 			position={ 575.077637 0.000000 3570.085449 }
 			rotation={ 0.000000 0.099425 0.000000 -0.995045 }
 			scale={ 1.000000 1.000000 1.000000 }
-		}		
+		}
 		{
 			id=9670
 			position={ 590.077637 0.000000 3582.085449 }
 			rotation={ 0.000000 0.099425 0.000000 -0.995045 }
 			scale={ 1.000000 1.000000 1.000000 }
-		}				
+		}
 		{
 			id=9671
 			position={ 585.077637 0.000000 3543.085449 }
@@ -52678,7 +52678,7 @@
 			position={ 614.077637 0.000000 3600.085449 }
 			rotation={ 0.000000 0.711894 0.000000 0.702287 }
 			scale={ 1.000000 1.000000 1.000000 }
-		}		
+		}
 		{
 			id=9673
 			position={ 644.077637 0.000000 3602.085449 }
@@ -52699,22 +52699,22 @@
 		}
 		{
 			id=9676
-			position={ 552.077637 0.000000 3524.085571 }
+			position={ 552.077637 0.000000 3524.085449 }
 			rotation={ 0.000000 0.455445 0.000000 0.890264 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=9677
-			position={ 583.077637 0.000000 3524.085571 }
+			position={ 583.077637 0.000000 3524.085449 }
 			rotation={ 0.000000 0.455445 0.000000 0.890264 }
 			scale={ 1.000000 1.000000 1.000000 }
-		}		
+		}
 		{
 			id=9678
-			position={ 500.077637 0.000000 3517.085571 }
+			position={ 500.077637 0.000000 3517.085449 }
 			rotation={ 0.000000 0.455445 0.000000 0.890264 }
 			scale={ 1.000000 1.000000 1.000000 }
-		}				
+		}
 		{
 			id=9679
 			position={ 636.077637 0.000000 3479.085449 }
@@ -52726,10 +52726,10 @@
 			position={ 594.077637 0.000000 3419.085449 }
 			rotation={ 0.000000 0.999892 0.000000 0.014724 }
 			scale={ 1.000000 1.000000 1.000000 }
-		}		
+		}
 		{
 			id=9681
-			position={ 573.077637 0.000000 3467.085571 }
+			position={ 573.077637 0.000000 3467.085449 }
 			rotation={ 0.000000 0.935039 0.000000 -0.354546 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -52984,7 +52984,7 @@
 			position={ 823.077637 0.000000 3408.085449 }
 			rotation={ 0.000000 0.440934 0.000000 0.897540 }
 			scale={ 1.000000 1.000000 1.000000 }
-		}		
+		}
 		{
 			id=9724
 			position={ 843.077637 0.000000 3377.085449 }
@@ -53215,7 +53215,7 @@
 		}
 		{
 			id=9762
-			position={ 1355.077637 0.000000 3055.085571 }
+			position={ 1355.077637 0.000000 3055.085449 }
 			rotation={ 0.000000 0.466486 0.000000 -0.884528 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -53341,13 +53341,13 @@
 		}
 		{
 			id=9783
-			position={ 1373.077637 0.000000 2929.085571 }
+			position={ 1373.077637 0.000000 2929.085449 }
 			rotation={ 0.000000 0.956689 0.000000 0.291111 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
 		{
 			id=9784
-			position={ 1394.077637 0.000000 2933.085571 }
+			position={ 1394.077637 0.000000 2933.085449 }
 			rotation={ 0.000000 0.315154 0.000000 -0.949041 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
@@ -67931,5 +67931,11 @@
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=13279
+			position={ 1175.083618 0.000000 2729.641113 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 	}
 }

N3OW/gfx/map/map_object_data/combat_locators.txt

@@ -72389,5 +72389,11 @@ game_object_locator={
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=13279
+			position={ 6802.000000 0.000000 2244.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 	}
 }

N3OW/gfx/map/map_object_data/other_stack_locators.txt

@@ -53520,5 +53520,11 @@
 			rotation={ -0.000000 0.261220 -0.000000 0.965279 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=13279
+			position={ 6802.000000 0.000000 2244.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 	}
 }

N3OW/gfx/map/map_object_data/player_stack_locators.txt

@@ -72418,5 +72418,11 @@ game_object_locator={
 			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=13279
+			position={ 6802.000000 0.000000 2244.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 	}
 }

N3OW/gfx/map/map_object_data/siege_locators.txt

@@ -67787,5 +67787,11 @@ game_object_locator={
 			rotation={ -0.000000 -0.000025 -0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=13279
+			position={ 6802.000000 0.000000 2244.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 	}
 }

N3OW/gfx/map/map_object_data/special_building_locators.txt

@@ -67787,5 +67787,11 @@
 			rotation={ -0.000000 -0.987597 -0.000000 0.157013 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=13279
+			position={ 6802.000000 0.000000 2244.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 	}
 }

N3OW/gfx/map/map_object_data/stack_locators.txt

@@ -26093,5 +26093,11 @@
 			rotation={ 0.000000 0.000000 0.000000 1.000000 }
 			scale={ 1.000000 1.000000 1.000000 }
 		}
+		{
+			id=13279
+			position={ 6802.000000 0.000000 2244.000000 }
+			rotation={ -0.000000 -0.000000 -0.000000 1.000000 }
+			scale={ 1.000000 1.000000 1.000000 }
+		}
 	}
 }

N3OW/history/provinces/e_france.txt

@@ -1224,19 +1224,21 @@
 	}
 }
 ###c_ardeche
-2063 = {
+2063 = {	# Privas
 	culture = rottisch
 	religion = rocambolist
 	holding = castle_holding
 }
-3258 = {
+2217 = {	# Annonay
+	holding = city_holding
+}
+3258 = {	# Aubenas
 	holding = church_holding
 }
-2217 = {
+13279 = {	# Largentière
-	culture = provencal
+	holding = none
-	religion = rocambolist
-	holding = castle_holding
 }
+
 ##d_toulouse
 ###c_toulouse
 2214 = {

N3OW/localization/english/titles_cultural_names_l_english.yml

@@ -2959,6 +2959,16 @@
  cn_b_o_hat_navela:0 "Bônavela"
  cn_camargo:0 "Camargo"
  cn_camarga:0 "Camarga"
+ cn_ard_e_grv_cha:0 "Ardècha"
+ cn_ardecha:0 "Ardecha"
+ cn_ardecho:0 "Ardecho"
+ cn_priv_a_grv_s:0 "Privàs"
+ cn_priva:0 "Priva"
+ cn_anonai:0 "Anonai"
+ cn_anounai:0 "Anounai"
+ cn_auben_a_grv_s:0 "Aubenàs"
+ cn_l_pst_argenti_e_grv_ira:0 "L'Argentièira"
+ cn_l_pst_argentiero:0 "L'Argentiero"
  
  #Bavarian
  cn_allgai:0 "Allgai"

N3OW/localization/english/titles_l_english.yml

@@ -1010,7 +1010,6 @@
  b_atush:0 "Atush"
  b_atyrau:0 "Atyrau"
  b_aube:0 "Migennes"
- b_aubenas:0 "Aubenas"
  b_auberoche:0 "Auberoche"
  b_aubonne:0 "Aubonne"
  b_aubusson:0 "Aubusson"
@@ -5792,7 +5791,6 @@
  b_laranda:0 "Laranda"
  b_laredo:0 "Laredo"
  b_lareole:0 "La Réole"
- b_largentiere:0 "Largentière"
  b_lari_bandar:0 "Lari Bandar"
  b_larijan:0 "Larijan"
  b_larino:0 "Larino"
@@ -8020,7 +8018,6 @@
  b_prishib:0 "Prishib"
  b_pristina:0 "Priština"
  b_prithiminagar:0 "Prithiminagar"
- b_privas:0 "Privas"
  b_prizren:0 "Prizren"
  b_prochabert:0 "Prochabert"
  b_prodromos:0 "Prodromos"
@@ -10872,7 +10869,6 @@
  b_vitoria:0 "Vitoria"
  b_vitry_en_perthois:0 "Montmirail"
  b_viveiro:0 "Viveiro"
- b_viviers:0 "Viviers"
  b_viyapura:0 "Viyapura"
  b_vizagipatam:0 "Vizagipatam"
  b_vizakna:0 "Vizakna"
@@ -24094,10 +24090,6 @@
  b_erg_ghati:0 "Erg Ghati"
  c_aosta:0 "Aosta"
  c_aosta_adj:0 "Aostan"
- c_viennois:0 "Viennois"
- c_viennois_adj:0 "Viennoisan"
- b_annonay:0 "Annonay"
- b_montlaur:0 "Montlaur"
  b_karnaphuli:0 "Karnaphuli"
  d_yungdrung_bon:0 "Eternal Bön"
  
@@ -24936,6 +24928,8 @@
  b_carpentras:0 "Carpentras"
  b_apt:0 "Apt"
  ##Switzerland
+ d_savoie:0 "Savoy"
+ d_savoie_adj:0 "Savoisian"
  c_savoy:0 "Savoy"
  c_savoy_adj:0 "Savoisian"
  b_chambery:0 "Chambéry"
@@ -24969,6 +24963,10 @@
  k_aquitaine_adj:0 "Axitonian"
  c_ardeche:0 "Ardèche"
  c_ardeche_adj:0 "Ardéchois"
+ b_privas:0 "Privas"
+ b_annonay:0 "Annonay"
+ b_aubenas:0 "Aubenas"
+ b_largentiere:0 "Largentière"
  
  ###Germania
  ##Swabia

N3OW/map_data/definition.csv

@@ -2015,29 +2015,12 @@
 2014;170;78;7;AGDE;x
 2015;2;81;135;MONTPELLIER;x
 2016;44;84;8;NIMES;x
-#2017;86;87;136;ARLES;x
-#2018;128;90;9;MARSEILLE;x
-#2019;170;93;137;TOULON;x
-#2020;2;96;10;GRASSE;x
-#2021;44;99;138;NICE;x
 2017;173;139;35;LYON;x;
 2018;228;204;130;VILLEFRANCHE-SUR-SAONE;x;
 2019;197;175;107;SAINT-ETIENNE;x;
 2020;168;129;11;ROANNE;x;
 2021;110;84;7;MONTBRISON;x;
 2022;86;102;11;MONACO;x
-#2023;128;105;139;AIX;x
-#2024;170;108;12;DRAGUGNIAN;x
-#2025;2;111;140;Castellane;x
-#2026;44;114;13;SISTERON;x
-#2027;86;117;141;EMBRUN;x
-#2028;128;120;14;GAP;x
-#2029;170;123;142;SAINT-MICHEL-DE-MAURIENNE;x
-#2030;2;126;15;GRENOBLE;x
-#2031;44;129;143;MOUTIERS;x
-#2032;86;132;16;CHARTREUSE;x
-#2033;128;135;144;VIENNE;x
-#2034;170;138;17;ANNECY;x
 2023;205;184;121;BOURG-EN-BRESSE;x;
 2024;91;73;19;AMBERIEU-EN-BUGEY;x;
 2025;150;120;28;OYONNAX;x;
@@ -2051,7 +2034,6 @@
 2033;237;213;150;MONTELIMAR;x;
 2034;145;113;26;NYONS;x;
 2035;2;141;145;GENEVA;x
-#2036;44;144;18;THONON-LES-BAINS;x
 2036;212;158;13;DIE;x;
 2037;86;147;146;LAUSANNE;x
 2038;128;150;19;MARTIGNY;x
@@ -2075,23 +2057,11 @@
 2056;44;204;28;PORRENTRUY;x
 2057;86;207;156;MONTPELLIARD;x
 2058;128;210;29;MULHOUSE;x
-#2059;170;0;157;AVIGNON;x
-#2060;2;3;30;APT;x
-#2061;44;6;158;FORCALQUIER;x
-#2062;86;9;31;ORANGE;x
 2059;191;178;142;GAP;x;
 2060;150;117;28;BRIANCON;x;
 2061;191;156;58;EMBRUN;x;
 2062;119;92;17;MARSEILLE;x;
-2063;128;12;159;VIVIERS;x
+2063;200;124;124;PRIVAS;x;
-#2064;170;15;32;VALENCE;x
-#2065;2;18;160;LYON;x
-#2066;44;21;33;DIE;x
-#2067;86;24;161;VAISON;x
-#2068;128;27;34;ROMANS;x
-#2069;170;30;162;BELLEY;x
-#2070;2;33;35;Villars;x
-#2071;44;36;163;BOURG;x
 2064;217;185;95;AIX-EN-PROVENCE;x;
 2065;200;172;96;SAINTES-MARIES-DE-LA-MER;x;
 2066;175;135;23;ARLES;x;
@@ -2245,7 +2215,7 @@
 2214;170;39;7;TOULOUSE;x
 2215;2;42;135;ALBI;x
 2216;44;45;8;USES;x
-2217;86;48;136;ALES;x
+2217;168;40;40;ANNONAY;x;
 2218;128;51;9;CEVENNES;x
 2219;170;54;137;LODEVE;x
 2220;2;57;10;NAVACELLES;x
@@ -2325,18 +2295,14 @@
 2294;170;66;47;AURILLAC;x
 2295;2;69;175;LA TOUR;x
 2296;44;72;48;VELAY;x
-#2297;86;75;176;FEURS;x
-#2298;128;78;49;MONTBRISON;x
 2297;242;180;8;CASTELLANE;x;
 2298;226;176;40;BARCELONETTE;x;
 2299;170;81;177;THIERS;x
 2300;2;84;50;AMBERT;x
-#2301;44;87;178;BEAUJEU;x
 2301;95;73;12;TOULON;x;
 2302;86;90;51;MACON;x
 2303;128;93;179;SEMUR-EN-BRIONNAIS;x
 2304;170;96;52;CLUNY;x
-#2305;2;99;180;ROANNE;x
 2305;148;143;128;FREJUS;x;
 2306;44;102;53;JILAGNY;x
 2307;86;105;181;MOULINS;x
@@ -2487,7 +2453,6 @@
 2452;86;114;26;STEENWIJK;x
 2453;128;117;154;DELFZIJL;x
 2454;170;120;27;VAREL;x
-#2455;2;123;155;CHAMBERY;x
 2455;145;108;9;DRAGUIGNAN;x;
 2456;44;126;28;CANAVESE;x
 2457;86;129;156;CHAMPAGNOLE;x
@@ -3289,10 +3254,9 @@
 3253;129;174;154;river_guadalquivir;x
 3254;171;177;27;river_guadalquivir;x
 3255;127;129;54;KUNLUNSHAN;x
-#3256;45;183;28;ALPS 1;x
 3256;195;151;30;BRIGNOLES;x;
 3257;87;186;156;German Mountains 13;x
-3258;129;189;29;Annonay;x
+3258;87;1;1;AUBENAS;x;
 3259;171;192;157;Northern Apennine Mountains 2;x
 3260;3;195;30;NORWEGIAN MOUNTAINS;x
 3261;45;198;158;SWEDISH IMPASSIBLE TERRAIN 1;x
@@ -8751,11 +8715,6 @@
 8714;176;156;57;Fuerteventura;x
 8715;8;159;185;Lanzarote;x
 8716;50;162;58;Madeira;x
-#8717;92;165;186;Monteil;x
-#8718;134;168;59;Briancon;x
-#8719;176;171;187;Faucigny;x
-#8720;8;174;60;Barcelonnette;x
-#8721;50;177;188;Puget;x
 8717;214;169;47;NICE;x;
 8718;129;97;8;GRASSE;x;
 8719;253;220;132;MONACO;x;
@@ -9750,8 +9709,6 @@
 9708;135;156;54;Tolmezzo;x;
 9709;177;159;182;Kartitsch;x;
 9710;9;162;55;Edolo;x;
-#9711;51;165;183;Isola;x;
-#9712;93;168;56;Oronaye;x;
 9711;225;166;3;ALBERTVILLE;x;
 9712;117;91;19;SAINT-JEAN-DE-MAURIENNE;x;
 9713;135;171;184;Lungano;x;
@@ -9838,7 +9795,6 @@
 9794;177;201;97;;x;
 9795;9;204;225;;x;
 9796;51;207;98;;x;
-#9797;93;210;226;;x;
 9797;193;164;81;BOURG-SAINT-MAURICE;x;
 9798;135;0;99;;x;
 9799;2;101;30;;x;
@@ -13321,7 +13277,7 @@
 13276;248;185;10;ANNECY;x;
 13277;189;173;128;THONON-LES-BAINS;x;
 13278;127;96;6;BONNEVILLE;x;
-#13279;52;32;248;;x;
+13279;240;47;47;LARGENTIERE;x;
 #13280;53;32;232;;x;
 #13281;54;32;236;;x;
 #13282;55;32;240;;x;

N3OW/map_data/provinces.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ac0630f3e59eafdd933a9911c6fcca65876fa1a5d0684c67cf113dd670a82ce
+oid sha256:553d96760c0982e228ae206d7dff379fa8f372d6392a9ad08ce7fee62641b575
-size 2605251
+size 2605629