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

common/landed_titles/alps.txt

@@ -9,21 +9,6 @@ e_alps = {
         
 	    capital = c_bern
         
-		d_aosta = {
-			color = { 101 8 34 }
-
-			capital = c_aosta  # Aosta
-
-			c_aosta = {
-				color = { 90 5 15 }
-
-				b_ivrea = {
-					province = 2040
-
-					color = { 115 25 45 }
-				}
-			}
-		}	
 		d_currezia = {
 			color = { 255 220 220 }
 
@@ -75,10 +60,10 @@ e_alps = {
 
 					color = { 255 215 205 }
 				}
-				b_porrentruy = {
-					province = 2056
+				b_delemont = {
+					province = 9763
 
-					color = { 215 200 215 }
+					color = { 255 215 205 }
 				}
 			}
 		}

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,14 +529,37 @@ e_benelux = {
 					color = { 53 132 226 }
 				}
 			}
+			c_neufchateau = {
+				color = { 75 75 125 }
 
-			c_vaucouleurs = {
-				color = { 15 80 220 }
+				b_epinal = {
+					province = 2715
 
-				b_vaucouleurs = {
-					province = 2387
+					color = { 65 65 100 }
+				}
+				b_neufchateau = {
+					province = 2384
 
-					color = { 15 80 220 }
+					color = { 75 75 125 }
+				}
+				b_vaudemont = {
+					province = 2078
+
+					color = { 75 75 125 }
+				}
+			}
+			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
@@ -608,28 +567,28 @@ e_benelux = {
 					color = { 15 80 220 }
 				}
 			}
-			c_neufchateau = {
-				color = { 75 75 125 }
+			c_metz = {
+				color = { 85 85 140 }
 
-				b_neufchateau = {
-					province = 2384
+				b_metz = {
+					province = 2708
 
-					color = { 75 75 125 }
+					color = { 85 85 140 }
 				}
-				b_vaudemont = {
-					province = 2715
+				b_saarburg = {
+					province = 2698
 
-					color = { 75 75 125 }
+					color = { 85 85 140 }
 				}
-				b_champs = {
-					province = 2385
+				b_forbach = {
+					province = 2711
 
-					color = { 55 105 225 }
+					color = { 85 85 140 }
 				}
-				b_grand = {
-					province = 2386
+				b_finstigen = { #Finstingen
+					province = 2712
 
-					color = { 55 105 225 }
+					color = { 80 80 115 }
 				}
 			}
 		}

common/landed_titles/france.txt

@@ -358,25 +358,6 @@ e_france = {
 
 			capital = c_amiens # Amiens
 
-			c_vermandois = {
-				color = { 20 50 220 }
-
-				b_laon = {
-					province = 2400
-
-					color = { 20 50 220 }
-				}
-				b_saint_quentin = {
-					province = 2397
-
-					color = { 28 58 230 }
-				}
-				b_roucy = {
-					province = 2399
-
-					color = { 20 50 220 }
-				}
-			}
 			
 			c_eu = {
 				color = { 20 20 130 }
@@ -460,20 +441,6 @@ e_france = {
 					color = { 35 65 230 }
 				}
 			}
-			c_compiegne = {
-				color = { 24 62 215 }
-
-				b_marle = {
-					province = 2398
-
-					color = { 20 50 220 }
-				}
-				b_noyon = {
-					province = 2187
-
-					color = { 28 58 230 }
-				}
-			}
 		}
 
 		d_berry = {
@@ -876,6 +843,69 @@ e_france = {
 				}
 			}
 		}
+		d_ardennes = {
+			color = { 14 80 160 }
+
+			capital = c_rethel
+
+			c_rethel = {
+				color = { 4 70 170 }
+
+				b_romigny = {
+					province = 2396
+
+					color = { 4 70 170 }
+				}
+				b_rethel = {
+					province = 2391
+
+					color = { 4 70 170 }
+				}
+				b_grandpre = {
+					province = 2393
+
+					color = { 4 70 170 }
+				}
+				b_mezieres = {
+					province = 2394
+
+					color = { 4 70 170 }
+				}
+			}
+			c_compiegne = {
+				color = { 24 62 215 }
+
+				b_marle = {
+					province = 2398
+
+					color = { 20 50 220 }
+				}
+				b_noyon = {
+					province = 2187
+
+					color = { 28 58 230 }
+				}
+			}
+			c_vermandois = {
+				color = { 20 50 220 }
+
+				b_laon = {
+					province = 2400
+
+					color = { 20 50 220 }
+				}
+				b_saint_quentin = {
+					province = 2397
+
+					color = { 28 58 230 }
+				}
+				b_roucy = {
+					province = 2399
+
+					color = { 20 50 220 }
+				}
+			}
+		}
 
 		d_champagne = {
 			color = { 7 60 160 }
@@ -900,6 +930,11 @@ e_france = {
 
 					color = { 7 60 160 }
 				}
+				b_vitry_en_perthois = {
+					province = 2367
+
+					color = { 7 60 120 }
+				}
 			}
 			c_troyes = {
 				color = { 15 55 145 }
@@ -909,41 +944,26 @@ e_france = {
 
 					color = { 15 55 145 }
 				}
-				b_clairvaux = {
-					province = 2375
-
-					color = { 15 55 145 }
-				}
-				b_joinville = {
-					province = 2373
-
-					color = { 15 55 145 }
-				}
-				b_bar_sur_aube = {
-					province = 2372
-
-					color = { 15 55 145 }
-				}
-				b_romilly = {
-					province = 2365
-
-					color = { 12 48 170 }
-				}
 				b_nogent = {
 					province = 2368
 
 					color = { 20 80 145 }
 				}
-				b_aube = {
-					province = 2369
-
-					color = { 20 80 145 }
-				}
 				b_bar_sur_seine = {
 					province = 2370
 
 					color = { 20 80 145 }
 				}
+				b_bar_sur_aube = {
+					province = 2365
+
+					color = { 15 55 145 }
+				}
+				b_brienne_le_chateau = {
+					province = 9751
+
+					color = { 15 55 145 }
+				}
 			}
 			c_chalons = {
 				color = { 7 60 120 }
@@ -958,34 +978,44 @@ e_france = {
 
 					color = { 7 60 120 }
 				}
-				b_vitry_en_perthois = {
-					province = 2367
+				b_fagnieres = {
+					province = 9749
 
 					color = { 7 60 120 }
 				}
 			}
-			c_rethel = {
-				color = { 4 70 170 }
+			c_langres = {
+				color = { 55 105 225 }
 
-				b_rethel = {
-					province = 2391
+				b_chaumont = {
+					province = 2374
 
-					color = { 4 70 170 }
+					color = { 55 105 225 }
 				}
-				b_grandpre = {
-					province = 2393
+				b_langres = {
+					province = 9750
 
-					color = { 4 70 170 }
+					color = { 55 105 225 }
 				}
-				b_mezieres = {
-					province = 2394
+				b_joinville = {
+					province = 2372
 
-					color = { 4 70 170 }
+					color = { 15 55 145 }
 				}
-				b_romigny = {
-					province = 2396
+				b_grand = {
+					province = 2386
 
-					color = { 4 70 170 }
+					color = { 55 105 225 }
+				}
+				b_romilly = {
+					province = 2373
+
+					color = { 12 48 170 }
+				}
+				b_champs = {
+					province = 2385
+
+					color = { 55 105 225 }
 				}
 			}
 		}
@@ -1009,7 +1039,7 @@ e_france = {
 
 					color = { 40 85 145 }
 				}
-				b_chaumont = {
+				b_chatillon_sur_seine = {
 					province = 2381
 
 					color = { 40 85 145 }
@@ -1067,6 +1097,11 @@ e_france = {
 
 					color = { 25 80 225 }
 				}
+				b_aube = {
+					province = 2369
+
+					color = { 20 80 145 }
+				}
 			}
 			c_tonnerrois = {
 				color = { 60 110 180 }
@@ -1081,6 +1116,11 @@ e_france = {
 
 					color = { 60 110 180 }
 				}
+				b_clairvaux = {
+					province = 2375
+
+					color = { 15 55 145 }
+				}
 			}
 			c_avalois = {
 				color = { 65 118 155 }
@@ -1134,15 +1174,6 @@ e_france = {
 					color = { 65 95 155 }
 				}
 			}
-			c_langres = {
-				color = { 55 105 225 }
-
-				b_langres = {
-					province = 2374
-
-					color = { 55 105 225 }
-				}
-			}
 		}
 		d_poitou = {
 			color = { 50 50 130 }

common/landed_titles/italy.txt

@@ -42,6 +42,21 @@ e_italy = {
 			}
 		}
 
+		d_aosta = {
+			color = { 101 8 34 }
+
+			capital = c_aosta  # Aosta
+
+			c_aosta = {
+				color = { 90 5 15 }
+
+				b_ivrea = {
+					province = 2040
+
+					color = { 115 25 45 }
+				}
+			}
+		}	
 		d_piedmonte = {
 			color = { 191 158 158 }
 			can_be_named_after_dynasty = no
@@ -1446,6 +1461,11 @@ e_italy = {
 
 					color = { 120 255 60 }
 				}
+				b_gozo = {
+					province = 9756
+
+					color = { 140 255 60 }
+				}
 			}
 		}