diff --git a/common/culture/name_equivalency/00_NEOW_female_names.txt b/common/culture/name_equivalency/00_NEOW_female_names.txt index 501683e3b..e64697bde 100644 --- a/common/culture/name_equivalency/00_NEOW_female_names.txt +++ b/common/culture/name_equivalency/00_NEOW_female_names.txt @@ -136,7 +136,7 @@ cholpan_female = { _S_crn_olpan } christelle_female = { Christel Christelle Chryst_a_act_lla Kristel Kristell } christina_female = { Carsta Chesten Chrissie Christ_i_act_na Christa Christiane Christina Christine Christl Crestina Crestino Cristiana Cristieana Cristina Cristyn Hristina Kersten_female Kersti Kerstin Kirsten Kirsti Kirstine Kirsty Kr_i_grv_schtian Kr_i_grv_schtinn Krist_i_act_n Krist_i_act_na Krist_i_mcn_ne Krist_y_act_na Krista Kristen Kristi Kristi_a_mcn_na Kristiina Kristiine Kristin Kristina Kristine Kristjana Kristy Krystyna Stina Stine Tiina Tine } chun_female = { Ch_y_hat_n Chun } -claire_female = { Argi_n_tld_e Chiara Clair Claire Clara Clare Clarha Clarice Clarisse Clarisso Claro_female Kl_a_act_ra Kl_a_uml_rchen Kl_a_uml_ris Klara Kler Sklaerenn } +claire_female = { Argi_n_tld_e Chiara Clair Claire Clara Clare Clarha Clarice Clarisse Clarisso Claro_female Kl_a_act_ra Kl_a_uml_rchen Kl_a_uml_ris Klara Kler Qlara Sklaerenn } clairemaria_female = { Clara_spc_Mar_i_act_a } claudia_female = { Cl_a_act_udia Cl_a_grv_udia Claudette Claudia Claudine Gladys Glaudeto Glaudino Glaudo_female Gwladdys Gwladys Klaoda Klaodina Klaudia Klaudija Klavdija Klodeta } clementia_female = { Cl_e_act_mentine Clem_e_grv_nci Clem_e_grv_ncia Clementia Clementina Clementino_female Clymyntyny Klementina Klimentina } @@ -363,7 +363,7 @@ kayleigh_female = { Kayleigh Kejli } kelly_female = { K_AE_ll_i_hat_ Kelli Kelly } kennedyn_jacqueline_female = { Kennedyn Jacqueline } khadija_female = { Chatitz_e_act_ Hatice Haty_c_ced_a X_shw_dic_shw_ Xadi_s_ced_at Xadicat Xadizhat Xaduzhat } -khalida_female = { Halida } +khalida_female = { Halida Xalid_a_uml_ } khayria_female = { Hajrie } khurshid_female = { Xur_s_ced_id } kimberley_female = { Kimberley Kimberli Kimberly Kymberl_i_hat_w } diff --git a/common/culture/name_equivalency/00_NEOW_male_names.txt b/common/culture/name_equivalency/00_NEOW_male_names.txt index 6dc721296..07af6475f 100644 --- a/common/culture/name_equivalency/00_NEOW_male_names.txt +++ b/common/culture/name_equivalency/00_NEOW_male_names.txt @@ -53,6 +53,7 @@ aeneas_male = { Aine_i_act_as Anej Enea } aetius_lincoln_male = { Aetius Lincoln } agapetus_male = { Agapit } ahmad_male = { _SHW_hm_shw_d A_h_mbw_mad A_x_dot_mad Achm_e_act_t Ahmad Ahmadd Ahmat Ahmed Ahmet Amadou } +ahmadjan_male = { _A_uml_xm_a_uml_tcan } ahti_male = { Ahti Ahto } aidan_male = { Aeddan Aidan } ajax_male = { Ajaks } @@ -69,7 +70,7 @@ 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_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 } +alexander_male = { _I_dot_sg_shw_nd_shw_r _I_dot_sk_a_uml_nd_a_uml_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 } @@ -96,7 +97,7 @@ amatus_male = { Aim_e_act_ Amado Amat Amato } ambrosius_male = { _AE_mbroseh Aamb_o_hat_s Ambr_o_act_z Ambr_o_grv_si Ambro Ambrogio Ambrose Ambrosio Ambroz Ambruhs Emrys } amenhotep_male = { Ahmahnhotep Am_pst_nawtypp Amenho_pst_ep Amenhotep Uhmenhuhtep } amin_male = { _A_uml_men Amin Amine Elamine Emin } -amir_male = { _G_dot_amir _SHW_mir Amir Emir } +amir_male = { _A_uml_mir _G_dot_amir _SHW_mir Amir Emir } amirhussein_male = { _SHW_mirh_u_uml_seyn } amirkhan_male = { _A_uml_m_i_dot_rhan Amirxan Emirhan } amrullah_male = { Emrullah } @@ -384,7 +385,7 @@ fahim_male = { Fehim } fakhruddin_male = { F_shw_xr_shw_ddin Fahredin Fahrettin Faxrudin } falk_male = { Falk Falko Fa_l_stk_ko } faraj_male = { F_shw_r_shw_c } -farhad_male = { F_shw_rhad } +farhad_male = { F_a_uml_rx_a_uml_t F_shw_rhad } farid_male = { F_shw_rid Farid Ferid Ferit Ferrid Frid } faris_male = { Far_e_grv_s } farrukh_male = { F_shw_rrux } @@ -447,7 +448,7 @@ gareth_male = { Gareth Garhyf Garyf } gary_male = { Garry Gary } gaston_male = { Gaston Gastone Gastono } gawayn_male = { Gaivin Gavin Gawayn Gawyyn } -genghis_male = { _C_ced_ingiz Cengiz } +genghis_male = { _C_ced__i_dot__n_tld__g_brv__i_dot_z _C_ced_ingiz Cengiz } gennadiy_male = { Genadi Genn_a_act_dios Gennadij Gennadiy } geoffrey_male = { _G_crn_efri Bogum_e_crn_r Bohum_e_crn_r Gaufre Geoffrei Geoffrey Geoffroy Godefroy Godffrhyy Godfrey Goffredo Gottfrid Gottfried Govert Gyoffrhyy Gyoffryy Gyr_eth_ir Jaufret Jeff Jeffrey Sieffre } george_male = { _D_bar_or_d_bar_e _G_dot_or_g_dot_ _O_stk_rjan _O_uml_rjan Chorche D_pst_ura D_z_dot_ord_z_dot_ G_o_uml_ran G_o_uml_rgen Ge_o_act_rgios Geo Georg George Georges Georgi Georgiy Georgo Gheorghe Gheorghi_t_cma__a_brv_ Gi_o_act_rgos Gic_a_brv_ Gigel Gio Giorgio Gjergj Gjergji Gjoko Gjore Gjorge Gjorgi Gjorgji Goce Gorch Gorka Gyorgy Gyorhgy Hieorhij Iurie J_o_grv_rgi J_o_stk_rgen J_o_stk_rn J_o_uml_ran J_o_uml_rg J_o_uml_rn J_u_uml_rgen J_u_uml_ri Jerg Jerri Jerzy Ji_r_crn__i_act_ Jord Jordi Jordy Jorge Jori Joris Jorj Jorn Jorres Jory Jur_i_hat_j Juraj Jure Jurgi Jurgis Juri Jurij Jurijs Juris Jurjen Juro Jury Jyri Jyrki Schorsch Si_o_hat_r Siorus Xurde Xurxo Youri Yrj_o_uml_ Yuri Yuriy Jirjis } @@ -663,7 +664,7 @@ johnraymond_male = { Chuan_spc_Ram_o_act_n Joan_spc_Ramon Jon_spc_Erramun Juan_s johnstephen_male = { Jan-Steve } johnthierry_male = { Hans-Dieter } johnyves_male = { Jan-Ives Jean-Yvon Yann-Erwan } -jonah_male = { _Y_act_unus Inus Iona_male J_o_act_nas Jon_a_act__s_crn_ Jona_Jonah Jonah Jonas Joona Joonas Xon_a_act_s Youn_e_grv_s Yunis Yunus } +jonah_male = { _Y_act_unus Inus Iona_male J_o_act_nas Jon_a_act__s_crn_ Jona_Jonah Jonah Jonas Joona Joonas Xon_a_act_s Youn_e_grv_s Yun_i_dot_s Yunis Yunus } jonathan_male = { Gionata Johnafan Jonafan Jonaitain Jonat_a_act_n Jonatan Jonathan Jounatan Xonat_a_act_n Yona Yonathan } jordan_male = { Giordano Iord_a_act_nis Jord_a_grv_ Jordan Jordan_c_crn_o Jorddain Jorddan Jordie Jorhddan Jourdan Xord_a_act_n Yordan } joseph_male = { _G_dot_u_z_dot__e_grv_ _Y_act_usup Beppe Beppino Chus_e_act_ Giouso_u_act_f Giuseppe Ioseba Iosif J_o_act_zef J_o_act_us_e_grv_ Jazep Jo_z_crn_e Jo_z_crn_ef Job_Joseph Joe Joep Joey Joosep Jos Jos_e_act_ Jos_i_hat_f Jose Joseba Josef Josep Joseph Josephus Josif Josip Josyff Joxe Jozeb Jozef Jozefo Juozapas Juozas Jusif Jusuf Juuso Osif Osip Pino Pippo Schoseff Sepa Xos_e_act_ Yosif Yossef Youssef Yusif Yusuf Yusup Zef } @@ -984,6 +985,7 @@ pulcher_amos_male = { Pulcher Amos } pythagoras_suetonius_male = { Pythagoras Suetonius } qadir_male = { Kadir Q_shw_dir } qasim_male = { Kaisim Kas_i_dot_m Kasim Kassim Qas_i_dot_m } +quddus_male = { Qotdus } quentin_male = { Quentin Quint_i_act_n Quinten } quirinus_male = { Krijn Quirino } qurban_male = { Gurban Q_pst_urban Qurban } @@ -1016,7 +1018,7 @@ reinhard_male = { Reinert Reinh_a_grv_rd Reinhard Ren_a_mcn_rs } remigius_male = { Remi Remig Remigijus Remigio Remixio Roumi_e_act_ } remington_drake_male = { Remington Drake } renatus_male = { R_o_uml_nn Reini_e_act_ Ren_e_act_ Renat Renatas Renato Rene } -reuben_male = { R_e_act_ouven R_u_act_ben Reuben Rub_e_act_n Rub_e_grv_n Ruben Rubens Ruvim } +reuben_male = { R_e_act_ouven R_u_act_ben Reuben Rub_e_act_n Rub_e_grv_n Ruben Rubens Rubin Ruvim } reza_male = { R_i_dot_za Reda Rza } rhett_sullivan_male = { Rhett Sullivan } rhys_male = { Reece Rhys } @@ -1044,7 +1046,7 @@ rudolf_male = { R_u_uml_dolf Ridolfo Rodolf Rodolfo Rodolphe Roelf Roelof Rolf R rufus_male = { Rufas Rufus } rufus_owen_male = { Rufus Owen } ruslan_male = { Ruslan Ruslanas } -rustam_male = { R_u_uml_st_shw_m R_u_uml_stem Rrustem Rustam } +rustam_male = { R_o_uml_st_a_uml_m R_u_uml_st_shw_m R_u_uml_stem Rrustem Rustam } rutherford_henry_male = { Rutherford Henry } ryan_male = { Ryan } sabah_male = { Sabah } diff --git a/common/culture/name_lists/NEOW_azerbaijani.txt b/common/culture/name_lists/NEOW_azerbaijani.txt index 6906def82..d2b9bd218 100644 --- a/common/culture/name_lists/NEOW_azerbaijani.txt +++ b/common/culture/name_lists/NEOW_azerbaijani.txt @@ -363,7 +363,7 @@ patronym_suffix_male = "dynnpat_suf__spc_o_g_brv_lu" patronym_suffix_female = "dynnpat_suf__spc_q_i_dot_z_i_dot_" - always_use_patronym = yes + always_use_patronym = yes # Chance of male children being named after their paternal or maternal grandfather, or their father. Sum must not exceed 100. pat_grf_name_chance = 60 diff --git a/common/culture/name_lists/NEOW_croatian.txt b/common/culture/name_lists/NEOW_croatian.txt index 34f82078b..73274beaf 100644 --- a/common/culture/name_lists/NEOW_croatian.txt +++ b/common/culture/name_lists/NEOW_croatian.txt @@ -1,6 +1,7 @@ name_list_NEOW_croatian = { cadet_dynasty_names = { + "dynn__D_bar_uri_s_crn_i_c_act_" "dynn_Aleksi_c_act_" "dynn_Anti_c_act_" "dynn_Ateljevi_c_act_" @@ -24,7 +25,6 @@ "dynn_Kvesi_c_act_" "dynn_Rudovi_c_act_" "dynn_Srzenti_c_act_" - "dynn_D_bar_uri_s_crn_i_c_act_" "dynn_Klobu_c_crn_ar" "dynn_Maru_s_crn_i_c_act_" "dynn_Milardovi_c_act_" @@ -46,6 +46,7 @@ } dynasty_names = { + "dynn__D_bar_uri_s_crn_i_c_act_" "dynn_Aleksi_c_act_" "dynn_Anti_c_act_" "dynn_Ateljevi_c_act_" @@ -69,7 +70,6 @@ "dynn_Kvesi_c_act_" "dynn_Rudovi_c_act_" "dynn_Srzenti_c_act_" - "dynn_D_bar_uri_s_crn_i_c_act_" "dynn_Klobu_c_crn_ar" "dynn_Maru_s_crn_i_c_act_" "dynn_Milardovi_c_act_" diff --git a/common/culture/name_lists/NEOW_tatar.txt b/common/culture/name_lists/NEOW_tatar.txt new file mode 100644 index 000000000..3847e21ee --- /dev/null +++ b/common/culture/name_lists/NEOW_tatar.txt @@ -0,0 +1,66 @@ +name_list_NEOW_tatar = { + + cadet_dynasty_names = { + } + + dynasty_names = { + "dynn_T_o_uml_xf_a_uml_tullin" + "dynn_X_a_uml_yretdinow" + } + + male_names = { + 3 = { + _A_uml_mir + _I_dot_ldar _I_dot_sk_a_uml_nd_a_uml_r + R_o_uml_st_a_uml_m Ramil + } + 2 = { + _C_ced__i_dot__n_tld__g_brv__i_dot_z + _I_dot_brahim + F_a_uml_rx_a_uml_t + Rubin + } + 1 = { + _A_uml_xm_a_uml_tcan + Afzal + K_a_uml_bir + Qotdus + Yun_i_dot_s + } + } + female_names = { + 3 = { + _A_uml_lfiy_a_uml_ + Elvira + } + 2 = { + Luiza + Qlara + T_a_uml_skir_a_uml_ + Xalid_a_uml_ + } + 1 = { + Mahir_a_uml_ + Rawza + } + } + dynasty_of_location_prefix = "dynnp_of" + + patronym_suffix_male = "dynnpat_suf__spc_ul_i_dot_" + patronym_suffix_female = "dynnpat_suf__spc_q_i_dot_z_i_dot_" + always_use_patronym = yes + + # Chance of male children being named after their paternal or maternal grandfather, or their father. Sum must not exceed 100. + pat_grf_name_chance = 60 + mat_grf_name_chance = 10 + father_name_chance = 10 + + # Chance of female children being named after their paternal or maternal grandmother, or their mother. Sum must not exceed 100. + pat_grm_name_chance = 10 + mat_grm_name_chance = 60 + mother_name_chance = 10 + + + mercenary_names = { + } +} diff --git a/common/dynasties/NEOW_dynasties.txt b/common/dynasties/NEOW_dynasties.txt index 0af84d3fd..e3d370d00 100644 --- a/common/dynasties/NEOW_dynasties.txt +++ b/common/dynasties/NEOW_dynasties.txt @@ -3012,7 +3012,7 @@ atchali_dynasty = { culture = egeli } khairetdinov_dynasty = { - name = dynn_khairetdinov + name = dynn_X_a_uml_yretdinow culture = NEOW_tatar } karim_dynasty = { diff --git a/common/landed_titles/caucasus.txt b/common/landed_titles/caucasus.txt index d5d14ed94..b6924c307 100644 --- a/common/landed_titles/caucasus.txt +++ b/common/landed_titles/caucasus.txt @@ -5,7 +5,6 @@ e_caucasia = { k_armenia = { color = { 216 155 32 } - capital = c_hayk # Ani ai_primary_priority = { @@ -20,7 +19,10 @@ e_caucasia = { cultural_names = { name_list_armenian = cn_hayastan } + d_kars = { # Ağrı + color = { 203 86 66 } + capital = c_agri # Ağrı cultural_names = { name_list_NEOW_griko = cn_ararat_greek @@ -28,10 +30,9 @@ e_caucasia = { name_list_NEOW_cypriot = cn_ararat_greek name_list_NEOW_greco_turkish = cn_ararat_greek } - color = { 203 86 66 } - capital = c_agri # Ağrı c_agri = { # Ağrı + color = { 37 71 27 } cultural_names = { name_list_NEOW_griko = cn_karakiose @@ -39,9 +40,10 @@ e_caucasia = { name_list_NEOW_cypriot = cn_karakiose name_list_NEOW_greco_turkish = cn_karakiose } - color = { 37 71 27 } b_valashkert = { # Ağrı + province = 5731 + color = { 195 82 88 } cultural_names = { name_list_NEOW_griko = cn_valaskert_greek @@ -49,10 +51,10 @@ e_caucasia = { name_list_NEOW_cypriot = cn_valaskert_greek name_list_NEOW_greco_turkish = cn_valaskert_greek } - province = 5731 - color = { 195 82 88 } } b_patnos = { # Patnos + province = 5732 + color = { 195 82 88 } cultural_names = { name_list_NEOW_griko = cn_patnos_greek @@ -60,10 +62,10 @@ e_caucasia = { name_list_NEOW_cypriot = cn_patnos_greek name_list_NEOW_greco_turkish = cn_patnos_greek } - province = 5732 - color = { 195 82 88 } } b_manzikert = { # Diyadin + province = 701 + color = { 150 65 50 } cultural_names = { name_list_NEOW_griko = cn_diyadin_greek @@ -71,15 +73,10 @@ e_caucasia = { name_list_NEOW_cypriot = cn_diyadin_greek name_list_NEOW_greco_turkish = cn_diyadin_greek } - province = 701 - color = { 150 65 50 } - - cultural_names = { - name_list_turkish = cn_malazgirt - } } } c_bagrewand = { # Iğdır + color = { 195 82 88 } cultural_names = { name_list_NEOW_griko = cn_tsolakert @@ -87,20 +84,21 @@ e_caucasia = { name_list_NEOW_cypriot = cn_tsolakert name_list_NEOW_greco_turkish = cn_tsolakert } - color = { 195 82 88 } b_tsalakert = { # Iğdır - + province = 5730 + color = { 195 82 88 } + cultural_names = { name_list_NEOW_griko = cn_tsolakert name_list_NEOW_greek = cn_tsolakert name_list_NEOW_cypriot = cn_tsolakert name_list_NEOW_greco_turkish = cn_tsolakert } - province = 5730 - color = { 195 82 88 } } b_bagavan = { # Doğubayazıt + province = 5720 + color = { 195 82 88 } cultural_names = { name_list_NEOW_griko = cn_vagavan @@ -108,11 +106,10 @@ e_caucasia = { name_list_NEOW_cypriot = cn_vagavan name_list_NEOW_greco_turkish = cn_vagavan } - province = 5720 - color = { 195 82 88 } } } c_vanand = { # Kars + color = { 189 136 133 } cultural_names = { name_list_NEOW_griko = cn_kars_greek @@ -120,9 +117,10 @@ e_caucasia = { name_list_NEOW_cypriot = cn_kars_greek name_list_NEOW_greco_turkish = cn_kars_greek } - color = { 189 136 133 } b_kars = { # Kars + province = 5734 + color = { 189 136 133 } cultural_names = { name_list_NEOW_griko = cn_kars_greek @@ -130,10 +128,10 @@ e_caucasia = { name_list_NEOW_cypriot = cn_kars_greek name_list_NEOW_greco_turkish = cn_kars_greek } - province = 5734 - color = { 189 136 133 } } b_zariskat = { # Sarıkamış + province = 5733 + color = { 189 136 133 } cultural_names = { name_list_NEOW_griko = cn_sarikamis_greek @@ -141,10 +139,10 @@ e_caucasia = { name_list_NEOW_cypriot = cn_sarikamis_greek name_list_NEOW_greco_turkish = cn_sarikamis_greek } - province = 5733 - color = { 189 136 133 } } b_ani = { # Akyaka + province = 681 + color = { 203 76 76 } cultural_names = { name_list_NEOW_griko = cn_ani_greek @@ -152,16 +150,10 @@ e_caucasia = { name_list_NEOW_cypriot = cn_ani_greek name_list_NEOW_greco_turkish = cn_ani_greek } - province = 681 - color = { 203 76 76 } - - cultural_names = { - name_list_greek = cn_anion - name_list_turkish = cn_ani - } } } c_ardahan = { # Ardahan + color = { 39 80 29 } cultural_names = { name_list_NEOW_griko = cn_ardahan_greek @@ -169,9 +161,10 @@ e_caucasia = { name_list_NEOW_cypriot = cn_ardahan_greek name_list_NEOW_greco_turkish = cn_ardahan_greek } - color = { 39 80 29 } b_artaani = { # Ardavan + province = 5741 + color = { 95 90 90 } cultural_names = { name_list_NEOW_griko = cn_artaani_greek @@ -179,10 +172,10 @@ e_caucasia = { name_list_NEOW_cypriot = cn_artaani_greek name_list_NEOW_greco_turkish = cn_artaani_greek } - province = 5741 - color = { 95 90 90 } } b_akhaltsikhe = { # Hanak + province = 5739 + color = { 95 90 90 } cultural_names = { name_list_NEOW_griko = cn_hanak_greek @@ -190,8 +183,6 @@ e_caucasia = { name_list_NEOW_cypriot = cn_hanak_greek name_list_NEOW_greco_turkish = cn_hanak_greek } - province = 5739 - color = { 95 90 90 } } } } @@ -281,10 +272,8 @@ e_caucasia = { } } } - k_georgia = { color = { 127 25 50 } - capital = c_tbilisi # Tbilisi ai_primary_priority = { @@ -299,10 +288,111 @@ e_caucasia = { } } - d_tao-klarjeti = { - color = { 60 60 60 } + d_abkhazia = { # Abkhazia + color = { 70 70 80 } + capital = c_abkhazia # Tskhumi + + c_abkhazia = { # Sukhumi + color = { 60 70 90 } - capital = c_klarjeti + b_tskhumi = { # Sukhumi + province = 5746 + color = { 255 255 255 } + } + b_gudakva = { # Tkvarcheli + province = 5747 + color = { 70 63 88 } + } + b_chkhalta = { # Chkhalta + province = 8952 + color = { 165 120 36 } + } + } + c_gagra = { # Gagra + color = { 155 119 35 } + + b_bichvinta = { # Gagra + province = 5744 + color = { 255 255 255 } + } + b_anacopia = { # Gudauta + province = 5745 + color = { 255 255 255 } + } + } + } + d_tao-klarjeti = { # Imereti + color = { 60 60 60 } + capital = c_imereti # Kutaisi + + c_imereti = { # Imereti + color = { 101 107 25 } + + b_kutaisi = { # Kutaisi + province = 601 + color = { 70 63 88 } + } + b_kvara = { # Samtredia + province = 5753 + color = { 90 94 90 } + } + b_shorapann = { # Baghdati + province = 5757 + color = { 95 95 104 } + } + } + c_odishi = { # Mingrelia + color = { 70 63 88 } + + b_zugdidi = { # Zugdidi + province = 5749 + color = { 70 63 88 } + } + b_gali = { # Gali + province = 8953 + color = { 165 120 36 } + } + b_tsageri = { # Tsalenjikha + province = 5750 + color = { 70 63 88 } + } + } + c_svaneti = { # Svaneti + color = { 90 94 90 } + + b_seti = { # Mestia + province = 5748 + color = { 70 63 88 } + } + b_kasriskari = { # Lentekhi + province = 5752 + color = { 90 94 90 } + } + b_ambrolauri = { # Ambrolauri + province = 5751 + color = { 90 94 90 } + } + } + c_guria = { # Adjara-Guria + color = { 95 95 104 } + + b_batumi = { # Batumi + province = 677 + color = { 95 95 104 } + } + b_vartsikhe = { # Kobuleti + province = 5756 + color = { 95 95 104 } + } + b_poti = { # Ozurgeti + province = 5754 + color = { 95 95 104 } + } + } + } + d_georgia = { + color = { 184 156 156 } + capital = c_tbilisi # Tbilisi c_klarjeti = { color = { 95 90 90 } @@ -313,111 +403,6 @@ e_caucasia = { color = { 95 90 90 } } } - c_guria = { - color = { 95 95 104 } - - b_batumi = { - province = 677 - - color = { 95 95 104 } - } - b_poti = { - province = 5754 - - color = { 95 95 104 } - } - b_vartsikhe = { - province = 5756 - - color = { 95 95 104 } - } - b_shorapann = { - province = 5757 - - color = { 95 95 104 } - } - } - } - - d_abkhazia = { - color = { 70 70 80 } - - capital = c_abkhazia # Tskhumi - - c_abkhazia = { - color = { 60 70 90 } - - b_tskhumi = { - province = 5746 - - color = { 255 255 255 } - } - b_nicopsia = { - province = 600 - - color = { 255 255 255 } - } - b_bichvinta = { - province = 5744 - - color = { 255 255 255 } - } - b_anacopia = { - province = 5745 - - color = { 255 255 255 } - } - b_gudakva = { - province = 5747 - - color = { 70 63 88 } - } - } - c_odishi = { - color = { 70 63 88 } - - b_kutaisi = { - province = 601 - - color = { 70 63 88 } - } - b_seti = { - province = 5748 - - color = { 70 63 88 } - } - b_zugdidi = { - province = 5749 - - color = { 70 63 88 } - } - b_tsageri = { - province = 5750 - - color = { 70 63 88 } - } - } - c_svaneti = { - color = { 90 94 90 } - - b_ambrolauri = { - province = 5751 - - color = { 90 94 90 } - } - b_kvara = { - province = 5753 - - color = { 90 94 90 } - } - } - } - - d_georgia = { - color = { 184 156 156 } - - capital = c_tbilisi # Tbilisi - c_tbilisi = { color = { 161 137 137 } diff --git a/common/landed_titles/nistrenia.txt b/common/landed_titles/nistrenia.txt index 14964df46..9a65c4a7c 100644 --- a/common/landed_titles/nistrenia.txt +++ b/common/landed_titles/nistrenia.txt @@ -2916,19 +2916,23 @@ e_nistrenia = { color = { 45 153 45 } b_sochi = { # Sochi - province = 8872 + province = 8875 color = { 164 196 152 } } b_tuapse = { # Tuapse - province = 8873 + province = 8872 color = { 164 196 152 } } b_apsheronsk = { # Apsheronsk province = 8874 color = { 164 196 152 } } - b_adler = { # Adler - province = 8875 + b_nicopsia = { # Adler + province = 600 + color = { 164 196 152 } + } + b_arkhipo_osipovka = { # Arkhipo-Osipovka + province = 8873 color = { 164 196 152 } } } @@ -3047,12 +3051,7 @@ e_nistrenia = { b_chikola = { # Chikola province = 8859 color = { 7 1 134 } - } - b_kasriskari = { - province = 5752 - - color = { 90 94 90 } - } + } } } } diff --git a/common/province_terrain/00_province_terrain.txt b/common/province_terrain/00_province_terrain.txt index f25846863..b7ff3cd8f 100644 --- a/common/province_terrain/00_province_terrain.txt +++ b/common/province_terrain/00_province_terrain.txt @@ -8205,8 +8205,8 @@ default_coastal_sea=coastal_sea 8949=wetlands 8950=wetlands 8951=wetlands -8952=plains -8953=hills +8952=mountains +8953=forest 8954=mountains 8955=forest 8956=forest diff --git a/common/province_terrain/01_province_properties.txt b/common/province_terrain/01_province_properties.txt index 15b2a0903..80a65db82 100644 --- a/common/province_terrain/01_province_properties.txt +++ b/common/province_terrain/01_province_properties.txt @@ -43278,12 +43278,8 @@ 8951 = { winter_severity_bias = 0.0 } -8952 = { - winter_severity_bias = 0.0 -} -8953 = { - winter_severity_bias = 0.0 -} +8952 = {winter_severity_bias = 0.40} +8953 = {winter_severity_bias = 0.20} 8954 = { winter_severity_bias = 0.0 } diff --git a/gfx/map/map_object_data/activities.txt b/gfx/map/map_object_data/activities.txt index 0f8f467f0..7a3a2fd68 100644 --- a/gfx/map/map_object_data/activities.txt +++ b/gfx/map/map_object_data/activities.txt @@ -3619,7 +3619,7 @@ } { id=601 - position={ 3246.000000 0.000000 2611.000000 } + position={ 3270.366943 0.000000 2622.267090 } rotation={ -0.000000 0.221387 -0.000000 0.975186 } scale={ 1.000000 1.000000 1.000000 } } @@ -3847,7 +3847,7 @@ } { id=677 - position={ 3223.446777 0.000000 2560.714844 } + position={ 3218.026123 0.000000 2556.343750 } rotation={ -0.000000 -0.435691 -0.000000 0.900096 } scale={ 1.000000 1.000000 1.000000 } } @@ -31297,79 +31297,79 @@ } { id=5744 - position={ 3128.801025 0.000000 2690.202148 } + position={ 3127.560791 0.000000 2689.375732 } rotation={ -0.000000 -0.397157 -0.000000 0.917751 } scale={ 1.000000 1.000000 1.000000 } } { id=5745 - position={ 3161.919678 0.000000 2670.175537 } + position={ 3161.110840 0.000000 2679.513428 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=5746 - position={ 3186.805420 0.000000 2671.822021 } + position={ 3168.281982 0.000000 2672.366943 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=5747 - position={ 3209.757568 0.000000 2635.299316 } + position={ 3197.288086 0.000000 2639.706787 } rotation={ -0.000000 0.121616 -0.000000 0.992577 } scale={ 1.000000 1.000000 1.000000 } } { id=5748 - position={ 3215.106934 0.000000 2660.104004 } + position={ 3233.179932 0.000000 2661.047607 } rotation={ -0.000000 0.400207 -0.000000 0.916425 } scale={ 1.000000 1.000000 1.000000 } } { id=5749 - position={ 3219.000000 0.000000 2613.000000 } + position={ 3234.093506 0.000000 2604.615479 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=5750 - position={ 3234.107422 0.000000 2643.550781 } + position={ 3239.317627 0.000000 2644.497070 } rotation={ -0.000000 0.155344 -0.000000 0.987861 } scale={ 1.000000 1.000000 1.000000 } } { id=5751 - position={ 3265.773926 0.000000 2641.449707 } + position={ 3282.553955 0.000000 2647.744385 } rotation={ -0.000000 -0.408107 -0.000000 0.912934 } scale={ 1.000000 1.000000 1.000000 } } { id=5752 - position={ 3296.000000 0.000000 2653.000000 } + position={ 3235.290039 0.000000 2653.977539 } rotation={ -0.000000 0.268132 -0.000000 0.963382 } scale={ 1.000000 1.000000 1.000000 } } { id=5753 - position={ 3269.246582 0.000000 2620.556396 } + position={ 3257.715332 0.000000 2608.982910 } rotation={ -0.000000 0.372370 -0.000000 0.928084 } scale={ 1.000000 1.000000 1.000000 } } { id=5754 - position={ 3241.825195 0.000000 2589.423828 } + position={ 3257.952881 0.000000 2586.304443 } rotation={ -0.000000 -0.431786 -0.000000 0.901976 } scale={ 1.000000 1.000000 1.000000 } } { id=5756 - position={ 3262.000000 0.000000 2584.000000 } + position={ 3253.897705 0.000000 2572.904785 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=5757 - position={ 3292.216797 0.000000 2584.652588 } + position={ 3255.542480 0.000000 2594.316162 } rotation={ -0.000000 -0.447383 -0.000000 0.894343 } scale={ 1.000000 1.000000 1.000000 } } @@ -47989,7 +47989,7 @@ } { id=8875 - position={ 3102.000000 0.000000 2718.000000 } + position={ 3119.180176 0.000000 2721.562744 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } @@ -48451,13 +48451,13 @@ } { id=8952 - position={ 6767.000000 0.000000 2185.000000 } - rotation={ 0.000000 0.773342 0.000000 0.633989 } + position={ 3189.084473 0.000000 2677.462402 } + rotation={ -0.000000 0.856806 -0.000000 -0.515640 } scale={ 1.000000 1.000000 1.000000 } } { id=8953 - position={ 6761.000000 0.000000 2147.000000 } + position={ 3200.724609 0.000000 2633.544434 } rotation={ 0.000000 -0.671005 0.000000 0.741453 } 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 4304f1be6..0d8ba9f6b 100644 --- a/gfx/map/map_object_data/building_locators.txt +++ b/gfx/map/map_object_data/building_locators.txt @@ -3589,8 +3589,8 @@ } { id=601 - position={ 3247.077637 0.000000 2604.085449 } - rotation={ -0.000000 -0.291559 -0.000000 0.956553 } + position={ 3264.280518 0.000000 2614.167480 } + rotation={ -0.000000 0.995120 -0.000000 0.098669 } scale={ 1.000000 1.000000 1.000000 } } { @@ -3817,8 +3817,8 @@ } { id=677 - position={ 3227.664062 0.000000 2567.200684 } - rotation={ -0.000000 -0.778797 -0.000000 -0.627276 } + position={ 3223.157959 0.000000 2564.179199 } + rotation={ -0.000000 -0.678091 -0.000000 -0.734978 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31267,14 +31267,14 @@ } { id=5744 - position={ 3135.077637 0.000000 2680.085449 } - rotation={ -0.000000 -0.979721 -0.000000 -0.200366 } + position={ 3139.081055 0.000000 2675.368164 } + rotation={ -0.000000 -0.940565 -0.000000 -0.339614 } scale={ 1.000000 1.000000 1.000000 } } { id=5745 - position={ 3147.877197 0.000000 2668.621582 } - rotation={ -0.000000 -0.910202 -0.000000 0.414166 } + position={ 3155.944092 0.000000 2664.106934 } + rotation={ -0.000000 0.313558 -0.000000 0.949570 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31285,62 +31285,62 @@ } { id=5747 - position={ 3209.431396 0.000000 2629.544434 } - rotation={ -0.000000 -0.363693 -0.000000 -0.931519 } + position={ 3205.643066 0.000000 2649.406250 } + rotation={ -0.000000 -0.715777 -0.000000 -0.698329 } scale={ 1.000000 1.000000 1.000000 } } { id=5748 - position={ 3218.780029 0.000000 2661.107910 } - rotation={ -0.000000 -0.339536 -0.000000 -0.940593 } + position={ 3234.598145 0.000000 2667.968750 } + rotation={ -0.000000 0.828071 -0.000000 -0.560622 } scale={ 1.000000 1.000000 1.000000 } } { id=5749 - position={ 3210.931885 0.000000 2607.521973 } - rotation={ -0.000000 0.034745 -0.000000 0.999396 } + position={ 3218.553711 0.000000 2619.307617 } + rotation={ -0.000000 -0.782853 -0.000000 0.622206 } scale={ 1.000000 1.000000 1.000000 } } { id=5750 - position={ 3238.313721 0.000000 2637.258789 } - rotation={ -0.000000 -0.803769 -0.000000 -0.594941 } + position={ 3227.575928 0.000000 2627.814209 } + rotation={ -0.000000 0.108237 -0.000000 -0.994125 } scale={ 1.000000 1.000000 1.000000 } } { id=5751 - position={ 3259.077637 0.000000 2644.085449 } - rotation={ -0.000000 -0.984063 -0.000000 0.177820 } + position={ 3267.812012 0.000000 2631.287598 } + rotation={ -0.000000 -0.821645 -0.000000 0.569999 } scale={ 1.000000 1.000000 1.000000 } } { id=5752 - position={ 3302.875732 0.000000 2653.563477 } - rotation={ -0.000000 -0.488429 -0.000000 0.872603 } + position={ 3242.490234 0.000000 2653.283936 } + rotation={ -0.000000 0.509341 -0.000000 0.860564 } scale={ 1.000000 1.000000 1.000000 } } { id=5753 - position={ 3272.393311 0.000000 2614.281250 } - rotation={ -0.000000 -0.995811 -0.000000 -0.091436 } + position={ 3252.943359 0.000000 2604.167969 } + rotation={ -0.000000 -0.729216 -0.000000 0.684283 } scale={ 1.000000 1.000000 1.000000 } } { id=5754 - position={ 3221.631104 0.000000 2584.863281 } - rotation={ -0.000000 -0.572594 -0.000000 0.819839 } + position={ 3214.168701 0.000000 2597.424316 } + rotation={ -0.000000 -0.943331 -0.000000 0.331852 } scale={ 1.000000 1.000000 1.000000 } } { id=5756 - position={ 3261.234375 0.000000 2577.276855 } - rotation={ -0.000000 -0.218116 -0.000000 -0.975923 } + position={ 3224.699463 0.000000 2577.690674 } + rotation={ -0.000000 -0.044911 -0.000000 -0.998991 } scale={ 1.000000 1.000000 1.000000 } } { id=5757 - position={ 3287.077637 0.000000 2590.085449 } - rotation={ -0.000000 -0.764174 -0.000000 0.645010 } + position={ 3283.360840 0.000000 2592.415283 } + rotation={ -0.000000 -0.615490 -0.000000 -0.788145 } scale={ 1.000000 1.000000 1.000000 } } { @@ -47959,7 +47959,7 @@ } { id=8875 - position={ 3105.000000 0.000000 2718.000000 } + position={ 3096.944580 0.000000 2705.508057 } rotation={ -0.000000 -0.010496 -0.000000 0.999945 } scale={ 1.000000 1.000000 1.000000 } } @@ -48421,13 +48421,13 @@ } { id=8952 - position={ 6767.000000 0.000000 2185.000000 } - rotation={ 0.000000 0.773342 0.000000 0.633989 } + position={ 3212.362061 0.000000 2670.389160 } + rotation={ -0.000000 0.856806 -0.000000 -0.515640 } scale={ 1.000000 1.000000 1.000000 } } { id=8953 - position={ 6761.000000 0.000000 2147.000000 } + position={ 3216.339844 0.000000 2633.855713 } rotation={ 0.000000 -0.671005 0.000000 0.741453 } 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 933a681da..69bcee960 100644 --- a/gfx/map/map_object_data/combat_locators.txt +++ b/gfx/map/map_object_data/combat_locators.txt @@ -3595,13 +3595,13 @@ } { id=600 - position={ 3091.922852 0.000000 2710.682129 } - rotation={ -0.000000 -0.390784 -0.000000 0.920482 } + position={ 3123.454590 0.000000 2702.119873 } + rotation={ -0.000000 -0.781704 -0.000000 0.623649 } scale={ 1.000000 1.000000 1.000000 } } { id=601 - position={ 3252.000000 0.000000 2623.000000 } + position={ 3292.791748 0.000000 2623.818115 } rotation={ -0.000000 -0.972992 -0.000000 0.230837 } scale={ 1.000000 1.000000 1.000000 } } @@ -3997,8 +3997,8 @@ } { id=677 - position={ 3227.294678 0.000000 2578.695068 } - rotation={ -0.000000 0.157996 -0.000000 0.987440 } + position={ 3252.086182 0.000000 2561.907227 } + rotation={ -0.000000 0.006866 -0.000000 0.999977 } scale={ 1.000000 1.000000 1.000000 } } { @@ -33157,73 +33157,73 @@ } { id=5744 - position={ 3137.285889 0.000000 2693.074951 } - rotation={ -0.000000 -0.282351 -0.000000 0.959311 } + position={ 3137.135742 0.000000 2688.773682 } + rotation={ -0.000000 -0.471900 -0.000000 0.881652 } scale={ 1.000000 1.000000 1.000000 } } { id=5745 - position={ 3164.260498 0.000000 2678.789062 } + position={ 3154.349121 0.000000 2677.272217 } rotation={ -0.000000 -0.206433 -0.000000 0.978461 } scale={ 1.000000 1.000000 1.000000 } } { id=5746 - position={ 3197.000000 0.000000 2666.000000 } - rotation={ -0.000000 -0.576187 -0.000000 0.817318 } + position={ 3175.283691 0.000000 2671.169189 } + rotation={ -0.000000 -0.409287 -0.000000 0.912406 } scale={ 1.000000 1.000000 1.000000 } } { id=5747 - position={ 3197.000000 0.000000 2646.000000 } - rotation={ -0.000000 -0.318562 -0.000000 0.947902 } + position={ 3192.091064 0.000000 2650.663574 } + rotation={ -0.000000 0.500395 -0.000000 0.865797 } scale={ 1.000000 1.000000 1.000000 } } { id=5748 - position={ 3244.000000 0.000000 2665.000000 } + position={ 3247.695557 0.000000 2663.540771 } rotation={ -0.000000 -0.996100 -0.000000 -0.088233 } scale={ 1.000000 1.000000 1.000000 } } { id=5749 - position={ 3228.307861 0.000000 2618.465576 } - rotation={ -0.000000 -0.418453 -0.000000 0.908238 } + position={ 3230.014893 0.000000 2612.428223 } + rotation={ -0.000000 -0.659507 -0.000000 0.751698 } scale={ 1.000000 1.000000 1.000000 } } { id=5750 - position={ 3240.391846 0.000000 2652.252441 } - rotation={ 0.000000 0.000000 0.000000 1.000000 } + position={ 3241.166748 0.000000 2630.057861 } + rotation={ -0.000000 0.578420 -0.000000 0.815739 } scale={ 1.000000 1.000000 1.000000 } } { id=5751 - position={ 3280.000000 0.000000 2647.000000 } + position={ 3286.129639 0.000000 2640.723633 } rotation={ -0.000000 -0.962517 -0.000000 -0.271221 } scale={ 1.000000 1.000000 1.000000 } } { id=5752 - position={ 3301.716797 0.000000 2663.447266 } - rotation={ 0.000000 0.000000 0.000000 1.000000 } + position={ 3260.431396 0.000000 2653.437988 } + rotation={ -0.000000 -0.124432 -0.000000 0.992228 } scale={ 1.000000 1.000000 1.000000 } } { id=5753 - position={ 3290.243896 0.000000 2627.478760 } + position={ 3251.618652 0.000000 2622.168213 } rotation={ -0.000000 -0.921441 -0.000000 0.388518 } scale={ 1.000000 1.000000 1.000000 } } { id=5754 - position={ 3242.123779 0.000000 2593.491211 } + position={ 3243.187744 0.000000 2588.008057 } rotation={ -0.000000 -0.071868 -0.000000 0.997414 } scale={ 1.000000 1.000000 1.000000 } } { id=5756 - position={ 3261.087158 0.000000 2591.813232 } + position={ 3248.496338 0.000000 2574.450439 } rotation={ -0.000000 -0.924766 -0.000000 0.380536 } scale={ 1.000000 1.000000 1.000000 } } @@ -50929,8 +50929,8 @@ } { id=8875 - position={ 6992.000000 0.000000 2791.000000 } - rotation={ 0.000000 0.773342 0.000000 0.633989 } + position={ 3104.068359 0.000000 2718.662842 } + rotation={ -0.000000 0.997650 -0.000000 0.068513 } scale={ 1.000000 1.000000 1.000000 } } { @@ -51391,14 +51391,14 @@ } { id=8952 - position={ 6767.000000 0.000000 2185.000000 } - rotation={ 0.000000 0.773342 0.000000 0.633989 } + position={ 3190.480957 0.000000 2670.368896 } + rotation={ -0.000000 0.376972 -0.000000 -0.926225 } scale={ 1.000000 1.000000 1.000000 } } { id=8953 - position={ 6761.000000 0.000000 2147.000000 } - rotation={ 0.000000 -0.671005 0.000000 0.741453 } + position={ 3214.960205 0.000000 2639.286621 } + rotation={ -0.000000 -0.970132 -0.000000 0.242579 } 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 8d877e324..eaa36ea46 100644 --- a/gfx/map/map_object_data/player_stack_locators.txt +++ b/gfx/map/map_object_data/player_stack_locators.txt @@ -3595,13 +3595,13 @@ } { id=600 - position={ 3118.083740 0.000000 2704.917480 } + position={ 3109.949951 0.000000 2702.229980 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=601 - position={ 3255.000000 0.000000 2612.000000 } + position={ 3274.671143 0.000000 2606.096924 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -3997,7 +3997,7 @@ } { id=677 - position={ 3232.702148 0.000000 2571.882812 } + position={ 3232.684814 0.000000 2556.098633 } rotation={ -0.000000 -0.125034 -0.000000 0.992152 } scale={ 1.000000 1.000000 1.000000 } } @@ -33157,79 +33157,79 @@ } { id=5744 - position={ 3136.000000 0.000000 2688.000000 } + position={ 3136.187988 0.000000 2681.446533 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5745 - position={ 3155.492432 0.000000 2672.961426 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 3153.565918 0.000000 2671.454590 } + rotation={ -0.000000 -0.003018 -0.000000 0.999996 } scale={ 1.000000 1.000000 1.000000 } } { id=5746 - position={ 3181.000000 0.000000 2673.000000 } + position={ 3186.522949 0.000000 2660.745361 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5747 - position={ 3214.424805 0.000000 2633.102051 } + position={ 3204.142822 0.000000 2654.693604 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5748 - position={ 3231.000000 0.000000 2665.000000 } + position={ 3229.875977 0.000000 2658.006104 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5749 - position={ 3214.451660 0.000000 2614.045166 } + position={ 3224.926270 0.000000 2606.166992 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5750 - position={ 3242.236084 0.000000 2643.173096 } + position={ 3230.956299 0.000000 2646.484863 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5751 - position={ 3264.000000 0.000000 2649.000000 } + position={ 3273.493408 0.000000 2646.582520 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5752 - position={ 3308.577393 0.000000 2654.793457 } + position={ 3254.123535 0.000000 2639.379883 } rotation={ 0.000000 0.000000 0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=5753 - position={ 3278.315674 0.000000 2620.195557 } + position={ 3245.064697 0.000000 2604.844971 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5754 - position={ 3232.885498 0.000000 2587.945557 } + position={ 3231.926514 0.000000 2584.774170 } rotation={ 0.000000 0.000000 0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=5756 - position={ 3268.000000 0.000000 2583.000000 } + position={ 3229.823242 0.000000 2569.892090 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5757 - position={ 3293.000000 0.000000 2597.000000 } + position={ 3264.286133 0.000000 2593.239258 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -50917,7 +50917,7 @@ } { id=8873 - position={ 3048.699707 0.000000 2755.311523 } + position={ 3042.782959 0.000000 2745.861084 } rotation={ 0.000000 0.444143 0.000000 0.895956 } scale={ 1.000000 1.000000 1.000000 } } @@ -50929,7 +50929,7 @@ } { id=8875 - position={ 6997.000000 0.000000 2791.000000 } + position={ 3115.213623 0.000000 2713.646484 } rotation={ 0.000000 0.182191 0.000000 -0.983263 } scale={ 1.000000 1.000000 1.000000 } } @@ -51391,13 +51391,13 @@ } { id=8952 - position={ 6793.000000 0.000000 2190.000000 } - rotation={ 0.000000 0.843499 0.000000 -0.537130 } + position={ 3202.651611 0.000000 2667.496338 } + rotation={ -0.000000 -0.222804 -0.000000 -0.974863 } scale={ 1.000000 1.000000 1.000000 } } { id=8953 - position={ 6770.000000 0.000000 2154.000000 } + position={ 3206.927002 0.000000 2622.240723 } rotation={ 0.000000 0.772691 0.000000 0.634783 } 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 e0a94a086..c5d0f523a 100644 --- a/gfx/map/map_object_data/siege_locators.txt +++ b/gfx/map/map_object_data/siege_locators.txt @@ -3589,8 +3589,8 @@ } { id=601 - position={ 3238.000000 0.000000 2605.000000 } - rotation={ 0.000000 0.666921 0.000000 0.745128 } + position={ 3275.625732 0.000000 2616.500244 } + rotation={ -0.000000 0.600160 -0.000000 -0.799880 } scale={ 1.000000 1.000000 1.000000 } } { @@ -3817,8 +3817,8 @@ } { id=677 - position={ 3238.586426 0.000000 2569.114990 } - rotation={ -0.000000 -0.640747 -0.000000 0.767752 } + position={ 3234.188232 0.000000 2562.109375 } + rotation={ -0.000000 -0.746678 -0.000000 0.665186 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31267,80 +31267,80 @@ } { id=5744 - position={ 3125.000000 0.000000 2681.000000 } - rotation={ 0.000000 0.671005 0.000000 0.741453 } + position={ 3129.779053 0.000000 2679.486084 } + rotation={ -0.000000 0.557016 -0.000000 0.830502 } scale={ 1.000000 1.000000 1.000000 } } { id=5745 - position={ 3157.265869 0.000000 2664.344727 } - rotation={ -0.000000 0.843699 -0.000000 -0.536817 } + position={ 3146.560059 0.000000 2669.706299 } + rotation={ -0.000000 -0.442667 -0.000000 -0.896686 } scale={ 1.000000 1.000000 1.000000 } } { id=5746 - position={ 3174.000000 0.000000 2660.000000 } - rotation={ 0.000000 0.889168 0.000000 0.457582 } + position={ 3172.434326 0.000000 2662.447021 } + rotation={ -0.000000 0.414396 -0.000000 0.910097 } scale={ 1.000000 1.000000 1.000000 } } { id=5747 - position={ 3202.398438 0.000000 2634.452393 } - rotation={ -0.000000 0.478671 -0.000000 0.877994 } + position={ 3197.228760 0.000000 2647.422607 } + rotation={ -0.000000 0.798408 -0.000000 0.602116 } scale={ 1.000000 1.000000 1.000000 } } { id=5748 - position={ 3232.000000 0.000000 2660.000000 } - rotation={ -0.000000 -0.671005 -0.000000 0.741453 } + position={ 3223.717285 0.000000 2662.711182 } + rotation={ -0.000000 -0.883811 -0.000000 -0.467844 } scale={ 1.000000 1.000000 1.000000 } } { id=5749 - position={ 3220.815674 0.000000 2606.209717 } - rotation={ -0.000000 0.754038 -0.000000 -0.656831 } + position={ 3214.003906 0.000000 2610.022461 } + rotation={ -0.000000 0.976465 -0.000000 0.215674 } scale={ 1.000000 1.000000 1.000000 } } { id=5750 - position={ 3228.236084 0.000000 2639.173096 } - rotation={ 0.000000 0.633989 0.000000 0.773342 } + position={ 3236.788574 0.000000 2636.546387 } + rotation={ -0.000000 -0.347921 -0.000000 0.937524 } scale={ 1.000000 1.000000 1.000000 } } { id=5751 - position={ 3269.000000 0.000000 2645.000000 } - rotation={ -0.000000 -0.671005 -0.000000 0.741453 } + position={ 3273.207520 0.000000 2638.463135 } + rotation={ -0.000000 -0.148676 -0.000000 0.988886 } scale={ 1.000000 1.000000 1.000000 } } { id=5752 - position={ 3295.798096 0.000000 2648.477783 } - rotation={ 0.000000 0.889168 0.000000 0.457582 } + position={ 3253.028564 0.000000 2649.904785 } + rotation={ -0.000000 0.842206 -0.000000 -0.539156 } scale={ 1.000000 1.000000 1.000000 } } { id=5753 - position={ 3281.315674 0.000000 2614.195557 } - rotation={ 0.000000 0.707107 0.000000 -0.707107 } + position={ 3251.348633 0.000000 2613.690186 } + rotation={ -0.000000 -0.059751 -0.000000 -0.998214 } scale={ 1.000000 1.000000 1.000000 } } { id=5754 - position={ 3229.858398 0.000000 2593.768555 } - rotation={ -0.000000 -0.447608 -0.000000 0.894230 } + position={ 3225.221924 0.000000 2592.219238 } + rotation={ -0.000000 -0.885213 -0.000000 0.465185 } scale={ 1.000000 1.000000 1.000000 } } { id=5756 - position={ 3273.000000 0.000000 2578.000000 } - rotation={ -0.000000 -0.633989 -0.000000 0.773342 } + position={ 3235.975586 0.000000 2573.546143 } + rotation={ -0.000000 -0.758923 -0.000000 0.651180 } scale={ 1.000000 1.000000 1.000000 } } { id=5757 - position={ 3296.000000 0.000000 2591.000000 } - rotation={ -0.000000 -0.666921 -0.000000 0.745128 } + position={ 3273.491699 0.000000 2592.932373 } + rotation={ -0.000000 -0.680539 -0.000000 -0.732711 } scale={ 1.000000 1.000000 1.000000 } } { @@ -47959,7 +47959,7 @@ } { id=8875 - position={ 7010.000000 0.000000 2799.000000 } + position={ 3106.896729 0.000000 2711.312012 } rotation={ 0.000000 -0.447214 0.000000 0.894427 } scale={ 1.000000 1.000000 1.000000 } } @@ -48421,14 +48421,14 @@ } { id=8952 - position={ 6786.000000 0.000000 2191.000000 } - rotation={ 0.000000 -0.544914 0.000000 0.838492 } + position={ 3198.474365 0.000000 2674.852539 } + rotation={ -0.000000 0.606911 -0.000000 0.794770 } scale={ 1.000000 1.000000 1.000000 } } { id=8953 - position={ 6744.000000 0.000000 2142.000000 } - rotation={ 0.000000 0.864910 0.000000 0.501927 } + position={ 3206.347412 0.000000 2630.948975 } + rotation={ -0.000000 0.814515 -0.000000 0.580143 } scale={ 1.000000 1.000000 1.000000 } } { diff --git a/gfx/map/map_object_data/special_building_locators.txt b/gfx/map/map_object_data/special_building_locators.txt index dcf8913ab..753120566 100644 --- a/gfx/map/map_object_data/special_building_locators.txt +++ b/gfx/map/map_object_data/special_building_locators.txt @@ -31273,7 +31273,7 @@ } { id=5746 - position={ 3179.381104 0.000000 2656.934814 } + position={ 3165.453125 0.000000 2664.388184 } rotation={ -0.000000 -0.919700 -0.000000 -0.392621 } scale={ 1.000000 1.000000 1.000000 } } diff --git a/history/provinces/e_caucasia.txt b/history/provinces/e_caucasia.txt index c312ee48c..e26679250 100644 --- a/history/provinces/e_caucasia.txt +++ b/history/provinces/e_caucasia.txt @@ -1,4 +1,80 @@ -### GEORGIA ### +#k_georgia/Georgia ################################### +##d_abkhazia/Abkhazia ################################### +###c_sukhumi +5746 = { # Sukhumi + culture = NEOW_abkhazian + religion = nartist + holding = castle_holding + + # History + special_building = new_athos_pagan_temple_01 +} +5747 = { # Tkvarcheli + holding = church_holding +} +8952 = { # Chkhalta + holding = none +} +###c_gagra +5744 = { # Gagra + culture = NEOW_abkhazian + religion = nartist + holding = castle_holding +} +5745 = { # Gudauta + holding = none +} + +##d_tao-klarjeti/Imereti ################################### +###c_imereti/Imereti +601 = { # Kutaisi + culture = NEOW_georgian + religion = orthodox + holding = castle_holding +} +5753 = { # Samtredia + holding = church_holding +} +5757 = { # Baghdati + holding = none +} +###c_odishi/Mingrelia +5749 = { # Zugdidi + culture = mingrelian + religion = orthodox + holding = castle_holding +} +8953 = { # Gali + holding = city_holding +} +5750 = { # Tsalenjikha + holding = none +} +###c_svaneti/Svaneti +5748 = { # Mestia + culture = svan + religion = orthodox + holding = castle_holding +} +5752 = { # Lentekhi + holding = none +} +5751 = { # Ambrolauri + holding = none +} +###c_guria/Adjara-Guria +677 = { # Batumi + culture = NEOW_georgian + religion = orthodox + holding = castle_holding +} +5756 = { # Kobuleti + holding = city_holding +} +5754 = { # Ozurgeti + holding = church_holding +} +# custom # 600 - Nicopsia 600 = { # 600 - Nicopsia @@ -13,19 +89,6 @@ } -# 601 - Kutaisi -601 = { # 601 - Kutaisi - - # Misc - culture = mingrelian - religion = orthodox - - holding = castle_holding - - # History - -} - # 673 - Nukhpata 673 = { # 673 - Nukhapata @@ -52,19 +115,6 @@ } -# 677 - Batumi -677 = { # 677 - Batumi - - # Misc - culture = NEOW_georgian - religion = orthodox - - holding = castle_holding - - # History - -} - # 679 - Gori 679 = { # 679 - Gori @@ -125,182 +175,6 @@ holding = castle_holding # History - -} - -# 5744 - Bichvinta -5744 = { # 5744 - Bichvinta - - # Misc - culture = NEOW_abkhazian - religion = nartist - - holding = church_holding - - # History - -} - -# 5745 - Anacopia -5745 = { # 5745 - Anacopia - - # Misc - culture = NEOW_abkhazian - religion = nartist - - holding = church_holding - - # History - special_building = new_athos_pagan_temple_01 -} - -# 5746 - Tskhumi -5746 = { # 5746 - Tskhumi - - # Misc - culture = NEOW_abkhazian - religion = nartist - - holding = castle_holding - - # History - 1066.1.1 = { - buildings = { - hill_forts_01 - #hill_farms_01 - common_tradeport_01 - } - } -} - -# 5747 - Gudakva -5747 = { # 5747 - Gudavka - - # Misc - culture = NEOW_georgian - religion = orthodox - - holding = none - - # History - -} - -# 5748 - Seti -5748 = { # 5748 - Seti - - # Misc - culture = NEOW_georgian - religion = orthodox - - holding = city_holding - - # History - -} - -# 5749 - Zugdidi -5749 = { # 5749 - Zugdidi - - # Misc - culture = NEOW_georgian - religion = orthodox - - holding = none - - # History - -} - -# 5750 - Tsageri -5750 = { # 5750 - Tsageri - - # Misc - culture = NEOW_georgian - religion = orthodox - - holding = church_holding - - # History - -} - -# 5751 - Ambrolauri -5751 = { # 5751 - Ambrolauri - - # Misc - culture = svan - religion = orthodox - - holding = none - - # History - -} - -# 5752 - Kasriskari -5752 = { # 5752 - Kasriskari - - # Misc - culture = NEOW_georgian - religion = orthodox - - holding = castle_holding - - # History - -} - -# 5753 - Kvara -5753 = { # 5753 - Kvara - - # Misc - culture = NEOW_georgian - religion = orthodox - - holding = none - - # History - -} - -# 5754 - Poti -5754 = { # 5754 - Poti - - # Misc - culture = NEOW_georgian - religion = orthodox - - holding = city_holding - - # History - -} - -# 5756 - Vartsikhe -5756 = { # 5756 - Vartsikhe - - # Misc - culture = NEOW_georgian - religion = orthodox - - holding = church_holding - - # History - -} - -# 5757 - Shorapann -5757 = { # 5757 - Shorapann - - # Misc - culture = NEOW_georgian - religion = orthodox - - holding = none - - # History - } # 5758 - Dmanisi diff --git a/history/provinces/e_nistrenia.txt b/history/provinces/e_nistrenia.txt index d73d47f59..9fda718f1 100644 --- a/history/provinces/e_nistrenia.txt +++ b/history/provinces/e_nistrenia.txt @@ -1964,18 +1964,21 @@ } ##d_adygea ###c_sochi -8872 = { +8875 = { # Sochi culture = NEOW_cossack religion = nartist holding = castle_holding } -8873 = { +8872 = { # Tuapse holding = city_holding } -8874 = { +8874 = { # Apsheronsk holding = church_holding } -8875 = { +600 = { # Adler + holding = none +} +8873 = { # Arkhipo-Osipovka holding = none } ###c_zichia 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 7864d7b29..a695c32e8 100644 --- a/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml +++ b/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml @@ -7650,3 +7650,6 @@ dynn_Ta_g_brv__i_dot_zad_shw_:0 "Tağızadə" dynn_Tal_i_dot_bzad_shw_:0 "Talıbzadə" dynn_Teymurlu:0 "Teymurlu" + dynn_X_a_uml_yretdinow:0 "Xäyretdinow" + dynn_T_o_uml_xf_a_uml_tullin:0 "Töxfätullin" + dynn__D_bar_uri_s_crn_i_c_act_:0 "Đurišić" 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 ff80260d5..740ff05a7 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 @@ -429,7 +429,6 @@ dynn_kucukrumli:0 "Küçükrumli" dynn_yilmaz:0 "Yilmaz" dynn_akdagh:0 "Akdağ" - dynn_khairetdinov:0 "Khairetdinov" dynn_karim:0 "Karim" dynn_oki:0 "Oki" dynn_lakomkin:0 "Lakomkin" 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 7f1ccf072..2bd9929b2 100644 --- a/localization/english/replace/names/NEOW_character_names_l_english.yml +++ b/localization/english/replace/names/NEOW_character_names_l_english.yml @@ -20853,3 +20853,23 @@ K_o_uml_n_u_uml_l:0 "Könül" Ar_shw_st_shw_:0 "Arəstə" _SHW_rto_g_brv_rul:0 "Ərtoğrul" + Qlara:0 "Qlara" + Ramil:0 "Ramil" + _C_ced__i_dot__n_tld__g_brv__i_dot_z:0 "Çıñğız" + Xalid_a_uml_:0 "Xalidä" + Afzal:0 "Afzal" + Qotdus:0 "Qotdus" + _A_uml_xm_a_uml_tcan:0 "Äxmätcan" + Mahir_a_uml_:0 "Mahirä" + Rawza:0 "Rawza" + _I_dot_ldar:0 "İldar" + R_o_uml_st_a_uml_m:0 "Röstäm" + Yun_i_dot_s:0 "Yunıs" + Rubin:0 "Rubin" + K_a_uml_bir:0 "Käbir" + _A_uml_mir:0 "Ämir" + F_a_uml_rx_a_uml_t:0 "Färxät" + _A_uml_lfiy_a_uml_:0 "Älfiyä" + _I_dot_sk_a_uml_nd_a_uml_r:0 "İskändär" + Elvira_spc_Mar_i_act_a:0 "Elvira María" + T_a_uml_skir_a_uml_:0 "Täskirä" diff --git a/localization/english/replace/titles_cultural_names_l_english.yml b/localization/english/replace/titles_cultural_names_l_english.yml index 744b96807..948bef89c 100644 --- a/localization/english/replace/titles_cultural_names_l_english.yml +++ b/localization/english/replace/titles_cultural_names_l_english.yml @@ -6077,16 +6077,10 @@ cn_np_rkert_adj:0 "Np'rkerti" cn_datvan:0 "Datvan" cn_datvan_adj:0 "Datvani" - cn_malazgirt:0 "Malazgirt" - cn_malazgirt_adj:0 "Malazgirti" cn_eua:0 "Eua" cn_eua_adj:0 "Euan" cn_mets_hayk_:0 "Mets Hayk'" cn_mets_hayk__adj:0 "Mets Hayki" - cn_anion:0 "Ánion" - cn_anion_adj:0 "Ánioni" - cn_ani:0 "Anı" - cn_ani_adj:0 "Anıan" cn_erivan:0 "Erivan" cn_erivan_adj:0 "Erivani" diff --git a/localization/english/replace/titles_l_english.yml b/localization/english/replace/titles_l_english.yml index bec778ad8..7e5b0f54b 100644 --- a/localization/english/replace/titles_l_english.yml +++ b/localization/english/replace/titles_l_english.yml @@ -6925,7 +6925,6 @@ b_gadhipuri:0 "Gadhipuri" b_gaeta:0 "Gaeta" b_gafsa:0 "Gafsa" - b_gagra:0 "Gagra" b_gagraun:0 "Gagraun" b_gailen:0 "Gailen" b_gainsborough:0 "Gainsborough" @@ -10356,7 +10355,6 @@ b_oyer:0 "Øyer" b_ozalj:0 "Ozalj" b_ozerki:0 "Ozerki" - b_ozurgeti:0 "Ozurgeti" b_paat:0 "Paat" b_pabna:0 "Pabna" b_pachmarhi:0 "Pachmarhi" @@ -13619,6 +13617,7 @@ b_zrin:0 "Zrin" b_zubtsov:0 "Zubtsov" b_zug:0 "Zug" + b_gali:0 "Gali" b_zugdidi:0 "Zugdidi" b_zumarshausen:0 "Zumarshausen" b_zumbo:0 "Zumbo" @@ -13643,8 +13642,10 @@ c_abensberg_adj:0 "Abensberger" c_abivard:0 "Abivard" c_abivard_adj:0 "Abivarder" - c_abkhazia:0 "Abkhazia" - c_abkhazia_adj:0 "Abkhazian" + c_gagra:0 "Gagra" + c_gagra_adj:0 "Gagran" + c_abkhazia:0 "Sukhumi" + c_abkhazia_adj:0 "Sukhumian" c_abruzzi:0 "Avezzano" c_abruzzi_adj:0 "Avezzanian" c_rieti:0 "Rieti" @@ -14488,8 +14489,8 @@ c_gurganj_adj:0 "Gurganji" c_gurgi:0 "Gurgi" c_gurgi_adj:0 "Gurgi" - c_guria:0 "Guria" - c_guria_adj:0 "Gurian" + c_guria:0 "Adjara-Guria" + c_guria_adj:0 "Adjaran-Gurian" c_gurjaratra:0 "Gurjaratra" c_gurjaratra_adj:0 "Gurjaratran" c_gurma:0 "Gurma" @@ -19061,8 +19062,10 @@ d_greater_armenia:0 "Greater Armenia" d_greater_armenia_adj:0 "Armenian" d_greater_armenia_pre:0 "Armeno" - d_tao-klarjeti:0 "Tao-Klarjeti" - d_tao-klarjeti_adj:0 "Tao-Klarjetian" + d_tao-klarjeti:0 "Imereti" + d_tao-klarjeti_adj:0 "Imeretian" + c_imereti:0 "Imereti" + c_imereti_adj:0 "Imeretian" d_shirvan:0 "Shirvan" d_shirvan_adj:0 "Shirvanian" c_trebizond:0 "Trebizond" @@ -19081,8 +19084,8 @@ c_dvin_adj:0 "Dvinian" c_klarjeti:0 "Klarjeti" c_klarjeti_adj:0 "Klarjetian" - c_odishi:0 "Odishi" - c_odishi_adj:0 "Odishian" + c_odishi:0 "Mingrelia" + c_odishi_adj:0 "Mingrelian" c_tbilisi:0 "Tbilisi" c_tbilisi_adj:0 "Tbilisian" c_svaneti:0 "Svaneti" @@ -19123,20 +19126,21 @@ b_artaani:0 "Ardahan" b_tskhinvali:0 "Tskhinvali" b_uplistsikhe:0 "Uplistsikhe" - b_nicopsia:0 "Nicopsia" - b_bichvinta:0 "Bichvinta" - b_anacopia:0 "Anacopia" - b_tskhumi:0 "Tskhumi" - b_gudakva:0 "Gudakva" - b_seti:0 "Seti" - b_tsageri:0 "Tsageri" + b_nicopsia:0 "Adler" + b_bichvinta:0 "Gagra" + b_anacopia:0 "Gudauta" + b_tskhumi:0 "Sukhumi" + b_gudakva:0 "Tkvarcheli" + b_chkhalta:0 "Chkhalta" + b_seti:0 "Mestia" + b_tsageri:0 "Tsalenjikha" b_ambrolauri:0 "Ambrolauri" - b_kasriskari:0 "Kasriskari" - b_kvara:0 "Kvara" - b_poti:0 "Poti" + b_kasriskari:0 "Lentekhi" + b_kvara:0 "Samtredia" + b_poti:0 "Ozurgeti" b_batumi:0 "Batumi" - b_vartsikhe:0 "Vartsikhe" - b_shorapann:0 "Shorapann" + b_vartsikhe:0 "Kobuleti" + b_shorapann:0 "Baghdati" b_dmanisi:0 "Dmanisi" b_rustavi:0 "Rustavi" b_bolnisi:0 "Bolnisi" @@ -26030,6 +26034,7 @@ d_sochi:0 "Sochi" d_sochi_adj:0 "Sochinets" b_sochi:0 "Sochi" + b_arkhipo_osipovka:0 "Arkhipo-Osipovka" b_gelendzhik:0 "Gelendzhik" c_gelendzhik:0 "Gelendzhik" c_gelendzhik_adj:0 "Gelendzhik" @@ -26041,7 +26046,6 @@ c_sochi:0 "Sochi" c_sochi_adj:0 "Sochinets" b_apsheronsk:0 "Apsheronsk" - b_adler:0 "Adler" b_abinsk:0 "Abinsk" b_severskaya:0 "Severskaya" b_krymsk:0 "Krymsk" diff --git a/map_data/definition.csv b/map_data/definition.csv index 60ba8cd21..cf4f1076f 100644 --- a/map_data/definition.csv +++ b/map_data/definition.csv @@ -598,7 +598,7 @@ 597;84;87;226;Azov;x 598;126;90;99;Tmutarakan;x 599;168;93;227;Yaseni;x -600;0;96;0;Nicopsia;x +600;0;96;0;ADLER;x 601;42;99;128;Kutaisi;x 602;84;102;1;Tasqala;x 603;126;105;129;Cabarda;x @@ -8870,10 +8870,10 @@ 8869;150;192;173;PREGRADNAYA;x 8870;15;110;67;PROKHLADNY;x 8871;96;147;124;BAKSAN;x -8872;183;178;162;SOCHI;x -8873;87;72;25;TUAPSE;x +8872;183;178;162;TUAPSE;x +8873;87;72;25;ARKHIPO-OSIPOVKA;x 8874;133;128;110;APSHERONSK;x -8875;108;94;51;ADLER;x +8875;108;94;51;SOCHI;x 8876;91;86;70;GELENDZHIK;x 8877;206;198;173;ABINSK;x 8878;160;147;105;SEVERSKAYA;x @@ -8950,8 +8950,8 @@ 8949;176;9;202;Zhalpaqtal;x 8950;8;12;75;Saykhin;x 8951;50;15;203;Zhanaqala;x -8952;92;18;76;;x -8953;134;21;204;;x +8952;197;133;131;CHKHALTA;x +8953;55;93;93;GALI;x 8954;176;24;77;;x 8955;8;27;205;;x 8956;50;30;78;;x @@ -12946,8 +12946,7 @@ 12945;234;86;120;;x 12946;140;84;84;;x 12947;107;161;159;b_qianzhou_qianhua;x -12948;255;216;0;x -;x +12948;255;216;0;;x 12949;143;205;49;b_zhangzhou_zhangpu_southwest;x 12950;180;79;227;b_zhangzhou_zhangpu_west;x 12951;126;81;15;b_zhangzhou_longxi_west;x diff --git a/map_data/geographical_regions/geographical_region.txt b/map_data/geographical_regions/geographical_region.txt index 05d3c00a3..b56f46f95 100644 --- a/map_data/geographical_regions/geographical_region.txt +++ b/map_data/geographical_regions/geographical_region.txt @@ -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_ordu 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_gagra c_zichia c_tana c_khortytsia #c_mesembria } } diff --git a/map_data/provinces.png b/map_data/provinces.png index 0b2fc7596..6a4b3a982 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:2aefd978c4bb7d9ad60a7f4f0ab9e403c95af1b6da08c1cab7aa4b2b679cccaa -size 2685060 +oid sha256:8ba4f9f6a621dd15cdabe7823d0e7bda7a6763277387dc0df2c19e9f18f98479 +size 2684598