diff --git a/common/province_terrain/00_province_terrain.txt b/common/province_terrain/00_province_terrain.txt index 597d6723..e74dd801 100644 --- a/common/province_terrain/00_province_terrain.txt +++ b/common/province_terrain/00_province_terrain.txt @@ -470,7 +470,7 @@ default_coastal_sea=coastal_sea 467=hills 468=hills 469=mountains -470=plains +470=farmlands 471=mountains 472=hills 473=plains @@ -3210,8 +3210,8 @@ default_coastal_sea=coastal_sea 3576=plains 3577=mountains 3578=plains -3579=mountains -3580=plains +3579=hills +3580=mountains 3581=mountains 3582=mountains 3583=mountains @@ -3224,11 +3224,11 @@ default_coastal_sea=coastal_sea 3590=mountains 3591=mountains 3592=mountains -3593=mountains -3594=mountains +3593=hills +3594=hills 3595=hills -3596=hills -3597=hills +3596=farmlands +3597=plains 3598=hills 3599=mountains 3600=mountains @@ -3264,9 +3264,9 @@ default_coastal_sea=coastal_sea 3636=mountains 3637=mountains 3638=hills -3639=mountains +3639=hills 3640=hills -3641=mountains +3641=hills 3642=hills 3643=hills 3644=hills @@ -3284,8 +3284,8 @@ default_coastal_sea=coastal_sea 3656=mountains 3657=hills 3658=hills -3659=hills -3660=hills +3659=forest +3660=forest 3661=hills 3662=mountains 3663=mountains @@ -3336,18 +3336,18 @@ default_coastal_sea=coastal_sea 3708=mountains 3709=hills 3710=plains -3711=mountains +3711=hills 3712=mountains -3713=hills -3714=mountains -3715=mountains +3713=plains +3714=hills +3715=hills 3716=mountains 3717=plains 3718=mountains 3719=plains -3720=mountains +3720=hills 3721=mountains -3722=mountains +3722=hills 3723=mountains 3724=mountains 3725=hills diff --git a/common/scripted_triggers/00_clothing_triggers.txt b/common/scripted_triggers/00_clothing_triggers.txt index f4d225ed..a23a6e9b 100644 --- a/common/scripted_triggers/00_clothing_triggers.txt +++ b/common/scripted_triggers/00_clothing_triggers.txt @@ -3168,7 +3168,6 @@ portrait_religious_african_trigger = { ### DDE HRE ### portrait_reichskrone_trigger = { - exists = this OR = { has_primary_title = title:e_european_union } diff --git a/gfx/map/map_object_data/activities.txt b/gfx/map/map_object_data/activities.txt index f9bacef8..efd0cf1c 100644 --- a/gfx/map/map_object_data/activities.txt +++ b/gfx/map/map_object_data/activities.txt @@ -2797,7 +2797,7 @@ } { id=470 - position={ 2084.116943 0.000000 2455.870117 } + position={ 2088.680420 0.000000 2475.354736 } rotation={ -0.000000 -0.283679 -0.000000 0.958919 } scale={ 1.000000 1.000000 1.000000 } } @@ -2809,7 +2809,7 @@ } { id=472 - position={ 2120.412842 0.000000 2348.727051 } + position={ 2105.454346 0.000000 2360.354492 } rotation={ -0.000000 -0.411754 -0.000000 0.911295 } scale={ 1.000000 1.000000 1.000000 } } @@ -18049,7 +18049,7 @@ } { id=3520 - position={ 2118.716064 0.000000 2433.602539 } + position={ 2126.227783 0.000000 2424.489014 } rotation={ -0.000000 -0.627172 -0.000000 0.778880 } scale={ 1.000000 1.000000 1.000000 } } @@ -18409,7 +18409,7 @@ } { id=3580 - position={ 2073.351807 0.000000 2527.755859 } + position={ 2081.462402 0.000000 2537.286865 } rotation={ -0.000000 -0.536139 -0.000000 0.844130 } scale={ 1.000000 1.000000 1.000000 } } @@ -18493,7 +18493,7 @@ } { id=3594 - position={ 2127.375732 0.000000 2583.038086 } + position={ 2122.948486 0.000000 2599.665771 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } @@ -18757,7 +18757,7 @@ } { id=3639 - position={ 2148.797119 0.000000 2428.395264 } + position={ 2140.007080 0.000000 2428.504395 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } @@ -18769,7 +18769,7 @@ } { id=3641 - position={ 2143.000000 0.000000 2405.000000 } + position={ 2139.422852 0.000000 2410.614746 } rotation={ -0.000000 -0.287919 -0.000000 0.957655 } scale={ 1.000000 1.000000 1.000000 } } @@ -19165,7 +19165,7 @@ } { id=3707 - position={ 2130.356445 0.000000 2363.965576 } + position={ 2126.632080 0.000000 2367.811035 } rotation={ -0.000000 0.466060 -0.000000 0.884753 } scale={ 1.000000 1.000000 1.000000 } } @@ -19195,13 +19195,13 @@ } { id=3712 - position={ 2104.194824 0.000000 2361.505859 } + position={ 2090.201660 0.000000 2382.521484 } rotation={ -0.000000 -0.509240 -0.000000 0.860624 } scale={ 1.000000 1.000000 1.000000 } } { id=3713 - position={ 2104.923096 0.000000 2422.773193 } + position={ 2105.136230 0.000000 2441.332275 } rotation={ -0.000000 -0.352460 -0.000000 0.935827 } scale={ 1.000000 1.000000 1.000000 } } @@ -19225,13 +19225,13 @@ } { id=3717 - position={ 2069.693848 0.000000 2419.884766 } + position={ 2070.100586 0.000000 2420.774658 } rotation={ -0.000000 0.297957 -0.000000 0.954579 } scale={ 1.000000 1.000000 1.000000 } } { id=3718 - position={ 2102.176758 0.000000 2502.197266 } + position={ 2110.880859 0.000000 2501.515381 } rotation={ -0.000000 -0.491458 -0.000000 0.870901 } scale={ 1.000000 1.000000 1.000000 } } @@ -19243,7 +19243,7 @@ } { id=3720 - position={ 2098.024658 0.000000 2466.126465 } + position={ 2104.462891 0.000000 2456.694092 } rotation={ -0.000000 -0.717050 -0.000000 0.697022 } scale={ 1.000000 1.000000 1.000000 } } @@ -19267,7 +19267,7 @@ } { id=3724 - position={ 2138.617920 0.000000 2478.115723 } + position={ 2141.036621 0.000000 2464.320068 } rotation={ -0.000000 -0.306306 -0.000000 0.951933 } 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 6e4eb3f9..b84a5eb2 100644 --- a/gfx/map/map_object_data/building_locators.txt +++ b/gfx/map/map_object_data/building_locators.txt @@ -2797,8 +2797,8 @@ } { id=470 - position={ 2076.077637 0.000000 2453.085449 } - rotation={ -0.000000 -0.812819 -0.000000 0.582516 } + position={ 2067.951172 0.000000 2470.017822 } + rotation={ -0.000000 -0.704861 -0.000000 0.709345 } scale={ 1.000000 1.000000 1.000000 } } { @@ -2809,7 +2809,7 @@ } { id=472 - position={ 2120.968262 0.000000 2349.530273 } + position={ 2110.762451 0.000000 2352.164551 } rotation={ -0.000000 -0.264505 -0.000000 0.964384 } scale={ 1.000000 1.000000 1.000000 } } @@ -18049,8 +18049,8 @@ } { id=3520 - position={ 2118.077637 0.000000 2441.085449 } - rotation={ -0.000000 -0.623404 -0.000000 -0.781900 } + position={ 2124.408936 0.000000 2439.701416 } + rotation={ -0.000000 -0.988753 -0.000000 -0.149555 } scale={ 1.000000 1.000000 1.000000 } } { @@ -18409,7 +18409,7 @@ } { id=3580 - position={ 2068.105957 0.000000 2524.309570 } + position={ 2063.498291 0.000000 2528.310303 } rotation={ -0.000000 -0.884900 -0.000000 0.465780 } scale={ 1.000000 1.000000 1.000000 } } @@ -18493,26 +18493,26 @@ } { id=3594 - position={ 2127.077637 0.000000 2576.085449 } - rotation={ -0.000000 -0.568495 -0.000000 -0.822687 } + position={ 2131.225342 0.000000 2593.974121 } + rotation={ -0.000000 0.100325 -0.000000 -0.994955 } scale={ 1.000000 1.000000 1.000000 } } { id=3595 - position={ 2115.077637 0.000000 2540.085449 } - rotation={ -0.000000 -0.086271 -0.000000 0.996272 } + position={ 2113.010498 0.000000 2552.673096 } + rotation={ -0.000000 -0.990293 -0.000000 -0.139001 } scale={ 1.000000 1.000000 1.000000 } } { id=3596 - position={ 2140.077637 0.000000 2561.085449 } - rotation={ -0.000000 -0.699354 -0.000000 0.714776 } + position={ 2146.579102 0.000000 2568.555908 } + rotation={ -0.000000 -0.942008 -0.000000 0.335591 } scale={ 1.000000 1.000000 1.000000 } } { id=3597 - position={ 2142.077637 0.000000 2542.085449 } - rotation={ -0.000000 -0.990392 -0.000000 0.138291 } + position={ 2130.075439 0.000000 2543.811523 } + rotation={ -0.000000 -0.352230 -0.000000 -0.935914 } scale={ 1.000000 1.000000 1.000000 } } { @@ -18757,8 +18757,8 @@ } { id=3639 - position={ 2158.077637 0.000000 2424.085449 } - rotation={ -0.000000 -0.376998 -0.000000 0.926214 } + position={ 2141.541260 0.000000 2433.493164 } + rotation={ -0.000000 -0.011309 -0.000000 0.999936 } scale={ 1.000000 1.000000 1.000000 } } { @@ -18769,8 +18769,8 @@ } { id=3641 - position={ 2146.077637 0.000000 2399.085449 } - rotation={ -0.000000 -0.086441 -0.000000 -0.996257 } + position={ 2151.416504 0.000000 2411.871582 } + rotation={ -0.000000 0.327578 -0.000000 -0.944824 } scale={ 1.000000 1.000000 1.000000 } } { @@ -18787,8 +18787,8 @@ } { id=3644 - position={ 2155.077637 0.000000 2509.085449 } - rotation={ -0.000000 -0.957858 -0.000000 0.287243 } + position={ 2157.627930 0.000000 2518.112793 } + rotation={ -0.000000 -0.499694 -0.000000 -0.866202 } scale={ 1.000000 1.000000 1.000000 } } { @@ -19159,13 +19159,13 @@ } { id=3706 - position={ 2150.077637 0.000000 2379.085449 } - rotation={ -0.000000 -0.398820 -0.000000 -0.917029 } + position={ 2141.373779 0.000000 2373.116211 } + rotation={ -0.000000 -0.784922 -0.000000 -0.619595 } scale={ 1.000000 1.000000 1.000000 } } { id=3707 - position={ 2137.077637 0.000000 2360.085449 } + position={ 2131.569580 0.000000 2361.494385 } rotation={ -0.000000 -0.170700 -0.000000 -0.985323 } scale={ 1.000000 1.000000 1.000000 } } @@ -19195,13 +19195,13 @@ } { id=3712 - position={ 2089.077637 0.000000 2379.085449 } - rotation={ -0.000000 -0.732051 -0.000000 -0.681250 } + position={ 2089.344727 0.000000 2374.308838 } + rotation={ -0.000000 -0.871297 -0.000000 -0.490756 } scale={ 1.000000 1.000000 1.000000 } } { id=3713 - position={ 2094.077637 0.000000 2417.085449 } + position={ 2099.538330 0.000000 2423.596191 } rotation={ -0.000000 -0.988046 -0.000000 0.154162 } scale={ 1.000000 1.000000 1.000000 } } @@ -19213,8 +19213,8 @@ } { id=3715 - position={ 2106.437988 0.000000 2403.602051 } - rotation={ -0.000000 -0.086193 -0.000000 -0.996278 } + position={ 2110.320557 0.000000 2379.994629 } + rotation={ -0.000000 -0.617063 -0.000000 -0.786913 } scale={ 1.000000 1.000000 1.000000 } } { @@ -19225,38 +19225,38 @@ } { id=3717 - position={ 2078.077637 0.000000 2420.085449 } - rotation={ -0.000000 -0.496800 -0.000000 0.867865 } + position={ 2078.569092 0.000000 2411.067383 } + rotation={ -0.000000 -0.121293 -0.000000 0.992617 } scale={ 1.000000 1.000000 1.000000 } } { id=3718 - position={ 2106.077637 0.000000 2486.085449 } + position={ 2111.750000 0.000000 2495.101807 } rotation={ -0.000000 -0.444321 -0.000000 0.895867 } scale={ 1.000000 1.000000 1.000000 } } { id=3719 - position={ 2081.077637 0.000000 2499.085449 } + position={ 2072.832520 0.000000 2504.018311 } rotation={ -0.000000 -0.094600 -0.000000 -0.995515 } scale={ 1.000000 1.000000 1.000000 } } { id=3720 - position={ 2089.077637 0.000000 2471.085449 } - rotation={ -0.000000 -0.907264 -0.000000 0.420561 } + position={ 2087.569336 0.000000 2459.843018 } + rotation={ -0.000000 -0.672463 -0.000000 0.740130 } scale={ 1.000000 1.000000 1.000000 } } { id=3721 - position={ 2128.077637 0.000000 2459.085449 } - rotation={ -0.000000 -0.327822 -0.000000 0.944739 } + position={ 2132.734863 0.000000 2455.208984 } + rotation={ -0.000000 -0.992822 -0.000000 0.119599 } scale={ 1.000000 1.000000 1.000000 } } { id=3722 - position={ 2133.077637 0.000000 2526.085449 } - rotation={ -0.000000 -0.939921 -0.000000 -0.341392 } + position={ 2118.302734 0.000000 2530.435059 } + rotation={ -0.000000 -0.687413 -0.000000 -0.726267 } scale={ 1.000000 1.000000 1.000000 } } { @@ -19267,7 +19267,7 @@ } { id=3724 - position={ 2132.077637 0.000000 2483.085449 } + position={ 2130.373535 0.000000 2485.436279 } rotation={ -0.000000 -0.382534 -0.000000 0.923942 } 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 79e8ea09..66a2d295 100644 --- a/gfx/map/map_object_data/combat_locators.txt +++ b/gfx/map/map_object_data/combat_locators.txt @@ -2815,8 +2815,8 @@ } { id=470 - position={ 2072.076416 0.000000 2469.316162 } - rotation={ -0.000000 0.246073 -0.000000 0.969251 } + position={ 2078.049072 0.000000 2459.207275 } + rotation={ -0.000000 0.619296 -0.000000 0.785157 } scale={ 1.000000 1.000000 1.000000 } } { @@ -2827,8 +2827,8 @@ } { id=472 - position={ 2126.520996 0.000000 2350.872070 } - rotation={ -0.000000 -0.562333 -0.000000 0.826911 } + position={ 2119.081299 0.000000 2344.077881 } + rotation={ -0.000000 -0.102183 -0.000000 0.994766 } scale={ 1.000000 1.000000 1.000000 } } { @@ -19933,8 +19933,8 @@ } { id=3520 - position={ 2101.000000 0.000000 2445.000000 } - rotation={ -0.000000 -0.968215 -0.000000 0.250119 } + position={ 2115.654053 0.000000 2442.397461 } + rotation={ -0.000000 -0.851958 -0.000000 0.523609 } scale={ 1.000000 1.000000 1.000000 } } { @@ -20287,7 +20287,7 @@ } { id=3579 - position={ 2107.801514 0.000000 2522.107910 } + position={ 2101.309082 0.000000 2514.780029 } rotation={ -0.000000 0.353060 -0.000000 0.935601 } scale={ 1.000000 1.000000 1.000000 } } @@ -20377,14 +20377,14 @@ } { id=3594 - position={ 2127.000000 0.000000 2592.000000 } - rotation={ -0.000000 -0.946473 -0.000000 0.322783 } + position={ 2129.757324 0.000000 2586.722656 } + rotation={ -0.000000 -0.973120 -0.000000 0.230300 } scale={ 1.000000 1.000000 1.000000 } } { id=3595 - position={ 2109.000000 0.000000 2560.000000 } - rotation={ -0.000000 -0.911855 -0.000000 0.410513 } + position={ 2113.795898 0.000000 2570.800293 } + rotation={ -0.000000 -0.996594 -0.000000 0.082469 } scale={ 1.000000 1.000000 1.000000 } } { @@ -20641,8 +20641,8 @@ } { id=3639 - position={ 2140.000000 0.000000 2430.000000 } - rotation={ -0.000000 -0.632384 -0.000000 0.774655 } + position={ 2138.587158 0.000000 2430.435059 } + rotation={ -0.000000 -0.445658 -0.000000 0.895203 } scale={ 1.000000 1.000000 1.000000 } } { @@ -20653,8 +20653,8 @@ } { id=3641 - position={ 2138.587646 0.000000 2417.870605 } - rotation={ -0.000000 -0.983468 -0.000000 0.181081 } + position={ 2144.484131 0.000000 2416.304443 } + rotation={ -0.000000 -0.999840 -0.000000 0.017900 } scale={ 1.000000 1.000000 1.000000 } } { @@ -20671,7 +20671,7 @@ } { id=3644 - position={ 2165.850830 0.000000 2517.764160 } + position={ 2165.503174 0.000000 2520.900635 } rotation={ -0.000000 -0.864961 -0.000000 0.501839 } scale={ 1.000000 1.000000 1.000000 } } @@ -20761,8 +20761,8 @@ } { id=3659 - position={ 2157.758545 0.000000 2569.776367 } - rotation={ -0.000000 -0.732256 -0.000000 0.681030 } + position={ 2177.472168 0.000000 2566.547852 } + rotation={ -0.000000 -0.097231 -0.000000 0.995262 } scale={ 1.000000 1.000000 1.000000 } } { @@ -21043,13 +21043,13 @@ } { id=3706 - position={ 2139.000000 0.000000 2381.000000 } - rotation={ -0.000000 -0.751274 -0.000000 0.659990 } + position={ 2140.762207 0.000000 2382.455322 } + rotation={ -0.000000 -0.889564 -0.000000 0.456811 } scale={ 1.000000 1.000000 1.000000 } } { id=3707 - position={ 2152.789795 0.000000 2367.273682 } + position={ 2127.668457 0.000000 2364.554688 } rotation={ -0.000000 -0.991744 -0.000000 0.128234 } scale={ 1.000000 1.000000 1.000000 } } @@ -21079,14 +21079,14 @@ } { id=3712 - position={ 2104.445801 0.000000 2367.479492 } - rotation={ -0.000000 -0.405793 -0.000000 0.913965 } + position={ 2086.615479 0.000000 2379.262939 } + rotation={ -0.000000 -0.843345 -0.000000 0.537372 } scale={ 1.000000 1.000000 1.000000 } } { id=3713 - position={ 2107.347412 0.000000 2426.393066 } - rotation={ -0.000000 -0.438495 -0.000000 0.898734 } + position={ 2103.906006 0.000000 2433.566406 } + rotation={ -0.000000 0.200381 -0.000000 0.979718 } scale={ 1.000000 1.000000 1.000000 } } { @@ -21097,8 +21097,8 @@ } { id=3715 - position={ 2094.518555 -0.859863 2406.506836 } - rotation={ -0.000000 -0.976635 -0.000000 0.214904 } + position={ 2103.751709 -0.859863 2394.398682 } + rotation={ -0.000000 -0.999386 -0.000000 0.035037 } scale={ 1.000000 1.000000 1.000000 } } { @@ -21109,38 +21109,44 @@ } { id=3717 - position={ 2074.841309 0.000000 2437.013672 } - rotation={ -0.000000 -0.944085 -0.000000 0.329701 } + position={ 2083.614258 0.000000 2422.388916 } + rotation={ -0.000000 -0.997257 -0.000000 0.074017 } scale={ 1.000000 1.000000 1.000000 } } { id=3718 - position={ 2109.000000 0.000000 2503.000000 } - rotation={ -0.000000 -0.509436 -0.000000 0.860508 } + position={ 2103.580566 0.000000 2503.226318 } + rotation={ -0.000000 0.099461 -0.000000 0.995041 } scale={ 1.000000 1.000000 1.000000 } } { id=3719 - position={ 2089.941650 0.000000 2496.720215 } - rotation={ -0.000000 0.509818 -0.000000 0.860282 } + position={ 2070.213867 0.000000 2507.007080 } + rotation={ -0.000000 -0.045791 -0.000000 0.998951 } scale={ 1.000000 1.000000 1.000000 } } { id=3720 - position={ 2086.000000 0.000000 2485.000000 } - rotation={ -0.000000 -0.959698 -0.000000 0.281032 } + position={ 2079.371582 0.000000 2435.915771 } + rotation={ -0.000000 -0.993865 -0.000000 0.110601 } scale={ 1.000000 1.000000 1.000000 } } { id=3721 - position={ 2109.294434 0.000000 2459.150391 } + position={ 2117.369141 0.000000 2473.826172 } rotation={ -0.000000 -0.969319 -0.000000 0.245807 } scale={ 1.000000 1.000000 1.000000 } } + { + id=0 + position={ 2105.088623 0.000000 2534.008789 } + rotation={ -0.000000 -0.230068 -0.000000 0.973175 } + scale={ 1.000000 1.000000 1.000000 } + } { id=3722 - position={ 2134.500488 0.000000 2531.218262 } - rotation={ -0.000000 0.110158 -0.000000 0.993914 } + position={ 2105.088623 0.000000 2534.008789 } + rotation={ -0.000000 -0.230068 -0.000000 0.973175 } scale={ 1.000000 1.000000 1.000000 } } { @@ -21151,8 +21157,8 @@ } { id=3724 - position={ 2128.209961 0.000000 2490.979004 } - rotation={ -0.000000 0.303806 -0.000000 0.952734 } + position={ 2144.519531 0.000000 2470.171143 } + rotation={ -0.000000 0.095800 -0.000000 0.995401 } 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 e751f13a..4bddbf5f 100644 --- a/gfx/map/map_object_data/player_stack_locators.txt +++ b/gfx/map/map_object_data/player_stack_locators.txt @@ -2813,9 +2813,15 @@ rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } + { + id=0 + position={ 2075.469238 0.000000 2476.612793 } + rotation={ -0.000000 -0.216440 -0.000000 0.976296 } + scale={ 1.000000 1.000000 1.000000 } + } { id=470 - position={ 2078.000000 0.000000 2461.000000 } + position={ 2075.469238 0.000000 2476.612793 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -2827,7 +2833,7 @@ } { id=472 - position={ 2115.587891 0.000000 2353.267822 } + position={ 2118.562012 0.000000 2354.075439 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -19933,7 +19939,7 @@ } { id=3520 - position={ 2119.000000 0.000000 2447.000000 } + position={ 2122.086670 0.000000 2428.351074 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -20377,19 +20383,19 @@ } { id=3594 - position={ 2131.774170 0.000000 2582.921631 } + position={ 2130.781494 0.000000 2577.222900 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=3595 - position={ 2117.000000 0.000000 2546.000000 } + position={ 2108.972900 0.000000 2560.733154 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=3596 - position={ 2147.000000 0.000000 2565.000000 } + position={ 2156.808105 0.000000 2562.656494 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -20641,7 +20647,7 @@ } { id=3639 - position={ 2163.452148 0.000000 2423.541260 } + position={ 2149.646973 0.000000 2435.265625 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } @@ -20653,7 +20659,7 @@ } { id=3641 - position={ 2149.000000 0.000000 2407.000000 } + position={ 2141.523438 0.000000 2397.802490 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -20671,7 +20677,7 @@ } { id=3644 - position={ 2156.395508 0.000000 2516.229004 } + position={ 2159.157959 0.000000 2524.266846 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -21043,13 +21049,13 @@ } { id=3706 - position={ 2155.000000 0.000000 2383.000000 } + position={ 2147.820801 0.000000 2375.479248 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=3707 - position={ 2139.312988 0.000000 2365.954102 } + position={ 2137.783447 0.000000 2362.749512 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -21079,13 +21085,13 @@ } { id=3712 - position={ 2095.630371 0.000000 2377.095459 } + position={ 2093.762939 0.000000 2377.031494 } rotation={ -0.000000 -0.000000 -0.000000 1.000000 } scale={ 1.000000 1.000000 1.000000 } } { id=3713 - position={ 2098.000000 0.000000 2425.000000 } + position={ 2108.142334 0.000000 2417.986084 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -21097,7 +21103,7 @@ } { id=3715 - position={ 2108.977295 0.000000 2401.884277 } + position={ 2117.945801 0.000000 2375.869141 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -21109,25 +21115,25 @@ } { id=3717 - position={ 2079.000000 0.000000 2428.000000 } + position={ 2086.562012 0.000000 2414.584717 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=3718 - position={ 2107.000000 0.000000 2494.000000 } + position={ 2099.280518 0.000000 2498.208496 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=3719 - position={ 2087.698975 0.000000 2502.245605 } + position={ 2081.234863 0.000000 2499.039551 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } { id=3720 - position={ 2090.000000 0.000000 2478.000000 } + position={ 2085.712158 0.000000 2447.362061 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -21139,7 +21145,7 @@ } { id=3722 - position={ 2138.531982 0.000000 2524.142334 } + position={ 2114.959473 0.000000 2539.014404 } rotation={ -0.000000 -0.216440 -0.000000 0.976296 } scale={ 1.000000 1.000000 1.000000 } } @@ -21151,7 +21157,7 @@ } { id=3724 - position={ 2137.376221 0.000000 2483.049316 } + position={ 2144.248047 0.000000 2474.526123 } 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 0070a29b..e7dc2457 100644 --- a/gfx/map/map_object_data/siege_locators.txt +++ b/gfx/map/map_object_data/siege_locators.txt @@ -2797,8 +2797,8 @@ } { id=470 - position={ 2086.000000 0.000000 2450.000000 } - rotation={ 0.000000 0.802293 0.000000 -0.596931 } + position={ 2079.285889 0.000000 2471.886963 } + rotation={ -0.000000 0.625249 -0.000000 -0.780426 } scale={ 1.000000 1.000000 1.000000 } } { @@ -2809,8 +2809,8 @@ } { id=472 - position={ 2122.000000 0.000000 2343.000000 } - rotation={ 0.000000 0.794707 0.000000 -0.606994 } + position={ 2123.858643 0.000000 2350.581787 } + rotation={ -0.000000 0.733047 -0.000000 -0.680179 } scale={ 1.000000 1.000000 1.000000 } } { @@ -18049,8 +18049,8 @@ } { id=3520 - position={ 2109.000000 0.000000 2438.000000 } - rotation={ 0.000000 0.811242 0.000000 0.584710 } + position={ 2127.832520 0.000000 2430.000244 } + rotation={ -0.000000 0.992437 -0.000000 -0.122756 } scale={ 1.000000 1.000000 1.000000 } } { @@ -18410,7 +18410,7 @@ { id=3580 position={ 2069.000000 0.000000 2520.000000 } - rotation={ 0.000000 0.973249 0.000000 -0.229753 } + rotation={ -0.000000 0.955318 -0.000000 -0.295579 } scale={ 1.000000 1.000000 1.000000 } } { @@ -18493,26 +18493,26 @@ } { id=3594 - position={ 2137.000000 0.000000 2578.000000 } - rotation={ -0.000000 -0.633989 -0.000000 0.773342 } + position={ 2134.365234 0.000000 2583.882812 } + rotation={ -0.000000 -0.984035 -0.000000 0.177973 } scale={ 1.000000 1.000000 1.000000 } } { id=3595 - position={ 2113.000000 0.000000 2530.000000 } - rotation={ 0.000000 0.995133 0.000000 0.098538 } + position={ 2115.491699 0.000000 2559.927979 } + rotation={ -0.000000 -0.151191 -0.000000 0.988504 } scale={ 1.000000 1.000000 1.000000 } } { id=3596 - position={ 2149.000000 0.000000 2560.000000 } - rotation={ 0.000000 0.745128 0.000000 -0.666921 } + position={ 2150.083008 0.000000 2559.071289 } + rotation={ -0.000000 0.962153 -0.000000 -0.272507 } scale={ 1.000000 1.000000 1.000000 } } { id=3597 - position={ 2132.000000 0.000000 2544.000000 } - rotation={ 0.000000 0.633989 0.000000 0.773342 } + position={ 2140.556152 0.000000 2546.409180 } + rotation={ -0.000000 -0.615388 -0.000000 0.788224 } scale={ 1.000000 1.000000 1.000000 } } { @@ -18757,8 +18757,8 @@ } { id=3639 - position={ 2160.000000 0.000000 2413.000000 } - rotation={ 0.000000 0.995959 0.000000 -0.089806 } + position={ 2152.138916 0.000000 2427.562256 } + rotation={ -0.000000 0.893744 -0.000000 -0.448576 } scale={ 1.000000 1.000000 1.000000 } } { @@ -18769,8 +18769,8 @@ } { id=3641 - position={ 2152.000000 0.000000 2392.000000 } - rotation={ 0.000000 0.937885 0.000000 -0.346946 } + position={ 2147.952393 0.000000 2402.099609 } + rotation={ -0.000000 0.997824 -0.000000 0.065927 } scale={ 1.000000 1.000000 1.000000 } } { @@ -18787,8 +18787,8 @@ } { id=3644 - position={ 2146.000000 0.000000 2503.000000 } - rotation={ 0.000000 0.881675 0.000000 0.471858 } + position={ 2164.695801 0.000000 2528.157715 } + rotation={ -0.000000 -0.256596 -0.000000 0.966519 } scale={ 1.000000 1.000000 1.000000 } } { @@ -19159,13 +19159,13 @@ } { id=3706 - position={ 2160.000000 0.000000 2380.000000 } - rotation={ -0.000000 -0.671005 -0.000000 0.741453 } + position={ 2146.290771 0.000000 2381.652100 } + rotation={ -0.000000 -0.240832 -0.000000 0.970567 } scale={ 1.000000 1.000000 1.000000 } } { id=3707 - position={ 2143.000000 0.000000 2352.000000 } + position={ 2137.491943 0.000000 2353.408936 } rotation={ 0.000000 0.948683 0.000000 -0.316228 } scale={ 1.000000 1.000000 1.000000 } } @@ -19195,13 +19195,13 @@ } { id=3712 - position={ 2094.000000 0.000000 2372.000000 } - rotation={ 0.000000 0.952295 0.000000 -0.305177 } + position={ 2096.986572 0.000000 2370.280762 } + rotation={ -0.000000 0.854278 -0.000000 -0.519816 } scale={ 1.000000 1.000000 1.000000 } } { id=3713 - position={ 2103.000000 0.000000 2420.000000 } + position={ 2108.460693 0.000000 2426.510742 } rotation={ -0.000000 -0.584710 -0.000000 0.811242 } scale={ 1.000000 1.000000 1.000000 } } @@ -19213,8 +19213,8 @@ } { id=3715 - position={ 2098.523438 0.000000 2391.479980 } - rotation={ -0.000000 0.960859 -0.000000 0.277038 } + position={ 2116.292480 0.000000 2370.563232 } + rotation={ -0.000000 0.955927 -0.000000 -0.293604 } scale={ 1.000000 1.000000 1.000000 } } { @@ -19225,38 +19225,38 @@ } { id=3717 - position={ 2083.000000 0.000000 2410.000000 } - rotation={ 0.000000 0.973249 0.000000 -0.229753 } + position={ 2089.113770 0.000000 2407.400146 } + rotation={ -0.000000 0.807945 -0.000000 -0.589257 } scale={ 1.000000 1.000000 1.000000 } } { id=3718 - position={ 2097.000000 0.000000 2485.000000 } + position={ 2102.672363 0.000000 2494.016357 } rotation={ 0.000000 0.745128 0.000000 0.666921 } scale={ 1.000000 1.000000 1.000000 } } { id=3719 - position={ 2079.000000 0.000000 2490.000000 } - rotation={ 0.000000 0.994029 0.000000 0.109117 } + position={ 2078.200684 0.000000 2492.246338 } + rotation={ -0.000000 0.979782 -0.000000 -0.200067 } scale={ 1.000000 1.000000 1.000000 } } { id=3720 - position={ 2088.000000 0.000000 2460.000000 } - rotation={ 0.000000 0.998973 0.000000 0.045314 } + position={ 2093.430908 0.000000 2450.912354 } + rotation={ -0.000000 0.938039 -0.000000 -0.346532 } scale={ 1.000000 1.000000 1.000000 } } { id=3721 - position={ 2129.000000 0.000000 2449.000000 } - rotation={ 0.000000 0.998758 0.000000 -0.049814 } + position={ 2123.664551 0.000000 2462.433594 } + rotation={ -0.000000 0.482685 -0.000000 0.875794 } scale={ 1.000000 1.000000 1.000000 } } { id=3722 - position={ 2123.000000 0.000000 2522.000000 } - rotation={ 0.000000 0.828067 0.000000 0.560629 } + position={ 2109.019043 0.000000 2536.319824 } + rotation={ -0.000000 0.489201 -0.000000 0.872171 } scale={ 1.000000 1.000000 1.000000 } } { @@ -19267,7 +19267,7 @@ } { id=3724 - position={ 2138.000000 0.000000 2474.000000 } + position={ 2136.295898 0.000000 2476.350830 } rotation={ 0.000000 0.957092 0.000000 -0.289784 } scale={ 1.000000 1.000000 1.000000 } } diff --git a/gfx/map/terrain/detail_index.tga b/gfx/map/terrain/detail_index.tga index b3e2e625..42fc7820 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:dfb27a26fa6709cdd719d640dd9e20c7c87173a1fcea7d9d99bb1dbe72c4f5b1 +oid sha256:6680a06ee38397d34ecf45d0f599e8caa9b72848ae8310bceb8ababec00ae25f size 169869356 diff --git a/gfx/map/terrain/detail_intensity.tga b/gfx/map/terrain/detail_intensity.tga index a9c4d7e2..52b0083f 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:e9239cebd3d65f8e2746acc76d8fd80b07b31bc6dd0013fe6e8a4300dbfa4796 +oid sha256:d051307c25609310df280a266a879fa316a9e646387b48e803f4ba41c2d9f35f size 169869356 diff --git a/gfx/map/terrain/masks/_debug_mask.png b/gfx/map/terrain/masks/_debug_mask.png index 7424b832..9b5b7de2 100644 --- a/gfx/map/terrain/masks/_debug_mask.png +++ b/gfx/map/terrain/masks/_debug_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c8fb728d4e8bb595cffed86446a284b2d197455325ed22d28ce7012b867e7b4 -size 7346442 +oid sha256:0a14f21d93793fad0a02ffd8216f8fe4a6299f01983bdfa9f10d737864f8f152 +size 7346327 diff --git a/gfx/map/terrain/masks/beach_02_mask.png b/gfx/map/terrain/masks/beach_02_mask.png index b34bc84e..11434dbe 100644 --- a/gfx/map/terrain/masks/beach_02_mask.png +++ b/gfx/map/terrain/masks/beach_02_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:116798fa99c95639e4b17af0c6a4c71e9211b3973ead23d7e7e5baaaedba52b9 -size 4109719 +oid sha256:e8fc589ca7b5260ebbe791aa3034cfa572dcb333af098f5efff4e444d14ebb99 +size 4109718 diff --git a/gfx/map/terrain/masks/beach_02_mediterranean_mask.png b/gfx/map/terrain/masks/beach_02_mediterranean_mask.png index 5881766b..68fd0315 100644 --- a/gfx/map/terrain/masks/beach_02_mediterranean_mask.png +++ b/gfx/map/terrain/masks/beach_02_mediterranean_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee414070fc7a9113c9e9a1e06622190301987f79e5af304ab047b2bc810753bb -size 1492004 +oid sha256:db28e74a1120ea41cafd52b61a56990ab1702c899be5b86b752af86888977b41 +size 1491889 diff --git a/gfx/map/terrain/masks/beach_02_pebbles_mask.png b/gfx/map/terrain/masks/beach_02_pebbles_mask.png index 8896bb5c..524309db 100644 --- a/gfx/map/terrain/masks/beach_02_pebbles_mask.png +++ b/gfx/map/terrain/masks/beach_02_pebbles_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63f884fdcbcb65a995f47ca7c97710a20e81b5b499f61152174dec8ccba8fa98 -size 829672 +oid sha256:1a4c41ed31b4a9f9170f7ef6c0c4be7f849ba1570ee25ad6d25871bbdced5842 +size 829679 diff --git a/gfx/map/terrain/masks/coastline_cliff_grey_mask.png b/gfx/map/terrain/masks/coastline_cliff_grey_mask.png index a93acbb8..53cd6d7f 100644 --- a/gfx/map/terrain/masks/coastline_cliff_grey_mask.png +++ b/gfx/map/terrain/masks/coastline_cliff_grey_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c03618d3a617f44921be2762eb0994b9a4580513224d39c30608220d9cba4a3 -size 931893 +oid sha256:80c7bd5749e42fde173a52abe948cf48fe839ba18c0e5c3efcce76c96a90b2d6 +size 931177 diff --git a/gfx/map/terrain/masks/forest_leaf_01_mask.png b/gfx/map/terrain/masks/forest_leaf_01_mask.png index d9279407..d6daa3a9 100644 --- a/gfx/map/terrain/masks/forest_leaf_01_mask.png +++ b/gfx/map/terrain/masks/forest_leaf_01_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c8719eeb285f3dd09f3b5a80bdbb94562813a829ebf26ead691bd92a01124db -size 1377380 +oid sha256:7f2eec90f0f2421123f4649df1698840079788103c9f3be89065efbcfd119962 +size 1377965 diff --git a/gfx/map/terrain/masks/forestfloor_mask.png b/gfx/map/terrain/masks/forestfloor_mask.png index f123452d..f47b16ee 100644 --- a/gfx/map/terrain/masks/forestfloor_mask.png +++ b/gfx/map/terrain/masks/forestfloor_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:131fcfe9720bce7a042cde7e4b5c0ba6cc2edbd7c6f03ed94b8aecdf786cc998 -size 1728336 +oid sha256:85e2bea3f9173b8f89309a3628670b8ab1808e17c94e8b00e1dd7455e69b5c55 +size 1728264 diff --git a/gfx/map/terrain/masks/hills_01_mask.png b/gfx/map/terrain/masks/hills_01_mask.png index e523f3b0..d9786fd1 100644 --- a/gfx/map/terrain/masks/hills_01_mask.png +++ b/gfx/map/terrain/masks/hills_01_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd133f993986213046be05491fc17a237af1071e2afd8ff5ce94b374862d4d8c -size 2762373 +oid sha256:013221958e57e093e9533297b64b8c7409ff058bdc8b4c4f220cadf444cdb7c0 +size 2762819 diff --git a/gfx/map/terrain/masks/hills_01_rocks_mask.png b/gfx/map/terrain/masks/hills_01_rocks_mask.png index 443fae06..7d0dfa57 100644 --- a/gfx/map/terrain/masks/hills_01_rocks_mask.png +++ b/gfx/map/terrain/masks/hills_01_rocks_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1fe7479b85f8b67afee198960374cf568344178e8754aedd75a6a4462e8a9447 -size 1936093 +oid sha256:21008be063093468ccad009582ae6e691686dc46a0b3fcc6479b119edd546581 +size 1936037 diff --git a/gfx/map/terrain/masks/hills_01_rocks_small_mask.png b/gfx/map/terrain/masks/hills_01_rocks_small_mask.png index 07f29e3f..da44e790 100644 --- a/gfx/map/terrain/masks/hills_01_rocks_small_mask.png +++ b/gfx/map/terrain/masks/hills_01_rocks_small_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d41318aea18326da979ad7af6e10a432cf537ac632c66d2c5ea4422343cdf18b -size 1505940 +oid sha256:a93da00cf7fad3129245e8ac0a6209b81f557677bd9b43c2ef6ba48a628d0939 +size 1506046 diff --git a/gfx/map/terrain/masks/medi_grass_01_mask.png b/gfx/map/terrain/masks/medi_grass_01_mask.png index dc9ddc44..fe103a06 100644 --- a/gfx/map/terrain/masks/medi_grass_01_mask.png +++ b/gfx/map/terrain/masks/medi_grass_01_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fed3178e611b00b5a28a2cbcbd6a9487e5cd38aca7f7962ab5851f4927d74f58 -size 1215475 +oid sha256:63a6a721ce36559c98ef4834e920cb0fc8081706a5594f7c5b0e6215fa6fca8d +size 1216553 diff --git a/gfx/map/terrain/masks/medi_lumpy_grass_mask.png b/gfx/map/terrain/masks/medi_lumpy_grass_mask.png index fdb2eefd..4e18d3c3 100644 --- a/gfx/map/terrain/masks/medi_lumpy_grass_mask.png +++ b/gfx/map/terrain/masks/medi_lumpy_grass_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1f7b7acddad0a844074208abd8976078101213442921a310e115bb017e2055f -size 216987 +oid sha256:34e101b612c77864b96334b55afffb82417474440c957386b4f814a1e7180520 +size 216709 diff --git a/gfx/map/terrain/masks/medi_noisy_grass_mask.png b/gfx/map/terrain/masks/medi_noisy_grass_mask.png index cede2d76..b2e2fa98 100644 --- a/gfx/map/terrain/masks/medi_noisy_grass_mask.png +++ b/gfx/map/terrain/masks/medi_noisy_grass_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6830613dbb53e514c0e7c49d6514f546cb6aed659d640583bc6cbdce42ce80cb -size 329277 +oid sha256:d1c76535753d1b65f3465e269e2607da9f8aad8aa624405dd6b1142708575f2c +size 328641 diff --git a/gfx/map/terrain/masks/plains_01_mask.png b/gfx/map/terrain/masks/plains_01_mask.png index 249ac358..54b72474 100644 --- a/gfx/map/terrain/masks/plains_01_mask.png +++ b/gfx/map/terrain/masks/plains_01_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da901da1fd0042b224d46811cdda3057eea43a4a36cf41651a51db2cf7f466fa -size 3331808 +oid sha256:74b2a23a5647ac7861079a8ee3936779fc0862580222bcd7d3051d24e29c10da +size 3336873 diff --git a/gfx/map/terrain/masks/plains_01_noisy_mask.png b/gfx/map/terrain/masks/plains_01_noisy_mask.png index 049fa580..6ca52436 100644 --- a/gfx/map/terrain/masks/plains_01_noisy_mask.png +++ b/gfx/map/terrain/masks/plains_01_noisy_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3383edf1064a03aa176065f8f0a32dd99e3d97e49b05a2db21fcff02ecc3d541 -size 1648715 +oid sha256:b32962b7b28f43da76e792ccd1b61ab2066228739f5911704cc09c03d3150e05 +size 1650830 diff --git a/gfx/map/terrain/masks/plains_01_rough_mask.png b/gfx/map/terrain/masks/plains_01_rough_mask.png index 53db93cb..a7d379c6 100644 --- a/gfx/map/terrain/masks/plains_01_rough_mask.png +++ b/gfx/map/terrain/masks/plains_01_rough_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d2f532d4c54d0da8cc9fe1ec03f9112b2017593d33082eea975093fff3185dd -size 3106455 +oid sha256:49360680a06d9769e40c979d733c9e80fb5160aa3d0bf04cd3cfacb79e8deb03 +size 3108725 diff --git a/gfx/map/terrain/masks/steppe_bushes_mask.png b/gfx/map/terrain/masks/steppe_bushes_mask.png index 34cb7663..573a6b0a 100644 --- a/gfx/map/terrain/masks/steppe_bushes_mask.png +++ b/gfx/map/terrain/masks/steppe_bushes_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0673ca12d57765df48e631eedfd5f60a47b24293ba318a4a83ce6281b5dba7db -size 2643654 +oid sha256:ccf3b1a34e803dd1d9f947edb47e04d3ad62acd65b05547d9aea08686687e640 +size 2642467 diff --git a/gfx/map/terrain/masks/steppe_grass_mask.png b/gfx/map/terrain/masks/steppe_grass_mask.png index dc4fd4dd..1a2046f0 100644 --- a/gfx/map/terrain/masks/steppe_grass_mask.png +++ b/gfx/map/terrain/masks/steppe_grass_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32beca8f41adadce50857802b9535c4e01e607b3fc17e4a24ad8112e85ad02c8 -size 1380548 +oid sha256:52b308b24d728970be3eb924e06692aba1ba7482519e3cd8c60c02496ee16295 +size 1384060 diff --git a/gfx/map/terrain/masks/steppe_rocks_mask.png b/gfx/map/terrain/masks/steppe_rocks_mask.png index fabd2095..4fedd2fe 100644 --- a/gfx/map/terrain/masks/steppe_rocks_mask.png +++ b/gfx/map/terrain/masks/steppe_rocks_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4673db1881cf04b5d3b139e3d7c0dcfcd159c1c50046cedb2bf21862df12d641 -size 1034724 +oid sha256:64a490f10a16821c8b4110232f529bfd2ca3f951879cb459a3b5f8cc401ae3d9 +size 1033996 diff --git a/gfx/map/terrain/masks/wetlands_02_mask.png b/gfx/map/terrain/masks/wetlands_02_mask.png index 92c39834..b9b77fb0 100644 --- a/gfx/map/terrain/masks/wetlands_02_mask.png +++ b/gfx/map/terrain/masks/wetlands_02_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d96910328a10614ad848cfd6f0cd2c03a5935fb3769c1dda15f5930a432ea1d8 -size 671308 +oid sha256:ed2cb6bd5d173d9a1524cbc1e22862bf6b0aa907a1a4e58bcdbf1b62672ccb84 +size 670695 diff --git a/gfx/map/terrain/masks_gen/gen_central_base_mask.png b/gfx/map/terrain/masks_gen/gen_central_base_mask.png index c2dc708b..e1f24e31 100644 --- a/gfx/map/terrain/masks_gen/gen_central_base_mask.png +++ b/gfx/map/terrain/masks_gen/gen_central_base_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2393286664b9e298711533a3da37a447a361e50e2d54f8922c45b23c5b1e548 -size 4207361 +oid sha256:5446cc1dd7ed9990cb5c2ac3c0df919665f4bc5d59894a571175b4d2e3a3f812 +size 4207939 diff --git a/gfx/map/terrain/masks_gen/gen_central_hills_mask.png b/gfx/map/terrain/masks_gen/gen_central_hills_mask.png index 8718da5e..66262ef2 100644 --- a/gfx/map/terrain/masks_gen/gen_central_hills_mask.png +++ b/gfx/map/terrain/masks_gen/gen_central_hills_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e2c88d1c7486adefce17e724d193e1a9472c297b7ebfba05e498bdf2c591b6f -size 4641607 +oid sha256:0bc175db90436c478be7300fef5de1fcfce57da3cfc28839e9469ae8c67d858b +size 4643150 diff --git a/gfx/map/terrain/masks_gen/gen_central_lowlands_02_mask.png b/gfx/map/terrain/masks_gen/gen_central_lowlands_02_mask.png index 2a8623ea..8b1a96c4 100644 --- a/gfx/map/terrain/masks_gen/gen_central_lowlands_02_mask.png +++ b/gfx/map/terrain/masks_gen/gen_central_lowlands_02_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:646e17c63ae0a8227ae27a25918d9343be47a5a02e32333d638e60b2c0ab1766 -size 6212947 +oid sha256:2c9b262bbddea087aa0568cb11ad35ec330d920f682ebd70849bbf23becbbfcb +size 6214613 diff --git a/gfx/map/terrain/masks_gen/gen_central_lowlands_03_mask.png b/gfx/map/terrain/masks_gen/gen_central_lowlands_03_mask.png index df0f0376..bd84933f 100644 --- a/gfx/map/terrain/masks_gen/gen_central_lowlands_03_mask.png +++ b/gfx/map/terrain/masks_gen/gen_central_lowlands_03_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c49b9cf8689c23051685cf525a729e6c9a8b812bab8e2e7a6e6061ce988bdadd -size 5797325 +oid sha256:106e110e75ef1de1fa9d88b0eed040117308beb9768f1d4d58dace122854e85f +size 5798596 diff --git a/gfx/map/terrain/masks_gen/gen_central_lowlands_mask.png b/gfx/map/terrain/masks_gen/gen_central_lowlands_mask.png index ee0e2abf..00cea105 100644 --- a/gfx/map/terrain/masks_gen/gen_central_lowlands_mask.png +++ b/gfx/map/terrain/masks_gen/gen_central_lowlands_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4f0b0b5f9ecf80885ff2380df6cc4db02a6f3cd926326e098c0944489818b86 -size 6031479 +oid sha256:be92d82381db261fbb741e0e028b70ae1bc961b0eeb3f4ea60dc4c35e3ef6ed6 +size 6032505 diff --git a/gfx/map/terrain/masks_gen/gen_central_mountain_mask.png b/gfx/map/terrain/masks_gen/gen_central_mountain_mask.png index 5ef06cfe..d39eae7f 100644 --- a/gfx/map/terrain/masks_gen/gen_central_mountain_mask.png +++ b/gfx/map/terrain/masks_gen/gen_central_mountain_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f7a37eb021b54875bbdef1d1e3d17216bf939c6c40eb85d0170daf448ba0c4e -size 2407673 +oid sha256:2483b7acae557968b89a3249f09feabec8883e391f6ed5b4804fe6a104950ad5 +size 2407656 diff --git a/gfx/map/terrain/masks_gen/gen_central_mountain_transition_mask.png b/gfx/map/terrain/masks_gen/gen_central_mountain_transition_mask.png index f0a827fa..78fb4d42 100644 --- a/gfx/map/terrain/masks_gen/gen_central_mountain_transition_mask.png +++ b/gfx/map/terrain/masks_gen/gen_central_mountain_transition_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:500c23735dc22de206d6644e558a14f9e5ae6a06a0e01a1ecb2bf27a0a2ec1c1 -size 2447660 +oid sha256:aa677f737d0c696f773f583b1687097aa9828addece9ba8af003e642d99d5796 +size 2447691 diff --git a/gfx/map/terrain/masks_gen/gen_drylands_lowlands_03_mask.png b/gfx/map/terrain/masks_gen/gen_drylands_lowlands_03_mask.png index 54cb9e01..178116cb 100644 --- a/gfx/map/terrain/masks_gen/gen_drylands_lowlands_03_mask.png +++ b/gfx/map/terrain/masks_gen/gen_drylands_lowlands_03_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66b8971d50d6572d95fbda6127989186030e603e1564d56a96a6fbc640dd60bd -size 4850559 +oid sha256:3df7690bd96e66ebff0bf50ae1d59a4cb004ee17367b145af39979de85f41224 +size 4850571 diff --git a/gfx/map/terrain/masks_gen/gen_mediterranean_base_mask.png b/gfx/map/terrain/masks_gen/gen_mediterranean_base_mask.png index 0b74ecfb..90efcb29 100644 --- a/gfx/map/terrain/masks_gen/gen_mediterranean_base_mask.png +++ b/gfx/map/terrain/masks_gen/gen_mediterranean_base_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:166b873bc7e63cf6990f4cfdfb6b57cbd6ee89563c8471e2e457f23841cf7f5f -size 901544 +oid sha256:38f44196c44e2934bf481e14468fa7955d1e0ebc4099fd1ca3b62c9993b448f4 +size 906300 diff --git a/gfx/map/terrain/masks_gen/gen_mediterranean_hills_mask.png b/gfx/map/terrain/masks_gen/gen_mediterranean_hills_mask.png index 17bcbe1a..0754a703 100644 --- a/gfx/map/terrain/masks_gen/gen_mediterranean_hills_mask.png +++ b/gfx/map/terrain/masks_gen/gen_mediterranean_hills_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4253031b1053f4ea0e96bdb8f5749a437fce0bd6baec993f7d66573595c49293 -size 958938 +oid sha256:f9c98750b0c46fa3a2cddd1255f6cafb43ca4a73ea5fa9c15ae93849470c0496 +size 959033 diff --git a/gfx/map/terrain/masks_gen/gen_mediterranean_lowlands_02_mask.png b/gfx/map/terrain/masks_gen/gen_mediterranean_lowlands_02_mask.png index b6830c36..ffc96480 100644 --- a/gfx/map/terrain/masks_gen/gen_mediterranean_lowlands_02_mask.png +++ b/gfx/map/terrain/masks_gen/gen_mediterranean_lowlands_02_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d5c685ea34a9c0708f11c06408b9d0afbdc8cfac77e4f2678d3c324a1668b43 -size 1057003 +oid sha256:c27fef5c87871aa092f7e3a8d15a659d5ced7d9fa2633fa99b9ae997b34b4618 +size 1060966 diff --git a/gfx/map/terrain/masks_gen/gen_mediterranean_lowlands_03_mask.png b/gfx/map/terrain/masks_gen/gen_mediterranean_lowlands_03_mask.png index 8ef0cb6e..d8f41f36 100644 --- a/gfx/map/terrain/masks_gen/gen_mediterranean_lowlands_03_mask.png +++ b/gfx/map/terrain/masks_gen/gen_mediterranean_lowlands_03_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:07dd809c2d0825615872ff4ebaf167a5709f6985ff2ae23c8aab1f0955a85675 -size 1004693 +oid sha256:7602bb10c43bd61c16f85d38eb77ea4d1bff69c4c9d4ebde35dd75fd32c75079 +size 1008592 diff --git a/gfx/map/terrain/masks_gen/gen_mediterranean_lowlands_mask.png b/gfx/map/terrain/masks_gen/gen_mediterranean_lowlands_mask.png index a7df10ae..d9d7b61f 100644 --- a/gfx/map/terrain/masks_gen/gen_mediterranean_lowlands_mask.png +++ b/gfx/map/terrain/masks_gen/gen_mediterranean_lowlands_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:252e80ea014eca3ed7c38b7122e1df931610cdafbe80a447e99eb8045ae79074 -size 989266 +oid sha256:41c04788d82596ecbaa5fc492fd9394b0d42f223973e061493c5f4caefc7af18 +size 992931 diff --git a/gfx/map/terrain/masks_gen/gen_mediterranean_mountain_mask.png b/gfx/map/terrain/masks_gen/gen_mediterranean_mountain_mask.png index b42ec2f4..a785749d 100644 --- a/gfx/map/terrain/masks_gen/gen_mediterranean_mountain_mask.png +++ b/gfx/map/terrain/masks_gen/gen_mediterranean_mountain_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:508b786c5b1710e86c39a32a965ff8aac37fdc5ab2fc34f5177a5bd5cf538840 -size 592230 +oid sha256:af210597eff7885eabe2dd2662d77cc1bdc3b5e6b88e927bc8c45d26b0b4ee49 +size 592440 diff --git a/gfx/map/terrain/masks_gen/gen_mediterranean_mountain_transition_mask.png b/gfx/map/terrain/masks_gen/gen_mediterranean_mountain_transition_mask.png index 2d927fb3..b1dcad5c 100644 --- a/gfx/map/terrain/masks_gen/gen_mediterranean_mountain_transition_mask.png +++ b/gfx/map/terrain/masks_gen/gen_mediterranean_mountain_transition_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c99b5dd1d8473a8ab658d3274ccf8e53e406a1865b99060740df47186c650d1a -size 615735 +oid sha256:89114adb8ac58824b2425dee416927edd5574d906aab9d62e61614b2d84c26f7 +size 615844 diff --git a/gfx/map/terrain/masks_gen/gen_steppe_base_mask.png b/gfx/map/terrain/masks_gen/gen_steppe_base_mask.png index 8ed48800..1ce01292 100644 --- a/gfx/map/terrain/masks_gen/gen_steppe_base_mask.png +++ b/gfx/map/terrain/masks_gen/gen_steppe_base_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e6ea6e51f28869c07d8fd30554829c13b982859416e8aaa0952adfb43034458c -size 2241812 +oid sha256:3733098a42c4e6d5a1429a2e27cc620191e8677aaff5b0806f78696aa74af882 +size 2240971 diff --git a/gfx/map/terrain/masks_gen/gen_steppe_hills_mask.png b/gfx/map/terrain/masks_gen/gen_steppe_hills_mask.png index 0fe222e7..1e5184fc 100644 --- a/gfx/map/terrain/masks_gen/gen_steppe_hills_mask.png +++ b/gfx/map/terrain/masks_gen/gen_steppe_hills_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8bf2bb7b1a091e2a9396b35d0f7455d32d98299d43c020e2c054f57ae3e934c4 -size 1569916 +oid sha256:3edb8a4da91c3e581a1d8b6577d18d939bc2300b0689a470ccb15d97e84226ff +size 1569846 diff --git a/gfx/map/terrain/masks_gen/gen_steppe_lowlands_02_mask.png b/gfx/map/terrain/masks_gen/gen_steppe_lowlands_02_mask.png index a3a94e48..f48f14a9 100644 --- a/gfx/map/terrain/masks_gen/gen_steppe_lowlands_02_mask.png +++ b/gfx/map/terrain/masks_gen/gen_steppe_lowlands_02_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eee5dbab8cec8eed1b60cc59389b60e934f468c3961a4121ec4f20545354d4e7 -size 2360004 +oid sha256:9f23534254327cec166279cf8746337ab01f2780c7a2706339b29125500219d0 +size 2359718 diff --git a/gfx/map/terrain/masks_gen/gen_steppe_lowlands_03_mask.png b/gfx/map/terrain/masks_gen/gen_steppe_lowlands_03_mask.png index bd1a9d56..9ab4c85a 100644 --- a/gfx/map/terrain/masks_gen/gen_steppe_lowlands_03_mask.png +++ b/gfx/map/terrain/masks_gen/gen_steppe_lowlands_03_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4768c7da878cfa223a05fa7ee6effc1d783b5eb99ba7b55ba78603d5f7a88e5d -size 2284435 +oid sha256:4c6cb995a2bfe91eb44ec5c18dbcb2f95741bd8c703bcfcf34ac8eceb4482288 +size 2282911 diff --git a/gfx/map/terrain/masks_gen/gen_steppe_lowlands_mask.png b/gfx/map/terrain/masks_gen/gen_steppe_lowlands_mask.png index 6b5846fd..181e36cf 100644 --- a/gfx/map/terrain/masks_gen/gen_steppe_lowlands_mask.png +++ b/gfx/map/terrain/masks_gen/gen_steppe_lowlands_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7887787885c9da2411cbe21605b5ca5ad1225f71d3a31bed4829516f11bb385 -size 2195336 +oid sha256:81c39964987a5287299cf1d0143866ef8c4f8ceac473c17baeb0658d0da8aed0 +size 2194461 diff --git a/gfx/map/terrain/masks_gen/gen_steppe_mountain_mask.png b/gfx/map/terrain/masks_gen/gen_steppe_mountain_mask.png index cf086f84..bba59a58 100644 --- a/gfx/map/terrain/masks_gen/gen_steppe_mountain_mask.png +++ b/gfx/map/terrain/masks_gen/gen_steppe_mountain_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d70fe92234184e23d06b7f7d9c0f83f0e3b713a2438e6de539a2fae9561b1bd -size 762567 +oid sha256:889ea7b5b47c0204c471cfbebf978847e2ea03093ac498ab2d0181d056925e0c +size 762370 diff --git a/gfx/map/terrain/masks_gen/gen_steppe_mountain_transition_mask.png b/gfx/map/terrain/masks_gen/gen_steppe_mountain_transition_mask.png index 9708b152..5fbc662d 100644 --- a/gfx/map/terrain/masks_gen/gen_steppe_mountain_transition_mask.png +++ b/gfx/map/terrain/masks_gen/gen_steppe_mountain_transition_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06be0eba8e818686aa5d878f27979a24fb639ed4ab964f7eccad729f254d059c -size 929966 +oid sha256:64257b46e9128ccf225b6017cdab49c5592a4291274575bb5a590b2099ae22b2 +size 929344 diff --git a/gfx/map/terrain/masks_gen/gen_tropical_hills_mask.png b/gfx/map/terrain/masks_gen/gen_tropical_hills_mask.png index 2a33f0ad..687ef880 100644 --- a/gfx/map/terrain/masks_gen/gen_tropical_hills_mask.png +++ b/gfx/map/terrain/masks_gen/gen_tropical_hills_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a81156f2d7af2dabbe48a79b5e0747b3b9507e12870b14b9da9ce3c038ca1f32 -size 2113885 +oid sha256:8a2ca235775cd63f8652b90627ed6923fb78226736f253cfd951ebbae4adca2d +size 2113810 diff --git a/gfx/map/terrain/masks_gen/gen_tropical_lowlands_02_mask.png b/gfx/map/terrain/masks_gen/gen_tropical_lowlands_02_mask.png index 0380a00b..e4efecb2 100644 --- a/gfx/map/terrain/masks_gen/gen_tropical_lowlands_02_mask.png +++ b/gfx/map/terrain/masks_gen/gen_tropical_lowlands_02_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4eff3146bb14bbc153d0d95fcb8b3b292fecd5979fb840c8ffcab0c201bb8b64 -size 3148532 +oid sha256:3b0b75f7d819a92a2c3c843bfdb730401928894e49395d8b7a78bf998c6db96a +size 3148477 diff --git a/localization/english/replace/culture/zz_NEOW_cultures_l_english.yml b/localization/english/replace/culture/zz_NEOW_cultures_l_english.yml index 0414128b..073e7fad 100644 --- a/localization/english/replace/culture/zz_NEOW_cultures_l_english.yml +++ b/localization/english/replace/culture/zz_NEOW_cultures_l_english.yml @@ -330,8 +330,8 @@ NEOW_bosnian_collective_noun:0 "Bosnians" NEOW_bosnian_prefix:0 "Bosansko" #Bosnian - NEOW_albanian:0 "Shqip" - NEOW_albanian_collective_noun:0 "Shqip" + NEOW_albanian:0 "Shqiptar" + NEOW_albanian_collective_noun:0 "Albanians" NEOW_albanian_prefix:0 "Shqiptarët" NEOW_arvantika:0 "Arbërisht" NEOW_arvantika_collective_noun:0 "Arvanites"