diff --git a/common/landed_titles/iberia.txt b/common/landed_titles/iberia.txt index 12c6e478..764934e4 100644 --- a/common/landed_titles/iberia.txt +++ b/common/landed_titles/iberia.txt @@ -1253,16 +1253,16 @@ e_iberia = { c_almader = { #Alarcos color = { 65 215 0 } can_be_named_after_dynasty = no - b_malagon = { - province = 1960 - - color = { 195 165 10 } - } b_alarcos = { province = 1987 color = { 65 215 0 } } + b_malagon = { + province = 1960 + + color = { 195 165 10 } + } b_almader = { #Almaden province = 1989 @@ -1622,11 +1622,6 @@ e_iberia = { name_list_yemeni = cn_saraqustah } } - b_caspe = { - province = 1883 - - color = { 155 115 50 } - } b_uncastillo = { province = 8793 @@ -2124,6 +2119,33 @@ e_iberia = { name_list_occitan = cn_gothia } + c_lleida = { + color = { 160 80 65 } + can_be_named_after_dynasty = no + + cultural_names = { + name_list_bedouin = cn_laridah + name_list_baranis = cn_laridah + name_list_butr = cn_laridah + name_list_zaghawa = cn_laridah + name_list_levantine = cn_laridah + name_list_egyptian = cn_laridah + name_list_maghrebi = cn_laridah + name_list_andalusian = cn_laridah + name_list_yemeni = cn_laridah + } + + b_lleida = { + province = 1881 + + color = { 160 80 65 } + } + b_agramunt = { + province = 8796 + + color = { 160 80 65 } + } + } c_barcelona = { color = { 156 110 72 } can_be_named_after_dynasty = no @@ -2249,6 +2271,11 @@ e_iberia = { name_list_yemeni = cn_turtusah } + b_caspe = { + province = 1883 + + color = { 155 115 50 } + } b_tarragona = { province = 1860 @@ -2318,33 +2345,6 @@ e_iberia = { color = { 170 97 92 } } } - c_lleida = { - color = { 160 80 65 } - can_be_named_after_dynasty = no - - cultural_names = { - name_list_bedouin = cn_laridah - name_list_baranis = cn_laridah - name_list_butr = cn_laridah - name_list_zaghawa = cn_laridah - name_list_levantine = cn_laridah - name_list_egyptian = cn_laridah - name_list_maghrebi = cn_laridah - name_list_andalusian = cn_laridah - name_list_yemeni = cn_laridah - } - - b_lleida = { - province = 1881 - - color = { 160 80 65 } - } - b_agramunt = { - province = 8796 - - color = { 160 80 65 } - } - } c_pallas = { color = { 163 81 75 } can_be_named_after_dynasty = no diff --git a/history/provinces/iberia.txt b/history/provinces/iberia.txt index 1d256253..eabd86ff 100644 --- a/history/provinces/iberia.txt +++ b/history/provinces/iberia.txt @@ -75,21 +75,12 @@ ###c_malaga 1846 = { # MALAGA #Misc - culture = visigothic + culture = castilian religion = sevillian holding = castle_holding # History - 800.1.1 = { culture = andalusian } - 811.1.1 = { religion = sevillian } - 1066.1.1 = { - buildings = { - hill_forts_01 - #hill_farms_01 - common_tradeport_01 - } - } } 1847 = { # NERJA holding = none @@ -225,36 +216,25 @@ } } 1953 = { # MORA - holding = church_holding + culture = castilian + religion = sevillian + holding = castle_holding } 1958 = { # OCANA holding = city_holding } 1959 = { # QUINTANAR - holding = none + holding = church_holding } -###c_malagon -1960 = { # MALAGON - # Misc - culture = visigothic - religion = sevillian - - holding = castle_holding - - # History - 800.1.1 = { culture = andalusian } - 939.1.1 = { religion = sevillian } - 1235.1.1 = { - culture = castilian - religion = sevillian - } -} +###c_malagon #CABANEROS 1961 = { # CABANEROS - holding = city_holding + culture = castilian + religion = sevillian + holding = castle_holding } 1957 = { # LA JARA - holding = none + holding = city_holding } 1962 = { # LA PUEBLA DE MONTALBAN holding = church_holding @@ -319,15 +299,13 @@ ###c_granada 1978 = { # GRANADA #Misc - culture = visigothic + culture = castilian religion = sevillian holding = castle_holding # History - 800.1.1 = { culture = andalusian } 811.1.1 = { - religion = sevillian special_building = alhambra_01 } 867.1.1 = { @@ -574,8 +552,8 @@ ###c_urgell 1878 = { # 1878 - URGELL # Misc - culture = visigothic - religion = sevillian + culture = catalan + religion = iberian holding = castle_holding @@ -585,18 +563,20 @@ 8801 = { # Seu d'Urgell holding = church_holding } -1869 = { # ANDORRA - holding = city_holding -} 1884 = { # BALAGUER/Organya holding = none } +1869 = { # ANDORRA + culture = andorra + religion = iberian + holding = city_holding +} ###c_pallas 8799 = { # PALLARS_JUSSA # Misc - culture = visigothic - religion = sevillian + culture = occitan + religion = iberian holding = castle_holding @@ -618,7 +598,7 @@ 1868 = { # PUIGCERDA # Misc culture = visigothic - religion = sevillian + religion = iberian holding = castle_holding @@ -659,7 +639,9 @@ 800.1.1 = { culture = catalan } } 8798 = { # PRADES/prades_rossello - holding = church_holding + culture = catalan + religion = sevillian + holding = castle_holding } 1865 = { # ROSES holding = city_holding @@ -893,17 +875,10 @@ 1747 = { # SILVES # Misc culture = visigothic - religion = sevillian + religion = iberian holding = castle_holding - # History - 800.1.1 = { culture = andalusian } - 811.1.1 = { religion = sevillian } - 1264.1.1 = { - culture = portuguese - religion = sevillian - } } 1746 = { # LAGOS holding = church_holding @@ -935,15 +910,9 @@ 1752 = { # ALCACER DO SAL # Misc culture = visigothic - religion = sevillian + religion = iberian # History - 800.1.1 = { culture = andalusian } - 939.1.1 = { religion = sevillian } - 1233.1.1 = { - culture = portuguese - religion = sevillian - } } 1778 = { # AVIS holding = none @@ -958,18 +927,12 @@ ###c_lisboa 1754 = { # Lisboa # Misc - culture = visigothic - religion = sevillian + culture = portuguese + religion = iberian holding = castle_holding # History - 800.1.1 = { culture = andalusian } - 944.1.1 = { religion = sevillian } - 1163.1.1 = { - culture = portuguese - religion = sevillian - } } 1755 = { # SANTAREM holding = city_holding @@ -987,7 +950,7 @@ holding = castle_holding # History - 800.1.1 = { culture = andalusian } + 800.1.1 = { culture = portuguese } 944.1.1 = { religion = sevillian } } 1774 = { # NISA @@ -1005,17 +968,11 @@ 1777 = { # EVORA # Misc culture = visigothic - religion = sevillian + religion = iberian holding = castle_holding # History - 800.1.1 = { culture = andalusian } - 811.1.1 = { religion = sevillian } - 1253.1.1 = { - culture = portuguese - religion = sevillian - } } 1751 = { # BEJA holding = city_holding @@ -1024,14 +981,11 @@ ###c_plasencia 1831 = { # PLASENCIA/Hervas # Misc - culture = visigothic + culture = castilian religion = sevillian holding = castle_holding - # History - 800.1.1 = { culture = andalusian } - 955.1.1 = { culture = asturleonese } } 1830 = { # 1830 - CORIA holding = city_holding @@ -1039,7 +993,14 @@ 1917 = { # 1917 - ALMARAZ holding = church_holding } - +1841 = { # Almonte + # Misc + culture = castilian + religion = sevillian + + holding = castle_holding + +} ###c_caceres 1954 = { # CACERES # Misc @@ -1250,6 +1211,8 @@ } 1820 = { # PONFERRADA holding = none + culture = asturleonese + religion = sevillian } ###c_monterrei @@ -1270,17 +1233,12 @@ ###c_porto 1760 = { # PORTO # Misc - culture = visigothic - religion = sevillian + culture = portuguese + religion = iberian holding = castle_holding # History - 800.1.1 = { culture = galician } - 950.1.1 = { faith = sevillian } - 1139.7.26 = { - culture = portuguese - } } 1761 = { # BRAGA holding = city_holding @@ -1324,18 +1282,12 @@ ###c_coimbra 1758 = { # COIMBRA # Misc - culture = visigothic - religion = sevillian + culture = portuguese + religion = iberian holding = castle_holding # History - 800.1.1 = { culture = andalusian } - 931.1.1 = { culture = galician } - 1139.7.26 = { - culture = portuguese - religion = sevillian - } } 1757 = { # LEIRIA holding = church_holding @@ -1347,18 +1299,12 @@ ###c_viseu 1769 = { # VISEU # Misc - culture = visigothic - religion = sevillian + culture = portuguese + religion = iberian holding = castle_holding # History - 800.1.1 = { culture = andalusian } - 926.1.1 = { culture = galician } - 1139.7.26 = { - culture = portuguese - religion = sevillian - } } 1770 = { # TRANCOSO holding = city_holding @@ -1367,18 +1313,12 @@ ###c_aveiro 1759 = { # 1759 - AVEIRO # Misc - culture = visigothic - religion = sevillian + culture = portuguese + religion = iberian holding = castle_holding # History - 800.1.1 = { culture = andalusian } - 931.1.1 = { culture = galician } - 950.1.1 = { faith = sevillian } - 1139.7.26 = { - culture = portuguese - } } 2003 = { # GRALHEIRA/Cinfaes holding = none @@ -1390,18 +1330,12 @@ ###c_castelo_branco 1773 = { # CASTELO BRANCO # Misc - culture = visigothic - religion = sevillian + culture = portuguese + religion = iberian holding = castle_holding # History - 800.1.1 = { culture = andalusian } - 926.1.1 = { culture = asturleonese } - 1178.1.1 = { - culture = portuguese - religion = sevillian - } } 1771 = { # IDANHA/Beira holding = city_holding diff --git a/localization/english/titles_l_english.yml b/localization/english/titles_l_english.yml index 3063b3a4..e54305a2 100644 --- a/localization/english/titles_l_english.yml +++ b/localization/english/titles_l_english.yml @@ -13431,8 +13431,8 @@ c_makuria_adj:0 "Makurian" c_malaga:0 "Malaga" c_malaga_adj:0 "Málagan" - c_malagon:0 "Malagon" - c_malagon_adj:0 "Malagonese" + c_malagon:0 "Cabaneros" + c_malagon_adj:0 "Cabanerese" c_maldives_article:0 "the " c_maldives:0 "Maldives" c_maldives_adj:0 "Maldivian" @@ -13604,8 +13604,12 @@ c_montpelliard_adj:0 "Montpelliard" c_montpellier:0 "Nîmes" c_montpellier_adj:0 "Nîmesian" - c_mora:1 "Uclés" - c_mora_adj:1 "Uclésian" + c_mora:1 "Mora" + c_mora_adj:1 "Morese" + c_ponferrada:0 "Ponferrada" + c_ponferrada_adj:0 "Ponferradan" + c_andorra:0 "Andorra" + c_andorra_adj:0 "Andorran" c_morarna:1 "Mórar" c_morarna_adj:0 "Móran" c_moray:0 "Moray" @@ -15253,6 +15257,8 @@ d_bar_adj:0 "Barrois" d_barcelona:0 "Barcelona" d_barcelona_adj:0 "Barcelonian" + d_andorra:0 "Andorra" + d_andorra_adj:0 "Andorran" d_basra:0 "Basra" d_basra_adj:0 "Basrite" d_bavaria:0 "Bavaria"