diff --git a/common/landed_titles/scandinavia.txt b/common/landed_titles/scandinavia.txt index 6cfb2c84..8a32c984 100644 --- a/common/landed_titles/scandinavia.txt +++ b/common/landed_titles/scandinavia.txt @@ -19,7 +19,77 @@ e_scandinavia = { add = @correct_culture_primary_score } } + k_doggerland= { + color = {239 247 254} + + capital = c_favrsted # favrsted + d_doggerland = { + color = { 239 247 254 } + + capital = c_favrsted # favrsted + + c_favrsted = { + color = { 1 1 1 } + + b_favrsted= { + province = 9685 + + color = { 255 245 245 } + } + b_fljot = { + province = 9686 + + color = { 255 245 245 } + } + b_akranes = { + province = 9692 + + color = { 255 245 245 } + } + } + c_hestr = { + color = { 1 1 1 } + + b_melar = { + province = 9687 + + color = { 255 245 245 } + } + b_hestr = { + province = 9688 + + color = { 255 245 245 } + } + } + c_north_doggerland = { + color = { 200 247 254 } + + b_storo = { + province = 9689 + + color = { 1 1 1 } + } + b_flekkevinger = { + province = 9693 + + color = { 1 1 1 } + } + b_ydreoer = { + province = 9690 + + color = { 1 1 1 } + } + b_lileo = { + province = 9691 + + color = { 1 1 1 } + } + } + } + } + + k_iceland = { color = {121 162 156} diff --git a/common/province_terrain/00_province_terrain.txt b/common/province_terrain/00_province_terrain.txt index 5b26d816..8c58a74c 100644 --- a/common/province_terrain/00_province_terrain.txt +++ b/common/province_terrain/00_province_terrain.txt @@ -8860,3 +8860,12 @@ default_coastal_sea=coastal_sea 9681=forest 9682=forest 9683=farmlands +9685=farmlands +9686=farmlands +9687=plains +9688=plains +9689=plains +9690=plains +9691=plains +9692=farmlands +9693=plains \ No newline at end of file diff --git a/gfx/map/terrain/beach_02_mask.png b/gfx/map/terrain/beach_02_mask.png index 6e50c849..f26b2ae8 100644 --- a/gfx/map/terrain/beach_02_mask.png +++ b/gfx/map/terrain/beach_02_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be1394800012db7254c8f8fe88cf907479436b144ac28eef50b483f3f0270fc3 -size 3029680 +oid sha256:5b3f6404db779af8bb2a174ff79fcd9ae070f28ac0bbf34337bab9ac28301df8 +size 3031984 diff --git a/gfx/map/terrain/detail_index.tga b/gfx/map/terrain/detail_index.tga index 9589d7ca..8b9dd3c6 100644 --- a/gfx/map/terrain/detail_index.tga +++ b/gfx/map/terrain/detail_index.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f33a3c76fbd7eddb206cba925691eabbb4df55df528703c75e2eb5d425f93a64 +oid sha256:722a14d98a4d2ffca1792bab91112cefc6f922de1891b8bbe5fed14d22d85a7d size 134217772 diff --git a/gfx/map/terrain/detail_intensity.tga b/gfx/map/terrain/detail_intensity.tga index 27e96ff8..a609ac6c 100644 --- a/gfx/map/terrain/detail_intensity.tga +++ b/gfx/map/terrain/detail_intensity.tga @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c41c9464a958634b7f78ad209345045997716c7be20d44dd3e7f7fb46e51610 +oid sha256:f5034e80f3892ffe612b57aaf30779be8854b0c6daa7198e71cbbd0e25330e56 size 134217772 diff --git a/gfx/map/terrain/farmland_01_mask.png b/gfx/map/terrain/farmland_01_mask.png index f5b9704d..89c159d3 100644 --- a/gfx/map/terrain/farmland_01_mask.png +++ b/gfx/map/terrain/farmland_01_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9bb80f9b74e446cea31a7aacdcc525296c533a2d35874ce3b84851c240b7bd4e -size 208470 +oid sha256:195e7a5fcfff5e02abb3d4c394a7532ca7fd2127c1a531948014077ec11c2ed3 +size 210046 diff --git a/gfx/map/terrain/plains_01_rough_mask.png b/gfx/map/terrain/plains_01_rough_mask.png index 38f16a73..5e50a182 100644 --- a/gfx/map/terrain/plains_01_rough_mask.png +++ b/gfx/map/terrain/plains_01_rough_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce139a703531c6f0422b12e11cdedc2a94172ec3d4bf86ffd05f5c2a5d1929ca -size 4620462 +oid sha256:2f1cb4e347e3b4e319dbc61ceb7f5618b8cbf865362f990cf854c1ac25899e5b +size 4623094 diff --git a/map_data/definition.csv b/map_data/definition.csv index f4287028..dd104cb9 100644 --- a/map_data/definition.csv +++ b/map_data/definition.csv @@ -9683,3 +9683,12 @@ 9682;93;78;41;Cullenagh;x 9683;135;81;169;Connello;x 9684;177;84;42;Dunkerron;x +9685;96;98;76;Favrsted;x +9686;210;42;128;Fljot;x +9687;121;22;75;Melar;x +9688;88;56;125;Hestr;x +9689;253;208;212;Storo;x +9690;11;22;18;Ydreoer;x +9691;136;166;172;Lileo;x +9692;101;105;122;Akranes;x +9693;95;65;192;Flekkevinger;x \ No newline at end of file diff --git a/map_data/heightmap.heightmap b/map_data/heightmap.heightmap index 9374c3ca..13c943aa 100644 --- a/map_data/heightmap.heightmap +++ b/map_data/heightmap.heightmap @@ -3,6 +3,6 @@ indirection_file="map_data/indirection_heightmap.png" original_heightmap_size={ 8192 4096 } tile_size=33 should_wrap_x=no -level_offsets={ { 0 0 } { 0 2953 } { 0 3641 } { 0 3776 } { 0 3793 } } +level_offsets={ { 0 0 } { 0 3151 } { 0 3839 } { 0 3933 } { 0 3980 } } max_compress_level=4 -empty_tile_offset={ 115 66 } +empty_tile_offset={ 176 29 } diff --git a/map_data/heightmap.png b/map_data/heightmap.png index 41895b7b..5cce2d98 100644 --- a/map_data/heightmap.png +++ b/map_data/heightmap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1e3da8070f4e9bfe7f85eac0ad32996dd0a161dcb3880c791ed59194cd288128 -size 17105322 +oid sha256:5a2f879b880c90b97c20c28b9f7641fc91cec8559b7bf2601dd5b74cff87ce95 +size 17080730 diff --git a/map_data/indirection_heightmap.png b/map_data/indirection_heightmap.png index 31ce46bb..2311d176 100644 --- a/map_data/indirection_heightmap.png +++ b/map_data/indirection_heightmap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7da2294c4850d926078eac1955d028e803139a9c2e8ba14409aec945cb259ade -size 22915 +oid sha256:73ff97c720ed3344ca95c9d85936f9c1861557dd42e2898b2236257be307b28c +size 33784 diff --git a/map_data/nodes.dat b/map_data/nodes.dat index 33b95663..7ef45378 100644 Binary files a/map_data/nodes.dat and b/map_data/nodes.dat differ diff --git a/map_data/packed_heightmap.png b/map_data/packed_heightmap.png index 98b72ec9..25375065 100644 --- a/map_data/packed_heightmap.png +++ b/map_data/packed_heightmap.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:13e1ea66c9fafa5f4b7d39a649f769ef256adba7c7482aa4420b4c1177bd865a -size 9047847 +oid sha256:d753abae8b12e1a0a3e16c11f58894c12af167ee8edbd2c49167a9a0a8b66a96 +size 8076856 diff --git a/map_data/provinces.png b/map_data/provinces.png index 547e00b9..3408f495 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:65b9a5106f4c3e1228e72fff8d5bb552c743bac7518307a1ffc8bab2e85f3309 -size 2527507 +oid sha256:27a340720179acbf1116b698610ab3f05e48ef3fa9395a53d9dc1c08d7834251 +size 2528802