From a2684119f52cbbe4c88a0f4cfd4c7078c264ff46 Mon Sep 17 00:00:00 2001 From: JulesFlammenkueche Date: Thu, 8 Oct 2026 21:19:33 +0200 Subject: [PATCH] k_finland + karelia done --- .../name_equivalency/00_NEOW_female_names.txt | 2 +- .../name_lists/name_list_NEOW_bashkir.txt | 6 +- common/landed_titles/finland.txt | 174 +++++++++++++++--- .../zz_NEOW_character_names_l_english.yml | 4 +- .../zz_NEOW_dynasty_names_l_english.yml | 3 +- ...z_NEOW_titles_cultural_names_l_english.yml | 52 +++++- .../replace/zz_NEOW_titles_l_english.yml | 52 +++--- map_data/definition.csv | 8 +- 8 files changed, 238 insertions(+), 63 deletions(-) diff --git a/common/culture/name_equivalency/00_NEOW_female_names.txt b/common/culture/name_equivalency/00_NEOW_female_names.txt index 5d5c8c803..2c9482271 100644 --- a/common/culture/name_equivalency/00_NEOW_female_names.txt +++ b/common/culture/name_equivalency/00_NEOW_female_names.txt @@ -24,7 +24,7 @@ alfonsa_female = { Alfonsa Anfounsino } alice_female = { _A_act_ylis _A_grv_liss Ailice Al_i_act_cia Alica Alice Alicia Alicija Alicja Aliise Alis Alisa Alishia Alisia Alison Alix Alixe Alize Alizia Allycy Alycy } alima_female = { Alimat } alina_female = { Al_i_mcn_na Aliena Alin_a_uml_ Alina Aline Alino } -aliya_female = { _A_uml_liia _G_brv_aliia Galiy_a_uml_ } +aliya_female = { _A_uml_liia _G_brv__a_uml_li_a_uml_ _G_brv_aliia Galiy_a_uml_ } alyssa_justina_female = { Alyssa Justina } amaia_female = { Amaia Amaya } amanda_female = { Amanda Amandino Mandy } diff --git a/common/culture/name_lists/name_list_NEOW_bashkir.txt b/common/culture/name_lists/name_list_NEOW_bashkir.txt index 12ba60a54..da4f5463f 100644 --- a/common/culture/name_lists/name_list_NEOW_bashkir.txt +++ b/common/culture/name_lists/name_list_NEOW_bashkir.txt @@ -10,6 +10,7 @@ "dynn__G_brv__a_uml_limullin" "dynn__G_brv__a_uml_yfullin" "dynn__G_brv__a_uml_zizov" + "dynn__I_dot_ma_s_ced_ev" "dynn_Allayarov" "dynn_Ar_g_brv__i_dot_nbayev" "dynn_Ar_i_dot__s_act_lanov" @@ -36,12 +37,13 @@ M_o_uml_x_a_uml_m_a_uml_t R_a_uml__s_ced_it R_a_uml_wef Sabir - Zilf_a_uml_t + Zahir Zilf_a_uml_t } 1 = { _A_uml_xk_a_uml_metdin _G_brv__a_uml_bdelx_a_uml_mit _G_brv__a_uml_ysa _I_dot_ldarxan + _S_ced_akir N_a_uml_zif Qasim Rifx_a_uml_t @@ -50,6 +52,7 @@ } female_names = { 3 = { + _G_brv__a_uml_li_a_uml_ Ayg_o_uml_l Elmira Elwira G_o_uml_lnara @@ -58,6 +61,7 @@ } 2 = { Fl_u_uml_r_a_uml_ + L_a_uml_yl_a_uml_ Saji_z_act__a_uml_ Z_a_uml_yt_u_uml_n_a_uml_ } diff --git a/common/landed_titles/finland.txt b/common/landed_titles/finland.txt index 7a1e73f53..f8f55b45a 100644 --- a/common/landed_titles/finland.txt +++ b/common/landed_titles/finland.txt @@ -1760,84 +1760,210 @@ e_finland = { } } } - d_west_karelia = { + d_west_karelia = { # West Karelia color = { 140 50 50 } - c_viipuri = { + capital = c_viipuri # Vyborg + + cultural_names = { + name_list_sami=cn_oarje_cn_g_a_act_rjila + name_list_NEOW_estonian=cn_l_a_uml__a_uml_ne_karjala + name_list_NEOW_danish=cn_vestkarelen + name_list_NEOW_norwegian=cn_vest_karelen + name_list_NEOW_vestlandsk=cn_vest_karelen + name_list_NEOW_swedish=cn_v_a_uml_stkarelen + name_list_NEOW_finnish=cn_l_a_uml_nsi_karjala + #name_list_NEOW_karelian=cn_l_a_uml_nsi_karjala + #name_list_NEOW_veps=cn_l_a_uml_nsi_karjala + name_list_NEOW_west_russian=cn_zapadnaya_kareliya + name_list_NEOW_pribaltiyskiy=cn_zapadnaya_kareliya + } + + c_viipuri = { # Vyborg color = { 153 55 55 } + + cultural_names = { + name_list_NEOW_estonian=cn_viiburi + name_list_NEOW_swedish=cn_viborg + name_list_NEOW_finnish=cn_viipuri + #name_list_NEOW_karelian=cn_viipuri + #name_list_NEOW_veps=cn_viipur + } - b_viipuri = { + b_viipuri = { # Vyborg province = 182 color = { 230 200 10 } + + cultural_names = { + name_list_NEOW_estonian=cn_viiburi + name_list_NEOW_swedish=cn_viborg + name_list_NEOW_finnish=cn_viipuri + #name_list_NEOW_karelian=cn_viipuri + #name_list_NEOW_veps=cn_viipur + } } - b_koivisto = { + b_koivisto = { # Roshchino province = 173 color = { 220 160 50 } - } + + cultural_names = { + name_list_NEOW_estonian=cn_ro_s_crn_t_s_crn_ino + name_list_NEOW_swedish=cn_raivola + name_list_NEOW_finnish=cn_raivola + #name_list_NEOW_karelian=cn_raivola + #name_list_NEOW_veps=cn_raivola + } + } } - c_sortavala = { + c_sortavala = { # Sortavala color = { 127 45 45 } - - b_sortavala = { + b_sortavala = { # Sortavala province = 174 color = { 220 140 20 } + + cultural_names = { + name_list_NEOW_swedish=cn_sordavala + #name_list_NEOW_karelian=cn_sortaval + #name_list_NEOW_veps=cn_sortaval + } } b_kidila = { # Pitkyaranta province = 191 color = { 220 140 20 } + + cultural_names = { + name_list_NEOW_estonian=cn_pitk_a_uml_ranta + name_list_NEOW_danish=cn_pitk_a_uml_ranta + name_list_NEOW_norwegian=cn_pitkjaranta + name_list_NEOW_vestlandsk=cn_pitkjaranta + name_list_NEOW_swedish=cn_pitk_a_uml_ranta + name_list_NEOW_finnish=cn_pitk_a_uml_ranta + #name_list_NEOW_karelian=cn_pitkyrandu + #name_list_NEOW_veps=cn_pit_pst_krand + } } - b_tovajarvi = { + b_tovajarvi = { # Vyartsilya province = 200 color = { 220 140 20 } + + cultural_names = { + name_list_NEOW_estonian=cn_v_a_uml_rtsil_a_uml_ + name_list_NEOW_finnish=cn_v_a_uml_rtsil_a_uml_ + #name_list_NEOW_karelian=cn_v_a_uml_rtsil_a_uml_ + } } } - c_joensuu = { + c_joensuu = { # Joensuu color = { 178 64 64 } - b_joensuu = { + + cultural_names = { + #name_list_NEOW_karelian=cn_jovensuu + #name_list_NEOW_veps=cn_jogensu + name_list_NEOW_west_russian=cn_yoensuu + name_list_NEOW_pribaltiyskiy=cn_yoensuu + } + + b_joensuu = { # Joensuu province = 204 color = { 220 140 20 } + + cultural_names = { + #name_list_NEOW_karelian=cn_jovensuu + #name_list_NEOW_veps=cn_jogensu + name_list_NEOW_west_russian=cn_yoensuu + name_list_NEOW_pribaltiyskiy=cn_yoensuu + } } - b_kitee = { + b_kitee = { # Kitee province = 203 color = { 250 80 10 } + + cultural_names = { + name_list_NEOW_norwegian=cn_kides + name_list_NEOW_vestlandsk=cn_kides + name_list_NEOW_swedish=cn_kides + } } - b_pielinen = { + b_pielinen = { # Nurmes province = 449 color = { 230 65 35 } } } - c_kakisalmi = { + c_kakisalmi = { # Priozersk color = { 102 36 36 } + + cultural_names = { + name_list_NEOW_swedish=cn_kexholm + name_list_NEOW_finnish=cn_k_a_uml_kisalmi + #name_list_NEOW_karelian=cn_k_a_uml_g_o_uml_isalmi + } - b_kakisalmi = { + b_kakisalmi = { # Priozersk province = 172 color = { 220 160 50 } + + cultural_names = { + name_list_NEOW_swedish=cn_kexholm + name_list_NEOW_finnish=cn_k_a_uml_kisalmi + #name_list_NEOW_karelian=cn_k_a_uml_g_o_uml_isalmi + } } - b_rautu = { + b_rautu = { # Sosnovo province = 171 color = { 220 160 50 } + + cultural_names = { + name_list_NEOW_swedish=cn_rautus + name_list_NEOW_estonian=cn_rautu + name_list_NEOW_finnish=cn_rautu + #name_list_NEOW_karelian=cn_rautu + } } } - - c_kymmenlaakso = { + c_kymmenlaakso = { # Kymenlaakso color = { 204 73 73 } - b_vehkalahti = { + + cultural_names = { + name_list_sami=cn_kymileagi + name_list_NEOW_danish=cn_kymmenedalen + name_list_NEOW_norwegian=cn_kymmenedalen + name_list_NEOW_vestlandsk=cn_kymmenedalen + name_list_NEOW_swedish=cn_kymmenedalen + name_list_NEOW_west_russian=cn_kyumenlaakso + name_list_NEOW_pribaltiyskiy=cn_kyumenlaakso + #name_list_NEOW_veps=cn_k_u_uml_menlakso + } + + b_vehkalahti = { # Kouvola province = 197 color = { 220 130 0 } - + + cultural_names = { + #name_list_NEOW_veps=cn_kouvol + } } - b_parikkala = { + b_parikkala = { # Imatra province = 181 color = { 230 200 10 } + + cultural_names = { + #name_list_NEOW_veps=cn_imatr + } } - b_savitaipale = { + b_savitaipale = { # Lappeenranta province = 187 color = { 230 200 10 } - } + + cultural_names = { + name_list_NEOW_norwegian=cn_villmanstrand + name_list_NEOW_vestlandsk=cn_villmanstrand + name_list_NEOW_swedish=cn_villmanstrand + #name_list_NEOW_veps=cn_lapenrand + } + } } } } - k_arkhangelsk = { color = { 188 238 234 } diff --git a/localization/english/replace/zz_NEOW_character_names_l_english.yml b/localization/english/replace/zz_NEOW_character_names_l_english.yml index 2ad2b10db..fe55013a3 100644 --- a/localization/english/replace/zz_NEOW_character_names_l_english.yml +++ b/localization/english/replace/zz_NEOW_character_names_l_english.yml @@ -21374,4 +21374,6 @@ Z_a_uml_yt_u_uml_n_a_uml_:0 "Zäytünä" N_a_uml_bil_a_uml_:0 "Näbilä" _G_brv__a_uml_bdelx_a_uml_mit:0 "Ğäbdelxämit" - Ban_i_dot_w:0 "Banıw" \ No newline at end of file + Ban_i_dot_w:0 "Banıw" + Zahir:0 "Zahir" + _G_brv__a_uml_li_a_uml_:0 "Ğäliä" \ No newline at end of file diff --git a/localization/english/replace/zz_NEOW_dynasty_names_l_english.yml b/localization/english/replace/zz_NEOW_dynasty_names_l_english.yml index 0130d89b0..fc47edc5f 100644 --- a/localization/english/replace/zz_NEOW_dynasty_names_l_english.yml +++ b/localization/english/replace/zz_NEOW_dynasty_names_l_english.yml @@ -8343,4 +8343,5 @@ dynn_Ar_i_dot__s_act_lanov:0 "Arıślanov" dynn__G_brv__a_uml_yfullin:0 "Ğäyfullin" dynn__G_brv__a_uml_zizov:0 "Ğäzizov" - dynn_W_a_uml_litov:0 "Wälitov" \ No newline at end of file + dynn_W_a_uml_litov:0 "Wälitov" + dynn__I_dot_ma_s_ced_ev:0 "İmaşev" \ No newline at end of file diff --git a/localization/english/replace/zz_NEOW_titles_cultural_names_l_english.yml b/localization/english/replace/zz_NEOW_titles_cultural_names_l_english.yml index fd863be6f..4f97addf1 100644 --- a/localization/english/replace/zz_NEOW_titles_cultural_names_l_english.yml +++ b/localization/english/replace/zz_NEOW_titles_cultural_names_l_english.yml @@ -5446,6 +5446,50 @@ cn_sege_z_crn_:0 "Segež" cn_sege_z_crn_a:0 "Segeža" cn_sege_z_crn_u:0 "Segežu" + ## West Karelia + cn_l_a_uml__a_uml_ne_karjala:0 "Lääne-Karjala" + cn_l_a_uml_nsi_karjala:0 "Länsi-Karjala" + cn_oarje_cn_g_a_act_rjila:0 "Oarje-Gárjila" + cn_v_a_uml_stkarelen:0 "Västkarelen" + cn_vest_karelen:0 "Vest-Karelen" + cn_vestkarelen:0 "Vestkarelen" + cn_zapadnaya_kareliya:0 "Zapadnaya Kareliya" + # Viipuri/Vyborg + cn_viborg:0 "Viborg" + cn_viiburi:0 "Viiburi" + cn_viipur:0 "Viipur" + cn_viipuri:0 "Viipuri" + cn_raivola:0 "Raivola" + cn_ro_s_crn_t_s_crn_ino:0 "Roštšino" + # Sortavala + cn_sordavala:0 "Sordavala" + cn_sortaval:0 "Sortaval" + cn_pit_pst_krand:0 "Pit'krand" + cn_pitk_a_uml_ranta:0 "Pitkäranta" + cn_pitkjaranta:0 "Pitkjaranta" + cn_pitkyrandu:0 "Pitkyrandu" + cn_v_a_uml_rtsil_a_uml_:0 "Värtsilä" + # Joensuu + cn_jogensu:0 "Jogensu" + cn_jovensuu:0 "Jovensuu" + cn_yoensuu:0 "Yoensuu" + cn_kides:0 "Kides" + # Kakisalmi/Priozersk + cn_k_a_uml_g_o_uml_isalmi:0 "Kägöisalmi" + cn_k_a_uml_kisalmi:0 "Käkisalmi" + cn_kexholm:0 "Kexholm" + cn_kexholm_adj:0 "Kexholmer" + cn_rautu:0 "Rautu" + cn_rautus:0 "Rautus" + # Kymmenlaakso/Kymenlaakso + cn_k_u_uml_menlakso:0 "Kümenlakso" + cn_kymileagi:0 "Kymileagi" + cn_kymmenedalen:0 "Kymmenedalen" + cn_kyumenlaakso:0 "Kyumenlaakso" + cn_kouvol:0 "Kouvol" + cn_imatr:0 "Imatr" + cn_lapenrand:0 "Lapenrand" + cn_villmanstrand:0 "Villmanstrand" # Custom (changed from default) title names: cn_bratislava:0 "Bratislava" @@ -5951,20 +5995,12 @@ cn_pedersore_adj:0 "Pedersörer" cn_korsholm:0 "Korsholm" cn_korsholm_adj:0 "Korsholmer" - cn_kexholm:0 "Kexholm" - cn_kexholm_adj:0 "Kexholmer" cn_korela:0 "Korela" cn_korela_adj:0 "Korelan" cn_bjorko:0 "Björkö" cn_bjorko_adj:0 "Björköer" cn_beryozovskoye:0 "Beryozovskoye" cn_beryozovskoye_adj:0 "Beryozovskoyian" - cn_viborg:0 "Viborg" - cn_viborg_adj:0 "Viborgian" - cn_wiborg:0 "Wiborg" - cn_wiborg_adj:0 "Wiborgian" - cn_viiburi:0 "Viiburi" - cn_viiburi_adj:0 "Viiburian" cn_sordavala:0 "Sordavala" cn_sordavala_adj:0 "Sordavalan" cn_serdovol:0 "Serdovol" diff --git a/localization/english/replace/zz_NEOW_titles_l_english.yml b/localization/english/replace/zz_NEOW_titles_l_english.yml index a35567af5..8946aff36 100644 --- a/localization/english/replace/zz_NEOW_titles_l_english.yml +++ b/localization/english/replace/zz_NEOW_titles_l_english.yml @@ -4359,6 +4359,35 @@ b_lizmajarvi:0 "Medvezhyegorsk" b_vatselanjarvi:0 "Porosozero" b_seesjarvi:0 "Segezha" + ## West Karelia + d_west_karelia:0 "West Karelia" + d_west_karelia_adj:0 "West Karelian" + # Viipuri/Vyborg + c_viipuri:0 "Viipuri" + c_viipuri_adj:0 "Viipurian" + b_koivisto:0 "Koivisto" + # Sortavala + c_sortavala:0 "Sortavala" + c_sortavala_adj:0 "Sortavalainen" + b_kidila:0 "Pitkyaranta" + b_tovajarvi:0 "Vyartsilya" + # Joensuu + c_joensuu:0 "Joensuu" + c_joensuu_adj:1 "Joensuulainen" + b_joensuu:0 "Joensuu" + b_kitee:0 "Kitee" + b_pielinen:0 "Nurmes" + # Kakisalmi/Priozersk + c_kakisalmi:0 "Priozersk" + c_kakisalmi_adj:0 "Priozerets" + b_kakisalmi:0 "Priozersk" + b_rautu:0 "Sosnovo" + # Kymmenlaakso/Kymenlaakso + c_kymmenlaakso:0 "Kymenlaakso" + c_kymmenlaakso_adj:1 "Kymenlaaksolainen" + b_vehkalahti:0 "Kouvola" + b_parikkala:0 "Imatra" + b_savitaipale:0 "Lappeenranta" # Custom (changed from default) title names: LOTHARINGIA:0 "$k_lotharingia$" @@ -8323,7 +8352,6 @@ b_kakath:0 "Kakath" b_kakhesasan:0 "Kakhesasan" b_kakinada:0 "Kakinada" - b_kakisalmi:0 "Kakisalmi" b_kalaatderat:0 "Kalaat Derat" b_kalabagh:0 "Kalabagh" b_kalaberd:0 "Kalaberd" @@ -8737,7 +8765,6 @@ b_kicevo:0 "Gostivar" b_kichkas:0 "Kichkas" b_kidal:0 "Kidal" - b_kidila:0 "Kidila" b_kidwelly:0 "Kidwelly" b_kielce:0 "Kielce" b_kiev:1 "Kyiv" @@ -8853,7 +8880,6 @@ b_kohat:0 "Kohat" b_kohir:0 "Kohir" b_kohlu:0 "Kohlu" - b_koivisto:0 "Koivisto" b_kojoor:0 "Kojoor" b_kokahdan:0 "Kokahdan" b_kokenhusen:0 "Kokenhus" @@ -10785,7 +10811,6 @@ b_pardubice:0 "Pardubice" b_pargar:0 "Pargar" b_parihasapura:0 "Parihasapura" - b_parikkala:0 "Parikkala" b_parivi:0 "Parivi" b_parma:0 "Parma" b_parnakheta:0 "Parnakheta" @@ -10911,7 +10936,6 @@ b_piatigorie:0 "Piatigorié" b_piatra_neamnt:0 "Piatra Neamț" b_piedra:0 "Piedra" - b_pielinen:0 "Pielinen" b_pienza:0 "Pienza" b_pieszew:0 "Pieszew" b_pigai:0 "Pigai" @@ -11338,7 +11362,6 @@ b_ratibor:0 "Jastrzębie-Zdrój" b_ratu:0 "Ratu" b_rauna:0 "Rauna" - b_rautu:0 "Rautu" b_ravansar:0 "Ravansar" b_ravendan:0 "Ravendan" b_ravenna:0 "Ravenna" @@ -11826,7 +11849,6 @@ b_sauveterre:0 "Sauveterre" b_savarinarayana:0 "Savarinarayana" b_savigliano:0 "Savigliano" - b_savitaipale:0 "Savitaipale" b_savona:0 "Savona" b_savosusa:0 "Susa" b_savra:0 "Elbasan" @@ -12984,7 +13006,6 @@ b_tournoel:0 "Tournoël" b_tournon:0 "Tournon" b_tournus:0 "Tournus" - b_tovajarvi:0 "Tovajärvi" b_tovis:0 "Tövis" b_towhid:0 "Towhid" b_toya:0 "Toya" @@ -13366,7 +13387,6 @@ b_veere:0 "Veere" b_veglia:0 "Veglia" b_vehari:0 "Vehari" - b_vehkalahti:0 "Vehkalahti" b_veiga:0 "Veiga" b_vejalkot:0 "Vejalkot" b_velbazhd:0 "Velbazhd" @@ -14960,8 +14980,6 @@ c_kairwan_adj:0 "Kairwanian" c_kakheti:0 "Kakheti" c_kakheti_adj:0 "Kakhetian" - c_kakisalmi:0 "Kakisalmi" - c_kakisalmi_adj:0 "Kakisalmian" c_kalanjara:0 "Kalanjara" c_kalanjara_adj:0 "Kalanjaran" c_kalat:0 "Qalāt" @@ -16065,8 +16083,6 @@ c_sopron_adj:0 "Sopronian" c_soroca:0 "Soroca" c_soroca_adj:0 "Sorocan" - c_sortavala:0 "Sortavala" - c_sortavala_adj:0 "Sortavalian" c_souf:0 "Souf" c_souf_adj:0 "Soufi" c_sous:0 "Sous" @@ -16462,8 +16478,6 @@ c_vidisa_adj:0 "Vidisa" c_limbazi:1 "Limbaži" c_limbazi_adj:1 "Limbažian" - c_viipuri:0 "Viipuri" - c_viipuri_adj:0 "Viipurian" c_vijayapura:0 "Vijayapura" c_vijayapura_adj:0 "Vijayapuran" c_vijayawada:0 "Vijayawada" @@ -25680,16 +25694,8 @@ #### Finland #### - c_kymmenlaakso:0 "Kymmenlaakso" - c_kymmenlaakso_adj:1 "Kymmenlaakso" - c_joensuu:0 "Joensuu" - c_joensuu_adj:1 "Joensuu" b_pori:0 "Pori" b_rauma:0 "Rauma" - b_joensuu:0 "Joensuu" - b_kitee:0 "Kitee" - d_west_karelia:0 "West Karelia" - d_west_karelia_adj:0 "West Karelian" diff --git a/map_data/definition.csv b/map_data/definition.csv index bacab2da4..48691a140 100644 --- a/map_data/definition.csv +++ b/map_data/definition.csv @@ -171,7 +171,7 @@ 170;0;84;85;NOTEBORG;x 171;42;87;213;RAUTU;x 172;84;90;86;KAKISALMI;x -173;126;93;214;KOIVISTO;x +173;126;93;214;ROSHCHINO;x 174;168;96;87;SORTAVALA;x 175;0;99;215;PORVOO;x 176;42;102;88;ESPOO;x @@ -179,13 +179,13 @@ 178;126;108;89;SALO;x 179;168;111;217;TURKU;x 180;0;114;90;UUSIKAUPUNKI;x -181;42;117;218;PARIKKALA;x +181;42;117;218;IMATRA;x 182;84;120;91;VIIPURI;x 183;126;123;219;LIINMAA;x 184;168;126;92;TELJA;x 185;0;129;220;ULVILA;x 186;42;132;93;PIRKKALA;x -187;84;135;221;SAVITAIPALE;x +187;84;135;221;LAPPEENRANTA;x 188;126;138;94;MIKKELI;x 189;168;141;222;SULKAVA;x 190;0;144;95;OLAVINLINNA;x @@ -195,7 +195,7 @@ 194;168;156;97;SEGEZHA;x 195;0;159;225;ONEGABORG;x 196;42;162;98;SOUTJARVI;x -197;84;165;226;VEHKALAHTI;x +197;84;165;226;KOUVOLA;x 198;126;168;99;KONDOPOGA;x 199;168;171;227;MEDVEZHYEGORSK;x 200;0;174;0;TOVAJARVI;x