diff --git a/common/culture/name_equivalency/00_NEOW_female_names.txt b/common/culture/name_equivalency/00_NEOW_female_names.txt index d8ff91daf..7390a5f23 100644 --- a/common/culture/name_equivalency/00_NEOW_female_names.txt +++ b/common/culture/name_equivalency/00_NEOW_female_names.txt @@ -280,7 +280,7 @@ hafiza_female = { _H_mbw_apizat Afisat Hapisat } hafsa_female = { Hafsa } hajar_female = { Hajer } haley_briseis_female = { Haley Briseis } -halima_female = { _H_mbw_alimat _X_dot_alimat Halima Halimat } +halima_female = { _H_mbw_alimat _X_dot_alimat Halima Halimat X_a_uml_lim_a_uml_ } hanan_female = { Hanane } harrisonia_samantha_female = { Harrisonia Samantha } hatshepsut_female = { Hatshypswt Haitshepsut } @@ -420,7 +420,7 @@ maqbula_female = { Makbule } mar_female = { Mar } marcella_female = { Marcela Marceline Marcelino_female Marcelle Marcello_female } margaret_female = { Gaid Gr_e_act_ta Greta Grete Gretel Grethe Grietje Grit Gryt M_a_act_regydd M_a_grv_rgret M_e_act_gane M_e_hat_g_pst_n Ma_l_stk_gorzata Mairgairet Mared Maret Margalida Margar_i_act_ta Margaret Margareta Margarete Margaretha Margarethe Margarida Margarido Margarita Margaritta Margaux Marge Marged Margery Margherita Margit Margita Margitta Margot Margott Margr_e_act_t Margret Margrete Margrethe Margrit Marguerite Marhar_i_mcn_ta Marhgarhyt Marit Marite Marjorie Marjour_i_grv_o Mark_e_act_ta Meeta Megain Megano Mererid Mereta Merete Merethe Metka Mette Peggy Reet Reetta Rita } -maria_female = { M_a_act_ria M_a_brv_rioara M_a_grv_ri M_a_grv_ria M_a_grv_riam M_a_grv_rie M_a_mcn_r_i_mcn_te M_a_mcn_ra M_a_uml_ry_a_uml_m M_i_act_riam M_shw_ry_shw_m Ma_s_crn_a Maaike Maarja Maddi Mai Maia Maie Maija Maiju Maiken Maila Maili Mair Maire Mairi Maive Maj Maja Majken Mali Manca Manon Manoun Mar_i_act_a Mar_i_grv_o_female Mar_pst_yam Mare Marhya Marhyy Mari Mari_e_uml_lle Maria Mariam Mariama Maricica Marie Mariechen Marieke Mariella Marieta Marietta Mariette Marija Marijam Marijat Marije Marijke Marika Marion Mariona Marioun Maris Mariska Mariso_female Marita Mariya Mariyam Marja Marjeta Marju Maru_s_crn_a Maru_s_crn_ka Maruxa Mary Maryam Maureen May Maya Megan Meryem Meta Mia Mie Mija Miren Mioara Mirene Miriam Miriama Mirian Mirja Mirjam Miryam Moirai Molli Mollie Moll_i_hat_ My Myriam Polly Ria } +maria_female = { M_a_act_ria M_a_brv_rioara M_a_grv_ri M_a_grv_ria M_a_grv_riam M_a_grv_rie M_a_mcn_r_i_mcn_te M_a_mcn_ra M_a_uml_ry_a_uml_m M_i_act_riam M_shw_ry_shw_m Ma_s_crn_a Maaike Maarja Maddi Mai Maia Maie Maija Maiju Maiken Maila Maili Mair Maire Mairi Maive Maj Maja Majken Mali Manca Manon Manoun Mar_i_act_a Mar_i_grv_o_female Mar_pst_yam Mare Marhya Marhyy Mari Mari_e_uml_lle Maria Mariam Mariama Maricica Marie Mariechen Marieke Mariella Marieta Marietta Mariette Marija Marijam Marijat Marije Marijke Marika Marion Mariona Marioun Maris Mariska Mariso_female Marita Mariya Mariyam Marja Marjeta Marjon Marju Maru_s_crn_a Maru_s_crn_ka Maruxa Mary Maryam Maureen May Maya Megan Meryem Meta Mia Mie Mija Miren Mioara Mirene Miriam Miriama Mirian Mirja Mirjam Miryam Moirai Molli Mollie Moll_i_hat_ My Myriam Polly Ria } maria_margaret_female = { Maria_spc_Rita } mariaangel_female = { Mar_i_grv_o-Ange Mariangela } mariaangeles_female = { Mar_i_act_a_spc__A_act_nchels Mar_i_act_a_spc__A_act_ngeles Mar_i_act_a_spc__A_act_nxeles Maria_spc__A_grv_ngels } diff --git a/common/culture/name_equivalency/00_NEOW_male_names.txt b/common/culture/name_equivalency/00_NEOW_male_names.txt index 8b4ab04d9..d4792bdaf 100644 --- a/common/culture/name_equivalency/00_NEOW_male_names.txt +++ b/common/culture/name_equivalency/00_NEOW_male_names.txt @@ -454,7 +454,7 @@ gawayn_male = { Gaivin Gavin Gawayn Gawyyn } 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 } +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 Jerdy 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 Jurri_e_uml_n Jury Jyri Jyrki Schorsch Si_o_hat_r Siorus Xurde Xurxo Youri Yrj_o_uml_ Yuri Yuriy Jirjis } georgejames_male = { Jordi_spc_Jaume } georgejoseph_male = { Jordi_spc_Josep } gerald_male = { G_e_act_rald G_e_crn_ralt Geraildd Gerald Geraldas Geraldo Gerallt Gerold Giraud Guerau Gyraldd Gyralldd Gyrhaldd } @@ -825,7 +825,7 @@ mercury_male = { Myrhcurhy } merlin_male = { Merlijn Merlin Myrddin Myrhlyn Myrlyn } methodius_male = { Meth_o_act_dios Meto Metod Metod_e_crn_j Metod_i_hat_j Metodi Metodija Metodiy } meyer_male = { Meir Meyer } -michael_male = { Chiel M_a_grv_jsche M_i_act_kis M_i_grv_schel M_i_hat_cha_i_hat_l M_i_hat_chajlo M_i_hat_chal M_i_hat_hal_pst_ Maic Maik Maikel Meical Meik Mich_e_grv_u Mi_c_crn_jo Mi_c_crn_o Mi_h_crn_aelo Mi_k_ced_elis Mich_a_act_lis Micha_e_uml_l Micha_i_act_l Michael Michaiel Micha_l_stk_ Micha_s_act_ Michal Michel Michele Michiel Mick Micka_e_uml_l Miguel Miha Mihael Mihai Mihail Mihailo Mihajlo Mihal Mihangel Mihhail Mihkel Miho Mihu Miika Miikka Mika Mika_e_uml_l Mikael Mikail Mikay_i_dot_l Mike Mikel Mikelo Mikhail Mikhayl Mikk Mikke Mikkel Mikko Miks Mincho Minko Miqu_e_grv_u Miquel Misha Misha_e_uml_l Misho Miska Mitchell Mitxel Mixail Mixel Mychayl Mychayll Myghal Myshayl Mytchyll Mikha_pst_il } +michael_male = { Chiel M_a_grv_jsche M_i_act_kis M_i_grv_schel M_i_hat_cha_i_hat_l M_i_hat_chajlo M_i_hat_chal M_i_hat_hal_pst_ Maic Maik Maikel Meical Meik Mich_e_grv_u Mi_c_crn_jo Mi_c_crn_o Mi_h_crn_aelo Mi_k_ced_elis Mich_a_act_lis Micha_e_uml_l Micha_i_act_l Michael Michaiel Micha_l_stk_ Micha_s_act_ Michal Michel Michele Michiel Mick Micka_e_uml_l Micky Miguel Miha Mihael Mihai Mihail Mihailo Mihajlo Mihal Mihangel Mihhail Mihkel Miho Mihu Miika Miikka Mika Mika_e_uml_l Mikael Mikail Mikay_i_dot_l Mike Mikel Mikelo Mikhail Mikhayl Mikk Mikke Mikkel Mikko Miks Mincho Minko Miqu_e_grv_u Miquel Misha Misha_e_uml_l Misho Miska Mitchell Mitxel Mixail Mixel Mychayl Mychayll Myghal Myshayl Mytchyll Mikha_pst_il } michaelangel_male = { Michelangelo Mikel_spc_Anjel Mikel_spc_Gotzon Miguel_spc__A_act_nchel Miguel_spc__A_act_ngel Miguel_spc__A_act_nxel Miguel_spc_Anxo Miquel_spc__A_grv_ngel } michaelanthony_male = { Michelantonio Miguel_spc_Ant_o_act_n } miechislav_male = { Me_c_crn_islavs Me_c_crn_islovas Mieczys_l_stk_aw } diff --git a/common/culture/name_lists/NEOW_dutch.txt b/common/culture/name_lists/NEOW_dutch.txt index e84435664..bf91bca5a 100644 --- a/common/culture/name_lists/NEOW_dutch.txt +++ b/common/culture/name_lists/NEOW_dutch.txt @@ -508,9 +508,9 @@ Ferdinand Floris Francis Frederik Frits Gerhard Gijs Govert Harm Hendrik Henri - Ivo - Jacob Jarno Jeffrey Jelle Jesper Jesse Job Joep Joey Johannes Jordy Joris Julian Justin - Karel Kees + Ian Ivo + Jacob Jarno Jeffrey Jelle Jesper Jesse Job Joep Joey Johannes Jordi Jordy Joris Julian Justin + Karel Kees Kenneth Lars Laurens Leendert Leonard Louis Luc Lucas Luuk Maikel Marcus Marinus Marius Marten Mathieu Matthijs Max Mohamed Mohammed Niek @@ -518,27 +518,28 @@ Ricardo Rik Roelof Roger Rogier Roland Ruben Rudolf Rutger Sam Sebastiaan Simon Sjoerd Stan_Constantine Stef Stephan Stijn Sven Teun Timo Ties Tjeerd - Wesley Wessel Wim + Wesley Wessel Wim Wout } 1 = { Abraham Adrianus Albertus Anne_male Anthonie Anthonius Antonie Antonius Antoon Arnoldus Bernardus Bryan Christianus Cornelius Christoffel Constantijn Damian Dylan - Edsger Eelke Ed + Edsger Eelke Ed Eliano Franciscus - Gerardus Gerhardus Gijsbert Gijsbertus Guus Gustaaf + Gerardus Gerhardus Gijsbert Gijsbertus Guus Gustaaf Hendricus Hendrikus Henricus Hermanus Hubert Hubertus - Jacobus Jakob Jerrel Joannes Jona_Jonah Joseph Josephus Jozef + Jacobus Jakob Jerdy Jerrel Jo_e_uml_l Joannes Jona_Jonah Joseph Josephus Jozef Jurri_e_uml_n Kornelis Krijn Lambertus Laurentius Leo Leonardus Levi Lodewijk Lourens - Marcellinus Martinus Mathias Mees Melle Merlijn Mike Milan Misha_e_uml_l + Marcellinus Martinus Mathias Mats Mees Melle Memphis Merlijn Mexx Micky Mike Milan Misha_e_uml_l Nicolaas Nimo Noah Paulus Petrus Pyke Quinten - Robertus Ronaldus Ryan Rembrandt Reinier - Sem - Teunis Theodorus Tjerk Tjark + Robertus Ronaldus Ryan Rembrandt Reinier Rodney + Sem Shane + Teunis Theodorus Tijjani Tjerk Tjark + Virgil Wilhelm Wilhelmus Willibrord Youri } @@ -579,7 +580,7 @@ Janna Jannie Janny Jasmijn Jeannette Jennifer Joanna Johanna Kelly Kimberley Kimberly Kirsten Lara Larissa Lianne Lieke Lisanne Lotte Louise Lucia Lynn - Maartje Mandy Mari_e_uml_lle Marie Marina Marit Martha Martina Maud Melanie Melissa Merel Michelle Milou Mireille Monica Myrthe + Maartje Mandy Mari_e_uml_lle Marie Marina Marit Marjon Martha Martina Maud Melanie Melissa Merel Michelle Milou Mireille Monica Myrthe Naomi Nancy Natascha Natasja Nelly Nikki Nina Paula Priscilla Rachel Renate Romy Roos Rosa Rosalie Roxanne Ruth diff --git a/common/culture/name_lists/NEOW_faroese.txt b/common/culture/name_lists/NEOW_faroese.txt index 4198ff71f..9a98919b5 100644 --- a/common/culture/name_lists/NEOW_faroese.txt +++ b/common/culture/name_lists/NEOW_faroese.txt @@ -120,11 +120,11 @@ male_names = { 3 = { - _A_act_lvhe_eth_in + _A_act_lvhe_eth_in _I_act_smal Andreas Atli Ari Atli Andrew Agnar Andrass Arnold Arnbj_o_stk_rn B_a_act_raldur Brian Bartal Bjarti Boas Bent - Claus Carl + Claus Carl Elias Edvard Ey_eth_stein Erik Eivind Eiler Heri Hj_o_stk_rtur Hilbert Harry Herman Hendrik Immanuel Ivan diff --git a/common/culture/name_lists/NEOW_tatar.txt b/common/culture/name_lists/NEOW_tatar.txt index 5df48ef17..f3b16adde 100644 --- a/common/culture/name_lists/NEOW_tatar.txt +++ b/common/culture/name_lists/NEOW_tatar.txt @@ -53,7 +53,7 @@ _A_uml_kr_a_uml_m _A_uml_s_g_brv__a_uml_t _A_uml_sk_a_uml_r _A_uml_xm_a_uml_tcan _G_brv_abdraxman _G_brv_al_a_uml_wetdin _G_brv_alimcan _G_brv_om_a_uml_r _I_dot_sxak - _S_ced__a_uml_msem_o_uml_x_a_uml_mm_a_uml_t _S_ced__a_uml_msi _S_ced__a_uml_rifulla + _S_ced__a_uml_msem_o_uml_x_a_uml_mm_a_uml_t _S_ced__a_uml_msi _S_ced__a_uml_rifulla _S_ced_akir Afzal Aman Asaf Engel F_a_uml_him F_a_uml_n F_a_uml_xretdin Fuat @@ -99,7 +99,7 @@ Rizid_shw_ Ru_s_ced_aniy_a_uml_ Ruzanna Ruziy_a_uml_ S_a_uml_lim_a_uml_ T_a_uml_skir_a_uml_ - Xalid_a_uml_ + Xalid_a_uml_ X_a_uml_lim_a_uml_ Y_a_uml_smin_a_uml_ Z_o_uml_lfir_a_uml_ } diff --git a/common/landed_titles/caucasus.txt b/common/landed_titles/caucasus.txt index e8abb0aee..1e0dcb8a7 100644 --- a/common/landed_titles/caucasus.txt +++ b/common/landed_titles/caucasus.txt @@ -3,7 +3,7 @@ e_caucasia = { capital = c_shirvan - k_armenia = { + k_armenia = { # Armenia color = { 216 155 32 } capital = c_hayk # Ani @@ -186,90 +186,140 @@ e_caucasia = { } } } - d_greater_armenia = { + d_greater_armenia = { # Yarevan color = { 216 155 32 } + capital = c_hayk # Yerevan - capital = c_hayk # Ani - - cultural_names = { - name_list_armenian = cn_mets_hayk_ - } - - c_hayk = { + c_hayk = { # Yerevan color = { 203 66 86 } - b_yerevan = { + + b_yerevan = { # Yerevan province = 5728 - - color = { 203 76 76 } - - cultural_names = { - name_list_turkish = cn_erivan - } - } - b_dlim = { - province = 5725 - color = { 203 76 76 } } - b_kumayri = { - province = 5727 - - color = { 203 76 76 } + b_hrazdan = { # Hrazdan + province = 8957 + color = { 203 154 24 } + } + b_dvin = { # Artashat + province = 672 + color = { 190 80 105 } } - b_bagaran = { - province = 5726 - - color = { 203 76 76 } - } } - c_lori = { + c_lori = { # Shirak-Lori color = { 205 160 160 } - b_lori = { + b_kumayri = { # Gyumri + province = 5727 + color = { 203 76 76 } + } + b_lori = { # Vanadzor province = 1013 - color = { 205 160 160 } } - b_kayan = { - province = 5762 - - color = { 205 160 160 } + b_dlim = { # Stepanavan + province = 5725 + color = { 203 76 76 } } } - c_suenik = { - color = { 197 80 107 } - - b_kapan = { - province = 671 - - color = { 197 80 107 } - } - b_goris = { - province = 5786 - - color = { 197 80 107 } - } - - } - c_dvin = { - color = { 190 80 105 } - - b_dvin = { - province = 672 - - color = { 190 80 105 } - } - b_gardman = { - province = 5782 - + c_tavush = { # Tavush + color = { 255 172 28 } + + b_tovuz = { # Ijevan + province = 5780 color = { 182 44 78 } } - b_garni = { + b_kayan = { # Noyemberyan + province = 5762 + color = { 205 160 160 } + } + } + c_armavir = { # Armavir + color = { 148 124 23 } + + b_bagaran = { # Vagharshapat + province = 5726 + color = { 203 76 76 } + } + b_ashtarak = { # Ashtarak + province = 8958 + color = { 148 124 23 } + color2 = { 255 255 255 } + } + } + c_gegharkunik = { # Gegharkunik + color = { 143 122 24 } + + b_garni = { # Gavar province = 5729 + color = { 182 44 78 } + } + b_martuni = { # Martuni + province = 8959 + color = { 143 122 24 } + } + b_vardenis = { # Vardenis + province = 8960 + color = { 143 122 24 } + } + } + } + d_karabakh = { + color = { 253 121 4 } + capital = c_artsakh # Artsakh + + c_nagorno_karabakh = { # Artsakh + color = { 118 45 30 } + + cultural_names = { + name_list_armenian=cn_artsakh + } + + b_stepanakert = { # Stepanakert + province = 8961 + color = { 118 45 30 } + } + b_ktis = { # Martuni - yes it's another one + province = 5784 + color = { 182 44 78 } + } + b_gandzasar = { # Martakert + province = 670 + color = { 182 44 78 } + } + } + c_dvin = { # Lachin + color = { 190 80 105 } + b_lachin = { # Lachin + province = 8962 + color = { 162 74 42 } + } + b_qubadli = { # Qubadlı + province = 8963 + color = { 162 74 42 } + } + b_gardman = { # Kalbajar + province = 5782 color = { 190 80 105 } } } + c_suenik = { # Syunik + color = { 197 80 107 } + + b_kapan = { # Kapan + province = 671 + color = { 197 80 107 } + } + b_yeghegnadzor = { # Yeghegnadzor + province = 8964 + color = { 142 61 38 } + } + b_goris = { # Goris + province = 5786 + color = { 197 80 107 } + } + } } } k_georgia = { @@ -644,27 +694,11 @@ e_caucasia = { color = { 182 44 78 } } - b_tovuz = { - province = 5780 - - color = { 182 44 78 } - } b_shamkur = { province = 5781 color = { 182 44 78 } } - - b_gandzasar = { - province = 670 - - color = { 182 44 78 } - } - b_ktis = { - province = 5784 - - color = { 182 44 78 } - } } } d_azerbaijan = { diff --git a/gfx/map/map_object_data/activities.txt b/gfx/map/map_object_data/activities.txt index 7a3a2fd68..fba487cfe 100644 --- a/gfx/map/map_object_data/activities.txt +++ b/gfx/map/map_object_data/activities.txt @@ -3805,19 +3805,19 @@ } { id=670 - position={ 3454.000000 0.000000 2471.000000 } + position={ 3459.846436 0.000000 2473.865723 } rotation={ -0.000000 0.289117 -0.000000 0.957294 } scale={ 1.000000 1.000000 1.000000 } } { id=671 - position={ 3445.863037 0.000000 2431.650391 } + position={ 3451.327637 0.000000 2417.393311 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=672 - position={ 3370.817383 0.000000 2459.607910 } + position={ 3365.373047 0.000000 2466.170166 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } @@ -4843,7 +4843,7 @@ } { id=1013 - position={ 3340.162598 0.000000 2532.065430 } + position={ 3366.372070 0.000000 2529.966309 } rotation={ -0.000000 0.212330 -0.000000 0.977198 } scale={ 1.000000 1.000000 1.000000 } } @@ -31183,31 +31183,31 @@ } { id=5725 - position={ 3319.039551 0.000000 2534.038574 } + position={ 3343.586426 0.000000 2525.720459 } rotation={ -0.000000 0.429197 -0.000000 0.903211 } scale={ 1.000000 1.000000 1.000000 } } { id=5726 - position={ 3335.203613 0.000000 2473.612305 } + position={ 3334.539795 0.000000 2482.554932 } rotation={ -0.000000 -0.300723 -0.000000 0.953712 } scale={ 1.000000 1.000000 1.000000 } } { id=5727 - position={ 3351.000000 0.000000 2510.000000 } + position={ 3322.257080 0.000000 2528.351562 } rotation={ -0.000000 0.302149 -0.000000 0.953261 } scale={ 1.000000 1.000000 1.000000 } } { id=5728 - position={ 3373.128174 0.000000 2481.145752 } + position={ 3356.404297 0.000000 2472.907471 } rotation={ -0.000000 -0.403980 -0.000000 0.914768 } scale={ 1.000000 1.000000 1.000000 } } { id=5729 - position={ 3388.633545 0.000000 2494.446777 } + position={ 3382.378662 0.000000 2488.221680 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } @@ -31399,7 +31399,7 @@ } { id=5762 - position={ 3370.969971 0.000000 2534.997559 } + position={ 3389.027100 0.000000 2539.056641 } rotation={ -0.000000 0.193444 -0.000000 0.981111 } scale={ 1.000000 1.000000 1.000000 } } @@ -31507,7 +31507,7 @@ } { id=5780 - position={ 3395.000000 0.000000 2522.000000 } + position={ 3391.573730 0.000000 2529.324707 } rotation={ -0.000000 0.156911 -0.000000 0.987613 } scale={ 1.000000 1.000000 1.000000 } } @@ -31519,7 +31519,7 @@ } { id=5782 - position={ 3427.969238 0.000000 2492.027832 } + position={ 3448.842041 0.000000 2477.288086 } rotation={ -0.000000 -0.427239 -0.000000 0.904139 } scale={ 1.000000 1.000000 1.000000 } } @@ -31531,8 +31531,8 @@ } { id=5784 - position={ 3478.000000 0.000000 2447.000000 } - rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + position={ 3480.215576 0.000000 2470.183594 } + rotation={ -0.000000 0.385727 -0.000000 0.922613 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31543,7 +31543,7 @@ } { id=5786 - position={ 3444.341309 0.000000 2453.293457 } + position={ 3436.389404 0.000000 2454.217529 } rotation={ -0.000000 0.370386 -0.000000 0.928878 } scale={ 1.000000 1.000000 1.000000 } } @@ -48481,50 +48481,50 @@ } { id=8957 - position={ 6749.000000 0.000000 2110.000000 } - rotation={ 0.000000 0.838492 0.000000 0.544914 } + position={ 3361.182373 0.000000 2489.080811 } + rotation={ -0.000000 0.902729 -0.000000 0.430210 } scale={ 1.000000 1.000000 1.000000 } } { id=8958 - position={ 6793.000000 0.000000 2120.000000 } - rotation={ 0.000000 0.447214 0.000000 0.894427 } + position={ 3341.156250 0.000000 2486.799072 } + rotation={ -0.000000 0.836553 -0.000000 0.547886 } scale={ 1.000000 1.000000 1.000000 } } { id=8959 - position={ 6783.000000 0.000000 2118.000000 } + position={ 3422.864502 0.000000 2476.481201 } rotation={ 0.000000 0.049814 0.000000 0.998759 } scale={ 1.000000 1.000000 1.000000 } } { id=8960 - position={ 6796.000000 0.000000 2075.000000 } - rotation={ 0.000000 -0.978216 0.000000 0.207591 } + position={ 3403.110352 0.000000 2504.415283 } + rotation={ 0.000000 -0.951153 -0.000000 0.308721 } scale={ 1.000000 1.000000 1.000000 } } { id=8961 - position={ 6879.000000 0.000000 2084.000000 } - rotation={ 0.000000 -0.998759 0.000000 0.049814 } + position={ 3463.853027 0.000000 2466.623047 } + rotation={ 0.000000 -0.819342 -0.000000 0.573305 } scale={ 1.000000 1.000000 1.000000 } } { id=8962 - position={ 6860.000000 0.000000 2067.000000 } + position={ 3441.947266 0.000000 2460.572510 } rotation={ 0.000000 1.000000 0.000000 0.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=8963 - position={ 6899.000000 0.000000 2072.000000 } - rotation={ 0.000000 -0.995133 0.000000 0.098538 } + position={ 3469.868164 0.000000 2445.676025 } + rotation={ -0.000000 -0.839420 -0.000000 -0.543483 } scale={ 1.000000 1.000000 1.000000 } } { id=8964 - position={ 6825.000000 0.000000 2091.000000 } - rotation={ 0.000000 1.000000 0.000000 0.000000 } + position={ 3393.126953 0.000000 2460.299072 } + rotation={ -0.000000 0.800548 -0.000000 0.599268 } 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 0d8ba9f6b..6e0d560ca 100644 --- a/gfx/map/map_object_data/building_locators.txt +++ b/gfx/map/map_object_data/building_locators.txt @@ -3775,20 +3775,20 @@ } { id=670 - position={ 3467.077637 0.000000 2466.085449 } + position={ 3469.898193 0.000000 2483.188477 } rotation={ -0.000000 -0.273268 -0.000000 -0.961938 } scale={ 1.000000 1.000000 1.000000 } } { id=671 - position={ 3452.077637 0.000000 2431.085449 } + position={ 3461.769775 0.000000 2429.255615 } rotation={ -0.000000 -0.443556 -0.000000 -0.896246 } scale={ 1.000000 1.000000 1.000000 } } { id=672 - position={ 3381.077637 0.000000 2455.085449 } - rotation={ -0.000000 -0.310268 -0.000000 -0.950649 } + position={ 3371.507080 0.000000 2461.068848 } + rotation={ -0.000000 -0.784393 -0.000000 -0.620263 } scale={ 1.000000 1.000000 1.000000 } } { @@ -4813,8 +4813,8 @@ } { id=1013 - position={ 3344.077637 0.000000 2525.085449 } - rotation={ -0.000000 -0.746191 -0.000000 -0.665731 } + position={ 3362.164062 0.000000 2516.580322 } + rotation={ -0.000000 0.143599 -0.000000 -0.989635 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31153,31 +31153,31 @@ } { id=5725 - position={ 3323.077637 0.000000 2522.085449 } + position={ 3347.355957 0.000000 2532.732422 } rotation={ -0.000000 -0.331369 -0.000000 -0.943501 } scale={ 1.000000 1.000000 1.000000 } } { id=5726 - position={ 3333.077637 0.000000 2481.085449 } - rotation={ -0.000000 -0.913381 -0.000000 0.407107 } + position={ 3351.249268 0.000000 2477.734619 } + rotation={ -0.000000 -0.789749 -0.000000 -0.613431 } scale={ 1.000000 1.000000 1.000000 } } { id=5727 - position={ 3359.077637 0.000000 2508.085449 } - rotation={ -0.000000 -0.495327 -0.000000 0.868707 } + position={ 3331.652832 0.000000 2510.409912 } + rotation={ -0.000000 0.291286 -0.000000 0.956636 } scale={ 1.000000 1.000000 1.000000 } } { id=5728 - position={ 3366.077637 0.000000 2481.085449 } - rotation={ -0.000000 -0.338096 -0.000000 0.941111 } + position={ 3366.892090 0.000000 2480.325928 } + rotation={ -0.000000 0.388612 -0.000000 0.921401 } scale={ 1.000000 1.000000 1.000000 } } { id=5729 - position={ 3387.077637 0.000000 2479.085449 } + position={ 3386.391846 0.000000 2495.291260 } rotation={ -0.000000 -0.630553 -0.000000 -0.776146 } scale={ 1.000000 1.000000 1.000000 } } @@ -31369,8 +31369,8 @@ } { id=5762 - position={ 3375.077637 0.000000 2527.085449 } - rotation={ -0.000000 -0.190453 -0.000000 0.981696 } + position={ 3384.600586 0.000000 2546.985107 } + rotation={ -0.000000 0.491907 -0.000000 0.870648 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31477,8 +31477,8 @@ } { id=5780 - position={ 3403.077637 0.000000 2515.085449 } - rotation={ -0.000000 -0.532241 -0.000000 -0.846593 } + position={ 3398.162109 0.000000 2529.690186 } + rotation={ -0.000000 -0.774653 -0.000000 -0.632387 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31489,8 +31489,8 @@ } { id=5782 - position={ 3425.077637 0.000000 2485.085449 } - rotation={ -0.000000 -0.906833 -0.000000 0.421491 } + position={ 3435.485840 0.000000 2485.251221 } + rotation={ -0.000000 0.449078 -0.000000 0.893493 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31501,8 +31501,8 @@ } { id=5784 - position={ 3481.174561 0.000000 2441.830078 } - rotation={ -0.000000 0.367257 -0.000000 -0.930119 } + position={ 3492.799316 0.000000 2462.452148 } + rotation={ -0.000000 -0.019936 -0.000000 -0.999801 } scale={ 1.000000 1.000000 1.000000 } } { @@ -48451,50 +48451,50 @@ } { id=8957 - position={ 6749.000000 0.000000 2110.000000 } - rotation={ 0.000000 0.838492 0.000000 0.544914 } + position={ 3367.117676 0.000000 2492.944336 } + rotation={ -0.000000 0.902729 -0.000000 0.430210 } scale={ 1.000000 1.000000 1.000000 } } { id=8958 - position={ 6793.000000 0.000000 2120.000000 } - rotation={ 0.000000 0.447214 0.000000 0.894427 } + position={ 3350.449463 0.000000 2491.463623 } + rotation={ -0.000000 0.891457 -0.000000 0.453106 } scale={ 1.000000 1.000000 1.000000 } } { id=8959 - position={ 6783.000000 0.000000 2118.000000 } + position={ 3398.149658 0.000000 2477.267578 } rotation={ 0.000000 0.049814 0.000000 0.998759 } scale={ 1.000000 1.000000 1.000000 } } { id=8960 - position={ 6796.000000 0.000000 2075.000000 } - rotation={ 0.000000 -0.978216 0.000000 0.207591 } + position={ 3415.981445 0.000000 2488.374756 } + rotation={ 0.000000 -0.951153 -0.000000 0.308721 } scale={ 1.000000 1.000000 1.000000 } } { id=8961 - position={ 6879.000000 0.000000 2084.000000 } - rotation={ 0.000000 -0.998759 0.000000 0.049814 } + position={ 3477.274902 0.000000 2457.228760 } + rotation={ 0.000000 -0.819342 -0.000000 0.573305 } scale={ 1.000000 1.000000 1.000000 } } { id=8962 - position={ 6860.000000 0.000000 2067.000000 } + position={ 3452.989990 0.000000 2457.225586 } rotation={ 0.000000 1.000000 0.000000 0.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=8963 - position={ 6899.000000 0.000000 2072.000000 } - rotation={ 0.000000 -0.995133 0.000000 0.098538 } + position={ 3467.691162 0.000000 2438.455078 } + rotation={ -0.000000 -0.839420 -0.000000 -0.543483 } scale={ 1.000000 1.000000 1.000000 } } { id=8964 - position={ 6825.000000 0.000000 2091.000000 } - rotation={ 0.000000 1.000000 0.000000 0.000000 } + position={ 3400.873047 0.000000 2462.214600 } + rotation={ -0.000000 0.800548 -0.000000 0.599268 } 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 69bcee960..5b39b0a18 100644 --- a/gfx/map/map_object_data/combat_locators.txt +++ b/gfx/map/map_object_data/combat_locators.txt @@ -3955,20 +3955,20 @@ } { id=670 - position={ 3454.484863 0.000000 2476.701904 } - rotation={ -0.000000 -0.999883 -0.000000 -0.015333 } + position={ 3468.963135 0.000000 2477.834961 } + rotation={ -0.000000 -0.993204 -0.000000 0.116391 } scale={ 1.000000 1.000000 1.000000 } } { id=671 - position={ 3432.163330 0.000000 2435.695068 } - rotation={ -0.000000 -0.931020 -0.000000 -0.364968 } + position={ 3441.129883 0.000000 2430.177979 } + rotation={ -0.000000 -0.818955 -0.000000 -0.573857 } scale={ 1.000000 1.000000 1.000000 } } { id=672 - position={ 3371.000000 0.000000 2466.000000 } - rotation={ -0.000000 -0.944497 -0.000000 0.328520 } + position={ 3362.785156 0.000000 2462.723145 } + rotation={ -0.000000 -0.906054 -0.000000 -0.423161 } scale={ 1.000000 1.000000 1.000000 } } { @@ -5623,8 +5623,8 @@ } { id=1013 - position={ 3338.000000 0.000000 2539.000000 } - rotation={ -0.000000 -0.990371 -0.000000 0.138439 } + position={ 3349.008789 0.000000 2515.145264 } + rotation={ -0.000000 -0.999996 -0.000000 0.002960 } scale={ 1.000000 1.000000 1.000000 } } { @@ -33043,32 +33043,32 @@ } { id=5725 - position={ 3311.356689 0.000000 2526.653320 } - rotation={ -0.000000 -0.768927 -0.000000 0.639336 } + position={ 3339.135254 0.000000 2528.255859 } + rotation={ -0.000000 -0.695860 -0.000000 0.718176 } scale={ 1.000000 1.000000 1.000000 } } { id=5726 - position={ 3348.122314 0.000000 2490.301025 } - rotation={ -0.000000 -0.998088 -0.000000 0.061806 } + position={ 3328.457520 0.000000 2483.031006 } + rotation={ -0.000000 -0.878102 -0.000000 -0.478473 } scale={ 1.000000 1.000000 1.000000 } } { id=5727 - position={ 3339.840088 0.000000 2509.553223 } - rotation={ -0.000000 -0.865337 -0.000000 0.501190 } + position={ 3319.628906 0.000000 2534.925293 } + rotation={ -0.000000 -0.996154 -0.000000 -0.087615 } scale={ 1.000000 1.000000 1.000000 } } { id=5728 - position={ 3366.000000 0.000000 2497.000000 } - rotation={ -0.000000 -0.963230 -0.000000 0.268677 } + position={ 3379.738770 0.000000 2473.548096 } + rotation={ -0.000000 -0.360795 -0.000000 0.932645 } scale={ 1.000000 1.000000 1.000000 } } { id=5729 - position={ 3389.000000 0.000000 2494.000000 } - rotation={ -0.000000 -0.598207 -0.000000 0.801342 } + position={ 3376.802002 0.000000 2502.802246 } + rotation={ -0.000000 -0.496999 -0.000000 0.867751 } scale={ 1.000000 1.000000 1.000000 } } { @@ -33259,8 +33259,8 @@ } { id=5762 - position={ 3382.859863 0.000000 2543.721680 } - rotation={ -0.000000 -0.990447 -0.000000 0.137896 } + position={ 3380.765137 0.000000 2525.682861 } + rotation={ -0.000000 -0.862869 -0.000000 0.505428 } scale={ 1.000000 1.000000 1.000000 } } { @@ -33367,7 +33367,7 @@ } { id=5780 - position={ 3398.588623 0.000000 2530.819336 } + position={ 3405.157959 0.000000 2520.356934 } rotation={ -0.000000 -0.984833 -0.000000 0.173502 } scale={ 1.000000 1.000000 1.000000 } } @@ -33380,7 +33380,7 @@ { id=5782 position={ 3443.117920 0.000000 2491.972168 } - rotation={ -0.000000 -0.902760 -0.000000 0.430145 } + rotation={ -0.000000 -0.990471 -0.000000 0.137726 } scale={ 1.000000 1.000000 1.000000 } } { @@ -33391,8 +33391,8 @@ } { id=5784 - position={ 3480.552002 0.000000 2458.083496 } - rotation={ -0.000000 -0.907518 -0.000000 0.420012 } + position={ 3502.594482 0.000000 2461.030762 } + rotation={ -0.000000 -0.349210 -0.000000 0.937044 } scale={ 1.000000 1.000000 1.000000 } } { @@ -33403,8 +33403,8 @@ } { id=5786 - position={ 3437.696777 0.000000 2457.680664 } - rotation={ -0.000000 -0.956006 -0.000000 0.293346 } + position={ 3432.106689 0.000000 2451.894043 } + rotation={ -0.000000 -0.794883 -0.000000 -0.606763 } scale={ 1.000000 1.000000 1.000000 } } { @@ -51421,50 +51421,50 @@ } { id=8957 - position={ 6749.000000 0.000000 2110.000000 } - rotation={ 0.000000 0.838492 0.000000 0.544914 } + position={ 3375.556885 0.000000 2493.480957 } + rotation={ -0.000000 0.780013 -0.000000 0.625763 } scale={ 1.000000 1.000000 1.000000 } } { id=8958 - position={ 6793.000000 0.000000 2120.000000 } - rotation={ 0.000000 0.447214 0.000000 0.894427 } + position={ 3347.072998 0.000000 2495.597900 } + rotation={ -0.000000 0.587219 -0.000000 0.809428 } scale={ 1.000000 1.000000 1.000000 } } { id=8959 - position={ 6783.000000 0.000000 2118.000000 } + position={ 3421.937012 0.000000 2480.695068 } rotation={ 0.000000 0.049814 0.000000 0.998759 } scale={ 1.000000 1.000000 1.000000 } } { id=8960 - position={ 6796.000000 0.000000 2075.000000 } - rotation={ 0.000000 -0.978216 0.000000 0.207591 } + position={ 3400.426270 0.000000 2508.664795 } + rotation={ -0.000000 -0.999580 -0.000000 0.028993 } scale={ 1.000000 1.000000 1.000000 } } { id=8961 - position={ 6879.000000 0.000000 2084.000000 } - rotation={ 0.000000 -0.998759 0.000000 0.049814 } + position={ 3470.894775 0.000000 2454.334229 } + rotation={ -0.000000 -0.458263 -0.000000 0.888817 } scale={ 1.000000 1.000000 1.000000 } } { id=8962 - position={ 6860.000000 0.000000 2067.000000 } - rotation={ 0.000000 1.000000 0.000000 0.000000 } + position={ 3461.937012 0.000000 2453.011719 } + rotation={ -0.000000 0.836721 -0.000000 0.547630 } scale={ 1.000000 1.000000 1.000000 } } { id=8963 - position={ 6899.000000 0.000000 2072.000000 } - rotation={ 0.000000 -0.995133 0.000000 0.098538 } + position={ 3476.799072 0.000000 2429.923340 } + rotation={ -0.000000 -0.322326 -0.000000 -0.946628 } scale={ 1.000000 1.000000 1.000000 } } { id=8964 - position={ 6825.000000 0.000000 2091.000000 } - rotation={ 0.000000 1.000000 0.000000 0.000000 } + position={ 3413.549072 0.000000 2451.809082 } + rotation={ -0.000000 0.443600 -0.000000 0.896225 } 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 eaa36ea46..e0c9e966f 100644 --- a/gfx/map/map_object_data/player_stack_locators.txt +++ b/gfx/map/map_object_data/player_stack_locators.txt @@ -3955,19 +3955,19 @@ } { id=670 - position={ 3474.000000 0.000000 2470.000000 } + position={ 3471.606201 0.000000 2493.218018 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=671 - position={ 3459.204346 0.000000 2429.761719 } + position={ 3465.515869 0.000000 2418.704346 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=672 - position={ 3390.000000 0.000000 2460.000000 } + position={ 3382.359375 0.000000 2464.651123 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -5623,7 +5623,7 @@ } { id=1013 - position={ 3350.000000 0.000000 2532.000000 } + position={ 3368.905762 0.000000 2534.132080 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -33043,31 +33043,31 @@ } { id=5725 - position={ 3325.000000 0.000000 2530.000000 } + position={ 3357.304688 0.000000 2536.196777 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5726 - position={ 3341.000000 0.000000 2483.000000 } + position={ 3330.639160 0.000000 2471.218994 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5727 - position={ 3361.000000 0.000000 2514.000000 } + position={ 3331.980713 0.000000 2527.163086 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=5728 - position={ 3366.825195 0.000000 2487.459961 } + position={ 3360.073242 0.000000 2476.101807 } rotation={ -0.000000 0.118863 -0.000000 0.992911 } scale={ 1.000000 1.000000 1.000000 } } { id=5729 - position={ 3389.000000 0.000000 2485.000000 } + position={ 3383.455322 0.000000 2483.095703 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -33259,7 +33259,7 @@ } { id=5762 - position={ 3380.688721 0.000000 2532.342529 } + position={ 3376.042969 0.000000 2547.853760 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -33367,7 +33367,7 @@ } { id=5780 - position={ 3406.000000 0.000000 2523.000000 } + position={ 3383.715088 0.000000 2516.427979 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -33379,7 +33379,7 @@ } { id=5782 - position={ 3435.000000 0.000000 2492.000000 } + position={ 3436.277344 0.000000 2475.640381 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -33391,8 +33391,8 @@ } { id=5784 - position={ 3486.978271 0.000000 2446.436035 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 3485.424072 0.000000 2469.719238 } + rotation={ -0.000000 0.176894 -0.000000 0.984230 } scale={ 1.000000 1.000000 1.000000 } } { @@ -33403,7 +33403,7 @@ } { id=5786 - position={ 3455.000000 0.000000 2454.000000 } + position={ 3448.408691 0.000000 2441.012939 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -51421,50 +51421,50 @@ } { id=8957 - position={ 6755.000000 0.000000 2118.000000 } - rotation={ 0.000000 0.691901 0.000000 0.721993 } + position={ 3361.552490 0.000000 2508.955811 } + rotation={ -0.000000 0.780634 -0.000000 0.624989 } scale={ 1.000000 1.000000 1.000000 } } { id=8958 - position={ 6797.000000 0.000000 2131.000000 } - rotation={ 0.000000 0.272320 0.000000 0.962207 } + position={ 3347.171631 0.000000 2507.069580 } + rotation={ -0.000000 0.719524 -0.000000 0.694468 } scale={ 1.000000 1.000000 1.000000 } } { id=8959 - position={ 6783.000000 0.000000 2113.000000 } + position={ 3393.974854 0.000000 2472.395752 } rotation={ 0.000000 0.917877 0.000000 -0.396864 } scale={ 1.000000 1.000000 1.000000 } } { id=8960 - position={ 6796.000000 0.000000 2081.000000 } - rotation={ 0.000000 0.284075 0.000000 -0.958802 } + position={ 3425.599854 0.000000 2490.230713 } + rotation={ -0.000000 0.182280 -0.000000 -0.983247 } scale={ 1.000000 1.000000 1.000000 } } { id=8961 - position={ 6894.000000 0.000000 2100.000000 } - rotation={ 0.000000 0.963041 0.000000 -0.269356 } + position={ 3482.937988 0.000000 2453.060059 } + rotation={ -0.000000 0.672346 -0.000000 -0.740238 } scale={ 1.000000 1.000000 1.000000 } } { id=8962 - position={ 6860.000000 0.000000 2098.000000 } + position={ 3454.816406 0.000000 2466.443604 } rotation={ 0.000000 0.354929 0.000000 0.934893 } scale={ 1.000000 1.000000 1.000000 } } { id=8963 - position={ 6902.000000 0.000000 2087.000000 } - rotation={ 0.000000 0.701533 0.000000 0.712637 } + position={ 3489.619385 0.000000 2443.314453 } + rotation={ -0.000000 0.104079 -0.000000 0.994569 } scale={ 1.000000 1.000000 1.000000 } } { id=8964 - position={ 6829.000000 0.000000 2096.000000 } - rotation={ 0.000000 0.310604 0.000000 0.950539 } + position={ 3411.038086 0.000000 2461.895020 } + rotation={ -0.000000 -0.320975 -0.000000 0.947087 } 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 c5d0f523a..96b32c4ca 100644 --- a/gfx/map/map_object_data/siege_locators.txt +++ b/gfx/map/map_object_data/siege_locators.txt @@ -3775,20 +3775,20 @@ } { id=670 - position={ 3457.000000 0.000000 2463.000000 } + position={ 3459.820557 0.000000 2480.103027 } rotation={ 0.000000 0.802293 0.000000 0.596931 } scale={ 1.000000 1.000000 1.000000 } } { id=671 - position={ 3444.000000 0.000000 2428.000000 } + position={ 3451.516602 0.000000 2425.786133 } rotation={ 0.000000 0.821926 0.000000 0.569595 } scale={ 1.000000 1.000000 1.000000 } } { id=672 - position={ 3385.000000 0.000000 2446.000000 } - rotation={ 0.000000 0.978216 0.000000 -0.207591 } + position={ 3380.653320 0.000000 2459.981689 } + rotation={ -0.000000 0.700032 -0.000000 -0.714112 } scale={ 1.000000 1.000000 1.000000 } } { @@ -4813,8 +4813,8 @@ } { id=1013 - position={ 3335.000000 0.000000 2528.000000 } - rotation={ 0.000000 0.584710 0.000000 0.811242 } + position={ 3366.351318 0.000000 2523.243408 } + rotation={ -0.000000 -0.354049 -0.000000 0.935227 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31153,31 +31153,31 @@ } { id=5725 - position={ 3328.000000 0.000000 2514.000000 } + position={ 3352.278320 0.000000 2524.646973 } rotation={ 0.000000 0.961249 0.000000 -0.275683 } scale={ 1.000000 1.000000 1.000000 } } { id=5726 - position={ 3342.000000 0.000000 2475.000000 } - rotation={ 0.000000 0.881675 0.000000 -0.471858 } + position={ 3341.133545 0.000000 2473.701660 } + rotation={ -0.000000 0.831894 -0.000000 0.554935 } scale={ 1.000000 1.000000 1.000000 } } { id=5727 - position={ 3370.000000 0.000000 2511.000000 } - rotation={ -0.000000 -0.606994 -0.000000 0.794707 } + position={ 3329.768799 0.000000 2520.269775 } + rotation={ -0.000000 0.160808 -0.000000 0.986986 } scale={ 1.000000 1.000000 1.000000 } } { id=5728 - position={ 3358.000000 0.000000 2477.000000 } - rotation={ -0.000000 0.939554 -0.000000 0.342402 } + position={ 3371.689453 0.000000 2472.000977 } + rotation={ -0.000000 0.923171 -0.000000 -0.384390 } scale={ 1.000000 1.000000 1.000000 } } { id=5729 - position={ 3389.000000 0.000000 2470.000000 } + position={ 3388.314209 0.000000 2486.205811 } rotation={ 0.000000 0.994029 0.000000 -0.109117 } scale={ 1.000000 1.000000 1.000000 } } @@ -31369,8 +31369,8 @@ } { id=5762 - position={ 3366.000000 0.000000 2530.000000 } - rotation={ 0.000000 0.584710 0.000000 0.811242 } + position={ 3380.897461 0.000000 2537.414795 } + rotation={ -0.000000 0.971249 -0.000000 0.238063 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31477,8 +31477,8 @@ } { id=5780 - position={ 3394.000000 0.000000 2515.000000 } - rotation={ 0.000000 0.707107 0.000000 0.707107 } + position={ 3391.196045 0.000000 2523.506592 } + rotation={ -0.000000 0.895841 -0.000000 0.444376 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31489,8 +31489,8 @@ } { id=5782 - position={ 3415.000000 0.000000 2488.000000 } - rotation={ 0.000000 0.596931 0.000000 0.802293 } + position={ 3445.333496 0.000000 2483.321289 } + rotation={ -0.000000 0.783627 -0.000000 -0.621232 } scale={ 1.000000 1.000000 1.000000 } } { @@ -31501,8 +31501,8 @@ } { id=5784 - position={ 3476.587891 0.000000 2432.727539 } - rotation={ -0.000000 -0.976529 -0.000000 -0.215386 } + position={ 3496.155273 0.000000 2452.521729 } + rotation={ -0.000000 -0.984039 -0.000000 0.177956 } scale={ 1.000000 1.000000 1.000000 } } { @@ -48451,50 +48451,50 @@ } { id=8957 - position={ 6752.000000 0.000000 2122.000000 } - rotation={ 0.000000 0.316228 0.000000 0.948683 } + position={ 3366.692139 0.000000 2504.010498 } + rotation={ -0.000000 0.045307 -0.000000 0.998973 } scale={ 1.000000 1.000000 1.000000 } } { id=8958 - position={ 6811.000000 0.000000 2115.000000 } - rotation={ 0.000000 -0.671005 0.000000 0.741453 } + position={ 3353.171387 0.000000 2498.218018 } + rotation={ -0.000000 -0.098501 -0.000000 0.995137 } scale={ 1.000000 1.000000 1.000000 } } { id=8959 - position={ 6794.000000 0.000000 2108.000000 } + position={ 3409.132324 0.000000 2476.184570 } rotation={ 0.000000 -0.707107 0.000000 0.707107 } scale={ 1.000000 1.000000 1.000000 } } { id=8960 - position={ 6788.000000 0.000000 2093.000000 } - rotation={ 0.000000 0.207591 0.000000 0.978216 } + position={ 3409.424561 0.000000 2496.376221 } + rotation={ -0.000000 0.308721 -0.000000 0.951153 } scale={ 1.000000 1.000000 1.000000 } } { id=8961 - position={ 6883.000000 0.000000 2102.000000 } - rotation={ 0.000000 -0.275683 0.000000 0.961249 } + position={ 3471.484619 0.000000 2466.527100 } + rotation={ 0.000000 0.277700 -0.000000 0.960668 } scale={ 1.000000 1.000000 1.000000 } } { id=8962 - position={ 6852.000000 0.000000 2083.000000 } - rotation={ 0.000000 0.447214 0.000000 0.894427 } + position={ 3446.717041 0.000000 2466.349609 } + rotation={ -0.000000 0.304964 -0.000000 0.952364 } scale={ 1.000000 1.000000 1.000000 } } { id=8963 - position={ 6897.000000 0.000000 2092.000000 } - rotation={ 0.000000 0.000000 0.000000 1.000000 } + position={ 3478.378418 0.000000 2440.236328 } + rotation={ -0.000000 -0.623553 -0.000000 0.781781 } scale={ 1.000000 1.000000 1.000000 } } { id=8964 - position={ 6835.000000 0.000000 2100.000000 } - rotation={ 0.000000 -0.741453 0.000000 0.671005 } + position={ 3402.926758 0.000000 2453.539551 } + rotation={ -0.000000 -0.995681 -0.000000 0.092842 } scale={ 1.000000 1.000000 1.000000 } } { diff --git a/history/provinces/e_caucasia.txt b/history/provinces/e_caucasia.txt index b53be9f8d..d80d12bad 100644 --- a/history/provinces/e_caucasia.txt +++ b/history/provinces/e_caucasia.txt @@ -163,6 +163,112 @@ 5766 = { # Signagi holding = none } +##d_greater_armenia/Yerevan ################################### +###c_yerevan +5728 = { # Yerevan + culture = NEOW_armenian + religion = armenian_apostolic + holding = castle_holding +} +8957 = { # Hrazdan + holding = city_holding +} +672 = { # Artashat + holding = church_holding + + effect = { + if = { + limit = { + has_tgp_dlc_trigger = yes + } + add_special_building_slot = dvin_shuka_01 + add_special_building = dvin_shuka_01 + } + } +} +###c_lori/Shirak-Lori +5727 = { # Gyumri + culture = NEOW_armenian + religion = armenian_apostolic + holding = castle_holding +} +1013 = { # Vanadzor + holding = city_holding +} +5725 = { # Stepanavan + holding = none +} +###c_tavush/Tavush +5780 = { # Ijevan + culture = NEOW_armenian + religion = armenian_apostolic + holding = castle_holding +} +5762 = { # Noyemberyan + holding = none +} +###c_armavir/Armavir +5726 = { # Vagharshapat + culture = NEOW_armenian + religion = armenian_apostolic + holding = castle_holding + + 304.1.1 = { + special_building_slot = etchmiadzin_cathedral + } +} +8958 = { # Ashtarak + holding = church_holding +} +###c_gegharkunik/Gegharkunik +5729 = { # Gevar + culture = NEOW_armenian + religion = armenian_apostolic + holding = castle_holding +} +8959 = { # Martuni + holding = church_holding +} +8960 = { # Vardenis + holding = none +} +##d_karabakh/Karabakh ################################### +###c_nagorno_karabakh/Nagorno-Karabakh +8961 = { # Stepanakert + culture = NEOW_armenian + religion = armenian_apostolic + holding = castle_holding +} +5784 = { # Martuni + holding = church_holding +} +670 = { # Martakert + holding = none +} +###c_dvin/Lachin +8962 = { # Lachin + culture = NEOW_armenian + religion = armenian_apostolic + holding = castle_holding +} +8963 = { # Qubadlı + holding = none +} +5782 = { # Kalbajar + holding = none +} +###c_suenik/Syunik +671 = { # Kapan + culture = NEOW_armenian + religion = armenian_apostolic + holding = castle_holding +} +8964 = { # Yeghegnadzor + holding = church_holding +} +5786 = { # Goris + holding = none +} # custom @@ -192,17 +298,6 @@ } -# 1013 - Lori -1013 = { # 1013 - Lori - - # Misc - culture = NEOW_armenian - religion = orthodox - - holding = castle_holding - -} - # 5761 - Bolnisi 5761 = { # 5761 - Bolnisi @@ -228,31 +323,6 @@ } -# 5762 - Kayan -5762 = { # 5762 - Kayan - - # Misc - culture = NEOW_georgian - religion = orthodox - - holding = none - - # History - 867.1.1 = { - culture = NEOW_armenian - religion = armenian_apostolic - } - 1084.1.1 = { - culture = kurd - religion = ashari - } - 1124.1.1 = { - culture = NEOW_georgian - religion = orthodox - } - -} - # 5767 - Ujarma 5767 = { # 5767 - Ujarma @@ -292,144 +362,6 @@ } -### ARMENIA ### - -# 670 - Gandzasar -670 = { # 670 - Gandzasar - - # Misc - culture = NEOW_armenian - religion = armenian_apostolic - - holding = none - - # History - 1066.1.1 = { - holding = church_holding - } - 1219.1.1 = { - culture = NEOW_armenian - religion = armenian_apostolic - } - -} - -# 671 - Kapan -671 = { # 671 - Kapan - - # Misc - culture = NEOW_armenian - religion = armenian_apostolic - - holding = castle_holding - - # History - 1219.1.1 = { - culture = NEOW_armenian - religion = armenian_apostolic - } - -} - -# 672 - Dvin -672 = { # 672 - Dvin - - # Misc - culture = NEOW_armenian - religion = armenian_apostolic - - holding = castle_holding - - effect = { - if = { - limit = { - has_tgp_dlc_trigger = yes - } - add_special_building_slot = dvin_shuka_01 - add_special_building = dvin_shuka_02 - } - } - - 893.12.28 = { # Dvin Earthquake of 893 seriously wrecked the city - effect = { - if = { - limit = { - has_tgp_dlc_trigger = yes - } - remove_building = dvin_shuka_02 - add_special_building = dvin_shuka_01 - } - } - } - - # History - 1219.1.1 = { - culture = NEOW_armenian - religion = armenian_apostolic - } - -} - -# 5725 - Dlim -5725 = { # 5725 - Dlim - - # Misc - culture = NEOW_armenian - religion = armenian_apostolic - - holding = none - - # History -} - -# 5726 - Bagaran -5726 = { # 5726 - Bagaran - - # Misc - culture = NEOW_armenian - religion = armenian_apostolic - - holding = city_holding - - # History -} - -# 5727 - Kumayri -5727 = { # 5727 - Kumayri - - # Misc - culture = NEOW_armenian - religion = armenian_apostolic - - holding = church_holding - - # History -} - -# 5728 - Yerevan -5728 = { # 5728 - Yerevan - - # Misc - culture = NEOW_armenian - religion = armenian_apostolic - - holding = church_holding - - # History - 304.1.1 = { - special_building_slot = etchmiadzin_cathedral - } - 1084.1.1 = { - culture = kurd - religion = ashari - } - 1219.1.1 = { - culture = NEOW_armenian - religion = armenian_apostolic - } - -} - # 5729 - Garni 5729 = { # 5729 - Garni @@ -437,19 +369,7 @@ culture = NEOW_armenian religion = armenian_apostolic - holding = none - - # History -} - -# 5780 - Tovuz -5780 = { # 5780 - Tovuz - - # Misc - culture = NEOW_armenian - religion = armenian_apostolic - - holding = none + holding = castle_holding # History } @@ -466,18 +386,6 @@ # History } -# 5782 - Gardman -5782 = { # 5782 - Gardman - - # Misc - culture = NEOW_armenian - religion = armenian_apostolic - - holding = city_holding - - # History -} - # 5783 - Parnes 5783 = { # 5783 - Parnes @@ -490,18 +398,6 @@ # History } -# 5784 - Ktis -5784 = { # 5784 - Ktis - - # Misc - culture = NEOW_armenian - religion = armenian_apostolic - - holding = none - - # History -} - # 5785 - Naxcivan 5785 = { # 5785 - Naxcivan @@ -514,18 +410,6 @@ # History } -# 5786 - Goris -5786 = { # 5786 - Goris - - # Misc - culture = NEOW_armenian - religion = armenian_apostolic - - holding = none - - # History -} - # 5787 - Jugha 5787 = { # 5787 - Jugha 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 6c1b029ce..c50aa4ecb 100644 --- a/localization/english/replace/names/NEOW_character_names_l_english.yml +++ b/localization/english/replace/names/NEOW_character_names_l_english.yml @@ -20972,3 +20972,11 @@ X_a_uml_ms_a_uml_n_a_uml_:0 "Xämsänä" _I_dot_sm_a_uml__g_brv_il:0 "İsmäğil" Gaynetdin:0 "Gaynetdin" + X_a_uml_lim_a_uml_:0 "Xälimä" + Mexx:0 "Mexx" + Memphis:0 "Memphis" + Jurri_e_uml_n:0 "Jurriën" + Micky:0 "Micky" + Tijjani:0 "Tijjani" + Eliano:0 "Eliano" + Jerdy:0 "Jerdy" diff --git a/localization/english/replace/titles_cultural_names_l_english.yml b/localization/english/replace/titles_cultural_names_l_english.yml index 7727d55cf..928fb759a 100644 --- a/localization/english/replace/titles_cultural_names_l_english.yml +++ b/localization/english/replace/titles_cultural_names_l_english.yml @@ -6079,10 +6079,8 @@ cn_datvan_adj:0 "Datvani" cn_eua:0 "Eua" cn_eua_adj:0 "Euan" - cn_mets_hayk_:0 "Mets Hayk'" - cn_mets_hayk__adj:0 "Mets Hayki" - cn_erivan:0 "Erivan" - cn_erivan_adj:0 "Erivani" + cn_artsakh:0 "Artsakh" + cn_artsakh_adj:0 "Artsakhi" #Italy cn_ravenna:0 "Ravenna" diff --git a/localization/english/replace/titles_l_english.yml b/localization/english/replace/titles_l_english.yml index c4d63a14e..1ab8e6881 100644 --- a/localization/english/replace/titles_l_english.yml +++ b/localization/english/replace/titles_l_english.yml @@ -6553,7 +6553,7 @@ b_duvzare:0 "Duvzare" b_duwayd:0 "Duwayd" b_dvaraka:0 "Dvaraka" - b_dvin:0 "Dvin" + b_dvin:0 "Artashat" b_dvinitsa:0 "Dvinitsa" b_dvur-chvojno:0 "Trutnov" b_dvur:0 "Dvur" @@ -8047,6 +8047,7 @@ b_kanyakubja:0 "Kanyakubja" b_kapalak:0 "Kapalak" b_kapan:0 "Kapan" + b_yeghegnadzor:0 "Yeghegnadzor" b_kapardikadvipa:0 "Kapardikadvipa" b_kaparthula:0 "Kaparthula" b_kapchagai:0 "Kapchagai" @@ -9086,7 +9087,7 @@ b_lopnor:0 "Lopnor" b_loq:0 "Loq" b_loralai:0 "Loralai" - b_lori:0 "Lori" + b_lori:0 "Vanadzor" b_lori_berd:0 "Lori Berd" b_loricol:0 "Loricol" b_lorient:0 "Lorient" @@ -15005,7 +15006,8 @@ c_lomzynska_adj:0 "Łomżyński" c_loon:0 "Loon" c_loon_adj:0 "Loonian" - c_lori:0 "Lori" + c_lori:0 "Shirak-Lori" + c_lori_adj:0 "Shirak-Lori" c_lorraine:0 "Lorraine" c_lorraine_adj:0 "Lorrainian" c_loulan:0 "Loulan" @@ -15849,8 +15851,8 @@ c_suceava_adj:0 "Suceavan" c_sudovia:0 "Sudovia" c_sudovia_adj:0 "Sudovian" - c_suenik:0 "Suenik" - c_suenik_adj:0 "Suenikian" + c_suenik:0 "Syunik" + c_suenik_adj:0 "Syunetsi" c_sugrov:0 "Sugrov" c_sugrov_adj:0 "Sugrovian" c_sumadija:0 "Šumadija" @@ -19062,9 +19064,8 @@ #Armenia & Georgia d_vaspurakan:0 "Van" d_vaspurakan_adj:0 "Vanlı" - d_greater_armenia:0 "Greater Armenia" - d_greater_armenia_adj:0 "Armenian" - d_greater_armenia_pre:0 "Armeno" + d_greater_armenia:0 "Yerevan" + d_greater_armenia_adj:0 "Yerevantsi" d_tao-klarjeti:0 "Imereti" d_tao-klarjeti_adj:0 "Imeretian" c_imereti:0 "Imereti" @@ -19077,14 +19078,14 @@ c_hark_adj:0 "Harkian" c_apahunik:0 "Erciş" c_apahunik_adj:0 "Ercişli" - c_hayk:0 "Hayk" - c_hayk_adj:0 "Haykian" + c_hayk:0 "Yerevan" + c_hayk_adj:0 "Yerevantsi" c_bagrewand:0 "Iğdır" c_bagrewand_adj:0 "Iğdırlı" c_vanand:0 "Kars" c_vanand_adj:0 "Karslı" - c_dvin:0 "Dvin" - c_dvin_adj:0 "Dvinian" + c_dvin:0 "Lachin" + c_dvin_adj:0 "Lachinli" c_samtskhe–javakheti:0 "Samtskhe-Javakheti" c_samtskhe–javakheti_adj:0 "Samtskhe-Javakheti" c_klarjeti:0 "Bolnisi" @@ -19113,11 +19114,15 @@ b_bagavan:0 "Doğubayazıt" b_berkri:0 "Muradiye" b_akhtamar:0 "Gevaş" - b_dlim:0 "Dlim" - b_bagaran:0 "Bagaran" - b_kumayri:0 "Kumayri" + b_dlim:0 "Stepanavan" + b_bagaran:0 "Vagharshapat" + b_ashtarak:0 "Ashtarak" + c_gegharkunik:0 "Gegharkunik" + c_gegharkunik_adj:0 "Gegharkuniktsi" + b_kumayri:0 "Gyumri" b_yerevan:0 "Yerevan" - b_garni:0 "Garni" + b_hrazdan:0 "Hrazdan" + b_garni:0 "Gavar" b_tsalakert:0 "Iğdır" b_valashkert:0 "Ağrı" b_patnos:0 "Patnos" @@ -19151,7 +19156,7 @@ b_dmanisi:0 "Tetritsqaro" b_rustavi:0 "Rustavi" b_bolnisi:0 "Bolnisi" - b_kayan:0 "Kayan" + b_kayan:0 "Noyemberyan" b_nektesi:0 "Akhmeta" b_gavazi:0 "Kvareli" b_kharnabuji:0 "Signagi" @@ -19165,12 +19170,12 @@ b_kudevan:0 "Kudevan" b_paidangaran:0 "Paidangaran" b_mingachevir:0 "Mingachevir" - b_tovuz:0 "Tovuz" + b_tovuz:0 "Ijevan" b_shamkur:0 "Shamkur" - b_gardman:0 "Gardman" + b_gardman:0 "Kalbajar" b_parnes:0 "Parnes" - b_gandzasar:0 "Gandzasar" - b_ktis:0 "Ktis" + b_gandzasar:0 "Martakert" + b_ktis:0 "Martuni" b_naxcivan:0 "Naxcivan" b_jugha:0 "Jugha" b_gabarawan:0 "Gabarawan" @@ -27501,4 +27506,17 @@ d_kakheti:0 "Kakheti" d_kakheti_adj:0 "Kakhetian" e_sublime_state:0 "Devlet-i Aliyye" - e_sublime_state_adj:0 "Sublime State" \ No newline at end of file + e_sublime_state_adj:0 "Sublime State" + c_tavush:0 "Tavush" + c_tavush_adj:0 "Tavushetsi" + c_armavir:0 "Armavir" + c_armavir_adj:0 "Armavirtsi" + b_martuni:0 "Martuni" + b_vardenis:0 "Vardenis" + d_karabakh:0 "Karabakh" + d_karabakh_adj:0 "Karabakhi" + c_nagorno_karabakh:0 "Nagorno-Karabakh" + c_nagorno_karabakh_adj:0 "Nagorno-Karabakhi" + b_stepanakert:0 "Stepanakert" + b_lachin:0 "Lachin" + b_qubadli:0 "Qubadlı" diff --git a/map_data/definition.csv b/map_data/definition.csv index 349d52d0d..99f450265 100644 --- a/map_data/definition.csv +++ b/map_data/definition.csv @@ -5724,9 +5724,9 @@ 5723;131;129;189;Akhtamar;x 5724;115;83;28;Hadamakert;x 5725;5;135;190;Dlim;x -5726;47;138;63;Bagaran;x -5727;89;141;191;Kumayri;x -5728;131;144;64;Yerevan;x +5726;210;67;171;Bagaran;x +5727;99;45;23;Kumayri;x +5728;232;132;15;Yerevan;x 5729;173;147;192;Garni;x 5730;5;150;65;Tsalakert;x 5731;24;103;133;Valashkert;x @@ -5782,9 +5782,9 @@ 5781;47;90;218;Shamkur;x 5782;89;93;91;Gardman;x 5783;131;96;219;Parnes;x -5784;173;99;92;Ktis;x +5784;67;210;121;Ktis;x 5785;5;102;220;Naxcivan;x -5786;47;105;93;Goris;x +5786;232;42;230;Goris;x 5787;89;108;221;Jugha;x 5788;131;111;94;Gabarawan;x 5789;173;114;222;Varsan;x @@ -8955,14 +8955,14 @@ 8954;4;111;111;AKHALTSIKHE;x 8955;193;85;85;BORJOMI;x 8956;87;21;86;KARELI;x -8957;92;33;206;;x -8958;134;36;79;;x -8959;176;39;207;;x -8960;8;42;80;;x -8961;50;45;208;;x -8962;92;48;81;;x -8963;134;51;209;;x -8964;176;54;82;;x +8957;164;205;32;HRAZDAN;x +8958;180;141;169;ASHTARAK;x +8959;203;225;52;MARTUNI;x +8960;148;145;192;VARDENIS;x +8961;255;228;154;STEPANAKERT;x +8962;211;138;50;LACHIN;x +8963;70;50;26;QUBADLI;x +8964;199;179;155;YEGHEGNADZOR;x 8965;8;57;210;;x 8966;50;60;83;;x 8967;92;63;211;;x diff --git a/map_data/geographical_regions/geographical_region.txt b/map_data/geographical_regions/geographical_region.txt index 0891c0637..c399c37ff 100644 --- a/map_data/geographical_regions/geographical_region.txt +++ b/map_data/geographical_regions/geographical_region.txt @@ -239,7 +239,7 @@ world_asia_minor = { #Anatolia d_ephese d_kutahya d_opsikion d_cilicia d_hatay d_cibyrrhaeot d_anatolia d_thracesia d_optimatoi d_bucellaria d_armeniac d_sebasteia d_charsianon d_cappadocia d_ankara d_chaldia #Armenia - d_mesopotamia d_malatya d_vaspurakan d_greater_armenia + d_mesopotamia d_malatya d_vaspurakan d_greater_armenia d_karabakh #Georgia d_tao-klarjeti d_abkhazia d_georgia d_kakheti #Azerbaijan @@ -1817,7 +1817,7 @@ custom_south_slavia = { custom_greater_armenia = { duchies = { #Armenia-proper - d_vaspurakan d_mesopotamia d_malatya d_greater_armenia d_shirvan d_georgia d_kakheti + d_vaspurakan d_mesopotamia d_malatya d_greater_armenia d_karabakh d_shirvan d_georgia d_kakheti #Atropatene d_azerbaijan #Sophene @@ -2211,7 +2211,7 @@ world_horse_buildings_in_hills_and_mountains = { #Anatolia d_ephese d_kutahya d_opsikion d_cilicia d_hatay d_cibyrrhaeot d_anatolia d_thracesia d_optimatoi d_bucellaria d_armeniac d_sebasteia d_charsianon d_cappadocia d_ankara d_chaldia #Armenia - d_mesopotamia d_malatya d_vaspurakan d_greater_armenia + d_mesopotamia d_malatya d_vaspurakan d_greater_armenia d_karabakh # k_georgia d_tao-klarjeti d_abkhazia d_georgia d_kakheti #Punjab @@ -2486,7 +2486,7 @@ special_mongol_empire_conquest_region_prio_4 = { duchies = { #Caucasus #k_armenia - d_mesopotamia d_malatya d_vaspurakan d_greater_armenia + d_mesopotamia d_malatya d_vaspurakan d_greater_armenia d_karabakh #k_georgia d_tao-klarjeti d_abkhazia d_georgia d_kakheti @@ -2921,7 +2921,7 @@ ghw_region_caucasus = { #Georgia d_tao-klarjeti d_abkhazia d_georgia d_kakheti #Armenia - d_mesopotamia d_malatya d_vaspurakan d_greater_armenia + d_mesopotamia d_malatya d_vaspurakan d_greater_armenia d_karabakh #Western Daylam d_shirvan d_azerbaijan d_daylam #Caucasus @@ -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_klarjeti c_inner_kartli c_samtskhe–javakheti c_vanand c_ardahan c_hayk c_kartli c_tbilisi c_kakheti c_lori c_hereti } + counties = { c_klarjeti c_inner_kartli c_samtskhe–javakheti c_vanand c_ardahan c_hayk c_kartli c_tbilisi c_kakheti c_lori c_gegharkunik c_tavush c_armavir c_hereti } } dlc_fp2_form_aragon_region = { @@ -4444,7 +4444,7 @@ dlc_mpo_steppe_caucasus_expansion = { #Georgia d_tao-klarjeti d_abkhazia d_georgia d_kakheti #Armenia - d_mesopotamia d_malatya d_vaspurakan d_greater_armenia + d_mesopotamia d_malatya d_vaspurakan d_greater_armenia d_karabakh #Western Daylam d_shirvan d_azerbaijan } @@ -5007,7 +5007,7 @@ dlc_tgp_silk_road_route_occident = { tgp_silk_road_occident_region = { duchies = { - d_aegean_islands d_ephese d_kutahya d_opsikion d_cilicia d_hatay d_cibyrrhaeot d_anatolia d_thracesia d_optimatoi d_bucellaria d_armeniac d_sebasteia d_charsianon d_cappadocia d_ankara d_chaldia d_mesopotamia d_malatya d_vaspurakan d_greater_armenia d_tao-klarjeti d_abkhazia d_georgia d_kakheti d_shirvan # Anatolia + d_aegean_islands d_ephese d_kutahya d_opsikion d_cilicia d_hatay d_cibyrrhaeot d_anatolia d_thracesia d_optimatoi d_bucellaria d_armeniac d_sebasteia d_charsianon d_cappadocia d_ankara d_chaldia d_mesopotamia d_malatya d_vaspurakan d_greater_armenia d_karabakh d_tao-klarjeti d_abkhazia d_georgia d_kakheti d_shirvan # Anatolia d_damascus d_aleppo d_antioch d_homs d_lebanon d_palmyra d_palestine d_urdunn # Jerusalem d_daylam d_tabaristan d_gurgan d_azerbaijan # Daylam d_isfahan d_kirman d_yazd d_rayy d_hamadan d_fars d_hormuz d_khuzestan d_kermanshah # Persia @@ -5027,7 +5027,7 @@ tgp_silk_road_asia_minor_minus_georgia = { #Anatolia d_aegean_islands d_ephese d_kutahya d_opsikion d_cilicia d_hatay d_cibyrrhaeot d_anatolia d_thracesia d_optimatoi d_bucellaria d_armeniac d_sebasteia d_charsianon d_cappadocia d_ankara d_chaldia #Armenia - d_mesopotamia d_malatya d_vaspurakan d_greater_armenia + d_mesopotamia d_malatya d_vaspurakan d_greater_armenia d_karabakh #Azerbaijan d_shirvan } diff --git a/map_data/provinces.png b/map_data/provinces.png index a6f81cf3b..e836ad5ed 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:48c07797760f31277afcb308f0b56257545e0531ce121a14dc2a7ccd502058f8 -size 2687606 +oid sha256:909aa6c82456738c6491959f5337802b31bc91d42e8eaf584fd552034124e674 +size 2688649