diff --git a/common/landed_titles/zapadoslavia.txt b/common/landed_titles/zapadoslavia.txt index 7d5f77d7..fd75a119 100644 --- a/common/landed_titles/zapadoslavia.txt +++ b/common/landed_titles/zapadoslavia.txt @@ -1215,6 +1215,22 @@ e_zapadoslavia = { province = 3218 color = { 225 125 125 } } + b_cranz = { # Zelenogradsk + province = 13616 + color = { 200 105 130 } + } + b_labiau = { # Polessk + province = 122 + color = { 200 105 130 } + } + } + c_balga = { # Gvardeisk + color = { 210 115 120 } + + b_tapiau = { # Gvardeisk + province = 13615 + color = { 200 105 130 } + } b_bartenstein = { # Bartoszyce province = 3205 color = { 230 165 165 } @@ -1228,11 +1244,11 @@ e_zapadoslavia = { color = { 225 125 125 } } } - c_natangia = { # Chernyakhovsk + c_natangia = { # Znamensk color = { 225 125 125 } - b_insterburg = { # Chernyakhovsk - province = 3206 + b_wehlau = { # Znamensk + province = 13617 color = { 230 165 165 } } b_ostlandsberg = { # Kętrzyn @@ -1263,10 +1279,10 @@ e_zapadoslavia = { province = 120 color = { 190 85 85 } } - b_labiau = { # Polessk - province = 122 - color = { 200 105 130 } - } + b_insterburg = { # Chernyakhovsk + province = 3206 + color = { 230 165 165 } + } } } } diff --git a/common/province_terrain/00_province_terrain.txt b/common/province_terrain/00_province_terrain.txt index d1d85172..d4f7a0d2 100644 --- a/common/province_terrain/00_province_terrain.txt +++ b/common/province_terrain/00_province_terrain.txt @@ -98,7 +98,7 @@ default_coastal_sea=coastal_sea 95=taiga 96=taiga 97=taiga -98=plains +98=taiga 99=taiga 100=taiga 101=taiga @@ -108,7 +108,7 @@ default_coastal_sea=coastal_sea 105=forest 106=forest 107=plains -108=taiga +108=farmlands 109=wetlands 110=plains 111=wetlands @@ -157,7 +157,7 @@ default_coastal_sea=coastal_sea 154=forest 155=forest 156=forest -157=plains +157=hills 158=forest 159=plains 160=plains @@ -2546,7 +2546,7 @@ default_coastal_sea=coastal_sea 2829=plains 2830=plains 2831=plains -2832=plains +2832=tells 2833=plains 2834=plains 2835=plains @@ -2930,9 +2930,9 @@ default_coastal_sea=coastal_sea 3213=forest 3214=forest 3215=forest -3216=plains +3216=tells 3217=plains -3218=plains +3218=forest 3219=forest 3220=forest 3221=mountains @@ -4531,6 +4531,7 @@ default_coastal_sea=coastal_sea 4930=forest 4934=forest 4935=forest +4936=tells 4937=forest 4938=forest 4939=forest @@ -11976,4 +11977,7 @@ default_coastal_sea=coastal_sea 13277=mountains 13278=mountains 13279=mountains -13428=wasteland \ No newline at end of file +13428=wasteland +13615=forest +13616=hills +13617=forest \ No newline at end of file diff --git a/gfx/map/map_object_data/activities.txt b/gfx/map/map_object_data/activities.txt index c5e23769..a56587c0 100644 --- a/gfx/map/map_object_data/activities.txt +++ b/gfx/map/map_object_data/activities.txt @@ -757,14 +757,14 @@ } { id=119 - position={ 2087.038330 0.000000 3510.830566 } + position={ 2067.022705 0.000000 3529.065430 } rotation={ -0.000000 -0.425362 -0.000000 0.905023 } scale={ 1.000000 1.000000 1.000000 } } { id=120 - position={ 2106.578857 0.000000 3505.915771 } - rotation={ -0.000000 -0.469163 -0.000000 0.883112 } + position={ 2132.554932 0.000000 3516.069336 } + rotation={ -0.000000 -0.345605 -0.000000 -0.938380 } scale={ 1.000000 1.000000 1.000000 } } { @@ -775,7 +775,7 @@ } { id=122 - position={ 2050.454346 0.000000 3509.824219 } + position={ 2057.918945 0.000000 3496.019775 } rotation={ -0.000000 -0.270013 -0.000000 0.962857 } scale={ 1.000000 1.000000 1.000000 } } @@ -979,13 +979,13 @@ } { id=156 - position={ 2127.418701 0.000000 3517.114014 } + position={ 2157.402832 0.000000 3516.812256 } rotation={ -0.000000 0.304533 -0.000000 0.952502 } scale={ 1.000000 1.000000 1.000000 } } { id=157 - position={ 2117.000000 0.000000 3466.000000 } + position={ 2132.866211 0.000000 3466.844971 } rotation={ -0.000000 0.502264 -0.000000 0.864715 } scale={ 1.000000 1.000000 1.000000 } } @@ -16579,25 +16579,25 @@ } { id=3203 - position={ 2048.982910 0.000000 3489.848389 } + position={ 2031.458618 0.000000 3478.429443 } rotation={ -0.000000 -0.366613 -0.000000 0.930373 } scale={ 1.000000 1.000000 1.000000 } } { id=3204 - position={ 2045.057129 0.000000 3444.842041 } + position={ 2112.281494 0.000000 3479.796875 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=3205 - position={ 2063.464355 0.000000 3468.844238 } + position={ 2035.209961 0.000000 3457.521484 } rotation={ -0.000000 -0.263749 -0.000000 0.964591 } scale={ 1.000000 1.000000 1.000000 } } { id=3206 - position={ 2083.285645 0.000000 3486.599854 } + position={ 2102.805908 0.000000 3503.521240 } rotation={ -0.000000 0.270807 -0.000000 0.962634 } scale={ 1.000000 1.000000 1.000000 } } @@ -16657,31 +16657,31 @@ } { id=3216 - position={ 2020.148071 0.000000 3509.863770 } + position={ 2045.635010 0.000000 3508.996338 } rotation={ -0.000000 0.286341 -0.000000 0.958128 } scale={ 1.000000 1.000000 1.000000 } } { id=3217 - position={ 2005.281738 0.000000 3471.232666 } + position={ 2016.449951 0.000000 3468.811035 } rotation={ -0.000000 0.102299 -0.000000 0.994754 } scale={ 1.000000 1.000000 1.000000 } } { id=3218 - position={ 2024.000000 0.000000 3484.000000 } + position={ 2015.926270 0.000000 3499.768555 } rotation={ -0.000000 0.339834 -0.000000 0.940485 } scale={ 1.000000 1.000000 1.000000 } } { id=3219 - position={ 2032.961914 0.000000 3454.755615 } + position={ 2064.516113 0.000000 3467.750244 } rotation={ -0.000000 -0.567214 -0.000000 0.823571 } scale={ 1.000000 1.000000 1.000000 } } { id=3220 - position={ 2022.579224 0.000000 3449.062012 } + position={ 2135.160400 0.000000 3486.861328 } rotation={ -0.000000 -0.303574 -0.000000 0.952808 } scale={ 1.000000 1.000000 1.000000 } } @@ -69665,5 +69665,23 @@ rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } + { + id=13615 + position={ 2048.773926 0.000000 3489.759033 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13616 + position={ 2014.674927 0.000000 3514.072510 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13617 + position={ 2093.062012 0.000000 3487.018799 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } } } diff --git a/gfx/map/map_object_data/building_locators.txt b/gfx/map/map_object_data/building_locators.txt index c4c7a5fa..e652728a 100644 --- a/gfx/map/map_object_data/building_locators.txt +++ b/gfx/map/map_object_data/building_locators.txt @@ -721,13 +721,13 @@ } { id=119 - position={ 2077.623535 0.000000 3517.293457 } + position={ 2096.099609 0.000000 3519.186768 } rotation={ -0.000000 -0.823504 -0.000000 0.567310 } scale={ 1.000000 1.000000 1.000000 } } { id=120 - position={ 2098.077637 0.000000 3500.085449 } + position={ 2109.136475 0.000000 3516.696289 } rotation={ -0.000000 -0.832371 -0.000000 0.554219 } scale={ 1.000000 1.000000 1.000000 } } @@ -739,7 +739,7 @@ } { id=122 - position={ 2043.077637 0.000000 3507.085449 } + position={ 2065.483643 0.000000 3508.552734 } rotation={ -0.000000 -0.968488 -0.000000 -0.249059 } scale={ 1.000000 1.000000 1.000000 } } @@ -943,13 +943,13 @@ } { id=156 - position={ 2130.882812 0.000000 3510.263672 } + position={ 2152.386230 0.000000 3517.877197 } rotation={ -0.000000 -0.503268 -0.000000 -0.864130 } scale={ 1.000000 1.000000 1.000000 } } { id=157 - position={ 2124.077637 0.000000 3463.085449 } + position={ 2126.557617 0.000000 3476.435791 } rotation={ -0.000000 -0.270333 -0.000000 0.962767 } scale={ 1.000000 1.000000 1.000000 } } @@ -985,7 +985,7 @@ } { id=163 - position={ 2148.077637 0.000000 3431.085449 } + position={ 2133.989014 0.000000 3449.413574 } rotation={ -0.000000 -0.476621 -0.000000 -0.879109 } scale={ 1.000000 1.000000 1.000000 } } @@ -16537,25 +16537,25 @@ } { id=3203 - position={ 2055.077637 0.000000 3485.085449 } + position={ 2022.243652 0.000000 3487.430664 } rotation={ -0.000000 -0.097004 -0.000000 -0.995284 } scale={ 1.000000 1.000000 1.000000 } } { id=3204 - position={ 2040.077637 0.000000 3441.085449 } + position={ 2107.054199 0.000000 3473.572998 } rotation={ -0.000000 -0.690770 -0.000000 0.723074 } scale={ 1.000000 1.000000 1.000000 } } { id=3205 - position={ 2069.061768 0.000000 3464.379395 } + position={ 2041.372437 0.000000 3459.818848 } rotation={ -0.000000 -0.647886 -0.000000 0.761737 } scale={ 1.000000 1.000000 1.000000 } } { id=3206 - position={ 2089.237305 0.000000 3483.967773 } + position={ 2102.702881 0.000000 3491.964355 } rotation={ -0.000000 -0.606623 -0.000000 -0.794990 } scale={ 1.000000 1.000000 1.000000 } } @@ -16615,31 +16615,31 @@ } { id=3216 - position={ 2023.423828 0.000000 3501.576660 } + position={ 2028.545166 0.000000 3500.716553 } rotation={ -0.000000 -0.437311 -0.000000 0.899310 } scale={ 1.000000 1.000000 1.000000 } } { id=3217 - position={ 2011.927490 0.000000 3468.211426 } + position={ 2009.583740 0.000000 3475.872070 } rotation={ -0.000000 -0.507327 -0.000000 -0.861754 } scale={ 1.000000 1.000000 1.000000 } } { id=3218 - position={ 2026.077637 0.000000 3478.085449 } + position={ 2004.909790 0.000000 3495.339355 } rotation={ -0.000000 -0.428443 -0.000000 0.903569 } scale={ 1.000000 1.000000 1.000000 } } { id=3219 - position={ 2036.077637 0.000000 3461.085449 } + position={ 2063.815674 0.000000 3460.323486 } rotation={ -0.000000 -0.348207 -0.000000 0.937418 } scale={ 1.000000 1.000000 1.000000 } } { id=3220 - position={ 2015.314209 0.000000 3450.913574 } + position={ 2122.466309 0.308594 3487.090820 } rotation={ -0.000000 -0.738763 -0.000000 0.673966 } scale={ 1.000000 1.000000 1.000000 } } @@ -69599,5 +69599,23 @@ rotation={ -0.000000 -0.698612 -0.000000 -0.715501 } scale={ 1.000000 1.000000 1.000000 } } + { + id=13615 + position={ 2063.800781 0.000000 3487.210938 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13616 + position={ 2029.110840 0.000000 3514.271729 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13617 + position={ 2071.702881 0.000000 3487.880615 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } } } diff --git a/gfx/map/map_object_data/combat_locators.txt b/gfx/map/map_object_data/combat_locators.txt index 4e5baf77..4a5934f5 100644 --- a/gfx/map/map_object_data/combat_locators.txt +++ b/gfx/map/map_object_data/combat_locators.txt @@ -763,14 +763,14 @@ } { id=119 - position={ 2065.027588 0.000000 3527.373779 } - rotation={ -0.000000 -0.886769 -0.000000 0.462212 } + position={ 2076.313477 0.000000 3522.179932 } + rotation={ -0.000000 -0.992344 -0.000000 -0.123505 } scale={ 1.000000 1.000000 1.000000 } } { id=120 - position={ 2104.320312 0.000000 3511.555664 } - rotation={ -0.000000 -0.971291 -0.000000 0.237895 } + position={ 2120.908203 0.000000 3513.400146 } + rotation={ -0.000000 -0.998752 -0.000000 -0.049942 } scale={ 1.000000 1.000000 1.000000 } } { @@ -782,7 +782,7 @@ { id=122 position={ 2062.860596 0.000000 3500.923584 } - rotation={ -0.000000 -0.608971 -0.000000 0.793192 } + rotation={ -0.000000 -0.815608 -0.000000 -0.578605 } scale={ 1.000000 1.000000 1.000000 } } { @@ -991,7 +991,7 @@ } { id=157 - position={ 2112.535156 0.000000 3474.599121 } + position={ 2135.599365 0.000000 3469.022461 } rotation={ -0.000000 -0.963198 -0.000000 0.268792 } scale={ 1.000000 1.000000 1.000000 } } @@ -18259,25 +18259,25 @@ } { id=3203 - position={ 2042.000000 0.000000 3486.000000 } - rotation={ -0.000000 -0.829404 -0.000000 0.558650 } + position={ 2031.366455 0.000000 3487.757080 } + rotation={ -0.000000 -0.943906 -0.000000 0.330215 } scale={ 1.000000 1.000000 1.000000 } } { id=3204 - position={ 2060.049805 0.000000 3440.572998 } + position={ 2109.771973 0.000000 3463.603760 } rotation={ -0.000000 -0.895610 -0.000000 0.444839 } scale={ 1.000000 1.000000 1.000000 } } { id=3205 - position={ 2068.008301 0.000000 3475.343262 } + position={ 2046.777100 0.000000 3464.299316 } rotation={ -0.000000 -0.997431 -0.000000 0.071636 } scale={ 1.000000 1.000000 1.000000 } } { id=3206 - position={ 2074.300293 0.000000 3486.307617 } + position={ 2085.345215 0.000000 3505.178223 } rotation={ -0.000000 -0.952715 -0.000000 0.303866 } scale={ 1.000000 1.000000 1.000000 } } @@ -18337,32 +18337,32 @@ } { id=3216 - position={ 2013.000000 0.000000 3511.000000 } - rotation={ -0.000000 -0.578120 -0.000000 0.815952 } + position={ 2039.483032 0.000000 3505.448730 } + rotation={ -0.000000 -0.130373 -0.000000 -0.991465 } scale={ 1.000000 1.000000 1.000000 } } { id=3217 - position={ 2004.634277 0.000000 3478.386963 } + position={ 2020.257935 0.000000 3468.590820 } rotation={ -0.000000 0.301334 -0.000000 0.953519 } scale={ 1.000000 1.000000 1.000000 } } { id=3218 - position={ 2032.000000 0.000000 3492.000000 } + position={ 2015.171631 0.000000 3503.071533 } rotation={ -0.000000 -0.996076 -0.000000 0.088499 } scale={ 1.000000 1.000000 1.000000 } } { id=3219 - position={ 2048.860107 0.000000 3467.996826 } + position={ 2072.637207 0.000000 3458.061523 } rotation={ -0.000000 -0.978703 -0.000000 0.205283 } scale={ 1.000000 1.000000 1.000000 } } { id=3220 - position={ 2026.026855 0.000000 3444.553955 } - rotation={ -0.000000 -0.786069 -0.000000 0.618138 } + position={ 2122.157227 0.000000 3492.020996 } + rotation={ -0.000000 -0.981430 -0.000000 0.191818 } scale={ 1.000000 1.000000 1.000000 } } { @@ -78461,5 +78461,23 @@ rotation={ -0.000000 0.575791 -0.000000 0.817597 } scale={ 1.000000 1.000000 1.000000 } } + { + id=13615 + position={ 2049.820312 0.000000 3478.229736 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13616 + position={ 2024.782349 0.000000 3512.181641 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13617 + position={ 2085.225098 0.000000 3481.108398 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } } } diff --git a/gfx/map/map_object_data/player_stack_locators.txt b/gfx/map/map_object_data/player_stack_locators.txt index 4e1c050e..8965bad8 100644 --- a/gfx/map/map_object_data/player_stack_locators.txt +++ b/gfx/map/map_object_data/player_stack_locators.txt @@ -763,13 +763,13 @@ } { id=119 - position={ 2083.545898 0.000000 3520.207764 } + position={ 2093.681885 0.000000 3513.255859 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=120 - position={ 2103.851074 0.000000 3502.506836 } + position={ 2113.673096 0.000000 3511.182617 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -781,7 +781,7 @@ } { id=122 - position={ 2049.000000 0.000000 3508.000000 } + position={ 2067.918945 0.000000 3510.192383 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -985,7 +985,7 @@ } { id=156 - position={ 2136.665771 0.000000 3514.176758 } + position={ 2144.059570 0.000000 3516.518799 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -1027,7 +1027,7 @@ } { id=163 - position={ 2153.857666 0.000000 3435.579590 } + position={ 2130.463623 0.000000 3444.878174 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -18259,25 +18259,25 @@ } { id=3203 - position={ 2061.000000 0.000000 3487.000000 } + position={ 2036.395508 0.000000 3489.304688 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=3204 - position={ 2049.000000 0.000000 3449.000000 } + position={ 2112.792969 0.000000 3463.937500 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=3205 - position={ 2075.835449 0.000000 3468.699707 } + position={ 2050.855469 0.000000 3466.192627 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=3206 - position={ 2095.159668 0.000000 3485.882324 } + position={ 2087.427002 0.000000 3499.675049 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -18337,31 +18337,31 @@ } { id=3216 - position={ 2026.855469 0.000000 3505.037598 } + position={ 2043.534424 0.000000 3506.609863 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=3217 - position={ 2012.849854 0.000000 3475.125977 } - rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + position={ 2011.407349 0.000000 3472.557373 } + rotation={ -0.000000 -0.209433 -0.000000 0.977823 } scale={ 1.000000 1.000000 1.000000 } } { id=3218 - position={ 2030.000000 0.000000 3483.000000 } + position={ 2014.774292 0.000000 3498.050049 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=3219 - position={ 2038.259644 0.000000 3466.552490 } + position={ 2068.392578 0.000000 3468.648926 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=3220 - position={ 2018.594360 0.000000 3454.310059 } + position={ 2118.395996 0.000000 3495.372314 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -78461,5 +78461,23 @@ rotation={ -0.000000 0.947614 -0.000000 0.319417 } scale={ 1.000000 1.000000 1.000000 } } + { + id=13615 + position={ 2054.544922 0.000000 3482.105713 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13616 + position={ 2033.318481 0.000000 3511.699219 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13617 + position={ 2095.386230 0.000000 3480.365723 } + rotation={ -0.000000 -0.000000 -0.000000 1.000000 } + scale={ 1.000000 1.000000 1.000000 } + } } } diff --git a/gfx/map/map_object_data/siege_locators.txt b/gfx/map/map_object_data/siege_locators.txt index 2b928167..c9f0fcad 100644 --- a/gfx/map/map_object_data/siege_locators.txt +++ b/gfx/map/map_object_data/siege_locators.txt @@ -769,14 +769,14 @@ } { id=119 - position={ 2075.545898 0.000000 3509.207764 } - rotation={ 0.000000 0.992508 0.000000 0.122183 } + position={ 2086.428467 0.000000 3521.091064 } + rotation={ -0.000000 0.605137 -0.000000 0.796122 } scale={ 1.000000 1.000000 1.000000 } } { id=120 - position={ 2089.000000 0.000000 3498.000000 } - rotation={ 0.000000 0.780042 0.000000 0.625727 } + position={ 2120.823975 0.000000 3516.676514 } + rotation={ -0.000000 0.773343 -0.000000 -0.633988 } scale={ 1.000000 1.000000 1.000000 } } { @@ -787,8 +787,8 @@ } { id=122 - position={ 2049.000000 0.000000 3500.000000 } - rotation={ 0.000000 0.937885 0.000000 -0.346946 } + position={ 2059.312012 0.000000 3503.579834 } + rotation={ -0.000000 0.959326 -0.000000 0.282299 } scale={ 1.000000 1.000000 1.000000 } } { @@ -991,14 +991,14 @@ } { id=156 - position={ 2134.197021 0.000000 3500.084717 } + position={ 2151.427734 0.000000 3511.381104 } rotation={ -0.000000 0.986652 -0.000000 -0.162845 } scale={ 1.000000 1.000000 1.000000 } } { id=157 - position={ 2118.000000 0.000000 3456.000000 } - rotation={ 0.000000 0.937885 0.000000 0.346946 } + position={ 2130.835938 0.000000 3467.197510 } + rotation={ -0.000000 0.965361 -0.000000 -0.260918 } scale={ 1.000000 1.000000 1.000000 } } { @@ -1033,7 +1033,7 @@ } { id=163 - position={ 2138.000000 0.000000 3430.000000 } + position={ 2128.016357 0.000000 3452.413086 } rotation={ 0.000000 0.741453 0.000000 0.671005 } scale={ 1.000000 1.000000 1.000000 } } @@ -16585,26 +16585,26 @@ } { id=3203 - position={ 2052.000000 0.000000 3477.000000 } - rotation={ 0.000000 0.983954 0.000000 0.178425 } + position={ 2027.456177 0.000000 3484.183838 } + rotation={ -0.000000 0.930207 -0.000000 -0.367036 } scale={ 1.000000 1.000000 1.000000 } } { id=3204 - position={ 2049.000000 0.000000 3440.000000 } + position={ 2115.134277 0.000000 3469.209229 } rotation={ 0.000000 0.745128 0.000000 -0.666921 } scale={ 1.000000 1.000000 1.000000 } } { id=3205 - position={ 2073.984131 0.000000 3456.293701 } - rotation={ 0.000000 0.961249 0.000000 -0.275683 } + position={ 2038.604980 0.000000 3466.723145 } + rotation={ -0.000000 0.141551 -0.000000 0.989931 } scale={ 1.000000 1.000000 1.000000 } } { id=3206 - position={ 2096.159668 0.000000 3475.882324 } - rotation={ 0.000000 0.936103 0.000000 -0.351727 } + position={ 2097.512207 0.000000 3498.572021 } + rotation={ -0.000000 0.337542 -0.000000 0.941311 } scale={ 1.000000 1.000000 1.000000 } } { @@ -16663,32 +16663,32 @@ } { id=3216 - position={ 2011.925171 0.000000 3501.240967 } - rotation={ -0.000000 0.711854 -0.000000 0.702328 } + position={ 2039.718628 0.000000 3501.958252 } + rotation={ -0.000000 0.715891 -0.000000 -0.698213 } scale={ 1.000000 1.000000 1.000000 } } { id=3217 - position={ 2001.849854 0.000000 3466.125977 } - rotation={ 0.000000 0.773342 0.000000 0.633989 } + position={ 2017.462036 0.000000 3475.112305 } + rotation={ -0.000000 0.840317 -0.000000 -0.542095 } scale={ 1.000000 1.000000 1.000000 } } { id=3218 - position={ 2018.000000 0.000000 3481.000000 } - rotation={ 0.000000 0.569595 0.000000 0.821926 } + position={ 2010.141968 0.000000 3505.006104 } + rotation={ -0.000000 -0.145181 -0.000000 0.989405 } scale={ 1.000000 1.000000 1.000000 } } { id=3219 - position={ 2045.000000 0.000000 3462.000000 } + position={ 2072.453857 0.000000 3460.835449 } rotation={ -0.000000 -0.666921 -0.000000 0.745128 } scale={ 1.000000 1.000000 1.000000 } } { id=3220 - position={ 2019.236572 0.000000 3441.827881 } - rotation={ 0.000000 0.978216 0.000000 -0.207591 } + position={ 2131.743652 0.000000 3491.550049 } + rotation={ -0.000000 0.608352 -0.000000 -0.793668 } scale={ 1.000000 1.000000 1.000000 } } { @@ -73853,5 +73853,23 @@ rotation={ -0.000000 -0.000025 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } + { + id=13615 + position={ 2055.685547 0.000000 3487.874512 } + rotation={ -0.000000 0.617378 -0.000000 0.786667 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13616 + position={ 2024.157104 0.000000 3512.988281 } + rotation={ -0.000000 0.848610 -0.000000 0.529020 } + scale={ 1.000000 1.000000 1.000000 } + } + { + id=13617 + position={ 2081.781738 0.000000 3482.300537 } + rotation={ -0.000000 -0.846171 -0.000000 0.532912 } + scale={ 1.000000 1.000000 1.000000 } + } } } diff --git a/history/provinces/e_zapadoslavia.txt b/history/provinces/e_zapadoslavia.txt index b5dbca26..d4688acc 100644 --- a/history/provinces/e_zapadoslavia.txt +++ b/history/provinces/e_zapadoslavia.txt @@ -602,8 +602,21 @@ holding = castle_holding } 3218 = { # Baltiysk + holding = castle_holding +} +13616 = { # Zelenogradsk holding = city_holding } +122 = { # Polessk + holding = none +} + +###c_balga (Kaliningrad) +13615 = { # Gvardeisk + culture = NEOW_pribaltic + religion = orthodox + holding = castle_holding +} 3205 = { # Bartoszyce holding = church_holding } @@ -613,8 +626,8 @@ 3203 = { # Mamonovo holding = none } -###c_natangia/Chernyakhovsk -3206 = { # Chernyakhovsk +###c_natangia (Znamensk) +13617 = { # Znamensk culture = NEOW_pribaltic religion = orthodox holding = castle_holding @@ -635,13 +648,13 @@ holding = castle_holding } 3220 = { # Gusev - holding = church_holding + holding = none } 120 = { # Neman holding = none } -122 = { # Polessk - holding = none +3206 = { # Chernyakhovsk + holding = church_holding } #k_goralia diff --git a/localization/english/replace/titles_l_english.yml b/localization/english/replace/titles_l_english.yml index 8988e569..a8cb4784 100644 --- a/localization/english/replace/titles_l_english.yml +++ b/localization/english/replace/titles_l_english.yml @@ -3811,7 +3811,6 @@ b_covilha:0 "Covilhã" b_crailsheim:0 "Crailsheim" b_craiova:0 "Craiova" - b_cranz:0 "Cranz" b_crato:0 "Elvas" b_cravant:0 "Cravant" b_crediton:0 "Crediton" @@ -9159,7 +9158,6 @@ b_raffadali:0 "Raffadali" b_rafha:0 "Rafha" b_ragai:0 "Raga'i" - b_ragnit:0 "Neman" b_ragunda:1 "Rafunda" b_ragusa:0 "Ragusa" b_ragusa_italy:0 "Ragusa" @@ -10765,7 +10763,6 @@ b_taoudeni:0 "Taoudeni" b_taoudouch:0 "Taoudouch" b_taouz:0 "Taouz" - b_tapiau:0 "Tapiau" b_taqtaqanah:0 "Taqtaqanah" b_taqyus:0 "Taqyus" b_tara:0 "Tara" @@ -10979,7 +10976,6 @@ b_tiliatepe:0 "Tilia Tepe" b_till:0 "Till" b_tilokpur:0 "Tilokpur" - b_tilsit:0 "Sovetsk" b_tim:0 "Tim" b_timbuktu:0 "Timbuktu" b_timerevo:0 "Timerevo" @@ -16216,9 +16212,6 @@ d_pressburg_adj:0 "Pressburger" d_pronsk:0 "Pronsk" d_pronsk_adj:0 "Pronskian" - d_prussia:0 "Kaliningrad" - d_prussia_adj:0 "Kaliningradyets" - d_prussia_pre:0 "Prusso" d_pruthenians:0 "Pruthenians" d_pruthenians_adj:0 "Pruthenian" d_pskov:0 "Pskov" @@ -24403,8 +24396,6 @@ c_torun_adj:0 "Torunianin" c_angerburg:1 "Ełk" c_angerburg_adj:0 "Ełcki" - c_konigsberg:0 "Kaliningrad" - c_konigsberg_adj:0 "Kaliningradyets" c_allenstein:1 "Olsztyn" c_allenstein_adj:0 "Olsztyński" # @@ -24413,12 +24404,9 @@ b_wislana:1 "Nowy Dwór Gdański" b_graudenz:1 "Kwidzyn" b_braunsberg:1 "Braniewo" - b_laukitten:1 "Baltiysk" - b_konigsberg:1 "Kaliningrad" b_ostlandsberg:1 "Kętrzyn" b_wormditt:1 "Gusev" b_mohrungen:1 "Iława" - b_insterburg:1 "Chernyakhovsk" b_bartenstein:1 "Bartoszyce" b_rastenburg:1 "Mrągowo" b_lautenburg:1 "Węgorzewo" @@ -25521,6 +25509,10 @@ d_gibraltar:0 "Gibraltar" d_gibraltar_adj:0 "Gibraltarian" + #### Zapadoslavia + e_zapadoslavia:0 "Zapadoslavia" + e_zapadoslavia_adj:0 "Zapadoslavian" + e_zapadoslavia_pre:0 "Zapadoslavic" ### Poland c_koszalin:0 "Koszalin" c_koszalin_adj:0 "Koszaliński" @@ -25562,6 +25554,26 @@ d_zakopane_adj:0 "Zakopiański" b_skarzysko_kamienna:0 "Skarżysko-Kamienna" b_starachowice:0 "Starachowice" + ## Prussia + d_prussia:0 "Korolevecgrad" + d_prussia_adj:0 "Korolevgradets" + d_prussia_pre:0 "Korolevecgradsko" + c_konigsberg:0 "Korolevecgrad" + c_konigsberg_adj:0 "Korolevgradets" + b_konigsberg:0 "Korolevecgrad" + b_cranz:0 "Zelenograd" + b_laukitten:0 "Baltiysk" + b_tapiau:0 "Gvardeysk" + c_natangia:0 "Welawa" + c_natangia_adj:0 "Welawski" + b_wehlau:0 "Znamensk" + c_balga:0 "Gvardeysk" + c_balga_adj:0 "Gvardeyskiy" + c_tilsit:0 "Tilsit" + c_tilsit_adj:0 "Tilsitskiy" + b_tilsit:0 "Tilsit" + b_insterburg:0 "Chernyakhovsk" + b_ragnit:0 "Ragnit" ### Czechia c_ceske_budejovice:0 "České Budějovice" diff --git a/map_data/definition.csv b/map_data/definition.csv index c7b5ab0b..640fdeaa 100644 --- a/map_data/definition.csv +++ b/map_data/definition.csv @@ -13613,3 +13613,6 @@ 13612;201;238;55;sea_newfens_bay;x 13613;18;240;231;river_kiel_canal;x 13614;70;65;149;;x +13615;129;209;9;TAPIAU;x +13616;129;19;9;CRANZ;x +13617;129;109;9;WEHLAU;x diff --git a/map_data/provinces.png b/map_data/provinces.png index edaafc92..5fe818ee 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:25655823555bbd424056e2094e4ff8d435534ec45bb4f711067a15a00a146fe9 -size 2479336 +oid sha256:90850b6ef9dfe762872d35221d0cd8702ee46175fe6720a996514a313f123d7e +size 2491591