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

N3OW.mod

@@ -4,7 +4,7 @@ tags={
 }
 name="New Era Old World"
 picture="thumbnail.png"
-path="mod/funny N3OW"
+path="mod/N3OW"
 replace_path="common/landed_titles"
 replace_path="history/characters"
 replace_path="history/cultures"

N3OW/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt

@@ -1361,14 +1361,6 @@ k_san_marino = {
 		texture = "flag_san_marino.dds"
 	}
 }
-k_sardinia = {
-	pattern = "pattern_solid.dds"
-	color1 = "red"
-	color2 = "white"
-	textured_emblem = {
-		texture = "flag_sardinia.dds"
-	}
-}
 k_andorra = {
 	pattern = "pattern_solid.dds"
 	color1 = "red"

N3OW/common/coat_of_arms/coat_of_arms/italia.txt

@@ -0,0 +1,265 @@
+#k_sardinia = {
+#	pattern = "pattern_solid.dds"
+#	color1 = "red"
+#	color2 = "white"
+#	textured_emblem = {
+#		texture = "flag_sardinia.dds"
+#	}
+#}
+k_sardinia_and_corsica={
+	pattern=pattern_solid.dds
+	color1=white
+	color2=red
+	colored_emblem={
+		texture="ce_head.dds"
+		color1=black
+		color2=white
+		color3=white
+		instance={position={0.27 0.23} scale={-0.38 0.38}}
+		instance={position={0.73 0.23} scale={0.38 0.38}}
+		instance={position={0.28 0.725} scale={-0.35 0.35}}
+		instance={position={0.72 0.725} scale={0.35 0.35}}
+	}
+	colored_emblem={
+		texture="ce_ordinary_cross_thin.dds"
+		color1=red
+		color2=red
+		instance={position={0.5 0.5}scale={1 1}}
+	}
+}
+d_sardinia_it={
+	pattern=pattern_solid.dds
+	color1=white
+	color2=red
+	colored_emblem={
+		texture="NEOW_ce_head_blindfolded.dds"
+		color1=black
+		color2=white
+		instance={position={0.27 0.23} scale={0.38 0.38}}
+		instance={position={0.73 0.23} scale={0.38 0.38}}
+		instance={position={0.28 0.725} scale={0.35 0.35}}
+		instance={position={0.72 0.725} scale={0.35 0.35}}
+	}
+	colored_emblem={
+		texture="ce_ordinary_cross_thin.dds"
+		color1=red
+		color2=red
+		instance={position={0.5 0.5}scale={1 1}}
+	}
+}
+c_cagliari_it={
+	pattern="pattern_checkers_02.dds"
+	color1=blue
+	color2=red
+	sub={
+		pattern="pattern_cross_01.dds"
+		color1=red
+		color2=white
+		instance={offset={0 0} scale={0.5 0.5}}
+		instance={offset={0.5 0.5} scale={0.5 0.5}}
+	}
+	sub={
+		pattern="pattern_solid.dds"
+		color1=blue
+		color2=white
+		colored_emblem={
+			color1=green_light
+			texture="ce_mount.dds"
+		}
+		colored_emblem={
+			color1=grey
+			color2=brown
+			texture="ce_castle.dds"
+			instance={position={0.5 0.4} scale={0.7 0.7}}
+		}
+		colored_emblem={
+			color1=blue_light
+			color2=white
+			texture="ce_waves_05.dds"
+			instance={position={0.5 0.7}}
+		}
+		instance={offset={0.5 0} scale={0.5 0.5}}
+		instance={offset={0 0.5} scale={0.5 0.5}}
+	}
+}
+c_nuoro={
+	pattern="pattern_tricolor_horizontal_01.dds"
+	color1=blue
+	color2=blue
+	color3=green
+	colored_emblem={
+		color1=green
+		mask={1 2}
+		texture="ce_ordinary_pile_03_inverted.dds"
+		instance={position={0.25 0.45} scale={0.7 0.7}}
+		instance={position={0.5 0.45} scale={0.7 0.7}}
+		instance={position={0.75 0.45} scale={0.7 0.7}}
+	}
+	colored_emblem={
+		color1=white
+		color2=white
+		color3=blue
+		texture="ce_bull_passant.dds"
+		instance={position={0.6 0.65} scale={0.55 0.55}}
+	}
+	colored_emblem={
+		color1=yellow
+		color3=blue
+		texture="ce_sun.dds"
+		instance={position={0.5 0.2} scale={0.35 0.35}}
+	}
+}
+c_oristano={
+	pattern="pattern_tricolor_horizontal_01.dds"
+	color1=red
+	color2=white
+	color3=blue
+	colored_emblem={
+		color1=white
+		texture="ce_cross_large.dds"
+		mask={1}
+		instance={position={0.5 0.165} scale={1 0.35}}
+	}
+}
+c_sassari={
+	pattern="pattern_checkers_02.dds"
+	color1=yellow
+	color2=red
+	sub={
+		pattern="pattern_cross_01.dds"
+		color1=red
+		color2=white
+		instance={offset={0 0} scale={0.5 0.5}}
+		instance={offset={0.5 0.5} scale={0.5 0.5}}
+	}
+	sub={
+		pattern="pattern_solid.dds"
+		color1=yellow
+		colored_emblem={
+			color1=red
+			color2=black
+			texture="ce_tower.dds"
+			instance={position={0.5 0.7}}
+		}
+		instance={offset={0.5 0} scale={0.5 0.5}}
+		instance={offset={0 0.5} scale={0.5 0.5}}
+	}
+}
+d_corsica_fr={
+	pattern="pattern_solid.dds"
+	color1=white
+	color2=black
+	colored_emblem={
+		color1=black
+		color2=white
+		color3=white
+		texture="ce_head.dds"
+		instance={scale={0.8 0.8}}
+	}
+}
+c_southern_corsica={
+	pattern="pattern_horizontal_split_02.dds"
+	color1=red
+	color2=blue
+	colored_emblem={
+		color1=green
+		color2=green
+		texture="ce_shield_02.dds"
+		instance={position={0.5 1} scale={0.7 -0.7}}
+	}
+	colored_emblem={
+		color1=white
+		color2=white
+		texture="ce_tower.dds"
+		instance={position={0.5 0.55} scale={0.5 0.5}}
+	}
+	colored_emblem={
+		color1=yellow
+		color2=red
+		color3=red
+		texture="ce_lion_rampant.dds"
+		instance={position={0.3 0.625} scale={-0.5 0.5}}
+	}
+	colored_emblem={
+		color1=white
+		color2=white
+		color3=red
+		texture="NEOW_ce_goat_rampant.dds"
+		instance={position={0.7 0.625} scale={0.5 0.5}}
+	}
+	colored_emblem={
+		color1=white
+		texture="ce_block_02.dds"
+		mask={2}
+		instance={position={0.75 0.25} scale={0.5 0.5}}
+	}
+	colored_emblem={
+		color1=white
+		texture="ce_inescutcheon.dds"
+		instance={position={0.5 0.175} scale={0.5 0.5}}
+	}
+	colored_emblem={
+		color1=black
+		color2=white
+		color3=white
+		texture="ce_head.dds"
+		instance={position={0.5 0.175} scale={0.25 0.25}}
+	}
+	colored_emblem={
+		color1=red
+		mask={2}
+		texture="ce_cross_patriarchal.dds"
+		instance={position={0.75 0.225} scale={0.35 0.35}}
+	}
+	colored_emblem={
+		color1=yellow
+		texture="ce_scales.dds"
+		instance={position={0.25 0.225} scale={0.3 0.3}}
+	}
+}
+c_upper_corsica={
+	pattern="pattern_tricolor_horizontal_01.dds"
+	color1=blue
+	color2=blue
+	color3=green
+	colored_emblem={
+		color1=white
+		color2=black
+		texture="ce_tower.dds"
+		mask={1 2}
+		instance={position={0.5 0.45} scale={0.8 0.8}}
+	}
+	colored_emblem={
+		color1=white
+		texture="ce_inescutcheon.dds"
+		instance={position={0.5 0.375} scale={0.5 0.5}}
+	}
+	colored_emblem={
+		color1=black
+		color2=white
+		color3=white
+		texture="ce_head.dds"
+		instance={position={0.5 0.375} scale={0.25 0.25}}
+	}
+	colored_emblem={
+		color1=red
+		texture="ce_cross_09.dds"
+		instance={position={0.5 0.2} scale={0.2 0.1}}
+	}
+	colored_emblem={
+		color1=yellow
+		texture="ce_fleur.dds"
+		instance={position={0.25 0.4} scale={0.25 0.25}}
+	}
+	colored_emblem={
+		color1=yellow
+		texture="ce_star_05.dds"
+		instance={position={0.25 0.2} scale={0.25 0.25}}
+	}
+	colored_emblem={
+		color1=yellow
+		color3=blue
+		texture="ce_sun.dds"
+		instance={position={0.9 0.1} scale={0.6 0.6}}
+	}
+}

N3OW/common/culture/cultures/NEOW_rhaeto_helvetic.txt

@@ -13,7 +13,7 @@ pelonais = {
 		tradition_parochialism
 		tradition_hard_working
 		tradition_chivalry
-		tradition_culinary_artists
+		tradition_culinary_art
 	}
 	
 	name_list = name_list_french

N3OW/common/dynasties/NEOW_dynasties.txt

@@ -704,6 +704,51 @@ alonso_dynasty = {
 	culture = castilian
 }
 
+puente_dynasty = {
+	name = dynn_puente
+	culture = castilian
+}
+
+navalucillos_dynasty = {
+	name = dynn_navalucillos
+	culture = castilian
+}
+
+castellon_dynasty = {
+	name = dynn_castellon
+	culture = castilian
+}
+
+alagon_dynasty = {
+	name = dynn_alagon
+	culture = castilian
+}
+
+quiroga_dynasty = {
+	name = dynn_quiroga
+	culture = castilian
+}
+
+ceballos_dynasty = {
+	name = dynn_ceballos
+	culture = castilian
+}
+
+aracena_dynasty = {
+	name = dynn_aracena
+	culture = extremeno
+}
+
+martin_dynasty = {
+	name = dynn_martin
+	culture = extremeno
+}
+
+agurto_dynasty = {
+	name = dynn_agurto
+	culture = basque
+}
+
 melendez_dynasty = {
 	name = dynn_melendez
 	culture = asturleonese
@@ -714,6 +759,11 @@ estevez_dynasty = {
 	culture = asturleonese
 }
 
+ourense_dynasty = {
+	name = dynn_ourense
+	culture = asturleonese
+}
+
 coimbra_dynasty = {
 	name = dynn_coimbra
 	culture = portugese
@@ -734,6 +784,11 @@ aboim_dynasty = {
 	culture = portugese
 }
 
+tavora_dynasty = {
+	name = dynn_tavora
+	culture = portugese
+}
+
 torre_dynasty = {
 	name = dynn_torre
 	culture = NEOW_andalusian

N3OW/common/landed_titles/italy.txt

@@ -236,158 +236,334 @@ e_italy = {
 			}
 		}
 	}
-
+	k_sardinia_and_corsica = {
-	k_sardinia = {	#Sardinia & Corsica
 		color = { 210 165 255 }
+		color2 = { 255 255 255 }
 		can_be_named_after_dynasty = no
-
+		
-		capital = c_cagliari # Cagliari
+		capital = c_cagliari_it
-
 		cultural_names = {
-			name_list_catalan = cn_sardenya_i_corsega
+			name_list_catalan=cn_sardenya_i_corsega
-			name_list_greek = cn_sardhnia_kai_thn_korsikn
+			name_list_corsican=cn_corsica_e_grv_sardegna
-			name_list_italian = cn_sardegna_e_corsica
+			name_list_greek=cn_sardhnia_kai_thn_korsikn
-			name_list_cisalpine = cn_sardegna_e_corsica
+			name_list_italian=cn_sardegna_e_corsica
-			name_list_sicilian = cn_sardegna_e_corsica
+			name_list_cisalpine=cn_sardegna_e_corsica
-			name_list_sardinian = cn_sardegna_e_corsica
+			name_list_sicilian=cn_sardegna_e_corsica
+			name_list_sardinian=cn_sardegna_e_corsica
+			name_list_NEOW_french=cn_corse_sardaigne
 		}
-
+		
-		d_corsica = {
+		d_sardinia_it = {
-			color = { 200 200 250 }
+			color = { 177 147 207 }
+			color2 = { 255 255 255 }
 			can_be_named_after_dynasty = no
-
+			
-			capital = c_ajaccio # Ajaccio
+			capital = c_cagliari_it
-
+			cultural_names = {
-			c_ajaccio = {
+				name_list_catalan=cn_sardenya
-				can_be_named_after_dynasty = no
+				name_list_corsican=cn_sardegna
-				color = { 200 200 250 }
+				name_list_NEOW_french=cn_sardaigne
-
+				name_list_italian=cn_sardegna
-				b_ajaccio = {
+				name_list_cisalpine=cn_sardegna
-					province = 2650
+				name_list_sardinian=cn_sardigna
-
-					color = { 200 200 250 }
-				}
-				b_bonifacio = {
-					province = 2652
-
-					color = { 205 230 235 }
-				}
-				b_vecchio = {
-					province = 2651
-
-					color = { 205 230 235 }
-				}
 			}
-			c_bastia = {
+			
+			c_cagliari_it = {
+				color = { 154 116 193 }
+				color2 = { 255 255 255 }
 				can_be_named_after_dynasty = no
-				color = { 226 248 251 }
+				cultural_names = {
-
+					name_list_catalan=cn_c_a_grv_ller
-				b_bastia = {
+					name_list_corsican=cn_c_a_grv_gliari
-					province = 2647
+					name_list_sardinian=cn_casteddu
-
-					color = { 226 248 251 }
 				}
-				b_corte = {
+				
-					province = 2648
-
-					color = { 226 248 251 }
-				}
-				b_calvi = {
-					province = 2649
-
-					color = { 200 200 250 }
-				}
-			}
-		}
-
-		d_sardinia = {
-			color = { 217 159 255 }
-			can_be_named_after_dynasty = no
-
-			capital = c_cagliari # Cagliari
-
-			c_cagliari = {
-				can_be_named_after_dynasty = no
-				color = { 220 160 250 }
-
 				b_cagliari = {
 					province = 2653
-
+					color = { 154 116 193 }
-					color = { 220 160 250 }
+					color2 = { 255 255 255 }
+					cultural_names = {
+						name_list_catalan=cn_c_a_grv_ller
+						name_list_corsican=cn_c_a_grv_gliari
+						name_list_sardinian=cn_casteddu
+					}
+				}
+				b_carbonia = {
+					province = 2654
+					color = { 154 116 193 }
+					color2 = { 255 255 255 }
+					cultural_names = {
+						name_list_catalan=cn_carb_o_grv_nia
+						name_list_sardinian=cn_carb_o_grv_nia
+					}
 				}
 				b_iglesias = {
-					province = 2654
-
-					color = { 220 160 250 }
-				}
-				b_samassi = {
-					province = 2660
-
-					color = { 220 160 250 }
-				}
-				b_carbonara = {
 					province = 2655
-
+					color = { 154 116 193 }
-					color = { 180 170 180 }
+					color2 = { 255 255 255 }
+					cultural_names = {
+						name_list_catalan=cn_esgl_e_act_sies
+						name_list_sardinian=cn_igr_e_grv_sias
+					}
+				}
+				b_dolianova = {
+					province = 2656
+					color = { 154 116 193 }
+					color2 = { 255 255 255 }
+					cultural_names = {
+						name_list_sardinian=cn_patiolla
+					}
+				}
+				b_muravera = {
+					province = 2657
+					color = { 154 116 193 }
+					color2 = { 255 255 255 }
+					cultural_names = {
+						name_list_sardinian=cn_murera
+					}
 				}
 			}
-			c_arborea = {
+			c_nuoro = {
+				color = { 185 157 213 }
+				color2 = { 255 255 255 }
 				can_be_named_after_dynasty = no
-				color = { 200 185 250 }
+				cultural_names = {
-
+					name_list_catalan=cn_n_u_grv_goro
-				b_oristano = {
+					name_list_corsican=cn_nuaru
-					province = 2659
+					name_list_sardinian=cn_n_u_grv_goro
-
-					color = { 200 185 250 }
 				}
-				b_isili = {
+				
+				b_nuoro = {
 					province = 2661
-
+					color = { 185 157 213 }
-					color = { 200 185 250 }
+					color2 = { 255 255 255 }
+					cultural_names = {
+						name_list_catalan=cn_n_u_grv_goro
+						name_list_corsican=cn_nuaru
+						name_list_sardinian=cn_n_u_grv_goro
+					}
+				}
+				b_siniscola = {
+					province = 2662
+					color = { 185 157 213 }
+					color2 = { 255 255 255 }
+					cultural_names = {
+						name_list_sardinian=cn_thiniscole
+					}
+				}
+				b_tortoli = {
+					province = 2663
+					color = { 185 157 213 }
+					color2 = { 255 255 255 }
+					cultural_names = {
+						name_list_catalan=cn_tortol_i_act_
+					}
+				}
+				b_macomer = {
+					province = 2664
+					color = { 185 157 213 }
+					color2 = { 255 255 255 }
+					cultural_names = {
+						name_list_sardinian=cn_macumere
+					}
 				}
 			}
-			c_logudoro = {
+			c_oristano = {
+				color = { 121 103 139 }
+				color2 = { 255 255 255 }
 				can_be_named_after_dynasty = no
-				color = { 170 182 225 }
+				cultural_names = {
-
+					name_list_catalan=cn_oristany
+					name_list_sardinian=cn_aristanis
+				}
+				
+				b_oristano = {
+					province = 2658
+					color = { 121 103 139 }
+					color2 = { 255 255 255 }
+					cultural_names = {
+						name_list_catalan=cn_oristany
+						name_list_sardinian=cn_aristanis
+					}
+				}
+				b_terralba = {
+					province = 2659
+					color = { 121 103 139 }
+					color2 = { 255 255 255 }
+					cultural_names = {
+						name_list_sardinian=cn_terraba
+					}
+				}
+				b_bosa = {
+					province = 2660
+					color = { 121 103 139 }
+					color2 = { 255 255 255 }
+				}
+			}
+			c_sassari = {
+				color = { 137 83 191 }
+				color2 = { 255 255 255 }
+				can_be_named_after_dynasty = no
+				cultural_names = {
+					name_list_catalan=cn_s_a_grv_sser
+					name_list_sardinian=cn_t_a_grv_tari
+				}
+				
 				b_sassari = {
-					province = 2662
-
-					color = { 170 182 225 }
-				}
-				b_alghero = {
 					province = 2665
-
+					color = { 137 83 191 }
-					color = { 170 182 225 }
+					color2 = { 255 255 255 }
-				}
+					cultural_names = {
-				b_porto_torres = {
+						name_list_catalan=cn_s_a_grv_sser
-					province = 2664
+						name_list_sardinian=cn_t_a_grv_tari
-
+					}
-					color = { 170 182 225 }
-				}
-				b_ardara = {
-					province = 2663
-
-					color = { 170 182 225 }
 				}
 				b_olbia = {
-					province = 2658
+					province = 13270
-
+					color = { 137 83 191 }
-					color = { 195 175 225 }
+					color2 = { 255 255 255 }
+					cultural_names = {
+						name_list_catalan=cn__o_grv_lbia
+						name_list_sardinian=cn_terranoa
+					}
+				}
+				b_alghero = {
+					province = 13271
+					color = { 137 83 191 }
+					color2 = { 255 255 255 }
+					cultural_names = {
+						name_list_catalan=cn_l_pst_alguer
+						name_list_sardinian=cn_s_pst_aligh_e_grv_ra
+					}
+				}
+				b_arzachena = {
+					province = 13272
+					color = { 137 83 191 }
+					color2 = { 255 255 255 }
+					cultural_names = {
+						name_list_catalan=cn_altzagh_e_grv_na
+						name_list_corsican=cn_alzachena
+						name_list_sardinian=cn_altzagh_e_grv_na
+					}
+				}
+				b_ozieri = {
+					province = 13273
+					color = { 137 83 191 }
+					color2 = { 255 255 255 }
+					cultural_names = {
+						name_list_catalan=cn_ocier
+						name_list_sardinian=cn_otieri
+					}
 				}
 			}
-			c_tortoli = {
+		}
-				color = { 180 170 180 }
+		d_corsica_fr = {
-
+			color = { 201 201 201 }
-				b_tortoli = {
+			color2 = { 255 255 255 }
-					province = 2656
+			can_be_named_after_dynasty = no
-
+			
-					color = { 180 170 180 }
+			capital = c_southern_corsica
+			cultural_names = {
+				name_list_catalan=cn_c_o_grv_rsega
+				name_list_NEOW_french=cn_corse
+				name_list_sardinian=cn_c_o_grv_ssiga
+			}
+			
+			c_southern_corsica = {
+				color = { 148 148 148 }
+				color2 = { 255 255 255 }
+				can_be_named_after_dynasty = no
+				cultural_names = {
+					name_list_catalan=cn_c_o_grv_rsega_del_sud
+					name_list_corsican=cn_pumonti
+					name_list_NEOW_french=cn_corse_du_sud
+					name_list_italian=cn_corsica_del_sud
+					name_list_cisalpine=cn_corsica_del_sud
+					name_list_sardinian=cn_c_o_grv_ssiga_de_su_sud
 				}
-				b_galtelli = {
+				
-					province = 2657
+				b_ajaccio = {
-
+					province = 2647
-					color = { 195 175 225 }
+					color = { 148 148 148 }
+					color2 = { 255 255 255 }
+					cultural_names = {
+						name_list_catalan=cn_aiacciu
+						name_list_corsican=cn_aiacciu
+						name_list_sardinian=cn_ajacciu
+					}
+				}
+				b_porto_vecchio = {
+					province = 2648
+					color = { 148 148 148 }
+					color2 = { 255 255 255 }
+					cultural_names = {
+						name_list_catalan=cn_port_vell
+						name_list_corsican=cn_portivechju
+					}
+				}
+				b_sartene = {
+					province = 2649
+					color = { 148 148 148 }
+					color2 = { 255 255 255 }
+					cultural_names = {
+						name_list_corsican=cn_sart_e_grv_
+						name_list_italian=cn_sartena
+						name_list_cisalpine=cn_sartena
+					}
+				}
+				b_bonifacio = {
+					province = 2650
+					color = { 148 148 148 }
+					color2 = { 255 255 255 }
+					cultural_names = {
+						name_list_catalan=cn_bunifaziu
+						name_list_corsican=cn_bunifaziu
+						name_list_sardinian=cn_bonif_a_grv_tziu
+					}
+				}
+			}
+			c_upper_corsica = {
+				color = { 220 220 220 }
+				color2 = { 255 255 255 }
+				can_be_named_after_dynasty = no
+				cultural_names = {
+					name_list_catalan=cn_alta_c_o_grv_rsega
+					name_list_corsican=cn_cismonte
+					name_list_NEOW_french=cn_haute_corse
+					name_list_italian=cn_alta_corsica
+					name_list_cisalpine=cn_alta_corsica
+					name_list_sardinian=cn_c_o_grv_ssiga_arta
+				}
+				
+				b_bastia = {
+					province = 2651
+					color = { 33 95 23 }
+					color2 = { 255 255 255 }
+					cultural_names = {
+						name_list_corsican=cn_bast_i_grv_a
+					}
+				}
+				b_corte = {
+					province = 2652
+					color = { 33 95 23 }
+					color2 = { 255 255 255 }
+					cultural_names = {
+						name_list_catalan=cn_corti
+						name_list_corsican=cn_corti
+					}
+				}
+				b_calvi = {
+					province = 13274
+					color = { 33 95 23 }
+					color2 = { 255 255 255 }
+				}
+				b_ghisonaccia = {
+					province = 13275
+					color = { 33 95 23 }
+					color2 = { 255 255 255 }
+					cultural_names = {
+						name_list_corsican=cn_ghisunaccia
+					}
 				}
 			}
 		}

N3OW/common/province_terrain/00_province_terrain.txt

@@ -2362,23 +2362,23 @@ default_coastal_sea=coastal_sea
 2645=hills
 2646=plains
 2647=hills
-2648=hills
+2648=mountains
 2649=mountains
 2650=mountains
-2651=mountains
+2651=hills
-2652=plains
+2652=mountains
 2653=plains
-2654=plains
+2654=hills
-2655=plains
+2655=hills
-2656=hills
+2656=mountains
 2657=hills
 2658=plains
 2659=plains
-2660=hills
+2660=mountains
-2661=mountains
+2661=hills
-2662=hills
+2662=plains
-2663=mountains
+2663=hills
-2664=plains
+2664=hills
 2665=plains
 2666=plains
 2667=plains
@@ -11961,3 +11961,9 @@ default_coastal_sea=coastal_sea
 13156=oasis
 13157=drylands
 13159=floodplains
+13270=plains
+13271=hills
+13272=wetlands
+13273=hills
+13274=mountains
+13275=mountains

N3OW/common/province_terrain/01_province_properties.txt

@@ -7360,115 +7360,102 @@
 	winter_severity_bias = 0.0
 }
 
-#### k_sardinia #Sardinia & Corsica
+#### k_sardinia_and_corsica
-### d_corsica 
+### d_sardinia_it
-## c_ajaccio 
+## c_cagliari_it
-# b_ajaccio 
+# b_cagliari
-2650 ={
+2653 = {winter_severity_bias = 0.0}
-	winter_severity_bias = 0.50
+# b_carbonia
-	mild_winter_factor_override = 0.3
+2654 = {winter_severity_bias = 0.0}
-	normal_winter_factor_override = 0.2
+# b_iglesias
-	harsh_winter_factor_override = 0.0
+2655 = {winter_severity_bias = 0.0}
-}
+# b_dolianova
-# b_calvi 
+2656 = {winter_severity_bias = 0.0}
-2649 ={
+# b_muravera
-	winter_severity_bias = 0.50
+2657 = {winter_severity_bias = 0.0
-	mild_winter_factor_override = 0.3
+		mild_winter_factor_override = 0.3
-	normal_winter_factor_override = 0.2
+		normal_winter_factor_override = 0.2
-	harsh_winter_factor_override = 0.0
+		harsh_winter_factor_override = 0.0
-}
-## c_bastia 
-# b_bastia 
-2647 ={
-	winter_severity_bias = 0.25
-	mild_winter_factor_override = 0.3
-	normal_winter_factor_override = 0.2
-	harsh_winter_factor_override = 0.0
-}
-# b_corte 
-2648 ={
-	winter_severity_bias = 0.25
-	mild_winter_factor_override = 0.3
-	normal_winter_factor_override = 0.2
-	harsh_winter_factor_override = 0.0
-}
-## c_vecchio 
-# b_bonifacio 
-2652 ={
-	winter_severity_bias = 0.0
-}
-# b_vecchio 
-2651 ={
-	winter_severity_bias = 0.50
-	mild_winter_factor_override = 0.3
-	normal_winter_factor_override = 0.2
-	harsh_winter_factor_override = 0.0
-}
-### d_sardinia 
-## c_cagliari 
-# b_cagliari 
-2653 ={
-	winter_severity_bias = 0.0
-}
-# b_iglesias 
-2654 ={
-	winter_severity_bias = 0.0
-}
-# b_samassi 
-2660 ={
-	winter_severity_bias = 0.0
-}
-## c_arborea 
-# b_oristano 
-2659 ={
-	winter_severity_bias = 0.0
-}
-# b_isili 
-2661 ={
-	winter_severity_bias = 0.40
-	mild_winter_factor_override = 0.3
-	normal_winter_factor_override = 0.2
-	harsh_winter_factor_override = 0.0
-}
-## c_gallura 
-# b_olbia 
-2658 ={
-	winter_severity_bias = 0.0
-}
-# b_galtelli 
-2657 ={
-	winter_severity_bias = 0.0
-}
-## c_logudoro 
-# b_sassari 
-2662 ={
-	winter_severity_bias = 0.0
-}
-# b_alghero 
-2665 ={
-	winter_severity_bias = 0.0
-}
-# b_porto_torres 
-2664 ={
-	winter_severity_bias = 0.0
-}
-# b_ardara 
-2663 ={
-	winter_severity_bias = 0.40
-	mild_winter_factor_override = 0.3
-	normal_winter_factor_override = 0.2
-	harsh_winter_factor_override = 0.0
-}
-## c_tortoli 
-# b_tortoli 
-2656 ={
-	winter_severity_bias = 0.0
-}
-# b_carbonara 
-2655 ={
-	winter_severity_bias = 0.0
 }
 
+## c_oristano
+# b_oristano
+2658 = {winter_severity_bias = 0.0}
+# b_terralba
+2659 = {winter_severity_bias = 0.0}
+# b_bosa
+2660 = {winter_severity_bias = 0.0}
+
+## c_nuoro
+# b_nuoro
+2661 = {winter_severity_bias = 0.0}
+# b_siniscola
+2662 = {winter_severity_bias = 0.0}
+# b_tortoli
+2663 = {winter_severity_bias = 0.0}
+# b_macomer
+2664 = {winter_severity_bias = 0.0}
+
+## c_sassari
+# b_sassari
+2665 = {winter_severity_bias = 0.0}
+# b_olbia
+13270 = {winter_severity_bias = 0.0}
+# b_alghero
+13271 = {winter_severity_bias = 0.0}
+# b_arzachena
+13272 = {winter_severity_bias = 0.0}
+# b_ozieri
+13273 = {winter_severity_bias = 0.0}
+
+### d_corsica_fr
+## c_southern_corsica
+# b_ajaccio
+1217 = {winter_severity_bias = 0.50
+		mild_winter_factor_override = 0.3
+		normal_winter_factor_override = 0.2
+		harsh_winter_factor_override = 0.0
+	}
+# b_porto_vecchio
+1218 = {winter_severity_bias = 0.50
+		mild_winter_factor_override = 0.3
+		normal_winter_factor_override = 0.2
+		harsh_winter_factor_override = 0.0
+	}
+# b_sartene
+1219 = {winter_severity_bias = 0.50
+		mild_winter_factor_override = 0.3
+		normal_winter_factor_override = 0.2
+		harsh_winter_factor_override = 0.0
+	}
+# b_bonifacio
+1220 = {winter_severity_bias = 0.0}
+
+## c_upper_corsica
+# b_bastia
+1221 = {winter_severity_bias = 0.25
+		mild_winter_factor_override = 0.3
+		normal_winter_factor_override = 0.2
+		harsh_winter_factor_override = 0.0}
+# b_corte
+1222 = {winter_severity_bias = 0.50
+		mild_winter_factor_override = 0.3
+		normal_winter_factor_override = 0.2
+		harsh_winter_factor_override = 0.0
+	}
+# b_calvi
+1223 = {winter_severity_bias = 0.50
+		mild_winter_factor_override = 0.3
+		normal_winter_factor_override = 0.2
+		harsh_winter_factor_override = 0.0
+	}
+# b_ghisonaccia
+1224 = {winter_severity_bias = 0.50
+		mild_winter_factor_override = 0.3
+		normal_winter_factor_override = 0.2
+		harsh_winter_factor_override = 0.0
+	}
+
 #### k_romagna 
 ### d_romagna 
 ## c_ravenna 

N3OW/common/religion/religions/NEOW_catholic.txt

@@ -501,6 +501,7 @@
 
 			#Doctrines
 			doctrine = doctrine_gender_male_dominated
+			doctrine = doctrine_pluralism_fundamentalist
 
 			holy_order_names = { #placeholder
 				{ name = "holy_order_knights_templar" coat_of_arms = "ho_knights_templar" }

N3OW/common/scripted_triggers/00_clothing_triggers.txt

@@ -2739,12 +2739,8 @@ portrait_religious_african_trigger = {
 ### DDE HRE ###
 
 portrait_reichskrone_trigger = {
-	exists = this
 	OR = {
-		has_primary_title = title:e_hre
+		has_primary_title = title:e_european_union
-		any_equipped_character_artifact = {
-			has_variable = reichskrone
-		}
 	}
 }
 

N3OW/descriptor.mod

@@ -9,4 +9,4 @@ replace_path="history/cultures"
 replace_path="history/provinces"
 replace_path="history/titles"
 supported_version="1.16.*"
-path="C:/Users/pkkim/Documents/Paradox Interactive/Crusader Kings III/mod/N3OW/N3OW"
+path="mod/N3OW"

N3OW/gfx/coat_of_arms/colored_emblems/NEOW_coa_designer_emblems.txt

@@ -39,8 +39,6 @@ NEOW_ce_numenor_tree.dds = { colors = 1 category = faiths }
 NEOW_ce_heart.dds = { colors = 1 category = abstract }
 NEOW_ce_cross_carolignian.dds = { colors = 2 category = crosses_and_knots }
 NEOW_ce_cross_nordic.dds = { colors = 2 category = crosses_and_knots }
-NEOW_ce_armillary_sphere.dds = { colors = 1 category = manmade }
-NEOW_ce_arnor_sceptre.dds = { colors = 1 category = manmade }
 NEOW_ce_arnor_crown.dds = { colors = 1 category = manmade }
 NEOW_ce_flower_star.dds = { colors = 2 category = nature }
 NEOW_ce_crown_koln.dds = { colors = 2 category = manmade }
@@ -57,8 +55,10 @@ NEOW_ce_rosa_camuna.dds = { colors = 1 category = nature }
 ###ANIMALS
 NEOW_ce_archaeopteryx.dds = { colors = 3 category = animals }
 NEOW_ce_blackadder.dds = { colors = 3 category = animals }
+NEOW_ce_cow.dds = { colors = 3 category = animals }
 NEOW_ce_eagle_modern.dds = { colors = 3 category = animals }
 NEOW_ce_gaul_boar.dds = { colors = 2 category = animals }
+NEOW_ce_goat_rampant.dds = { colors = 3 category = animals }
 NEOW_ce_harpy.dds = { colors = 3 category = animals }
 NEOW_ce_harpy_crowned.dds = { colors = 3 category = animals }
 NEOW_ce_kulindadromeus.dds = { colors = 3 category = animals }
@@ -67,3 +67,11 @@ NEOW_ce_nap_eagle.dds = { colors = 1 category = animals }
 NEOW_ce_dragon_rampant.dds = { colors = 3 category = animals }
 NEOW_ce_dragon_rampant.dds = { colors = 3 category = animals }
 NEOW_ce_wallonia.dds = { colors = 1 category = animals }
+
+###FIGURES
+NEOW_ce_head_blindfolded.dds = { colors = 3 category = animals }
+
+###MANMADE
+NEOW_ce_armillary_sphere.dds = { colors = 1 category = manmade }
+NEOW_ce_arnor_sceptre.dds = { colors = 1 category = manmade }
+NEOW_ce_lantern.dds = { colors = 3 category = animals }

N3OW/history/characters/NEOW_e_france.txt

@@ -949,4 +949,21 @@ france_chanan_alaux = {
 	2600.1.1 = {
 		death = yes
 	}
+}
+france_belasko_agurto = {
+	name = "Belasko"
+	dynasty = agurto_dynasty
+	religion = sevillian
+	culture = basque
+	trait = generous
+	trait = just
+	trait = calm
+	trait = education_martial_1
+	trait = open_terrain_expert
+	2529.3.12 = {
+		birth = yes
+	}
+	2600.1.1 = {
+		death = yes
+	}
 }

N3OW/history/characters/NEOW_e_hispania.txt

@@ -437,7 +437,7 @@ hispania0021 = { #Lorién de Borja Terol Count
 }
 
 hispania0022 = { #Jerónimo de Teruel-Moctezuma Cordoba Duke
-	name = "Lorién"
+	name = "Jerónimo"
 	dynasty = teruel_moctezuma_dynasty
 	religion = sevillian
 	culture = NEOW_andalusian
@@ -688,6 +688,144 @@ castille_suero_alonso = {
 		death = yes
 	}
 }
+castille_velasco_puente = {
+	name = "Velasco"
+	dynasty = puente_dynasty
+	religion = sevillian
+	culture = castilian
+	trait = shy
+	trait = stubborn
+	trait = cynical
+	trait = education_martial_2
+	trait = reckless
+	2522.8.17 = {
+		birth = yes
+	}
+	2600.1.1 = {
+		death = yes
+	}
+}
+castille_garcia_navalucillos = {
+	name = "García"
+	dynasty = navalucillos_dynasty
+	religion = sevillian 
+	culture = castilian
+	trait = gregarious
+	trait = fickle
+	trait = honest
+	trait = education_martial_4
+	trait = aggressive_attacker
+	2539.5.12 = {
+		birth = yes
+	}
+	2600.1.1 = {
+		death = yes
+	}
+}
+castille_gerardo_castellon = {
+	name = "Gerardo"
+	dynasty = castellon_dynasty
+	religion = sevillian 
+	culture = castilian
+	trait = gregarious
+	trait = fickle
+	trait = compassionate
+	trait = education_martial_1
+	trait = logistician
+	trait = strong
+	2542.3.1 = {
+		birth = yes
+	}
+	2600.1.1 = {
+		death = yes
+	}
+}
+castille_marina_alagon = {
+	name = "Marina"
+	dynasty = alagon_dynasty
+	religion = sevillian 
+	culture = castilian
+	female = yes
+	trait = callous
+	trait = greedy
+	trait = calm
+	trait = education_intrigue_1
+	trait = whole_of_body
+	2532.4.1 = {
+		birth = yes
+	}
+	2600.1.1 = {
+		death = yes
+	}
+}
+castille_luis_quiroga = {
+	name = "Luis"
+	dynasty = quiroga_dynasty
+	religion = sevillian 
+	culture = castilian
+	trait = deceitful
+	trait = gluttonous
+	trait = arrogant
+	trait = education_diplomacy_3
+	2534.9.24 = {
+		birth = yes
+	}
+	2600.1.1 = {
+		death = yes
+	}
+}
+castille_cristina_ceballos = {
+	name = "Cristina"
+	dynasty = ceballos_dynasty
+	religion = sevillian 
+	culture = castilian
+	female = yes
+	trait = deceitful
+	trait = gluttonous
+	trait = callous
+	trait = education_diplomacy_3
+	trait = fecund
+	2540.12.19 = {
+		birth = yes
+	}
+	2600.1.1 = {
+		death = yes
+	}
+}
+castille_arias_aracena = {
+	name = "Arias"
+	dynasty = aracena_dynasty
+	religion = sevillian
+	culture = extremeno
+	trait = trusting
+	trait = generous
+	trait = wrathful
+	trait = education_intrigue_3
+	2530.10.21 = {
+		birth = yes
+	}
+	2600.1.1 = {
+		death yes
+	}
+}
+castille_mencia_martin = {
+	name = "Mencín"
+	dynasty = martin_dynasty
+	religion = sevillian
+	culture = extremeno
+	female = yes
+	trait = calm
+	trait = arbitrary
+	trait = greedy
+	trait = education_intrigue_2
+	trait = seducer
+	2538.11.1 = {
+		birth = yes
+	}
+	2600.1.1 = {
+		death yes
+	}
+}
 s_galicia_sanchu_melendez = {
 	name = "Sanchu"
 	dynasty = melendez_dynasty
@@ -721,6 +859,25 @@ s_galicia_savaricu_estevez = {
 		death = yes
 	}
 }
+s_galicia_mumadona_ourense = {
+	name = "Mumadona"
+	dynasty = ourense_dynasty
+	religion = sevillian
+	culture = asturleonese
+	female = yes
+	trait = forgiving
+	trait = sadistic
+	trait = trusting
+	trait = education_martial_3
+	trait = aggressive_attacker
+	trait = lisping
+	2532.5.22 = {
+		birth = yes
+	} 
+	2600.1.1 = {
+		death = yes
+	}
+}
 portugal_hermigo_coimbra = {
 	name = "Hermígo"
 	dynasty = coimbra_dynasty
@@ -785,4 +942,24 @@ portugal_vela_aboim = {
 	2600.1.1 = {
 		death = yes
 	}
+}
+portugal_catarina_tavora = {
+	name = "Catarina"
+	dynasty = tavora_dynasty
+	religion = iberian 
+	culture = portuguese
+	female = yes
+	trait = temperate
+	trait = arbitrary
+	trait = craven
+	trait = education_martial_1
+	trait = lifestyle_hunter
+	trait = logistician
+	trait = beauty_good_3
+	2520.4.19 = {
+		birth = yes
+	}
+	2600.1.1 = {
+		death = yes
+	}
 }

N3OW/history/provinces/e_italy.txt

@@ -151,120 +151,108 @@
 	}
 }
 
-#k_sardinia
+#k_sardinia_and_corsica ###########################
-##d_corsica
+##d_sardinia_it ###################################
-###c_ajaccio
+###c_cagliari_it
-2650 = {
+2653 = {	# Cagliari
-	culture = corsican
-	religion = sevillian
-	holding = castle_holding
-}
-2652 = {
-	culture = sardinian
-	religion = sevillian
-	holding = castle_holding
-}
-2651 = {
-	holding = city_holding
-}
-###c_bastia
-2647 = {
-	culture = corsican
-	religion = sevillian
-	holding = castle_holding
-}
-2648 = {
-	holding = none
-}
-2649 = {
-	holding = city_holding
-}
-##d_sardinia
-###c_cagliari
-2653 = {
 	culture = sardinian
 	religion = orthodox
 	holding = castle_holding
-	1060.1.1 = {
-	religion = roman_catholic
-	}
 	1066.1.1 = {
-	buildings = {
+		buildings = {
-	common_tradeport_01
+			common_tradeport_01
-	curtain_walls_01
+			curtain_walls_01
-	}
+		}
 	}
 }
-2654 = {
+2654 = {	# Carbonia
-	culture = sardinian
-	religion = orthodox
-	holding = castle_holding
-	special_building_slot = argentiera_mines_01
-	1000.1.1 = {
-	special_building = argentiera_mines_01
-	}
-}
-2660 = {
-	holding = none
-}
-2655 = {
-	holding = none
-}
-###c_arborea
-2659 = {
-	culture = sardinian
-	religion = orthodox
-	holding = castle_holding
-	1060.1.1 = {
-	religion = roman_catholic
-	}
-}
-2661 = {
-	holding = none
-}
-###c_logudoro
-2662 = {
-	culture = sardinian
-	religion = orthodox
-	holding = castle_holding
-	1060.1.1 = {
-	religion = roman_catholic
-	}
-}
-2665 = {
-	holding = none
-	1102.1.1 = {
-	holding = city_holding
-	}
-}
-2664 = {
 	holding = city_holding
 }
-2663 = {
+2655 = {	# Iglesias
+	holding = church_holding
+}
+2656 = {	# Dolianova
 	holding = none
 }
-2658 = {
+2657 = {	# Muravera
+	holding = none
+}
+###c_oristano
+2658 = {	# Oristano
 	culture = sardinian
 	religion = orthodox
 	holding = castle_holding
-	1060.1.1 = {
-	religion = roman_catholic
-	}
 }
-###c_tortoli
+2659 = {	# Terralba
-2656 = {
+	holding = church_holding
+}
+2660 = {	# Bosa
+	holding = none
+}
+###c_nuoro
+2661 = {	# Nuoro
 	culture = sardinian
 	religion = orthodox
 	holding = castle_holding
-	1060.1.1 = {
-	religion = roman_catholic
-	}
 }
-2657 = {
+2662 = {	# Siniscola
-	holding = none
-	1000.1.1 = {
 	holding = city_holding
-	}
+}
+2663 = {	# Tortolì
+	holding = church_holding
+}
+2664 = {	# Macomer
+	holding = none
+}
+###c_sassari
+2665 = {	# Sassari
+	culture = sardinian
+	religion = orthodox
+	holding = castle_holding
+}
+13270 = {	# Olbia
+	holding = city_holding
+}
+13271 = {	# Alghero
+	holding = church_holding
+}
+13272 = {	# Arzachena
+	holding = none
+}
+13273 = {	# Ozieri
+	holding = none
+}
+
+##d_corsica_fr ###################################
+###c_southern_corsica
+1217 = {	# Ajaccio
+	culture = corsican
+	religion = sevillian
+	holding = castle_holding
+}
+1218 = {	# Porto-Vecchio
+	holding = city_holding
+}
+1219 = {	# Sartène
+	holding = church_holding
+}
+1220 = {	# Bonifacio
+	holding = none
+}
+###c_upper_corsica
+1221 = {	# Bastia
+	culture = corsican
+	religion = sevillian
+	holding = castle_holding
+}
+1222 = {	# Corte
+	holding = church_holding
+}
+1223 = {	# Calvi
+	holding = city_holding
+}
+1224 = {	# Ghisonaccia
+	holding = none
 }
 
 #k_romagna

N3OW/history/titles/k_aquitaine.txt

@@ -154,7 +154,8 @@ c_marsan = {
 	}
 }
 c_bearn = {
-	2550.1.1 = {
+	2551.1.1 = {
-		holder = hispania0008
+		holder = france_belasko_agurto
+		liege = k_navarra
 	}
 }

N3OW/history/titles/k_castille.txt

@@ -14,22 +14,28 @@ d_la_mancha = {
 	}
 }
 
-d_badajoz = {
-	2550.1.1 = {
-		holder = hispania0003
-	}
-}
-
 d_leon = {
 	2550.1.1 = {
 		holder = castille_fernando_bourbon
 		liege = k_castille_leon
 	}
 }
+c_salamanca = {
+	2550.1.1 = {
+		holder = castille_marina_alagon
+		liege = d_leon
+	}
+}
+c_zamora = {
+	2550.1.1 = {
+		holder = castille_luis_quiroga
+		liege = d_leon
+	}
+}
 c_valladolid = {
 	2550.1.1 = {
-		holder = castille_fernando_bourbon
+		holder = castille_gerardo_castellon
-		liege = k_castille_leon
+		liege = d_leon
 	}
 }
 
@@ -47,7 +53,7 @@ c_cuellar = {
 }
 c_soria = {
 	2550.1.1 = {
-		holder = castille_pedro_adgaz
+		holder = castille_cristina_ceballos
 		liege = k_castille_leon
 	}
 }
@@ -63,4 +69,34 @@ c_amaya = {
 		holder = castille_suero_alonso
 		liege = k_castille_leon
 	}
+}
+c_malagon = {
+	2550.1.1 = {
+		holder = castille_velasco_puente
+		liege = k_castille_leon
+	}
+}
+c_cuenca = {
+	2550.1.1 = {
+		holder = castille_garcia_navalucillos
+		liege = k_castille_leon
+	}
+}
+
+d_badajoz = {
+	2550.1.1 = {
+		holder = hispania0003
+	}
+}
+c_caceres = {
+	2550.1.1 = {
+		holder = castille_arias_aracena
+		liege = d_badajoz
+	}
+}
+c_plasencia = {
+	2550.1.1 = {
+		holder = castille_mencia_martin
+		liege = d_badajoz
+	}
 }

N3OW/history/titles/k_portugal.txt

@@ -57,4 +57,10 @@ c_viseu = {
 		holder = portugal_garcia_alvarenga
 		liege = k_portugal
 	}
+}
+c_castelo_branco = {
+	2550.1.1 = {
+		holder = portugal_catarina_tavora
+		liege = k_portugal
+	}
 }

N3OW/history/titles/k_sardinia_and_corsica.txt

@@ -1,4 +1,4 @@
-k_sardinia = {
+k_sardinia_and_corsica = {
 	2505.1.1 = {
 		change_development_level = 7
 	}

N3OW/history/titles/k_spanish_galicia.txt

@@ -9,7 +9,12 @@ k_spanish_galicia = {
 		holder = hispania0004
 	}
 }
-
+c_monterrei = {
+	2550.1.1 = {
+		holder = s_galicia_mumadona_ourense
+		liege = k_spanish_galicia
+	}
+}
 c_pravia = {
 	2550.1.1 = {
 		holder = s_galicia_sanchu_melendez

N3OW/localization/english/replace/culture/zz_NEOW_culture_history_l_english.yml

@@ -1,3 +1,3 @@
 l_english:
  kuhjung_military_heritage_loc:0 "Formed from the rallying of the United States European Command after the [Concept('neow_the_event','Event')|E]."
- easlander_exodus_heritage_loc:0 "Formed from [CULTURE.GetName] after persuction and internal conflicts in Britain."
+ easlander_exodus_heritage_loc:0 "Formed from [CULTURE.GetName] after persecution and internal conflicts in Britain."

N3OW/localization/english/replace/dynasties/zz_NEOW_dynasty_names_l_english.yml

@@ -320,19 +320,30 @@
  dynn_mateu:0 "Mateu"
  dynn_lapeyre:0 "Lapeyre"
  dynn_quixano:0 "Quixano"
- dynn_teruel_moctezuma:0 "Teruel-Moctezuma"
+ dynn_teruel_moctezuma:0 "Moctezuma-Tultengo"
  dynn_borja:0 "Borja"
  dynn_boatswain:0 "Boatswain"
  dynn_figueroa:0 "Figueroa"
  dynn_ribera:0 "Ribera"
  dynn_adgaz:0 "Adgaz"
  dynn_alonso:0 "Alonso"
+ dynn_puente:0 "Puente"
+ dynn_navalucillos:0 "Los Navalucillos"
+ dynn_castellon:0 "Castellon"
+ dynn_alagon:0 "Alagón"
+ dynn_quiroga:0 "Quiroga"
+ dynn_ceballos:0 "Ceballos"
+ dynn_aracena:0 "Aracena"
+ dynn_martin:0 "Martin"
+ dynn_ourense:0 "Ourense"
+ dynn_agurto:0 "Agurto"
  dynn_melendez:0 "Meléndez"
  dynn_estevez:0 "Estévez"
  dynn_coimbra:0 "Coimbra"
  dynn_fogaca:0 "Fogaça"
  dynn_alvarenga:0 "Alvarenga"
  dynn_aboim:0 "Aboim"
+ dynn_tavora:0 "Távora"
  dynn_torre:0 "de la Torre"
  dynn_santibanez:0 "Santibáñez"
  dynn_almonte:0 "Almonte"

N3OW/localization/english/titles_cultural_names_l_english.yml

@@ -1701,14 +1701,70 @@
  cn_erivan_adj:0 "Erivani"
  
  #Italy
+ cn_ravenna:0 "Ravenna"
+ cn_ravenna_adj:0 "Ravennan"
  cn_sardenya_i_corsega:0 "Sardenya i Còrsega"
  cn_sardenya_i_corsega_adj:0 "Corso-Sardenyian"
  cn_sardhnia_kai_thn_korsikn:1 "Sardinia kai Korsiki"
  cn_sardhnia_kai_thn_korsikn_adj:1 "Korso-Sardinian"
  cn_sardegna_e_corsica:0 "Sardegna e Corsica"
  cn_sardegna_e_corsica_adj:0 "Corso-Sardegni"
- cn_ravenna:0 "Ravenna"
+ cn_corse_sardaigne:0 "Corse-Sardaigne"
- cn_ravenna_adj:0 "Ravennan"
+ cn_corsica_e_grv_sardegna:0 "Corsica è Sardegna"
+ cn_sardenya:0 "Sardenya"
+ cn_sardegna:0 "Sardegna"
+ cn_sardigna:0 "Sardigna"
+ cn_sardaigne:0 "Sardaigne"
+ cn_c_a_grv_ller:0 "Càller"
+ cn_c_a_grv_gliari:0 "Càgliari"
+ cn_casteddu:0 "Casteddu"
+ cn_carb_o_grv_nia:0 "Carbònia"
+ cn_esgl_e_act_sies:0 "Esglésies"
+ cn_igr_e_grv_sias:0 "Igrèsias"
+ cn_patiolla:0 "Patiolla"
+ cn_murera:0 "Murera"
+ cn_nuaru:0 "Nuaru"
+ cn_n_u_grv_goro:0 "Nùgoro"
+ cn_thiniscole:0 "Thiniscole"
+ cn_tortol_i_act_:0 "Tortolí"
+ cn_macumere:0 "Macumere"
+ cn_oristany:0 "Oristany"
+ cn_aristanis:0 "Aristanis"
+ cn_terraba:0 "Terraba"
+ cn_s_a_grv_sser:0 "Sàsser"
+ cn_t_a_grv_tari:0 "Tàtari"
+ cn__o_grv_lbia:0 "Òlbia"
+ cn_terranoa:0 "Terranoa"
+ cn_s_pst_aligh_e_grv_ra:0 "S'Alighèra"
+ cn_l_pst_alguer:0 "L'Alguer"
+ cn_altzagh_e_grv_na:0 "Altzaghèna"
+ cn_alzachena:0 "Alzachena"
+ cn_ocier:0 "Ocier"
+ cn_otieri:0 "Otieri"
+ cn_corse:0 "Corse"
+ cn_corse_du_sud:0 "Corse-du-Sud"
+ cn_c_o_grv_rsega:0 "Còrsega"
+ cn_alta_c_o_grv_rsega:0 "Alta Còrsega"
+ cn_c_o_grv_rsega_del_sud:0 "Còrsega del Sud"
+ cn_corsica_del_sud:0 "Corsica del Sud"
+ cn_alta_corsica:0 "Alta Corsica"
+ cn_c_o_grv_ssiga:0 "Còssiga"
+ cn_c_o_grv_ssiga_arta:0 "Còssiga Arta"
+ cn_c_o_grv_ssiga_de_su_sud:0 "Còssiga de su Sud"
+ cn_pumonti:0 "Pumonti"
+ cn_haute_corse:0 "Haute-Corse"
+ cn_cismonte:0 "Cismonte"
+ cn_aiacciu:0 "Aiacciu"
+ cn_port_vell:0 "Port Vell"
+ cn_portivechju:0 "Portivechju"
+ cn_sart_e_grv_:0 "Sartè"
+ cn_sartena:0 "Sartena"
+ cn_ajacciu:0 "Ajacciu"
+ cn_bunifaziu:0 "Bunifaziu"
+ cn_bonif_a_grv_tziu:0 "Bonifàtziu"
+ cn_bast_i_grv_a:0 "Bastìa"
+ cn_corti:0 "Corti"
+ cn_ghisunaccia:0 "Ghisunaccia"
  
  #Estonia & closeby
  cn_reval:0 "Reval"

N3OW/localization/english/titles_l_english.yml

@@ -349,7 +349,6 @@
  b_aivarmalai:0 "Aivarmalai"
  b_aix:0 "Aix"
  b_aj_bogd:0 "Aj Bogd"
- b_ajaccio:0 "Ajaccio"
  b_ajadabiya:0 "Ajadabiya"
  b_ajaigarh:0 "Ajaigarh"
  b_ajayameru:0 "Ajayameru"
@@ -500,7 +499,6 @@
  b_algaida:0 "Algaida"
  b_algeciras:0 "Fuengirola"
  b_alghazalah:0 "Al-Ghazalah"
- b_alghero:0 "Alghero"
  b_alghiran:0 "Al Ghiran"
  b_algiers:0 "Algiers"
  b_algutsrum:0 "Algutsrum"
@@ -824,7 +822,6 @@
  b_ardakan:0 "Ardakan"
  b_ardakhivah:0 "Ardakhivah"
  b_ardalankath:0 "Ardalankath"
- b_ardara:0 "Ardara"
  b_ardatovo:0 "Ardatovo"
  b_ardchattan:0 "Ardchattan"
  b_ardda:1 "Árðardalr"
@@ -1359,7 +1356,6 @@
  b_bassein:0 "Bassein"
  b_bastak:0 "Bastak"
  b_bastam:0 "Bastam"
- b_bastia:0 "Bastia"
  b_bastogne:0 "Wiltz"
  b_baszmacka:0 "Baszmacka"
  b_bata:0 "Bata"
@@ -1750,7 +1746,6 @@
  b_bonaguil:0 "Bonaguil"
  b_bondeno:0 "Bondeno"
  b_bonga:0 "Bonga"
- b_bonifacio:0 "Bonifacio"
  b_bonjar:0 "Bonjar"
  b_bonn:0 "Bonn"
  b_bonneval:0 "Bonneval"
@@ -2036,7 +2031,6 @@
  b_caetani:0 "Caetani"
  b_caffa:0 "Caffa"
  b_cagli:0 "Cagli"
- b_cagliari:0 "Cagliari"
  b_cahir:0 "Cahir"
  b_cahors:0 "Cahors"
  b_cahul:0 "Cahul"
@@ -2066,7 +2060,6 @@
  b_caltagirone:0 "Caltagirone"
  b_caltanisetta:1 "Caltanissetta"
  b_caltavuturo:0 "Caltavuturo"
- b_calvi:0 "Calvi"
  b_calw:0 "Calw"
  b_camachus:0 "Camachus"
  b_camaldoli:0 "Camaldoli"
@@ -2115,7 +2108,6 @@
  b_caravacadelacruz:0 "Caravaca de la Cruz"
  b_carbajosadelasagrada:0 "Carbajosa de la Sagrada"
  b_carballido:0 "Ponferrada"
- b_carbonara:0 "Carbonara"
  b_carbonia:0 "Carbonia"
  b_carcassonne:0 "Carcassonne"
  b_carcastillo:0 "Carcastillo"
@@ -2566,7 +2558,6 @@
  b_cornouailles:0 "Guingamp"
  b_coron:0 "Coron"
  b_corrales:0 "Corrales"
- b_corte:0 "Corte"
  b_cortegana:0 "Cortegana"
  b_cortona:0 "Cortona"
  b_corunna:0 "A Corunnã"
@@ -3641,7 +3632,6 @@
  b_gallardon:0 "Gallardon"
  b_gallipoli:0 "Gallipoli"
  b_gallivare:0 "Gällivare"
- b_galtelli:0 "Galtelli"
  b_galway:0 "Galway"
  b_gamakh:0 "Gamakh"
  b_gamar:0 "Gamar"
@@ -4449,7 +4439,6 @@
  b_igilliz:0 "Igilliz"
  b_igiradyatuf:0 "Igiradyatuf"
  b_iglau:0 "Iglau"
- b_iglesias:0 "Iglesias"
  b_igoumenitsa:0 "Igoumenitsa"
  b_igrim:0 "Igrim"
  b_igualada:0 "Igualada"
@@ -4541,7 +4530,6 @@
  b_ishtikhan:0 "Ishtikhan"
  b_ishtikhon:0 "Ishtikhon"
  b_ishwaripur:0 "Ishwaripur"
- b_isili:0 "Isili"
  b_isilkul:0 "Isilkul"
  b_iskandariya:0 "Iskandriya"
  b_iskar:0 "Iskar"
@@ -7504,7 +7492,6 @@
  b_okulovsky:0 "Okulovsky"
  b_olavinlinna:0 "Olavinlinna"
  b_olawa:0 "Olawa"
- b_olbia:0 "Olbia"
  b_oldenburg:0 "Oldenburg"
  b_olesnica:0 "Oleśnica"
  b_olesnica_MPL:0 "Oleśnica"
@@ -7565,7 +7552,6 @@
  b_oriana:0 "Oriana"
  b_orihuela:0 "Orihuela"
  b_orisaare:0 "Orisaare"
- b_oristano:0 "Oristano"
  b_orkdala:1 "Orkland"
  b_orkistos:0 "Orkistos"
  b_orlamunde:0 "Orlamünde"
@@ -8022,7 +8008,6 @@
  b_portella:0 "Portella"
  b_portevecchio:0 "Portevecchio"
  b_porto:0 "Porto"
- b_porto_torres:0 "Porto Torres"
  b_portoferraio:0 "Portoferraio"
  b_portoguaro:0 "Portoguaro"
  b_portotorres:0 "Porto Torres"
@@ -8781,7 +8766,6 @@
  b_samarkand:0 "Samarkand"
  b_samarqand:0 "Samarqand"
  b_samarra:0 "Samarra"
- b_samassi:0 "Samassi"
  b_samawah:0 "Samavah"
  b_sambalpur:0 "Sambalpur"
  b_sambhal:0 "Sambhal"
@@ -8934,7 +8918,6 @@
  b_sarria:0 "Astorga"
  b_sarsink:0 "Sarsink"
  b_sarskoyegorodishche:0 "Sarskoye Gorodishche"
- b_sartene:0 "Sartène"
  b_sarthe:1 "Mamers"
  b_sarum:0 "Sarum"
  b_sarvantikar:0 "Sarvantikar"
@@ -8953,7 +8936,6 @@
  b_sasd:0 "Sásd"
  b_sason:0 "Sason"
  b_sasovo:0 "Sasovo"
- b_sassari:0 "Sassari"
  b_sassuolo:0 "Sassuolo"
  b_satala:0 "Satala"
  b_satara:0 "Satara"
@@ -10308,7 +10290,6 @@
  b_torshavn:1 "Þórshöfn"
  b_torshiz:0 "Torshiz"
  b_torskhali:0 "Torskhali"
- b_tortoli:0 "Tortoli"
  b_tortona:0 "Tortona"
  b_tortosa:0 "Tortosa"
  b_tortum:0 "Tortum"
@@ -10773,7 +10754,6 @@
  b_vaudemont:1 "Saint-Dié-des-Vosges"
  b_vavuniya:0 "Vavuniya"
  b_vaxjo:0 "Växjö"
- b_vecchio:0 "Vecchio"
  b_vechta:0 "Vechta"
  b_vedasuvar:0 "Veda Suvar"
  b_vedbo:0 "Vedbo"
@@ -11541,8 +11521,6 @@
  c_aintab_adj:0 "Aintabian"
  c_aj_bogd:0 "Aj Bogd"
  c_aj_bogd_adj:0 "Aj Bogdi"
- c_ajaccio:0 "Ajaccio"
- c_ajaccio_adj:0 "Ajaccian"
  c_ajayameru:0 "Ajayameru"
  c_ajayameru_adj:0 "Ajayameru"
  c_akershus:0 "Akershus"
@@ -11715,8 +11693,6 @@
  c_araouane_adj:0 "Araouanean"
  c_arbanon:0 "Arbanon"
  c_arbanon_adj:0 "Arbanoni"
- c_arborea:0 "Arborea"
- c_arborea_adj:0 "Arborean"
  c_archa:0 "Archa"
  c_archa_adj:0 "Archan"
  c_ardabil:0 "Ardabil"
@@ -11899,8 +11875,6 @@
  c_bashkirs_adj:0 "Bashkir"
  c_basra:0 "Basra"
  c_basra_adj:0 "Basran"
- c_bastia:0 "Bastia"
- c_bastia_adj:0 "Bastian"
  c_batticaloa:0 "Batticaloa"
  c_bayda:0 "Bayda"
  c_bayda_adj:0 "Baydanian"
@@ -12126,8 +12100,6 @@
  c_cadiz:0 "Cádiz"
  c_cadiz_adj:0 "Cádizian"
  c_caernarfonshire:2 "Gwynedd"
- c_cagliari:0 "Cagliari"
- c_cagliari_adj:0 "Cagliarian"
  c_cairo:0 "Cairo"
  c_cairo_adj:0 "Cairene"
  c_caithness:0 "Caithness"
@@ -13370,8 +13342,6 @@
  c_lleida_adj:0 "Lleidan"
  c_lobdaburg:0 "Lobdaburg"
  c_lobdaburg_adj:0 "Lobdaburger"
- c_logudoro:0 "Logudoro"
- c_logudoro_adj:0 "Logudorean"
  c_lolland_falster:0 "Lolland-Falster"
  c_lolland_falster_adj:0 "Lolland-Falsterian"
  c_lombardia:0 "Lombardia"
@@ -14721,8 +14691,6 @@
  c_torki_adj:0 "Torkian"
  c_toropets:0 "Toropets"
  c_toropets_adj:0 "Toropetsian"
- c_tortoli:0 "Tortoli"
- c_tortoli_adj:0 "Tortolian"
  c_tortona:0 "Tortona"
  c_tortona_adj:0 "Tortonan"
  c_tortosa:0 "Tortosa"
@@ -15433,8 +15401,6 @@
  d_cordoba_adj:0 "Córdoban"
  d_cornwall:0 "Cornwall"
  d_cornwall_adj:0 "Cornish"
- d_corsica:0 "Corsica"
- d_corsica_adj:0 "Corsican"
  d_courland:0 "Courland"
  d_courland_adj:0 "Courlander"
  d_crimea:0 "Crimea"
@@ -16098,8 +16064,6 @@
  d_sandomiersk_adj:0 "Sandomierskan"
  d_sapmi:0 "Lapland"
  d_sapmi_adj:0 "Lappish"
- d_sardinia:0 "Sardinia"
- d_sardinia_adj:0 "Sardinian"
  d_sarkel:0 "Sarkel"
  d_sarkel_adj:0 "Sarkelian"
  d_saryupara:0 "Saryupara"
@@ -16646,8 +16610,8 @@
  k_brittany_adj:0 "Breton"
  k_bulgaria:0 "Bulgaria"
  k_bulgaria_adj:0 "Bulgarian"
- k_burgundy:0 "Rhonie"
+ k_burgundy:0 "Rhodania"
- k_burgundy_adj:0 "Rhodanien"
+ k_burgundy_adj:0 "Rhodanian"
  k_byzantium:0 "Greece"
  k_byzantium_adj:0 "Greek"
  k_byzantium_pre:0 "Greco"
@@ -16874,8 +16838,6 @@
  k_rus_pre:0 "Russo"
  k_ruthenia:0 "Ruthenia"
  k_ruthenia_adj:0 "Ruthenian"
- k_sardinia:0 "Sardinia"
- k_sardinia_adj:0 "Sardinian"
  k_sapmi:0 "Sápmi"
  k_sapmi_adj:0 "Sami"
  k_saruhan:0 "Saruhan"
@@ -24918,6 +24880,49 @@
  c_giepma_adj:0 "Giepman"
  c_roavvenjarga:0 "Roavvenjárga"
  c_roavvenjarga_adj:0 "Roavvenjárgan"
+ k_sardinia_and_corsica:0 "Sardinia and Corsica"
+ k_sardinia_and_corsica_adj:0 "Sardinian-Corsican"
+ d_sardinia_it:0 "Sardinia"
+ d_sardinia_it_adj:0 "Sardinian"
+ c_cagliari_it:0 "Cagliari"
+ c_cagliari_it_adj:0 "Cagliaritan"
+ b_cagliari:0 "Cagliari"
+ b_carbonia:0 "Carbonia"
+ b_iglesias:0 "Iglesias"
+ b_dolianova:0 "Dolianova"
+ b_muravera:0 "Muravera
+ c_nuoro:0 "Nuoro"
+ c_nuoro_adj:0 "Nuorese""
+ b_nuoro:0 "Nuoro"
+ b_siniscola:0 "Siniscola"
+ b_tortoli:0 "Tortolì"
+ b_macomer:0 "Macomer"
+ c_oristano:0 "Oristano"
+ c_oristano_adj:0 "Oristanese"
+ b_oristano:0 "Oristano"
+ b_terralba:0 "Terralba"
+ b_bosa:0 "Bosa"
+ c_sassari:0 "Sassari"
+ c_sassari_adj:0 "Sassarese"
+ b_sassari:0 "Sassari"
+ b_olbia:0 "Olbia"
+ b_alghero:0 "Alghero"
+ b_arzachena:0 "Arzachena"
+ b_ozieri:0 "Ozieri"
+ d_corsica_fr:0 "Corsica"
+ d_corsica_fr_adj:0 "Corsican"
+ c_southern_corsica:0 "Southern Corsica"
+ c_southern_corsica_adj:0 "Southern Corsican"
+ b_porto_vecchio:0 "Porto-Vecchio"
+ b_ajaccio:0 "Ajaccio"
+ b_sartene:0 "Sartène"
+ b_bonifacio:0 "Bonifacio"
+ c_upper_corsica:0 "Upper Corsica"
+ c_upper_corsica_adj:0 "Upper Corsican"
+ b_bastia:0 "Bastia"
+ b_corte:0 "Corte"
+ b_calvi:0 "Calvi"
+ b_ghisonaccia:0 "Ghisonaccia"
 
 
  ##NEOW special titles

N3OW/map_data/adjacencies.csv

@@ -43,7 +43,7 @@ From;To;Type;Through;start_x;start_y;stop_x;stop_y;Comment
 2497;2530;river_large;3244;1549;2744;-1;-1;Mantua-Guastalla
 2525;2527;river_large;3243;1610;2737;-1;-1;Rovigo-Ferrara
 2627;2633;sea;8653;1864;2218;1855;2213;Reggio-Messina
-2652;2658;sea;8637;1477;2460;1482;2451;Bonifacio-Olbia
+2650;13272;sea;8637;1477;2460;1482;2451;Bonifacio-Arzachena
 #SCANDINAVIA
 55;81;sea;1001;1518;3690;1517;3680;Lindholm-Aalborg
 227;228;sea;999;1510;3577;1514;3573;Taulov-Middelfart

N3OW/map_data/definition.csv

@@ -2645,25 +2645,44 @@
 2644;170;51;22;MAZARA;x
 2645;2;54;150;CALATAFIMI;x
 2646;44;57;23;MALTA;x
-2647;86;60;151;BASTIA;x
+#2647;86;60;151;BASTIA;x
-2648;128;63;24;CORTE;x
+#2648;128;63;24;CORTE;x
-2649;170;66;152;CALVI;x
+#2649;170;66;152;CALVI;x
-2650;2;69;25;AJACCIO;x
+#2650;2;69;25;AJACCIO;x
-2651;44;72;153;VECCHIO;x
+#2651;44;72;153;VECCHIO;x
-2652;86;75;26;BONIFACIO;x
+#2652;86;75;26;BONIFACIO;x;
-2653;128;78;154;CAGLIARI;x
+2647;11;102;11;AJACCIO;x;
-2654;170;81;27;IGLESIAS;x
+2648;85;110;85;PORTO-VECCHIO;x;
-2655;2;84;155;CARBONARA;x
+2649;17;117;17;SARTENE;x;
-2656;44;87;28;TORTOLI;x
+2650;33;181;33;BONIFACIO;x;
-2657;86;90;156;GALTELLI;x
+2651;14;119;14;BASTIA;x;
-2658;128;93;29;OLBIA;x
+2652;11;82;11;CORTE;x;
-2659;170;96;157;ORISTANO;x
+#2653;128;78;154;CAGLIARI;x
-2660;2;99;30;SAMASSI;x
+#2654;170;81;27;IGLESIAS;x
-2661;44;102;158;ISILI;x
+#2655;2;84;155;CARBONARA;x
-2662;86;105;31;SASSARI;x
+#2656;44;87;28;TORTOLI;x
-2663;128;108;159;ARDARA;x
+#2657;86;90;156;GALTELLI;x
-2664;170;111;32;PORTO TORRES;x
+#2658;128;93;29;OLBIA;x
-2665;2;114;160;ALGHERO;x
+#2659;170;96;157;ORISTANO;x
+#2660;2;99;30;SAMASSI;x
+#2661;44;102;158;ISILI;x
+#2662;86;105;31;SASSARI;x
+#2663;128;108;159;ARDARA;x
+#2664;170;111;32;PORTO TORRES;x
+#2665;2;114;160;ALGHERO;x
+2653;17;115;17;CAGLIARI;x;
+2654;71;158;71;CARBONIA;x;
+2655;29;127;29;IGLESIAS;x;
+2656;135;193;135;DOLIANOVA;x;
+2657;26;201;26;MURAVERA;x;
+2658;26;161;26;ORISTANO;x;
+2659;110;177;110;TERRALBA;x;
+2660;55;187;55;BOSA;x;
+2661;4;75;4;NUORO;x;
+2662;98;129;98;SINISCOLA;x;
+2663;55;215;55;TORTOLI;x;
+2664;149;166;149;MACOMER;x;
+2665;74;228;74;SASSARI;x;
 2666;44;117;33;MONTAGNANA;x
 2667;86;120;161;PERSIAN IMPASSABLE;x
 2668;128;123;34;PERSIAN IMPASSABLE;x
@@ -13268,12 +13287,12 @@
 13267;136;88;106;;x;
 13268;159;111;3;;x;
 13269;107;147;212;;x;
-#13270;43;32;232;;x;
+13270;67;165;67;OLBIA;x;
-#13271;44;32;236;;x;
+13271;20;88;20;ALGHERO;x;
-#13272;45;32;240;;x;
+13272;5;73;5;ARZACHENA;x;
-#13273;46;32;244;;x;
+13273;2;103;2;OZIERI;x;
-#13274;47;32;248;;x;
+13274;88;147;88;CALVI;x;
-#13275;48;32;232;;x;
+13275;13;192;13;GHISONACCIA;x;
 #13276;49;32;236;;x;
 #13277;50;32;240;;x;
 #13278;51;32;244;;x;

N3OW/map_data/provinces.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ac021f004775b191f29cda84aebce324abad97d9d2a7171921e5d37ce0df7a2
+oid sha256:581c455f6776159130ec957896e80c9bd5200880131de93210ef2ee736e486a7
-size 3428867
+size 2604511