Merge remote-tracking branch 'origin/main'

N3OW/common/culture/cultures/00_goidelic.txt

@@ -118,3 +118,34 @@ manx = {
 		30 = caucasian_dark_hair
 	}
 }
+
+atlantannach = { #atlantic irish dispora post-event
+	color = { 45 160 80 }
+	
+	ethos = ethos_egalitarian
+	heritage = heritage_goidelic
+	language = language_anglo_irish
+	martial_custom = martial_custom_equal
+	traditions = {
+		tradition_seafaring
+		tradition_adaptive_skirmishing
+		tradition_festivities
+		tradition_swords_for_hire
+		tradition_diasporic
+	}
+	
+	name_list = name_list_neow_goidelic
+	
+	coa_gfx = { irish_coa_gfx western_coa_gfx }
+	building_gfx = { iberian_building_gfx }
+	clothing_gfx = { iberian_christian_clothing_gfx western_clothing_gfx }
+	unit_gfx = { iberian_christian_unit_gfx }
+	
+	ethnicities = {
+		15 = caucasian_ginger
+		25 = caucasian_brown_hair
+		15 = caucasian_dark_hair
+		30 = mediterranean
+		15 = arab
+	}
+}

N3OW/common/culture/cultures/NEOW_anglo_frisian.txt

@@ -205,6 +205,37 @@ norner = {
 		30 = caucasian_dark_hair
 	}
 }
+
+llanito = {
+	color = { 0.8 0.95 0.15 }
+
+	ethos = ethos_bellicose
+	heritage = heritage_hispanic
+	language = language_english
+	martial_custom = martial_custom_equal
+	traditions = {
+		tradition_castle_keepers
+		tradition_maritime_mercantilism
+		tradition_seafaring
+		tradition_mountain_homes
+	}
+	
+	name_list = name_list_english
+	
+	coa_gfx = { english_coa_gfx western_coa_gfx }
+	building_gfx = { iberian_building_gfx }
+	clothing_gfx = { western_clothing_gfx }
+	unit_gfx = { western_unit_gfx }
+	
+	ethnicities = {
+		10 = caucasian_blond
+		10 = caucasian_ginger
+		10 = caucasian_brown_hair
+		10 = caucasian_dark_hair
+		60 = mediterranean
+	}
+}
+
 english = {
 	color = english
 	created = 1070.1.1

N3OW/common/dna_data/NEOW_dna.txt

@@ -342,6 +342,121 @@ dna_arthur_crowtemple_i={ #Credit to user vnth93
 	enabled=yes
 }
 
+dna_conde_quixano={
+	portrait_info = {
+		genes={ 		
+			hair_color={ 176 225 176 225 }
+			skin_color={ 140 71 136 117 }
+			eye_color={ 94 183 127 203 }
+			gene_chin_forward={ "chin_forward_neg" 122 "chin_forward_neg" 122 }
+			gene_chin_height={ "chin_height_pos" 128 "chin_height_pos" 140 }
+			gene_chin_width={ "chin_width_pos" 138 "chin_width_pos" 139 }
+			gene_eye_angle={ "eye_angle_neg" 134 "eye_angle_neg" 127 }
+			gene_eye_depth={ "eye_depth_pos" 147 "eye_depth_pos" 133 }
+			gene_eye_height={ "eye_height_pos" 96 "eye_height_pos" 135 }
+			gene_eye_distance={ "eye_distance_pos" 134 "eye_distance_pos" 134 }
+			gene_eye_shut={ "eye_shut_pos" 130 "eye_shut_pos" 139 }
+			gene_forehead_angle={ "forehead_angle_pos" 141 "forehead_angle_pos" 166 }
+			gene_forehead_brow_height={ "forehead_brow_height_pos" 106 "forehead_brow_height_pos" 173 }
+			gene_forehead_roundness={ "forehead_roundness_pos" 148 "forehead_roundness_pos" 132 }
+			gene_forehead_width={ "forehead_width_pos" 149 "forehead_width_pos" 149 }
+			gene_forehead_height={ "forehead_height_pos" 180 "forehead_height_pos" 229 }
+			gene_head_height={ "head_height_pos" 176 "head_height_pos" 175 }
+			gene_head_width={ "head_width_neg" 117 "head_width_neg" 126 }
+			gene_head_profile={ "head_profile_neg" 110 "head_profile_neg" 84 }
+			gene_head_top_height={ "head_top_height_pos" 121 "head_top_height_pos" 157 }
+			gene_head_top_width={ "head_top_width_pos" 142 "head_top_width_pos" 176 }
+			gene_jaw_angle={ "jaw_angle_pos" 94 "jaw_angle_pos" 135 }
+			gene_jaw_forward={ "jaw_forward_pos" 136 "jaw_forward_pos" 132 }
+			gene_jaw_height={ "jaw_height_neg" 120 "jaw_height_neg" 120 }
+			gene_jaw_width={ "jaw_width_pos" 104 "jaw_width_pos" 138 }
+			gene_mouth_corner_depth={ "mouth_corner_depth_neg" 126 "mouth_corner_depth_neg" 126 }
+			gene_mouth_corner_height={ "mouth_corner_height_pos" 132 "mouth_corner_height_pos" 132 }
+			gene_mouth_forward={ "mouth_forward_pos" 136 "mouth_forward_pos" 136 }
+			gene_mouth_height={ "mouth_height_pos" 142 "mouth_height_pos" 142 }
+			gene_mouth_width={ "mouth_width_neg" 118 "mouth_width_neg" 118 }
+			gene_mouth_upper_lip_size={ "mouth_upper_lip_size_neg" 113 "mouth_upper_lip_size_neg" 113 }
+			gene_mouth_lower_lip_size={ "mouth_lower_lip_size_pos" 127 "mouth_lower_lip_size_pos" 127 }
+			gene_mouth_open={ "mouth_open_neg" 57 "mouth_open_neg" 57 }
+			gene_neck_length={ "neck_length_pos" 115 "neck_length_pos" 146 }
+			gene_neck_width={ "neck_width_pos" 139 "neck_width_pos" 159 }
+			gene_bs_cheek_forward={ "cheek_forward_neg" 4 "cheek_forward_neg" 4 }
+			gene_bs_cheek_height={ "cheek_height_neg" 59 "cheek_height_pos" 55 }
+			gene_bs_cheek_width={ "cheek_width_neg" 183 "cheek_width_pos" 32 }
+			gene_bs_ear_angle={ "ear_angle_neg" 43 "ear_angle_pos" 22 }
+			gene_bs_ear_inner_shape={ "ear_inner_shape_pos" 7 "ear_inner_shape_pos" 23 }
+			gene_bs_ear_bend={ "ear_upper_bend_pos" 52 "ear_upper_bend_pos" 67 }
+			gene_bs_ear_outward={ "ear_outward_neg" 15 "ear_outward_pos" 4 }
+			gene_bs_ear_size={ "ear_size_neg" 39 "ear_size_pos" 117 }
+			gene_bs_eye_corner_depth={ "eye_corner_depth_pos" 137 "eye_corner_depth_pos" 170 }
+			gene_bs_eye_fold_shape={ "eye_fold_shape_neg" 55 "eye_fold_shape_neg" 23 }
+			gene_bs_eye_size={ "eye_size_pos" 1 "eye_size_pos" 47 }
+			gene_bs_eye_upper_lid_size={ "eye_upper_lid_size_neg" 39 "eye_upper_lid_size_pos" 19 }
+			gene_bs_forehead_brow_curve={ "forehead_brow_curve_neg" 187 "forehead_brow_curve_neg" 190 }
+			gene_bs_forehead_brow_forward={ "forehead_brow_forward_neg" 75 "forehead_brow_forward_pos" 24 }
+			gene_bs_forehead_brow_inner_height={ "forehead_brow_inner_height_neg" 31 "forehead_brow_inner_height_pos" 21 }
+			gene_bs_forehead_brow_outer_height={ "forehead_brow_outer_height_neg" 119 "forehead_brow_outer_height_neg" 49 }
+			gene_bs_forehead_brow_width={ "forehead_brow_width_neg" 95 "forehead_brow_width_pos" 4 }
+			gene_bs_jaw_def={ "jaw_def_neg" 43 "jaw_def_neg" 31 }
+			gene_bs_mouth_lower_lip_def={ "mouth_lower_lip_def_pos" 47 "mouth_lower_lip_def_pos" 43 }
+			gene_bs_mouth_lower_lip_full={ "mouth_lower_lip_full_neg" 49 "mouth_lower_lip_full_neg" 4 }
+			gene_bs_mouth_lower_lip_pad={ "mouth_lower_lip_pad_neg" 160 "mouth_lower_lip_pad_neg" 160 }
+			gene_bs_mouth_lower_lip_width={ "mouth_lower_lip_width_pos" 0 "mouth_lower_lip_width_neg" 0 }
+			gene_bs_mouth_philtrum_def={ "mouth_philtrum_def_pos" 10 "mouth_philtrum_def_pos" 10 }
+			gene_bs_mouth_philtrum_shape={ "mouth_philtrum_shape_pos" 46 "mouth_philtrum_shape_pos" 46 }
+			gene_bs_mouth_philtrum_width={ "mouth_philtrum_width_neg" 93 "mouth_philtrum_width_neg" 93 }
+			gene_bs_mouth_upper_lip_def={ "mouth_upper_lip_def_pos" 47 "mouth_upper_lip_def_pos" 47 }
+			gene_bs_mouth_upper_lip_full={ "mouth_upper_lip_full_pos" 31 "mouth_upper_lip_full_pos" 31 }
+			gene_bs_mouth_upper_lip_profile={ "mouth_upper_lip_profile_neg" 116 "mouth_upper_lip_profile_neg" 116 }
+			gene_bs_mouth_upper_lip_width={ "mouth_upper_lip_width_pos" 72 "mouth_upper_lip_width_pos" 72 }
+			gene_bs_nose_forward={ "nose_forward_neg" 33 "nose_forward_neg" 23 }
+			gene_bs_nose_height={ "nose_height_neg" 75 "nose_height_neg" 53 }
+			gene_bs_nose_length={ "nose_length_pos" 81 "nose_length_pos" 46 }
+			gene_bs_nose_nostril_height={ "nose_nostril_height_neg" 51 "nose_nostril_height_neg" 36 }
+			gene_bs_nose_nostril_width={ "nose_nostril_width_neg" 155 "nose_nostril_width_neg" 163 }
+			gene_bs_nose_profile={ "nose_profile_neg" 133 "nose_profile_pos" 29 }
+			gene_bs_nose_ridge_angle={ "nose_ridge_angle_pos" 131 "nose_ridge_angle_pos" 8 }
+			gene_bs_nose_ridge_width={ "nose_ridge_width_neg" 9 "nose_ridge_width_neg" 7 }
+			gene_bs_nose_size={ "nose_size_pos" 15 "nose_size_neg" 11 }
+			gene_bs_nose_tip_angle={ "nose_tip_angle_pos" 31 "nose_tip_angle_neg" 15 }
+			gene_bs_nose_tip_forward={ "nose_tip_forward_pos" 83 "nose_tip_forward_pos" 37 }
+			gene_bs_nose_tip_width={ "nose_tip_width_pos" 14 "nose_tip_width_pos" 14 }
+			face_detail_cheek_def={ "cheek_def_02" 98 "cheek_def_01" 20 }
+			face_detail_cheek_fat={ "cheek_fat_01_neg" 0 "cheek_fat_01_pos" 189 }
+			face_detail_chin_cleft={ "chin_dimple" 24 "chin_dimple" 24 }
+			face_detail_chin_def={ "chin_def_neg" 86 "chin_def_neg" 52 }
+			face_detail_eye_lower_lid_def={ "eye_lower_lid_def" 67 "eye_lower_lid_def" 33 }
+			face_detail_eye_socket={ "eye_socket_color_02" 99 "eye_socket_01" 25 }
+			face_detail_nasolabial={ "nasolabial_03" 128 "nasolabial_03" 142 }
+			face_detail_nose_ridge_def={ "nose_ridge_def_neg" 50 "nose_ridge_def_neg" 8 }
+			face_detail_nose_tip_def={ "nose_tip_def" 232 "nose_tip_def" 221 }
+			face_detail_temple_def={ "temple_def" 0 "temple_def" 209 }
+			expression_brow_wrinkles={ "brow_wrinkles_02" 212 "brow_wrinkles_02" 212 }
+			expression_eye_wrinkles={ "eye_wrinkles_01" 61 "eye_wrinkles_01" 61 }
+			expression_forehead_wrinkles={ "forehead_wrinkles_03" 249 "forehead_wrinkles_03" 249 }
+			expression_other={ "cheek_wrinkles_both_01" 0 "cheek_wrinkles_both_01" 0 }
+			complexion={ "complexion_6" 137 "complexion_1" 140 }
+			gene_height={ "normal_height" 124 "normal_height" 116 }
+			gene_bs_body_type={ "body_fat_head_fat_low" 140 "body_fat_head_fat_low" 140 }
+			gene_bs_body_shape={ "body_shape_triangle_full" 25 "body_shape_triangle_full" 0 }
+			gene_bs_bust={ "bust_clothes" 90 "bust_shape_3_full" 148 }
+			gene_age={ "old_2" 28 "old_2" 28 }
+			gene_eyebrows_shape={ "avg_spacing_high_thickness" 129 "avg_spacing_high_thickness" 140 }
+			gene_eyebrows_fullness={ "layer_2_avg_thickness" 156 "layer_2_low_thickness" 154 }
+			gene_body_hair={ "body_hair_sparse" 152 "body_hair_sparse" 152 }
+			gene_hair_type={ "hair_wavy" 181 "hair_wavy" 181 }
+			gene_baldness={ "male_pattern_baldness" 153 "male_pattern_baldness" 153 }
+			eye_accessory={ "normal_eyes" 190 "normal_eyes" 190 }
+			teeth_accessory={ "normal_teeth" 0 "normal_teeth" 0 }
+			eyelashes_accessory={ "normal_eyelashes" 158 "normal_eyelashes" 158 }
+			hairstyles={ "male_hair_western_09" 231 "all_hairstyles" 0 }
+			beards={ "fp2_beards_straight" 84 "no_beard" 0 }
+			clothes={ "male_beard_fp2_iberian_christian_02" 79 "most_clothes" 0 }
+		}
+	}
+	enabled=yes
+}
+
 dna_tereza = {
 	portrait_info={
 		type=female

N3OW/common/dynasties/NEOW_dynasties.txt

@@ -591,6 +591,11 @@ dorn_dynasty = {
 
 #e_hispania
 
+boatswain_dynasty = {
+	name = dynn_boatswain
+	culture = llanito
+}
+
 avril_dynasty = {
 	name = dynn_avril
 	culture = portugese
@@ -607,7 +612,22 @@ cortes_dynasty = {
 	culture = spanish
 }
 
-###The 3 Thez the Mighty Houses###
+quixano_dynasty = {
+	name = dynn_quixano
+	culture = spanish
+}
+
+teruel_moctezuma_dynasty = {
+	prefix = dynnp_de
+	name = dynn_teruel_moctezuma
+	culture = spanish
+}
+
+borja_dynasty = {
+	prefix = dynnp_de
+	name = dynn_borja
+	culture = spanish
+}
 
 dias_dynasty = {
 	name = dynn_dias

N3OW/common/landed_titles/iberia.txt

@@ -303,11 +303,6 @@ e_iberia = {
 					name_list_yemeni = cn_al_karas
 				}
 
-				b_ventadelmoro = { #Iniesta
-					province = 1950
-
-					color = { 0 100 35 }
-				}
 				b_huescar = { #Cotillas
 					province = 1973
 
@@ -786,6 +781,11 @@ e_iberia = {
 
 					color = { 155 145 15 }
 				}
+				b_siguenza = {
+					province = 1930
+
+					color = { 195 125 10 }
+				}
 			}
 			c_cuellar = {
 				color = { 255 245 10 }
@@ -812,6 +812,11 @@ e_iberia = {
 				b_cuellar = {
 					province = 1925
 
+					color = { 255 245 10 }
+				}
+				b_uceda = {
+					province = 1926
+
 					color = { 255 245 10 }
 				}
 			}
@@ -1065,14 +1070,14 @@ e_iberia = {
 						name_list_yemeni = cn_madinat_al_muluk
 					}
 				}
-				b_lapueblademontalban = {
-					province = 1962
-
-					color = { 195 165 10 }
-				}
 				b_maqueda = {
 					province = 1920
 
+					color = { 212 151 12 }
+				}
+				b_talavera = {
+					province = 1918
+
 					color = { 212 151 12 }
 				}
 			}
@@ -1085,10 +1090,20 @@ e_iberia = {
 
 					color = { 195 165 10 }
 				}
-				b_talavera = {
+				b_lapueblademontalban = {
-					province = 1918
+					province = 1962
 
-					color = { 212 151 12 }
+					color = { 195 165 10 }
+				}
+				b_ocana = {
+					province = 1958
+
+					color = { 190 130 20 }
+				}
+				b_malagon = {
+					province = 1960
+
+					color = { 195 165 10 }
 				}
 			}
 			c_madrid = {
@@ -1112,11 +1127,6 @@ e_iberia = {
 
 					color = { 230 185 15 }
 				}
-				b_villarejodesalvanes = {
-					province = 1929
-
-					color = { 230 185 15 }
-				}
 				b_arganda = {
 					province = 1928
 
@@ -1154,15 +1164,15 @@ e_iberia = {
 
 					color = { 195 125 10 }
 				}
-				b_siguenza = {
+				b_villarejodesalvanes = {
-					province = 1930
+					province = 1929
 
-					color = { 195 125 10 }
+					color = { 230 185 15 }
 				}
-				b_uceda = {
+				b_huete = {
-					province = 1926
+					province = 1951
 
-					color = { 255 245 10 }
+					color = { 210 165 40 }
 				}
 			}
 			c_cuenca = {
@@ -1203,58 +1213,11 @@ e_iberia = {
 
 					color = { 210 165 40 }
 				}
-				b_ademuz = { #Alpuente
-					province = 1946
-
-					color = { 110 160 115 }
-				}
-				b_ucles = {
-					province = 1952
-
-					color = { 190 130 20 }
-				}
 				b_zurita = { #Zorita
 					province = 1944
 
 					color = { 210 165 40 }
 				}
-				b_huete = {
-					province = 1951
-
-					color = { 210 165 40 }
-				}
-			}
-			c_mora = {
-				color = { 190 130 20 }
-				can_be_named_after_dynasty = no
-
-				cultural_names = {
-					name_list_bedouin = cn_uqlish
-					name_list_baranis = cn_uqlish
-					name_list_butr = cn_uqlish
-					name_list_zaghawa = cn_uqlish
-					name_list_levantine = cn_uqlish
-					name_list_egyptian = cn_uqlish
-					name_list_maghrebi = cn_uqlish
-					name_list_andalusian = cn_uqlish
-					name_list_yemeni = cn_uqlish
-				}
-
-				b_mora = {
-					province = 1953
-
-					color = { 190 130 20 }
-				}
-				b_ocana = {
-					province = 1958
-
-					color = { 190 130 20 }
-				}
-				b_quintanar = {
-					province = 1959
-
-					color = { 190 130 20 }
-				}
 			}
 		}
 		d_la_mancha = {
@@ -1263,20 +1226,6 @@ e_iberia = {
 			capital = c_almander # placeholder, figure out what to put it as
 			can_be_named_after_dynasty = no
 
-			c_almader = { #Alarcos
-				color = { 65 215 0 }
-				can_be_named_after_dynasty = no
-				b_alarcos = {
-					province = 1987
-
-					color = { 65 215 0 }
-				}
-				b_malagon = {
-					province = 1960
-
-					color = { 195 165 10 }
-				}
-			}
 			c_calatrava = {
 				color = { 25 205 20 }
 				can_be_named_after_dynasty = no
@@ -1308,6 +1257,11 @@ e_iberia = {
 
 					color = { 25 205 20 }
 				}
+				b_alarcos = {
+					province = 1987
+
+					color = { 65 215 0 }
+				}
 			}
 			c_alarcon = {
 				color = { 0 100 35 }
@@ -1335,15 +1289,57 @@ e_iberia = {
 
 					color = { 0 100 35 }
 				}
+				b_alcaraz = {
+					province = 1967
+
+					color = { 5 115 60 }
+				}
+				b_ventadelmoro = { #Iniesta
+					province = 1950
+
+					color = { 0 100 35 }
+				}
+			}
+			c_mora = {
+				color = { 190 130 20 }
+				can_be_named_after_dynasty = no
+
+				cultural_names = {
+					name_list_bedouin = cn_uqlish
+					name_list_baranis = cn_uqlish
+					name_list_butr = cn_uqlish
+					name_list_zaghawa = cn_uqlish
+					name_list_levantine = cn_uqlish
+					name_list_egyptian = cn_uqlish
+					name_list_maghrebi = cn_uqlish
+					name_list_andalusian = cn_uqlish
+					name_list_yemeni = cn_uqlish
+				}
+
+				b_mora = {
+					province = 1953
+
+					color = { 190 130 20 }
+				}
+				b_quintanar = {
+					province = 1959
+
+					color = { 190 130 20 }
+				}
+				b_ademuz = { #Alpuente
+					province = 1946
+
+					color = { 110 160 115 }
+				}
 				b_alcazar = {
 					province = 1964
 
 					color = { 0 100 35 }
 				}
-				b_alcaraz = {
+				b_ucles = {
-					province = 1967
+					province = 1952
 
-					color = { 5 115 60 }
+					color = { 190 130 20 }
 				}
 			}
         }

N3OW/common/religion/religions/NEOW_calvinist.txt

@@ -319,5 +319,57 @@
 			}
 
 		}
+		genevan  = {
+			color = { 203 209 239 }
+			icon = genevan
+
+			# religious_head = k_papal_state
+
+			graphical_faith = "catholic_gfx"
+			#placeholder holy sites
+			holy_site = jerusalem
+			holy_site = rome
+			holy_site = cologne
+			holy_site = santiago
+			holy_site = kent
+			#holy_site = segrada_familia
+
+			doctrine = doctrine_temporal_head
+			doctrine = doctrine_gender_male_dominated
+			doctrine = doctrine_pluralism_fundamentalist
+			doctrine = doctrine_theocracy_temporal
+
+			#Marriage | placeholder
+			doctrine = doctrine_monogamy
+			doctrine = doctrine_divorce_approval
+			doctrine = doctrine_bastardry_legitimization
+			doctrine = doctrine_consanguinity_aunt_nephew_and_uncle_niece
+
+			#Crimes | placeholder
+			doctrine = doctrine_homosexuality_criminal
+			doctrine = doctrine_adultery_women_crime
+			doctrine = doctrine_adultery_women_crime
+			doctrine = doctrine_kinslaying_close_kin_crime
+			doctrine = doctrine_deviancy_crime
+			doctrine = doctrine_witchcraft_crime
+
+			#Clerical Functions | placeholder
+			doctrine = doctrine_clerical_function_taxation
+			doctrine = doctrine_clerical_gender_male_only
+			doctrine = doctrine_clerical_marriage_allowed
+			doctrine = doctrine_clerical_succession_temporal_appointment
+
+			#Special Tolerance | placeholder
+			doctrine = special_doctrine_christian
+
+			#Tenets | placeholder
+			doctrine = tenet_aniconism
+			doctrine = tenet_adaptive
+			doctrine = tenet_pacifism
+
+			holy_order_names = { #placeholder
+			}
+
+		}
 	}
 }

N3OW/common/religion/religions/NEOW_thelema.txt

@@ -376,6 +376,38 @@
 			#Special/virtue | placeholder
 			doctrine = special_doctrine_old_thelema
 
+			holy_order_names = { #placeholder
+			}
+		}
+		carcosan = {
+			color = { 153 153 22 }
+			icon = carcosan
+
+			# religious_head = k_papal_state
+
+			graphical_faith = "catholic_gfx"
+			#placeholder holy sites
+			holy_site = lochness
+			holy_site = cefalu
+			holy_site = paris
+			holy_site = london
+			#holy_site = cairo
+			
+			#holy_site = segrada_familia
+			
+			#Special Tolerance | placeholder-
+			doctrine = special_doctrine_esoteric_witchcraft
+			doctrine = doctrine_no_head
+			doctrine = doctrine_pluralism_pluralistic
+
+			#Tenets | WIP
+			doctrine = tenet_gnosticism
+			doctrine = tenet_adorcism
+			doctrine = tenet_human_sacrifice
+
+			#Special/virtue | placeholder
+			doctrine = special_doctrine_old_thelema
+
 			holy_order_names = { #placeholder
 			}
 		}

N3OW/history/characters/NEOW_e_hispania.txt

@@ -399,3 +399,80 @@ hispania0020 = {
     	death = yes
 	}
 }
+
+hispania0021 = { #Lorién de Borja Terol Count
+	name = "Lorién"
+	dynasty = borja_dynasty
+	religion = sevillian
+	culture = aragonese
+	trait = diligent
+	trait = eccentric
+	trait = gregarious
+	trait = education_diplomacy_4
+	trait = scholar
+	2538.2.16 = {
+    	birth = yes
+	}
+	2666.1.1 = {
+    	death = yes
+	}
+}
+
+hispania0022 = { #Jerónimo de Teruel-Moctezuma Cordoba Duke
+	name = "Lorién"
+	dynasty = teruel_moctezuma_dynasty
+	religion = sevillian
+	culture = NEOW_andalusian
+	trait = arrogant
+	trait = callous
+	trait = calm
+	trait = education_intrigue_3
+	2530.4.17 = {
+    	birth = yes
+	}
+	2666.1.1 = {
+    	death = yes
+	}
+}
+
+hispania0023 = { #Alonso Quixano the lord of la mancha, not related to that lunatic.
+	name = "Alonso"
+	dna = dna_conde_quixano
+	dynasty = quixano_dynasty
+	religion = sevillian
+	culture = castilian
+	trait = just
+	trait = brave
+	trait = stubborn
+	trait = education_martial_3
+	trait = education_martial_prowess_3
+	trait = knight_errant
+	trait = reckless
+	trait = gallant
+	trait = scholar
+	2507.9.29 = {
+    	birth = yes
+	}
+	2666.1.1 = {
+    	death = yes
+	}
+}
+
+hispania0024 = { #James Boatswain, lord of Gibraltar and tributary of the UK
+	name = "James"
+	dynasty = boatswain_dynasty
+	religion = victorian
+	culture = llanito
+	trait = greedy
+	trait = diligent
+	trait = stubborn
+	trait = education_martial_3
+	trait = forder
+	trait = rough_terrain_expert
+	2520.10.9 = {
+    	birth = yes
+	}
+	2666.1.1 = {
+    	death = yes
+	}
+}

N3OW/history/characters/NEOW_e_zapadoslavia.txt

@@ -3,11 +3,10 @@
 	dynasty = masaryk_dynasty
 	religion = "osvicenist"
 	culture = czech
-	trait = education_diplomacy_1
+	trait = education_martial_4
 	trait = zealous
 	trait = stubborn
 	trait = temperate
-	trait = ambitious
 	trait = physique_bad_1
 	trait = diplomat
 	trait = scholar

N3OW/history/provinces/e_iberia.txt

@@ -215,8 +215,8 @@
 	}
 	800.1.1 = { culture = andalusian }
 	1263.1.1 = {
-	culture = NEOW_andalusian
+	culture = llanito
-	religion = sevillian
+	religion = victorian
 	}
 }
 ##d_sevilla

N3OW/history/titles/k_andalusia.txt

@@ -1,5 +1,5 @@
 k_andalusia = {
-	2550.1.1 = {
+	2546.1.1 = {
 		holder = hispania0006
 	}
 	2505.1.1 = {
@@ -7,6 +7,13 @@ k_andalusia = {
 	}
 }		
 
+d_cordoba = {
+	2547.6.14 = {
+		holder = hispania0022
+		liege = k_andalusia
+	}
+}
+
 d_murcia = {
 	2550.1.1 = {
 		holder = hispania0007
@@ -18,3 +25,9 @@ c_murcia = {
 		holder = hispania0007
 	}
 }
+
+c_gibraltar = {
+	2550.1.1 = {
+		holder = hispania0024
+	}
+}	

N3OW/history/titles/k_aragon.txt

@@ -16,3 +16,10 @@ c_zaragoza = {
 		liege = k_aragon
 	}
 }
+
+c_teruel = {
+	2554.7.26 = {
+		holder = hispania0021
+		liege = k_aragon
+	}
+}

N3OW/history/titles/k_castille.txt

@@ -7,6 +7,13 @@ k_castille_leon = {
 	}
 }
 
+d_la_mancha = {
+	2550.1.1 = { #change to 2526.4.22
+		holder = hispania0023
+		liege = k_castille_leon
+	}
+}
+
 d_badajoz = {
 	2550.1.1 = {
 		holder = hispania0003

N3OW/history/titles/k_england.txt

@@ -163,7 +163,7 @@ c_scilly = {
 	2540.3.21 = {
 		holder = britannia_aurelian_ambrose #Ambrose Aurelian
 		government = administrative_government
-		liege = d_cornwall
+		liege = e_britannia
 	}
 }
 

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

@@ -38,6 +38,8 @@
  easlander_collective_noun:0 "Easlanders"
  souflander:0 "Souflander"
  souflander_collective_noun:0 "Souflanders"
+ llanito:0 "Llanito"
+ llanito_collective_noun:0 "Llanitos"
  pelonais:0 "Pelonais"
  pelonais_collective_noun:0 "Pelonais"
  pelonais:0 "Pélonais"
@@ -77,6 +79,8 @@
  strafclideg:0 "Strafclideg"
  strafclideg_collective_noun:0 "Strafclidegs"
  #Goidelic
+ atlantannach:0 "Atlantannach"
+ atlantannach_collective_noun:0 "Atlantannach"
  high_irish:0 "Éireannach Uasal"
  high_irish_collective_noun:0 "High Irish"
  norner:0 "Norner"

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

@@ -275,7 +275,7 @@
  dynn_keith:0 "Keith"
  dynn_drummond:0 "Drummond"
  dynn_carnegie:0 "Carnegie"
- dynn_jacob:0 "Jagher"
+ dynn_jacob:0 "Jäger"
  dynn_newton:0 "Newton"
  dynn_juny:0 "Juny"
  dynn_gibb:0 "Gibb"
@@ -305,14 +305,18 @@
  dynn_avril:0 "Avril"
  dynn_borbon:0 "Bourbon"
  dynn_cortes:0 "Cortés"
- dynn_jimena:0 "Jiménez"
+ dynn_jimena:0 "Ximénez"
- dynn_jimena_zaragoza:0 "Jiménez-Zaragoza"
+ dynn_jimena_zaragoza:0 "Ximénez-Zaragoza"
  dynn_dias:0 "Dias"
  dynn_vivar:0 "Vivar"
  dynn_posas:0 "Posas"
  dynn_aguirre:0 "Aguirre"
  dynn_mateu:0 "Mateu"
  dynn_lapeyre:0 "Lapeyre"
+ dynn_quixano:0 "Quixano"
+ dynn_teruel_moctezuma:0 "Teruel-Moctezuma"
+ dynn_borja:0 "Borja"
+ dynn_boatswain:0 "Boatswain"
 
  #e_italia
 

N3OW/localization/english/replace/religion/NEOW_religion_calvinist_l_english.yml

@@ -16,8 +16,16 @@
 
  helvetic:0 "Helvetic Reformed Church"
  helvetic_adj:0 "Helvetic"
- helvetic_adherent:0 "Helvetic Calvinist"
+ helvetic_adherent:0 "Helvetic"
- helvetic_adherent_plural:0 "Helvetic Calvinists"
+ helvetic_adherent_plural:0 "Helvetics"
  helvetic_desc:0 "The Calvinist churches of the Alps were heavily shaped by the militaristic rule of Emperor Jürgen in the early days of the post-Event. It is said that the legendary Emperor called for the Council of Geneva, which consequently decreed that all European Reformed churches must unite into one Church led by a single Elder. All rulers of this Church are to recognise the temporal and spiritual sovereignty of the Elder, and follow him to battle should he call for it. By extent, the only valid ruler on Earth is God, and the only valid form of government is the Theocracy. These reforms drove a wedge between the Alpine Church and the remaining Reformed churches of the continent, and since then the Calvinists of the Alps have been slowly rebuilding in relative isolation. Though there has yet to be an Elder that called for the whole faith to go to war, it is only a matter of time before they sally forth from their mountains."
  helvetic_religious_head_title:0 "WIP"
  helvetic_religious_head_title_name:0 "WIP"
+ 
+ genevan:0 "Genevan Fellowship"
+ genevan_adj:0 "Genevan"
+ genevan_adherent:0 "Genevan"
+ genevan_adherent_plural:0 "Genevans"
+ genevan_desc:0 "The Genevan churches consider themselves the sole successors of the Continental Reformed tradition following a split with the Helvetic Church many centuries ago. The Genevan Fellowship is opposed to Helvetic Calvinism in every way that matters - they are ardent believers in pacifism, forbidding their followers to wage war in the name of the Lord. Additionally, they hold that all of God's laws cannot possibly be enforced on earth, and as such advocate for total separation of the laws of God and the laws of men."
+ genevan_religious_head_title:0 "WIP"
+ genevan_religious_head_title_name:0 "WIP"

N3OW/localization/english/replace/religion/NEOW_religion_thelema_l_english.yml

@@ -99,6 +99,15 @@
  old_thelema_religious_head_title:0 "WIP"
  old_thelema_religious_head_title_name:0 "WIP"
  
+
+ carcosan:0 "Carcosan Thelema"
+ carcosan_adj:0 "Carcosan"
+ carcosan_adherent:0 "Carcosan"
+ carcosan_adherent_plural:0 "Carcosans"
+ carcosan_desc:0 "Carcosan Thelemites worship not the light, but the abyss in which it dwells. They hold that all of creation — including the earth and the stars — is formed from that primordial darkness, guided by the Yellow King that has ruled over it since time immemorial. In praise of their shadowy god, the Carcosans delve into what is considered 'dark magic' by other occultists, including summoning malevolent beings and harmful hexes, all in the hopes of bringing the mist of creation to earth, where it may be manipulated to their heart's desire."
+ carcosan_religious_head_title:0 "WIP"
+ carcosan_religious_head_title_name:0 "WIP"
+
  special_doctrine_old_thelema_name: "Nuit Thelema"
  special_doctrine_old_thelema_desc: "Distinguishing itself from Royal Thelema, those who honor the goddess Nuit categorically reject the Imperial religious hierarchy and the authoritarian influence of the British Empire."
 

N3OW/map_data/provinces.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d5a05c6e43f8cc010abf5fae535314788b2ac9ebab67892807b4c5cac67005e0
+oid sha256:ab90a2640c2d34918cebc80c4275b9ffff6c3c0902aa3059cbba06b2690c4748
 size 100825561