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

history/provinces/e_alps.txt

@@ -230,8 +230,11 @@
 #k_rhodania
 ##d_lyonnais
 ###c_rhone
-2017 = {
-	holding = none
+2017 = {	# Lyon
+	culture = pelonais
+	religion = helvetic
+	holding = castle_holding
+	special_building = fourviere_01
 }
 2018 = {
 	holding = none
@@ -261,7 +264,19 @@
 }
 ##d_dauphine_fr
 ###c_isere
-2027 = {
+2027 = {	# Grenoble
+	culture = patoues
+	religion = rocambolist
+	holding = castle_holding
+	special_building_slot = generic_university
+}
+2028 = {	# Vienne
+	holding = city_holding
+}
+2029 = {	# Bourgoin-Jallieu
+	holding = church_holding
+}
+2030 = {	# Voiron
 	holding = none
 }
 2028 = {
@@ -315,7 +330,21 @@
 	holding = none
 }
 ###c_alpes_maritimes
-8717 = {
+8717 = {	# Nice
+	culture = azurrano
+	religion = fraticelli
+	holding = castle_holding
+}
+8718 = {	# Grasse
+	holding = city_holding
+}
+8719 = {	# Monaco
+	culture = azurrano
+	religion = fraticelli
+	holding = castle_holding
+	special_building = fortified_port_of_monaco_01
+}
+8720 = {	# Tende
 	holding = none
 }
 8718 = {

history/provinces/e_france.txt

@@ -52,6 +52,7 @@
 	culture = galo
 	religion = numenorian
 	holding = castle_holding
+	special_building_slot = generic_university
 	1066.1.1 = {
 	buildings = {
 	ramparts_01
@@ -70,6 +71,7 @@
 	culture = galo
 	religion = numenorian
 	holding = castle_holding
+	special_building = chateau_bretagne_01
 }
 2153 = {
 	holding = church_holding
@@ -787,6 +789,7 @@
 	culture = poitevin
 	religion = carolingian
 	holding = castle_holding
+	special_building_slot = generic_university
 	1066.1.1 = {
 	buildings = {
 	curtain_walls_01
@@ -885,6 +888,7 @@
 	culture = poitevin
 	religion = carolingian
 	holding = castle_holding
+	special_building_slot = port_of_la_rochelle_01
 }
 2243 = {
 	holding = none
@@ -960,6 +964,7 @@
 	culture = gascon
 	religion = rocambolist
 	holding = castle_holding
+	special_building = fort_de_bordeaux_01
 	867.1.1 = {
 	buildings = {
 	hunting_grounds_01
@@ -1151,6 +1156,7 @@
 	culture = axiton
 	religion = rocambolist
 	holding = castle_holding
+	special_building = capitole_toulouse_01
 	1066.1.1 = {
 	buildings = {
 	cereal_fields_01
@@ -1251,6 +1257,7 @@
 	culture = axiton
 	religion = girondin
 	holding = castle_holding
+	special_building_slot = generic_university
 }
 2288 = {
 	holding = none