diff --git a/common/coat_of_arms/coat_of_arms/01_landed_titles.txt b/common/coat_of_arms/coat_of_arms/01_landed_titles.txt index 27827fa39..35b15decd 100644 --- a/common/coat_of_arms/coat_of_arms/01_landed_titles.txt +++ b/common/coat_of_arms/coat_of_arms/01_landed_titles.txt @@ -17696,19 +17696,6 @@ d_smaland = { } } -d_norrland = { - pattern = "pattern_solid.dds" - color1 = "blue" - color2 = "white" - colored_emblem = { - texture = "ce_stag.dds" - color1 = "white" - color2 = "red" - color3 = "black" - instance = { position = { 0.5 0.48 } scale = { 1.0 1.0 } } - } -} - d_viken = { pattern = "pattern_solid.dds" color1 = "yellow" @@ -29351,18 +29338,6 @@ k_mann_the_isles_alternate = { #### FP1 # NB includes new modified for those existing entries d_the_isles, c_isle_of_man, c_varmland, c_narke, c_upland (all removed from above to keep things clean) -c_jamtfir = { - pattern = "pattern_solid.dds" - color1 = "red" - color2 = "white" - colored_emblem = { - texture = "ce_cross_scandinavian_froso.dds" - color1 = "white" - color2 = "yellow" - instance = { position = { 0.5 0.48 } scale = { 0.95 0.95 } } - } -} - c_skara = { pattern = "pattern_solid.dds" color1 = "blue" @@ -30083,19 +30058,6 @@ c_oland_norse = { } } -d_norrland_norse = { - pattern = "pattern_solid.dds" - color1 = "yellow" - color2 = "black" - - colored_emblem = { - texture = "ce_walknut.dds" - color1 = "black" - color2 = "black" - instance = { position = { 0.5 0.48 } scale = { 0.9 0.9 } } - } -} - c_halsingland_norse = { pattern = "pattern_solid.dds" color1 = "white" @@ -30122,34 +30084,6 @@ c_medelpad_norse = { } } -c_angermanland = { - pattern="pattern_solid.dds" - color1=white - color2=white - color3=red - colored_emblem={ - color1=red - color2=red - texture="ce_pagan_endless_knot.dds" - instance={ - position={ 0.500000 0.480000 } - } - } -} - -c_angermanland_norse = { - pattern = "pattern_solid.dds" - color1 = "black" - color2 = "yellow" - - colored_emblem = { - texture = "ce_rune_futhark_oss.dds" - color1 = "yellow" - color2 = "yellow" - instance = { position = { 0.5 0.48 } scale = { 1.0 1.0 } } - } -} - d_gotland_norse = { pattern = "pattern_solid.dds" color1 = "red" @@ -31530,20 +31464,6 @@ d_jamtland_norse = { instance = { position = { 0.5 0.48 } scale = { -0.725 0.725 } rotation = 7.5 } } } - -c_jamtfir_norse = { - pattern = "pattern_solid.dds" - color1 = "red" - color2 = "white" - - colored_emblem = { - texture = "ce_ginfaxi.dds" - color1 = "white" - color2 = "white" - instance = { position = { 0.5 0.48 } scale = { 1.0 1.0 } } - } -} - c_morarna = { pattern="pattern_solid.dds" color1=green diff --git a/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt b/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt index bdd349845..b5de3f2e6 100644 --- a/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt +++ b/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt @@ -2050,44 +2050,6 @@ c_halsingland={ } -c_angermanland={ - pattern="pattern_horizontal_split_01.dds" - color1=blue - color2=white - color3=blue - colored_emblem={ - color1=blue - texture="ce_block_02.dds" - instance={ - depth=3.010000 - } - - } - - colored_emblem={ - color1=white - color3=blue - texture="ce_fish.dds" - instance={ - position={ 0.500000 0.750000 } - scale={ 0.700000 0.700000 } - } - - instance={ - scale={ -0.700000 0.700000 } - depth=1.010000 - } - - instance={ - position={ 0.500000 0.250000 } - scale={ 0.700000 0.700000 } - depth=2.010000 - } - - } - -} - c_medelpad={ pattern="pattern_horizontal_split_01.dds" @@ -7524,126 +7486,6 @@ d_west_karelia={ } -c_sjeltie={ - pattern="pattern_solid.dds" - color1=red - color2=white - color3=red - colored_emblem={ - color1=yellow - color2=red - color3=red - texture="ce_bull_head.dds" - instance={ - position={ 0.500000 0.690000 } - scale={ 0.560000 0.700000 } - depth=1.010000 - } - - } - - colored_emblem={ - color1=yellow - texture="ce_antlers_attire.dds" - instance={ - position={ 0.500000 0.320000 } - scale={ 0.650000 0.860000 } - depth=2.010000 - } - - } - - colored_emblem={ - color1=yellow - texture="ce_african_fern.dds" - instance={ - position={ 0.500000 0.190000 } - scale={ 0.250000 0.170000 } - } - - } - -} - - -d_norrland={ - pattern="pattern_vertical_split_01.dds" - color1=blue - color2=white - color3=red - colored_emblem={ - color1=blue - texture="ce_block_02.dds" - instance={ - position={ 0.000000 0.500000 } - depth=3.010000 - } - - instance={ - depth=7.010000 - } - - } - - colored_emblem={ - color1=red - color2=red - texture="ce_waves_03.dds" - instance={ - position={ 0.785000 0.500000 } - scale={ 0.500000 1.000000 } - depth=6.010000 - rotation=134 - } - - } - - colored_emblem={ - color1=white - color2=blue - color3=blue - texture="ce_fish.dds" - instance={ - position={ 0.275000 0.715000 } - scale={ 0.450000 0.450000 } - } - - instance={ - position={ 0.275000 0.500000 } - scale={ -0.450000 0.450000 } - depth=1.010000 - } - - instance={ - position={ 0.275000 0.285000 } - scale={ 0.450000 0.450000 } - depth=2.010000 - } - - } - - colored_emblem={ - color1=white - color2=white - texture="ce_waves_03.dds" - instance={ - position={ 0.785000 0.715000 } - scale={ 0.500000 1.000000 } - depth=4.010000 - rotation=134 - } - - instance={ - position={ 0.785000 0.280000 } - scale={ 0.500000 1.000000 } - depth=5.010000 - rotation=134 - } - - } - -} - d_guoldat={ pattern="pattern_solid.dds" diff --git a/common/coat_of_arms/coat_of_arms/scandinavia.txt b/common/coat_of_arms/coat_of_arms/scandinavia.txt index da6e6c050..84e266aa1 100644 --- a/common/coat_of_arms/coat_of_arms/scandinavia.txt +++ b/common/coat_of_arms/coat_of_arms/scandinavia.txt @@ -114,3 +114,107 @@ c_helgum={ } } +b_sjeltie={ + pattern="pattern_solid.dds" + color1=red + color2=white + color3=red + colored_emblem={ + color1=yellow + color2=red + color3=red + texture="ce_bull_head.dds" + instance={ + position={ 0.500000 0.690000 } + scale={ 0.560000 0.700000 } + depth=1.010000 + } + + } + + colored_emblem={ + color1=yellow + texture="ce_antlers_attire.dds" + instance={ + position={ 0.500000 0.320000 } + scale={ 0.650000 0.860000 } + depth=2.010000 + } + + } + + colored_emblem={ + color1=yellow + texture="ce_african_fern.dds" + instance={ + position={ 0.500000 0.190000 } + scale={ 0.250000 0.170000 } + } + + } + +} +c_angermanland={ + pattern="pattern_horizontal_split_01.dds" + color1=blue + color2=white + color3=blue + colored_emblem={ + color1=blue + texture="ce_block_02.dds" + } + colored_emblem={ + color1=white + color2=red + color3=blue + texture="NEOW_ce_salmon.dds" + instance={position={0.5 0.75} scale={0.85 0.85}} + instance={scale={-0.85 0.85}} + instance={position={0.5 0.25} scale={0.85 0.85}} + } +} +d_norrland={ + pattern="pattern_vertical_split_01.dds" + color1=blue + color2=white + color3=red + colored_emblem={ + color1=red + color2=red + texture="ce_waves_03.dds" + instance={position={0.785 0.5} scale={0.5 1} rotation=134} + } + colored_emblem={ + color1=white + color2=white + texture="ce_waves_03.dds" + instance={position={0.785 0.715} scale={0.5 1} rotation=134} + instance={position={0.785 0.28} scale={0.5 1} rotation=134} + } + colored_emblem={ + color1=blue + texture="ce_block_02.dds" + instance={depth=7} + instance={position={0 0.5}} + } + colored_emblem={ + color1=white + color2=red + color3=blue + texture="NEOW_ce_salmon.dds" + instance={position={0.275 0.715} scale={0.5 0.5}} + instance={position={0.275 0.5} scale={-0.5 0.5}} + instance={position={0.275 0.285} scale={ 0.5 0.5}} + } +} +c_jamtfir={ + pattern="pattern_solid.dds" + color1=blue + color2=white + colored_emblem={ + color1=white + color2=white + color3=blue + texture="NEOW_ce_meese_cabbossed.dds" + } +} diff --git a/common/culture/name_equivalency/00_NEOW_female_names.txt b/common/culture/name_equivalency/00_NEOW_female_names.txt index 0bd8b34c1..f0d7e47c5 100644 --- a/common/culture/name_equivalency/00_NEOW_female_names.txt +++ b/common/culture/name_equivalency/00_NEOW_female_names.txt @@ -290,7 +290,7 @@ haysey_molly_female = { Haysey Molly } hazel_female = { Hasyl Hazel } heather_female = { Heaiter Heather Hyafyr } hedwig_female = { Heda Hedda Hedvig Hedviga Hedvika Hedwig Hedvigo Hedwisch Jadvyga Jadwiga Jagoda } -helen_female = { _E_act_lena A_l_ced_ona Alena Alenka Eileen El_e_act_ni El_i_act_n Elaine Elayny Elen Elena Elene Eleni Eleno Elin Elina Eline Ellayny Ellen H_e_act_l_e_grv_ne Hel_e_act_n Hel_e_act_ne Heleene Helen Helena Helene Heli Helin Hylyna Ileana Ilinca Ilka Ilona Je_l_ced_ena Jelena Jelka Len_c_crn_e Lena Liene Neli Nellie Nelly Yelena } +helen_female = { _E_act_lena A_l_ced_ona Alena Alenka Eileen El_e_act_ni El_i_act_n Elaine Elayny Elen Elena Elene Eleni Eleno Elin Elina Eline Ellayny Ellen H_e_act_l_e_grv_ne Hel_e_act_n Hel_e_act_ne Heleene Helen Helena Helene Heli Helin Hylyna Ileana Ilinca Ilka Ilona Je_l_ced_ena Jelena Jelka Len_c_crn_e Lena Liene Neli Nellie Nelly Olena Yelena } heloise_female = { H_e_act_lo_i_uml_se Helo_i_act_sa } henrietta_female = { Enrieto Enriqueta H_a_grv__a_grv_fj_e_grv_tt Harriet Harriette Hattie Heike Henderika Hendrica Hendrika Hendrikje Hendrina Henri_e_uml_tte Henrica Henrieta Henrietta Henriette Henrika Henriqueta Hetty Jette Inta Jind_r_crn_i_s_crn_ka Jindra } hermine_female = { Herm_i_act_na Herm_i_act_nia Hermin Hermina Hermine Herminia } @@ -420,8 +420,8 @@ malika_female = { M_AE_lyka Malika Mallyca Melike } 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 Margit Margita Margitta Margot Margott Margr_e_act_t Margret Margrete Margrethe Margrit Marguerite 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_i_act_riam Ma_s_crn_a Maaike Maarja Maddi Mai Maia Maie Maija 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 } +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 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_i_act_riam 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_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 b9065e8ab..1006686bc 100644 --- a/common/culture/name_equivalency/00_NEOW_male_names.txt +++ b/common/culture/name_equivalency/00_NEOW_male_names.txt @@ -67,7 +67,7 @@ albinus_male = { Alb_i_act_n Albin Albinas Albino Alpo Aubin Bine } alcide_male = { Alcides } alex_male = { _A_act_lex _A_grv_lex A_l_ced_iks Aahlex Ahl_i_hat_x Alec Alecs Alek Aleks Aleksa Aleksas Alekso Alex Ale_c_crn_jo Alick Allex Arlegz } alexander_male = { _I_dot_skender Aahlexenda Ace Aco Ailaistair Al_e_act_xandros Al_i_hat_kz_ae_nda Alastair Alaxandr Alecsander Alecu Aleissandre Alejandro Aleksand_e_uml_r Aleksandar Aleksander Aleksandr Aleksandras Aleksandrs Aleksandro Aleksanteri Alessandro Alexander Alexandr Alexandre Alexandri Alexandro Alexandru Alistair Allygzanir Arlegzahnuh Cane Eskend_i_dot_r Eskender Lek_e_uml_ Leka S_a_grv_nder Sa_s_crn_a Sa_s_crn_ko Sa_s_crn_o Sacha Sand_e_uml_r Sander Sandi Sandis Sandrino Sandris Sandro Sandu Santeri Santtu Sascha Sasho Sk_e_uml_nder } -alexis_male = { Al_e_act_xios Al_e_act_xis Al_e_grv_ssi Alaksiej Aleix Aleixo Alejo Aleksej Aleksey Aleksi Aleksis Ales Alessio Alexe Alexej Alexey Alexis Aljo_s_crn_a L_a_uml_xi Laxi } +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 } alfonso_male = { Afonso Alfons Alfonsas Alfonso Alfonsu Alfonz Alfus Alifonso Alphonse Alonso Alonsu Anfous Funse } alfred_male = { _A_grv_lfred Alfehd Alfie Alfr_e_act_d Alfr_e_mcn_ds Alfre_eth_ Alfred Alfredo Alfredu Alfret Alfrid Alfrud Fredd } algernon_male = { _AE_ldernon Algernon Aljern_o_hat_n Aljurnin Aljurnon Arjuhnun } @@ -167,7 +167,7 @@ barukh_male = { Barukh Borukh } basenzhabu_male = { Bahsenshuho Baseneabiu Basenzhabu Bazenj_a_hat_bu } bashar_male = { Ba_s_ced_ar } bashir_male = { B_e_act_chir Ba_s_ced_ir Bashir } -basil_male = { Bas_i_act_lio Basil Basile Basilio Bazyl Faslli Pasi Vas_i_act_leios Vasil Vasile Vasilic_a_brv_ Vasilije Vasilijus Vasiliy Vasillaq Vasja Vasko Vasyl Vazil } +basil_male = { Bas_i_act_lio Basil Basile Basilio Bazyl Faslli Pasi Vas_i_act_leios Vas_i_hat_l_pst_ Vasil Vasile Vasilic_a_brv_ Vasilije Vasilijus Vasiliy Vasillaq Vasja Vasko Vasyl Vazil } bassam_male = { Bassem } bayram_male = { Ba_y_act_ram Bajram Bayram } becket_male = { Becet Becket Bek_i_hat_t Bekit Br_e_brv_kat } @@ -261,7 +261,6 @@ clarence_male = { Clarence Klarenco } claudius_male = { Cl_a_act_udio Claude_male Claudi Claudio Claudiu Claudius Gl_a_grv_udi Glaoda Glywys Klaod Klaudio } clement_male = { Cl_e_act_ment Clem_e_grv_nt Clemens Clement Clemente Clemmin_pst_ Clemmyynt Climent Kleman Klemant Klemen Klemens Klemensas Klement Klemuhnt Klimant Kliment } clifford_publicola_male = { Clifford Publicola } -clinton_eugene_male = { Clinton Eugene } clovis_male = { Chlodwig Clouvis Clovis Kloviso } colombanus_male = { Caillum Callum Colom_a_act_n Kallwm Koloman } conan_male = { Conan Cynan Kenan } @@ -354,7 +353,7 @@ ertughrul_male = { Ertu_g_brv_rul } erwin_male = { Erv_i_act_n Ervin Erwein Erwin } eskil_male = { Eskil Esko } ethan_male = { Ethan Izan } -eugene_male = { _E_act_ug_e_grv_ni _U_uml_sch_e_act_n Eug_e_act_nio Eugen Eugene Eugeni Eugenijus Eugenio Eugeniu Eugeniusz Eujen Euken Euj_e_crn_n Ev_z_crn_en Evg_e_act_nios Evgeni Evgeniy Ewgyny Ja_u_brv_hien Ja_u_brv_hienij Oxenu Uchenio Ux_i_act_o Yauhen Yevgeniy } +eugene_male = { _E_act_ug_e_grv_ni _U_uml_sch_e_act_n Eug_e_act_nio Eugen Eugene Eugeni Eugenijus Eugenio Eugeniu Eugeniusz Eujen Euken Euj_e_crn_n Ev_z_crn_en Evg_e_act_nios Evgen Evgeni Evgeniy Evhen Evhen_i_hat_j Ewgyny Ja_u_brv_hien Ja_u_brv_hienij Oxenu Uchenio Ux_i_act_o Yauhen Yevgeniy } eulogius_male = { Evlogi } euphemius_male = { Yefim Yufimiy } eusebius_male = { Efs_e_act_vios Eus_e_act_bio Eusebi Eusebio } @@ -644,7 +643,7 @@ 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 } jonathan_male = { Gionata Johnafan Jonafan Jonaitain Jonat_a_act_n Jonatan Jonathan Jounatan Xonat_a_act_n Yona Yonathan } jordan_male = { 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_ Jose Joseba Josef Josep Joseph Josephus Josif Josip Josyff Joxe Jozeb Jozef Jozefo Juozapas Juozas Jusif Jusuf Juuso Osip Pino Pippo Schoseff Sepa Xos_e_act_ Yosif Yossef Youssef Yusuf Yusup Zef } +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_ 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 Yusuf Yusup Zef } josephalbert_male = { Chus_e_act__spc_Alberto Jos_e_act__spc_Alberto Xos_e_act__spc_Alberte Xos_e_act__spc_Albertu } josephandrew_male = { Chus_e_act__spc_Andr_e_act_s Jos_e_act__spc_Andr_e_act_s Xosu_e_act__spc_Andr_e_act_s } josephangel_male = { Chus_e_act__spc__A_act_nchel Jos_e_act__spc__A_act_ngel Joseba_spc_Gotzon Josep_spc__A_grv_ngel Xos_e_act__spc__A_act_nxel Xos_e_act__spc_Anxo } @@ -729,7 +728,7 @@ lionel_male = { Leonel Lionel Lionello Liounel Llyonyll Lyonyl } livio_male = { Livio Liviu } lloyd_male = { Lloydd Loydd } lothar_male = { Clotaire L_u_uml_ther Lota_r_act_ Lothar } -louis_male = { _L_crn_udov_i_act_t _L_stk_ud_z_act_ik Alo_i_act_sio Alois Aloisio Aloizs Alojz Alojzij Alojs Aloys Aloysius Aloyzas Koldo L_pst_udov_i_hat_t L_u_act__eth_v_i_act_k L_u_uml_i L_u_uml_k_a_grv_s L_u_uml_wwi Lew Lewis Liudas Liudvikas Llu_i_act_s Lluis Llywys Lo_i_act_s Lo_i_uml_c Lo_i_uml_g Lo_i_uml_s Lodewijk Lodovico Loeiz Lois_male Lojze Lou_i_uml_s Louis Love Lovis Lu_i_act_s Lud_e_crn_k Ludev_i_act_t Ludovic Ludovico Ludv_i_act_k Ludvig Ludw_i_grv_g Ludwig Lui Luizo Luigi Luigino Luis Luiz Lutz Lwddowyyc Lywys } +louis_male = { _L_crn_udov_i_act_t _L_stk_ud_z_act_ik Alo_i_act_sio Alois Aloisio Aloizs Alojz Alojzij Alojs Aloys Aloysius Aloyzas Koldo L_pst_udov_i_hat_t L_pst_udv_i_hat_v L_u_act__eth_v_i_act_k L_u_uml_i L_u_uml_k_a_grv_s L_u_uml_wwi Lew Lewis Liudas Liudvikas Llu_i_act_s Lluis Llywys Lo_i_act_s Lo_i_uml_c Lo_i_uml_g Lo_i_uml_s Lodewijk Lodovico Loeiz Lois_male Lojze Lou_i_uml_s Louis Love Lovis Lu_i_act_s Lud_e_crn_k Ludev_i_act_t Ludovic Ludovico Ludv_i_act_k Ludvig Ludw_i_grv_g Ludwig Lui Luizo Luigi Luigino Luis Luiz Lutz Lwddowyyc Lywys } louisalbert_male = { Lluis_spc_Albertu Lo_i_act_s_spc_Alberto Luis_spc_Alberto } louisangel_male = { Lluis_spc__A_act_nxel Lo_i_act_s_spc__A_act_nchel Lois_spc_Anxo } louisanthony_male = { Lluis_spc_Antoniu Lo_i_act_s_spc_Ant_o_act_n Luis_spc_Antonio } @@ -1088,12 +1087,12 @@ spartacus_male = { Spartak Spartakus } spencer_male = { Spynsyr } spiridon_male = { Sp_y_act_ros Spiridione Spiro Spyr_i_act_don } stafford_ryan_male = { Stafford Ryan } -stanislaus_male = { Estanislau Sta_n_ced_islavs Stane Stanis_l_stk_a_u_brv_ Stanis_l_stk_aw Stanij Stanish Stanislas Stanislav Stanislaw Stanislovas Staschko Stasys } +stanislaus_male = { Estanislau Sta_n_ced_islavs Stan_pst_islav Stane Stanis_l_stk_a_u_brv_ Stanis_l_stk_aw Stanij Stanish Stanislas Stanislav Stanislaw Stanislovas Staschko Stasys } stanley_hiram_male = { Stanley Hiram } stanley_male = { Stainlei Stanlyy } stavros_male = { Stavre Stavri } stein_male = { Steen Steinn Sten } -stephen_male = { _E_act_tienne _S_cma_tefan _S_crn_t_pst_epan _S_crn_tew S_c_act_e_crn_pan _S_crn_tefan _S_crn_tevan Est_e_grv_ve Est_e_hat_v_a_tld_o Esteban Estebe Estefan Esteve Estevo Etienne F_a_brv_nic_a_brv_ Isteban I_s_crn_tvan Shtjef_e_uml_n St_e_act_fanos St_e_act_phane St_e_grv_fann Staffan Staffe Steeven Stef Stef_a_act_n Stefan Stefano Steffan Steffen Stepas Stephan Stephanus Stephen Steponas Stev_c_crn_e Stev_c_crn_o Stevan Steve Steven Stevica Stevo Stivi Stjepan Stivjan Styffyn Tapani Teppo } +stephen_male = { _E_act_tienne _I_hat__s_crn_tvan _S_cma_tefan _S_crn_t_pst_epan _S_crn_tew S_c_act_e_crn_pan _S_crn_tefan _S_crn_tevan Est_e_grv_ve Est_e_hat_v_a_tld_o Esteban Estebe Estefan Esteve Estevo Etienne F_a_brv_nic_a_brv_ Isteban I_s_crn_tvan Shtjef_e_uml_n St_e_act_fanos St_e_act_phane St_e_grv_fann Staffan Staffe Steeven Stef Stef_a_act_n Stefan Stefano Steffan Steffen Stepas Stephan Stephanus Stephen Steponas Stev_c_crn_e Stev_c_crn_o Stevan Steve Steven Stevica Stevo Stivi Stjepan Stivjan Styffyn Tapani Teppo } stilyanos_male = { Stiliyan Stilyan } stoyan_male = { Stojan Stojan_c_crn_e Stole Stoyan Stoyanche Stoycho Stoyko } stuart_male = { Stewairt Stewart Stuart } @@ -1135,7 +1134,7 @@ theodoric_male = { Ddyryk Derek Derk Derrick Diderik Dideriko Diedrich Diederik theodosius_male = { Teodosi Teodosiy Tewdos Theod_o_act_sios } theophanus_male = { Theof_a_act_nis } theophilus_male = { Te_o_act_filo Teofil Teofil_pst_ Teofilis Teoufile The_o_act_filos Theophil Thyoffylus } -thomas_male = { Doma_s_crn_ Tamas Tama_s_crn_ T_o_act_mas Thom_a_act_s Thom_a_grv_ss Thoma Thomas Tom Tom_a_act__s_crn_ Tom_a_act_s Tom_a_grv_s_e_uml_ Tom_c_crn_e Tom_e_act_ Toma Toma_z_crn_ Tomais Tomas Tomaso Tomass Tomasz Tomaz Tome Tomi Tommaso Tommi Tommy Tomo Tomos Toms Toomas Toumas Tuomas Tuomo } +thomas_male = { Doma_s_crn_ Tamas Tama_s_crn_ T_o_act_mas Thom_a_act_s Thom_a_grv_ss Thoma Thomas Tom Tom_a_act__s_crn_ Tom_a_act_s Tom_a_grv_s_e_uml_ Tom_c_crn_e Tom_e_act_ Toma Toma_c_crn_ Toma_z_crn_ Tomais Tomas Tomaso Tomass Tomasz Tomaz Tome Tomi Tommaso Tommi Tommy Tomo Tomos Toms Toomas Toumas Tuomas Tuomo } thor_male = { _TH__o_act_r Thor Tor } thorbjorn_male = { Thorben Thorbj_o_stk_rn Thorbj_o_uml_rn Torben Torbj_o_stk_rn Torbj_o_uml_rn } thorgeir_male = { Terje Torgeir Torgjer Toke } diff --git a/common/culture/name_lists/NEOW_rusyn.txt b/common/culture/name_lists/NEOW_rusyn.txt index affca46c8..74c7e73f6 100644 --- a/common/culture/name_lists/NEOW_rusyn.txt +++ b/common/culture/name_lists/NEOW_rusyn.txt @@ -4,12 +4,16 @@ } dynasty_names = { + "dynn__S_crn_vorc" "dynn__Z_crn__i_hat_ro_s_crn_" "dynn_B_i_hat_l_pst_n_pst_a" + "dynn_Belej_c_crn_ak" + "dynn_Besk_i_hat_d" "dynn_Besk_i_hat_d" "dynn_Dan_i_hat_l_pst_uk" "dynn_Duchnovi_c_crn_" "dynn_Dul_i_hat_škov_i_hat_č" + "dynn_F_i_hat_l_i_hat_p" "dynn_Felde_s_crn__i_hat_" "dynn_Gerovskyj" "dynn_Haraks_i_hat_m" @@ -18,43 +22,61 @@ "dynn_Hran_c_crn_ak" "dynn_K_i_hat_mak" "dynn_Ka_c_crn_mar_c_crn_yk" + "dynn_Kon_pst_e_c_crn_ni" "dynn_Kondratov_i_hat__c_crn_" + "dynn_L_i_hat_bezn_pst_uk" "dynn_Labo_s_crn_" "dynn_Leleka_c_crn_" "dynn_Lend_pst_el" "dynn_Lu_c_crn_kaj" "dynn_Mago_c_crn_ij" "dynn_Mazurok" + "dynn_Medvid_pst_" "dynn_Murcko" + "dynn_Pastel_i_hat_j" + "dynn_Perfeckyj" + "dynn_Petrov" + "dynn_Pol_pst_anskyj" "dynn_Pop" + "dynn_Pu_s_crn_ka_s_crn_" + "dynn_R_i_hat_zn_i_hat__c_crn_" "dynn_Rak" + "dynn_Rudlov_c_crn_ak" + "dynn_Rusin_pst_ak" + "dynn_Seman" + "dynn_Skuban" + "dynn_Tka_c_crn_" + "dynn_Vajda" "dynn_Val_pst_kovskyj" "dynn_Vehe_s_crn_" "dynn_Zahajkevi_c_crn_" } male_names = { - _I_hat_van + _I_hat__s_crn_tvan _I_hat_van _S_crn_t_pst_epan - Aleksander Aleksej Antonij + Aleksander Aleksej Aleksij Andrej Antonij Bohdan D_i_hat_m_i_hat_trij Dm_i_hat_tro + Edvard Evgen Evhen Evhen_i_hat_j Fedor Ivan Jaroslav Jul_i_hat_j - L_pst_udov_i_hat_t + L_pst_udov_i_hat_t L_pst_udv_i_hat_v Leonid M_i_hat_cha_i_hat_l M_i_hat_chajlo M_i_hat_chal M_i_hat_kola M_i_hat_ron Nikolaj - Oleh - Pavel + Oleh Osif + Pavel Peter Petro Robert - Teofil_pst_ - V_i_hat_ktor Vlad_i_hat_m_i_hat_r + Stan_pst_islav + Teofil_pst_ Toma_c_crn_ + V_i_hat_ktor Vas_i_hat_l_pst_ Vlad_i_hat_m_i_hat_r Zoltan } female_names = { Anna - Marija + Marhar_i_mcn_ta Marija + Olena } patronym_suffix_male = "dynnpat_suf_ov_i_hat__c_crn_" diff --git a/common/landed_titles/finland.txt b/common/landed_titles/finland.txt index 7fe504189..4a462c6d6 100644 --- a/common/landed_titles/finland.txt +++ b/common/landed_titles/finland.txt @@ -65,6 +65,15 @@ e_finland = { } color = { 153 204 189 } } + b_sjeltie = { #Sjeltie (�sele) + province = 430 + + color = { 133 184 159 } + + cultural_names = { + name_list_NEOW_swedish = cn_asele + } + } } c_ubmejeiednuo = { #(Umeälven) color = { 30 42 76 } diff --git a/common/landed_titles/religious_titles.txt b/common/landed_titles/religious_titles.txt index 677dc0b14..62206508d 100644 --- a/common/landed_titles/religious_titles.txt +++ b/common/landed_titles/religious_titles.txt @@ -27,12 +27,13 @@ k_papal_state = { Benedictus Clemens Franciscus - Gregorius + Gabriel Gregorius Ignatius Innocentius Ioannes Ioannes-Paulus Josephus Leo Lucas - Marcus Maximilianus - Paulus Pius + Marcus Maximilianus Michael + Patricius Paulus Pius + Raphael Sarbelius Sixtus Thomas Urbanus diff --git a/common/landed_titles/scandinavia.txt b/common/landed_titles/scandinavia.txt index 15b7d607f..55b0f6ce0 100644 --- a/common/landed_titles/scandinavia.txt +++ b/common/landed_titles/scandinavia.txt @@ -411,235 +411,240 @@ e_scandinavia = { # Scandinavia c_vastmanland = { # Västmanland color = { 31 95 127 } - b_vaestraaros = { #V�straaros (V�ster�s) + b_vaestraaros = { # Västerås province = 346 - color = { 43 43 153 } - - cultural_names = { - name_list_norwegian = cn_vesteras - name_list_NEOW_danish = cn_vesteras - } } - b_arbuga = { #Arbug� (Arboga) + b_arbuga = { # Köping province = 347 - color = { 43 43 153 } } - b_skynzekkeberge = { #(Skinnskatteberg) + b_skynzekkeberge = { # Fagersta province = 348 - color = { 43 43 153 } } - b_fernabo = { #(V�sterf�rnebo) + b_fernabo = { # Sala province = 349 - color = { 43 43 153 } } } - c_narke = { #Neeric + c_narke = { # Örebro color = { 38 114 153 } - b_orabro = { - province = 327 #�rabro (�rebro) - + b_orabro = { # Örebro + province = 327 color = { 15 90 195 } } - b_riseberga = { + b_riseberga = { # Degerfors province = 328 - color = { 15 90 195 } } - b_noraskog = { + b_noraskog = { # Karlskoga province = 329 - color = { 15 90 195 } } } - c_dalabergslagen = { + c_dalabergslagen = { # Dalabergslagen color = { 25 76 102 } - b_falene = { #Falun + b_falene = { # Falun province = 350 - color = { 56 56 199 } } - b_norrbarke = { #Norrb䲫e + b_norrbarke = { # Borlänge province = 353 - color = { 56 56 199 } } - b_henamorum = { #Hedemora + b_henamorum = { # Avesta province = 345 - color = { 56 56 199 } } - b_leksand = { + b_leksand = { # Vansbro province = 8728 - color = { 56 56 199 } } } } - d_norrland = { color = { 38 101 191 } - capital = c_angermanland - c_medelpad = { + cultural_names = { + name_list_NEOW_icelander=cn_nor_eth_urland + name_list_NEOW_finnish=cn_norlanti + } + + c_medelpad = { # Medelpad color = { 35 95 178 } - b_seilanger = { #(Sel�nger) - province = 361 - - color = { 55 65 215 } - } - b_hafra = { #Hafr� (Haver�) - province = 362 - - color = { 55 65 215 } - } - b_lidh = { #(Liden) - province = 363 - - color = { 55 65 215 } - } - b_hedanger = { #(H�ggd�nger) + b_hedanger = { # Härnösand province = 364 - color = { 55 65 215 } + + cultural_names = { + name_list_sami=cn_h_i_uml_ernesaande + } + } + b_seilanger = { # Sundsvall + province = 361 + color = { 55 65 215 } + + cultural_names = { + name_list_sami=cn_sj_a_uml_dtavallie + } + } + b_hafra = { # Ånge + province = 362 + color = { 55 65 215 } + } + b_lidh = { # Liden + province = 363 + color = { 55 65 215 } + + cultural_names = { + name_list_sami=cn_h_i_uml_ernesaande + } } } c_angermanland = { #Angermannaland color = { 40 108 204 } - b_neteru = { #(N�tra) - province = 367 - color = { 30 55 185 } - } - b_solatumum = { #(Sollefte�) - province = 366 - - color = { 30 55 185 } - } - b_sioboradh = { #(S�br�) - province = 365 - - color = { 30 55 185 } - } - b_helgum = { # Helgum - province = 439 - - color = { 45 0 50 } - } - } - c_sjeltie = { - color = { 30 81 153 } cultural_names = { - name_list_NEOW_swedish = cn_asele + name_list_NEOW_icelander=cn_angurmannaland + name_list_NEOW_finnish=cn_angermanlanti } - b_sjeltie = { #Sjeltie (�sele) - province = 430 - - color = { 133 184 159 } + + b_sioboradh = { # Örnsköldsvik + province = 365 + color = { 30 55 185 } cultural_names = { - name_list_NEOW_swedish = cn_asele + name_list_sami=cn_orrestaare } - } - } + } + b_neteru = { # Husum + province = 367 + color = { 30 55 185 } + } + b_solatumum = { # Bredbyn + province = 366 + color = { 30 55 185 } + } + b_helgum = { # Sollefteå + province = 439 + color = { 45 0 50 } + + cultural_names = { + name_list_sami=cn_sjoelehte + } + } + } } - d_gavleborg = { - color = { 35 105 140 } + d_gavleborg = { # Gävleborg + color = { 15 85 160 } capital = c_gastrikland - c_gastrikland = { #Gestrikalandia + + c_gastrikland = { # Gästrikland color = { 31 95 127 } - b_gavle = { + cultural_names = { + name_list_NEOW_icelander=cn_gestrekaland + name_list_NEOW_finnish=cn_gestriklanti + } + + b_gavle = { # Gävle province = 354 - color = { 40 70 220 } + + cultural_names = { + name_list_sami=cn_tjarvetje + } } - b_oklabo = { #(Ockelbo) + b_oklabo = { # Ockelbo province = 355 - color = { 40 70 220 } } - b_odmarden = { #�dm�rden + b_odmarden = { # Sandviken province = 356 - color = { 40 70 220 } } } - c_halsingland = { + c_halsingland = { # Hälsingland color = { 38 114 153 } - b_norale = { #(Norrala) + cultural_names = { + name_list_NEOW_icelander=cn_helsingjaland + name_list_norwegian=cn_helsingland + name_list_NEOW_vestlandsk=cn_helsingland + name_list_NEOW_finnish=cn_helsinglanti + name_list_sami=cn_heelsege + } + + b_norale = { # Hudiksvall province = 360 - color = { 60 70 235 } } - b_baldanas = { #Baldan�s (Bolln�s) + b_baldanas = { # Bollnäs province = 357 - color = { 60 70 235 } } - b_farila = { #F�rila (F�rila) + b_farila = { # Edsbyn province = 358 - color = { 60 70 235 } } - b_dilsbo = { #(Delsbo) + b_dilsbo = { # Ljusdal province = 359 - color = { 60 70 235 } } } } d_varmland= { color = { 26 140 178 } - capital = c_varmland # Wysbu/Visby + capital = c_varmland # Värmland + + cultural_names = { + name_list_NEOW_icelander=cn_vermaland + name_list_NEOW_finnish=cn_v_a_uml_rmlanti + } + c_varmland = { color = { 22 120 153 } - b_tingvalla = { + cultural_names = { + name_list_NEOW_icelander=cn_vermaland + name_list_NEOW_finnish=cn_v_a_uml_rmlanti + } + + b_tingvalla = { # Karlstad province = 323 - color = { 18 57 153 } } - b_friskdal = { + b_friskdal = { # Sunne province = 324 - color = { 18 57 153 } } - b_vase = { #V�se + b_vase = { # Kristinehamn province = 326 - color = { 18 57 153 } } - b_farnebo = { #F�rnebo + b_farnebo = { # Filipstad province = 8739 - color = { 18 57 153 } } } - c_nordmark = { + c_nordmark = { # Nordmark color = { 30 160 204 } - b_nordmark = { + b_nordmark = { # Årjäng province = 8731 - color = { 30 70 235 } } - b_josse = { - province = 8732 - - color = { 30 70 235 } - } - b_gillberg = { + b_gillberg = { # Arvika province = 325 - + color = { 30 70 235 } + } + b_josse = { # Torsby + province = 8732 color = { 30 70 235 } } } diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_arnor_sceptre.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_arnor_sceptre.dds index 03cccf49f..33aa8d4ce 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_arnor_sceptre.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_arnor_sceptre.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:441ba9152a8b1dd730afa53ea1afa19555a6b3916171130fc64ef6ae7e57cf7a -size 667392 +oid sha256:ac7133ab0d5832fac7b4c92b885325fc749d15bd3097a3bf4c003586c22b26e5 +size 87536 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_meese_cabbossed.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_meese_cabbossed.dds new file mode 100644 index 000000000..0dc926991 --- /dev/null +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_meese_cabbossed.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f603d51e021e8909a7ad7a25b34b1f4be3a8723c3b51128bb9a907f9f69665cf +size 349680 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_coa_designer_emblems.txt b/gfx/coat_of_arms/colored_emblems/NEOW_coa_designer_emblems.txt index 1d6de1a39..93ab2d8ff 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_coa_designer_emblems.txt +++ b/gfx/coat_of_arms/colored_emblems/NEOW_coa_designer_emblems.txt @@ -92,6 +92,7 @@ NEOW_ce_lynx_rampant.dds = { colors = 3 category = animals } NEOW_ce_mackerel.dds = { colors = 3 category = animals } NEOW_ce_marten_passant.dds = { colors = 3 category = animals } NEOW_ce_meese.dds = { colors = 2 category = animals } +NEOW_ce_meese_cabbossed.dds = { colors = 3 category = animals } NEOW_ce_merlette.dds = { colors = 3 category = animals } NEOW_ce_microraptor.dds = { colors = 3 category = animals } NEOW_ce_nap_eagle.dds = { colors = 1 category = animals } diff --git a/gfx/map/map_object_data/activities.txt b/gfx/map/map_object_data/activities.txt index fb634eca7..008e3dc34 100644 --- a/gfx/map/map_object_data/activities.txt +++ b/gfx/map/map_object_data/activities.txt @@ -2113,19 +2113,19 @@ } { id=354 - position={ 1845.592407 0.000000 3911.896484 } + position={ 1848.396362 0.000000 3904.891846 } rotation={ -0.000000 -0.362976 -0.000000 0.931798 } scale={ 1.000000 1.000000 1.000000 } } { id=355 - position={ 1836.173706 0.000000 3929.272461 } + position={ 1835.086182 0.000000 3931.707031 } rotation={ -0.000000 -0.372738 -0.000000 0.927937 } scale={ 1.000000 1.000000 1.000000 } } { id=356 - position={ 1828.541382 0.000000 3922.722168 } + position={ 1824.460571 0.000000 3896.122314 } rotation={ -0.000000 -0.212241 -0.000000 0.977217 } 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 7dc65f4f0..5371f4c10 100644 --- a/gfx/map/map_object_data/building_locators.txt +++ b/gfx/map/map_object_data/building_locators.txt @@ -2113,19 +2113,19 @@ } { id=354 - position={ 1848.561768 0.000000 3906.126953 } + position={ 1851.622314 0.000000 3913.975098 } rotation={ -0.000000 -0.978770 -0.000000 0.204962 } scale={ 1.000000 1.000000 1.000000 } } { id=355 - position={ 1832.344238 0.000000 3935.035645 } + position={ 1829.392456 0.000000 3938.240234 } rotation={ -0.000000 -0.017984 -0.000000 -0.999838 } scale={ 1.000000 1.000000 1.000000 } } { id=356 - position={ 1815.288940 0.000000 3939.589844 } + position={ 1829.364502 0.000000 3908.557129 } rotation={ -0.000000 0.030685 -0.000000 0.999529 } 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 ee9fa366b..356a6c6b8 100644 --- a/gfx/map/map_object_data/combat_locators.txt +++ b/gfx/map/map_object_data/combat_locators.txt @@ -2119,19 +2119,19 @@ } { id=354 - position={ 1833.000000 0.000000 3911.000000 } + position={ 1842.834351 0.000000 3919.512451 } rotation={ -0.000000 -0.851195 -0.000000 0.524849 } scale={ 1.000000 1.000000 1.000000 } } { id=355 - position={ 1843.243652 0.000000 3943.350342 } + position={ 1831.079590 0.000000 3951.010986 } rotation={ -0.000000 -0.977410 -0.000000 -0.211350 } scale={ 1.000000 1.000000 1.000000 } } { id=356 - position={ 1830.531982 0.000000 3951.903809 } + position={ 1830.717651 0.000000 3902.958252 } rotation={ -0.000000 -0.996971 -0.000000 -0.077774 } 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 350185a96..c492cdfbd 100644 --- a/gfx/map/map_object_data/player_stack_locators.txt +++ b/gfx/map/map_object_data/player_stack_locators.txt @@ -2119,19 +2119,19 @@ } { id=354 - position={ 1851.743774 0.000000 3912.868408 } + position={ 1860.355957 0.000000 3913.431396 } rotation={ -0.000000 0.139743 -0.000000 0.990188 } scale={ 1.000000 1.000000 1.000000 } } { id=355 - position={ 1837.293091 0.000000 3938.284424 } + position={ 1841.807129 0.000000 3942.580322 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=356 - position={ 1814.727783 0.000000 3946.366211 } + position={ 1828.524292 0.000000 3917.236572 } rotation={ -0.000000 0.430248 -0.000000 0.902711 } 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 e73268b14..b66320456 100644 --- a/gfx/map/map_object_data/siege_locators.txt +++ b/gfx/map/map_object_data/siege_locators.txt @@ -2113,19 +2113,19 @@ } { id=354 - position={ 1838.924683 0.000000 3902.026855 } + position={ 1841.614868 0.000000 3908.294189 } rotation={ -0.000000 0.837750 -0.000000 0.546053 } scale={ 1.000000 1.000000 1.000000 } } { id=355 - position={ 1842.140503 0.000000 3932.802246 } - rotation={ -0.000000 -0.777937 -0.000000 0.628341 } + position={ 1820.951782 0.000000 3933.541260 } + rotation={ -0.000000 -0.867281 -0.000000 -0.497818 } scale={ 1.000000 1.000000 1.000000 } } { id=356 - position={ 1818.128174 0.000000 3931.124023 } + position={ 1832.470337 0.000000 3899.180420 } rotation={ -0.000000 0.988671 -0.000000 -0.150101 } scale={ 1.000000 1.000000 1.000000 } } diff --git a/history/provinces/e_finland.txt b/history/provinces/e_finland.txt index 920d1f0e6..8336c9278 100644 --- a/history/provinces/e_finland.txt +++ b/history/provinces/e_finland.txt @@ -13,6 +13,9 @@ 382 = { holding = none } +430 = { + holding = none +} ###c_ubmejeiednuo 428 = { culture = norrlandsk diff --git a/history/provinces/e_scandinavia.txt b/history/provinces/e_scandinavia.txt index 601224090..e58881bce 100644 --- a/history/provinces/e_scandinavia.txt +++ b/history/provinces/e_scandinavia.txt @@ -271,65 +271,41 @@ } ##d_norrland ###c_medelpad -361 = { +364 = { culture = norrlandsk religion = vaesenite holding = tribal_holding } +361 = { + holding = none +} 362 = { holding = none } 363 = { holding = none } -364 = { - holding = none -} ###c_angermanland +365 = { + holding = tribal_holding + culture = norrlandsk + religion = vaesenite +} 367 = { holding = tribal_holding - 1066.1.1 = { - culture = norrlandsk - } - 1085.1.1 = { - religion = vaesenite - } } 366 = { - culture = norse - religion = folketro - holding = tribal_holding - 1066.1.1 = { - culture = svealandsk - } - 1090.1.1 = { - religion = folketro - } -} -365 = { holding = none } 439 = { holding = none } -###c_sjeltie -430 = { - culture = norrlandsk - religion = vaesenite - holding = tribal_holding -} ##d_gavleborg ###c_gastrikland 354 = { - culture = norse - religion = folketro holding = tribal_holding - 1066.1.1 = { culture = svealandsk - } - 1085.1.1 = { religion = folketro - } } 355 = { holding = none diff --git a/holder for later/common/landed_titles/finland.txt b/holder for later/common/landed_titles/finland.txt index 33d048d32..0ede24d9a 100644 --- a/holder for later/common/landed_titles/finland.txt +++ b/holder for later/common/landed_titles/finland.txt @@ -15,7 +15,7 @@ e_finland = { } d_vasterbottena = { color = { 153 204 189 } - capital = c_sjeltie + capital = c_ubmeje cultural_names = { name_list_norwegian = cn_vasterbotten name_list_NEOW_swedish = cn_vasterbotten 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 8fd739e7d..b22f0c0ba 100644 --- a/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml +++ b/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml @@ -4323,7 +4323,6 @@ dynn_Petri_c_crn_:0 "Petrič" dynn_Petril_a_act_k:0 "Petrilák" dynn_Petrov:0 "Petrov" - dynn_Petrov:0 "Petrov" dynn_Petrovi_c_act_:0 "Petrović" dynn_Petrovikj:0 "Petrovikj" dynn_Petrovs:0 "Petrovs" @@ -6513,3 +6512,21 @@ dynn_Murcko:0 "Murcko" dynn_Mago_c_crn_ij:0 "Magočij" dynn_Gl_u_uml_cksburg:0 "Glücksburg" + dynn_Pastel_i_hat_j:0 "Pastelîj" + dynn_Perfeckyj:0 "Perfeckyj" + dynn_Perfeckyj:0 "Perfeckyj" + dynn_Pol_pst_anskyj:0 "Pol'anskyj" + dynn_Pu_s_crn_ka_s_crn_:0 "Puškaš" + dynn_Rudlov_c_crn_ak:0 "Rudlovčak" + dynn_Kon_pst_e_c_crn_ni:0 "Kon'ečni" + dynn_F_i_hat_l_i_hat_p:0 "Fîlîp" + dynn__S_crn_vorc:0 "Švorc" + dynn_L_i_hat_bezn_pst_uk:0 "Lîbezn'uk" + dynn_Medvid_pst_:0 "Medvid'" + dynn_R_i_hat_zn_i_hat__c_crn_:0 "Rîznîč" + dynn_Rusin_pst_ak:0 "Rusin'ak" + dynn_Skuban:0 "Skuban" + dynn_Tka_c_crn_:0 "Tkač" + dynn_Bab_i_hat_nec_pst_:0 "Babînec'" + dynn_Belej_c_crn_ak:0 "Belejčak" + dynn_Vajda:0 "Vajda" 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 7a412e587..b24647e03 100644 --- a/localization/english/replace/names/NEOW_character_names_l_english.yml +++ b/localization/english/replace/names/NEOW_character_names_l_english.yml @@ -19491,3 +19491,15 @@ M_i_hat_chal:0 "Mîchal" Niccol_o_grv_:0 "Niccolò" _E_act_tienne:0 "Étienne" + Evhen_i_hat_j:0 "Evhenîj" + Evhen:0 "Evhen" + Aleksij:0 "Aleksij" + _I_hat__s_crn_tvan:0 "Κtvan" + Stan_pst_islav:0 "Stan'islav" + L_pst_udv_i_hat_v:0 "L'udvîh" + Evgen:0 "Evgen" + Vas_i_hat_l_pst_:0 "Vasîl'" + Osif:0 "Osif" + Marhar_i_mcn_ta:0 "Marharîta" + Toma_c_crn_:0 "Tomaš" + Maiju:0 "Maiju" diff --git a/localization/english/replace/titles_cultural_names_l_english.yml b/localization/english/replace/titles_cultural_names_l_english.yml index a6ce1feaf..bbc60b176 100644 --- a/localization/english/replace/titles_cultural_names_l_english.yml +++ b/localization/english/replace/titles_cultural_names_l_english.yml @@ -4685,6 +4685,30 @@ cn_herjedaelie:0 "Herjedaelie" cn_herjedalen:0 "Herjedalen" cn_bienjedaelie:0 "Bienjedaelie" + ## Norrland + cn_nor_eth_urland:0 "Norðurland" + cn_norlanti:0 "Norlanti" + # Medelpad + cn_h_i_uml_ernesaande:0 "Hïernesaande" + cn_sj_a_uml_dtavallie:0 "Sjädtavallie" + # Angermanland/Ångermanland + cn_angermanlanti:0 "Angermanlanti" + cn_angurmannaland:0 "Angurmannaland" + cn_orrestaare:0 "Orrestaare" + cn_sjoelehte:0 "Sjoelehte" + ## Gavleborg/Gävleborg + # Gastrikland/Gästrikland + cn_gestrekaland:0 "Gestrekaland" + cn_gestriklanti:0 "Gestriklanti" + cn_tjarvetje:0 "Tjarvetje" + # Halsingland + cn_heelsege:0 "Heelsege" + cn_helsingjaland:0 "Helsingjaland" + cn_helsingland:0 "Helsingland" + cn_helsinglanti:0 "Helsinglanti" + ## Varmland/Värmland + cn_v_a_uml_rmlanti:0 "Värmlanti" + cn_vermaland:0 "Vermaland" # Custom (changed from default) title names: @@ -5223,8 +5247,6 @@ cn_onegaborg_adj:0 "Onegaborger" #Sweden - cn_vesteras:0 "Vesterås" - cn_vesteras_adj:0 "Vesteråser" cn_lodose_NORWDAN:0 "Lødøse" cn_lodose_NORWDAN_adj:0 "Lødøsean" cn_falkoping_NORW:0 "Falkøping" diff --git a/localization/english/replace/titles_l_english.yml b/localization/english/replace/titles_l_english.yml index d79506acf..2184723c1 100644 --- a/localization/english/replace/titles_l_english.yml +++ b/localization/english/replace/titles_l_english.yml @@ -3486,6 +3486,69 @@ # Vastmanland c_vastmanland:0 "Västmanland" c_vastmanland_adj:0 "Västmanlander" + b_vaestraaros:0 "Västerås" + b_arbuga:1 "Köping" + b_skynzekkeberge:0 "Fagersta" + b_fernabo:0 "Sala" + # Narke/Örebro + c_narke:0 "Örebro" + c_narke_adj:0 "Örebroan" + b_orabro:1 "Örebro" + b_riseberga:0 "Degerfors" + b_noraskog:0 "Karlskoga" + # Dalabergslagen + c_dalabergslagen:0 "Dalabergslagen" + c_dalabergslagen_adj:0 "Lower Dalecarlian" + b_falene:0 "Falun" + b_norrbarke:0 "Borlänge" + b_henamorum:0 "Avesta" + ## Norrland + d_norrland:0 "Norrland" + d_norrland_adj:0 "Norrlander" + # Medelpad + c_medelpad:0 "Medelpad" + c_medelpad_adj:0 "Medelpadian" + b_hedanger:0 "Hedanger" + b_seilanger:0 "Sundsvall" + b_hafra:0 "Ånge" + b_lidh:0 "Liden" + # Angermanland/Ångermanland + c_angermanland:1 "Ångermanland" + c_angermanland_adj:0 "Ångermanlander" + b_sioboradh:0 "Örnsköldsvik" + b_neteru:0 "Husum" + b_solatumum:0 "Bredbyn" + b_helgum:0 "Sollefteå" + ## Gavleborg/Gävleborg + d_gavleborg:0 "Gävleborg" + d_gavleborg_adj:0 "Gävleborgsk" + # Gastrikland/Gästrikland + c_gastrikland:0 "Gästrikland" + c_gastrikland_adj:0 "Gästriklander" + b_gavle:0 "Gävle" + b_oklabo:0 "Ockelbo" + b_odmarden:0 "Sandviken" + # Halsingland + c_halsingland:0 "Hälsingland" + c_halsingland_adj:0 "Hälsinglander" + b_norale:0 "Hudiksvall" + b_baldanas:0 "Bollnäs" + b_farila:0 "Edsbyn" + b_dilsbo:0 "Dilsbo" + ## Varmland/Värmland + d_varmland:0 "Värmland" + d_varmaland_adj:0 "Värmlandsk" + # Varmland/Värmland + c_varmland:1 "Värmland" + c_varmland_adj:0 "Värmlandsk" + b_tingvalla:0 "Karlstad" + b_friskdal:0 "Sunne" + b_vase:0 "Kristinehamn" + # Nordmark + c_nordmark:0 "Nordmark" + c_nordmark_adj:0 "Nordmarker" + b_nordmark:0 "Årjäng" + b_gillberg:0 "Arvika" # Custom (changed from default) title names: LOTHARINGIA:0 "$k_lotharingia$" @@ -4196,8 +4259,6 @@ b_arasikere:0 "Arasikere" b_arbil:0 "Arbil" b_arbinjan:0 "Arbinjan" - b_arboga:0 "Arboga" - b_arbuga:1 "Arboga" b_arca:0 "Arca" b_arcadia:0 "Arcadia" b_archa:0 "Archa" @@ -4548,7 +4609,6 @@ b_balasane:0 "Balasane" b_balashov:0 "Balashov" b_balassagyarmat:0 "Balassagyarmat" - b_baldanas:0 "Baldanäs" b_bale:0 "Bale" b_balemia:0 "Balemia" b_baleshvara:0 "Baleshvara" @@ -5969,7 +6029,6 @@ b_dikhil:0 "Dikhil" b_diksmuide:0 "Diksmuide" b_dilla:0 "Dilla" - b_dilsbo:0 "Dilsbo" b_dimapur:0 "Dimapur" b_dimona:0 "Dimona" b_dinan:0 "Dinan" @@ -6355,7 +6414,6 @@ b_faizabad:0 "Faizabad" b_fakala:0 "Fakala" b_falciu:0 "Falciu" - b_falene:0 "Falene" b_falesti:0 "Fălești" b_faliero:0 "Faliero" b_falkenberg:0 "Falkenberg" @@ -6378,7 +6436,6 @@ b_fareskur:0 "Fareskur" b_farfa:0 "Segni" b_farhajird:0 "Farhajird" - b_farila:0 "Färila" b_farim:0 "Farim" b_fariman:0 "Fariman" b_faris:0 "Faris" @@ -6417,7 +6474,6 @@ b_fermo:0 "Fermo" b_fermoselle:0 "Fermoselle" b_fermoy:0 "Fermoy" - b_fernabo:0 "Fernabo" b_ferrara:0 "Ferrara" b_ferreries:0 "Ferreries" b_ferrero:0 "Ferrero" @@ -6493,7 +6549,6 @@ b_friedland:0 "Friedland" b_friedrichshafen:0 "Friedrichshafen" b_frigento:0 "Frigento" - b_friskdal:0 "Friskdal" b_friuli:0 "Friuli" b_frombork:0 "Frombork" b_frontenhausen:0 "Frontenhausen" @@ -6610,7 +6665,6 @@ b_gauldala:1 "Gauldal" b_gaur:0 "Gaur" b_gavi:0 "Gavi" - b_gavle:0 "Gävle" b_gavrilovyam:0 "Gavrilov-Yam" b_gawilghar:0 "Gawilghar" b_gaya:0 "Gaya" @@ -6689,7 +6743,6 @@ b_gilat:0 "Gilat" b_gildehusen:0 "Gildehusen" b_gilgenburg:0 "Gilgenburg" - b_gillberg:0 "Gillberg" b_gilsland:0 "Gilsland" b_gimhathiththa:1 "Rayigama" b_gimsoy:0 "Gimsøy" @@ -6919,7 +6972,6 @@ b_hafaralbatin:0 "Hafar al Batin" b_haffouz:0 "Haffouz" b_hafn:0 "Copenhagen" - b_hafra:0 "Hafrä" b_hagelsrum:0 "Hagelsrum" b_hagenau:0 "Hagenau" b_hagenow:0 "Hagenow" @@ -7060,7 +7112,6 @@ b_hazart:0 "Hazart" b_hazretisuleymancamii:0 "Hazreti Suleyman Cami" b_hebron:0 "Hebron" - b_hedanger:0 "Hedanger" b_heddall:1 "Notodden" b_hede:0 "Hede" b_hedeby:0 "Hedeby" @@ -7076,7 +7127,6 @@ b_hejde:0 "Hejde" b_hejnum:0 "Hejnum" b_helen:0 "Helen" - b_helgum:0 "Helgum" b_heliopolis:0 "Heliopolis" b_hellin:0 "Hellín" b_helmstedt:0 "Helmstedt" @@ -7089,7 +7139,6 @@ b_hemambika:0 "Hemambika" b_hemavati:0 "Hemavati" b_hemse:0 "Hemse" - b_henamorum:0 "Henamorum" b_hennebont:0 "Hennebont" b_henrykow:0 "Henrykow" b_heraclea:0 "Heraclea" @@ -8669,7 +8718,6 @@ b_lichtensteig:0 "Lichtensteig" b_lida:0 "Lida" b_liden:0 "Liden" - b_lidh:0 "Lidh" b_lido:0 "Lido" b_lidoriki:0 "Lidoriki" b_lienz:0 "Lienz" @@ -9737,7 +9785,6 @@ b_nerva:0 "Nerva" b_nes:0 "Nes" b_nesvizh:0 "Nesvizh" - b_neteru:0 "Neteru" b_netza:0 "Netza" b_neue_weissenburg:0 "Neue Weissenburg" b_neuenburg:0 "Dobele" @@ -9810,8 +9857,6 @@ b_nok_kundi:0 "Nok Kundi" b_noor_bukhara:0 "Noor Bukhara" b_nora:0 "Nora" - b_norale:0 "Norale" - b_noraskog:0 "Noraskog" b_noravank:0 "Noravank" b_norberg:0 "Norberg" b_nordal:0 "Nordal" @@ -9820,12 +9865,10 @@ b_nordenham:0 "Nordenham" b_norderney:0 "Norderney" b_nordhausen:0 "Nordhausen" - b_nordmark:0 "Nordmark" b_nore:0 "Nore" b_norena:0 "Noreña" b_norham:0 "Norham" b_norrala:0 "Norrala" - b_norrbarke:0 "Norrbärke" b_norrkoping:0 "Norrköping" b_norrvidinge:0 "Norrvidinge" b_north_jaz_murian:0 "North Jaz Murian" @@ -9924,7 +9967,6 @@ b_oderzo:0 "Oderzo" b_odessa:1 "Khadjibey" b_odessos:0 "Odessos" - b_odmarden:0 "Ödmården" b_oescus:0 "Oescus" b_ofak:0 "Ofak" b_ofakim:0 "Ofakim" @@ -9938,7 +9980,6 @@ b_oirai:0 "Oirai" b_oivela_mariam:0 "Oivela Mariam" b_okic:0 "Okic" - b_oklabo:0 "Oklabo" b_okladnikowa:0 "Okladnikowa" b_oknist:0 "Oknist" b_okulovka:0 "Okulovka" @@ -9981,7 +10022,6 @@ b_opoczno:0 "Opoczno" b_opole:0 "Opole" b_optimatum:0 "Optimatum" - b_orabro:1 "Örebro" b_orahovica:0 "Orahovica" b_oran:0 "Oran" b_oranienburg:0 "Oranienburg" @@ -10821,7 +10861,6 @@ b_ringsted:0 "Ringsted" b_riqan:0 "Riqan" b_risan:0 "Risan" - b_riseberga:0 "Riseberga" b_rishabhdeo:0 "Rishabhdeo" b_rishikesh:0 "Rishikesh" b_rishton:0 "Rishton" @@ -11284,7 +11323,6 @@ b_segeberg:0 "Segeberg" b_segezha:0 "Segezha" b_segni:0 "Frosinone" - b_seilanger:0 "Seilanger" b_seiniai:0 "Seiniai" b_seiyun:0 "Seiyun" b_sejny:0 "Olecko" @@ -11543,7 +11581,6 @@ b_sinjcroat:1 "Sinj" b_sinkat:0 "Sinkat" b_sinope:0 "Sinope" - b_sioboradh:0 "Sioboradh" b_sioni:0 "Sioni" b_sipan:0 "Sipan" b_siponto:0 "Siponto" @@ -11616,7 +11653,6 @@ b_skorokhod:0 "Skorokhod" b_skrapar:0 "Fier" b_skulnas:0 "Skulnäs" - b_skynzekkeberge:0 "Skynzekkeberge" b_skyros:0 "Skyros" b_slagelse:0 "Slagelse" b_slakta:0 "Slakta" @@ -11657,7 +11693,6 @@ b_sokyrbulak:0 "Sokyr-Bulak" b_sol_hasan:0 "Sol Hasan" b_solak:0 "Solak" - b_solatumum:0 "Solatumum" b_soldaia:0 "Soldaia" b_soleb:0 "Soleb" b_soli:0 "Tuzla" @@ -12334,7 +12369,6 @@ b_tineo:0 "Tineo" b_tingevara:0 "Tingevara" b_tinghaugen:0 "Tinghaugen" - b_tingvalla:0 "Tingvalla" b_tingwall:0 "Tingwall" b_tinis:0 "Tinis" b_tinmallal:0 "Tinmallal" @@ -12752,7 +12786,6 @@ b_vadnagar:0 "Vadnagar" b_vadodara:0 "Vadodara" b_vadstena:0 "Vadstena" - b_vaestraaros:0 "Västraaros" b_vagan:1 "Vågan" b_vagay:0 "Vagay" b_vaghli:0 "Vaghli" @@ -12827,7 +12860,6 @@ b_varviai:0 "Varviai" b_varzaresti:0 "Varzaresti" b_varzuga:0 "Varzuga" - b_vase:0 "Väse" b_vashjird:0 "Vashjird" b_vasilyeva:0 "Vasilyeva" b_vaslui:0 "Vaslui" @@ -13573,8 +13605,6 @@ c_andernach_adj:0 "Andernacher" c_anfa:0 "Anfa" c_anfa_adj:0 "Anfan" - c_angermanland:1 "Ångermanland" - c_angermanland_adj:0 "Ångermanlander" c_anhalt:0 "Anhalt" c_anhalt_adj:0 "Anhaltian" c_ani:0 "Ani" @@ -14256,8 +14286,6 @@ c_gallura:0 "Gallura" c_gallura_adj:0 "Galluran" c_gao:0 "Gao" - c_gastrikland:0 "Gestrikalandia" - c_gastrikland_adj:0 "Gästriklander" c_gauda:0 "Gauda" c_gauda_adj:0 "Gaudan" c_gauldala:1 "Gauldal" @@ -14369,8 +14397,6 @@ c_hallstatt_adj:0 "Hallstatter" c_halogaland:0 "Nordland" c_halogaland_adj:0 "Nordlander" - c_halsingland:0 "Halsingland" - c_halsingland_adj:0 "Hälsinglander" c_hama:0 "Hama" c_hama_adj:0 "Haman" c_hamadan:0 "Hamadan" @@ -15004,8 +15030,6 @@ c_medantaka_adj:0 "Medantakan" c_medapata:0 "Medapata" c_medapata_adj:0 "Medapatan" - c_medelpad:0 "Medelpad" - c_medelpad_adj:0 "Medelpadian" c_medina:0 "Medina" c_medina_adj:0 "Medinan" c_medjerda:0 "Medjerda" @@ -15139,8 +15163,6 @@ c_narbonne_adj:0 "Narbonnian" c_narim:0 "Narim" c_narim_adj:0 "Narimian" - c_narke:0 "Örebro" - c_narke_adj:0 "Örebroan" c_narva:1 "Virumaa" c_narva_adj:1 "Virumaan" c_nasaiya:0 "Nasaiya" @@ -15679,8 +15701,6 @@ c_siwistan_adj:0 "Siwistan" c_sjaelland:2 "Sjælland" c_sjaelland_adj:0 "Sjællander" - c_sjeltie:0 "Åsele" - c_sjeltie_adj:0 "Åsele" c_skane:0 "Skåne" c_skane_adj:0 "Scanian" c_skopje:0 "Skopje" @@ -16071,8 +16091,6 @@ c_vardhamana_adj:0 "Vardhamana" c_varend:0 "Kronoberg" c_varend_adj:0 "Kronoberger" - c_varmland:1 "Värmaland" - c_varmland_adj:0 "Wermelandian" c_vas:0 "Vas" c_vas_adj:0 "Vasian" c_vaslui:0 "Vaslui" @@ -16887,8 +16905,6 @@ d_nobatia_adj:0 "Nobatia" d_nordgau:0 "Nordgau" d_nordgau_adj:0 "Nordgauer" - d_norrland:0 "Norrland" - d_norrland_adj:0 "Hälsinglander" d_norse_pagan_reformed_article:0 "the" d_norse_pagan_reformed:0 "Fylkirate" d_norse_pagan_reformed_adj:0 "Norse" @@ -25102,10 +25118,6 @@ c_sevede:0 "Västervik" c_sevede_adj:0 "Västerviker" - c_dalabergslagen:0 "Dalarna" - c_dalabergslagen_adj:0 "Darlarnan" - c_nordmark:0 "Nordmark" - c_nordmark_adj:0 "Nordmarkian" c_kinda:0 "Kinda" c_kinda_adj:0 "Kindan" c_skara:0 "Skara" @@ -25114,10 +25126,11 @@ b_kindaholm:0 "Kindaholm" b_stegholm:0 "Västervik" b_torsas:0 "Torsås" - b_leksand:0 "Leksand" b_grebo2:0 "Grebo" b_lima:0 "Lima" b_orsa:0 "Orsa" + b_leksand:0 "Vansbro" + #Additional Tibet & Xia k_zhangzhung:0 "Zhangzhung" @@ -25969,14 +25982,6 @@ b_carpentras:0 "Carpentras" b_apt:0 "Apt" - #### Sweden #### - ## Gavleborg - d_gavleborg:0 "Gävleborg" - d_gavleborg_adj:0 "Gävleborgsk" - ## Varmland - d_varmland:0 "Värmland" - d_varmaland_adj:0 "Värmlandsk" - #### Religion #### d_patriarch_dublin_article:0 "the " d_patriarch_dublin:0 "Patriarchate of Armagh" diff --git a/map_data/provinces.png b/map_data/provinces.png index 5cac8c894..582fc262e 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:ff39a6650cd573c962d26bb7b0d53ff21eb7f4b69313c71bae061bcb7e70dd00 -size 3367545 +oid sha256:2fb5b289fb2d0bfba14b036c0616b670b9cc482fa755df5a398758bf95a15dda +size 2650567