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

common/culture/cultures/NEOW_hebraic.txt

@@ -6,11 +6,11 @@
 	language = language_sarphatique
 	martial_custom = martial_custom_equal
 	traditions = {
+		tradition_chanson_de_geste
 		tradition_diasporic
-		tradition_caravaneers
+		tradition_chivalry
 		tradition_philosopher_culture
 		tradition_maritime_mercantilism
-		tradition_mobile_guards
 	}
 	
 	name_list = name_list_sephardi

common/culture/cultures/NEOW_italo_dalmatian.txt

@@ -71,8 +71,9 @@ azurrano = {
 	language = language_sardinian
 	martial_custom = martial_custom_male_only
 	traditions = {
+		tradition_maritime_mercantilism
+		tradition_culture_blending
 		tradition_stalwart_defenders
-		tradition_isolationist
 	}
 	
 	name_list = name_list_sardinian

common/landed_titles/france.txt

@@ -393,6 +393,35 @@ e_france = {
 					color = { 10 16 243 }
 				}
 			}
+			c_tourraine = {
+				color = { 25 65 225 }
+
+				b_tours = {
+					province = 2274
+
+					color = { 25 65 225 }
+				}
+				b_tourraine = { #Langeais
+					province = 2273
+
+					color = { 25 65 225 }
+				}
+				b_loches = {
+					province = 2275
+
+					color = { 25 65 225 }
+				}
+				b_la_haye = {
+					province = 2276
+
+					color = { 30 40 220 }
+				}
+				b_le_lude = {
+					province = 2269
+
+					color = { 5 95 235 }
+				}
+			}
 			c_issoudun = {
 				color = { 25 50 250 }
 
@@ -447,40 +476,6 @@ e_france = {
 
 					color = { 5 95 235 }
 				}
-				b_le_lude = {
-					province = 2269
-
-					color = { 5 95 235 }
-				}
-				b_craon = {
-					province = 2262
-
-					color = { 5 95 235 }
-				}
-			}
-			c_tourraine = {
-				color = { 25 65 225 }
-
-				b_tours = {
-					province = 2274
-
-					color = { 25 65 225 }
-				}
-				b_tourraine = { #Langeais
-					province = 2273
-
-					color = { 25 65 225 }
-				}
-				b_loches = {
-					province = 2275
-
-					color = { 25 65 225 }
-				}
-				b_la_haye = {
-					province = 2276
-
-					color = { 30 40 220 }
-				}
 			}
 			c_saumur = {
 				color = { 30 80 230 }
@@ -490,26 +485,12 @@ e_france = {
 
 					color = { 30 80 230 }
 				}
-				b_melay = {
+				b_cholet = {
 					province = 2260
 
 					color = { 30 80 230 }
 				}
 			}
-			c_chartres = {
-				color = { 23 38 255 }
-
-				b_dreux = {
-					province = 2331
-
-					color = { 23 38 255 }
-				}
-				b_nogent_le_rotrou = {
-					province = 2323
-
-					color = { 23 38 255 }
-				}
-			}
 			c_maine = {
 				color = { 15 80 205 }
 
@@ -528,15 +509,15 @@ e_france = {
 
 					color = { 15 80 205 }
 				}
-			}
-			c_sable = {
-				color = { 10 110 250 }
-
 				b_sable = {
 					province = 2264
 
 					color = { 10 110 250 }
 				}
+			}
+			c_sable = {
+				color = { 10 110 250 }
+
 				b_mayenne = {
 					province = 2266
 
@@ -547,6 +528,16 @@ e_france = {
 
 					color = { 10 110 250 }
 				}
+				b_craon = {
+					province = 2262
+
+					color = { 5 95 235 }
+				}
+				b_evron = {
+					province = 9746
+
+					color = { 5 95 235 }
+				}
 			}
 		}
 
@@ -710,6 +701,20 @@ e_france = {
 					color = { 5 30 175 }
 				}
 			}
+			c_chartres = {
+				color = { 23 38 255 }
+
+				b_dreux = {
+					province = 2331
+
+					color = { 23 38 255 }
+				}
+				b_nogent_le_rotrou = {
+					province = 2323
+
+					color = { 23 38 255 }
+				}
+			}
 			c_blois = {
 				color = { 42 65 190 }
 

gfx/interface/illustrations/loading_screens/loadscreen_settings.txt

@@ -1,6 +1,6 @@
-bike = { priority = 50 }
-paris = { priority = 50 }
-andorra = { priority = 50 }
-bhutan = { priority = 50 }
-shepherd = { priority = 50 }
-numenor = { priority = 50 }
+bike = { priority = 100 }
+paris = { priority = 100 }
+andorra = { priority = 100 }
+bhutan = { priority = 100 }
+shepherd = { priority = 100 }
+numenor = { priority = 100 }

history/provinces/k_france.txt

@@ -258,6 +258,8 @@
 	holding = castle_holding
 }
 2266 = {	#MAYENNE
+	culture = galo
+	religion = victorian
 	holding = castle_holding
 }
 2265 = {	#LAVAL
@@ -734,7 +736,7 @@
 2349 = {	#VEZELAY
 	culture = bourguignon
 	religion = carolingian
-	holding = church_holding
+	holding = castle_holding
 }
 2378 = {	#MORVAN
 	holding = none

localization/english/titles_l_english.yml

@@ -2555,7 +2555,7 @@
  b_coulogne:0 "Coulogne"
  b_coulommiers:0 "Coulommiers"
  b_coupar_angus:1 "Scone"
- b_courcillon:0 "Courcillon"
+ b_courcillon:0 "Montval-sur-Loir"
  b_courtenay:0 "Courtenay"
  b_courtrai:0 "Courtrai"
  b_coutances:0 "Coutances"
@@ -3337,7 +3337,7 @@
  b_evesham:0 "Ledbury"
  b_evora:0 "Évora"
  b_evreux:1 "Évreux"
- b_evron:0 "Evron"
+ b_evron:0 "Évron"
  b_ewell:0 "Ewell"
  b_ewloe:0 "Ewloe"
  b_ewyas_harold:0 "Ewyas Harold"
@@ -5685,7 +5685,7 @@
  b_kyzylsu:0 "Kyzyl Su"
  b_kyzylyar:0 "Kyzyl-Yar"
  b_kzyluzen:0 "Kzyl-Uzen"
- b_la_fleche:0 "La Flèche"
+ b_la_fleche:0 "Baugé-en-Anjou"
  b_la_haye:0 "La Haye"
  b_la_peyrade:0 "La Peyrade"
  b_la_roche-bernard:0 "La Roche-bernard"
@@ -6150,7 +6150,7 @@
  b_lugny:0 "Lugny"
  b_lugo:0 "Lugo"
  b_lugos:0 "Lugos"
- b_luigne:0 "Luigné"
+ b_luigne:0 "Segré-en-Anjou Bleu"
  b_lujavvr:0 "Lujavv'r"
  b_lukh:0 "Lukh"
  b_lukow:0 "Łuków"
@@ -8905,7 +8905,7 @@
  b_sarsink:0 "Sarsink"
  b_sarskoyegorodishche:0 "Sarskoye Gorodishche"
  b_sartene:0 "Sartène"
- b_sarthe:1 "Ballon"
+ b_sarthe:1 "Mamers"
  b_sarum:0 "Sarum"
  b_sarvantikar:0 "Sarvantikar"
  b_sarvar:0 "Sárvár"
@@ -11638,8 +11638,8 @@
  c_anhalt_adj:0 "Anhaltian"
  c_ani:0 "Ani"
  c_ani_adj:0 "Anian"
- c_anjou:0 "Anjou"
- c_anjou_adj:0 "Angevin"
+ c_anjou:0 "Maine-et-Loire"
+ c_anjou_adj:0 "Loiran"
  c_ankober:0 "Ankober"
  c_ankober_adj:0 "Ankoberian"
  c_ankyra:0 "Ankyra"
@@ -13421,8 +13421,8 @@
  c_mahoyadapuram_adj:0 "Mahoyadapuram"
  c_mahra:0 "Mahra"
  c_mahra_adj:0 "Mahran"
- c_maine:0 "Maine"
- c_maine_adj:0 "Mainian"
+ c_maine:0 "Sarthe"
+ c_maine_adj:0 "Sarthian"
  c_mainz:0 "Mainz"
  c_mainz_adj:0 "Mainzian"
  c_makran:0 "Makran"
@@ -14195,7 +14195,7 @@
  c_ryazan_adj:0 "Ryazanian"
  c_saarbrucken:0 "Saarbrücken"
  c_saarbrucken_adj:0 "Saarbrückener"
- c_sable:1 "Sablé"
+ c_sable:1 "Mayenne"
  c_sable_adj:0 "Sablian"
  c_sabzevar:0 "Sabzevar"
  c_sacz:0 "Sącz"
@@ -15186,8 +15186,8 @@
  d_angria_adj:0 "Angarian"
  d_anhalt:0 "Anhalt"
  d_anhalt_adj:0 "Anhalter"
- d_anjou:0 "Anjou"
- d_anjou_adj:0 "Angevin"
+ d_anjou:0 "Pays de la Loire"
+ d_anjou_adj:0 "Loirin"
  d_antioch:0 "Antioch"
  d_antioch_adj:0 "Antiochian"
  d_anupa:0 "Anupa"

map_data/definition.csv

@@ -9744,7 +9744,7 @@
 9743;135;48;199;Zone Rouge;x
 9744;177;51;72;Zone Rouge;x
 9745;9;54;200;Zone Rouge;x
-#9746;51;57;73;;x;
+9746;51;57;73;Evron;x;
 #9747;93;60;201;;x;
 #9748;135;63;74;;x;
 #9749;177;66;202;;x;