From 4d4ded667be3ceecfbe6679af7b5d335a25bfd6a Mon Sep 17 00:00:00 2001 From: JulesFlammenkueche Date: Sat, 3 Oct 2026 22:39:36 +0200 Subject: [PATCH] modernization and CoAs around the Baltic and Finland --- .../coat_of_arms/NEOW_landed_titles.txt | 387 ------------- common/coat_of_arms/coat_of_arms/baltic.txt | 379 +++++++++++++ common/coat_of_arms/coat_of_arms/finland.txt | 515 +++++++++++++++++- common/landed_titles/britannia.txt | 10 +- common/landed_titles/finland.txt | 427 +++++++++++---- .../colored_emblems/NEOW_ce_afghanseal.dds | 4 +- .../colored_emblems/NEOW_ce_allahflower.dds | 4 +- .../colored_emblems/NEOW_ce_aurora.dds | 3 + .../colored_emblems/NEOW_ce_gondor_star.dds | 4 +- .../colored_emblems/NEOW_ce_gondor_tree.dds | 4 +- .../NEOW_ce_grapes_no_vine.dds | 4 +- .../colored_emblems/NEOW_ce_guillotine.dds | 4 +- .../colored_emblems/NEOW_ce_hamsick_china.dds | 4 +- .../NEOW_ce_hamsick_soviet.dds | 4 +- .../NEOW_ce_head_w_adrian_helmet.dds | 4 +- .../colored_emblems/NEOW_ce_heart.dds | 4 +- .../colored_emblems/NEOW_ce_herzeg.dds | 4 +- .../colored_emblems/NEOW_ce_horse_tuva.dds | 4 +- .../colored_emblems/NEOW_ce_iranallah.dds | 4 +- .../colored_emblems/NEOW_ce_reindeer.dds | 3 + .../colored_emblems/NEOW_ce_reindeer_head.dds | 3 + .../colored_emblems/NEOW_ce_star_08.dds | 3 + .../colored_emblems/NEOW_ce_wolverine.dds | 3 + .../NEOW_coa_designer_emblems.txt | 7 +- history/provinces/e_finland.txt | 32 +- .../titles_cultural_names_l_english.yml | 89 ++- .../english/replace/titles_l_english.yml | 142 ++--- map_data/definition.csv | 8 +- map_data/provinces.png | 4 +- 29 files changed, 1434 insertions(+), 633 deletions(-) create mode 100644 common/coat_of_arms/coat_of_arms/baltic.txt create mode 100644 gfx/coat_of_arms/colored_emblems/NEOW_ce_aurora.dds create mode 100644 gfx/coat_of_arms/colored_emblems/NEOW_ce_reindeer.dds create mode 100644 gfx/coat_of_arms/colored_emblems/NEOW_ce_reindeer_head.dds create mode 100644 gfx/coat_of_arms/colored_emblems/NEOW_ce_star_08.dds create mode 100644 gfx/coat_of_arms/colored_emblems/NEOW_ce_wolverine.dds 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 83dfb237f..afc149011 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 @@ -6481,146 +6481,6 @@ d_vilnius={ } -d_moonsund={ - pattern="pattern_solid.dds" - color1=blue_light - color2=white - color3=red - colored_emblem={ - color1=blue_light - color2=white - texture="NEOW_ce_waves_05.dds" - instance={ - position={ 0.500000 0.540000 } - } - - } - - colored_emblem={ - color1=white - color2=black - color3=black - texture="ce_ship_longship.dds" - instance={ - position={ 0.500000 0.390000 } - scale={ 0.740000 0.740000 } - depth=1.010000 - } - - } - -} - - -d_narva={ - pattern="pattern_solid.dds" - color1=blue_light - color2=white - color3=blue - colored_emblem={ - color1=white - color2=white - texture="ce_tower_and_wall.dds" - instance={ - scale={ -1.000000 0.890000 } - depth=2.010000 - } - - } - - colored_emblem={ - color1=red - texture="ce_ordinary_pile.dds" - instance={ - position={ 0.640000 0.050000 } - scale={ 0.360000 -0.340000 } - } - - } - - colored_emblem={ - color1=white - color2=white - texture="ce_swords_crossed.dds" - instance={ - position={ 0.370000 0.370000 } - scale={ 0.370000 0.370000 } - depth=1.010000 - } - - } - -} - - -d_tartu={ - pattern="pattern_diagonal_split_01.dds" - color1=blue_light - color2=green - color3=red - colored_emblem={ - color1=yellow - texture="ce_star_06.dds" - instance={ - position={ 0.310000 0.300000 } - scale={ 0.500000 0.500000 } - depth=2.010000 - } - - } - - colored_emblem={ - color1=yellow - texture="ce_oak_leaf.dds" - instance={ - position={ 0.610000 0.700000 } - scale={ 0.360000 0.360000 } - rotation=17 - } - - instance={ - position={ 0.710000 0.770000 } - scale={ 0.410000 0.410000 } - depth=1.010000 - rotation=62 - } - - } - - colored_emblem={ - color1=white - texture="ce_bendlet.dds" - instance={ - scale={ -1.000000 1.000000 } - depth=3.010000 - } - - } - -} - - - -d_parnu={ - pattern="pattern_solid.dds" - color1=yellow - color2=white - color3=red - colored_emblem={ - color1=black - color2=white - color3=white - texture="ce_bear_rampant.dds" - instance={ - scale={ 0.940000 0.940000 } - } - - } - -} - - - c_limbazi={ pattern="pattern_horizontal_split_01.dds" color1=blue @@ -7355,62 +7215,6 @@ d_west_karelia={ } } - - -d_guoldat={ - pattern="pattern_solid.dds" - color1=red - color2=white - color3=red - colored_emblem={ - color1=white - texture="ce_seal_name_ding_4e01.dds" - instance={ - position={ 0.440000 0.470000 } - scale={ 0.800000 0.800000 } - depth=3.010000 - rotation=308 - } - - } - - colored_emblem={ - color1=red - texture="ce_block_01.dds" - instance={ - position={ 0.120000 0.190000 } - scale={ 0.630000 0.630000 } - rotation=129 - } - - } - - colored_emblem={ - color1=white - color2=white - texture="ce_sword_simple.dds" - instance={ - position={ 0.510000 0.500000 } - depth=2.010000 - rotation=239 - } - - } - - colored_emblem={ - color1=yellow - texture="ce_anchor.dds" - instance={ - position={ 0.500000 0.520000 } - scale={ 0.930000 0.810000 } - depth=1.010000 - } - - } - -} - - d_norrbottena ={ pattern="pattern_checkers_02.dds" color1=white @@ -9351,197 +9155,6 @@ d_ragusa={ } - - -d_esthonia ={ - - pattern="pattern_barry_06.dds" - color1=rgb { 0 86 155 } - color2=white - color3=red - colored_emblem={ - color1=rgb { 173 117 20 } - texture="ce_eastern_clouds.dds" - instance={ - position={ 0.630000 0.110000 } - scale={ 0.135000 0.135000 } - depth=3.010000 - rotation=153 - } - - } - - colored_emblem={ - color1=rgb { 238 183 103 } - texture="ce_eastern_clouds.dds" - instance={ - position={ 0.410000 0.100000 } - scale={ 0.155000 0.155000 } - depth=7.010000 - rotation=171 - } - - } - - colored_emblem={ - color1=yellow - texture="ce_eastern_clouds.dds" - instance={ - position={ 0.720000 0.140000 } - scale={ 0.125000 0.125000 } - rotation=216 - } - - instance={ - position={ 0.580000 0.070000 } - scale={ 0.095000 0.095000 } - depth=12.010000 - rotation=109 - } - - } - - colored_emblem={ - color1=rgb { 15 73 127 } - texture="ce_eastern_clouds.dds" - instance={ - position={ 0.380000 0.095000 } - scale={ 0.130000 0.130000 } - depth=8.010000 - rotation=51 - } - - } - - colored_emblem={ - color1=rgb { 236 158 42 } - texture="ce_eastern_clouds.dds" - instance={ - position={ 0.335000 0.115000 } - scale={ 0.135000 0.135000 } - depth=6.010000 - rotation=32 - } - - } - - colored_emblem={ - color1=yellow - texture="ce_escutcheon.dds" - instance={ - position={ 0.500000 0.465000 } - scale={ 0.690000 0.840000 } - depth=16.010000 - } - - } - - colored_emblem={ - color1=rgb { 72 174 194 } - texture="ce_eastern_clouds.dds" - instance={ - position={ 0.680000 0.115000 } - scale={ 0.130000 0.130000 } - depth=1.010000 - rotation=156 - } - - } - - colored_emblem={ - color1=rgb { 17 53 87 } - texture="ce_eastern_clouds.dds" - instance={ - position={ 0.245000 0.145000 } - scale={ 0.120000 0.120000 } - depth=4.010000 - rotation=187 - } - - } - - colored_emblem={ - color1=rgb { 11 134 247 } - texture="ce_eastern_clouds.dds" - instance={ - position={ 0.450000 0.110000 } - scale={ 0.180000 0.180000 } - depth=10.010000 - rotation=201 - } - - instance={ - position={ 0.550000 0.110000 } - scale={ -0.180000 0.180000 } - depth=11.010000 - rotation=163 - } - - } - - colored_emblem={ - color1=rgb { 192 158 108 } - texture="ce_eastern_clouds.dds" - instance={ - position={ 0.635000 0.110000 } - scale={ 0.085000 0.085000 } - depth=2.010000 - rotation=52 - } - - } - - colored_emblem={ - color1=yellow - texture="ce_chalice.dds" - instance={ - position={ 0.500000 0.165000 } - scale={ 0.090000 0.115000 } - depth=9.010000 - rotation=178 - } - - } - - colored_emblem={ - color1=rgb { 109 137 163 } - texture="ce_eastern_clouds.dds" - instance={ - position={ 0.295000 0.120000 } - scale={ 0.140000 0.140000 } - depth=5.010000 - rotation=178 - } - - } - - colored_emblem={ - color1=rgb { 0 102 203 } - color2=rgb { 156 28 60 } - color3=rgb { 0 0 0 } - texture="ce_leopard_passant_guardant.dds" - instance={ - position={ 0.500000 0.515000 } - scale={ 0.400000 0.400000 } - depth=13.010000 - } - - instance={ - position={ 0.500000 0.390000 } - scale={ 0.400000 0.400001 } - depth=14.010000 - } - - instance={ - position={ 0.500000 0.260000 } - scale={ 0.400000 0.400000 } - depth=15.010000 - } - - } - -} - d_crna_gora={ pattern="pattern_solid.dds" diff --git a/common/coat_of_arms/coat_of_arms/baltic.txt b/common/coat_of_arms/coat_of_arms/baltic.txt new file mode 100644 index 000000000..f9167aaee --- /dev/null +++ b/common/coat_of_arms/coat_of_arms/baltic.txt @@ -0,0 +1,379 @@ +d_esthonia={ + pattern="pattern_barry_06.dds" + color1=rgb{0 86 155} + color2=white + colored_emblem={ + color1=rgb{173 117 20} + texture="ce_eastern_clouds.dds" + instance={position={0.63 0.11} scale={0.135 0.135} depth=3 rotation=153} + } + colored_emblem={ + color1=rgb{238 183 103} + texture="ce_eastern_clouds.dds" + instance={position={0.41 0.10} scale={0.155 0.155} depth=7 rotation=171} + } + colored_emblem={ + color1=yellow + texture="ce_eastern_clouds.dds" + instance={position={0.72 0.14} scale={0.125 0.125} rotation=216} + instance={position={0.58 0.07} scale={0.095 0.095} depth=12 rotation=109} + } + colored_emblem={ + color1=rgb{15 73 127} + texture="ce_eastern_clouds.dds" + instance={position={0.38 0.095} scale={0.13 0.13} depth=8 rotation=51} + } + colored_emblem={ + color1=rgb{236 158 42} + texture="ce_eastern_clouds.dds" + instance={position={0.335 0.115} scale={0.135 0.135} depth=6 rotation=32} + } + colored_emblem={ + color1=yellow + texture="ce_escutcheon.dds" + instance={position={0.5 0.465} scale={0.69 0.84} depth=16} + } + colored_emblem={ + color1=rgb{72 174 194} + texture="ce_eastern_clouds.dds" + instance={position={0.68 0.115} scale={0.13 0.13} depth=1 rotation=156} + } + colored_emblem={ + color1=rgb{17 53 87} + texture="ce_eastern_clouds.dds" + instance={position={0.245 0.145} scale={0.12 0.12} depth=4 rotation=187} + } + colored_emblem={ + color1=rgb{11 134 247} + texture="ce_eastern_clouds.dds" + instance={position={0.45 0.11} scale={0.18 0.18} depth=10 rotation=201} + instance={position={0.55 0.11} scale={-0.18 0.18} depth=11 rotation=163} + } + colored_emblem={ + color1=rgb{192 158 108} + texture="ce_eastern_clouds.dds" + instance={position={0.635 0.11} scale={0.085 0.085} depth=2 rotation=52} + } + colored_emblem={ + color1=yellow + texture="ce_chalice.dds" + instance={position={0.5 0.165} scale={0.09 0.115} depth=9 rotation=178} + } + colored_emblem={ + color1=rgb{109 137 163} + texture="ce_eastern_clouds.dds" + instance={position={0.295 0.12} scale={0.14 0.14} depth=5 rotation=178} + } + colored_emblem={ + color1=rgb{0 102 203} + color2=rgb{156 28 60} + color3=rgb{0 0 0} + texture="ce_leopard_passant_guardant.dds" + instance={position={0.5 0.515} scale={0.40 0.40} depth=13} + instance={position={0.5 0.39} scale={0.40 0.41} depth=14} + instance={position={0.5 0.26} scale={0.40 0.40} depth=15} + } +} +c_harjumaa={ + pattern="pattern_cross_01.dds" + color1=red + color2=white +} +c_wiek={ + pattern="pattern_solid.dds" + color1=red + color2=yellow + colored_emblem={ + color1=yellow + color2=yellow + texture="ce_frame_circle_borre_doted.dds" + instance={position={0.5 0.215} scale={0.355 0.355}} + } + colored_emblem={ + color1=white + color2=yellow + texture="ce_eagle.dds" + instance={position={0.5 0.545} scale={-1 1}} + } +} +d_parnu={ + pattern="pattern_solid.dds" + color1=blue + color2=yellow + colored_emblem={ + color1=red + color2=red + texture="NEOW_ce_arm_holding_sword_3.dds" + instance={position={0.25 0.45} scale={-1 1} rotation=53} + } + colored_emblem={ + color1=blue + texture="ce_block_02.dds" + instance={position={0.5 0.185} scale={0.245 0.34}} + instance={position={0.42 0.505} scale={0.1 0.1}} + instance={position={0.59 0.505} scale={0.1 0.1}} + } + colored_emblem={ + color1=yellow + texture="ce_religion_christianity_generic.dds" + instance={position={0.5 0.465} scale={0.7 0.7}} + } + colored_emblem={ + color1=white + texture="ce_eastern_clouds.dds" + instance={position={0.035 0} rotation=56} + } + colored_emblem={ + color1=yellow + texture="ce_key.dds" + instance={position={0.7 0.645} scale={0.5 0.5}} + } +} +c_parnu={ + pattern="pattern_solid.dds" + color1=yellow + color2=black + colored_emblem={ + color1=black + color2=white + color3=white + texture="ce_bear_rampant.dds" + instance={scale={0.94 0.94}} + } +} +c_livs={ + pattern="pattern_solid.dds" + color1=blue + color2=white + colored_emblem={ + color1=white + color2=yellow + texture="ce_eagle.dds" + instance={position={0.5 0.56} scale={-1 1}} + } + colored_emblem={ + color1=yellow + color2=white + texture="ce_sword_simple.dds" + instance={position={0.255 0.605} scale={0.58 0.58} rotation=315} + } + colored_emblem={ + color1=green + texture="ce_inescutcheon.dds" + instance={scale={0.685 0.685}} + } + colored_emblem={ + color1=yellow + color2=yellow + texture="ce_grain.dds" + instance={position={0.5 0.485} scale={0.32 0.32}} + } +} +d_narva={ + pattern="pattern_solid.dds" + color1=blue_light + color2=white + colored_emblem={ + color1=white + texture="ce_circle.dds" + instance={position={0.21 0.2} scale={0.22 0.22}} + instance={position={0.79 0.2} scale={0.22 0.22}} + instance={position={0.5 0.88} scale={0.22 0.22}} + } + colored_emblem={ + color1=white + color2=white + texture="NEOW_ce_mackerel.dds" + instance={position={0.5 0.45} scale={0.845 0.845}} + instance={position={0.5 0.6} scale={-0.845 0.845}} + } + colored_emblem={ + color1=yellow + color2=white + texture="ce_sword_simple.dds" + instance={position={0.5 0.22} scale={0.63 0.63} rotation=61} + } + colored_emblem={ + color1=yellow + color2=white + texture="ce_sabre.dds" + instance={position={0.5 0.745} scale={0.595 0.595}} + } +} +c_ida_viru={ + pattern="pattern_solid.dds" + color1=blue_light + color2=white + color3=blue + colored_emblem={ + color1=white + color2=white + texture="ce_tower_and_wall.dds" + instance={scale={-1 0.89}} + } + colored_emblem={ + color1=red + texture="ce_ordinary_pile.dds" + instance={position={0.64 0.05} scale={0.36 -0.34}} + } + colored_emblem={ + color1=white + color2=white + texture="ce_swords_crossed.dds" + instance={position={0.37 0.37} scale={0.37 0.37}} + } +} +c_laane_viru={ + pattern="pattern_solid.dds" + color1=blue_light + color2=white + color3=blue + colored_emblem={ + color1=white + color2=white + texture="ce_tower_and_wall.dds" + instance={scale={-1 0.89}} + } + colored_emblem={ + color1=yellow + texture="ce_ordinary_pile.dds" + instance={position={0.64 0.05} scale={0.36 -0.34}} + } + colored_emblem={ + color1=white + color2=white + texture="ce_swords_crossed.dds" + instance={position={0.37 0.37} scale={0.37 0.37}} + } +} +d_tartu={ + pattern="pattern_solid.dds" + color1=red + color2=white + colored_emblem={ + color1=grey + texture="ce_ordinary_pile_02_inverted.dds" + instance={position={0.315 0.17} scale={0.175 0.28}} + instance={position={0.685 0.17} scale={0.175 0.28}} + } + colored_emblem={ + color1=yellow + texture="ce_cross_07.dds" + instance={position={0.315 0.15} scale={0.115 0.115}} + instance={position={0.685 0.15} scale={0.115 0.115}} + } + colored_emblem={ + color1=white + texture="ce_star_06.dds" + instance={position={0.5 0.775} scale={0.075 0.075}} + } + colored_emblem={ + color1=black + texture="ce_portcullis.dds" + instance={position={0.5 0.685} scale={0.325 0.325}} + } + colored_emblem={ + color1=white + texture="ce_castle_random.dds" + instance={position={0.5 0.6}} + } + colored_emblem={ + color1=red + texture="ce_block_02.dds" + instance={position={0.5 0.31} scale={0.17 0.355}} + } + colored_emblem={ + color1=white + texture="ce_key.dds" + instance={position={0.5 0.355} scale={0.31 0.31} rotation=45} + } + colored_emblem={ + color1=white + texture="ce_key.dds" + instance={position={0.5 0.355} scale={0.31 0.31} rotation=45} + } + colored_emblem={ + color1=yellow + color2=white + texture="ce_sword_simple.dds" + instance={position={0.498 0.352} scale={0.31 0.31} rotation=315} + } +} +c_tartu={ + pattern="pattern_diagonal_split_01.dds" + color1=blue_light + color2=green + colored_emblem={ + color1=yellow + texture="ce_star_06.dds" + instance={position={0.31 0.3} scale={0.5 0.5}} + } + colored_emblem={ + color1=yellow + texture="ce_oak_leaf.dds" + instance={position={0.61 0.7} scale={0.36 0.36} rotation=17} + instance={position={0.71 0.77} scale={0.41 0.41} rotation=62} + } + colored_emblem={ + color1=white + texture="ce_bendlet.dds" + instance={scale={-1 1}} + } +} +d_moonsund={ + pattern="pattern_solid.dds" + color1=blue_light + color2=white + colored_emblem={ + color1=white + color2=white + color3=white + texture="ce_norse_longship_gotland_shields.dds" + } + colored_emblem={ + color1=blue_light + texture="NEOW_ce_flame.dds" + instance={position={0.52 0.36} scale={0.395 0.395} rotation=61} + } + colored_emblem={ + color1=blue_light + texture="ce_star_07.dds" + instance={position={0.37 0.43} scale={0.145 0.145}} + } +} +c_saaremaa={ + pattern="pattern_solid.dds" + color1=blue_light + color2=white + colored_emblem={ + color1=white + color2=black + color3=black + texture="ce_ship_longship.dds" + instance={position={0.5 0.39} scale={0.74 0.74}} + } + colored_emblem={ + color1=blue_light + color2=white + texture="NEOW_ce_waves_05.dds" + instance={position={0.5 0.54}} + } +} +c_hiiumaa={ + pattern="pattern_solid.dds" + color1=white + color2=red + colored_emblem={ + color1=red + texture="ce_fleur.dds" + instance={position={0.265 0.255} scale={0.385 0.385}} + instance={position={0.735 0.255} scale={0.385 0.385}} + instance={position={0.265 0.71} scale={0.385 0.385}} + instance={position={0.735 0.71} scale={0.385 0.385}} + } + colored_emblem={ + color1=red + texture="ce_block_02.dds" + instance={position={0.5 0.435} scale={0.07 1}} + } +} diff --git a/common/coat_of_arms/coat_of_arms/finland.txt b/common/coat_of_arms/coat_of_arms/finland.txt index 7e312ce80..1b24864bf 100644 --- a/common/coat_of_arms/coat_of_arms/finland.txt +++ b/common/coat_of_arms/coat_of_arms/finland.txt @@ -1,5 +1,3 @@ - - k_sapmi_tornedalian={ pattern="pattern_tricolor_horizontal_01.dds" color1=yellow @@ -102,3 +100,516 @@ c_ubmejeiednuo={ instance={position={0.57 0.265} scale={0.3 0.15}} } } +c_ubmeje={ + pattern="pattern_solid.dds" + color1=blue + color2=white + colored_emblem={ + color1=white + color2=red + color3=red + texture="NEOW_ce_reindeer_head.dds" + instance={position={0.29 0.39} scale={0.55 0.55}} + instance={position={0.71 0.39} scale={0.55 0.55}} + instance={position={0.5 0.76} scale={0.55 0.55}} + } +} +c_jahkamakke={ + pattern="pattern_checkers_02.dds" + color1=yellow + color2=red + colored_emblem={ + color1=blue + texture="ce_polish_ajsicz.dds" + instance={position={0.77 0.24} scale={0.38 0.38} rotation=45} + } + colored_emblem={ + color1=yellow + texture="ce_circle_mask.dds" + instance={position={0.68 0.34} scale={0.26 0.26}} + } + colored_emblem={ + color1=blue + texture="ce_religion_bogomilist.dds" + instance={position={0.3 0.69} scale={0.32 0.32}} + instance={position={0.68 0.34} scale={0.32 0.32}} + } + colored_emblem={ + color1=blue + texture="ce_cross_09.dds" + instance={position={0.3 0.88} scale={0.22 0.22}} + } + colored_emblem={ + color1=yellow + color2=blue + color3=red + texture="NEOW_ce_reindeer.dds" + instance={position={0.29 0.29} scale={0.45 0.45}} + instance={position={0.7 0.75} scale={0.45 0.45}} + } +} +c_torne={ + pattern="pattern_horizontal_split_01.dds" + color1=white + color2=blue + colored_emblem={ + color1=blue + texture="ce_polish_ajsicz.dds" + instance={position={0.57 0.26} scale={0.34 0.34} rotation=42} + } + colored_emblem={ + color1=white + texture="ce_circle_mask.dds" + instance={position={0.5 0.33} scale={0.21 0.21}} + } + colored_emblem={ + color1=blue + texture="ce_religion_bogomilist.dds" + instance={position={0.5 0.33} scale={0.27 0.27}} + } + colored_emblem={ + color1=white + color2=red + color3=blue + texture="NEOW_ce_ptarmigan_passant.dds" + instance={position={0.5 0.78} scale={0.57 0.57}} + } +} +c_pite={ + pattern="pattern_horizontal_split_02.dds" + color1=yellow + color2=blue + colored_emblem={ + color1=yellow + texture="ce_star_06.dds" + instance={position={0.19 0.21} scale={0.13 0.13}} + instance={position={0.24 0.11} scale={0.13 0.13}} + instance={position={0.42 0.12} scale={0.13 0.13}} + instance={position={0.6 0.09} scale={0.13 0.13}} + instance={position={0.63 0.21} scale={0.13 0.13}} + instance={position={0.79 0.22} scale={0.13 0.13}} + instance={position={0.83 0.1} scale={0.13 0.13}} + } + colored_emblem={ + color1=blue + color2=red + color3=yellow + texture="NEOW_ce_reindeer_head.dds" + instance={position={0.5 0.72} scale={0.7 0.7}} + } +} +c_julevadno={ + pattern="pattern_solid.dds" + color1=white + color2=white + color3=black + colored_emblem={ + color1=blue + color2=blue + texture="ce_key.dds" + instance={rotation=323} + instance={rotation=229} + } +} +c_karasjohka={ + pattern="pattern_solid.dds" + color1=red + color2=yellow + colored_emblem={ + color1=yellow + color2=yellow_light + texture="ce_fire.dds" + instance={position={0.27 0.3} scale={0.46 0.46}} + instance={position={0.73 0.3} scale={0.46 0.46}} + instance={position={0.5 0.7} scale={0.46 0.46}} + } +} +c_rounala={ + pattern="pattern_solid.dds" + color1=red + color2=yellow + colored_emblem={ + color1=yellow + color2=yellow + color3=red + texture="ce_griffin_rampant.dds" + } +} +c_aviovara={ + pattern="pattern_solid.dds" + color1=red + color2=white + colored_emblem={ + color1=white + color2=white + color3=black + texture="ce_bear_passant.dds" + instance={position={0.5 0.5} scale={0.89 0.89}} + } +} +c_cahcesuolu={ + pattern="pattern_solid.dds" + color1=red + color2=white + colored_emblem={ + color1=yellow + color2=yellow + texture="ce_fire.dds" + instance={position={0.13 0.16} rotation=210} + instance={position={0.41 0.32} rotation=210} + instance={position={0.69 0.48} rotation=210} + instance={position={0.97 0.64} rotation=210} + } + colored_emblem={ + color1=yellow + color2=white + texture="ce_triangle_mask.dds" + instance={position={0.5 0.1} rotation=180} + } +} +c_roavvenjarga={ + pattern="pattern_solid.dds" + color1=green + color2=white + colored_emblem={ + color1=white + texture="ce_ordinary_pall_5.dds" + instance={position={0.5 0.5}} + } + colored_emblem={ + color1=white + texture="ce_block_03.dds" + instance={position={0.18 0.3} scale={0.41 0.55} rotation=-138} + instance={position={0.82 0.3} scale={0.41 0.55} rotation=138} + } + colored_emblem={ + color1=green + texture="ce_block_03.dds" + instance={position={0.2 0.03} scale={0.41 0.55} rotation=-138} + instance={position={0.8 0.03} scale={0.41 0.55} rotation=138} + } + colored_emblem={ + color1=yellow + color2=yellow_light + texture="ce_fire.dds" + instance={position={0.5 0.17} scale={0.26 0.26}} + } +} +c_giepma={ + pattern="pattern_horizontal_split_01.dds" + color1=red + color2=blue + colored_emblem={ + color1=white + texture="ce_anchor.dds" + instance={position={0.5 0.31} scale={0.42 0.42}} + } + colored_emblem={ + color1=white + color2=rgb{155 125 81} + texture="NEOW_ce_salmon.dds" + instance={position={0.5 0.72} scale={0.94 0.94}} + } +} +c_kittila={ + pattern="pattern_solid.dds" + color1=black + color2=white + colored_emblem={ + color1=white + texture="ce_circle_mask.dds" + instance={position={0.5 0.95} scale={1.35 1.35}} + } + colored_emblem={ + color1=yellow + texture="NEOW_ce_wolverine.dds" + instance={position={0.5 0.68} scale={0.88 0.88}} + } +} +c_tornionlaakso={ + pattern="pattern_solid.dds" + color1=white + color2=blue + colored_emblem={ + color1=blue + texture="ce_ordinary_pile_03_inverted.dds" + instance={position={0.5 0.27} scale={0.37 0.37}} + instance={position={0.43 0.28} scale={0.12 0.24}} + instance={position={0.57 0.28} scale={0.12 0.24}} + } + colored_emblem={ + color1=red + color2=blue + texture="NEOW_ce_tower_02.dds" + instance={position={0.5 0.7} scale={0.7 0.7}} + } + colored_emblem={ + color1=red + color2=red + color3=red + texture="ce_globus_cruciger.dds" + instance={position={0.5 0.18} scale={0.15 0.15}} + } + colored_emblem={ + color1=red + texture="ce_circle.dds" + instance={position={0.43 0.26} scale={0.08 0.08}} + instance={position={0.57 0.26} scale={0.08 0.08}} + } +} +c_inari={ + pattern="pattern_solid.dds" + color1=black + color2=white + colored_emblem={ + color1=white + color2=yellow + color3=grey + texture="NEOW_ce_fish_antlered.dds" + } +} +d_guoldat={ + pattern="pattern_horizontal_split_02.dds" + color1=red + color2=blue + colored_emblem={ + color1=white + texture="ce_seal_name_ding_4e01.dds" + instance={position={0.44 0.6} scale={0.8 0.8} rotation=308} + } + colored_emblem={ + color1=red + texture="ce_block_01.dds" + mask={1} + instance={position={0.12 0.32} scale={0.63 0.63} rotation=129} + } + colored_emblem={ + color1=white + color2=white + texture="ce_sword_simple.dds" + instance={position={0.51 0.63} rotation=239} + } + colored_emblem={ + color1=yellow + texture="ce_anchor.dds" + instance={position={0.5 0.715} scale={0.93 0.81}} + } + colored_emblem={ + color1=yellow + texture="NEOW_ce_aurora.dds" + instance={position={0.5 0.165} scale={0.75 0.75}} + } +} +c_murmansk={ + pattern="pattern_horizontal_split_01.dds" + color1=blue + color2=yellow + colored_emblem={ + color1=blue + texture="ce_block_02.dds" + instance={position={0.5 0.235} scale={1 0.7}} + } + colored_emblem={ + color1=yellow + texture="ce_norse_longship.dds" + instance={position={0.5 0.4} scale={0.73 0.73}} + } + colored_emblem={ + color1=yellow + texture="NEOW_ce_aurora.dds" + instance={position={0.5 0.155} scale={0.615 0.615}} + } + colored_emblem={ + color1=blue + color2=blue + color3=yellow + texture="NEOW_ce_mackerel.dds" + instance={position={0.5 0.78} scale={0.92 0.92}} + } +} +c_ter={ + pattern="pattern_solid.dds" + color1=blue + color2=white + colored_emblem={ + color1=yellow + texture="ce_norse_longship_figureheads.dds" + instance={position={0.015 0.425} scale={-0.75 0.75}} + instance={position={0.985 0.425} scale={0.75 0.75}} + } + colored_emblem={ + color1=white + color2=white + texture="NEOW_ce_waves_05.dds" + } + colored_emblem={ + color1=blue_light + texture="ce_circle_mask.dds" + instance={position={0.5 1} scale={0.75 0.52}} + } + colored_emblem={ + color1=yellow + color2=yellow + color3=blue + texture="NEOW_ce_reindeer.dds" + instance={position={0.5 0.505} scale={0.555 0.6}} + } + colored_emblem={ + color1=yellow + texture="NEOW_ce_aurora.dds" + instance={position={0.5 0.13} scale={0.775 0.575}} + } + colored_emblem={ + color1=blue + texture="ce_anchor.dds" + instance={position={0.21 0.615} scale={0.13 0.13}} + instance={position={0.79 0.615} scale={0.13 0.13}} + } + colored_emblem={ + color1=blue + texture="ce_block_02.dds" + instance={position={0.21 0.506} scale={0.01 0.1}} + instance={position={0.79 0.506} scale={0.01 0.1}} + } + colored_emblem={ + color1=white + color3=blue_light + texture="ce_fish.dds" + instance={position={0.5 0.885} scale={0.215 0.215}} + } +} +c_jovvkuj={ + pattern="pattern_vertical_split_01.dds" + color1=green_light + color2=blue_light + colored_emblem={ + color1=black + texture="ce_ordinary_pile_02_inverted.dds" + } + colored_emblem={ + color1=white + texture="ce_ordinary_pile_02_inverted.dds" + instance={scale={0.375 0.375}} + } + colored_emblem={ + color1=yellow + color2=yellow + texture="NEOW_ce_meese.dds" + instance={position={0.245 0.39} scale={-0.53 0.53} rotation=315} + } + colored_emblem={ + color1=yellow + color2=yellow + color3=blue_light + texture="NEOW_ce_reindeer.dds" + instance={position={0.765 0.435} scale={0.555 0.555} rotation=45} + } +} +c_east_kiilt={ + pattern="pattern_solid.dds" + color1=blue_light + color2=white + colored_emblem={ + color1=white + color2=black + texture="NEOW_ce_tower_02.dds" + instance={position={0.5 0.605} scale={0.41 0.75}} + } + colored_emblem={ + color1=white + color2=yellow + color3=rgb { 1 73 140 } + texture="NEOW_ce_lantern.dds" + instance={position={0.5 0.305} scale={0.5 0.5}} + } + colored_emblem={ + color1=grey + color2=grey + texture="ce_shield_02.dds" + instance={position={0.5 1.285} scale={1.5 -1}} + } + colored_emblem={ + color1=red + texture="ce_block_02.dds" + instance={position={0.5 0.615} scale={0.13 0.075}} + instance={position={0.5 0.47} scale={0.12 0.075}} + } + colored_emblem={ + color1=yellow + texture="NEOW_ce_aurora.dds" + instance={position={0.5 0.145} scale={0.5 0.5}} + } +} +c_tersky={ + pattern="pattern_solid.dds" + color1=blue_light + color2=white + colored_emblem={ + color1=yellow + texture="NEOW_ce_aurora.dds" + instance={position={0.5 0.17} scale={0.63 0.63}} + } + colored_emblem={ + color1=white + color2=white + color3=blue_light + texture="NEOW_ce_salmon.dds" + instance={position={0.5 0.595} scale={0.635 0.635}} + } + colored_emblem={ + color1=white + texture="ce_india_doted_frame.dds" + instance={position={0.5 0.595} scale={0.7 0.7}} + } +} +c_akkel={ + pattern="pattern_tricolor_horizontal_01.dds" + color1=red + color2=red + color3=blue + colored_emblem={ + color1=yellow + color2=white + color3=white + texture="ce_norse_longship_gotland_shields.dds" + instance={position={0.5 0.63} scale={0.885 0.885}} + } + colored_emblem={ + color1=yellow + color2=yellow + texture="ce_religion_melieism.dds" + instance={position={0.5 0.225} scale={-0.29 0.29}} + } +} +c_skolt={ + custom=yes + pattern="pattern_solid.dds" + color1=white + color2=black + colored_emblem={ + color1=yellow + texture="ce_block_02.dds" + instance={position={0.5 1} scale={1 0.7}} + } + colored_emblem={ + color1=black + texture="ce_block_02.dds" + instance={position={0.5 1.125} scale={1 0.7}} + } + colored_emblem={ + color1=black + texture="ce_pile_mask.dds" + instance={position={0.5 0.835} scale={0.5 -0.25}} + } + colored_emblem={ + color1=black + texture="ce_circle_mask.dds" + instance={position={0.5 0.333} scale={0.4 0.4}} + } + colored_emblem={ + color1=yellow + color2=blue_light + texture="NEOW_ce_star_08.dds" + instance={position={0.5 0.333} scale={0.666 0.666}} + } +} diff --git a/common/landed_titles/britannia.txt b/common/landed_titles/britannia.txt index 2a79ccd13..13999e507 100644 --- a/common/landed_titles/britannia.txt +++ b/common/landed_titles/britannia.txt @@ -5062,16 +5062,14 @@ e_britannia = { # Great Britain } } - d_moray = { + d_moray = { # The Grampians color = { 31 47 127 } capital = c_mearns # Aberdeen cultural_names = { - name_list_neow_goidelic = cn_moireibh - name_list_NEOW_manx = cn_moireibh - name_list_gaelic = cn_moireibh - name_list_prytoneg = cn_morhay - name_list_strafclideg = cn_morai + name_list_neow_goidelic = cn_am_monadh + name_list_NEOW_manx = cn_am_monadh + name_list_gaelic = cn_am_monadh } c_moray = { diff --git a/common/landed_titles/finland.txt b/common/landed_titles/finland.txt index 6c2a4accb..6a622a61f 100644 --- a/common/landed_titles/finland.txt +++ b/common/landed_titles/finland.txt @@ -372,7 +372,7 @@ e_finland = { color = { 210 150 255 } } } - c_aviovara = { + c_aviovara = { # Hammerfest color = { 71 107 178 } cultural_names = { @@ -610,152 +610,253 @@ e_finland = { } } } - d_guoldat = { #Guoládat = Kola + d_guoldat = { # Kola color = { 46 40 114 } - capital = c_murmansk - + capital = c_murmansk # Murmansk + cultural_names = { - name_list_NEOW_pribaltiyskiy = cn_murmansk - name_list_NEOW_west_russian = cn_murmansk + name_list_sami=cn_guol_a_act_dat + name_list_NEOW_finnish=cn_kuola + name_list_NEOW_west_russian=cn_murmansk + name_list_NEOW_pribaltiyskiy=cn_murmansk } - c_murmansk = { + c_murmansk = { # Murmansk color = { 51 45 127 } - b_murmansk = { - province = 404 - - color = { 144 120 250 } + + cultural_names = { + name_list_sami=cn_m_u_mcn_rman } - b_pechengsky = { + + b_murmansk = { # Murmansk + province = 404 + color = { 144 120 250 } + + cultural_names = { + name_list_sami=cn_m_u_mcn_rman + } + } + b_pechengsky = { # Zapolyarny province = 8789 color = { 144 120 250 } + + cultural_names = { + name_list_NEOW_swedish=cn_zapoljarnyj + name_list_NEOW_norwegian=cn_zapoljarnyj + name_list_NEOW_vestlandsk=cn_zapoljarnyj + name_list_NEOW_danish=cn_zapoljarny + name_list_NEOW_finnish=cn_zapoljarnyi + } } - b_vidyayevo = { #Mue´t?? + b_vidyayevo = { # Zaozyorsk province = 402 - color = { 144 120 250 } + + cultural_names = { + name_list_NEOW_swedish=cn_zaoziorsk + name_list_NEOW_norwegian=cn_zaoziorsk + name_list_NEOW_vestlandsk=cn_zaoziorsk + name_list_NEOW_finnish=cn_zaozjorsk + } } } - c_ter = { + c_ter = { # Ostrovnoy color = { 41 36 102 } - b_jovvkuj = { #Jovvkuj + + cultural_names = { + name_list_sami=cn_ter + name_list_NEOW_norwegian=cn_ostrovnoj + name_list_NEOW_vestlandsk=cn_ostrovnoj + name_list_NEOW_finnish=cn_ostrovnoi + } + + b_jovvkuj = { # Ostrovnoy province = 415 - color = { 55 35 245 } - + + cultural_names = { + name_list_NEOW_norwegian=cn_ostrovnoj + name_list_NEOW_vestlandsk=cn_ostrovnoj + name_list_sami=cn_jofkyj + name_list_NEOW_finnish=cn_ostrovnoi + } } - b_sosnevke = { #Sosnevke + b_sosnevke = { # Sosnovka province = 417 - color = { 55 35 245 } - + + cultural_names = { + name_list_sami=cn_sosnyeffke + } } - b_penne = { #P'enne + b_penne = { # Kanevka province = 416 - color = { 55 35 245 } - } } - c_jovvkuj = { #Kildin + c_jovvkuj = { # Revda color = { 61 55 153 } - b_guoddemjavvr = { #Guoddemjavv'r - province = 413 - - color = { 40 15 200 } - - } - b_lejjavvr = { #Lejjavv'r - province = 411 - - color = { 40 15 200 } - - } - b_arsjogk = { #Arsjogk - province = 412 - - color = { 40 15 200 } - - } - b_kintus = { #Kintuš - province = 414 - - color = { 35 5 135 } - } - b_lujavvr = { #Lujavv'r + b_lujavvr = { # Revda province = 410 - color = { 25 5 75 } - + } + b_guoddemjavvr = { # Mys-Chyorny + province = 413 + color = { 40 15 200 } + } + b_lejjavvr = { # Tumanny + province = 411 + color = { 40 15 200 } + + cultural_names = { + name_list_NEOW_finnish=cn_tumannyi + } + } + b_kintus = { # Krasnoshchelye + province = 414 + color = { 35 5 135 } + + cultural_names = { + #name_list_komi=cn_g_o_uml_rd_shchelya + name_list_NEOW_finnish=cn_krasno_s_crn_t_s_crn_elje + } } } - c_east_kiilt = { #Kordok + c_east_kiilt = { # Teriberka color = { 30 27 76 } - b_tyrber = { - province = 405 - - color = { 25 5 75 } + + cultural_names = { + name_list_sami=cn_kildin + name_list_NEOW_finnish=cn_turjanper_a_uml_ } - b_maselk = { # Masel'k - province = 406 - + + b_tyrber = { # Teriberka + province = 405 color = { 25 5 75 } + + cultural_names = { + name_list_sami=cn_tyrber + name_list_NEOW_finnish=cn_turjanper_a_uml_ + } + } + b_maselk = { # Pushnoy + province = 406 + color = { 25 5 75 } + + cultural_names = { + name_list_NEOW_finnish=cn_pu_s_crn_noi + } } } - c_tersky = { + c_tersky = { # Tersky color = { 71 64 178 } - b_umba = { + + cultural_names = { + name_list_NEOW_finnish=cn_turjan + name_list_sami=cn_ummp + } + + b_umba = { # Umba province = 8792 color = { 35 5 135 } + + cultural_names = { + name_list_sami=cn_ummp + name_list_NEOW_finnish=cn_umpi + } } - b_varzuga = { #AKA Varzuga + b_varzuga = { # Varzuga province = 8791 color = { 35 5 135 } } - b_pyalitsa = { + b_pyalitsa = { # Chapoma province = 8790 color = { 55 35 245 } } } - c_akkel = { #Akkala + c_akkel = { # Kandalaksha color = { 20 18 51 } - - b_akkel = { - province = 409 - - color = { 35 10 145 } + + cultural_names = { + name_list_NEOW_swedish=cn_kandalaksja + name_list_NEOW_norwegian=cn_kandalaksja + name_list_NEOW_vestlandsk=cn_kandalaksja + name_list_NEOW_danish=cn_kandalaksja + name_list_sami=cn_k_a_uml_ddluhtt + name_list_NEOW_finnish=cn_kantalahti } - b_cukksual = { #?u´kksuâl - province = 407 - color = { 35 10 145 } - } - b_kaddlhutt = { #AKA Kandalaksha + b_kaddlhutt = { # Kandalaksha province = 8787 color = { 35 10 145 } + + cultural_names = { + name_list_NEOW_swedish=cn_kandalaksja + name_list_NEOW_norwegian=cn_kandalaksja + name_list_NEOW_vestlandsk=cn_kandalaksja + name_list_NEOW_danish=cn_kandalaksja + name_list_sami=cn_k_a_uml_ddluhtt + name_list_NEOW_finnish=cn_kantalahti + } + } + b_akkel = { # Apatity + province = 409 + color = { 35 10 145 } + + cultural_names = { + name_list_sami=cn_apatit + name_list_NEOW_finnish=cn_apatiitti + } + } + b_cukksual = { # Monchegorsk + province = 407 + color = { 35 10 145 } + + cultural_names = { + name_list_NEOW_danish=cn_montsjegorsk + name_list_NEOW_norwegian=cn_montsjegorsk + name_list_NEOW_vestlandsk=cn_montsjegorsk + name_list_NEOW_finnish=cn_mont_s_crn_egorsk + name_list_NEOW_swedish=cn_montjegorsk + name_list_sami=cn_mon_c_crn_e + } } } - c_skolt = { + c_skolt = { # Kovdor color = { 82 73 204 } - b_suonnjel = { #Suõ?nnjel - province = 401 - - color = { 130 125 245 } + + cultural_names = { + name_list_sami=c_skolt + name_list_NEOW_finnish=cn_koutero } - b_nuottjaurr = { #Nuõ´ttjäu´rr - province = 403 - - color = { 130 125 245 } - } - b_saarvesjaurr = { #Sââ´rvesjäu´rr + + b_saarvesjaurr = { # Kovdor province = 408 - color = { 130 125 245 } + + cultural_names = { + name_list_NEOW_finnish=cn_koutero + } } - b_koulajavri = { #Koulajävri + b_suonnjel = { # Svetly + province = 401 + color = { 130 125 245 } + + cultural_names = { + name_list_NEOW_finnish=cn_svetlyi + } + } + b_nuottjaurr = { # Verkhnetulomsky + province = 403 + color = { 130 125 245 } + + cultural_names = { + name_list_NEOW_finnish=cn_yl_a_uml__tuuloma + } + } + b_koulajavri = { # Alakurtti province = 418 - color = { 15 10 150 } } } @@ -782,74 +883,182 @@ e_finland = { add = @correct_culture_primary_score } } + + cultural_names = { + name_list_NEOW_swedish=cn_suisse + name_list_NEOW_estonian=cn_soome + name_list_sami=cn_suopma + name_list_NEOW_finnish=cn_suomi + name_list_NEOW_west_russian=cn_finlyandiya + name_list_NEOW_pribaltiyskiy=cn_finlyandiya + } d_finland = { color = { 184 195 216 } capital = c_nyland # Helsinki + + cultural_names = { + name_list_NEOW_swedish=cn_suisse + name_list_NEOW_estonian=cn_soome + name_list_sami=cn_suopma + name_list_NEOW_finnish=cn_suomi + name_list_NEOW_west_russian=cn_finlyandiya + name_list_NEOW_pribaltiyskiy=cn_finlyandiya + } - c_nyland = { + c_nyland = { # Uusimaa color = { 197 208 229 } + + cultural_names = { + name_list_NEOW_danish=cn_nyland + name_list_NEOW_norwegian=cn_nyland + name_list_NEOW_vestlandsk=cn_nyland + name_list_NEOW_swedish=cn_nyland + } - b_helsinki = { + b_helsinki = { # Helsinki province = 176 color = { 185 185 233 } + + cultural_names = { + name_list_sami=cn_helsset + name_list_NEOW_estonian=cn_helsingi + name_list_NEOW_norwegian=cn_helsingfors + name_list_NEOW_vestlandsk=cn_helsingfors + name_list_NEOW_swedish=cn_helsingfors + name_list_NEOW_west_russian=cn_khelsinki + name_list_NEOW_pribaltiyskiy=cn_khelsinki + } } - b_porvoo = { + b_porvoo = { # Porvoo province = 175 color = { 185 185 233 } + + cultural_names = { + name_list_NEOW_norwegian=cn_borg_a_rng_ + name_list_NEOW_vestlandsk=cn_borg_a_rng_ + name_list_NEOW_swedish=cn_borg_a_rng_ + } } - b_raseborg = { + b_raseborg = { # Raseborg province = 177 color = { 185 185 233 } - + + cultural_names = { + name_list_NEOW_finnish=cn_raasepori + } } } - c_finland = { + c_finland = { # Finland color = { 175 185 204 } + + cultural_names = { + name_list_NEOW_swedish=cn_suisse + name_list_NEOW_estonian=cn_soome + name_list_sami=cn_suopma + name_list_NEOW_finnish=cn_suomi + name_list_NEOW_west_russian=cn_finlyandiya + name_list_NEOW_pribaltiyskiy=cn_finlyandiya + } - b_turku = { + b_turku = { # Turku province = 179 color = { 235 245 245 } + + cultural_names = { + name_list_NEOW_estonian=cn_turu + name_list_NEOW_norwegian=cn__a_rng_bo + name_list_NEOW_vestlandsk=cn__a_rng_bo + name_list_NEOW_swedish=cn__a_rng_bo + } } - b_salo = { + b_salo = { # Salo province = 178 color = { 235 245 245 } } - b_uusikaupunki = { + b_uusikaupunki = { # Uusikaupunki province = 180 ccolor = { 235 245 245 } + + cultural_names = { + name_list_NEOW_norwegian=cn_nystad + name_list_NEOW_vestlandsk=cn_nystad + name_list_NEOW_swedish=cn_nystad + } } } - c_aland = { + c_aland = { # Åland color = { 153 162 178 } - b_sund = { + + cultural_names = { + name_list_sami=cn__a_rng_l_a_act_nda + name_list_NEOW_estonian=cn_ahvenamaa + name_list_NEOW_finnish=cn_ahvenanmaa + } + + b_mariehamn = { # Mariehamn + province = 217 + color = { 28 56 199 } + + cultural_names = { + name_list_NEOW_estonian=cn_maarianhamina + name_list_NEOW_finnish=cn_maarianhamina + name_list_NEOW_west_russian=cn_mariyekhamn + name_list_NEOW_pribaltiyskiy=cn_mariyekhamn + } + } + b_sund = { # Sund province = 216 color = { 28 56 199 } } - b_mariehamn = { - province = 217 - color = { 28 56 199 } - } } - c_satakunta = { + c_satakunta = { # Satakunta color = { 219 231 255 } + + cultural_names = { + name_list_NEOW_danish=cn_satakunda + } - b_pori = { + b_pori = { # Pori province = 185 color = { 205 205 245 } + + cultural_names = { + name_list_NEOW_norwegian=cn_bj_o_uml_rneborg + name_list_NEOW_vestlandsk=cn_bj_o_uml_rneborg + name_list_NEOW_swedish=cn_bj_o_uml_rneborg + } } - b_rauma = { + b_rauma = { # Rauma province = 183 color = { 205 205 245 } + + cultural_names = { + name_list_NEOW_norwegian=cn_raumo + name_list_NEOW_vestlandsk=cn_raumo + name_list_NEOW_swedish=cn_raumo + } } } - - c_pirkanmaa = { + c_pirkanmaa = { # Pirkanmaa color = { 131 139 153 } + + cultural_names = { + name_list_NEOW_danish=cn_birkaland + name_list_NEOW_norwegian=cn_birkaland + name_list_NEOW_vestlandsk=cn_birkaland + name_list_NEOW_swedish=cn_birkaland + } - b_tampere = { + b_tampere = { # Tampere province = 211 color = { 151 151 215 } + + cultural_names = { + name_list_NEOW_norwegian=cn_tammerfors + name_list_NEOW_vestlandsk=cn_tammerfors + name_list_NEOW_swedish=cn_tammerfors + } } b_nokia = { province = 184 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_afghanseal.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_afghanseal.dds index 60a4e9107..23e7734e5 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_afghanseal.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_afghanseal.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:48422383bcf77aede599d51d5724cbfc0372687e197560f813f8146580199bbe -size 262272 +oid sha256:507a50643c3c6aa952099abfafb3ac60544ff092ad22e4a9e2a244fbd090b121 +size 87536 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_allahflower.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_allahflower.dds index b43c7f1aa..f0bb53abf 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_allahflower.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_allahflower.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1aa8671e2d762b3d86034a3569919efa5c5f98291e1f2775563938ff321a49c1 -size 262272 +oid sha256:c7cff0f0f45cb11c55595e61a3cca5fadbb8cf0010235a3c7c35530640b38010 +size 87536 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_aurora.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_aurora.dds new file mode 100644 index 000000000..320688cef --- /dev/null +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_aurora.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87a9251c458c419b1e7309933882823c986e1f89ce81d536fee078ab7dc7eb30 +size 22000 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_gondor_star.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_gondor_star.dds index 052217b51..3a479ef2b 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_gondor_star.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_gondor_star.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:503a6ad0b2aebf26db41d8170bffedaea032c8692412970dc52c284da7393b84 -size 87508 +oid sha256:3952c4f58b1e2a8a6094254d6aaa25804a99e9a6c31df9fa11a85e103300699b +size 22000 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_gondor_tree.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_gondor_tree.dds index 5b2d9602b..9f4ac3131 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_gondor_tree.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_gondor_tree.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d178ec15fa054f1db25649b280d4abfc8a014e8fa4d23f24125ab4a4dbc4f73b -size 87508 +oid sha256:17f81eee93d9e34f7a29c67584baf643dbb16f8d98f1357f2ae62c42879fa16c +size 22000 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_grapes_no_vine.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_grapes_no_vine.dds index 05a4bbee8..334e3e863 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_grapes_no_vine.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_grapes_no_vine.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0be0d72bc60fe49b80ff568b9945b83f096b2e1aba775de13eacb36ae6295c2f -size 640128 +oid sha256:5bbf7b860ecd62710170fc7c25a10bd8d62fb0f4b8abb43c7fc499e2ffb38cf7 +size 213856 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_guillotine.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_guillotine.dds index 5a45c157c..30a356d0a 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_guillotine.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_guillotine.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d4d6f7b3eb4244f9c35b862a2ac1053ef26c35c09e43374c4d45548e6903482 -size 262272 +oid sha256:37d3303b4cfefa6bafb9a022b5562a99f053d069781fccecd2e4eca6250c3505 +size 87536 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_hamsick_china.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_hamsick_china.dds index d215f1bcb..313815c46 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_hamsick_china.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_hamsick_china.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ccf8313b65b0868e17f3df2d0ced0eed411ab8dc49b610ffd18bdc2b38ac78b7 -size 65664 +oid sha256:b5e75a2d445f4dc5c4332c1edf90f3579c05f91d6806ec9443cd3ea52eadf3bb +size 22000 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_hamsick_soviet.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_hamsick_soviet.dds index 4e5bf261a..255cbd065 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_hamsick_soviet.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_hamsick_soviet.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8106ed639165c9c25a3a8d450cc846f91ffd747be29ad193aa014e0ef24a335 -size 65664 +oid sha256:296fe653df9b3db2c567b38eb9276b8fc7a7eee3d75eca9b99650fcd72f92e06 +size 22000 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_head_w_adrian_helmet.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_head_w_adrian_helmet.dds index a322753a2..533ff3736 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_head_w_adrian_helmet.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_head_w_adrian_helmet.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f40e9a61060b34f4bffa139107ebb54ddc0e1b17b57b896ba96ccf178fb6d15b -size 1398228 +oid sha256:f5b5673f0a86ba3c6bd37d79e4160073a74e5ace727378bd01ee6c1ddfb59a2b +size 87536 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_heart.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_heart.dds index f6cc1d45a..0aa3f4486 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_heart.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_heart.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a067d7322a5d0d4b59ccd5e6d98c0bae33cb2b19264ef2ab3f3680839cc55f8e -size 65664 +oid sha256:b44ba566bb84ca2a67f9017e445f64b3d8c77c527ca80ed060f3a7acf21e7653 +size 22000 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_herzeg.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_herzeg.dds index 661dce49d..ee014be44 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_herzeg.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_herzeg.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b21063b9e47330d8e2b71ea337748d24cf9236b422cc56923a27fccb98e4168 -size 1048704 +oid sha256:dbc18dacdf174e68708b0cf29f2c8cecc2344707ea6aa5900395a681c3c3473c +size 87536 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_horse_tuva.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_horse_tuva.dds index 303f226a8..dfc1a65da 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_horse_tuva.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_horse_tuva.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17f0c4ff037eea886dd71b129352c19f125b446a7903bd55a5d2b434d165d016 -size 262272 +oid sha256:ab13347f0a00354870fa925c1f05cfbd603ae0e4f6f4ebde3cb956b97edd4246 +size 87536 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_iranallah.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_iranallah.dds index aabdabc64..0cfc6a056 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_ce_iranallah.dds +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_iranallah.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ebf53712f6a869362a8f8b9d350bc86abd079b92da3fca204e64b96476914da2 -size 262272 +oid sha256:43ddb2428751ea794a171dd149fab26f956f6e00afacdadca19c4eae86cfa760 +size 87536 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_reindeer.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_reindeer.dds new file mode 100644 index 000000000..0efc33beb --- /dev/null +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_reindeer.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b038b1c015b0d3d4a581ec6a27419eaa6c57d7d7ca3f9ec7392e709c3fbed0bc +size 349680 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_reindeer_head.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_reindeer_head.dds new file mode 100644 index 000000000..6e65fcf8f --- /dev/null +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_reindeer_head.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66d79e743118c8c72910c00f20d6d2f80ea12d71942870d4bdd39791d1463983 +size 87536 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_star_08.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_star_08.dds new file mode 100644 index 000000000..677f64226 --- /dev/null +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_star_08.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53a1cf0ac0adc34bda77852be9d8afc376b53d0b026550a86f7aff03c3763c24 +size 22000 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_wolverine.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_wolverine.dds new file mode 100644 index 000000000..5d0450ee2 --- /dev/null +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_wolverine.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e0476065c00f3b30f3d85f8e9fb25c73ddb91af18b179364fef401342f4a043 +size 87536 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 6bac9a471..c0d5de524 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 @@ -106,6 +106,8 @@ NEOW_ce_ponticeagle.dds = { colors = 1 category = animals } NEOW_ce_ptarmigan_passant.dds = { colors = 3 category = animals } NEOW_ce_ram_passant.dds = { colors = 3 category = animals } NEOW_ce_ram_rampant.dds = { colors = 3 category = animals } +NEOW_ce_reindeer.dds = { colors = 3 category = animals } +NEOW_ce_reindeer_head.dds = { colors = 3 category = animals } NEOW_ce_salmon.dds = { colors = 3 category = animals } NEOW_ce_salmon_2.dds = { colors = 3 category = animals } NEOW_ce_scorpion.dds = { colors = 3 category = animals } @@ -120,6 +122,7 @@ NEOW_ce_tyrol_eagle.dds = { colors = 3 category = animals } NEOW_ce_wallonia.dds = { colors = 1 category = animals } NEOW_ce_whale.dds = { colors = 3 category = animals } NEOW_ce_winged_serpent.dds = { colors = 3 category = animals } +NEOW_ce_wolverine.dds = { colors = 3 category = animals } ###CROSSES AND KNOTS NEOW_ce_arevakhach.dds = { colors = 1 category = crosses_and_knots } @@ -255,6 +258,7 @@ NEOW_ce_zulfiqar_4.dds = { colors = 1 category = manmade } ###NATURE NEOW_ce_acorn.dds = { colors = 1 category = nature } +NEOW_ce_aurora.dds = { colors = 1 category = nature } NEOW_ce_cedar.dds = { colors = 2 category = nature } NEOW_ce_Domowina.dds = { colors = 3 category = nature } NEOW_ce_drop.dds = { colors = 2 category = nature } @@ -276,8 +280,9 @@ NEOW_ce_paektu.dds = { colors = 1 category = nature } NEOW_ce_palm_leaf.dds = { colors = 1 category = nature } NEOW_ce_pear.dds = { colors = 2 category = nature } NEOW_ce_rosa_camuna.dds = { colors = 1 category = nature } -NEOW_ce_stump.dds = { colors = 1 category = nature } NEOW_ce_sovwreath.dds = { colors = 1 category = nature } +NEOW_ce_stump.dds = { colors = 1 category = nature } +NEOW_ce_star_08.dds = { colors = 2 category = nature } NEOW_ce_taiwan_star.dds = { colors = 1 category = nature } NEOW_ce_tree_fir.dds = { colors = 2 category = nature } NEOW_ce_trefoil.dds = { colors = 1 category = nature } diff --git a/history/provinces/e_finland.txt b/history/provinces/e_finland.txt index fd168898b..e11e91cde 100644 --- a/history/provinces/e_finland.txt +++ b/history/provinces/e_finland.txt @@ -251,27 +251,27 @@ holding = tribal_holding } ###c_akkel -409 = { +8787 = { culture = sami rite = sami_pagan holding = tribal_holding } +409 = { + holding = none +} 407 = { holding = none } -8787 = { - holding = none -} ###c_skolt -401 = { +408 = { culture = sami rite = sami_pagan holding = tribal_holding } -403 = { +401 = { holding = none } -408 = { +403 = { holding = none } 418 = { @@ -321,19 +321,13 @@ 1158.1.1 = { rite = sisuist } } ###c_aland -216 = { - culture = norse - rite = folktro_rite - holding = none - 1066.1.1 = { culture = finnoswede } - 1085.1.1 = { rite = liturgical_rite } -} 217 = { - culture = norse - rite = folktro_rite - holding = none - 1066.1.1 = { culture = finnoswede } - 1085.1.1 = { rite = liturgical_rite } + culture = finnoswede + rite = liturgical_rite + holding = castle_holding +} +216 = { + holding = church_holding } ###c_satakunta 185 = { diff --git a/localization/english/replace/titles_cultural_names_l_english.yml b/localization/english/replace/titles_cultural_names_l_english.yml index aa22a3203..eabd37d38 100644 --- a/localization/english/replace/titles_cultural_names_l_english.yml +++ b/localization/english/replace/titles_cultural_names_l_english.yml @@ -1588,9 +1588,7 @@ cn_sylcyrhc:0 "Sylcyrhc" cn_sylkyrk:0 "Sylkyrk" ## Moray - cn_moireibh:0 "Moireibh" - cn_morai:0 "Morai" - cn_morhay:0 "Morhay" + cn_am_monadh:0 "am Monadh" # Moray cn_eilginn:0 "Eilginn" cn_ylgyn:0 "Ylgyn" @@ -5267,6 +5265,82 @@ cn_ohcejohka:0 "Ohcejohka" cn_utsjok:0 "Utsjok" cn_utsyoki:0 "Utsyoki" + ## Guoldat/Kola + cn_guol_a_act_dat:0 "Guoládat" + cn_kuola:0 "Kuola" + cn_murmansk:0 "Murmansk" + # Murmansk + cn_m_u_mcn_rman:0 "Mūrman" + cn_zapoljarny:0 "Zapoljarny" + cn_zapoljarnyi:0 "Zapoljarnyi" + cn_zapoljarnyj:0 "Zapoljarnyj" + cn_zaoziorsk:0 "Zaoziorsk" + cn_zaozjorsk:0 "Zaozjorsk" + # Ter/Ostrovnoy + cn_ter:0 "Ter" + cn_jofkyj:0 "Jofkyj" + cn_ostrovnoi:0 "Ostrovnoi" + cn_ostrovnoj:0 "Ostrovnoj" + cn_sosnyeffke:0 "Sosnyeffke" + cn_tumannyi:0 "Tumannyi" + cn_g_o_uml_rd_shchelya:0 "Görd Shchelya" + cn_krasno_s_crn_t_s_crn_elje:0 "Krasnoštšelje" + # East Kiilt/Teriberka + cn_kildin:0 "Kildin" + cn_turjanper_a_uml_:0 "Turjanperä" + cn_tyrber:0 "Tyrber" + cn_pu_s_crn_noi:0 "Pušnoi" + # Tersky + cn_turjan:0 "Turjan" + cn_ummp:0 "Ummp" + cn_umpi:0 "Umpi" + # Akkel/Kandalaksha + cn_k_a_uml_ddluhtt:0 "Käddluhtt" + cn_kandalaksja:0 "Kandalaksja" + cn_kantalahti:0 "Kantalahti" + cn_apatiitti:0 "Apatiitti" + cn_apatit:0 "Apatit" + cn_mon_c_crn_e:0 "Monče" + cn_mont_s_crn_egorsk:0 "Montšegorsk" + cn_montjegorsk:0 "Montjegorsk" + cn_montsjegorsk:0 "Montsjegorsk" + # Skolt/Kovdor + c_skolt:0 "Skolt" + cn_koutero:0 "Koutero" + cn_svetlyi:0 "Svetlyi" + cn_yl_a_uml__tuuloma:0 "Ylä-Tuuloma" + ### Finland + cn_finlyandiya:0 "Finlyandiya" + cn_soome:0 "Soome" + cn_suomi:0 "Suomi" + cn_suopma:0 "Suopma" + ## Finland + # Nyland/Uusimaa + cn_nyland:0 "Nyland" + cn_nyland_adj:0 "Nylanding" + cn_helsingfors:0 "Helsingfors" + cn_helsingi:0 "Helsingi" + cn_helsset:0 "Helsset" + cn_khelsinki:0 "Khelsinki" + cn_borg_a_rng_:0 "Borgå" + cn_raasepori:0 "Raasepori" + # Finland + cn__a_rng_bo:0 "Åbo" + cn_turu:0 "Turu" + cn_nystad:0 "Nystad" + # Aland/Åland + cn__a_rng_l_a_act_nda:0 "Ålánda" + cn_ahvenamaa:0 "Ahvenamaa" + cn_ahvenanmaa:0 "Ahvenanmaa" + cn_maarianhamina:0 "Maarianhamina" + cn_mariyekhamn:0 "Mariyekhamn" + # Satakunta + cn_satakunda:0 "Satakunda" + cn_bj_o_uml_rneborg:0 "Björneborg" + cn_raumo:0 "Raumo" + # Pirkanmaa + cn_birkaland:0 "Birkaland" + cn_tammerfors:0 "Tammerfors" # Custom (changed from default) title names: cn_bratislava:0 "Bratislava" @@ -5758,16 +5832,10 @@ cn_angar:0 "Angar" #Finland - cn_raseborg:0 "Raseborg" - cn_raseborg_adj:0 "Raseborger" cn_veckelax:0 "Veckelax" cn_veckelax_adj:0 "Veckelaxer" cn_satakunda:0 "Satakunda" cn_satakunda_adj:0 "Satakundaer" - cn_aland_SWE:0 "Åland" - cn_aland_SWE_adj:0 "Ålander" - cn_ahvenanmaa:0 "Ahvenanmaa" - cn_ahvenanmaa_adj:0 "Ahvenanmaaian" cn_olofsborg:0 "Olofsborg" cn_olofsborg_adj:0 "Olofsborger" cn_olavsborg:0 "Olavsborg" @@ -5882,7 +5950,6 @@ cn_ponoy_adj:0 "Ponoian" cn_sosnovka:0 "Sosnovka" cn_sosnovka_adj:0 "Sosnovkan" - cn_murmansk:0 "Murmansk" #Norway and Iceland cn_alfheimar:0 "Álfheimar" @@ -6982,8 +7049,6 @@ cn_ui_maine_adj:0 "Uí Mháinean" cn_kola:0 "Kola" cn_kola_adj:0 "Kolan" - cn_kuola:0 "Kuola" - cn_kuola_adj:0 "Kuolan" cn_ruija:0 "Ruija" cn_ruija_adj:0 "Ruijan" cn_leporie:0 "Leporie" diff --git a/localization/english/replace/titles_l_english.yml b/localization/english/replace/titles_l_english.yml index 8f01b787c..4b14fbe5e 100644 --- a/localization/english/replace/titles_l_english.yml +++ b/localization/english/replace/titles_l_english.yml @@ -646,7 +646,7 @@ b_kelso:0 "Kelso" b_jedburgh:0 "Jedburgh" b_selkirk:0 "Selkirk" - ## Moray + ## Moray/the Grampians d_moray:0 "the Grampians" d_moray_adj:0 "the Grampians" # Moray @@ -4186,6 +4186,82 @@ b_suenekele:0 "Ivalo" b_aanaarjavri:0 "Inari" b_laggujakka:0 "Utsjoki" + ## Guoldat/Kola + d_guoldat:0 "Kola" + d_guoldat_adj:0 "Kolan" + # Murmansk + c_murmansk:0 "Murmansk" + c_murmansk_adj:0 "Murmanchanin" + b_murmansk:0 "Murmansk" + b_pechengsky:0 "Zapolyarny" + b_vidyayevo:0 "Zaozyorsk" + # Ter/Ostrovnoy + c_ter:0 "Ostrovnoy" + c_ter_adj:0 "Ostrovnyanin" + b_jovvkuj:0 "Ostrovnoy" + b_sosnevke:0 "Sosnovka" + b_penne:0 "Kanevka" + # Revda + c_jovvkuj:0 "Revda" + c_jovvkuj_adj:0 "Revdinets" + b_lujavvr:0 "Revda" + b_guoddemjavvr:0 "Mys-Chyorny" + b_lejjavvr:0 "Tumanny" + b_kintus:0 "Krasnoshchelye" + # East Kiilt/Teriberka + c_east_kiilt:0 "Teriberka" + c_east_kiilt_adj:0 "Teriberchanin" + b_tyrber:0 "Teriberka" + b_maselk:0 "Pushnoy" + # Tersky + c_tersky:0 "Tersky" + c_tersky_adj:0 "Tersky" + b_umba:0 "Umba" + b_varzuga:0 "Varzuga" + b_pyalitsa:0 "Chapoma" + # Akkel/Kandalaksha + c_akkel:0 "Kandalaksha" + c_akkel_adj:0 "Kandalakshanin" + b_kaddlhutt:0 "Kandalaksha" + b_akkel:0 "Apatity" + b_cukksual:0 "Olenegorsk" + # Skolt/Kovdor + c_skolt:0 "Kovdor" + c_skolt_adj:0 "Kovdorchanin" + b_saarvesjaurr:0 "Kovdor" + b_suonnjel:0 "Svetlyi" + b_nuottjaurr:0 "Verkhnetulomsky" + b_koulajavri:0 "Alakurtti" + ### Finland + k_finland:0 "Finland" + k_finland_adj:0 "Finnish" + ## Finland + d_finland:0 "Finland" + d_finland_adj:0 "Finnish" + d_finland_pre:0 "Finno" + # Nyland/Uusimaa + c_nyland:0 "Uusimaa" + c_nyland_adj:0 "Uusmaalainen" + b_helsinki:0 "Helsinki" + b_porvoo:0 "Porvoo" + b_raseborg:0 "Raseborg" + b_turku:0 "Turku" + b_salo:0 "Salo" + b_uusikaupunki:0 "Uusikaupunki" + # Aland/Åland + c_aland:0 "Åland" + c_aland_adj:0 "Ålander" + b_mariehamn:0 "Mariehamn" + b_sund:0 "Sund" + # Satakunta + c_satakunta:0 "Satakunta" + c_satakunta_adj:0 "Satakuntan" + b_pori:0 "Pori" + b_rauma:0 "Rauma" + # Pirkanmaa + c_pirkanmaa:0 "Pirkanmaa" + c_pirkanmaa_adj:1 "Pirkanmaalainen" + b_tampere:0 "Tampere" # Custom (changed from default) title names: b_kuusama:0 "Kuusama" @@ -4497,7 +4573,6 @@ b_akhtuba:0 "Akhtuba" b_akhur:0 "Akhur" b_akkar:0 "Akkar" - b_akkel:0 "Akkel" b_akkerman:0 "Akkerman" b_akkube:0 "Akkube" b_akkuduk:0 "Ak-Kuduk" @@ -4934,7 +5009,6 @@ b_arsanjan:0 "Arsanjan" b_arsgul:0 "Arsgul" b_arsinoe:0 "Arsinoë" - b_arsjogk:0 "Arsjogk" b_arslanbek:0 "Arslanbek" b_arsuf:0 "Arsuf" b_arsunda:0 "Årsunda" @@ -6348,7 +6422,6 @@ b_cuixa:0 "Cuixà" b_cujmir:0 "Vânju Mare" b_cukataw:0 "Cükätaw" - b_cukksual:0 "Ču'kksuâl" b_culzean:0 "Culzean" b_cumae:0 "Cumae" b_cuneo:0 "Cuneo" @@ -7487,7 +7560,6 @@ b_gundijan:0 "Gundijan" b_gundorovka:0 "Gundorovka" b_guntur:0 "Guntur" - b_guoddemjavvr:0 "Guoddemjavv'r" b_gurazala:0 "Gurazala" b_gurgan:0 "Gurgan" b_gurganj:0 "Gurganj" @@ -8104,7 +8176,6 @@ b_joudreville:0 "Joudreville" b_jouillat:0 "Jouillat" b_journie:0 "Journie" - b_jovvkuj:0 "Jovvkuj" b_joyeuse:0 "Joyeuse" b_jubail:0 "Jubail" b_judaidah:0 "Judaudah" @@ -8603,7 +8674,6 @@ b_kinilov:0 "Kinilov" b_kinsarvik:0 "Kinsarvik" b_kintore:0 "Kintore" - b_kintus:0 "Kintuš" b_kios:0 "Kios" b_kiparissia:0 "Kiparissia" b_kipchak:0 "Kipchak" @@ -8813,7 +8883,6 @@ b_kotovo:0 "Kotovo" b_kotte:1 "Kelaniya" b_kotyaion:0 "Kotyaion" - b_koulajavri:0 "Koulajävri" b_koumbi_saleh:0 "Koumbi Saleh" b_koutajoki:0 "Koutajoki" b_kouyunik:0 "Kouyunik" @@ -9149,7 +9218,6 @@ b_leiningen:0 "Leiningen" b_leisi:0 "Leisi" b_leith:0 "Leith" - b_lejjavvr:0 "Lejjavv'r" b_lejre:0 "Lejre" b_lek:0 "Lek" b_lekastrom:0 "Lekastrom" @@ -9342,7 +9410,6 @@ b_lughaya:0 "Lughaya" b_lugny:0 "Lugny" b_lugos:0 "Lugoj" - b_lujavvr:0 "Lujavv'r" b_lukh:0 "Lukh" b_lukow:0 "Łuków" b_lulea:0 "Luleå" @@ -9624,7 +9691,6 @@ b_masaka:0 "Masaka" b_masal:0 "Masal" b_masau:0 "Masau" - b_maselk:0 "Masel'k" b_mashala:0 "Mashala" b_mashgarah:0 "Mashgarah" b_mashhad:0 "Mashhad" @@ -10370,7 +10436,6 @@ b_numaligarh:0 "Numaligarh" b_nunney:0 "Nunney" b_nuokkijarvi:0 "Nuokkijärvi" - b_nuottjaurr:0 "Nuõ'ttjäu'rr" b_nuqaq:0 "Nuqaq" b_nur:0 "Ostrołęka" b_nurlat:0 "Nurlat" @@ -10705,7 +10770,6 @@ b_penafiel:0 "Peñafiel" b_pendosis:0 "Pendosis" b_penela:0 "Penela" - b_penne:0 "P'enne" b_penuballi:0 "Penuballi" b_penugonda:0 "Penugonda" b_penza:0 "Penza" @@ -10874,7 +10938,6 @@ b_populonia:0 "Populonia" b_pordenone:0 "Maniago" b_pordim:0 "Pordim" - b_pori:0 "Pori" b_porkhov:0 "Porkhov" b_porkhovo:0 "Porkhovo" b_portalegre:0 "Portalegre" @@ -10886,7 +10949,6 @@ b_portoferraio:0 "Portoferraio" b_portoguaro:0 "Portoguaro" b_portotorres:0 "Porto Torres" - b_porvoo:0 "Porvoo" b_posad:0 "Posad" b_poskam:0 "Poskam" b_postyen:0 "Pöstyén" @@ -11188,7 +11250,6 @@ b_rarem:0 "Rarem" b_ras_elma:0 "Ras el Má" b_rasak:0 "Rasak" - b_raseborg:0 "Raasepori" b_raseiniai:0 "Raseiniai" b_raselma:0 "Ras el Ma" b_rashid:0 "Rashid" @@ -11202,7 +11263,6 @@ b_rathangan:0 "Rathangan" b_ratibor:0 "Jastrzębie-Zdrój" b_ratu:0 "Ratu" - b_rauma:0 "Rauma" b_rauna:0 "Rauna" b_rautu:0 "Rautu" b_ravansar:0 "Ravansar" @@ -11410,7 +11470,6 @@ b_rzhev:0 "Rzhev" b_saa:0 "Saa" b_saan:0 "Saan" - b_saarvesjaurr:0 "Sââ'rvesjäu'rr" b_sabalgarh:0 "Sabalgarh" b_saban:0 "Sab'an" b_sabbioneta:0 "Sabbioneta" @@ -11503,7 +11562,6 @@ b_salliballu:0 "Salliballu" b_salmas:0 "Salmas" b_salmydessus:0 "Kırklareli" - b_salo:0 "Salo" b_salqah:0 "Salqah" b_salt:0 "Salt" b_saltvik:0 "Saltvik" @@ -12143,7 +12201,6 @@ b_sorsele:0 "Sorsele" b_sortavala:0 "Sortavala" b_sosavur:0 "Sosavur" - b_sosnevke:0 "Sosnevke" b_sosnogorsk:0 "Sosnogorsk" b_sosnovyostrov:0 "Sosnovy Ostrov" b_sosnytsia:0 "Sosnytsia" @@ -12360,13 +12417,11 @@ b_sumkino:0 "Sumkino" b_sumy:0 "Sumy" b_sunam:0 "Sunam" - b_sund:0 "Sund" b_sundal:0 "Sundal" b_sundhed:0 "Sundhed" b_sundsvall:0 "Sundsvall" b_sundyr:0 "Sundyr" b_suojarvi:0 "Suojärvi" - b_suonnjel:0 "Suo 'nnjel" b_suoparsaari:0 "Suoparsaari" b_suoyang:0 "Suoyang" b_suqash:0 "Suq Ash" @@ -12980,7 +13035,6 @@ b_turfan:0 "Turfan" b_turgay:0 "Turgay" b_turin:0 "Turin" - b_turku:0 "Turku" b_turna:0 "Turna" b_turnberry:0 "Turnberry" b_turnov:0 "Turnov" @@ -13054,7 +13108,6 @@ b_ulvo:0 "Ulvö" b_uman:0 "Uman" b_umapur:0 "Umapur" - b_umba:0 "Umba" b_umbriatico:0 "Umbriatico" b_umerkote:0 "Umerkote" b_umm_al_nasan:0 "Umm al Nasan" @@ -13224,7 +13277,6 @@ b_varukh:0 "Varukh" b_varviai:0 "Varviai" b_varzaresti:0 "Varzaresti" - b_varzuga:0 "Varzuga" b_vashjird:0 "Vashjird" b_vasilyeva:0 "Vasilyeva" b_vaslui:0 "Vaslui" @@ -13863,8 +13915,6 @@ c_aj_bogd_adj:0 "Aj Bogdi" c_ajayameru:0 "Ajayameru" c_ajayameru_adj:0 "Ajayameru" - c_akkel:0 "Akkel" - c_akkel_adj:0 "Akkelian" c_akordat:0 "Akordat" c_akordat_adj:0 "Akordatian" c_aksu:0 "Aksu" @@ -13891,8 +13941,6 @@ c_al_nasiryah_adj:0 "Al Nasiryahian" c_alampur:0 "Alampur" c_alampur_adj:0 "Alampuran" - c_aland:0 "Åland" - c_aland_adj:0 "Ålander" c_alania:0 "Alania" c_alania_adj:0 "Alanian" c_albania:0 "Albania" @@ -14500,8 +14548,6 @@ c_dyrrachion_adj:0 "Tiranas" c_east-tokharestan:0 "East-Tokharestan" c_east-tokharestan_adj:0 "East-Tokharestani" - c_east_kiilt:0 "East Kiilt" - c_east_kiilt_adj:0 "East Kiiltian" c_eberswalde:0 "Eberswalde" c_eberswalde_adj:0 "Eberswaldenian" c_eichstadt:1 "Eichstätt" @@ -14834,7 +14880,6 @@ c_jihlava_adj:0 "Jihlavan" c_jiruft:0 "Jiruft" c_jiruft_adj:0 "Jiruftian" - c_jovvkuj:0 "Jovvkuj" c_julich:0 "Julich" c_julich_adj:0 "Jülichian" c_juterbog:0 "Jüterbog" @@ -14887,8 +14932,6 @@ c_kanchipuram_adj:0 "Kanchipuram" c_kandail:0 "Kandail" c_kandail_adj:0 "Kandail" - c_kandalax:0 "Kandalax" - c_kandalax_adj:0 "Kandalaxian" c_kandy:1 "Malaya" c_kandy_adj:0 "Malayan" c_kaneia:0 "Kaneia" @@ -15503,8 +15546,6 @@ c_novgorod_seversky_adj:0 "Novgorod-Severskian" c_nubia:0 "Nubia" c_nubia_adj:0 "Nubian" - c_nyland:0 "Nyland" - c_nyland_adj:0 "Nylander" c_nysa:0 "Nysa" c_nysa_adj:0 "Nyski" c_oberbayern:0 "Oberbayern" @@ -15870,8 +15911,6 @@ c_sarykamysh_adj:0 "Sarykamyshi" c_sasaram:0 "Sasaram" c_sasaram_adj:0 "Sasaram" - c_satakunta:0 "Satakunta" - c_satakunta_adj:0 "Satakuntan" c_satfura:0 "Satfura" c_satfura_adj:0 "Satfuran" c_satif:0 "Satif" @@ -16774,9 +16813,6 @@ d_ferrara_adj:0 "Ferraran" d_fes:0 "Fes" d_fes_adj:0 "Fesian" - d_finland:0 "Finland" - d_finland_adj:0 "Finnish" - d_finland_pre:0 "Finno" d_finnish_band:0 "Finnish Band" d_finnish_band_adj:0 "Finnish" d_finnish_pagan_reformed_article:0 "the" @@ -16832,8 +16868,6 @@ d_greater_poland_adj:0 "Greater Polish" d_grodno:0 "Grodno" d_grodno_adj:0 "Grodnian" - d_guoldat:0 "Guoládat" - d_guoldat_adj:0 "Guoládati" d_gurgan:0 "Gurgan" d_gurgan_adj:0 "Gurgani" d_gurjara_mandala:0 "Gurjara Mandala" @@ -17739,8 +17773,6 @@ k_esthonia_adj:0 "Estonian" k_fatimids:0 "Fatimids" k_fatimids_adj:0 "Fatimid" - k_finland:0 "Finland" - k_finland_adj:0 "Finnish" k_finland_pre:0 "Finno" e_finland:0 "Kalevala" e_finland_adj:0 "Kalevalan" @@ -25180,14 +25212,9 @@ c_suondavara:0 "Suondavara" c_suondavara_adj:0 "Suondavaran" - c_skolt:0 "Skolt" - c_skolt_adj:0 "Skoltean" - c_ter:0 "Ter" - c_ter_adj:0 "Terean" c_kintus:0 "Kintuš" c_kintus_adj:0 "Kintušean" - b_kaddlhutt:0 "Käddlhutt" b_skolt:0 "Skolt" b_peliza:0 "Peliza" b_varsiga:0 "Varsiga" @@ -25611,8 +25638,6 @@ #### Finland #### - c_pirkanmaa:0 "Pirkanmaa" - c_pirkanmaa_adj:1 "Pirkanmaa" c_kantahame:0 "Kanta-Häme" c_kantahame_adj:1 "Kanta-Häme" c_paijathame:0 "Päijät-Häme" @@ -25631,11 +25656,9 @@ c_kuopio_adj:1 "Kuopio" c_joensuu:0 "Joensuu" c_joensuu_adj:1 "Joensuu" - b_tampere:0 "Tampere" b_nokia:0 "Nokia" b_pori:0 "Pori" b_rauma:0 "Rauma" - b_mariehamn:0 "Mariehamn" b_kaskinen:0 "Kaskinen" b_vaasa:0 "Vaasa" b_saarijarvi:0 "Saarijärvi" @@ -25646,16 +25669,7 @@ b_kokkola:0 "Kokkola" b_joensuu:0 "Joensuu" b_kitee:0 "Kitee" - b_uusikaupunki:0 "Uusikaupunki" - b_helsinki:0 "Helsinki" b_forssa:0 "Forssa" - c_murmansk:0 "Murmansk" - c_murmansk_adj:0 "Murmanskian" - b_murmansk:0 "Murmansk" - b_pechengsky:0 "Pechengsky" - b_vidyayevo:0 "Vidyayevo" - c_tersky:0 "Tersky" - c_tersky_adj:0 "Terskian" d_west_karelia:0 "West Karelia" d_west_karelia_adj:0 "West Karelian" @@ -26970,11 +26984,9 @@ b_tosno:0 "Tosno" b_putina:0 "Putina" b_eolie:0 "Eolie" - b_tyrber:0 "Tyrber" b_zagares:0 "Žagarė" b_udomlya:0 "Udomlya" b_krasnik:0 "Kraśnik" - b_pyalitsa:0 "Pyalitsa" b_gatchina:0 "Gatchina" b_shugozero:0 "Shugozero" b_ikaalinen:0 "Ikaalinen" diff --git a/map_data/definition.csv b/map_data/definition.csv index 3e4ddca2f..142c3107e 100644 --- a/map_data/definition.csv +++ b/map_data/definition.csv @@ -408,11 +408,11 @@ 407;84;156;131;CUKKSUAL;x 408;126;159;4;SAARVESJAURR;x 409;168;162;132;AKKEL;x -410;0;165;5;LUJAVVR;x -411;42;168;133;LEJJAVVR;x +410;0;165;5;REVDA;x +411;42;168;133;TUMANNY;x 412;84;171;6;ARSJOGK;x -413;126;174;134;GUODDEMJAVVR;x -414;168;177;7;KINTUS;x +413;126;174;134;MYS-CHYORNY;x +414;168;177;7;KRASNOSHCHELYE;x 415;0;180;135;JOVVKUJ;x 416;42;183;8;PENNE;x 417;84;186;136;SOSNEVKE;x diff --git a/map_data/provinces.png b/map_data/provinces.png index 76a70c36b..f07228ea6 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:d3279388227ec1d607b3be4f0431c6302f8969ef4677f45dd096b248d079e4ba -size 2685716 +oid sha256:fb80c92568937f896ccd3836546ca975be2013f9b1ababe2c92d4801bd2826ce +size 2685768