From d0e23cf5ea4cb88ef27e1fc5d9eba7c5ba5a451c Mon Sep 17 00:00:00 2001 From: JulesFlammenkueche Date: Fri, 18 Sep 2026 20:47:09 +0200 Subject: [PATCH] Turkiye done (Trabzon) --- .../name_equivalency/00_NEOW_female_names.txt | 2 + .../name_equivalency/00_NEOW_male_names.txt | 23 +- .../culture/name_lists/NEOW_azerbaijani.txt | 28 +- common/landed_titles/caucasus.txt | 7 +- common/landed_titles/turkey.txt | 306 +++++++++--------- .../province_terrain/00_province_terrain.txt | 2 +- .../01_province_properties.txt | 6 +- gfx/map/map_object_data/activities.txt | 32 +- gfx/map/map_object_data/building_locators.txt | 52 +-- gfx/map/map_object_data/combat_locators.txt | 42 +-- .../map_object_data/player_stack_locators.txt | 34 +- gfx/map/map_object_data/siege_locators.txt | 52 +-- history/provinces/e_caucasia.txt | 52 --- history/provinces/e_mashriq.txt | 26 +- history/provinces/e_turkey.txt | 157 ++++----- .../names/NEOW_character_names_l_english.yml | 30 +- .../english/replace/titles_l_english.yml | 53 ++- map_data/definition.csv | 10 +- .../geographical_region.txt | 4 +- map_data/provinces.png | 4 +- 20 files changed, 421 insertions(+), 501 deletions(-) diff --git a/common/culture/name_equivalency/00_NEOW_female_names.txt b/common/culture/name_equivalency/00_NEOW_female_names.txt index c3882dc10..7233214bc 100644 --- a/common/culture/name_equivalency/00_NEOW_female_names.txt +++ b/common/culture/name_equivalency/00_NEOW_female_names.txt @@ -520,6 +520,7 @@ naima_female = { Naima } najat_female = { Najat Naxhije } najma_female = { Nexhmie Nexhmije } naomi_female = { Naiomi Naomi Naomy No_e_act_mie Noem_i_act_ Noemi Nouen_i_grv_o } +nargis_female = { N_shw_rgiz } narmin_female = { Nermin } nasrin_female = { Nesrin Nesrine } nathalie_female = { Nadalo Naitailie Nat_a_act_lia Nat_a_act_lie Nat_a_grv_lia Nata_s_crn_a Natach_a_grv_ Natacha Natal_i_grv_o Natale Natali Natalia Natalie Natalija Natalina Nataliya Natalka Natascha Natascia Natasha Natasja Nathalie Nattattel_i_grv_ Nattel_i_grv_ } @@ -697,6 +698,7 @@ vita_female = { Vita } vivian_female = { Bibi_a_act_na Bibiana Viviana Viviane Viviano_female Vivien Vivienne Vivjena Wywyana } vladimira_female = { Vladim_i_act_ra } vladisliva_female = { Vladislava } +wafa_female = { V_shw_fa Wafaa } walida_female = { Valida } wanda_female = { Vanda Wanda } wenceslava_female = { V_a_act_clava V_e_crn_nceslava Vendula Viacheslava Vysheslava } diff --git a/common/culture/name_equivalency/00_NEOW_male_names.txt b/common/culture/name_equivalency/00_NEOW_male_names.txt index ec305c070..344982275 100644 --- a/common/culture/name_equivalency/00_NEOW_male_names.txt +++ b/common/culture/name_equivalency/00_NEOW_male_names.txt @@ -66,13 +66,16 @@ albert_male = { _A_hat_lbert Abbes Adalbert Adalberto Adalberts Aelbert Alb_e_cr albinus_male = { Alb_i_act_n Albin Albinas Albino Alpo Aubin Bine } alcide_male = { Alcides } alex_male = { _A_act_lex _A_grv_lex A_l_ced_iks Aahlex Ahl_i_hat_x Alec Alecs Alek Aleks Aleksa Aleksas Alekso Alex Ale_c_crn_jo Alick Allex Arlegz } -alexander_male = { _I_dot_skender Aahlexenda Ace Aco Ailaistair Al_e_act_xandros Al_i_hat_kz_ae_nda Alastair Alaxandr Alecsander Alecu Aleissandre Alejandro Aleksand_e_uml_r Aleksandar Aleksander Aleksandr Aleksandras Aleksandrs Aleksandro Aleksanteri Alessandro Alexander Alexandr Alexandre Alexandri Alexandro Alexandru Alistair Allygzanir Arlegzahnuh Cane Eskend_i_dot_r Eskender Lek_e_uml_ Leka S_a_grv_nder Sa_s_crn_a Sa_s_crn_ko Sa_s_crn_o Sacha Sand_e_uml_r Sander Sandi Sandis Sandrino Sandris Sandro Sandu Santeri Santtu Sascha Sasho Sk_e_uml_nder Iskandar } +alexander_male = { _I_dot_sg_shw_nd_shw_r _I_dot_skender Aahlexenda Ace Aco Ailaistair Al_e_act_xandros Al_i_hat_kz_ae_nda Alastair Alaxandr Alecsander Alecu Aleissandre Alejandro Aleksand_e_uml_r Aleksandar Aleksander Aleksandr Aleksandras Aleksandrs Aleksandro Aleksanteri Alessandro Alexander Alexandr Alexandre Alexandri Alexandro Alexandru Alistair Allygzanir Arlegzahnuh Cane Eskend_i_dot_r Eskender Lek_e_uml_ Leka S_a_grv_nder Sa_s_crn_a Sa_s_crn_ko Sa_s_crn_o Sacha Sand_e_uml_r Sander Sandi Sandis Sandrino Sandris Sandro Sandu Santeri Santtu Sascha Sasho Sk_e_uml_nder Iskandar } alexis_male = { Al_e_act_xios Al_e_act_xis Al_e_grv_ssi Alaksiej Aleix Aleixo Alejo Aleksej Aleksey Aleksi Aleksij Aleksis Ales Alessio Alexe Alexej Alexey Alexis Aljo_s_crn_a L_a_uml_xi Laxi Alaksiyus } alfonso_male = { Afonso Alfons Alfonsas Alfonso Alfonsu Alfonz Alfus Alifonso Alphonse Alonso Alonsu Anfous Funse } alfred_male = { _A_grv_lfred Alfehd Alfie Alfr_e_act_d Alfr_e_mcn_ds Alfre_eth_ Alfred Alfredo Alfredu Alfret Alfrid Alfrud Fredd } algernon_male = { _AE_ldernon Algernon Aljern_o_hat_n Aljurnin Aljurnon Arjuhnun } algirdas_male = { A_l_ced__g_ced_irds Algirdas O_l_ced__g_ced_erts Olgierd } -ali_male = { _AE_li _G_dot_ali Ale_e_hat_ Al_i_act_ Alee Ali Aly Jali Jeli Qali } +ali_male = { _AE_li _G_dot_ali _SHW_li Ale_e_hat_ Al_i_act_ Alee Ali Aly Jali Jeli Qali } +aliakbar_male = { _SHW_l_shw_kb_shw_r } +aliasgar_male = { _SHW_l_shw_sg_shw_r } +alihussein_male = { _SHW_lih_u_uml_seyn } alijan_male = { Qalijan } alikhan_male = { _A_uml_lihan Alixan } alim_male = { Alim Alym } @@ -135,7 +138,7 @@ asad_male = { _A_uml_set Esat Esed } asadullah_male = { Esedullah } asbjorn_male = { Asbj_o_stk_rn Ebbe Espen } asgeir_male = { Eske } -ashraf_male = { E_s_ced_ref } +ashraf_male = { _SHW__s_ced_r_shw_f E_s_ced_ref } asier_male = { Asier Axier } ataullah_male = { Ataullah Taullah } athanasius_male = { Atanas Atanasie Atanasije Atanasio Athan_a_act_sios Athanasiy Nasko T_a_brv_nase Ta_s_crn_ko Tasko Thanas } @@ -484,7 +487,7 @@ halim_male = { _H_mbw_alim Halim } hamed_male = { Hamed } hamid_male = { _H_mbw_amid _X_dot_amid Hamid Hamidou } hamlet_male = { H_ae_mlet Haimlet Hamlet Hamlit Hemlet } -hamza_male = { _H_mbw_amzat _X_dot_amzat Hamza Hamzah Hemzet } +hamza_male = { _H_mbw_amzat _X_dot_amzat H_shw_mz_shw_ Hamza Hamzah Hemzet } hanafi_male = { Hanifi } hannibal_male = { An_i_act_bal Annibale } hannibal_scott_male = { Hannibal Scott } @@ -562,7 +565,7 @@ ismat_male = { _I_dot_smet Ismet } israel_male = { Isra_e_uml_l Israel Israil Izrail Yisroel } ivanhoe_male = { Ifanhoy Ivainhoe } ivar_male = { _AE_irva _I_act_var Aiva Aivar Aivars Ifor Ivar Ivari Ivaro Ivars Ivfor Ivor Iivo } -izzat_male = { _I_dot_zzet Izet } +izzat_male = { _I_dot_zz_shw_t _I_dot_zzet Izet } izzuddin_male = { Azzedine Yzedin } jabbar_male = { Zhabbar } jabir_male = { Jabyr } @@ -958,7 +961,7 @@ radoslav_male = { Rados_l_stk_aw Radoslav } rafiq_male = { Rafik Refik } rafn_male = { Hrafn Rafn } ragnar_male = { Neri Rahnjar Ragnar Rain Rainer Raini_e_grv_ Rajnar Raniero Rannar Rein Reiner Reinier } -rahim_male = { Ra_h_mbw_im Rahyym } +rahim_male = { R_shw_him Ra_h_mbw_im Rahyym } rahman_male = { Rahman Rrahman } rajab_male = { Razhab Recep Rejep Rexhep } ramadan_male = { Ramadan Ramazan } @@ -970,7 +973,7 @@ randolph_male = { Randdollff Randolph Rhanddolff } raoul_male = { Ra_u_act_l Ra_u_uml_l Railph Ralf Ralff Ralfs Rallff Ralph Raoul Raul Ravous Rhalff } raphael_male = { Israpil Raf_e_grv_u Rafa_i_act_l Rafa_l_stk_ Rafael Rafail Rafel Raffaele Raffaello Rapha_e_uml_l Raphael Rapolas } rashad_male = { Re_s_ced_at } -rashid_male = { Ra_s_ced_id Rachid Rashid Re_s_ced_it } +rashid_male = { R_shw__s_ced_id Ra_s_ced_id Rachid Rashid Re_s_ced_it } rasul_male = { Rasul Resul } rauf_male = { Raouf } rayan_male = { Rayan Rayanne } @@ -1039,7 +1042,7 @@ sattar_male = { S_shw_ttar } saturninus_male = { Saturnino } saul_male = { Sa_u_act_l Sa_u_uml_l Saul Saule Sauli Saulius Saulo } sawyer_tecumesh_male = { Sawyer Tecumesh } -sayfuddin_male = { Sefedin Sejfudin } +sayfuddin_male = { Sefedin Sejfudin Seyf_shw_ddin } sayfullah_male = { Saypulla } sayyid_male = { Sayit Seit Seyit Seyyit } schuyler_clark_male = { Schuyler Clark } @@ -1102,7 +1105,7 @@ stoyan_male = { Stojan Stojan_c_crn_e Stole Stoyan Stoyanche Stoycho Stoyko } stuart_male = { Stewairt Stewart Stuart } suad_male = { Suat } sufyan_male = { Seufyann Sofian Sofiane Soufian } -sultan_male = { S_u_mcn_ltan Sultan Zoltan } +sultan_male = { S_u_mcn_ltan Soltan Sultan Zoltan } sven_male = { Svein Sveinn Sven Svend Sveno Swen } sverre_male = { Sverre Sverrir } sviatopolk_male = { Sv_a_uml_topluk Svante Svatopluk } @@ -1205,7 +1208,7 @@ vitus_male = { V_i_act_t V_i_act_tek Veit Vid Vit Vitas Vito Vituci Wito } vladimir_male = { U_l_stk_adzimir Vlad_i_hat_m_i_hat_r Vladan Vladas Vlade Vladim_i_act_r Vladimir Vladimiras Vladimirs Vlado Volod_i_hat_m_i_hat_r Volodya W_l_stk_odzimierz Wladimir Wladimiro } vladislaus_male = { Ladislau Laslov U_l_stk_adzis_l_stk_a_u_brv_ Ladislav Vladislav Vladislavas W_l_stk_adys_l_stk_aw } vytautas_male = { V_i_mcn_tauts Vitolds Vytautas Witold } -wafa_male = { Wepa } +wafa_male = { V_shw_fa Wepa } wahbi_male = { Vehbi } wahid_male = { Va_x_dot_id Vahit } wajdi_male = { Vecdi } diff --git a/common/culture/name_lists/NEOW_azerbaijani.txt b/common/culture/name_lists/NEOW_azerbaijani.txt index 1b072cbc8..89ac78a8d 100644 --- a/common/culture/name_lists/NEOW_azerbaijani.txt +++ b/common/culture/name_lists/NEOW_azerbaijani.txt @@ -12,38 +12,54 @@ 3 = { _C_ced_ingiz _I_dot_brahim + _SHW_fqan _SHW_li Akif Arif Ayd_i_dot_n - El_c_ced_in El_s_ced__shw_n El_s_ced_ad Elman Elnur Elvin Elxan + El_c_ced_in El_s_ced__shw_n El_s_ced_ad Elman Elnur Elvin Elxan Etibar H_shw_s_shw_n H_u_uml_seyn M_shw_h_shw_rr_shw_m M_shw_mm_shw_d Mahir + R_shw_him Sabir Sad_i_dot_q Samir + V_shw_fa Ya_s_ced_ar + Zakir } 2 = { + _I_dot_sg_shw_nd_shw_r _I_dot_zz_shw_t _S_ced_ahbaz + _SHW__s_ced_r_shw_f _SHW_l_shw_kb_shw_r _SHW_l_shw_sg_shw_r _SHW_lia_g_brv_a A_g_brv_a Abbas Arzu Aslan B_o_uml_y_u_uml_ka_g_brv_a B_shw_hlul B_shw_hr_shw_m Bahadur Ehtiram Elmar - Hikm_shw_t + F_shw_rman Firudin + H_shw_mz_shw_ Hikm_shw_t K_shw_r_shw_m M_u_uml__s_ced_fiq Musa N_shw_sir Qara - S_u_act_leyman + R_shw__s_ced_id R_shw_van + S_u_act_leyman Seyf_shw_ddin Soltan } 1 = { - _SHW_lip_shw_nah - A_s_ced_ur - B_shw_davi B_shw_hr_shw_mxan + _SHW_lih_u_uml_seyn _SHW_lip_shw_nah + A_g_brv_ah_u_uml_seyn A_s_ced_ur Ad_i_dot_g_o_uml_z_shw_l + B_shw_davi + F_shw_rh_shw_ng + Qaraxan S_shw_ttar Zeyni_s_ced_ } } female_names = { 3 = { + Aysel + N_shw_rgiz Nigar + V_shw_fa } 2 = { Arif_shw_ + Durna + R_o_uml_ya + Sara } 1 = { } diff --git a/common/landed_titles/caucasus.txt b/common/landed_titles/caucasus.txt index 0173f280c..0f3845615 100644 --- a/common/landed_titles/caucasus.txt +++ b/common/landed_titles/caucasus.txt @@ -127,16 +127,11 @@ e_caucasia = { d_tao-klarjeti = { color = { 60 60 60 } - capital = c_tao + capital = c_klarjeti c_klarjeti = { color = { 95 90 90 } - b_arthanuji = { - province = 5740 - - color = { 95 90 90 } - } b_tmogvi = { province = 5738 diff --git a/common/landed_titles/turkey.txt b/common/landed_titles/turkey.txt index 21d7555f1..e091606ef 100644 --- a/common/landed_titles/turkey.txt +++ b/common/landed_titles/turkey.txt @@ -2182,10 +2182,9 @@ e_turky = { } } } - d_chaldia = { + d_chaldia = { # Trabzon color = { 150 130 20 } - - capital = c_sinope + capital = c_trebizond # Trabzon cultural_names = { name_list_NEOW_griko = cn_khaldia @@ -2194,7 +2193,7 @@ e_turky = { name_list_NEOW_greco_turkish = cn_khaldia } - c_trebizond = { + c_trebizond = { # Trabzon color = { 150 130 20 } cultural_names = { @@ -2204,9 +2203,8 @@ e_turky = { name_list_NEOW_greco_turkish = cn_trapezous } - b_trebizond = { + b_trebizond = { # Trabzon province = 678 - color = { 150 130 20 } cultural_names = { @@ -2216,147 +2214,8 @@ e_turky = { name_list_NEOW_greco_turkish = cn_trapezous } } - b_rhizus = { - province = 5692 - - color = { 150 130 20 } - - cultural_names = { - name_list_NEOW_griko = cn_rizunda - name_list_NEOW_greek = cn_rizunda - name_list_NEOW_cypriot = cn_rizunda - name_list_NEOW_greco_turkish = cn_rizunda - } - } - b_hyspiratis = { - - cultural_names = { - name_list_NEOW_griko = cn_hyspiratis - name_list_NEOW_greek = cn_hyspiratis - name_list_NEOW_cypriot = cn_hyspiratis - name_list_NEOW_greco_turkish = cn_hyspiratis - } - province = 5693 - - color = { 150 130 20 } - } - } - c_ablastha = { - color = { 195 145 50 } - - cultural_names = { - name_list_NEOW_griko = cn_ablastha - name_list_NEOW_greek = cn_ablastha - name_list_NEOW_cypriot = cn_ablastha - name_list_NEOW_greco_turkish = cn_ablastha - } - - b_baeberdon = { - - cultural_names = { - name_list_NEOW_griko = cn_baeberdon - name_list_NEOW_greek = cn_baeberdon - name_list_NEOW_cypriot = cn_baeberdon - name_list_NEOW_greco_turkish = cn_baeberdon - } - province = 5694 - - color = { 150 130 20 } - } - } - c_acampse = { - - cultural_names = { - name_list_NEOW_griko = cn_acampse - name_list_NEOW_greek = cn_acampse - name_list_NEOW_cypriot = cn_acampse - name_list_NEOW_greco_turkish = cn_acampse - } - color = { 70 55 55 } - - b_archabis = { - - cultural_names = { - name_list_NEOW_griko = cn_archabis - name_list_NEOW_greek = cn_archabis - name_list_NEOW_cypriot = cn_archabis - name_list_NEOW_greco_turkish = cn_archabis - } - province = 5696 - - color = { 70 55 55 } - } - b_petra = { - - cultural_names = { - name_list_NEOW_griko = cn_petra - name_list_NEOW_greek = cn_petra - name_list_NEOW_cypriot = cn_petra - name_list_NEOW_greco_turkish = cn_petra - } - province = 5697 - - color = { 70 55 55 } - } - } - c_tao = { - color = { 70 70 60 } - - b_taoskari = { - province = 5736 - - color = { 60 60 60 } - } - } - c_cerasus = { - color = { 169 139 36 } - - cultural_names = { - name_list_NEOW_griko = cn_kerasous - name_list_NEOW_greek = cn_kerasous - name_list_NEOW_cypriot = cn_kerasous - name_list_NEOW_greco_turkish = cn_kerasous - } - - b_cerasus = { - province = 705 - - color = { 169 139 36 } - - cultural_names = { - name_list_NEOW_griko = cn_kerasous - name_list_NEOW_greek = cn_kerasous - name_list_NEOW_cypriot = cn_kerasous - name_list_NEOW_greco_turkish = cn_kerasous - } - } - b_oinaion = { - province = 5689 - - color = { 169 139 36 } - - cultural_names = { - name_list_NEOW_griko = cn_oinaion - name_list_NEOW_greek = cn_oinaion - name_list_NEOW_cypriot = cn_oinaion - name_list_NEOW_greco_turkish = cn_oinaion - } - } - b_polemonium = { - province = 5690 - - color = { 169 139 36 } - - cultural_names = { - name_list_NEOW_griko = cn_polemonium - name_list_NEOW_greek = cn_polemonium - name_list_NEOW_cypriot = cn_polemonium - name_list_NEOW_greco_turkish = cn_polemonium - } - } - b_koralla = { + b_koralla = { # Akçaabat province = 5691 - color = { 169 139 36 } cultural_names = { @@ -2366,20 +2225,71 @@ e_turky = { name_list_NEOW_greco_turkish = cn_koralla } } + b_hyspiratis = { # Araklı + province = 5693 + color = { 150 130 20 } + + cultural_names = { + name_list_NEOW_griko = cn_hyspiratis + name_list_NEOW_greek = cn_hyspiratis + name_list_NEOW_cypriot = cn_hyspiratis + name_list_NEOW_greco_turkish = cn_hyspiratis + } + } } - c_colonea = { - color = { 136 116 40 } + c_ordu = { # Ordu + color = { 64 84 115 } + + b_taoskari = { # Ordu + province = 5736 + color = { 60 60 60 } + } + b_oinaion = { # Ünye + province = 5689 + color = { 169 139 36 } + + cultural_names = { + name_list_NEOW_griko = cn_oinaion + name_list_NEOW_greek = cn_oinaion + name_list_NEOW_cypriot = cn_oinaion + name_list_NEOW_greco_turkish = cn_oinaion + } + } + b_polemonium = { # Fatsa + province = 5690 + color = { 169 139 36 } + + cultural_names = { + name_list_NEOW_griko = cn_polemonium + name_list_NEOW_greek = cn_polemonium + name_list_NEOW_cypriot = cn_polemonium + name_list_NEOW_greco_turkish = cn_polemonium + } + } + } + c_cerasus = { # Giresun + color = { 169 139 36 } cultural_names = { - name_list_NEOW_griko = cn_koloneia - name_list_NEOW_greek = cn_koloneia - name_list_NEOW_cypriot = cn_koloneia - name_list_NEOW_greco_turkish = cn_koloneia + name_list_NEOW_griko = cn_kerasous + name_list_NEOW_greek = cn_kerasous + name_list_NEOW_cypriot = cn_kerasous + name_list_NEOW_greco_turkish = cn_kerasous } - b_colonea = { - province = 706 + b_cerasus = { # Giresun + province = 705 + color = { 169 139 36 } + cultural_names = { + name_list_NEOW_griko = cn_kerasous + name_list_NEOW_greek = cn_kerasous + name_list_NEOW_cypriot = cn_kerasous + name_list_NEOW_greco_turkish = cn_kerasous + } + } + b_colonea = { # Şebinkarahisar + province = 706 color = { 136 116 40 } cultural_names = { @@ -2389,9 +2299,34 @@ e_turky = { name_list_NEOW_greco_turkish = cn_koloneia } } - b_sinoria = { - province = 5699 + } + c_colonea = { # Gümüşhane + color = { 136 116 40 } + cultural_names = { + name_list_NEOW_griko = cn_koloneia + name_list_NEOW_greek = cn_koloneia + name_list_NEOW_cypriot = cn_koloneia + name_list_NEOW_greco_turkish = cn_koloneia + } + + b_gumushane = { # Gümüşhane + province = 5902 + color = { 70 105 137 } + } + b_baeberdon = { # Bayburt + province = 5694 + color = { 150 130 20 } + + cultural_names = { + name_list_NEOW_griko = cn_baeberdon + name_list_NEOW_greek = cn_baeberdon + name_list_NEOW_cypriot = cn_baeberdon + name_list_NEOW_greco_turkish = cn_baeberdon + } + } + b_sinoria = { # Şiran + province = 5699 color = { 136 116 40 } cultural_names = { @@ -2402,6 +2337,65 @@ e_turky = { } } } + c_ablastha = { # Rize + color = { 195 145 50 } + + cultural_names = { + name_list_NEOW_griko = cn_ablastha + name_list_NEOW_greek = cn_ablastha + name_list_NEOW_cypriot = cn_ablastha + name_list_NEOW_greco_turkish = cn_ablastha + } + + b_rhizus = { # Rize + province = 5692 + color = { 150 130 20 } + + cultural_names = { + name_list_NEOW_griko = cn_rizunda + name_list_NEOW_greek = cn_rizunda + name_list_NEOW_cypriot = cn_rizunda + name_list_NEOW_greco_turkish = cn_rizunda + } + } + b_archabis = { # Ardeşen + province = 5696 + color = { 70 55 55 } + + cultural_names = { + name_list_NEOW_griko = cn_archabis + name_list_NEOW_greek = cn_archabis + name_list_NEOW_cypriot = cn_archabis + name_list_NEOW_greco_turkish = cn_archabis + } + } + } + c_acampse = { # Artvin + + cultural_names = { + name_list_NEOW_griko = cn_acampse + name_list_NEOW_greek = cn_acampse + name_list_NEOW_cypriot = cn_acampse + name_list_NEOW_greco_turkish = cn_acampse + } + color = { 70 55 55 } + + b_arthanuji = { # Artvin + province = 5740 + color = { 95 90 90 } + } + b_petra = { # Borçka + province = 5697 + color = { 70 55 55 } + + cultural_names = { + name_list_NEOW_griko = cn_petra + name_list_NEOW_greek = cn_petra + name_list_NEOW_cypriot = cn_petra + name_list_NEOW_greco_turkish = cn_petra + } + } + } } } k_armenitolia = { # Ermenidolu diff --git a/common/province_terrain/00_province_terrain.txt b/common/province_terrain/00_province_terrain.txt index 962864b15..f25846863 100644 --- a/common/province_terrain/00_province_terrain.txt +++ b/common/province_terrain/00_province_terrain.txt @@ -5474,7 +5474,7 @@ default_coastal_sea=coastal_sea 5899=taiga 5900=drylands 5901=drylands -5902=drylands +5902=mountains 5903=mountains 5904=mountains 5905=plains diff --git a/common/province_terrain/01_province_properties.txt b/common/province_terrain/01_province_properties.txt index 781c254b4..15b2a0903 100644 --- a/common/province_terrain/01_province_properties.txt +++ b/common/province_terrain/01_province_properties.txt @@ -27303,10 +27303,8 @@ 5901 ={ winter_severity_bias = 0.40 } -# b_jarabulus -5902 ={ - winter_severity_bias = 0.40 -} +# b_gumushane +3645 = {winter_severity_bias = 0.60} # b_duluk-teluch 4899 = {winter_severity_bias = 0.60} ### d_homs diff --git a/gfx/map/map_object_data/activities.txt b/gfx/map/map_object_data/activities.txt index c90fab110..0f8f467f0 100644 --- a/gfx/map/map_object_data/activities.txt +++ b/gfx/map/map_object_data/activities.txt @@ -3853,7 +3853,7 @@ } { id=678 - position={ 3123.602539 0.000000 2499.024902 } + position={ 3139.518066 0.000000 2508.814209 } rotation={ -0.000000 -0.464413 -0.000000 0.885619 } scale={ 1.000000 1.000000 1.000000 } } @@ -3907,13 +3907,13 @@ } { id=705 - position={ 3050.381348 0.000000 2489.720215 } + position={ 3087.373291 0.000000 2485.287598 } rotation={ -0.000000 -0.292884 -0.000000 0.956148 } scale={ 1.000000 1.000000 1.000000 } } { id=706 - position={ 3078.521484 0.000000 2456.686035 } + position={ 3065.467773 0.000000 2469.637939 } rotation={ -0.000000 -0.364369 -0.000000 0.931255 } scale={ 1.000000 1.000000 1.000000 } } @@ -30967,19 +30967,19 @@ } { id=5689 - position={ 2994.571045 0.000000 2496.218262 } + position={ 3000.246826 0.000000 2513.524902 } rotation={ -0.000000 0.255556 -0.000000 0.966794 } scale={ 1.000000 1.000000 1.000000 } } { id=5690 - position={ 3033.841797 0.000000 2486.024902 } + position={ 3026.342773 0.000000 2499.663086 } rotation={ -0.000000 -0.227156 -0.000000 0.973858 } scale={ 1.000000 1.000000 1.000000 } } { id=5691 - position={ 3101.109131 0.000000 2476.198730 } + position={ 3106.697754 0.000000 2504.072021 } rotation={ -0.000000 -0.268103 -0.000000 0.963390 } scale={ 1.000000 1.000000 1.000000 } } @@ -30991,13 +30991,13 @@ } { id=5693 - position={ 3158.000000 0.000000 2479.000000 } + position={ 3157.081543 0.000000 2488.609375 } rotation={ -0.000000 0.372568 -0.000000 0.928005 } scale={ 1.000000 1.000000 1.000000 } } { id=5694 - position={ 3161.083984 0.000000 2448.660156 } + position={ 3152.278320 0.000000 2462.384766 } rotation={ -0.000000 0.615407 -0.000000 0.788209 } scale={ 1.000000 1.000000 1.000000 } } @@ -31009,13 +31009,13 @@ } { id=5696 - position={ 3188.914795 0.000000 2505.686279 } + position={ 3201.551025 0.000000 2504.790039 } rotation={ -0.000000 -0.402891 -0.000000 0.915248 } scale={ 1.000000 1.000000 1.000000 } } { id=5697 - position={ 3218.681641 0.000000 2529.214844 } + position={ 3240.614990 0.000000 2516.436279 } rotation={ -0.000000 -0.360558 -0.000000 0.932737 } scale={ 1.000000 1.000000 1.000000 } } @@ -31027,7 +31027,7 @@ } { id=5699 - position={ 3111.583252 0.000000 2465.811035 } + position={ 3111.612305 0.000000 2472.303467 } rotation={ -0.000000 0.542820 -0.000000 0.839849 } scale={ 1.000000 1.000000 1.000000 } } @@ -31249,8 +31249,8 @@ } { id=5736 - position={ 3254.781250 0.000000 2513.427246 } - rotation={ -0.000000 -0.487600 -0.000000 0.873067 } + position={ 3028.923096 0.000000 2488.197754 } + rotation={ -0.000000 -0.352204 -0.000000 0.935923 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31273,7 +31273,7 @@ } { id=5740 - position={ 3246.890625 0.000000 2539.007324 } + position={ 3217.045410 0.000000 2526.379639 } rotation={ -0.000000 -0.462520 -0.000000 0.886609 } scale={ 1.000000 1.000000 1.000000 } } @@ -32143,8 +32143,8 @@ } { id=5902 - position={ 3070.621582 0.000000 2231.634766 } - rotation={ -0.000000 0.322355 -0.000000 0.946619 } + position={ 3138.740479 0.000000 2484.494385 } + rotation={ -0.000000 0.517411 -0.000000 0.855737 } scale={ 1.000000 1.000000 1.000000 } } { diff --git a/gfx/map/map_object_data/building_locators.txt b/gfx/map/map_object_data/building_locators.txt index a76d6db84..4304f1be6 100644 --- a/gfx/map/map_object_data/building_locators.txt +++ b/gfx/map/map_object_data/building_locators.txt @@ -3823,7 +3823,7 @@ } { id=678 - position={ 3115.077637 0.000000 2500.085449 } + position={ 3132.362549 0.000000 2509.178711 } rotation={ -0.000000 -0.019363 -0.000000 -0.999813 } scale={ 1.000000 1.000000 1.000000 } } @@ -3877,13 +3877,13 @@ } { id=705 - position={ 3054.340820 0.000000 2485.001953 } - rotation={ -0.000000 -0.792028 -0.000000 -0.610484 } + position={ 3073.076172 0.000000 2495.556396 } + rotation={ -0.000000 -0.186944 -0.000000 -0.982370 } scale={ 1.000000 1.000000 1.000000 } } { id=706 - position={ 3066.077637 0.000000 2461.085449 } + position={ 3066.313232 0.000000 2464.045898 } rotation={ -0.000000 -0.254646 -0.000000 0.967034 } scale={ 1.000000 1.000000 1.000000 } } @@ -30937,38 +30937,38 @@ } { id=5689 - position={ 2994.067383 0.000000 2515.389160 } - rotation={ -0.000000 -0.333521 -0.000000 0.942743 } + position={ 3011.356689 0.000000 2510.284180 } + rotation={ -0.000000 -0.771855 -0.000000 0.635799 } scale={ 1.000000 1.000000 1.000000 } } { id=5690 - position={ 3026.077637 0.000000 2497.085449 } - rotation={ -0.000000 -0.976900 -0.000000 -0.213696 } + position={ 3024.956055 0.000000 2505.433105 } + rotation={ -0.000000 -0.753336 -0.000000 -0.657636 } scale={ 1.000000 1.000000 1.000000 } } { id=5691 - position={ 3089.694824 0.000000 2483.887207 } - rotation={ -0.000000 -0.747993 -0.000000 0.663707 } + position={ 3120.034424 0.000000 2514.021240 } + rotation={ -0.000000 -0.981940 -0.000000 -0.189196 } scale={ 1.000000 1.000000 1.000000 } } { id=5692 - position={ 3155.077637 0.000000 2498.085449 } - rotation={ -0.000000 -0.845321 -0.000000 0.534259 } + position={ 3178.955078 0.000000 2504.674316 } + rotation={ -0.000000 -0.966317 -0.000000 0.257357 } scale={ 1.000000 1.000000 1.000000 } } { id=5693 - position={ 3166.077637 0.000000 2482.085449 } - rotation={ -0.000000 -0.917879 -0.000000 0.396860 } + position={ 3153.706055 0.000000 2506.021484 } + rotation={ -0.000000 -0.970666 -0.000000 0.240431 } scale={ 1.000000 1.000000 1.000000 } } { id=5694 - position={ 3162.077637 0.000000 2456.085449 } - rotation={ -0.000000 -0.988726 -0.000000 0.149735 } + position={ 3160.697510 0.000000 2460.595703 } + rotation={ -0.000000 -0.878560 -0.000000 0.477631 } scale={ 1.000000 1.000000 1.000000 } } { @@ -30979,14 +30979,14 @@ } { id=5696 - position={ 3181.077637 0.000000 2509.085449 } - rotation={ -0.000000 -0.836667 -0.000000 -0.547712 } + position={ 3195.062012 0.000000 2527.793945 } + rotation={ -0.000000 -0.271618 -0.000000 -0.962405 } scale={ 1.000000 1.000000 1.000000 } } { id=5697 - position={ 3212.502930 0.000000 2537.600586 } - rotation={ -0.000000 -0.160695 -0.000000 0.987004 } + position={ 3228.762695 0.000000 2542.573730 } + rotation={ -0.000000 0.416376 -0.000000 0.909192 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31219,8 +31219,8 @@ } { id=5736 - position={ 3241.077637 0.000000 2512.085449 } - rotation={ -0.000000 -0.998351 -0.000000 -0.057403 } + position={ 3042.477295 0.000000 2503.491943 } + rotation={ -0.000000 -0.995773 -0.000000 0.091850 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31243,8 +31243,8 @@ } { id=5740 - position={ 3239.077637 0.000000 2539.085449 } - rotation={ -0.000000 -0.265384 -0.000000 0.964143 } + position={ 3225.575684 0.000000 2525.053711 } + rotation={ -0.000000 0.187796 -0.000000 0.982208 } scale={ 1.000000 1.000000 1.000000 } } { @@ -32113,8 +32113,8 @@ } { id=5902 - position={ 3072.077637 0.000000 2224.085449 } - rotation={ -0.000000 -0.567153 -0.000000 -0.823613 } + position={ 3126.830078 0.000000 2483.580566 } + rotation={ -0.000000 -0.730225 -0.000000 -0.683207 } 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 7e8840f5d..933a681da 100644 --- a/gfx/map/map_object_data/combat_locators.txt +++ b/gfx/map/map_object_data/combat_locators.txt @@ -4003,7 +4003,7 @@ } { id=678 - position={ 3104.000000 0.000000 2500.000000 } + position={ 3128.930664 0.000000 2495.856689 } rotation={ -0.000000 -0.773372 -0.000000 0.633952 } scale={ 1.000000 1.000000 1.000000 } } @@ -4165,14 +4165,14 @@ } { id=705 - position={ 3057.000000 0.000000 2499.000000 } - rotation={ -0.000000 -0.991353 -0.000000 0.131220 } + position={ 3056.753662 0.000000 2485.498291 } + rotation={ -0.000000 -0.791312 -0.000000 0.611413 } scale={ 1.000000 1.000000 1.000000 } } { id=706 - position={ 3050.000000 0.000000 2464.000000 } - rotation={ -0.000000 -0.940958 -0.000000 0.338523 } + position={ 3049.335205 0.000000 2461.137939 } + rotation={ -0.000000 -0.996466 -0.000000 -0.083997 } scale={ 1.000000 1.000000 1.000000 } } { @@ -32827,19 +32827,19 @@ } { id=5689 - position={ 2990.899170 0.000000 2484.967285 } - rotation={ -0.000000 -0.999066 -0.000000 0.043204 } + position={ 2993.683838 0.000000 2513.487305 } + rotation={ -0.000000 -0.816265 -0.000000 0.577677 } scale={ 1.000000 1.000000 1.000000 } } { id=5690 - position={ 3015.956543 0.000000 2502.618652 } - rotation={ -0.000000 -0.921875 -0.000000 0.387487 } + position={ 3004.728271 0.000000 2493.065430 } + rotation={ -0.000000 -0.964127 -0.000000 0.265442 } scale={ 1.000000 1.000000 1.000000 } } { id=5691 - position={ 3082.451660 0.000000 2492.475342 } + position={ 3103.563965 0.000000 2506.019775 } rotation={ -0.000000 -0.917649 -0.000000 0.397391 } scale={ 1.000000 1.000000 1.000000 } } @@ -32851,14 +32851,14 @@ } { id=5693 - position={ 3148.540527 0.000000 2475.982910 } + position={ 3163.541748 0.000000 2484.468506 } rotation={ -0.000000 -0.941959 -0.000000 0.335728 } scale={ 1.000000 1.000000 1.000000 } } { id=5694 - position={ 3175.947266 0.000000 2453.823730 } - rotation={ -0.000000 -0.929916 -0.000000 0.367772 } + position={ 3170.989502 0.000000 2454.554932 } + rotation={ -0.000000 -0.988945 -0.000000 0.148280 } scale={ 1.000000 1.000000 1.000000 } } { @@ -32869,13 +32869,13 @@ } { id=5696 - position={ 3200.000000 0.000000 2510.000000 } - rotation={ -0.000000 -0.813690 -0.000000 0.581299 } + position={ 3187.755371 0.000000 2515.866455 } + rotation={ -0.000000 -0.373788 -0.000000 0.927514 } scale={ 1.000000 1.000000 1.000000 } } { id=5697 - position={ 3216.203857 0.000000 2551.673828 } + position={ 3247.120361 0.000000 2528.202148 } rotation={ -0.000000 -0.804480 -0.000000 0.593979 } scale={ 1.000000 1.000000 1.000000 } } @@ -33109,8 +33109,8 @@ } { id=5736 - position={ 3254.643311 0.000000 2519.728516 } - rotation={ -0.000000 0.306466 -0.000000 0.951882 } + position={ 3031.652100 0.000000 2481.299805 } + rotation={ -0.000000 -0.038122 -0.000000 0.999273 } scale={ 1.000000 1.000000 1.000000 } } { @@ -33133,7 +33133,7 @@ } { id=5740 - position={ 3234.233154 0.000000 2551.373047 } + position={ 3216.394043 0.000000 2534.739014 } rotation={ -0.000000 -0.880014 -0.000000 0.474948 } scale={ 1.000000 1.000000 1.000000 } } @@ -34033,8 +34033,8 @@ } { id=5902 - position={ 3068.977295 0.000000 2233.695312 } - rotation={ -0.000000 0.455199 -0.000000 0.890390 } + position={ 3114.035645 0.000000 2489.776123 } + rotation={ -0.000000 0.977728 -0.000000 0.209879 } 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 64acb81af..8d877e324 100644 --- a/gfx/map/map_object_data/player_stack_locators.txt +++ b/gfx/map/map_object_data/player_stack_locators.txt @@ -4003,7 +4003,7 @@ } { id=678 - position={ 3122.178955 0.000000 2504.279541 } + position={ 3145.968018 0.000000 2493.318604 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -4165,13 +4165,13 @@ } { id=705 - position={ 3061.237793 0.000000 2487.786621 } + position={ 3082.764893 0.000000 2494.137939 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=706 - position={ 3071.000000 0.000000 2468.000000 } + position={ 3080.844971 0.000000 2463.693359 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -32827,37 +32827,37 @@ } { id=5689 - position={ 3001.112061 0.000000 2512.401123 } + position={ 2993.247559 0.000000 2498.583984 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5690 - position={ 3035.000000 0.000000 2499.000000 } + position={ 3019.647217 0.000000 2487.129639 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5691 - position={ 3094.353271 0.000000 2488.715332 } + position={ 3121.610596 0.000000 2502.224609 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5692 - position={ 3162.000000 0.000000 2500.000000 } + position={ 3170.864014 0.000000 2498.183105 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5693 - position={ 3176.000000 0.000000 2490.000000 } + position={ 3167.217285 0.000000 2499.483887 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5694 - position={ 3171.000000 0.000000 2458.000000 } + position={ 3156.723145 0.000000 2466.653076 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -32869,13 +32869,13 @@ } { id=5696 - position={ 3187.000000 0.000000 2517.000000 } + position={ 3203.582520 0.000000 2527.427734 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5697 - position={ 3220.638428 0.000000 2533.060059 } + position={ 3250.601318 0.000000 2543.723145 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -32887,7 +32887,7 @@ } { id=5699 - position={ 3122.941650 0.000000 2465.038330 } + position={ 3140.845947 0.000000 2464.841553 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -33109,8 +33109,8 @@ } { id=5736 - position={ 3245.597412 0.000000 2517.428711 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 3031.423340 0.000000 2491.756104 } + rotation={ -0.000000 -0.068698 -0.000000 0.997638 } scale={ 1.000000 1.000000 1.000000 } } { @@ -33133,7 +33133,7 @@ } { id=5740 - position={ 3245.000000 0.000000 2545.000000 } + position={ 3214.446045 0.000000 2508.485107 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -34033,8 +34033,8 @@ } { id=5902 - position={ 3075.644531 0.000000 2228.599121 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 3145.028076 0.000000 2481.726074 } + rotation={ -0.000000 -0.002560 -0.000000 0.999997 } 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 c9ec21e62..e0a94a086 100644 --- a/gfx/map/map_object_data/siege_locators.txt +++ b/gfx/map/map_object_data/siege_locators.txt @@ -3823,7 +3823,7 @@ } { id=678 - position={ 3119.000000 0.000000 2491.000000 } + position={ 3136.284912 0.000000 2500.093262 } rotation={ 0.000000 0.978216 0.000000 -0.207591 } scale={ 1.000000 1.000000 1.000000 } } @@ -3877,13 +3877,13 @@ } { id=705 - position={ 3065.263184 0.000000 2482.916504 } - rotation={ 0.000000 0.767752 0.000000 -0.640747 } + position={ 3069.865967 0.000000 2482.556885 } + rotation={ -0.000000 0.999532 -0.000000 0.030599 } scale={ 1.000000 1.000000 1.000000 } } { id=706 - position={ 3072.000000 0.000000 2454.000000 } + position={ 3072.235596 0.000000 2456.960449 } rotation={ 0.000000 0.937885 0.000000 -0.346946 } scale={ 1.000000 1.000000 1.000000 } } @@ -30937,38 +30937,38 @@ } { id=5689 - position={ 2994.989746 0.000000 2505.303711 } - rotation={ 0.000000 0.998758 0.000000 -0.049814 } + position={ 3001.955078 0.000000 2505.214111 } + rotation={ -0.000000 0.881445 -0.000000 0.472286 } scale={ 1.000000 1.000000 1.000000 } } { id=5690 - position={ 3030.000000 0.000000 2487.000000 } - rotation={ 0.000000 0.981956 0.000000 -0.189108 } + position={ 3017.919189 0.000000 2496.707764 } + rotation={ -0.000000 0.951701 -0.000000 0.307025 } scale={ 1.000000 1.000000 1.000000 } } { id=5691 - position={ 3099.617188 0.000000 2482.801758 } - rotation={ 0.000000 0.741452 0.000000 -0.671005 } + position={ 3114.678223 0.000000 2503.635742 } + rotation={ -0.000000 0.983746 -0.000000 0.179564 } scale={ 1.000000 1.000000 1.000000 } } { id=5692 - position={ 3145.000000 0.000000 2501.000000 } - rotation={ 0.000000 0.596931 0.000000 0.802293 } + position={ 3172.755615 0.000000 2513.432373 } + rotation={ -0.000000 0.330021 -0.000000 0.943974 } scale={ 1.000000 1.000000 1.000000 } } { id=5693 - position={ 3174.000000 0.000000 2477.000000 } - rotation={ 0.000000 0.874642 0.000000 -0.484768 } + position={ 3159.312500 0.000000 2498.372559 } + rotation={ -0.000000 0.942482 -0.000000 -0.334255 } scale={ 1.000000 1.000000 1.000000 } } { id=5694 - position={ 3153.000000 0.000000 2458.000000 } - rotation={ 0.000000 0.625727 0.000000 0.780042 } + position={ 3152.591064 0.000000 2455.554688 } + rotation={ -0.000000 0.854049 -0.000000 0.520193 } scale={ 1.000000 1.000000 1.000000 } } { @@ -30979,14 +30979,14 @@ } { id=5696 - position={ 3191.000000 0.000000 2512.000000 } - rotation={ -0.000000 -0.596931 -0.000000 0.802293 } + position={ 3198.841797 0.000000 2517.312500 } + rotation={ -0.000000 -0.976970 -0.000000 0.213378 } scale={ 1.000000 1.000000 1.000000 } } { id=5697 - position={ 3208.425293 0.000000 2529.515137 } - rotation={ 0.000000 0.973249 0.000000 0.229753 } + position={ 3234.180908 0.000000 2535.667725 } + rotation={ -0.000000 0.936239 -0.000000 -0.351363 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31219,8 +31219,8 @@ } { id=5736 - position={ 3233.000000 0.000000 2507.000000 } - rotation={ 0.000000 0.874642 0.000000 0.484769 } + position={ 3037.121582 0.000000 2495.197510 } + rotation={ -0.000000 0.937059 -0.000000 0.349170 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31243,8 +31243,8 @@ } { id=5740 - position={ 3229.000000 0.000000 2540.000000 } - rotation={ 0.000000 0.671005 0.000000 0.741453 } + position={ 3218.863281 0.000000 2517.202637 } + rotation={ -0.000000 0.929510 -0.000000 0.368796 } scale={ 1.000000 1.000000 1.000000 } } { @@ -32113,8 +32113,8 @@ } { id=5902 - position={ 3078.000000 0.000000 2217.000000 } - rotation={ 0.000000 0.937885 0.000000 -0.346946 } + position={ 3135.687012 0.000000 2478.520996 } + rotation={ -0.000000 0.841944 -0.000000 -0.539564 } scale={ 1.000000 1.000000 1.000000 } } { diff --git a/history/provinces/e_caucasia.txt b/history/provinces/e_caucasia.txt index 92f3cbd82..c312ee48c 100644 --- a/history/provinces/e_caucasia.txt +++ b/history/provinces/e_caucasia.txt @@ -89,45 +89,6 @@ } -# 5696 - Archabis -5696 = { # 5696 - Archabis - - # Misc - culture = laz - religion = naqshbandi - - holding = castle_holding - - # History - -} - -# 5697 - Petra -5697 = { # 5697 - Petra - - # Misc - culture = NEOW_georgian - religion = orthodox - - holding = city_holding - - # History - -} - -# 5736 - Taoskari -5736 = { # 5736 - Taoskari - - # Misc - culture = karadenizli - religion = naqshbandi - - holding = none - - # History - -} - # 5738 - Tmogvi 5738 = { # 5738 - Tmogvi @@ -141,19 +102,6 @@ } -# 5740 - Arthanuji -5740 = { # 5740 - Arthanuji - - # Misc - culture = NEOW_georgian - religion = orthodox - - holding = castle_holding - - # History - -} - # 5742 - Tskhinvali 5742 = { # 5742 - Tskhinvali diff --git a/history/provinces/e_mashriq.txt b/history/provinces/e_mashriq.txt index c8b5d0066..4c5c5ea78 100644 --- a/history/provinces/e_mashriq.txt +++ b/history/provinces/e_mashriq.txt @@ -117,16 +117,14 @@ holding = castle_holding } 4815 = { # Hakkâri - culture = kurd - religion = majlisi - holding = castle_holding -} -4817 = { # Başkale holding = city_holding } -5723 = { # Gevaş +4817 = { # Başkale holding = church_holding } +5723 = { # Gevaş + holding = none +} ###c_turuberan/Muş 5716 = { # Muş culture = kurd @@ -1506,22 +1504,6 @@ } -# 5902 - JARABULUS -5902 = { # 5902 - Jarabulus - - # Misc - culture = armenian - religion = armenian_apostolic - - # History - 1177.1.1 = { - culture = kurd - religion = majlisi - } - 1320.1.1 = { culture = syrian } - -} - # 5906 - TALL_AFRIN 5906 = { # 5906 - Tall Afrin diff --git a/history/provinces/e_turkey.txt b/history/provinces/e_turkey.txt index 95d52eb9d..f2445e75e 100644 --- a/history/provinces/e_turkey.txt +++ b/history/provinces/e_turkey.txt @@ -901,7 +901,70 @@ 5698 = { # Niksar holding = none } - +##d_chaldia/Trabzon ################################### +###c_trebizond/Trabzon +678 = { # Trabzon + culture = karadenizli + religion = naqshbandi + holding = castle_holding +} +5691 = { # Akçaabat + holding = city_holding +} +5693 = { # Araklı + holding = church_holding +} +###c_ordu/Ordu +5736 = { # Ordu + culture = karadenizli + religion = naqshbandi + holding = castle_holding +} +5689 = { # Ünye + holding = city_holding +} +5690 = { # Fatsa + holding = none +} +###c_cerasus/Giresun +705 = { # Giresun + culture = karadenizli + religion = naqshbandi + holding = castle_holding +} +706 = { # Şebinkarahisar + holding = none +} +###c_colonea/Gümüşhane +5902 = { # Gümüşhane + culture = NEOW_pontic + religion = naqshbandi + holding = castle_holding +} +5694 = { # Bayburt + holding = church_holding +} +5699 = { # Şiran + holding = none +} +###c_ablastha/Rize +5692 = { # Rize + culture = laz + religion = naqshbandi + holding = castle_holding +} +5696 = { # Ardeşen + holding = city_holding +} +###c_acampse/Artvin +5740 = { # Artvin + culture = laz + religion = naqshbandi + holding = castle_holding +} +5697 = { # Borçka + holding = church_holding +} # custom # 5565 - Chalcedon @@ -1018,36 +1081,6 @@ ### PONTUS ### -# 678 - Trebizond -678 = { # 678 - Trebizond - - # Misc - culture = karadenizli - religion = naqshbandi - - holding = castle_holding -} - -# 705 - Cerasus -705 = { # 705 - Cerasus - - # Misc - culture = karadenizli - religion = naqshbandi - - holding = castle_holding -} - -# 706 - Colonea -706 = { # 706 - Colonea - - # Misc - culture = NEOW_pontic - religion = naqshbandi - - holding = castle_holding -} - # 5603 - Malandra 5603 = { # 5603 - Malandra @@ -1080,23 +1113,6 @@ } } -# 5689 - Oinaion -5689 = { # 5689 - Oinaion - - # Misc - culture = greek - religion = orthodox - - holding = city_holding - - # History - 1100.1.1 = { - culture = turkmen - religion = maturidi - } - -} - # 5690 - Polemonium 5690 = { # 5690 - Polemonium @@ -1134,23 +1150,6 @@ } -# 5692 - Rhizus -5692 = { # 5692 - Rhizus - - # Misc - culture = greek - religion = orthodox - - holding = castle_holding - - # History - 1100.1.1 = { - culture = turkmen - religion = maturidi - } - -} - # 5693 - Hyspiratis 5693 = { # 5693 - Hyspiratis @@ -1167,31 +1166,3 @@ } } - -# 5694 - Baeberdon -5694 = { # 5694 - Baeberdon - - # Misc - culture = karadenizli - religion = naqshbandi - - holding = castle_holding -} - -# 5699 - Sinoria -5699 = { # 5699 - Sinoria - - # Misc - culture = greek - religion = orthodox - - holding = none - - # History - 1100.1.1 = { - culture = turkmen - religion = maturidi - } - -} - 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 b7c811495..4ece77d74 100644 --- a/localization/english/replace/names/NEOW_character_names_l_english.yml +++ b/localization/english/replace/names/NEOW_character_names_l_english.yml @@ -20238,8 +20238,36 @@ H_u_uml_seyn:0 "Hüseyn" El_s_ced__shw_n:0 "Elşən" B_shw_hr_shw_m:0 "Bəhrəm" - B_shw_hr_shw_mxan:0 "Bəhrəmxan" Elnur:0 "Elnur" El_s_ced_ad:0 "Elşad" K_shw_r_shw_m:0 "Kərəm" Arif_shw_:0 "Arifə" + _SHW_li:0 "Əli" + R_shw__s_ced_id:0 "Rəşid" + Ad_i_dot_g_o_uml_z_shw_l:0 "Adıgözəl" + _SHW_l_shw_kb_shw_r:0 "Ələkbər" + _SHW_l_shw_sg_shw_r:0 "Ələsgər" + _SHW_lia_g_brv_a:0 "Əliağa" + _SHW_lih_u_uml_seyn:0 "Əlihüseyn" + Nigar:0 "Nigar" + Qaraxan:0 "Qaraxan" + Etibar:0 "Etibar" + _SHW_fqan:0 "Əfqan" + _I_dot_zz_shw_t:0 "İzzət" + N_shw_rgiz:0 "Nərgiz" + R_o_uml_ya:0 "Röya" + R_shw_van:0 "Rəvan" + Soltan:0 "Soltan" + Durna:0 "Durna" + A_g_brv_ah_u_uml_seyn:0 "Ağahüseyn" + Firudin:0 "Firudin" + H_shw_mz_shw_:0 "Həmzə" + Seyf_shw_ddin:0 "Seyfəddin" + F_shw_rman:0 "Fərman" + R_shw_him:0 "Rəhim" + F_shw_rh_shw_ng:0 "Fərhəng" + Zakir:0 "Zakir" + Aysel:0 "Aysel" + V_shw_fa:0 "Vəfa" + _I_dot_sg_shw_nd_shw_r:0 "İsgəndər" + _SHW__s_ced_r_shw_f:0 "Əşrəf" diff --git a/localization/english/replace/titles_l_english.yml b/localization/english/replace/titles_l_english.yml index bf2f0f1db..bec778ad8 100644 --- a/localization/english/replace/titles_l_english.yml +++ b/localization/english/replace/titles_l_english.yml @@ -8552,7 +8552,6 @@ b_kopys:0 "Kopys" b_kora:0 "Kora" b_korablino:0 "Korablino" - b_koralla:0 "Koralla" b_koraput:0 "Koraput" b_korat:0 "Korat" b_koravangala:0 "Koravangala" @@ -10543,7 +10542,7 @@ b_pestovo:0 "Pestovo" b_petervasara:0 "Pétervására" b_petobriga:0 "Petobriga" - b_petra:0 "Petra" + b_petra:0 "Borçka" b_petralia:0 "Petralia" b_petron:0 "Petron" b_petrovskoye:0 "Petrovskoye" @@ -15918,8 +15917,6 @@ c_tanas_adj:0 "Tanasian" c_tangiers:0 "Tangiers" c_tangiers_adj:0 "Tangieran" - c_tao:0 "Tao" - c_tao_adj:0 "Taoian" c_taradavadi:0 "Taradavadi" c_taradavadi_adj:0 "Taradavadi" c_karahataka:0 "Karahataka" @@ -19059,8 +19056,6 @@ b_soli_CYP:0 "Soli" #Armenia & Georgia - d_chaldia:0 "Chaldia" - d_chaldia_adj:0 "Chaldian" d_vaspurakan:0 "Van" d_vaspurakan_adj:0 "Vanlı" d_greater_armenia:0 "Greater Armenia" @@ -19070,14 +19065,8 @@ d_tao-klarjeti_adj:0 "Tao-Klarjetian" d_shirvan:0 "Shirvan" d_shirvan_adj:0 "Shirvanian" - c_cerasus:0 "Cerasus" - c_cerasus_adj:0 "Cerasusian" c_trebizond:0 "Trebizond" c_trebizond_adj:0 "Trebizondian" - c_acampse:0 "Acampse" - c_acampse_adj:0 "Acampsian" - c_colonea:0 "Colonea" - c_colonea_adj:0 "Colonean" c_hark:0 "Hark" c_hark_adj:0 "Harkian" c_apahunik:0 "Erciş" @@ -19108,17 +19097,7 @@ c_khachen_adj:0 "Khacheni" c_mugan:0 "Mugan" c_mugan_adj:0 "Muganian" - b_oinaion:0 "Oinaion" - b_polemonium:0 "Polemonium" - b_cerasus:0 "Cerasus" - b_trebizond:0 "Trebizond" - b_rhizus:0 "Rhizus" - b_hyspiratis:0 "Hyspiratis" - b_baeberdon:0 "Baeberdon" b_keltzine:0 "Keltzine" - b_archabis:0 "Archabis" - b_colonea:0 "Colonea" - b_sinoria:0 "Sinoria" b_musch:0 "Muş" b_tatvan:0 "Tatvan" b_khlat:0 "Ahlat" @@ -19137,10 +19116,10 @@ b_zariskat:0 "Sarıkamış" b_kars:0 "Kars" b_sevuki:0 "Karayazı" - b_taoskari:0 "Taoskari" + b_taoskari:0 "Ordu" b_oltisi:0 "Horasan" b_tmogvi:0 "Tmogvi" - b_arthanuji:0 "Arthanuji" + b_arthanuji:0 "Artvin" b_artaani:0 "Ardahan" b_tskhinvali:0 "Tskhinvali" b_uplistsikhe:0 "Uplistsikhe" @@ -27193,33 +27172,35 @@ b_andrapa:0 "Boyabat" b_ziporea:0 "Karabük" d_chaldia:0 "Trabzon" - d_chaldia_adj:0 "Trabzon" + d_chaldia_adj:0 "Trabzonlu" c_trebizond:0 "Trabzon" - c_trebizond_adj:0 "Trabzon" + c_trebizond_adj:0 "Trabzonlu" b_trebizond:0 "Trabzon" b_rhizus:0 "Rize" - b_hyspiratis:0 "İspir" + b_hyspiratis:0 "Araklı" c_acampse:0 "Artvin" - c_acampse_adj:0 "Artvin" - b_archabis:0 "Arhavi" - b_petra:0 "Hopa" + c_acampse_adj:0 "Artvinli" + b_archabis:0 "Ardeşen" c_sinope:0 "Sinop" c_sinope_adj:0 "Sinoplu" b_sinope:0 "Sinop" b_zagora:0 "Alaçam" b_gadilon:0 "Çarşamba" b_amisos:0 "Samsun" + c_ordu:0 "Ordu" + c_ordu_adj:0 "Ordulu" c_cerasus:0 "Giresun" - c_cerasus_adj:0 "Giresun" + c_cerasus_adj:0 "Giresunlu" b_cerasus:0 "Giresun" b_oinaion:0 "Ünye" b_polemonium:0 "Fatsa" - b_koralla:0 "Görele" - c_colonea:0 "Şebinkarahisar" - c_colonea_adj:0 "Şebinkarahisar" + b_koralla:0 "Akçaabat" + b_gumushane:0 "Gümüşhane" + c_colonea:0 "Gümüşhane" + c_colonea_adj:0 "Gümüşhaneli" b_colonea:0 "Şebinkarahisar" b_neocaesara:0 "Niksar" - b_sinoria:0 "Yağlıdere" + b_sinoria:0 "Şiran" c_edessa:0 "Urfa" c_edessa_adj:0 "Urfalı" b_edessa:0 "Şanlıurfa" @@ -27362,6 +27343,8 @@ d_mardin_adj:0 "Mardinli" c_sirnak:0 "Şırnak" c_sirnak_adj:0 "Şırnaklı" + c_ablastha:0 "Rize" + c_ablastha_adj:0 "Rizeli" e_caucasia:0 "Caucasia" e_caucasia_adj:0 "Caucasian" diff --git a/map_data/definition.csv b/map_data/definition.csv index 55c269acd..60ba8cd21 100644 --- a/map_data/definition.csv +++ b/map_data/definition.csv @@ -704,7 +704,7 @@ 703;126;192;179;Martyropolis;x 704;168;195;52;Theodosiopolis;x 705;0;198;180;Cerasus;x -706;42;201;53;Colonea;x +706;22;124;29;Colonea;x 707;84;204;181;Melitene;x 708;126;207;54;sea_irish;x 709;168;210;182;sea_irish;x @@ -5599,7 +5599,7 @@ 5598;131;180;99;Comana Pontica;x 5599;173;183;227;Sebastopolis;x 5600;5;186;0;Agranai;x -5601;47;189;128;Pedachtoe;x +5601;80;101;92;Pedachtoe;x 5602;89;192;1;Sebasteia;x 5603;131;195;129;Malandra;x 5604;173;198;2;Karnalis;x @@ -5694,12 +5694,12 @@ 5693;131;39;174;Hyspiratis;x 5694;173;42;47;Baeberdon;x 5695;5;45;175;Keltzine;x -5696;47;48;48;Archabis;x +5696;106;132;132;Archabis;x 5697;89;51;176;Petra;x 5698;179;90;84;Neocaesara;x -5699;173;57;177;Sinoria;x +5699;89;57;90;Sinoria;x 5700;5;60;50;Hypseie;x -5701;47;63;178;Nicopolis_ARM;x +5701;108;117;184;Nicopolis_ARM;x 5702;89;66;51;Kheranion;x 5703;131;69;179;Satala;x 5704;173;72;52;Kamisa;x diff --git a/map_data/geographical_regions/geographical_region.txt b/map_data/geographical_regions/geographical_region.txt index e202c31f8..05d3c00a3 100644 --- a/map_data/geographical_regions/geographical_region.txt +++ b/map_data/geographical_regions/geographical_region.txt @@ -4047,7 +4047,7 @@ dlc_fp2_mediterranean_shoreline = { # Then check is_coastal_county = yes } dlc_fp2_caucasian_iberia = { # Next to Georgia (Due to how counties are partitioned, and some warping, it does not match actual maps) - counties = { c_tao c_klarjeti c_vanand c_ardahan c_hayk c_kartli c_tbilisi c_kakheti c_lori c_hereti } + counties = { c_klarjeti c_vanand c_ardahan c_hayk c_kartli c_tbilisi c_kakheti c_lori c_hereti } } dlc_fp2_form_aragon_region = { @@ -5573,7 +5573,7 @@ black_sea_coast_region = { d_sevastopol d_simferopol d_azov d_sochi } counties = { - c_oleshye c_kherson c_odessa c_cetatea_alba c_chilia c_constanta c_burgas c_brysis c_byzantion c_bithynia c_tarsos c_honorias c_zonguldak c_karabuk c_sinope c_helenopontus c_samsun c_cerasus c_trebizond c_acampse c_guria c_odishi c_abkhazia c_zichia c_tana c_khortytsia + c_oleshye c_kherson c_odessa c_cetatea_alba c_chilia c_constanta c_burgas c_brysis c_byzantion c_bithynia c_tarsos c_honorias c_zonguldak c_karabuk c_sinope c_helenopontus c_samsun c_cerasus c_ordu c_trebizond c_acampse c_guria c_odishi c_abkhazia c_zichia c_tana c_khortytsia #c_mesembria } } diff --git a/map_data/provinces.png b/map_data/provinces.png index 9bb9d658a..0b2fc7596 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:cb31c89428f559c1e13b62e585d58edb7e93fbdef7ecb594dc7a1c1f4c911a8b -size 2684447 +oid sha256:2aefd978c4bb7d9ad60a7f4f0ab9e403c95af1b6da08c1cab7aa4b2b679cccaa +size 2685060