diff --git a/common/culture/name_equivalency/00_NEOW_male_names.txt b/common/culture/name_equivalency/00_NEOW_male_names.txt index fff783665..530044c64 100644 --- a/common/culture/name_equivalency/00_NEOW_male_names.txt +++ b/common/culture/name_equivalency/00_NEOW_male_names.txt @@ -270,7 +270,8 @@ bedirhan_male = { Mpentirch_a_act_n Bedirhan } bedivere_male = { Beddiveer Bedivere Bedivuh Bediev_ae_re Bedwyr Behdihvuh Bwdiv_pst_rah } bedri_male = { Mpentr_i_act_ Bedri } behic_male = { Mpech_i_act_ts Behi_c_ced_ } -bekbolat_male = { Baybolat Biybolat } +bekbolat_male = { Baybolat Bekbolat Biybolat } +beksultan_male = { Biysoltan Biysultan } bela_male = { Belo } belisarius_male = { Velis_a_act_rios } bellerophon_male = { Vellerof_o_act_ntis } @@ -288,7 +289,7 @@ berthold_male = { Berthold Bertold Bertolt T_o_uml_lke } bertrand_male = { B_ae_rtr_a_grv_nd Beltr_a_act_n Beltram Bertram Bertrand } bessarion_male = { Visarion } beyhan_male = { Mpe_i_uml_ch_a_act_n Beyhan } -bilal_male = { Bil_a_hat_l Bilal Bylal Byllall Bil_a_act_l } +bilal_male = { Bil_a_hat_l Bilal Bilyal Bylal Byllall Bil_a_act_l } binali_male = { Mpinal_i_act_ Binali } birger_male = { B_o_stk_rge B_o_uml_rje Birger Birgir } birkan_male = { Mpirk_a_act_n Birkan } @@ -416,8 +417,8 @@ daniel_male = { D_a_brv_nu_t_cma_ Daan Dahnyuhl Dan Dan_i_act_el Danail Danas Da darius_male = { D_ae_rias Daeyyus Dar_i_act_o Dar_i_act_u Darijan Dario Dariu_s_crn_ Darius Dariusz Darrius Dayruss Ddaryus } daron_male = { D_ae_ren D_ae_rrhen Daar_pst_n Daron Daroon Darun Dayrun Darren } darwish_male = { Darbish Dervish } -david_male = { D_a_act_vid D_a_grv_vi D_a_grv_vid D_a_mcn_vis Da_eth_i Daafid Dafydd Daivie Daivudd Danvid Daud Daut Dav_i_act_ Dav_i_act__eth_ Dav_i_act_d Dave Daveth Davi David Davide Davido Davud Davy Dawt Deivad Dewi Divi Dovid Dovydas Taavi } -dawlat_male = { D_a_uml_ulet Davled Devlet Ntevl_e_act_t } +david_male = { D_a_act_vid D_a_grv_vi D_a_grv_vid D_a_mcn_vis Da_eth_i Daafid Dafydd Daivie Daivudd Danvid Daud Daut Dav_i_act_ Dav_i_act__eth_ Dav_i_act_d Dave Daveth Davi David Davide Davido Davud Davy Dawt Dawut Deivad Dewi Divi Dovid Dovydas Taavi } +dawlat_male = { D_a_uml_ulet Davled Dawlet Devlet Ntevl_e_act_t } dawlatbek_male = { D_a_uml_letbek D_a_uml_wl_a_uml_tbay } delphinus_male = { Delf_i_act_ Delf_i_act_n Delfim } dean_male = { Di_e_uml_hn } @@ -630,7 +631,7 @@ friedemann_male = { Friedemann } fuad_male = { Foat Fouad Foued Fu_pst_ad Fuad Fuat Fu_a_act_t } fulk_male = { Ffulk Folke Folkke } furkan_male = { Furk_a_act_n Furkan } -gabriel_male = { Biel C_shw_bray_i_dot_l D_z_stk_abrail Djibril Gabri_e_act_u Gabriel Gabriele_male Gabriello Gabrielo Gabrielius Gabryyll Gaby Gavrail Gavri_i_act_l Gavriil Gavril Gibrael Grabiel Havr_i_hat__i_hat_l Zhabra_g_dot_il Zhabrail } +gabriel_male = { Biel C_shw_bray_i_dot_l D_z_stk_abrail Djibril Gabri_e_act_u Gabriel Gabriele_male Gabriello Gabrielo Gabrielius Gabryyll Gaby Gavrail Gavri_i_act_l Gavriil Gavril Gibrael Grabiel Havr_i_hat__i_hat_l Jabrail Zhabra_g_dot_il Zhabrail } gael_male = { Ga_e_grv_l Ga_e_uml_l Gael } gaetan_male = { Gaetano Gaiet_a_grv_ Gaietan Kajet_a_act_n } gaius_washington_male = { Gaius Washington } @@ -835,7 +836,7 @@ izzat_male = { _I_dot_zz_shw_t _I_dot_zzet Izet Iz_e_act_t } izzuddin_male = { Azzedine Yzedin } jabbar_male = { Cabbar Cebbar Zhabbar } jabir_male = { Jabyr } -jafar_male = { C_shw_f_shw_r Cafer Xhafer Tzaf_e_act_r } +jafar_male = { C_shw_f_shw_r Cafer Jagafar Xhafer Tzaf_e_act_r } jahan_male = { Cihan Jihan Tzich_a_act_n } jahangir_male = { Cahangir Cihangir Tzichang_i_act_r } jahanshah_male = { Cihan_s_ced_a } @@ -844,7 +845,7 @@ jair_male = { Chair Jair Jairo Xairo Xairu Ya_i_uml_r } jalal_male = { C_shw_lal Cel_a_hat_l Celal J_a_uml_lel Xhelal Zhalal Tzel_a_act_l } jalaluddin_male = { C_a_uml_l_a_uml_letdin Celaledin Celalettin Xheladin Tzelalett_i_act_n } jalil_male = { C_shw_lil Jalyl Xhelil Zhalil Zhelil } -jamal_male = { Camal Cemal Djamel Jamel Xhemal Tzem_a_act_l } +jamal_male = { Camal Cemal Djamel Jamal_male Jamel Xhemal Tzem_a_act_l } jamaluddin_male = { C_shw_m_shw_l_shw_ddin Camalutdin D_z_stk_amaldi Jamel_spc_Eddine Zhamaludin } james_male = { _Y_act_akup Chaime Diago Diego Diogo Geovane Giachen Giacobe Giacomo Giacun Giako_u_act_p I_a_act_kovos Iacob Iago Iakov J_e_mcn_kabs Jaak Jaakko Jaap Jachen Jacky Jacob Jacobo Jacobus Jacopo Jacques Jacquot Jago Jagoba Jaicob Jaime Jaimes Jaka Jakes Jakez Jakob Jakobo Jakov Jakub Jakup Jaky James Jamie Jamys Jamyy Jaqub Jaque Jaume Jeppe Jim Jimi Jimmy Jokeb Kaupo Koop Lapo Santi Santiago Santiagu Sch_a_grv_k Sch_a_grv_kobb Seumas Thiago Tiago Xacob Xacobe Xacobu Xaime Xanti Xhimi Ya_pst_qub Yaacov Yaakov Yago Yakov Yakup Yankel Yaqub Gkou_act_m } jamesgeorge_male = { Jacob_dsh_G_o_uml_ran } @@ -853,6 +854,7 @@ jamesyves_male = { Jacques_dsh_Yves Jaque_dsh_Ives } jamil_male = { C_a_uml_mil C_shw_mil Cemil Xhemil Y_a_uml_mil Tzem_i_act_l } jamshid_male = { C_shw_m_s_ced_id C_u_uml_m_s_ced__u_uml_d } janbulat_male = { Cambulat Jembulat } +janibek_male = { J_a_uml_n_i_dot_bek Jan_i_dot_bek } jantje_male = { Jantje Jantick } januarius_male = { Gener Gennaro Gianuario Janu_a_act_rio Xenaro } jared_male = { Jarydd } @@ -1605,7 +1607,7 @@ tahmasp_male = { T_shw_hmasib } tahsin_male = { Tachs_i_act_n Tahsin } tajuddin_male = { Tac_shw_ddin Tacettin Tacuddin Tazhidin Tatzett_i_act_n } takiuddin_male = { Takiddin Takintd_i_act_n } -talaat_male = { T_a_uml_l_g_brv__a_uml_t T_pst_al_h_mbw_at T_shw_l_shw_t Tal_g_brv_at } +talaat_male = { Dalhat T_a_uml_l_g_brv__a_uml_t T_pst_al_h_mbw_at T_shw_l_shw_t Tal_g_brv_at } talal_male = { Talal } talha_male = { Talch_a_act_ Talha } talib_male = { Tal_i_dot_b Talyb } diff --git a/common/culture/name_lists/NEOW_karachay_balkar.txt b/common/culture/name_lists/NEOW_karachay_balkar.txt index a7e07a696..94b5b2d19 100644 --- a/common/culture/name_lists/NEOW_karachay_balkar.txt +++ b/common/culture/name_lists/NEOW_karachay_balkar.txt @@ -7,7 +7,12 @@ } male_names = { - A_c_ced_ah Abdul Abdulhamit Abdulkerim Abdullah Abdulmajit Abdulmanaf Abdulra_s_ced_id Abdulrahim Abdulsamat Abdurahman Abu Abubekir Abuk Adam Adiham Adik Adil Adilbiy Adilgeriy Ahil Ahk_o_uml_bek Ahmadiya Ahmat Ahmathan Ajok Akkay Ako Alau_g_brv_an Ali Alim Amin Amirhan Anuar Apay Apon Aqqu_s_ced_ Ashat Askerbiy Aslan Aslanali Aslanbek Aslangeriy Aslanm_i_dot_rza Aslantoq Aslanuq Atabiy Atto Ay_i_dot_w Aybekir Aydaruq Aytm_i_dot_rza Azamat Azatgeriy Azatqul Aznor + _O_uml_r_u_uml_zmek + A_c_ced_ah A_c_ced_ahmat A_c_ced_emez A_c_ced_ey Abdul Abdulhamit Abdulkerim Abdullah Abdulmajit Abdulmanaf Abdulra_s_ced_id Abdulrahim Abdulsamat Abdurahman Abu Abubekir Abuk Adam Adiham Adik Adil Adilbiy Adilgeriy Ahil Ahk_o_uml_bek Ahmadiya Ahmat Ahmathan Ajok Akkay Ako Alau_g_brv_an Ali Alim Amin Amirhan Anuar Apay Apon Aqqu_s_ced_ Ashat Askerbiy Aslan Aslanali Aslanbek Aslangeriy Aslanm_i_dot_rza Aslantoq Aslanuq Atabiy Atto Ay_i_dot_w Aybekir Aydaruq Aytm_i_dot_rza Azamat Azatgeriy Azatqul Aznor + B_o_uml_r_u_uml_ka Ba_c_ced_i Ba_s_ced__c_ced__i_dot_ Ba_s_ced_il Ba_s_ced_ir Babi Badinat Balba_s_ced_ Bap_i_dot_na Baraq Baraz Barisbiy Bat_i_dot_rbek Bat_i_dot_rbiy Battal Bawuk Baybat_i_dot_r Baydullah Baym_i_dot_rza Bekbolat Bekir Bekm_i_dot_rza Bibo Bilyal Biso Biyaka Biybert Biym_i_dot_rza Biyn_o_uml_ger Biysoltan Bolat Bota_s_ced_ Botta Buzjigit + Dad_i_dot_k Dada_s_ced_ Dalhat Daniyal Dawlet Dawut Didin Dogalay Domalay Dondu Dongay Dudaruq Duray + G_i_dot_kga Ga_c_ced__i_dot_w Gilyastan Git_c_ced_e Git_c_ced_ew + Ja_s_ced__i_dot_w Ja_s_ced_akku Ja_s_ced_arbek Ja_s_ced_aw Jabrail Jagafar Jamal_male Jamarqul Jambot Jan_i_dot_bek Janaqayt Janhot Janm_i_dot_rza Jansuy Jappu Jara_s_ced_t_i_dot_ Jarahmat Jawbermez Jigit } female_names = { } diff --git a/common/landed_titles/iberia.txt b/common/landed_titles/iberia.txt index d3915f2ca..5b8948a30 100644 --- a/common/landed_titles/iberia.txt +++ b/common/landed_titles/iberia.txt @@ -27,7 +27,7 @@ e_iberia = { add = @correct_culture_primary_score } } - k_andalusia = { + k_andalusia = { # Andalusia color = { 42 140 50 } capital = c_sevilla # Granada @@ -61,7 +61,7 @@ e_iberia = { d_cordoba = { # Córdoba color = { 60 180 12 } - capital = c_cordoba # Cordoba + capital = c_cordoba # Córdoba cultural_names = { name_list_NEOW_portuguese = cn_c_o_act_rdova @@ -71,9 +71,8 @@ e_iberia = { name_list_occitan = cn_c_o_grv_rdoa } - c_cordoba = { + c_cordoba = { # Córdoba color = { 60 180 12 } - #can_be_named_after_dynasty = no cultural_names = { name_list_NEOW_portuguese = cn_c_o_act_rdova @@ -83,7 +82,7 @@ e_iberia = { name_list_occitan = cn_c_o_grv_rdoa } - b_cordoba = { + b_cordoba = { # Córdoba province = 1995 color = { 60 180 12 } @@ -122,7 +121,7 @@ e_iberia = { name_list_asturleonese = cn_xa_e_act_n } - b_jaen = { + b_jaen = { # Jaén province = 1977 color = { 65 155 40 } @@ -158,7 +157,7 @@ e_iberia = { name_list_occitan = cn_m_u_act_rcia } - c_murcia = { + c_murcia = { # Murcia color = { 27 130 60 } cultural_names = { @@ -168,7 +167,7 @@ e_iberia = { name_list_occitan = cn_m_u_act_rcia } - b_murcia = { + b_murcia = { # Murcia province = 1852 color = { 27 130 60 } @@ -179,7 +178,7 @@ e_iberia = { name_list_occitan = cn_m_u_act_rcia } } - b_cartagena = { + b_cartagena = { # Cartagena province = 1851 color = { 27 130 60 } @@ -196,7 +195,7 @@ e_iberia = { province = 1970 color = { 27 130 60 } } - b_cieza = { + b_cieza = { # Cieza province = 1971 color = { 27 130 60 } } @@ -375,7 +374,7 @@ e_iberia = { name_list_occitan = cn_cadis } } - b_tarifa = { + b_tarifa = { # Algeciras province = 1844 color = { 175 235 15 } @@ -386,7 +385,7 @@ e_iberia = { name_list_NEOW_galician = cn_alxeciras } } - b_jerez = { + b_jerez = { # Jerez de la Frontera province = 1842 color = { 175 235 15 } @@ -522,7 +521,7 @@ e_iberia = { name_list_NEOW_galician = cn_castela } - c_valladolid = { + c_valladolid = { # Valladolid color = { 204 165 10 } cultural_names = { @@ -530,7 +529,7 @@ e_iberia = { name_list_aragonese = cn_valladolit } - b_valladolid = { + b_valladolid = { # Valladolid province = 1897 color = { 210 160 10 } @@ -560,10 +559,10 @@ e_iberia = { } } } - c_burgos = { + c_burgos = { # Burgos color = { 229 185 11 } - b_burgos = { + b_burgos = { # Burgos province = 1906 color = { 242 196 12 } } @@ -598,7 +597,7 @@ e_iberia = { name_list_occitan = cn_pal_e_act_ncia } - b_palencia = { + b_palencia = { # Palencia province = 1905 color = { 242 196 12 } @@ -631,7 +630,7 @@ e_iberia = { color = { 242 196 12 } } } - c_soria = { + c_soria = { # Soria color = { 255 212 43 } cultural_names = { @@ -639,7 +638,7 @@ e_iberia = { name_list_NEOW_catalan = cn_s_o_grv_ria } - b_soria = { + b_soria = { # Soria province = 1900 color = { 255 215 5 } @@ -648,7 +647,7 @@ e_iberia = { name_list_NEOW_catalan = cn_s_o_grv_ria } } - b_osma = { + b_osma = { # Osma province = 1901 color = { 255 215 5 } } @@ -722,9 +721,9 @@ e_iberia = { } } } - d_leon = { + d_leon = { # León color = { 216 139 32 } - capital = c_leon # Leon + capital = c_leon # León cultural_names = { name_list_NEOW_portuguese = cn_le_a_tld_o @@ -735,7 +734,7 @@ e_iberia = { name_list_asturleonese = cn_lli_o_act_n } - c_leon = { + c_leon = { # León color = { 204 131 30 } cultural_names = { @@ -747,7 +746,7 @@ e_iberia = { name_list_asturleonese = cn_lli_o_act_n } - b_leon = { + b_leon = { # León province = 1816 color = { 223 128 31 } @@ -962,7 +961,7 @@ e_iberia = { color = { 195 165 10 } } } - c_molina = { + c_molina = { # Guadalajara color = { 255 174 25 } cultural_names = { @@ -971,7 +970,7 @@ e_iberia = { name_list_NEOW_galician = cn_guadalaxara } - b_gudalajara = { + b_gudalajara = { # Guadalajara province = 1929 color = { 230 185 15 } @@ -1007,7 +1006,7 @@ e_iberia = { color = { 210 165 40 } } } - c_cuenca = { + c_cuenca = { # Cuenca color = { 127 87 12 } cultural_names = { @@ -1015,7 +1014,7 @@ e_iberia = { name_list_occitan = cn_c_o_grv_nca } - b_cuenca = { + b_cuenca = { # Cuenca province = 1947 color = { 210 165 40 } @@ -1159,10 +1158,10 @@ e_iberia = { name_list_NEOW_galician = cn_estremadura } - c_merida = { + c_merida = { # Mérida color = { 153 153 7 } - b_merida = { + b_merida = { # Mérida province = 1834 color = { 150 220 10 } @@ -1235,7 +1234,7 @@ e_iberia = { name_list_asturleonese = cn_pras_e_act_ncia } - b_hervas = { + b_hervas = { # Plasencia province = 1831 color = { 125 240 15 } @@ -1257,7 +1256,7 @@ e_iberia = { province = 1917 color = { 125 240 15 } } - b_sierradegredos = { #Gredos + b_sierradegredos = { # Hervás province = 1916 color = { 200 110 50 } @@ -1291,7 +1290,7 @@ e_iberia = { name_list_NEOW_portuguese = cn_s_a_tld_o_vicente_de_alc_a_hat_ntara } } - b_trujillo = { + b_trujillo = { # Trujillo province = 1955 color = { 150 220 10 } @@ -1367,8 +1366,6 @@ e_iberia = { } } - # Creation/usurpation trigger - d_aragon = { # Aragón color = { 153 84 15 } capital = c_zaragoza # Zaragoza diff --git a/history/characters/NEOW_e_turkey.txt b/history/characters/NEOW_e_turkey.txt index e4e6a7b34..ec8d476ed 100644 --- a/history/characters/NEOW_e_turkey.txt +++ b/history/characters/NEOW_e_turkey.txt @@ -598,7 +598,7 @@ turkey_tahir_sarikaya = { # count of afyonkarahisar, descendant of bahattin the } turkey_barish_kemal = { # count of bilecik, son of the former ruler of marmara - name = "Barish" + name = "Bar_i_dot__s_ced_" dynasty = kemal_dynasty rite = "naqshbandi_rite" culture = egeli diff --git a/history/provinces/e_iberia.txt b/history/provinces/e_iberia.txt index 44ff15c3a..80e732d5c 100644 --- a/history/provinces/e_iberia.txt +++ b/history/provinces/e_iberia.txt @@ -8,96 +8,114 @@ special_building = cathedral_mosque_cordoba_01 culture = NEOW_andalusian 867.1.1 = { - buildings = { - farm_estates_01 - cereal_fields_01 - } + buildings = { + farm_estates_01 + cereal_fields_01 + } } 1066.1.1 = { - buildings = { - castle_02 - curtain_walls_01 - farm_estates_02 + buildings = { + castle_02 + curtain_walls_01 + farm_estates_02 + } } + 2555.1.1 = { + province_size = 6 } } 1988 = { - holding = none - 1066.1.1 = { holding = city_holding + 2555.1.1 = { + province_size = 2 } } 1979 = { - rite = compostelan_rite holding = castle_holding - 800.1.1 = { culture = NEOW_andalusian} - 1263.1.1 = { - culture = NEOW_andalusian - rite = compostelan_rite + } + 2555.1.1 = { + province_size = 1 } } 1984 = { holding = church_holding + 2555.1.1 = { + province_size = 3 + } } 1986 = { - rite = compostelan_rite holding = none } ###c_andujar 1977 = { rite = compostelan_rite - holding = castle_holding - 800.1.1 = { culture = NEOW_andalusian} - 1263.1.1 = { culture = NEOW_andalusian - rite = compostelan_rite + holding = castle_holding + 2555.1.1 = { + province_size = 5 } } 1985 = { holding = church_holding + 2555.1.1 = { + province_size = 4 + } } 2004 = { - holding = none - 1066.1.1 = { holding = city_holding + 2555.1.1 = { + province_size = 2 } } 1976 = { - holding = church_holding + holding = none } ##d_murcia ###c_murcia 1852 = { rite = compostelan_rite + culture = NEOW_andalusian holding = castle_holding special_building_slot = generic_university - 800.1.1 = { culture = NEOW_andalusian} - 812.1.1 = { rite = compostelan_rite } - 1280.1.1 = { - culture = NEOW_andalusian - rite = iberian_rite + 2555.1.1 = { + province_size = 6 } } 1851 = { holding = city_holding + 2555.1.1 = { + province_size = 5 + } } 1850 = { - holding = none + holding = church_holding + 2555.1.1 = { + province_size = 4 + } } 1970 = { - holding = church_holding + holding = none } 1971 = { holding = church_holding + 2555.1.1 = { + province_size = 3 + } } ###c_alcaraz 1968 = { culture = NEOW_andalusian rite = compostelan_rite holding = castle_holding + 2555.1.1 = { + province_size = 3 + } } 1973 = { holding = church_holding + 2555.1.1 = { + province_size = 1 + } } ##d_granada ###c_granada @@ -107,49 +125,59 @@ holding = castle_holding special_building = alhambra_01 867.1.1 = { - buildings = { - hill_forts_01 - } + buildings = { + hill_forts_01 + } } 1066.1.1 = { - buildings = { - hill_forts_01 - quarries_01 + buildings = { + hill_forts_01 + quarries_01 + } } + 2555.1.1 = { + province_size = 5 } } 1975 = { holding = city_holding + 2555.1.1 = { + province_size = 2 + } } 1848 = { holding = church_holding + 2555.1.1 = { + province_size = 4 + } } 1974 = { - holding = none - 1066.1.1 = { holding = church_holding + 2555.1.1 = { + province_size = 2 } } ###c_almeria 1849 = { + culture = cale rite = compostelan_rite holding = castle_holding special_building = almeria_castle_01 - 800.1.1 = { culture = NEOW_andalusian} - 812.1.1 = { rite = compostelan_rite } - 1280.1.1 = { - culture = cale - rite = compostelan_rite - } 1066.1.1 = { - buildings = { - common_tradeport_02 - hill_forts_02 + buildings = { + common_tradeport_02 + hill_forts_02 + } } + 2555.1.1 = { + province_size = 5 } } 1972 = { holding = city_holding + 2555.1.1 = { + province_size = 2 + } } ###c_malaga 1846 = { @@ -157,60 +185,72 @@ rite = penitente_rite holding = castle_holding special_building_slot = fortified_port_of_malaga_01 + 2555.1.1 = { + province_size = 7 + } } 1847 = { - holding = none - 1066.1.1 = { holding = city_holding + 2555.1.1 = { + province_size = 4 } } 1845 = { rite = compostelan_rite + culture = NEOW_andalusian holding = castle_holding - 800.1.1 = { culture = NEOW_andalusian} - 1263.1.1 = { - culture = llanito - rite = victorian + 2555.1.1 = { + province_size = 4 } } ##d_sevilla ###c_sevilla 1981 = { rite = penitente_rite + culture = NEOW_andalusian holding = castle_holding special_building = cathedral_seville_01 - culture = NEOW_andalusian 867.1.1 = { - buildings = { - farm_estates_01 - military_camps_01 - } + buildings = { + farm_estates_01 + military_camps_01 + } } 1066.1.1 = { - buildings = { - farm_estates_01 - curtain_walls_01 + buildings = { + farm_estates_01 + curtain_walls_01 + } } + 2555.1.1 = { + province_size = 7 } } 1841 = { holding = city_holding + 2555.1.1 = { + province_size = 3 + } } 1994 = { - holding = city_holding + holding = none } 1993 = { holding = castle_holding - culture = NEOW_andalusian - rite = compostelan_rite + 2555.1.1 = { + province_size = 3 + } } 1980 = { holding = castle_holding + 2555.1.1 = { + province_size = 3 + } } 1983 = { - holding = none - 1066.1.1 = { holding = church_holding + 2555.1.1 = { + province_size = 3 } } ###c_cadiz @@ -218,31 +258,50 @@ rite = penitente_rite holding = castle_holding culture = NEOW_andalusian + 2555.1.1 = { + province_size = 5 + } } 1844 = { holding = city_holding special_building = port_of_liverpool_01 + 2555.1.1 = { + province_size = 5 + } } 1842 = { holding = city_holding + 2555.1.1 = { + province_size = 5 + } } 1982 = { - holding = city_holding + holding = church_holding + 2555.1.1 = { + province_size = 3 + } } ###c_niebla 1840 = { holding = castle_holding culture = NEOW_andalusian rite = iberian_rite + 2555.1.1 = { + province_size = 5 + } } 1839 = { - culture = NEOW_andalusian - rite = compostelan_rite holding = castle_holding + 2555.1.1 = { + province_size = 3 + } } 1991 = { holding = church_holding special_building = generic_copper_mines_01 + 2555.1.1 = { + province_size = 2 + } } 1992 = { holding = none @@ -254,20 +313,53 @@ culture = llanito rite = jack_tar_rite special_building = fortress_of_gibraltar_01 + 2555.1.1 = { + province_size = 3 + } } #k_castille_leon ##d_castilla +###c_valladolid +1897 = { + culture = castilian + rite = compostelan_rite + holding = castle_holding + 2555.1.1 = { + province_size = 6 + } +} +1896 = { + holding = city_holding + 2555.1.1 = { + province_size = 2 + } +} +1911 = { + holding = none +} +1895 = { + holding = none +} +1912 = { + holding = church_holding + 2555.1.1 = { + province_size = 2 + } +} ###c_burgos 1906 = { rite = compostelan_rite holding = castle_holding - 800.1.1 = { culture = castilian } + culture = castilian 1066.1.1 = { - buildings = { - curtain_walls_01 - military_camps_01 + buildings = { + curtain_walls_01 + military_camps_01 + } } + 2555.1.1 = { + province_size = 5 } } 1907 = { @@ -275,6 +367,9 @@ } 1898 = { holding = church_holding + 2555.1.1 = { + province_size = 3 + } } 1812 = { holding = none @@ -287,51 +382,42 @@ rite = compostelan_rite holding = castle_holding culture = castilian + 2555.1.1 = { + province_size = 4 + } } 1814 = { holding = city_holding + 2555.1.1 = { + province_size = 1 + } } 1813 = { - holding = city_holding + holding = none } 1904 = { holding = church_holding -} -1908 = { - holding = church_holding -} -###c_valladolid -1897 = { - rite = compostelan_rite - holding = castle_holding - 800.1.1 = { culture = castilian } -} -1896 = { - holding = none - 1066.1.1 = { - holding = city_holding + 2555.1.1 = { + province_size = 1 } } -1911 = { +1908 = { holding = none } -1895 = { - holding = church_holding -} -1912 = { - rite = compostelan_rite - holding = castle_holding - 800.1.1 = { culture = NEOW_andalusian} - 955.1.1 = { culture = castilian } -} ###c_soria 1900 = { holding = castle_holding culture = castilian rite = compostelan_rite + 2555.1.1 = { + province_size = 3 + } } 1901 = { holding = city_holding + 2555.1.1 = { + province_size = 1 + } } 1931 = { holding = none @@ -345,25 +431,36 @@ ###c_cuellar 1924 = { rite = compostelan_rite + culture = castilian holding = castle_holding special_building = alcazar_of_segovia_01 - 800.1.1 = { culture = NEOW_andalusian} - 955.1.1 = { culture = castilian } + 2555.1.1 = { + province_size = 4 + } } 1925 = { holding = church_holding + 2555.1.1 = { + province_size = 1 + } } 1926 = { - holding = city_holding + holding = none } ###c_olmedo 1922 = { culture = castilian rite = compostelan_rite holding = castle_holding + 2555.1.1 = { + province_size = 4 + } } 1915 = { holding = city_holding + 2555.1.1 = { + province_size = 1 + } } 1921 = { holding = none @@ -375,19 +472,22 @@ rite = compostelan_rite holding = castle_holding 1066.1.1 = { - buildings = { - pastures_01 - barracks_01 + buildings = { + pastures_01 + barracks_01 + } } + 2555.1.1 = { + province_size = 5 } } 1817 = { - holding = church_holding + holding = none } 1825 = { - holding = none - 1066.1.1 = { - holding = castle_holding + holding = church_holding + 2555.1.1 = { + province_size = 1 } } ###c_ponferrada @@ -395,285 +495,364 @@ holding = castle_holding culture = asturleonese rite = compostelan_rite + 2555.1.1 = { + province_size = 4 + } } 1824 = { - holding = none + holding = church_holding + 2555.1.1 = { + province_size = 2 + } } 1822 = { holding = city_holding + 2555.1.1 = { + province_size = 2 + } } ###c_zamora 1894 = { rite = compostelan_rite + culture = castilian holding = castle_holding - 800.1.1 = { culture = castilian } + 2555.1.1 = { + province_size = 4 + } } 1910 = { holding = city_holding + 2555.1.1 = { + province_size = 1 + } } 1826 = { - rite = compostelan_rite - holding = castle_holding - 800.1.1 = { culture = castilian } + holding = church_holding + 2555.1.1 = { + province_size = 2 + } } 1827 = { - holding = church_holding + holding = none } 1820 = { holding = none - culture = asturleonese - rite = compostelan_rite } ###c_salamanca 1828 = { rite = compostelan_rite holding = castle_holding culture = castilian + 2555.1.1 = { + province_size = 5 + } } 1829 = { - holding = city_holding + holding = none } 1913 = { holding = church_holding + 2555.1.1 = { + province_size = 2 + } } 1914 = { holding = city_holding + 2555.1.1 = { + province_size = 2 + } } ##d_toledo +###c_madrid +1923 = { + rite = compostelan_rite + culture = castilian + holding = castle_holding + special_building = madrid_university_01 + 2555.1.1 = { + province_size = 8 + } +} +1928 = { + holding = church_holding + 2555.1.1 = { + province_size = 5 + } +} ###c_toledo 1919 = { rite = compostelan_rite + culture = castilian holding = castle_holding special_building = toledo_steelworks_01 - 800.1.1 = { culture = NEOW_andalusian} 867.1.1 = { - buildings = { - regimental_grounds_01 + buildings = { + regimental_grounds_01 + } + duchy_capital_building = blacksmiths_01 } - duchy_capital_building = blacksmiths_01 - } - 955.1.1 = { culture = castilian } 1066.1.1 = { - buildings = { - curtain_walls_01 - farm_estates_01 + buildings = { + curtain_walls_01 + farm_estates_01 + } } + 2555.1.1 = { + province_size = 4 } } 1920 = { holding = church_holding + 2555.1.1 = { + province_size = 2 + } } 1918 = { holding = city_holding + 2555.1.1 = { + province_size = 4 + } } ###c_malagon 1962 = { culture = castilian rite = compostelan_rite holding = castle_holding + 2555.1.1 = { + province_size = 2 + } } 1961 = { - holding = church_holding + holding = none } 1958 = { holding = city_holding + 2555.1.1 = { + province_size = 2 + } } 1960 = { - holding = none -} -###c_madrid -1923 = { - rite = compostelan_rite - holding = castle_holding - special_building = madrid_university_01 - 800.1.1 = { culture = NEOW_andalusian} - 955.1.1 = { culture = castilian } -} -1928 = { holding = church_holding + 2555.1.1 = { + province_size = 1 + } } ###c_molina 1929 = { holding = castle_holding rite = compostelan_rite culture = castilian + 2555.1.1 = { + province_size = 4 + } } 1935 = { holding = castle_holding + 2555.1.1 = { + province_size = 1 + } } 1933 = { holding = none } 1927 = { holding = city_holding + 2555.1.1 = { + province_size = 3 + } } 1951 = { holding = none } ###c_cuenca 1947 = { - rite = compostelan_rite holding = castle_holding - 800.1.1 = { culture = NEOW_andalusian} - 939.1.1 = { rite = compostelan_rite } - 1235.1.1 = { culture = castilian rite = compostelan_rite + 2555.1.1 = { + province_size = 4 } } 1945 = { - holding = city_holding + holding = none } 1944 = { holding = none } 1899 = { holding = church_holding + 2555.1.1 = { + province_size = 1 + } } ##d_la_mancha -###c_calatrava -1963 = { - rite = compostelan_rite - holding = castle_holding - 800.1.1 = { culture = NEOW_andalusian} - 812.1.1 = { rite = compostelan_rite } - 1245.3.19 = { - culture = castilian - rite = compostelan_rite - } -} -1965 = { - holding = city_holding -} -1966 = { - holding = church_holding -} -1987 = { - rite = compostelan_rite - holding = castle_holding - 800.1.1 = { culture = NEOW_andalusian} - 812.1.1 = { rite = compostelan_rite } - 1245.3.19 = { - culture = castilian - rite = compostelan_rite - } -} ###c_alarcon 1948 = { holding = castle_holding culture = castilian rite = compostelan_rite + 2555.1.1 = { + province_size = 5 + } } 1949 = { holding = church_holding + 2555.1.1 = { + province_size = 3 + } } 1967 = { - holding = city_holding + holding = none } 1950 = { - culture = NEOW_andalusian + holding = city_holding + 2555.1.1 = { + province_size = 2 + } +} +###c_calatrava +1963 = { + culture = castilian rite = compostelan_rite holding = castle_holding + 2555.1.1 = { + province_size = 4 + } +} +1965 = { + holding = city_holding + 2555.1.1 = { + province_size = 3 + } +} +1966 = { + holding = none +} +1987 = { + holding = church_holding + 2555.1.1 = { + province_size = 1 + } } ###c_mora 1952 = { - rite = compostelan_rite - holding = castle_holding - 800.1.1 = { culture = NEOW_andalusian} - 939.1.1 = { rite = compostelan_rite } - 1235.1.1 = { culture = castilian rite = compostelan_rite + holding = castle_holding + 2555.1.1 = { + province_size = 2 } } 1953 = { - culture = castilian - rite = compostelan_rite holding = castle_holding + 2555.1.1 = { + province_size = 2 + } } 1959 = { holding = church_holding + 2555.1.1 = { + province_size = 2 + } } 1946 = { - holding = city_holding -} -1964 = { holding = none } +1964 = { + holding = city_holding + 2555.1.1 = { + province_size = 1 + } +} ##d_badajoz -###c_badajoz -1835 = { - rite = compostelan_rite - holding = castle_holding - 800.1.1 = { culture = NEOW_andalusian} - 812.1.1 = { rite = compostelan_rite } - 1245.3.19 = { +###c_merida +1834 = { culture = extremeno rite = compostelan_rite + holding = castle_holding + 2555.1.1 = { + province_size = 4 + } +} +1833 = { + holding = none +} +###c_badajoz +1835 = { + culture = extremeno + rite = compostelan_rite + holding = castle_holding + 2555.1.1 = { + province_size = 5 } } 1836 = { holding = city_holding + 2555.1.1 = { + province_size = 2 + } } 1990 = { holding = church_holding + 2555.1.1 = { + province_size = 2 + } } 1997 = { - holding = church_holding + holding = none } 1999 = { holding = church_holding + 2555.1.1 = { + province_size = 3 + } } ###c_plasencia 1831 = { culture = extremeno rite = compostelan_rite holding = castle_holding + 2555.1.1 = { + province_size = 3 + } } 1830 = { holding = city_holding + 2555.1.1 = { + province_size = 2 + } } 1917 = { holding = church_holding + 2555.1.1 = { + province_size = 2 + } } 1916 = { - holding = church_holding + holding = none } ###c_caceres 1954 = { - rite = compostelan_rite - holding = castle_holding - 800.1.1 = { culture = NEOW_andalusian} - 939.1.1 = { rite = compostelan_rite } - 1235.1.1 = { culture = extremeno rite = compostelan_rite + holding = castle_holding + 2555.1.1 = { + province_size = 4 } } 1832 = { - holding = city_holding + holding = church_holding + 2555.1.1 = { + province_size = 1 + } } 1955 = { - holding = none - 1066.1.1 = { holding = city_holding + 2555.1.1 = { + province_size = 1 } } 1956 = { - holding = church_holding -} -###c_merida -1834 = { - rite = compostelan_rite - holding = castle_holding - 800.1.1 = { culture = NEOW_andalusian} - 939.1.1 = { rite = compostelan_rite } - 1235.1.1 = { - culture = extremeno - rite = compostelan_rite - } -} -1833 = { holding = none } ###c_medellin @@ -681,12 +860,18 @@ culture = extremeno rite = compostelan_rite holding = castle_holding + 2555.1.1 = { + province_size = 3 + } } 1996 = { holding = church_holding + 2555.1.1 = { + province_size = 1 + } } 1989 = { - holding = city_holding + holding = none } 1957 = { holding = none @@ -697,32 +882,37 @@ ###c_zaragoza 1887 = { rite = compostelan_rite + culture = aragonese holding = castle_holding special_building_slot = aljaferia_palace_01 - 800.1.1 = { culture = NEOW_andalusian} 1066.1.1 = { - buildings = { - ramparts_01 - logging_camps_02 + buildings = { + ramparts_01 + logging_camps_02 + } + special_building = aljaferia_palace_01 } - special_building = aljaferia_palace_01 + 2555.1.1 = { + province_size = 7 } - 1178.1.1 = { culture = aragonese } } 1893 = { holding = church_holding + 2555.1.1 = { + province_size = 2 + } } 1885 = { holding = none } 1891 = { holding = none - 1066.1.1 = { - holding = church_holding - } } 1888 = { holding = city_holding + 2555.1.1 = { + province_size = 1 + } } ###c_teruel 1937 = { diff --git a/localization/english/replace/zz_NEOW_character_names_l_english.yml b/localization/english/replace/zz_NEOW_character_names_l_english.yml index c50a6e4c2..e20bd4d1e 100644 --- a/localization/english/replace/zz_NEOW_character_names_l_english.yml +++ b/localization/english/replace/zz_NEOW_character_names_l_english.yml @@ -11618,6 +11618,7 @@ Jaly:0 "Jaly" Jama:0 "Jama" Jamal:0 "Jamal" + Jamal_male:0 "Jamal" Jamanak:0 "Jamanak" Jamas:0 "Jamas" Jamel_spc_Eddine:0 "Jamel Eddine" @@ -25730,4 +25731,73 @@ Ahk_o_uml_bek:0 "Ahköbek" Ahmadiya:0 "Ahmadiya" Ahmathan:0 "Ahmathan" - A_c_ced_ah:0 "Açah" \ No newline at end of file + A_c_ced_ah:0 "Açah" + A_c_ced_ahmat:0 "Açahmat" + A_c_ced_ey:0 "Açey" + A_c_ced_emez:0 "Açemez" + Babi:0 "Babi" + Badinat:0 "Badinat" + Baybat_i_dot_r:0 "Baybatır" + Baydullah:0 "Baydullah" + Baym_i_dot_rza:0 "Baymırza" + Balba_s_ced_:0 "Balbaş" + Bap_i_dot_na:0 "Bapına" + Baraz:0 "Baraz" + Baraq:0 "Baraq" + Barisbiy:0 "Barisbiy" + Battal:0 "Battal" + Bat_i_dot_rbek:0 "Batırbek" + Bat_i_dot_rbiy:0 "Batırbiy" + Bawuk:0 "Bawuk" + Ba_c_ced_i:0 "Baçi" + Ba_s_ced_il:0 "Başil" + Ba_s_ced_il:0 "Başir" + Ba_s_ced__c_ced__i_dot_:0 "Başçı" + Bekbolat:0 "Bekbolat" + Bekm_i_dot_rza:0 "Bekmırza" + B_o_uml_r_u_uml_ka:0 "Börüka" + Bibo:0 "Bibo" + Biybert:0 "Biybert" + Biym_i_dot_rza:0 "Biymırza" + Biyn_o_uml_ger:0 "Biynöger" + Biysoltan:0 "Biysoltan" + Bilyal:0 "Bilyal" + Biso:0 "Biso" + Biyaka:0 "Biyaka" + Bota_s_ced_:0 "Botaş" + Botta:0 "Botta" + Buzjigit:0 "Buzjigit" + Ga_c_ced__i_dot_w:0 "Gaçıw" + Gilyastan:0 "Gilyastan" + Git_c_ced_e:0 "Gitçe" + Git_c_ced_ew:0 "Gitçew" + G_i_dot_kga:0 "Gıkga" + Dad_i_dot_k:0 "Dadık" + Dalhat:0 "Dalhat" + Dawlet:0 "Dawlet" + Dawut:0 "Dawut" + Didin:0 "Didin" + Dogalay:0 "Dogalay" + Domalay:0 "Domalay" + Dongay:0 "Dongay" + Dondu:0 "Dondu" + Dudaruq:0 "Dudaruq" + Duray:0 "Duray" + _O_uml_r_u_uml_zmek:0 "Örüzmek" + Jabrail:0 "Jabrail" + Jagafar:0 "Jagafar" + Jamarqul:0 "Jamarqul" + Janaqayt:0 "Janaqayt" + Janm_i_dot_rza:0 "Janmırza" + Jansuy:0 "Jansuy" + Janhot:0 "Janhot" + Jan_i_dot_bek:0 "Janıbek" + Jappu:0 "Jappu" + Jarahmat:0 "Jarahmat" + Jara_s_ced_t_i_dot_:0 "Jaraştı" + Jawbermez:0 "Jawbermez" + Ja_s_ced_akku:0 "Jaşakku" + Ja_s_ced_arbek:0 "Jaşarbek" + Ja_s_ced_aw:0 "Jaşaw" + Ja_s_ced__i_dot_w:0 "Jaşıw" + Jigit:0 "Jigit" \ No newline at end of file diff --git a/localization/english/replace/zz_NEOW_titles_l_english.yml b/localization/english/replace/zz_NEOW_titles_l_english.yml index 30cc33683..3095cc6e1 100644 --- a/localization/english/replace/zz_NEOW_titles_l_english.yml +++ b/localization/english/replace/zz_NEOW_titles_l_english.yml @@ -1571,6 +1571,14 @@ ## Castilla/Castile d_castilla:0 "Castile" d_castilla_adj:0 "Castilian" + # Valladolid + c_valladolid:0 "Valladolid" + c_valladolid_adj:0 "Vallisoletan" + b_valladolid:0 "Valladolid" + b_simancas:0 "Arroyo de la Encomienda" + b_valenciadecampos:0 "Mayorga" + b_toro:0 "Íscar" + b_avila:0 "Medina del Campo" # Burgos c_burgos:0 "Burgos" c_burgos_adj:0 "Burgalés" @@ -1587,14 +1595,6 @@ b_mirandadeebro:0 "Astudillo" b_sedano:0 "Saldaña" b_lerma:0 "Baltanás" - # Valladolid - c_valladolid:0 "Valladolid" - c_valladolid_adj:0 "Vallisoletan" - b_valladolid:0 "Valladolid" - b_simancas:0 "Arroyo de la Encomienda" - b_valenciadecampos:0 "Mayorga" - b_toro:0 "Íscar" - b_avila:0 "Medina del Campo" # Soria c_soria:0 "Soria" c_soria_adj:0 "Soriano" @@ -1709,6 +1709,11 @@ ## Badajoz/Extremadura d_badajoz:0 "Extremadura" d_badajoz_adj:0 "Extremaduran" + # Merida/Mérida + c_merida:0 "Mérida" + c_merida_adj:0 "Emeritense" + b_merida:0 "Mérida" + b_zalaca:0 "Albuquerque" # Badajoz c_badajoz:0 "Badajoz" c_badajoz_adj:0 "Badajocense" @@ -1731,11 +1736,6 @@ b_alcantara:0 "San Vicente de Alcántara" b_trujillo:0 "Trujillo" b_castilblanco:0 "Guadalupe" - # Merida/Mérida - c_merida:0 "Mérida" - c_merida_adj:0 "Emeritense" - b_merida:0 "Mérida" - b_zalaca:0 "Albuquerque" # Medellin/Don Benito c_medellin:0 "Don Benito" c_medellin_adj:0 "Dombenitense"