From ad45331c7835c63384bceddefdb768b753cea617 Mon Sep 17 00:00:00 2001 From: JulesFlammenkueche Date: Thu, 1 Oct 2026 13:35:33 +0200 Subject: [PATCH] more sapmi locs --- common/landed_titles/finland.txt | 194 +++++++++++++----- history/provinces/e_finland.txt | 4 +- .../titles_cultural_names_l_english.yml | 24 +++ .../english/replace/titles_l_english.yml | 60 +++--- map_data/definition.csv | 12 +- 5 files changed, 203 insertions(+), 91 deletions(-) diff --git a/common/landed_titles/finland.txt b/common/landed_titles/finland.txt index 77151aafb..6c2a4accb 100644 --- a/common/landed_titles/finland.txt +++ b/common/landed_titles/finland.txt @@ -442,87 +442,171 @@ e_finland = { } } } - d_giemajohka = { #(Kemi älv) + d_giemajohka = { # Eastern Lapland color = { 26 26 178 } - capital = c_giepma + capital = c_roavvenjarga # Rovaniemi + + cultural_names = { + name_list_NEOW_swedish=cn_ostra_lappland + name_list_NEOW_norwegian=cn_ostra_lappland + name_list_NEOW_vestlandsk=cn_ostra_lappland + name_list_NEOW_danish=cn_ostra_lappland + name_list_sami=cn_nuorta_s_a_act_pmi + name_list_NEOW_finnish=cn_it_a_uml__lapi + } - c_giepma = { #Kemi + c_roavvenjarga = { # Rovaniemi + color = { 30 30 204 } + + cultural_names = { + name_list_sami=cn_roavvenj_a_act_rga + } + + b_roavvenjarga = { # Rovaniemi + province = 8785 + color = { 210 240 255 } + + cultural_names = { + name_list_sami=cn_roavvenj_a_act_rga + } + } + b_suadigil = { # Sodankylä + province = 387 + color = { 210 240 255 } + + cultural_names = { + name_list_sami=cn_soa_d_stk_egilli + name_list_NEOW_pribaltiyskiy=cn_sodankyulya + name_list_NEOW_west_russian=cn_sodankyulya + } + } + b_kemijavri = { # Salla + province = 388 + color = { 210 240 255 } + } + b_sombio = { # Savukoski + province = 390 + color = { 130 125 245 } + + cultural_names = { + name_list_sami=cn_suovvaguoika + } + } + } + c_giepma = { # Kemi color = { 22 22 153 } - b_giempa = { #Kemi + + cultural_names = { + name_list_sami=cn_giepma + } + + b_giempa = { # Kemi province = 425 - color = { 210 220 255 } - } - b_kuusama = { + + cultural_names = { + name_list_sami=cn_giepma + } + } + b_maanselka = { # Ranua province = 8786 color = { 210 220 255 } } } - c_roavvenjarga = { - color = { 30 30 204 } - - b_roavvenjarga = { #Rovaniemi - province = 8785 - color = { 210 240 255 } - } - b_suadigil = { #Suádigil (Sodankylä) - province = 387 - - color = { 210 240 255 } - } - b_kemijavri = { #Kemijävri (Kemijärvi) - province = 388 - - color = { 210 240 255 } - } - b_sombio = { - province = 390 - - color = { 130 125 245 } - } - } - c_kittila = { + c_kittila = { # Kittilä color = { 19 19 127 } - - b_kittal = { - province = 385 - - color = { 143 194 249 } + + cultural_names = { + name_list_sami=cn_gihttel + name_list_NEOW_west_russian=cn_kittilya + name_list_NEOW_pribaltiyskiy=cn_kittilya } - b_suondavara = { - province = 384 + b_kittal = { # Kittilä + province = 385 + color = { 143 194 249 } + + cultural_names = { + name_list_sami=cn_gihttel + name_list_NEOW_west_russian=cn_kittilya + name_list_NEOW_pribaltiyskiy=cn_kittilya + } + } + b_suondavara = { # Muonio + province = 384 color = { 120 110 227 } + + cultural_names = { + name_list_sami=cn_muon_a_act_ + } } } - c_tornionlaakso = { + c_tornionlaakso = { # Tornio color = { 34 34 229 } - b_duortnus = { #(Torneå) - province = 424 - - color = { 130 130 190 } + + cultural_names = { + name_list_NEOW_swedish=cn_torne_a_rng_ + name_list_NEOW_norwegian=cn_torne_a_rng_ + name_list_NEOW_vestlandsk=cn_torne_a_rng_ + name_list_sami=cn_duortnus } - b_kangos = { + + b_duortnus = { # Tornio + province = 424 + color = { 130 130 190 } + + cultural_names = { + name_list_NEOW_swedish=cn_torne_a_rng_ + name_list_NEOW_norwegian=cn_torne_a_rng_ + name_list_NEOW_vestlandsk=cn_torne_a_rng_ + name_list_sami=cn_duortnus + } + } + b_kangos = { # Pello province = 8784 color = { 143 194 249 } } } - c_inari = { + c_inari = { # Inari color = { 15 15 102 } - - b_aanaarjavri = { #Aanaarjävri (Enare Träsk) - province = 391 - - color = { 120 160 205 } + + cultural_names = { + name_list_NEOW_swedish=cn_enare + name_list_NEOW_norwegian=cn_enare + name_list_NEOW_vestlandsk=cn_enare + name_list_sami=cn_aanaar } - b_suenekele = { + + b_suenekele = { # Ivalo province = 8788 color = { 120 160 205 } + + cultural_names = { + name_list_sami=cn_avveel + } } - b_laggujakka = { #Laggujåkka - province = 398 - + b_aanaarjavri = { # Inari + province = 391 color = { 120 160 205 } + + cultural_names = { + name_list_NEOW_swedish=cn_enare + name_list_NEOW_norwegian=cn_enare + name_list_NEOW_vestlandsk=cn_enare + name_list_sami=cn_aanaar + } + } + b_laggujakka = { # Utsjoki + province = 398 + color = { 120 160 205 } + + cultural_names = { + name_list_NEOW_norwegian=cn_utsjok + name_list_NEOW_vestlandsk=cn_utsjok + name_list_sami=cn_ohcejohka + name_list_NEOW_west_russian=cn_utsyoki + name_list_NEOW_pribaltiyskiy=cn_utsyoki + } } } } @@ -873,7 +957,7 @@ e_finland = { color = { 210 220 255 } } - b_maanselka = { #Maanselkä + b_kuusama = { #Maanselkä province = 420 color = { 15 10 150 } diff --git a/history/provinces/e_finland.txt b/history/provinces/e_finland.txt index 0f43f89a5..8f0f1251d 100644 --- a/history/provinces/e_finland.txt +++ b/history/provinces/e_finland.txt @@ -171,12 +171,12 @@ holding = none } ###c_inari -391 = { +8788 = { culture = sami religion = sami_pagan holding = tribal_holding } -8788 = { +391 = { holding = none } 398 = { diff --git a/localization/english/replace/titles_cultural_names_l_english.yml b/localization/english/replace/titles_cultural_names_l_english.yml index 12b356bb6..597c6bc58 100644 --- a/localization/english/replace/titles_cultural_names_l_english.yml +++ b/localization/english/replace/titles_cultural_names_l_english.yml @@ -5243,6 +5243,30 @@ cn_vesisaari:0 "Vesisaari" cn_pors_a_act_ng_gu:0 "Porsáŋgu" cn_porsanki:0 "Porsanki" + ## Giemajohka/Eastern Lapland + cn_it_a_uml__lapi:0 "Itä-Lapi" + cn_nuorta_s_a_act_pmi:0 "Nuorta-Sápmi" + cn_ostra_lappland:0 "Porsanki" + # Roavvenjarga/Rovaniemi + cn_roavvenj_a_act_rga:0 "Roavvenjárga" + cn_soa_d_stk_egilli:0 "Soađegilli" + cn_sodankyulya:0 "Sodankyulya" + cn_suovvaguoika:0 "Suovvaguoika" + # Giepma/Kemi + cn_giepma:0 "Giepma" + # Kittila/Kittilä + cn_gihttel:0 "Gihttel" + cn_kittilya:0 "Kittilya" + cn_muon_a_act_:0 "Muoná" + cn_duortnus:0 "Duortnus" + cn_torne_a_rng_:0 "Torneå" + # Inari + cn_aanaar:0 "Aanaar" + cn_enare:0 "Enare" + cn_avveel:0 "Avveel" + cn_ohcejohka:0 "Ohcejohka" + cn_utsjok:0 "Utsjok" + cn_utsyoki:0 "Utsyoki" # Custom (changed from default) title names: cn_bratislava:0 "Bratislava" diff --git a/localization/english/replace/titles_l_english.yml b/localization/english/replace/titles_l_english.yml index 331416dcf..8f01b787c 100644 --- a/localization/english/replace/titles_l_english.yml +++ b/localization/english/replace/titles_l_english.yml @@ -4155,8 +4155,40 @@ b_matta_varjjat:0 "Kirkenes" b_cahcesuolu:0 "Vadsø" b_porsangu:0 "Porsanger" + ## Giemajohka/Eastern Lapland + d_giemajohka:0 "Eastern Lapland" + d_giemajohka_adj:0 "Eastern Laplander" + # Roavvenjarga/Rovaniemi + c_roavvenjarga:0 "Rovaniemi" + c_roavvenjarga_adj:0 "Rovaniemeläinen" + b_roavvenjarga:0 "Rovaniemi" + b_suadigil:0 "Sodankylä" + b_kemijavri:0 "Salla" + b_sombio:0 "Savukoski" + # Giepma/Kemi + c_giepma:0 "Kemi" + c_giepma_adj:0 "Kemiläinen" + b_giempa:0 "Kemi" + b_maanselka:0 "Ranua" + # Kittila/Kittilä + c_kittila:0 "Kittilä" + c_kittila_adj:0 "Kittiläläinen" + b_kittal:0 "Kittal" + b_suondavara:0 "Muonio" + # Tornionlaakso/Tornio + c_tornionlaakso:0 "Tornio" + c_tornionlaakso_adj:0 "Torniolainen" + b_duortnus:0 "Tornio" + b_kangos:0 "Pello" + # Inari + c_inari:0 "Inari" + c_inari_adj:0 "Inarilainen" + b_suenekele:0 "Ivalo" + b_aanaarjavri:0 "Inari" + b_laggujakka:0 "Utsjoki" # Custom (changed from default) title names: + b_kuusama:0 "Kuusama" LOTHARINGIA:0 "$k_lotharingia$" LOTHARINGIA_adj:0 "$k_lotharingia_adj$" WEST_FRANCIA:0 "West Francia" @@ -4252,7 +4284,6 @@ b_aadel:0 "Aadel" b_aakirkeby:0 "Åkirkeby" b_aalst:0 "Aalst" - b_aanaarjavri:0 "Aanaarjävri" b_aardenburg:0 "Aardenburg" b_aarhus:0 "Aarhus" b_aarschot:0 "Aarschot" @@ -6730,7 +6761,6 @@ b_dunvegan:0 "Dunvegan" b_dunwich:0 "Dunwich" b_dunyveg:0 "Dunyveg" - b_duortnus:0 "Duortnus" b_duqm:0 "Duqm" b_durazzo:0 "Durrës" b_durdevac:0 "Durdevac" @@ -7259,7 +7289,6 @@ b_gibelet:0 "Gibelet" b_gibraleon:0 "Gibraleon" b_giecz:0 "Giecz" - b_giempa:0 "Giempa" b_gien:0 "Gien" b_giglio:0 "Giglio" b_gilan:0 "Gilan" @@ -8391,8 +8420,6 @@ b_kembolcha:0 "Kembolcha" b_kemer:0 "Kemer" b_kemi:0 "Kemi" - b_kemijarvi:0 "Kemijärvi" - b_kemijavri:0 "Kemijävri" b_kemir:0 "Kemir" b_kemnitz:0 "Kemnitz" b_kend-i-badam:0 "Kend-i-badam" @@ -8614,7 +8641,6 @@ b_kisszeben:0 "Kisszeben" b_kitezh:0 "Kitezh" b_kitka:0 "Kitka" - b_kittal:0 "Kittal" b_kiukainen:0 "Kiukainen" b_kiya:0 "Kiya" b_kiz:0 "Kiz" @@ -8993,7 +9019,6 @@ b_laft:0 "Laft" b_lagawa:0 "Lagawa" b_laggan:0 "Laggan" - b_laggujakka:0 "Laggujåkka" b_lagineta:0 "La Gineta" b_lagomera:0 "La Gomera" b_lagraciosa:0 "La Graciosa" @@ -9359,7 +9384,6 @@ b_maan:0 "Ma'an" b_maanalhasa:0 "Al-Hasa" b_maanaljafr:0 "Al-Jafr" - b_maanselka:0 "Maanselkä" b_maaratannuman:0 "Ma'arat an Numan" b_maasilinna:0 "Maasilinna" b_macerata:0 "Macerata" @@ -11332,7 +11356,6 @@ b_roudehen:0 "Roudehen" b_rouessa:0 "Rouessa" b_roumana:0 "Roumana" - b_rovaniemi:0 "Rovaniemi" b_rovereto:0 "Rovereto" b_rovigo:0 "Rovigo" b_roxburgh:0 "Roxburgh" @@ -12093,7 +12116,6 @@ b_somanathapura:0 "Somanathapura" b_somapura_mahavihara:0 "Somapura Mahavihara" b_somarama:0 "Somarama" - b_sombio:0 "Sombio" b_somero:0 "Somero" b_somna:0 "Sømna" b_somnath:0 "Somnath" @@ -12296,7 +12318,6 @@ b_stupovi:0 "Stupovi" b_stveit:0 "Sankt Veith" b_suada:0 "Suada" - b_suadigil:0 "Suádigil" b_suances:0 "Suances" b_suar:0 "Suar" b_subakh:0 "Subakh" @@ -12345,7 +12366,6 @@ b_sundsvall:0 "Sundsvall" b_sundyr:0 "Sundyr" b_suojarvi:0 "Suojärvi" - b_suondavara:0 "Soundavara" b_suonnjel:0 "Suo 'nnjel" b_suoparsaari:0 "Suoparsaari" b_suoyang:0 "Suoyang" @@ -16795,8 +16815,6 @@ d_ghana_adj:0 "Ghanan" d_ghur:0 "Ghur" d_ghur_adj:0 "Ghuri" - d_giemajohka:0 "Giemajohka" - d_giemajohka_adj:0 "Giemajohkan" d_gilan:0 "Gilan" d_glomacze:0 "Glomacze" d_glomacze_adj:0 "Glomacz" @@ -25160,24 +25178,16 @@ d_vuovdisamieana:0 "Vuovdisámieana" d_vuovdisamieana_adj:0 "Vuovdisámi" - c_kittila:0 "Kittila" - c_kittila_adj:0 "Kittilan" c_suondavara:0 "Suondavara" c_suondavara_adj:0 "Suondavaran" c_skolt:0 "Skolt" c_skolt_adj:0 "Skoltean" - c_inari:0 "Inari" - c_inari_adj:0 "Inariean" c_ter:0 "Ter" c_ter_adj:0 "Terean" c_kintus:0 "Kintuš" c_kintus_adj:0 "Kintušean" - b_kangos:0 "Kangos" - b_roavvenjarga:0 "Roavvenjárga" - b_kuusama:0 "Kuusama" b_kaddlhutt:0 "Käddlhutt" - b_suenekele:0 "Suenekele" b_skolt:0 "Skolt" b_peliza:0 "Peliza" b_varsiga:0 "Varsiga" @@ -25559,10 +25569,6 @@ ###NEOW Scandinavian Titles d_torniolaakso:0 "Torniolaakso" d_torniolaakso_adj:0 "Torniolaaksan" - c_giepma:0 "Giepma" - c_giepma_adj:0 "Giepman" - c_roavvenjarga:0 "Roavvenjárga" - c_roavvenjarga_adj:0 "Roavvenjárgan" e_turkey:0 "Türkiye" e_yugoslavia:0 "Jugoslavija" e_greece:0 "Makedonia" @@ -25650,8 +25656,6 @@ b_vidyayevo:0 "Vidyayevo" c_tersky:0 "Tersky" c_tersky_adj:0 "Terskian" - c_tornionlaakso:0 "Tornionlaakso" - c_tornionlaakso_adj:0 "Tornionlaaksan" 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 a6bc8940d..3e4ddca2f 100644 --- a/map_data/definition.csv +++ b/map_data/definition.csv @@ -382,13 +382,13 @@ 381;42;78;218;LAIS;x 382;84;81;91;VINDELN;x 383;126;84;219;TINGEVARA;x -384;168;87;92;SUONDAVARA;x +384;168;87;92;MUONIO;x 385;0;90;220;KITTAL;x 386;42;93;93;FROSO;x 387;84;96;221;SUADIGIL;x -388;126;99;94;KEMIJAVRI;x +388;126;99;94;SALLA;x 389;168;102;222;MORARNA;x -390;0;105;95;SOMBIO;x +390;0;105;95;SAVUKOSKI;x 391;42;108;223;AANAARJAVRI;x 392;84;111;96;PELDOJAVRI;x 393;126;114;224;TROMSØ;x @@ -418,7 +418,7 @@ 417;84;186;136;SOSNEVKE;x 418;126;189;9;KOULAJARVI;x 419;168;192;137;KITKA;x -420;0;195;10;MAANSELKA;x +420;0;195;10;KUUSAMO;x 421;42;198;138;JULEVU;x 422;84;201;11;BITON;x 423;126;204;139;KALIX;x @@ -8782,9 +8782,9 @@ 8781;50;144;218;MALÅ;x 8782;92;147;91;TALLVIK;x 8783;134;150;219;PAJALA;x -8784;176;153;92;Kangos;x +8784;176;153;92;PELLO;x 8785;8;156;220;Roavvenjarga;x -8786;50;159;93;Kuusama;x +8786;50;159;93;RANUA;x 8787;92;162;221;Kaddlhutt;x 8788;134;165;94;Suenekele;x 8789;176;168;222;Skolt;x