diff --git a/common/culture/name_equivalency/00_NEOW_male_names.txt b/common/culture/name_equivalency/00_NEOW_male_names.txt index 730db3e66..fb6a9c4cf 100644 --- a/common/culture/name_equivalency/00_NEOW_male_names.txt +++ b/common/culture/name_equivalency/00_NEOW_male_names.txt @@ -284,7 +284,7 @@ czeslaw_male = { _C_crn_eslovas Czes_l_stk_aw } dakota_angel_male = { Dakota Angel } damas_male = { D_a_act_maso Damas } damian_male = { Dami_a_act_n Dami_a_grv_ Damian Damian_o_act_s Damiano Damien Damijan Damjan Damyan } -daniel_male = { D_a_brv_nu_t_cma_ Daan Dahnyuhl Dan Dan_i_act_el Danail Danas Danel Dani_e_grv_ Dani_e_grv_l Dani_e_uml_l Dani_i_act_l Daniel Daniele Danielius Daniels Daniial Daniil Danijal Danijel Danilo Daniyal Danyuhl Danyul Danny Danyal Deiniol Tanel Taneli } +daniel_male = { D_a_brv_nu_t_cma_ Daan Dahnyuhl Dan Dan_i_act_el Danail Danas Danel Dani_e_grv_ Dani_e_grv_l Dani_e_uml_l Dani_i_act_l Daniel Daniele Danielius Daniels Daniial Daniil Danijal Danijel Danilo Daniyal Danyuhl Danyul Danny Dany Danyal Deiniol Tanel Taneli } 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 Daar_pst_n Daron Daroon Darun Dayrun } darwish_male = { Darbish Dervish } @@ -418,7 +418,7 @@ frederick_male = { Bed_r_crn_ich Bjedrich Federico Federicu Federigo Ffred Ffrhy frederickhenry_male = { Fritz-Heiner } frederickwilliam_male = { Friedrich-Wilhelm Frjedrich-Wje_l_stk_i_c_crn_k } friedemann_male = { Friedemann Frjedom_e_crn_n } -fuad_male = { Foued Fu_pst_ad Fuat } +fuad_male = { Fouad Foued Fu_pst_ad Fuat } fulk_male = { Ffulk } gabriel_male = { Biel D_z_stk_abrail Djibril Gabri_e_act_u Gabriel Gabriello Gabrielo Gabriele_male Gabrielius Gabryyll Gaby Gavrail Gavri_i_act_l Gavriil Gavril Grabiel Havr_i_hat__i_hat_l Zhabra_g_dot_il Zhabrail } gael_male = { Ga_e_grv_l Ga_e_uml_l Gael } @@ -598,7 +598,7 @@ jesusemmanuel_male = { Ches_u_act_s_spc_Manuel Jes_u_act_s_spc_Manuel Xes_u_act_ jesusmaria_male = { Ches_u_act_s_spc_Mar_i_act_a Jes_u_act_s_spc_Mar_i_act_a Xes_u_act_s_spc_Mar_i_act_a } jesusmichael_male = { Ches_u_act_s_spc_Miguel } jesusxavier_male = { Ches_u_act_s_spc_Chabier Xes_u_act_s_spc_Xavier } -jihad_male = { Cihat } +jihad_male = { Cihat Jihad } joachim_male = { Achim Aki Akim Chuaqu_i_act_n Gioacchino Ioachim Ioake_i_act_m Iokin J_a_act_chym J_o_act_chymj Jaakkima Jak_i_hat_m Jakim Joachim Joakim Joakin Joaqu_i_act_n Joaquim Jochem Jochen Jochum Jogchum Jokin Jokum Jouachin Quim Xaqu_i_act_n Xuaqu_i_act_n Yakim } job_male = { Ejup Ey_u_uml_p Eyy_u_uml_p Job } joel_male = { Choel Jo_e_uml_l Joel Jou_e_grv_l Xoel Yevel Yo_e_uml_l Yoel } @@ -761,7 +761,7 @@ malcolm_male = { Maelcwn Mailcolm Malcolm } malik_male = { M_a_uml_l_i_dot_k Malek Malik Mallyc Malyc Malyk Melik } malthe_male = { Malte Malthe } manfred_male = { Manfred Manfredi Manfredo Manfrid Manfried } -mansur_male = { Mansur Mensur } +mansur_male = { Mansour Mansur Mensur } maqsud_male = { Maq_pst_sud Maqs_u_crn_t } marcel_male = { Marc_e_grv_u Marcel Marcelis Marcello Marcelo Marcelu Markel Marsel Marsell Martxel Martxelo Selle } marcelinus_male = { Marcel_mdn_l_i_act_ Marcelino Marcelinu Marcellino Marcellinus Martzelino } @@ -862,7 +862,7 @@ nicholaspeter_male = { Claas-Peter Klaus-Peter } nicodemus_male = { Nicodim Nik_o_act_dimos Nikodem Teemu } nihad_male = { Nihat } nimat_male = { Ny_g_brv_met } -nimatullah_male = { Nimetullah } +nimatullah_male = { Nematallah Nimetullah } niyazi_male = { Nijazi Niyazi } nizamuddin_male = { Nizamettin } noah_male = { N_o_act_i No_e_act_ No_e_grv_ Noah Noa_h_crn_o Nojus Nou_e_grv_ Noy Nuhi } @@ -1239,7 +1239,7 @@ yasser_male = { Jasir Yaser Yasir } yassin_male = { Yacine Yassin Yassine } yechezkel_male = { Je_h_crn_ezkelo Yechezkel } yves_male = { Eozen Erwan Erwann Ives Ivo Youen Youenn Youn Yves Yvon Yvonig Yvonnick } -zachary_male = { Sachary Sakari Saku Sashary Z_a_grv_cher Zacar_i_grv_o Zach Zachar_i_act_as Zachary Zahari Zaichairi Zakari Zakario Zakhar Zekirja Zeqirija } +zachary_male = { Sachary Sakari Saku Sashary Z_a_grv_cher Zacar_i_grv_o Zach Zachar_i_act_as Zachary Zahari Zaichairi Zakari Zakaria Zakario Zakhar Zekirja Zeqirija } zadok_male = { Zadoc Zadok } zafar_male = { Zafer } zafir_male = { Zafir Zapir } diff --git a/common/culture/name_lists/NEOW_maronite.txt b/common/culture/name_lists/NEOW_maronite.txt index 7c625cfe3..ca9f0f635 100644 --- a/common/culture/name_lists/NEOW_maronite.txt +++ b/common/culture/name_lists/NEOW_maronite.txt @@ -6,6 +6,7 @@ dynasty_names = { "dynn_Abdallah" "dynn_Abboud" + "dynn_Abdelnour" "dynn_Abed" "dynn_Abi_dsh_Nader" "dynn_Alwan" @@ -31,6 +32,7 @@ "dynn_Chebala" "dynn_Chehab" "dynn_Chedid" + "dynn_Chemali" "dynn_El_dsh_Hajj" "dynn_El_dsh_Warcha" "dynn_Harb" @@ -50,34 +52,39 @@ male_names = { _E_act_mile - Abdallah Alain Antoine Antoun Augustin + Abdallah Alain Antoine Antoun Assaad Augustin Bechara Boulos Boutros Chamel Charbel Choukrallah + Dany Dory Elias - Fadi Fran_c_ced_ois Francis - Gaby Gebran Gennadios Georges Ghattas Guy-Paul + Fadi Fouad Fran_c_ced_ois Francis + Gaby Gebran Gennadios Georges Ghassan Ghattas Guy-Paul Habib Hamid Hanna_male - Jawad + Jawad Jihad Kamil_Camillus Khalil Louis - Mario Maroun Maurice Michel Mohsen - Nabil Nadim Najib Nasser Nicolas + Mansour Mario Maroun Maurice Michel Mohsen Mounir + Nabil Nadim Najib Nasser Nematallah Nicolas Nimr Paul Philippe Pierre - Rafik Raymond Ren_e_act_ Roland + Rafik Rami Raymond Ren_e_act_ Richard Roger Roland Sami Samir Selim Simon Sleiman - Tobia + Tarek Tobia Youhanna Youssef + Zakaria } female_names = { Andr_e_act_e Chantal Claudine + Elissar Hoda Hortense - Jeanette + Ingrid + Jacqueline Jeanette Lamia May Mich_e_grv_le Mireille Mouna - Nadia Nayla Nour - Rima + Nadia Nayla Norma Nour + Rima Rita Samia + Tamara Tracy } dynasty_of_location_prefix = "dynnp_of" diff --git a/common/dynasties/NEOW_dynasties.txt b/common/dynasties/NEOW_dynasties.txt index 0a85498ad..10cad8ce7 100644 --- a/common/dynasties/NEOW_dynasties.txt +++ b/common/dynasties/NEOW_dynasties.txt @@ -1408,7 +1408,7 @@ lorusso_dynasty = { } innocenti_dynasty = { - name = dynn_innocenti + name = dynn_Innocenti culture = tuscan } @@ -1570,23 +1570,24 @@ lambo_dynasty = { culture = emilian } -volterra_dynasty = { - name = dynn_volterra +volpi_dynasty = { + name = dynn_Volpi culture = tuscan } -mastropiero_dynasty = { - name = dynn_mastropiero +masini_dynasty = { + name = dynn_Masini culture = tuscan } montalcino_dynasty = { - name = dynn_montalcino + prefix = "dynnp_di" + name = dynn_Montalcino culture = tuscan } borri_dynasty = { - name = dynn_borri + name = dynn_Borri culture = tuscan } diff --git a/common/landed_titles/turkey.txt b/common/landed_titles/turkey.txt index f670b75f4..294cd7bf8 100644 --- a/common/landed_titles/turkey.txt +++ b/common/landed_titles/turkey.txt @@ -169,6 +169,10 @@ e_turky = { province = 5560 color = { 147 54 134 } } + b_oka = { # Gölpazarı + province = 5564 + color = { 147 54 134 } + } } c_abydos = { # Çanakkale color = { 175 20 100 } @@ -804,10 +808,6 @@ e_turky = { name_list_NEOW_greco_turkish = cn_chelai } } - b_nikomedia = { # Adapazarı - province = 741 - color = { 145 56 151 } - } b_nikaea = { # İznik province = 750 color = { 146 47 130 } @@ -824,29 +824,22 @@ e_turky = { color = { 145 56 151 } } } - c_lower_galatia = { - color = { 220 85 103 } + c_tarsos = { # Sakarya + color = { 145 56 112 } - cultural_names = { - name_list_NEOW_griko = cn_lower_galatia - name_list_NEOW_greek = cn_lower_galatia - name_list_NEOW_cypriot = cn_lower_galatia - name_list_NEOW_greco_turkish = cn_lower_galatia + b_nikomedia = { # Adapazarı + province = 741 + color = { 145 56 151 } } - - b_parnassos = { - province = 5632 - - color = { 220 85 103 } - - cultural_names = { - name_list_NEOW_griko = cn_parnassos - name_list_NEOW_greek = cn_parnassos - name_list_NEOW_cypriot = cn_parnassos - name_list_NEOW_greco_turkish = cn_parnassos - } + b_tarsos = { # Akyazı + province = 5569 + color = { 145 56 112 } } - } + b_prusias_ad_hypium = { # Hendek + province = 5567 + color = { 145 56 112 } + } + } } } @@ -1287,10 +1280,9 @@ e_turky = { } } } - d_cappadocia = { + d_cappadocia = { # Aksaray color = { 200 77 52 } - - capital = c_galatia + capital = c_lower_galatia # Aksaray cultural_names = { name_list_NEOW_griko = cn_kappadokia @@ -1298,67 +1290,19 @@ e_turky = { name_list_NEOW_cypriot = cn_kappadokia name_list_NEOW_greco_turkish = cn_kappadokia } - c_cappadocia = { - color = { 210 87 52 } + + c_lower_galatia = { # Aksaray + color = { 220 85 103 } cultural_names = { - name_list_NEOW_griko = cn_kappadokia - name_list_NEOW_greek = cn_kappadokia - name_list_NEOW_cypriot = cn_kappadokia - name_list_NEOW_greco_turkish = cn_kappadokia + name_list_NEOW_griko = cn_lower_galatia + name_list_NEOW_greek = cn_lower_galatia + name_list_NEOW_cypriot = cn_lower_galatia + name_list_NEOW_greco_turkish = cn_lower_galatia } - b_tyana = { - province = 760 - - color = { 200 77 52 } - - cultural_names = { - name_list_NEOW_griko = cn_tyana - name_list_NEOW_greek = cn_tyana - name_list_NEOW_cypriot = cn_tyana - name_list_NEOW_greco_turkish = cn_tyana - } - } - b_papira = { - province = 753 - - color = { 210 25 120 } - - cultural_names = { - name_list_NEOW_griko = cn_ankyra - name_list_NEOW_greek = cn_ankyra - name_list_NEOW_cypriot = cn_ankyra - name_list_NEOW_greco_turkish = cn_ankyra - } - } - b_ecobrogis = { - province = 5684 - - color = { 210 25 120 } - - cultural_names = { - name_list_NEOW_griko = cn_ecobrogis - name_list_NEOW_greek = cn_ecobrogis - name_list_NEOW_cypriot = cn_ecobrogis - name_list_NEOW_greco_turkish = cn_ecobrogis - } - } - b_tabia = { - province = 5683 - - color = { 210 25 120 } - - cultural_names = { - name_list_NEOW_griko = cn_tabia - name_list_NEOW_greek = cn_tabia - name_list_NEOW_cypriot = cn_tabia - name_list_NEOW_greco_turkish = cn_tabia - } - } - b_garsaura = { + b_garsaura = { # Aksaray province = 5630 - color = { 200 77 52 } cultural_names = { @@ -1368,9 +1312,30 @@ e_turky = { name_list_NEOW_greco_turkish = cn_garsaura } } - b_nazianzus = { - province = 5631 + b_zeila_CHA = { # Nevşehir + province = 5622 + color = { 205 118 118 } + cultural_names = { + name_list_NEOW_griko = cn_zela + name_list_NEOW_greek = cn_zela + name_list_NEOW_cypriot = cn_zela + name_list_NEOW_greco_turkish = cn_zela + } + } + b_parnassos = { # Ortaköy + province = 5632 + color = { 220 85 103 } + + cultural_names = { + name_list_NEOW_griko = cn_parnassos + name_list_NEOW_greek = cn_parnassos + name_list_NEOW_cypriot = cn_parnassos + name_list_NEOW_greco_turkish = cn_parnassos + } + } + b_nazianzus = { # Eskil + province = 5631 color = { 200 77 52 } cultural_names = { @@ -1380,9 +1345,89 @@ e_turky = { name_list_NEOW_greco_turkish = cn_nazianzus } } - b_cybistra = { - province = 5628 + } + c_kirsehir = { # Kırşehir + color = { 121 148 89 } + + b_aspona_CHA = { # Kırşehir + province = 5620 + color = { 205 130 85 } + cultural_names = { + name_list_NEOW_griko = cn_aspona + name_list_NEOW_greek = cn_aspona + name_list_NEOW_cypriot = cn_aspona + name_list_NEOW_greco_turkish = cn_aspona + } + } + b_ecobrogis = { # Kırıkkale + province = 5684 + color = { 210 25 120 } + + cultural_names = { + name_list_NEOW_griko = cn_ecobrogis + name_list_NEOW_greek = cn_ecobrogis + name_list_NEOW_cypriot = cn_ecobrogis + name_list_NEOW_greco_turkish = cn_ecobrogis + } + } + b_papira = { # Kaman + province = 753 + color = { 210 25 120 } + + cultural_names = { + name_list_NEOW_griko = cn_ankyra + name_list_NEOW_greek = cn_ankyra + name_list_NEOW_cypriot = cn_ankyra + name_list_NEOW_greco_turkish = cn_ankyra + } + } + b_soanda = { # Çiçekdağı + province = 5619 + color = { 205 130 85 } + + cultural_names = { + name_list_NEOW_griko = cn_soanda + name_list_NEOW_greek = cn_soanda + name_list_NEOW_cypriot = cn_soanda + name_list_NEOW_greco_turkish = cn_soanda + } + } + } + c_kyzistra = { # Niğde + color = { 205 118 118 } + + cultural_names = { + name_list_NEOW_griko = cn_kyzistra + name_list_NEOW_greek = cn_kyzistra + name_list_NEOW_cypriot = cn_kyzistra + name_list_NEOW_greco_turkish = cn_kyzistra + } + + b_tyana = { # Niğde + province = 760 + color = { 200 77 52 } + + cultural_names = { + name_list_NEOW_griko = cn_tyana + name_list_NEOW_greek = cn_tyana + name_list_NEOW_cypriot = cn_tyana + name_list_NEOW_greco_turkish = cn_tyana + } + } + b_galatia = { # Ereğli + province = 752 + color = { 205 130 85 } + + cultural_names = { + name_list_NEOW_griko = cn_mocissus + name_list_NEOW_greek = cn_mocissus + name_list_NEOW_cypriot = cn_mocissus + name_list_NEOW_greco_turkish = cn_mocissus + } + } + b_cybistra = { # Bor + province = 5628 color = { 200 77 52 } cultural_names = { @@ -1392,9 +1437,19 @@ e_turky = { name_list_NEOW_greco_turkish = cn_cybistra } } + b_kyzistra = { # Çiftlik + province = 5623 + color = { 205 118 118 } + + cultural_names = { + name_list_NEOW_griko = cn_kyzistra + name_list_NEOW_greek = cn_kyzistra + name_list_NEOW_cypriot = cn_kyzistra + name_list_NEOW_greco_turkish = cn_kyzistra + } + } } } - d_charsianon = { color = { 215 120 85 } @@ -1453,40 +1508,26 @@ e_turky = { name_list_NEOW_greco_turkish = cn_euaissa } } - b_galatia = { - province = 752 + } + c_cappadocia = { + color = { 210 87 52 } - color = { 205 130 85 } - - cultural_names = { - name_list_NEOW_griko = cn_mocissus - name_list_NEOW_greek = cn_mocissus - name_list_NEOW_cypriot = cn_mocissus - name_list_NEOW_greco_turkish = cn_mocissus - } + cultural_names = { + name_list_NEOW_griko = cn_kappadokia + name_list_NEOW_greek = cn_kappadokia + name_list_NEOW_cypriot = cn_kappadokia + name_list_NEOW_greco_turkish = cn_kappadokia } - b_soanda = { - province = 5619 - color = { 205 130 85 } + b_tabia = { + province = 5683 + color = { 210 25 120 } cultural_names = { - name_list_NEOW_griko = cn_soanda - name_list_NEOW_greek = cn_soanda - name_list_NEOW_cypriot = cn_soanda - name_list_NEOW_greco_turkish = cn_soanda - } - } - b_aspona_CHA = { - province = 5620 - - color = { 205 130 85 } - - cultural_names = { - name_list_NEOW_griko = cn_aspona - name_list_NEOW_greek = cn_aspona - name_list_NEOW_cypriot = cn_aspona - name_list_NEOW_greco_turkish = cn_aspona + name_list_NEOW_griko = cn_tabia + name_list_NEOW_greek = cn_tabia + name_list_NEOW_cypriot = cn_tabia + name_list_NEOW_greco_turkish = cn_tabia } } } @@ -1549,41 +1590,6 @@ e_turky = { } } } - c_kyzistra = { - color = { 205 118 118 } - - cultural_names = { - name_list_NEOW_griko = cn_kyzistra - name_list_NEOW_greek = cn_kyzistra - name_list_NEOW_cypriot = cn_kyzistra - name_list_NEOW_greco_turkish = cn_kyzistra - } - - b_kyzistra = { - province = 5623 - - color = { 205 118 118 } - - cultural_names = { - name_list_NEOW_griko = cn_kyzistra - name_list_NEOW_greek = cn_kyzistra - name_list_NEOW_cypriot = cn_kyzistra - name_list_NEOW_greco_turkish = cn_kyzistra - } - } - b_zeila_CHA = { - province = 5622 - - color = { 205 118 118 } - - cultural_names = { - name_list_NEOW_griko = cn_zela - name_list_NEOW_greek = cn_zela - name_list_NEOW_cypriot = cn_zela - name_list_NEOW_greco_turkish = cn_zela - } - } - } } } @@ -1891,22 +1897,6 @@ e_turky = { name_list_NEOW_greco_turkish = cn_krateia } } - b_prusias_ad_hypium = { # Hendek - province = 5567 - color = { 145 56 112 } - } - } - c_tarsos = { - color = { 145 56 112 } - - b_tarsos = { # Akyazı - province = 5569 - color = { 145 56 112 } - } - b_oka = { # Gölpazarı - province = 5564 - color = { 147 54 134 } - } b_modra = { province = 5568 @@ -1918,8 +1908,8 @@ e_turky = { name_list_NEOW_cypriot = cn_modra name_list_NEOW_greco_turkish = cn_modra } - } - } + } + } } d_paphlagonia = { color = { 205 127 158 } diff --git a/gfx/map/map_object_data/activities.txt b/gfx/map/map_object_data/activities.txt index b1d65852a..4f94c6579 100644 --- a/gfx/map/map_object_data/activities.txt +++ b/gfx/map/map_object_data/activities.txt @@ -11,6 +11,24 @@ rotation={ -0.000000 -0.570402 -0.000000 0.821366 } scale={ 1.000000 1.000000 1.000000 } } + { + id=0 + position={ 2685.065674 0.000000 2200.129395 } + rotation={ -0.000000 0.371095 -0.000000 0.928595 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=0 + position={ 2694.584473 0.000000 2303.222900 } + rotation={ -0.000000 0.320708 -0.000000 0.947178 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=0 + position={ 2727.861084 0.000000 2326.511963 } + rotation={ -0.000000 -0.327320 -0.000000 0.944914 } + scale={ 1.000000 1.000000 1.000000 } + } { id=1 position={ 258.331116 0.000000 4468.756836 } @@ -3997,13 +4015,13 @@ } { id=752 - position={ 2892.904053 0.000000 2357.012207 } + position={ 2892.040283 0.000000 2251.587646 } rotation={ -0.000000 0.363374 -0.000000 0.931643 } scale={ 1.000000 1.000000 1.000000 } } { id=753 - position={ 2822.455811 0.000000 2420.794434 } + position={ 2849.133057 0.000000 2369.314941 } rotation={ -0.000000 -0.284907 -0.000000 0.958555 } scale={ 1.000000 1.000000 1.000000 } } @@ -4045,7 +4063,7 @@ } { id=760 - position={ 2911.854492 0.000000 2259.573730 } + position={ 2911.630859 0.000000 2263.194580 } rotation={ -0.000000 -0.576227 -0.000000 0.817289 } scale={ 1.000000 1.000000 1.000000 } } @@ -30541,13 +30559,13 @@ } { id=5619 - position={ 2876.000000 0.000000 2386.000000 } + position={ 2895.178711 0.000000 2384.023193 } rotation={ -0.000000 0.205107 -0.000000 0.978739 } scale={ 1.000000 1.000000 1.000000 } } { id=5620 - position={ 2857.111816 0.000000 2371.393311 } + position={ 2890.614990 0.000000 2351.466797 } rotation={ -0.000000 0.300286 -0.000000 0.953849 } scale={ 1.000000 1.000000 1.000000 } } @@ -30559,13 +30577,13 @@ } { id=5622 - position={ 2898.204102 0.000000 2321.860352 } + position={ 2901.321045 0.000000 2315.369141 } rotation={ -0.000000 -0.393316 -0.000000 0.919403 } scale={ 1.000000 1.000000 1.000000 } } { id=5623 - position={ 2914.912354 0.000000 2301.335938 } + position={ 2902.461182 0.000000 2293.295410 } rotation={ -0.000000 0.415588 -0.000000 0.909553 } scale={ 1.000000 1.000000 1.000000 } } @@ -30595,7 +30613,7 @@ } { id=5628 - position={ 2890.941406 0.000000 2254.280273 } + position={ 2864.197998 0.000000 2255.279297 } rotation={ -0.000000 -0.386544 -0.000000 0.922271 } scale={ 1.000000 1.000000 1.000000 } } @@ -30607,19 +30625,25 @@ } { id=5630 - position={ 2870.646973 0.000000 2291.002197 } + position={ 2865.305176 0.000000 2289.946777 } rotation={ -0.000000 -0.380117 -0.000000 0.924938 } scale={ 1.000000 1.000000 1.000000 } } { id=5631 - position={ 2903.817383 0.000000 2289.715820 } + position={ 2841.578613 0.000000 2280.012207 } rotation={ -0.000000 -0.404259 -0.000000 0.914645 } scale={ 1.000000 1.000000 1.000000 } } + { + id=0 + position={ 2871.864502 0.000000 2326.454102 } + rotation={ -0.000000 0.241101 -0.000000 0.970500 } + scale={ 1.000000 1.000000 1.000000 } + } { id=5632 - position={ 2841.055176 0.000000 2347.151855 } + position={ 2871.864502 0.000000 2326.454102 } rotation={ -0.000000 0.241101 -0.000000 0.970500 } scale={ 1.000000 1.000000 1.000000 } } @@ -30689,12 +30713,6 @@ rotation={ -0.000000 0.343391 -0.000000 0.939193 } scale={ 1.000000 1.000000 1.000000 } } - { - id=0 - position={ 2685.065674 0.000000 2200.129395 } - rotation={ -0.000000 0.371095 -0.000000 0.928595 } - scale={ 1.000000 1.000000 1.000000 } - } { id=5644 position={ 2685.065674 0.000000 2200.129395 } @@ -30743,12 +30761,6 @@ rotation={ -0.000000 0.339203 -0.000000 0.940713 } scale={ 1.000000 1.000000 1.000000 } } - { - id=0 - position={ 2694.584473 0.000000 2303.222900 } - rotation={ -0.000000 0.320708 -0.000000 0.947178 } - scale={ 1.000000 1.000000 1.000000 } - } { id=5652 position={ 2694.584473 0.000000 2303.222900 } @@ -30785,12 +30797,6 @@ rotation={ -0.000000 -0.372200 -0.000000 0.928153 } scale={ 1.000000 1.000000 1.000000 } } - { - id=0 - position={ 2727.861084 0.000000 2326.511963 } - rotation={ -0.000000 -0.327320 -0.000000 0.944914 } - scale={ 1.000000 1.000000 1.000000 } - } { id=5658 position={ 2727.861084 0.000000 2326.511963 } diff --git a/gfx/map/map_object_data/building_locators.txt b/gfx/map/map_object_data/building_locators.txt index efc30df03..bbdbfc43a 100644 --- a/gfx/map/map_object_data/building_locators.txt +++ b/gfx/map/map_object_data/building_locators.txt @@ -3991,13 +3991,13 @@ } { id=752 - position={ 2901.077637 0.000000 2353.085449 } - rotation={ -0.000000 -0.446319 -0.000000 0.894874 } + position={ 2872.335938 0.000000 2243.763672 } + rotation={ -0.000000 -0.007569 -0.000000 0.999971 } scale={ 1.000000 1.000000 1.000000 } } { id=753 - position={ 2820.077637 0.000000 2413.085449 } + position={ 2853.827148 0.000000 2376.792236 } rotation={ -0.000000 -0.570637 -0.000000 0.821202 } scale={ 1.000000 1.000000 1.000000 } } @@ -4039,8 +4039,8 @@ } { id=760 - position={ 2907.077637 0.000000 2266.085449 } - rotation={ -0.000000 -0.986104 -0.000000 -0.166129 } + position={ 2887.222412 0.000000 2267.718262 } + rotation={ -0.000000 -0.169885 -0.000000 0.985464 } scale={ 1.000000 1.000000 1.000000 } } { @@ -30535,13 +30535,13 @@ } { id=5619 - position={ 2880.077637 0.000000 2377.085449 } - rotation={ -0.000000 -0.999043 -0.000000 -0.043733 } + position={ 2890.658691 0.000000 2389.973633 } + rotation={ -0.000000 -0.424073 -0.000000 -0.905628 } scale={ 1.000000 1.000000 1.000000 } } { id=5620 - position={ 2865.077637 0.000000 2368.085449 } + position={ 2879.886963 0.000000 2364.868652 } rotation={ -0.000000 -0.283785 -0.000000 -0.958888 } scale={ 1.000000 1.000000 1.000000 } } @@ -30553,14 +30553,14 @@ } { id=5622 - position={ 2891.077637 0.000000 2326.085449 } + position={ 2903.448730 0.000000 2324.254639 } rotation={ -0.000000 -0.851324 -0.000000 -0.524640 } scale={ 1.000000 1.000000 1.000000 } } { id=5623 - position={ 2922.077637 0.000000 2296.085449 } - rotation={ -0.000000 -0.780009 -0.000000 0.625768 } + position={ 2881.924316 0.000000 2283.968994 } + rotation={ -0.000000 -0.612683 -0.000000 0.790329 } scale={ 1.000000 1.000000 1.000000 } } { @@ -30589,8 +30589,8 @@ } { id=5628 - position={ 2879.077637 0.000000 2257.085449 } - rotation={ -0.000000 -0.452623 -0.000000 0.891702 } + position={ 2872.310303 0.000000 2262.005371 } + rotation={ -0.000000 -0.973010 -0.000000 -0.230763 } scale={ 1.000000 1.000000 1.000000 } } { @@ -30601,19 +30601,19 @@ } { id=5630 - position={ 2866.077637 0.000000 2299.085449 } + position={ 2872.764893 0.000000 2300.994385 } rotation={ -0.000000 -0.881387 -0.000000 -0.472395 } scale={ 1.000000 1.000000 1.000000 } } { id=5631 - position={ 2890.849609 0.000000 2292.879883 } + position={ 2842.315918 0.000000 2300.488770 } rotation={ -0.000000 -0.796859 -0.000000 -0.604165 } scale={ 1.000000 1.000000 1.000000 } } { id=5632 - position={ 2848.077637 0.000000 2343.085449 } + position={ 2869.137939 0.000000 2335.629395 } rotation={ -0.000000 -0.522768 -0.000000 -0.852475 } scale={ 1.000000 1.000000 1.000000 } } diff --git a/gfx/map/map_object_data/combat_locators.txt b/gfx/map/map_object_data/combat_locators.txt index 33e86d720..bb586bf9c 100644 --- a/gfx/map/map_object_data/combat_locators.txt +++ b/gfx/map/map_object_data/combat_locators.txt @@ -4381,13 +4381,13 @@ } { id=752 - position={ 2902.373047 0.000000 2366.186523 } + position={ 2887.468262 0.000000 2245.718262 } rotation={ -0.000000 0.992649 -0.000000 -0.121029 } scale={ 1.000000 1.000000 1.000000 } } { id=753 - position={ 2814.997559 0.000000 2427.136719 } + position={ 2844.602783 0.000000 2378.578613 } rotation={ -0.000000 -0.910866 -0.000000 0.412702 } scale={ 1.000000 1.000000 1.000000 } } @@ -4429,7 +4429,7 @@ } { id=760 - position={ 2891.942627 0.000000 2270.153320 } + position={ 2913.357178 0.000000 2281.213135 } rotation={ -0.000000 -0.959104 -0.000000 0.283052 } scale={ 1.000000 1.000000 1.000000 } } @@ -32431,13 +32431,13 @@ } { id=5619 - position={ 2871.077148 0.000000 2390.880127 } + position={ 2864.622559 0.000000 2390.773193 } rotation={ -0.000000 -0.943501 -0.000000 0.331370 } scale={ 1.000000 1.000000 1.000000 } } { id=5620 - position={ 2852.813232 0.000000 2375.540527 } + position={ 2908.118652 0.000000 2359.373291 } rotation={ -0.000000 -0.966339 -0.000000 0.257269 } scale={ 1.000000 1.000000 1.000000 } } @@ -32449,13 +32449,13 @@ } { id=5622 - position={ 2880.000000 0.000000 2341.000000 } - rotation={ -0.000000 -0.904716 -0.000000 0.426015 } + position={ 2886.193115 0.000000 2331.977783 } + rotation={ -0.000000 -0.998552 -0.000000 0.053797 } scale={ 1.000000 1.000000 1.000000 } } { id=5623 - position={ 2915.783936 0.000000 2312.138916 } + position={ 2915.009766 0.000000 2302.145996 } rotation={ -0.000000 -0.975931 -0.000000 0.218082 } scale={ 1.000000 1.000000 1.000000 } } @@ -32485,7 +32485,7 @@ } { id=5628 - position={ 2870.531250 0.000000 2264.765625 } + position={ 2853.016113 0.000000 2272.733398 } rotation={ -0.000000 -0.991903 -0.000000 0.126995 } scale={ 1.000000 1.000000 1.000000 } } @@ -32497,19 +32497,19 @@ } { id=5630 - position={ 2861.000000 0.000000 2314.000000 } - rotation={ -0.000000 -0.840682 -0.000000 0.541530 } + position={ 2866.211182 0.000000 2312.093994 } + rotation={ -0.000000 -0.987634 -0.000000 0.156781 } scale={ 1.000000 1.000000 1.000000 } } { id=5631 - position={ 2894.000000 0.000000 2303.000000 } + position={ 2845.878418 0.000000 2286.547363 } rotation={ -0.000000 -0.997052 -0.000000 0.076725 } scale={ 1.000000 1.000000 1.000000 } } { id=5632 - position={ 2837.878418 0.000000 2353.435547 } + position={ 2864.468994 0.000000 2345.703613 } rotation={ 0.000000 0.000000 0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } diff --git a/gfx/map/map_object_data/player_stack_locators.txt b/gfx/map/map_object_data/player_stack_locators.txt index d55a649d0..4e3cc2b6c 100644 --- a/gfx/map/map_object_data/player_stack_locators.txt +++ b/gfx/map/map_object_data/player_stack_locators.txt @@ -4381,13 +4381,13 @@ } { id=752 - position={ 2908.000000 0.000000 2357.000000 } + position={ 2882.494873 0.000000 2255.447266 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=753 - position={ 2829.000000 0.000000 2420.000000 } + position={ 2857.296631 0.000000 2366.931641 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -4429,7 +4429,7 @@ } { id=760 - position={ 2911.000000 0.000000 2271.000000 } + position={ 2903.203613 0.000000 2258.073975 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -32431,13 +32431,13 @@ } { id=5619 - position={ 2888.000000 0.000000 2380.000000 } + position={ 2865.125244 0.000000 2400.308838 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5620 - position={ 2871.000000 0.000000 2370.000000 } + position={ 2890.714844 0.000000 2372.517822 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -32449,13 +32449,13 @@ } { id=5622 - position={ 2895.000000 0.000000 2334.000000 } + position={ 2907.742920 0.000000 2329.025635 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5623 - position={ 2928.000000 0.000000 2299.000000 } + position={ 2895.788330 0.000000 2299.252686 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -32485,7 +32485,7 @@ } { id=5628 - position={ 2887.000000 0.000000 2259.000000 } + position={ 2866.398926 0.000000 2273.161621 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -32497,19 +32497,19 @@ } { id=5630 - position={ 2873.000000 0.000000 2306.000000 } + position={ 2880.273193 0.000000 2309.197021 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5631 - position={ 2895.902832 0.000000 2295.058105 } + position={ 2851.593750 0.000000 2281.688232 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5632 - position={ 2851.685303 0.000000 2348.624268 } + position={ 2874.991455 0.000000 2346.005615 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -32821,7 +32821,7 @@ } { id=5684 - position={ 2853.000000 0.000000 2411.000000 } + position={ 2855.031738 0.000000 2409.716797 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } diff --git a/gfx/map/map_object_data/siege_locators.txt b/gfx/map/map_object_data/siege_locators.txt index 9d25c689a..7a1bc62ad 100644 --- a/gfx/map/map_object_data/siege_locators.txt +++ b/gfx/map/map_object_data/siege_locators.txt @@ -3991,13 +3991,13 @@ } { id=752 - position={ 2908.000000 0.000000 2349.000000 } - rotation={ 0.000000 0.864910 0.000000 -0.501927 } + position={ 2879.911377 0.000000 2248.974609 } + rotation={ -0.000000 0.556272 -0.000000 -0.831000 } scale={ 1.000000 1.000000 1.000000 } } { id=753 - position={ 2829.000000 0.000000 2412.000000 } + position={ 2862.749512 0.000000 2375.706787 } rotation={ 0.000000 0.745128 0.000000 -0.666921 } scale={ 1.000000 1.000000 1.000000 } } @@ -4039,8 +4039,8 @@ } { id=760 - position={ 2898.000000 0.000000 2264.000000 } - rotation={ 0.000000 0.780042 0.000000 0.625727 } + position={ 2899.639160 0.000000 2270.459473 } + rotation={ -0.000000 0.628695 -0.000000 -0.777652 } scale={ 1.000000 1.000000 1.000000 } } { @@ -30535,13 +30535,13 @@ } { id=5619 - position={ 2886.000000 0.000000 2371.000000 } - rotation={ 0.000000 0.923880 0.000000 -0.382684 } + position={ 2880.540039 0.000000 2389.129639 } + rotation={ -0.000000 0.767149 -0.000000 0.641470 } scale={ 1.000000 1.000000 1.000000 } } { id=5620 - position={ 2875.000000 0.000000 2366.000000 } + position={ 2889.809326 0.000000 2362.783203 } rotation={ 0.000000 0.773342 0.000000 -0.633989 } scale={ 1.000000 1.000000 1.000000 } } @@ -30553,14 +30553,14 @@ } { id=5622 - position={ 2882.000000 0.000000 2328.000000 } + position={ 2894.371094 0.000000 2326.169189 } rotation={ 0.000000 0.625727 0.000000 0.780042 } scale={ 1.000000 1.000000 1.000000 } } { id=5623 - position={ 2933.000000 0.000000 2297.000000 } - rotation={ -0.000000 -0.674338 -0.000000 0.738423 } + position={ 2890.895508 0.000000 2290.894775 } + rotation={ -0.000000 -0.483666 -0.000000 0.875253 } scale={ 1.000000 1.000000 1.000000 } } { @@ -30589,8 +30589,8 @@ } { id=5628 - position={ 2887.000000 0.000000 2250.000000 } - rotation={ 0.000000 0.910633 0.000000 -0.413216 } + position={ 2860.254395 0.000000 2265.624512 } + rotation={ -0.000000 0.615346 -0.000000 0.788257 } scale={ 1.000000 1.000000 1.000000 } } { @@ -30601,19 +30601,19 @@ } { id=5630 - position={ 2857.000000 0.000000 2298.000000 } + position={ 2863.687256 0.000000 2299.908936 } rotation={ 0.000000 0.745128 0.000000 0.666921 } scale={ 1.000000 1.000000 1.000000 } } { id=5631 - position={ 2884.771973 0.000000 2286.794434 } + position={ 2836.238281 0.000000 2294.403320 } rotation={ 0.000000 0.923880 0.000000 0.382683 } scale={ 1.000000 1.000000 1.000000 } } { id=5632 - position={ 2840.000000 0.000000 2339.000000 } + position={ 2861.060303 0.000000 2331.543945 } rotation={ 0.000000 0.850651 0.000000 0.525731 } scale={ 1.000000 1.000000 1.000000 } } diff --git a/history/characters/NEOW_e_italia.txt b/history/characters/NEOW_e_italia.txt index 0ee7f7175..85ac48fb9 100644 --- a/history/characters/NEOW_e_italia.txt +++ b/history/characters/NEOW_e_italia.txt @@ -117,7 +117,7 @@ italy0004 = { } italy0005 = { - name = "Nicollo" + name = "Niccol_o_grv_" dynasty = innocenti_dynasty religion = "roman_catholic" culture = tuscan @@ -601,8 +601,8 @@ italy_ferruccio_lambo = { } italy_archibaldo_volterra = { - name = "Archibaldo" - dynasty = volterra_dynasty + name = "Archimede" + dynasty = volpi_dynasty religion = roman_catholic culture = tuscan trait = education_diplomacy_4 @@ -619,7 +619,7 @@ italy_archibaldo_volterra = { italy_riccardo_mastropiero = { name = "Riccardo" - dynasty = mastropiero_dynasty + dynasty = masini_dynasty religion = roman_catholic culture = tuscan trait = education_intrigue_3 diff --git a/history/provinces/e_turkey.txt b/history/provinces/e_turkey.txt index 86b868027..c086d7838 100644 --- a/history/provinces/e_turkey.txt +++ b/history/provinces/e_turkey.txt @@ -219,6 +219,86 @@ 5534 = { # Milas holding = none } +##d_cibyrrhaeot/Antalya ################################### +###c_lycia/Antalya +755 = { # Antalya + culture = egeli + religion = naqshbandi + holding = castle_holding +} +5643 = { # Kumluca + holding = city_holding +} +5645 = { # Kaş + holding = church_holding +} +5644 = { # Korkuteli + holding = none +} +5642 = { # Elmalı + holding = none +} +###c_galatia_salutaris/Afyonkarahisar +5659 = { # Afyonkarahisar + culture = egeli + religion = naqshbandi + holding = castle_holding +} +5660 = { # Çivril + holding = city_holding +} +5652 = { # Sandıklı + holding = church_holding +} +5654 = { # Bolvadin + holding = none +} +5658 = { # Emirdağ + holding = none +} +###c_selge/Alanya +5640 = { # Alanya + culture = cukurovali + religion = naqshbandi + holding = castle_holding +} +5641 = { # Manavgat + holding = city_holding +} +5664 = { # Serik + holding = church_holding +} +5639 = { # Gazipaşa + holding = none +} +5668 = { # Akseki + holding = none +} +###c_adada/Burdur +5665 = { # Burdur + culture = egeli + religion = naqshbandi + holding = castle_holding +} +5663 = { # Bucak + holding = church_holding +} +5646 = { # Yeşilova + holding = none +} +###c_isparta +754 = { # Isparta + culture = egeli + religion = naqshbandi + holding = castle_holding +} +5661 = { # Yalvaç + holding = city_holding +} +5662 = { # Şarkikaraağaç + holding = none +} +### k_anatolia/Anatolia ############################## ##d_ankara ################################### ###c_galatia/Ankara 5579 = { # Ankara @@ -338,83 +418,51 @@ 5669 = { # Bozkır holding = church_holding } -##d_cibyrrhaeot/Antalya ################################### -###c_lycia/Antalya -755 = { # Antalya - culture = egeli +##d_kırıkkale ################################### +###c_lower_galatia/Aksaray +5630 = { # Aksaray + culture = kapadokyali religion = naqshbandi holding = castle_holding } -5643 = { # Kumluca +5622 = { # Nevşehir holding = city_holding } -5645 = { # Kaş +5632 = { # Ortaköy holding = church_holding } -5644 = { # Korkuteli +5631 = { # Eskil holding = none } -5642 = { # Elmalı - holding = none -} -###c_galatia_salutaris/Afyonkarahisar -5659 = { # Afyonkarahisar - culture = egeli +###c_kirsehir/Kırşehir +5620 = { # Kırşehir + culture = kapadokyali religion = naqshbandi holding = castle_holding } -5660 = { # Çivril +5684 = { # Kırıkkale holding = city_holding } -5652 = { # Sandıklı +753 = { # Kaman holding = church_holding } -5654 = { # Bolvadin +5619 = { # Çiçekdağı holding = none } -5658 = { # Emirdağ - holding = none -} -###c_selge/Alanya -5640 = { # Alanya - culture = cukurovali +###c_nevsehir/Nevşehir +###c_nigde +760 = { # Niğde + culture = kapadokyali religion = naqshbandi holding = castle_holding } -5641 = { # Manavgat - holding = city_holding -} -5664 = { # Serik +752 = { # Ereğli holding = church_holding } -5639 = { # Gazipaşa +5628 = { # Bor holding = none } -5668 = { # Akseki - holding = none -} -###c_adada/Burdur -5665 = { # Burdur - culture = egeli - religion = naqshbandi - holding = castle_holding -} -5663 = { # Bucak - holding = church_holding -} -5646 = { # Yeşilova - holding = none -} -###c_isparta -754 = { # Isparta - culture = egeli - religion = naqshbandi - holding = castle_holding -} -5661 = { # Yalvaç - holding = city_holding -} -5662 = { # Şarkikaraağaç +5623 = { # Çiftlik holding = none } # custom @@ -432,16 +480,6 @@ } -# 753 - Ankyra -753 = { # 753 - Ankyra - - # Misc - culture = kapadokyali - religion = turkology - - holding = castle_holding -} - # 5565 - Chalcedon 5565 = { # 5565 - Chalcedon @@ -539,23 +577,10 @@ 5683 = { # 5683 - Tabia # Misc - culture = greek - religion = orthodox + culture = kapadokyali + religion = naqshbandi - holding = church_holding - - # History - -} - -# 5684 - Ecobrogis -5684 = { # 5684 - Ecobrogis - - # Misc - culture = greek - religion = orthodox - - holding = none + holding = castle_holding # History @@ -587,16 +612,6 @@ holding = castle_holding } -# 760 - Tyana -760 = { # 760 - Tyana - - # Misc - culture = kapadokyali - religion = naqshbandi - - holding = castle_holding -} - # 761 - Tarsus 761 = { # 761 - Tarsus @@ -749,64 +764,6 @@ } -# 5628 - Cybistra -5628 = { # 5628 - Cybistra - - # Misc - culture = greek - religion = orthodox - - holding = church_holding - - # History - 1100.1.1 = { - culture = turkmen - religion = maturidi - } -} - -# 5630 - Garsaura -5630 = { # 5630 - Garsaura - - # Misc - culture = greek - religion = orthodox - - holding = none - - # History - 1100.1.1 = { - culture = turkmen - religion = maturidi - } -} - -# 5631 - Nazianzus -5631 = { # 5631 - Nazianzus - - # Misc - culture = greek - religion = orthodox - - holding = church_holding - - # History - 1100.1.1 = { - culture = turkmen - religion = maturidi - } -} - -# 5632 - Parnassos -5632 = { # 5632 - Parnassos - - # Misc - culture = kapadokyali - religion = naqshbandi - - holding = castle_holding -} - # 5635 - Corycus 5635 = { # 5635 - Corycus @@ -963,16 +920,6 @@ } -# 752 - Galatia -752 = { # 752 - Galatia (AKA Mikissos) - - # Misc - culture = greek - religion = orthodox - - holding = city_holding -} - # 5581 - Amastris 5581 = { # XXXX - XXX @@ -1443,38 +1390,6 @@ } } -# 5619 - Soanda -5619 = { # 5619 - Soanda - - # Misc - culture = greek - religion = orthodox - - holding = none - - # History - 1100.1.1 = { - culture = turkmen - religion = maturidi - } -} - -# 5620 - Aspona_CHA -5620 = { # 5620 - Aspona - - # Misc - culture = greek - religion = orthodox - - holding = church_holding - - # History - 1100.1.1 = { - culture = turkmen - religion = maturidi - } -} - # 5621 - Euaissa 5621 = { # 5621 - Euaissa @@ -1491,32 +1406,6 @@ } } -# 5622 - Zeila_CHA -5622 = { # 5622 - Zeila - - # Misc - culture = greek - religion = orthodox - - holding = none - - # History - 1100.1.1 = { - culture = turkmen - religion = maturidi - } -} - -# 5623 - Kyzistra -5623 = { # 5623 - Kyzistra - - # Misc - culture = kapadokyali - religion = naqshbandi - - holding = castle_holding -} - # 5689 - Oinaion 5689 = { # 5689 - Oinaion diff --git a/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml b/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml index ab269c477..4c13c4587 100644 --- a/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml +++ b/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml @@ -7489,3 +7489,8 @@ dynn_Bostani:0 "Bostani" dynn_Chbeir:0 "Chbeir" dynn_Chebala:0 "Chebala" + dynn_Innocenti:0 "Innocenti" + dynn_Montalcino:0 "Montalcino" + dynn_Borri:0 "Borri" + dynn_Chemali:0 "Chemali" + dynn_Abdelnour:0 "Abdelnour" diff --git a/localization/english/replace/dynasties/zz_NEOW_dynasty_names_l_english.yml b/localization/english/replace/dynasties/zz_NEOW_dynasty_names_l_english.yml index 0f244f7ef..00d727290 100644 --- a/localization/english/replace/dynasties/zz_NEOW_dynasty_names_l_english.yml +++ b/localization/english/replace/dynasties/zz_NEOW_dynasty_names_l_english.yml @@ -286,7 +286,6 @@ dynn_russo:0 "Russo" dynn_guidi:0 "Guidi" dynn_lorusso:0 "Lorusso" - dynn_innocenti:0 "Innocenti" dynn_ferrari:0 "Ferrari" dynn_napolitano:0 "Napolitano" dynn_gasperi:0 "Gasperi" @@ -306,10 +305,6 @@ dynn_morrone:0 "Morrone" dynn_ocri:0 "Ocri" dynn_lambo:0 "Lamborghini" - dynn_volterra:0 "Volterra" - dynn_mastropiero:0 "Mastropiero" - dynn_montalcino:0 "Montalcino" - dynn_borri:0 "Borri" dynn_luzzatini:0 "Luzzatini" dynn_mancini:0 "Mancini" dynn_orvieto:0 "Orvieto" diff --git a/localization/english/replace/names/NEOW_character_names_l_english.yml b/localization/english/replace/names/NEOW_character_names_l_english.yml index bbdc35889..c9d8c8142 100644 --- a/localization/english/replace/names/NEOW_character_names_l_english.yml +++ b/localization/english/replace/names/NEOW_character_names_l_english.yml @@ -20112,8 +20112,20 @@ Maroun:0 "Maroun" Mouna:0 "Mouna" Chamel:0 "Chamel" + Rami:0 "Rami" + Fouad:0 "Fouad" + Mansour:0 "Mansour" Hoda:0 "Hoda" Ghattas:0 "Ghattas" Gebran:0 "Gebran" Mohsen:0 "Mohsen" Youhanna:0 "Youhanna" + Zakaria:0 "Zakaria" + Elissar:0 "Elissar" + Nematallah:0 "Nematallah" + Assaad:0 "Assaad" + Ghassan:0 "Ghassan" + Jihad:0 "Jihad" + Nimr:0 "Nimr" + Dory:0 "Dory" + Dany:0 "Dany" diff --git a/localization/english/replace/titles_l_english.yml b/localization/english/replace/titles_l_english.yml index 9ff6da7a8..e1da30ef0 100644 --- a/localization/english/replace/titles_l_english.yml +++ b/localization/english/replace/titles_l_english.yml @@ -6140,7 +6140,6 @@ b_cupar:0 "Cupar" b_curtatone:0 "Curtatone" b_curteadearges:0 "Curtea de Arges" - b_cybistra:0 "Cybistra" b_cyrene:0 "Cyrene" b_czarkow:0 "Czarkow" b_czarnkow:0 "Oborniki" @@ -12844,7 +12843,6 @@ b_tuzara:0 "Tuzara" b_tver:0 "Tver" b_tvergorodok:0 "Gorodok" - b_tyana:0 "Tyana" b_tyer:0 "At Tyer" b_tykocin:0 "Tykocin" b_tyninghame:0 "Tyninghame" @@ -19121,8 +19119,6 @@ c_hadrianopolis_adj:0 "Çankırılı" c_lycaonia:0 "Lycaonia" c_lycaonia_adj:0 "Lycaonian" - c_cappadocia:0 "Cappadocia" - c_cappadocia_adj:0 "Cappadocian" c_pompeiopolis:0 "Pompeiopolis" c_pompeiopolis_adj:0 "Pompeiopolitan" c_helenopontus:0 "Helenopontus" @@ -19139,8 +19135,6 @@ c_ablastha_adj:0 "Ablasthan" c_charsianon:0 "Charsianon" c_charsianon_adj:0 "Charsianan" - c_kyzistra:0 "Kyzistra" - c_kyzistra_adj:0 "Kyzistran" b_nicosia:0 "Nicosia" b_limisol:0 "Limisol" b_cerynia:0 "Cerynia" @@ -19160,8 +19154,7 @@ b_modra:0 "Modra" b_boli:0 "Boli" b_cratea:0 "Cratea" - b_papira:0 "Papira" - b_ecobrogis:0 "Ecobrogis" + b_papira:0 "Kaman" b_tabia:0 "Tabia" b_krateia:0 "Çubuk" b_iuliopolis:0 "Kızılcahamam" @@ -19181,8 +19174,6 @@ b_philomelium:0 "Philomelion" b_laranalia:0 "Laranalia" b_soloi:0 "Soloi" - b_nazianzus:0 "Nazianzus" - b_parnassos:0 "Parnassos" b_kinna:0 "Cihanbeyli" b_aigialos:0 "Aigialos" b_ionopolis:0 "Ionopolis" @@ -19215,12 +19206,8 @@ b_charsianon:0 "Charsianon" b_therma:0 "Therma" b_euaissa:0 "Euaissa" - b_galatia:0 "Mocissus" - b_soanda:0 "Soanda" b_herpha:0 "Herpha" b_armaxa:0 "Armaxa" - b_zeila_CHA:0 "Zeila" - b_kyzistra:0 "Kyzistra" b_arasaxa:0 "Arasaxa" b_soli_CYP:0 "Soli" @@ -27288,28 +27275,27 @@ b_laranalia:0 "Karaman" b_derbe:0 "Ermenek" b_barata:0 "Karapınar" - d_cappadocia:0 "Kapadokya" - d_cappadocia_adj:0 "Kapadokya" + d_cappadocia:0 "Aksaray" + d_cappadocia_adj:0 "Aksaraylı" c_galatia:0 "Ankara" c_galatia_adj:0 "Ankaralı" b_ankyra:0 "Ankara" b_vindia:0 "Polatlı" - b_papira:0 "Balıkuyumcu" b_kandara:0 "Şabanözü" b_gangra:0 "Çankırı" - b_ecobrogis:0 "Şorsovus" + b_ecobrogis:0 "Kırıkkale" b_tabia:0 "Büyüknefes" b_hadrianopolis:0 "Çerkeş" c_cappadocia:0 "Nevşehir" c_cappadocia_adj:0 "Nevşehir" - b_tyana:0 "Kemerhisar" + b_tyana:0 "Niğde" b_comitanassus:0 "Çumra" b_garsaura:0 "Aksaray" - b_nazianzus:0 "Nenizi" - b_cybistra:0 "Ereğli" - c_lower_galatia:0 "Kırıkkale" - c_lower_galatia_adj:0 "Kırıkkale" - b_parnassos:0 "Değirmenyolu" + b_nazianzus:0 "Eskil" + b_cybistra:0 "Bor" + c_lower_galatia:0 "Aksaray" + c_lower_galatia_adj:0 "Aksaraylı" + b_parnassos:0 "Ortaköy" b_aspona:0 "Şereflikoçhisar" d_charsianon:0 "Yozgat" d_charsianon_adj:0 "Yozgat" @@ -27318,19 +27304,21 @@ b_charsianon:0 "Akdağmadeni" b_therma:0 "Yerköy" b_euaissa:0 "Yoğunhisar" - b_galatia:0 "Kırşehir" - b_soanda:0 "Kuşaklı Höyük" - b_aspona_CHA:0 "Sarıhöyük" + c_kirsehir:0 "Kırşehir" + c_kirsehir_adj:0 "Kırşehirli" + b_galatia:0 "Ereğli" + b_soanda:0 "Çiçekdağı" + b_aspona_CHA:0 "Kırşehir" c_kaisereia:0 "Kayseri" c_kaisereia_adj:0 "Kayseri" b_kaisereia:0 "Kayseri" b_herpha:0 "Karmalas" b_armaxa:0 "Gemerek" b_arasaxa:0 "Akmescit" - c_kyzistra:0 "Sivas" - c_kyzistra_adj:0 "Sivas" - b_kyzistra:0 "Zengibar Kalesi" - b_zeila_CHA:0 "Zile" + c_kyzistra:0 "Niğde" + c_kyzistra_adj:0 "Niğdeli" + b_kyzistra:0 "Çiftlik" + b_zeila_CHA:0 "Nevşehir" d_armeniac:0 "Amasya" d_armeniac_adj:0 "Amasya" c_helenopontus:0 "Amasya" diff --git a/map_data/provinces.png b/map_data/provinces.png index 3a7563710..edf5ada79 100644 --- a/map_data/provinces.png +++ b/map_data/provinces.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37fedec6491c9a5607c5a96fcf033c006ae4557e33c34e350f6899247d522f91 -size 2678736 +oid sha256:468cebb535b409690f0401e49e7dc3ff75f68a2e811caf60a68dd799d13d5203 +size 2679670