From bb1467e91b0cb861aa41f1977cad714aa8bea6f6 Mon Sep 17 00:00:00 2001 From: Magpie490 Date: Sat, 16 Nov 2024 12:24:26 +0000 Subject: [PATCH] added netherlands and another valley --- .../generated/tree_leaf_high_generator_1.txt | 55 +++++++++++++++- .../generated/tree_leaf_high_generator_2.txt | 31 ++++++++- .../generated/tree_leaf_high_generator_3.txt | 62 ++++++++++++++++-- .../generated/tree_pine_01_a_generator_1.txt | 12 +--- .../generated/tree_pine_01_b_generator_1.txt | 43 +++++++++++- .../tree_pine_impassable_01_a_generator_1.txt | 44 ++++++++++++- gfx/map/terrain/beach_02_mask.png | 4 +- gfx/map/terrain/beach_02_pebbles_mask.png | 4 +- gfx/map/terrain/coastline_cliff_grey_mask.png | 4 +- gfx/map/terrain/detail_index.tga | 2 +- gfx/map/terrain/detail_intensity.tga | 2 +- gfx/map/terrain/farmland_01_mask.png | 4 +- gfx/map/terrain/forest_leaf_01_mask.png | 2 +- gfx/map/terrain/hills_01_mask.png | 4 +- gfx/map/terrain/hills_01_rocks_mask.png | 4 +- gfx/map/terrain/hills_01_rocks_small_mask.png | 4 +- gfx/map/terrain/mountain_02_b_mask.png | 4 +- gfx/map/terrain/plains_01_dry_mask.png | 4 +- gfx/map/terrain/plains_01_dry_mud_mask.png | 4 +- gfx/map/terrain/plains_01_mask.png | 4 +- gfx/map/terrain/plains_01_noisy_mask.png | 4 +- gfx/map/terrain/plains_01_rough_mask.png | 4 +- gfx/map/terrain/steppe_01_mask.png | 4 +- gfx/map/terrain/wetlands_02_mask.png | 4 +- map_data/definition.csv | 2 +- map_data/nodes.dat | Bin 2796192 -> 2796192 bytes map_data/provinces.png | 4 +- tools/mapeditor/nudger_settings.json | 40 +++++++++++ 28 files changed, 302 insertions(+), 57 deletions(-) diff --git a/gfx/map/map_object_data/generated/tree_leaf_high_generator_1.txt b/gfx/map/map_object_data/generated/tree_leaf_high_generator_1.txt index 3a0ca73b..8d9106d4 100644 --- a/gfx/map/map_object_data/generated/tree_leaf_high_generator_1.txt +++ b/gfx/map/map_object_data/generated/tree_leaf_high_generator_1.txt @@ -5,7 +5,7 @@ generated_content=yes layer="tree_high_layer" pdxmesh="tree_leaf_01_a_mesh" - count=106614 + count=106665 transform="498.798340 0.000000 255.928192 0.000000 0.791744 0.000000 0.610852 0.751439 0.751439 0.751439 500.656189 0.000000 252.034744 0.000000 0.034582 0.000000 0.999402 0.557614 0.557614 0.557614 499.750549 0.000000 253.986221 0.000000 0.177898 0.000000 0.984049 0.185609 0.185609 0.185609 @@ -41722,16 +41722,31 @@ 1047.263306 0.000000 2853.606934 0.000000 0.427674 0.000000 -0.903933 0.973607 0.973607 0.973607 1045.064453 0.000000 2844.713623 0.000000 0.204565 0.000000 -0.978853 0.985353 0.985353 0.985353 1047.838257 0.000000 2850.845947 0.000000 0.834566 0.000000 -0.550907 0.944496 0.944496 0.944496 +1237.354126 0.000000 2841.576660 0.000000 0.998590 0.000000 -0.053083 0.801379 0.801379 0.801379 1237.622314 0.000000 2869.658691 0.000000 0.098664 0.000000 0.995121 0.711804 0.711804 0.711804 1261.375244 0.000000 2820.238525 0.000000 0.519808 0.000000 -0.854283 0.853183 0.853183 0.853183 +1273.954468 0.000000 2833.104004 0.000000 0.981954 0.000000 -0.189121 0.811400 0.811400 0.811400 1216.383423 0.000000 2815.462402 0.000000 0.271856 0.000000 -0.962338 0.882796 0.882796 0.882796 1258.445923 0.000000 2825.971436 0.000000 0.092571 0.000000 -0.995706 0.991887 0.991887 0.991887 1244.161499 0.000000 2850.028564 0.000000 0.615630 0.000000 0.788036 0.432018 0.432018 0.432018 +1269.525513 0.000000 2833.721924 0.000000 0.977670 0.000000 0.210146 0.768708 0.768708 0.768708 1261.456299 0.000000 2822.733154 0.000000 0.956323 0.000000 -0.292311 0.836733 0.836733 0.836733 +1235.164185 0.000000 2842.755859 0.000000 0.205654 0.000000 0.978625 0.639310 0.639310 0.639310 +1261.922119 0.000000 2856.199463 0.000000 0.533333 0.000000 0.845905 0.652997 0.652997 0.652997 +1257.496582 0.000000 2856.376709 0.000000 0.969072 0.000000 0.246777 0.762649 0.762649 0.762649 +1259.498169 0.000000 2857.910645 0.000000 0.873650 0.000000 0.486554 0.723884 0.723884 0.723884 +1275.241211 0.000000 2831.051025 0.000000 0.458776 0.000000 0.888552 0.636100 0.636100 0.636100 +1272.560303 0.000000 2831.217285 0.000000 0.576205 0.000000 -0.817305 0.941399 0.941399 0.941399 +1276.505737 0.000000 2838.531494 0.000000 0.409636 0.000000 0.912249 0.627927 0.627927 0.627927 +1242.347534 0.000000 2873.415527 0.000000 0.943724 0.000000 0.330734 0.750181 0.750181 0.750181 +1261.440063 0.000000 2854.002197 0.000000 0.566603 0.000000 0.823991 0.658806 0.658806 0.658806 1227.877563 0.000000 2865.878906 0.000000 0.002366 0.000000 0.999997 0.540000 0.540000 0.540000 +1259.296753 0.000000 2850.489258 0.000000 0.687558 0.000000 -0.726129 0.920110 0.920110 0.920110 1256.515015 0.000000 2822.921631 0.000000 0.842306 0.000000 -0.539000 0.984182 0.984182 0.984182 +1253.923706 0.000000 2853.475342 0.000000 0.625755 0.000000 -0.780019 0.934019 0.934019 0.934019 1225.349243 0.000000 2857.055420 0.000000 0.982895 0.000000 -0.184167 0.874727 0.874727 0.874727 1235.886719 0.000000 2868.461182 0.000000 0.840339 0.000000 -0.542061 0.893824 0.893824 0.893824 +1242.168335 0.000000 2850.289062 0.000000 0.678801 0.000000 -0.734322 0.958118 0.958118 0.958118 1243.330933 0.000000 2834.771729 0.000000 0.691668 0.000000 0.722216 0.596917 0.596917 0.596917 1225.295532 0.000000 2853.600098 0.000000 0.914763 0.000000 0.403991 0.677071 0.677071 0.677071 1229.239380 0.000000 2869.885498 0.000000 0.401324 0.000000 -0.915936 1.165371 1.165371 1.165371 @@ -41740,6 +41755,8 @@ 1226.604858 0.000000 2862.174316 0.000000 0.264857 0.000000 -0.964288 1.101819 1.101819 1.101819 1229.966919 0.000000 2868.408447 0.000000 0.118714 0.000000 0.992929 0.341864 0.341864 0.341864 1237.229126 0.000000 2890.922607 0.000000 0.127629 0.000000 -0.991822 0.923911 0.923911 0.923911 +1255.384277 0.000000 2912.598389 0.000000 0.963171 0.000000 0.268888 0.759221 0.759221 0.759221 +1259.296753 0.000000 2914.473633 0.000000 0.537463 0.000000 0.843287 0.649702 0.649702 0.649702 1113.274414 0.000000 3043.996338 0.000000 0.696375 0.000000 -0.717678 0.820783 0.820783 0.820783 1146.170776 0.000000 3039.254639 0.000000 0.849269 0.000000 -0.527961 0.816663 0.816663 0.816663 1141.979858 0.000000 3023.046631 0.000000 0.759981 0.000000 -0.649945 0.822609 0.822609 0.822609 @@ -41798,21 +41815,38 @@ 1295.885742 0.000000 2822.868408 0.000000 0.957292 0.000000 0.289124 0.666435 0.666435 0.666435 1300.624023 0.000000 2833.156006 0.000000 0.989913 0.000000 0.141674 0.733281 0.733281 0.733281 1294.999634 0.000000 2829.941895 0.000000 0.775783 0.000000 -0.631000 1.108218 1.108218 1.108218 +1287.426758 0.000000 2861.960938 0.000000 0.944215 0.000000 0.329329 0.771849 0.771849 0.771849 1289.064575 0.000000 2822.212402 0.000000 0.117622 0.000000 -0.993058 1.467412 1.467412 1.467412 1292.329590 0.000000 2824.179932 0.000000 0.221365 0.000000 -0.975191 1.408266 1.408266 1.408266 1331.784546 0.000000 2815.749268 0.000000 0.997613 0.000000 0.069052 0.793513 0.793513 0.793513 +1340.735352 0.000000 2863.636230 0.000000 0.784835 0.000000 -0.619705 0.866744 0.866744 0.866744 1291.722900 0.000000 2827.596924 0.000000 0.477346 0.000000 -0.878715 1.303691 1.303691 1.303691 1298.584351 0.000000 2821.355469 0.000000 0.838477 0.000000 0.544937 0.530657 0.530657 0.530657 +1332.448608 0.000000 2828.592041 0.000000 0.143101 0.000000 0.989708 0.660327 0.660327 0.660327 +1299.077759 0.000000 2860.876953 0.000000 0.177374 0.000000 -0.984143 0.966867 0.966867 0.966867 1297.175537 0.000000 2825.602051 0.000000 0.950250 0.000000 0.311488 0.656390 0.656390 0.656390 1309.020264 0.000000 2861.615967 0.000000 0.768278 0.000000 0.640116 0.715370 0.715370 0.715370 1299.041992 0.000000 2831.065674 0.000000 0.122468 0.000000 -0.992472 1.450709 1.450709 1.450709 +1305.656006 0.000000 2878.412598 0.000000 0.449527 0.000000 -0.893267 0.943395 0.943395 0.943395 1325.201904 0.000000 2838.582520 0.000000 0.149055 0.000000 0.988829 0.601309 0.601309 0.601309 +1335.668335 0.000000 2829.004395 0.000000 0.084557 0.000000 0.996419 0.577387 0.577387 0.577387 +1290.239014 0.000000 2850.776367 0.000000 0.880092 0.000000 0.474803 0.731820 0.731820 0.731820 1294.391724 0.000000 2820.573975 0.000000 0.950186 0.000000 -0.311684 0.941171 0.941171 0.941171 +1301.888428 0.000000 2849.045410 0.000000 0.742796 0.000000 0.669518 0.690118 0.690118 0.690118 +1298.033203 0.000000 2851.514160 0.000000 0.544625 0.000000 0.838680 0.650978 0.650978 0.650978 +1300.342041 0.000000 2847.022461 0.000000 0.954425 0.000000 0.298451 0.754602 0.754602 0.754602 1284.376831 0.000000 2819.095703 0.000000 0.680432 0.000000 0.732812 0.510899 0.510899 0.510899 1323.490356 0.000000 2857.910645 0.000000 0.232887 0.000000 -0.972504 1.013425 1.013425 1.013425 +1289.435913 0.000000 2860.711670 0.000000 0.977425 0.000000 0.211282 0.768961 0.768961 0.768961 +1318.806519 0.000000 2875.031006 0.000000 0.425806 0.000000 -0.904814 0.969407 0.969407 0.969407 1301.049438 0.000000 2821.179932 0.000000 0.076562 0.000000 0.997065 0.086778 0.086778 0.086778 +1297.467896 0.000000 2862.621826 0.000000 0.998299 0.000000 0.058308 0.791261 0.791261 0.791261 +1307.189087 0.000000 2876.209717 0.000000 0.425177 0.000000 0.905110 0.630488 0.630488 0.630488 +1303.232056 0.000000 2853.606934 0.000000 0.048882 0.000000 -0.998805 1.027969 1.027969 1.027969 1325.432251 0.000000 2854.002197 0.000000 0.999814 0.000000 0.019301 0.797147 0.797147 0.797147 1298.963501 0.000000 2834.659912 0.000000 0.981603 0.000000 0.190932 0.736307 0.736307 0.736307 +1342.930298 0.000000 2864.318848 0.000000 0.276057 0.000000 0.961141 0.606601 0.606601 0.606601 +1290.815918 0.000000 2858.987305 0.000000 0.092313 0.000000 -0.995730 1.024399 1.024399 1.024399 1300.394287 0.000000 2828.979492 0.000000 0.788059 0.000000 -0.615599 1.109924 1.109924 1.109924 1337.190552 0.000000 2815.383057 0.000000 0.354944 0.000000 0.934888 0.356091 0.356091 0.356091 1282.409058 0.000000 2818.231445 0.000000 0.533030 0.000000 0.846096 0.411211 0.411211 0.411211 @@ -41835,6 +41869,7 @@ 1315.249023 0.000000 2856.999023 0.000000 0.720468 0.000000 0.693488 0.634704 0.634704 0.634704 1296.741333 0.000000 2820.906006 0.000000 0.891985 0.000000 -0.452065 1.013605 1.013605 1.013605 1301.286499 0.000000 2825.018066 0.000000 0.080372 0.000000 0.996765 0.112415 0.112415 0.112415 +1295.745483 0.000000 2863.388428 0.000000 0.141292 0.000000 -0.989968 1.102536 1.102536 1.102536 1321.542847 0.000000 2854.373779 0.000000 0.266696 0.000000 -0.963781 1.226084 1.226084 1.226084 1318.061768 0.000000 2855.634277 0.000000 0.971318 0.000000 0.237784 0.718005 0.718005 0.718005 1298.304199 0.000000 2819.424072 0.000000 0.617326 0.000000 0.786708 0.469060 0.469060 0.469060 @@ -41844,11 +41879,13 @@ 1299.953613 0.000000 2822.591064 0.000000 0.247353 0.000000 0.968926 0.198524 0.198524 0.198524 1292.574829 0.000000 2826.005371 0.000000 0.759509 0.000000 -0.650497 1.119682 1.119682 1.119682 1293.500000 0.000000 2830.917725 0.000000 0.947633 0.000000 -0.319361 0.929193 0.929193 0.929193 +1292.528809 0.000000 2862.997070 0.000000 0.435215 0.000000 0.900326 0.515781 0.515781 0.515781 1303.917603 0.000000 2823.454346 0.000000 0.107766 0.000000 -0.994176 1.270378 1.270378 1.270378 1301.900391 0.000000 2819.659424 0.000000 0.800384 0.000000 -0.599488 0.941234 0.941234 0.941234 1323.768921 0.000000 2853.562988 0.000000 0.963317 0.000000 -0.268366 0.862947 0.862947 0.862947 1288.344604 0.000000 2820.571045 0.000000 0.365185 0.000000 -0.930935 1.347453 1.347453 1.347453 1333.250854 0.000000 2816.642578 0.000000 0.587698 0.000000 -0.809081 1.214165 1.214165 1.214165 +1294.637817 0.000000 2860.270996 0.000000 0.776132 0.000000 0.630570 0.601047 0.601047 0.601047 1289.759521 0.000000 2823.880371 0.000000 0.345327 0.000000 -0.938482 1.359602 1.359602 1.359602 1290.198608 0.000000 2820.832520 0.000000 0.015667 0.000000 -0.999877 1.265894 1.265894 1.265894 1323.530762 0.000000 2841.458984 0.000000 0.836680 0.000000 -0.547692 0.970168 0.970168 0.970168 @@ -41876,6 +41913,7 @@ 1406.790405 0.000000 2877.967529 0.000000 0.999350 0.000000 -0.036047 0.817138 0.817138 0.817138 1366.823853 0.000000 2835.350098 0.000000 0.999993 0.000000 -0.003743 0.800344 0.800344 0.800344 1376.781006 0.000000 2853.230225 0.000000 0.557254 0.000000 0.830342 0.396912 0.396912 0.396912 +1349.282227 0.000000 2843.417480 0.000000 0.278665 0.000000 0.960388 0.686778 0.686778 0.686778 1383.266479 0.000000 2851.869385 0.000000 0.299763 0.000000 -0.954014 1.399422 1.399422 1.399422 1372.129883 0.000000 2852.643799 0.000000 0.729760 0.000000 -0.683703 1.129282 1.129282 1.129282 1374.228760 0.000000 2846.633057 0.000000 0.990003 0.000000 -0.141050 0.872076 0.872076 0.872076 @@ -41886,6 +41924,9 @@ 1348.069336 0.000000 2831.206543 0.000000 0.378223 0.000000 -0.925714 1.383556 1.383556 1.383556 1372.182617 0.000000 2844.841309 0.000000 0.058937 0.000000 -0.998262 1.434090 1.434090 1.434090 1381.274292 0.000000 2870.091064 0.000000 0.400495 0.000000 0.916299 0.258459 0.258459 0.258459 +1349.765381 0.000000 2846.049561 0.000000 0.070809 0.000000 -0.997490 0.961769 0.961769 0.961769 +1345.785889 0.000000 2874.473145 0.000000 0.640057 0.000000 -0.768327 0.919002 0.919002 0.919002 +1345.801880 0.000000 2864.210205 0.000000 0.703905 0.000000 0.710294 0.713229 0.713229 0.713229 1387.147095 0.000000 2875.800049 0.000000 0.538347 0.000000 0.842723 0.329559 0.329559 0.329559 1372.145874 0.000000 2850.028564 0.000000 0.972277 0.000000 -0.233830 0.912660 0.912660 0.912660 1379.813965 0.000000 2874.509521 0.000000 0.823123 0.000000 -0.567863 1.083444 1.083444 1.083444 @@ -41927,7 +41968,7 @@ 1400.337524 0.000000 2837.501221 0.000000 0.940528 0.000000 -0.339716 0.896226 0.896226 0.896226 1390.218872 0.000000 2878.969971 0.000000 0.927691 0.000000 0.373349 0.661684 0.661684 0.661684 1368.078857 0.000000 2877.130371 0.000000 0.645789 0.000000 -0.763516 1.101904 1.101904 1.101904 -1347.465210 0.000000 2873.232178 0.000000 0.367169 0.000000 0.930154 0.530341 0.530341 0.530341 +1347.465210 0.000000 2873.232178 0.000000 0.367169 0.000000 0.930154 0.380000 0.380000 0.380000 1376.373047 0.000000 2866.601074 0.000000 0.977708 0.000000 0.209968 0.761975 0.761975 0.761975 1387.130249 0.000000 2865.108887 0.000000 0.858300 0.000000 0.513148 0.568615 0.568615 0.568615 1374.874268 0.000000 2853.033691 0.000000 0.999405 0.000000 -0.034486 0.816396 0.816396 0.816396 @@ -41987,10 +42028,20 @@ 1343.902832 0.000000 2830.314697 0.000000 0.664505 0.000000 0.747284 0.451081 0.451081 0.451081 1403.567993 0.000000 2837.066406 0.000000 0.240393 0.000000 0.970676 0.447233 0.447233 0.447233 1397.355469 0.000000 2878.943848 0.000000 0.844740 0.000000 0.535177 0.532694 0.532694 0.532694 +1286.632202 0.000000 2883.984375 0.000000 0.670937 0.000000 -0.741514 0.821688 0.821688 0.821688 +1331.063232 0.000000 2882.746094 0.000000 0.352331 0.000000 0.935876 0.732292 0.732292 0.732292 +1300.624023 0.000000 2897.140381 0.000000 0.960786 0.000000 0.277292 0.781481 0.781481 0.781481 +1307.172485 0.000000 2891.189453 0.000000 0.744221 0.000000 0.667934 0.744488 0.744488 0.744488 1328.384155 0.000000 2904.453369 0.000000 0.383411 0.000000 -0.923578 0.903460 0.903460 0.903460 +1331.784546 0.000000 2879.733643 0.000000 0.981912 0.000000 -0.189339 0.816740 0.816740 0.816740 1293.013306 0.000000 2914.899902 0.000000 0.660005 0.000000 0.751261 0.715120 0.715120 0.715120 1332.044434 0.000000 2906.994141 0.000000 0.165874 0.000000 0.986147 0.614908 0.614908 0.614908 +1333.565918 0.000000 2882.339844 0.000000 0.491666 0.000000 0.870784 0.641700 0.641700 0.641700 1330.306152 0.000000 2902.846680 0.000000 0.623034 0.000000 -0.782194 0.902251 0.902251 0.902251 +1308.811768 0.000000 2889.400391 0.000000 0.943793 0.000000 -0.330538 0.850461 0.850461 0.850461 +1307.240234 0.000000 2879.417725 0.000000 0.809532 0.000000 0.587075 0.706014 0.706014 0.706014 +1310.555420 0.000000 2893.118164 0.000000 0.190298 0.000000 0.981726 0.593386 0.593386 0.593386 +1302.966553 0.000000 2896.085449 0.000000 0.703983 0.000000 -0.710217 0.918307 0.918307 0.918307 1330.319580 0.000000 2905.478760 0.000000 0.999994 0.000000 -0.003331 0.800559 0.800559 0.800559 1384.994751 0.000000 2909.451660 0.000000 0.580863 0.000000 -0.814001 0.837988 0.837988 0.837988 1405.617188 0.000000 2895.762939 0.000000 0.371111 0.000000 0.928589 0.234061 0.234061 0.234061 diff --git a/gfx/map/map_object_data/generated/tree_leaf_high_generator_2.txt b/gfx/map/map_object_data/generated/tree_leaf_high_generator_2.txt index aac7dff3..fae57f34 100644 --- a/gfx/map/map_object_data/generated/tree_leaf_high_generator_2.txt +++ b/gfx/map/map_object_data/generated/tree_leaf_high_generator_2.txt @@ -5,7 +5,7 @@ generated_content=yes layer="tree_high_layer" pdxmesh="tree_leaf_01_b_mesh" - count=23603 + count=23632 transform="498.307129 0.000000 252.345596 0.000000 0.459067 0.000000 0.888402 0.279296 0.279296 0.279296 500.312622 0.000000 249.768890 0.000000 0.797755 0.000000 -0.602981 0.423915 0.423915 0.423915 251.774353 0.000000 383.087280 0.000000 0.618712 0.000000 0.785618 0.354426 0.354426 0.354426 @@ -8979,15 +8979,27 @@ 1046.884033 0.000000 2855.851807 0.000000 0.044652 0.000000 -0.999003 0.436577 0.436577 0.436577 1045.919678 0.000000 2849.045410 0.000000 0.312978 0.000000 0.949760 0.338088 0.338088 0.338088 1258.836792 0.000000 2823.259033 0.000000 0.103169 0.000000 0.994664 0.233675 0.233675 0.233675 +1261.067383 0.000000 2851.702148 0.000000 0.114519 0.000000 -0.993421 0.409451 0.409451 0.409451 1221.104370 0.000000 2853.344727 0.000000 0.990192 0.000000 -0.139713 0.401050 0.401050 0.401050 1224.018188 0.000000 2849.495850 0.000000 0.987667 0.000000 0.156568 0.398195 0.398195 0.398195 +1269.964233 0.000000 2831.093506 0.000000 0.040059 0.000000 -0.999197 0.418343 0.418343 0.418343 +1257.210693 0.000000 2858.836182 0.000000 0.999529 0.000000 -0.030682 0.400567 0.400567 0.400567 1227.910034 0.000000 2860.966553 0.000000 0.966698 0.000000 0.255919 0.396123 0.396123 0.396123 +1257.265503 0.000000 2849.745605 0.000000 0.695742 0.000000 0.718292 0.383195 0.383195 0.383195 +1244.561890 0.000000 2874.009277 0.000000 0.841582 0.000000 0.540129 0.389174 0.389174 0.389174 1219.132446 0.000000 2821.183838 0.000000 0.997091 0.000000 0.076225 0.397981 0.397981 0.397981 +1278.510742 0.000000 2839.628174 0.000000 0.145244 0.000000 -0.989396 0.430596 0.430596 0.430596 +1258.269043 0.000000 2852.646484 0.000000 0.226196 0.000000 -0.974082 0.450279 0.450279 0.450279 +1240.681396 0.000000 2848.983643 0.000000 0.700498 0.000000 0.713655 0.372224 0.372224 0.372224 +1255.282104 0.000000 2851.869385 0.000000 0.888972 0.000000 -0.457962 0.417814 0.417814 0.417814 1244.145508 0.000000 2852.643799 0.000000 0.577072 0.000000 0.816694 0.361826 0.361826 0.361826 1223.865845 0.000000 2852.405762 0.000000 0.198795 0.000000 -0.980041 0.460226 0.460226 0.460226 1243.582153 0.000000 2836.731689 0.000000 0.779318 0.000000 -0.626629 0.423332 0.423332 0.423332 +1244.126465 0.000000 2870.332764 0.000000 0.625788 0.000000 -0.779993 0.433503 0.433503 0.433503 1243.248047 0.000000 2815.433350 0.000000 0.911971 0.000000 -0.410255 0.419419 0.419419 0.419419 1259.043457 0.000000 2820.222412 0.000000 0.862540 0.000000 0.505989 0.367947 0.367947 0.367947 +1258.269043 0.000000 2916.630859 0.000000 0.525749 0.000000 -0.850640 0.438092 0.438092 0.438092 +1255.282104 0.000000 2915.853760 0.000000 0.376160 0.000000 -0.926555 0.437872 0.437872 0.437872 1101.850952 0.000000 3056.925049 0.000000 0.958451 0.000000 0.285258 0.395956 0.395956 0.395956 1124.156250 0.000000 3023.815674 0.000000 0.791333 0.000000 0.611386 0.392774 0.392774 0.392774 1123.880981 0.000000 3044.406250 0.000000 0.921454 0.000000 -0.388488 0.406973 0.406973 0.406973 @@ -9020,19 +9032,31 @@ 1296.910278 0.000000 2832.729980 0.000000 0.737384 0.000000 0.675473 0.316314 0.316314 0.316314 1289.519043 0.000000 2825.557861 0.000000 0.606031 0.000000 0.795441 0.293917 0.293917 0.293917 1299.482666 0.000000 2824.336182 0.000000 0.018103 0.000000 0.999836 0.224013 0.224013 0.224013 +1299.469116 0.000000 2853.531738 0.000000 0.999547 0.000000 0.030092 0.399835 0.399835 0.399835 1339.508179 0.000000 2821.689941 0.000000 0.998156 0.000000 -0.060703 0.400485 0.400485 0.400485 1296.436646 0.000000 2819.067139 0.000000 0.947869 0.000000 -0.318660 0.438540 0.438540 0.438540 1294.583252 0.000000 2826.477539 0.000000 0.073155 0.000000 -0.997321 0.568992 0.568992 0.568992 +1305.039917 0.000000 2875.397217 0.000000 0.486155 0.000000 -0.873873 0.419110 0.419110 0.419110 1315.857544 0.000000 2852.453125 0.000000 0.297405 0.000000 0.954751 0.377826 0.377826 0.377826 +1332.352783 0.000000 2865.858154 0.000000 0.999587 0.000000 0.028737 0.399498 0.399498 0.399498 +1302.852783 0.000000 2855.851807 0.000000 0.790529 0.000000 -0.612425 0.415139 0.415139 0.415139 +1330.696899 0.000000 2879.287598 0.000000 0.947241 0.000000 -0.320522 0.407168 0.407168 0.407168 1285.731567 0.000000 2823.207764 0.000000 0.900351 0.000000 -0.435165 0.411240 0.411240 0.411240 +1332.056885 0.000000 2837.041748 0.000000 0.406597 0.000000 -0.913608 0.429337 0.429337 0.429337 1322.421143 0.000000 2842.748779 0.000000 0.621662 0.000000 -0.783285 0.433252 0.433252 0.433252 1304.363159 0.000000 2840.626465 0.000000 0.716402 0.000000 0.697687 0.370313 0.370313 0.370313 +1293.871582 0.000000 2858.693848 0.000000 0.716381 0.000000 0.697710 0.375324 0.375324 0.375324 1301.221313 0.000000 2826.938232 0.000000 0.963413 0.000000 -0.268023 0.426419 0.426419 0.426419 1302.926270 0.000000 2862.786133 0.000000 0.685212 0.000000 -0.728344 0.426888 0.426888 0.426888 +1304.673584 0.000000 2848.983643 0.000000 0.303004 0.000000 -0.952989 0.447295 0.447295 0.447295 +1290.989624 0.000000 2863.812500 0.000000 0.447896 0.000000 0.894086 0.358015 0.358015 0.358015 1302.089111 0.000000 2838.514160 0.000000 0.883114 0.000000 -0.469159 0.445840 0.445840 0.445840 1296.885376 0.000000 2835.549805 0.000000 0.454184 0.000000 -0.890908 0.441168 0.441168 0.441168 1302.172119 0.000000 2823.236328 0.000000 0.271893 0.000000 0.962327 0.295861 0.295861 0.295861 +1285.588989 0.000000 2850.693115 0.000000 0.925804 0.000000 -0.378003 0.414516 0.414516 0.414516 1316.305542 0.000000 2855.058838 0.000000 0.997656 0.000000 0.068427 0.394324 0.394324 0.394324 +1330.712402 0.000000 2863.561279 0.000000 0.266085 0.000000 -0.963949 0.448738 0.448738 0.448738 +1294.132080 0.000000 2862.354248 0.000000 0.950513 0.000000 0.310686 0.383280 0.383280 0.383280 1333.565918 0.000000 2818.355469 0.000000 0.456709 0.000000 -0.889616 0.486504 0.486504 0.486504 1308.020630 0.000000 2859.313721 0.000000 0.686038 0.000000 0.727566 0.363386 0.363386 0.363386 1342.724854 0.000000 2833.905029 0.000000 0.254731 0.000000 0.967012 0.326561 0.326561 0.326561 @@ -9062,8 +9086,13 @@ 1371.181274 0.000000 2876.209717 0.000000 0.289834 0.000000 0.957077 0.337526 0.337526 0.337526 1374.689697 0.000000 2840.869873 0.000000 0.866433 0.000000 -0.499293 0.427147 0.427147 0.427147 1395.641235 0.000000 2877.345703 0.000000 0.712230 0.000000 -0.701946 0.448177 0.448177 0.448177 +1335.748779 0.000000 2883.851074 0.000000 0.326428 0.000000 -0.945222 0.430296 0.430296 0.430296 1335.461670 0.000000 2906.455566 0.000000 0.800849 0.000000 0.598866 0.387817 0.387817 0.387817 1291.627197 0.000000 2912.464355 0.000000 0.999329 0.000000 -0.036624 0.400841 0.400841 0.400841 +1306.869873 0.000000 2883.843994 0.000000 0.667871 0.000000 -0.744277 0.424730 0.424730 0.424730 +1302.831665 0.000000 2899.334473 0.000000 0.501679 0.000000 0.865054 0.360857 0.360857 0.360857 +1309.988159 0.000000 2883.950928 0.000000 0.852575 0.000000 -0.522606 0.420593 0.420593 0.420593 +1329.450073 0.000000 2895.594482 0.000000 0.126240 0.000000 -0.992000 0.454083 0.454083 0.454083 1290.239014 0.000000 2914.760742 0.000000 0.654242 0.000000 0.756286 0.328916 0.328916 0.328916 1398.889160 0.000000 2880.049072 0.000000 0.470374 0.000000 0.882467 0.274768 0.274768 0.274768 1402.246704 0.000000 2892.822266 0.000000 0.918069 0.000000 0.396421 0.351357 0.351357 0.351357 diff --git a/gfx/map/map_object_data/generated/tree_leaf_high_generator_3.txt b/gfx/map/map_object_data/generated/tree_leaf_high_generator_3.txt index c06270c1..3ae2bb41 100644 --- a/gfx/map/map_object_data/generated/tree_leaf_high_generator_3.txt +++ b/gfx/map/map_object_data/generated/tree_leaf_high_generator_3.txt @@ -5,7 +5,7 @@ generated_content=yes layer="tree_high_layer" pdxmesh="tree_leaf_01_c_mesh" - count=50985 + count=51039 transform="503.599518 0.000000 249.703598 0.000000 0.861466 0.000000 0.507815 0.778617 0.778617 0.778617 507.129578 0.000000 247.514343 0.000000 0.269547 0.000000 -0.962987 0.854435 0.854435 0.854435 252.527557 0.000000 380.642578 0.000000 0.901114 0.000000 0.433581 0.775548 0.775548 0.775548 @@ -20860,30 +20860,46 @@ 1531.261108 0.000000 2789.948730 0.000000 0.922002 0.000000 -0.387186 0.821916 0.821916 0.821916 1494.942383 0.000000 2808.403320 0.000000 0.469274 0.000000 -0.883053 0.877820 0.877820 0.877820 1530.442017 0.000000 2786.521729 0.000000 0.348153 0.000000 -0.937438 0.874995 0.874995 0.874995 -1046.848511 0.000000 2846.744385 0.000000 0.995985 0.000000 0.089516 0.796670 0.796670 0.796670 -1050.844604 0.000000 2857.117920 0.000000 0.348190 0.000000 -0.937424 0.834220 0.834220 0.834220 -1049.282104 0.000000 2852.043213 0.000000 0.246714 0.000000 0.969088 0.742990 0.742990 0.742990 1042.824097 0.000000 2845.155273 0.000000 0.806577 0.000000 0.591128 0.778021 0.778021 0.778021 1046.093384 0.000000 2851.580566 0.000000 0.885783 0.000000 0.464100 0.764143 0.764143 0.764143 +1274.262329 0.000000 2828.837891 0.000000 0.576588 0.000000 -0.817035 0.825783 0.825783 0.825783 +1253.199585 0.000000 2848.442871 0.000000 0.945583 0.000000 -0.325381 0.808539 0.808539 0.808539 +1275.121094 0.000000 2841.905518 0.000000 0.689883 0.000000 0.723921 0.787390 0.787390 0.787390 1216.224121 0.000000 2818.605713 0.000000 0.285112 0.000000 -0.958494 0.849916 0.849916 0.849916 +1247.166260 0.000000 2871.246338 0.000000 0.342359 0.000000 0.939569 0.764873 0.764873 0.764873 1227.224121 0.000000 2853.120605 0.000000 0.783215 0.000000 -0.621751 0.816081 0.816081 0.816081 1224.412842 0.000000 2865.180664 0.000000 0.741504 0.000000 0.670948 0.792068 0.792068 0.792068 1240.866943 0.000000 2837.644775 0.000000 0.086065 0.000000 0.996290 0.787546 0.787546 0.787546 +1261.740845 0.000000 2858.613037 0.000000 0.779988 0.000000 -0.625794 0.808508 0.808508 0.808508 1229.279297 0.000000 2871.760498 0.000000 0.110263 0.000000 -0.993902 0.841124 0.841124 0.841124 1246.567383 0.000000 2851.121338 0.000000 0.453865 0.000000 0.891070 0.743334 0.743334 0.743334 +1255.698853 0.000000 2854.751709 0.000000 0.613079 0.000000 0.790022 0.778716 0.778716 0.778716 1224.108521 0.000000 2858.804932 0.000000 0.206954 0.000000 -0.978351 0.856323 0.856323 0.856323 +1277.281372 0.000000 2836.136230 0.000000 0.695491 0.000000 -0.718535 0.830262 0.830262 0.830262 1233.932983 0.000000 2867.756592 0.000000 0.552506 0.000000 0.833509 0.760441 0.760441 0.760441 +1241.556152 0.000000 2871.104248 0.000000 0.933821 0.000000 -0.357741 0.815564 0.815564 0.815564 +1241.258789 0.000000 2852.043213 0.000000 0.076692 0.000000 0.997055 0.774935 0.774935 0.774935 1229.835327 0.000000 2864.971924 0.000000 0.616554 0.000000 0.787313 0.752749 0.752749 0.752749 +1241.047729 0.000000 2875.397217 0.000000 0.893317 0.000000 0.449428 0.779053 0.779053 0.779053 +1266.905762 0.000000 2834.041992 0.000000 0.469386 0.000000 -0.882993 0.833070 0.833070 0.833070 1245.477417 0.000000 2834.726562 0.000000 0.341289 0.000000 -0.939958 0.893027 0.893027 0.893027 +1251.865356 0.000000 2852.453125 0.000000 0.587919 0.000000 -0.808920 0.842346 0.842346 0.842346 1220.020508 0.000000 2816.566162 0.000000 0.996797 0.000000 0.079972 0.797602 0.797602 0.797602 +1234.800781 0.000000 2845.155273 0.000000 0.888079 0.000000 0.459690 0.785977 0.785977 0.785977 +1259.653442 0.000000 2855.391113 0.000000 0.996872 0.000000 0.079035 0.796445 0.796445 0.796445 1227.452026 0.000000 2856.893311 0.000000 0.956112 0.000000 -0.293002 0.818886 0.818886 0.818886 +1274.209229 0.000000 2838.253174 0.000000 0.742402 0.000000 -0.669955 0.826833 0.826833 0.826833 1228.359863 0.000000 2868.201904 0.000000 0.905138 0.000000 -0.425118 0.841568 0.841568 0.841568 1224.289185 0.000000 2855.238037 0.000000 0.795480 0.000000 -0.605979 0.853048 0.853048 0.853048 1256.520264 0.000000 2820.601807 0.000000 0.950883 0.000000 -0.309549 0.815651 0.815651 0.815651 +1238.070068 0.000000 2851.580566 0.000000 0.086464 0.000000 0.996255 0.733302 0.733302 0.733302 1231.310425 0.000000 2869.431152 0.000000 0.853635 0.000000 -0.520872 0.840377 0.840377 0.840377 1236.640259 0.000000 2866.480469 0.000000 0.195021 0.000000 -0.980799 0.873298 0.873298 0.873298 1226.997437 0.000000 2863.812500 0.000000 0.606221 0.000000 0.795296 0.736091 0.736091 0.736091 +1253.199585 0.000000 2912.427246 0.000000 0.836767 0.000000 0.547558 0.797570 0.797570 0.797570 1238.579224 0.000000 2893.616699 0.000000 0.984479 0.000000 0.175503 0.793024 0.793024 0.793024 +1261.067383 0.000000 2915.686523 0.000000 0.966267 0.000000 0.257542 0.792353 0.792353 0.792353 +1257.265503 0.000000 2913.729980 0.000000 0.982948 0.000000 0.183885 0.791689 0.791689 0.791689 1136.145386 0.000000 3029.208984 0.000000 0.372883 0.000000 -0.927878 0.813532 0.813532 0.813532 1110.840698 0.000000 3038.697510 0.000000 0.443876 0.000000 0.896088 0.791347 0.791347 0.791347 1104.308105 0.000000 3052.623779 0.000000 0.922912 0.000000 -0.385011 0.826285 0.826285 0.826285 @@ -20942,35 +20958,59 @@ 1151.909302 0.000000 3035.249268 0.000000 0.623199 0.000000 -0.782063 0.858646 0.858646 0.858646 1167.830688 0.000000 3037.395264 0.000000 0.435876 0.000000 0.900007 0.736260 0.736260 0.736260 1165.028931 0.000000 3042.868652 0.000000 0.596682 0.000000 0.802478 0.707915 0.707915 0.707915 +1302.817261 0.000000 2846.744385 0.000000 0.591983 0.000000 -0.805950 0.821341 0.821341 0.821341 1334.896973 0.000000 2816.064697 0.000000 0.987486 0.000000 0.157707 0.775803 0.775803 0.775803 +1320.165405 0.000000 2877.253174 0.000000 0.354643 0.000000 0.935002 0.755115 0.755115 0.755115 +1296.284668 0.000000 2860.670654 0.000000 0.444129 0.000000 0.895963 0.750092 0.750092 0.750092 1280.216309 0.000000 2818.605713 0.000000 0.099300 0.000000 0.995058 0.752395 0.752395 0.752395 1301.418213 0.000000 2815.666504 0.000000 0.376288 0.000000 -0.926503 0.834081 0.834081 0.834081 +1330.205688 0.000000 2875.705078 0.000000 0.727455 0.000000 -0.686155 0.812233 0.812233 0.812233 +1291.216309 0.000000 2853.120605 0.000000 0.627927 0.000000 -0.778273 0.829927 0.829927 0.829927 1304.859131 0.000000 2837.644775 0.000000 0.162437 0.000000 0.986719 0.771324 0.771324 0.771324 1303.514648 0.000000 2865.728027 0.000000 0.313766 0.000000 0.949500 0.787251 0.787251 0.787251 1319.771606 0.000000 2840.896240 0.000000 0.550515 0.000000 0.834825 0.782836 0.782836 0.782836 +1332.517334 0.000000 2861.631836 0.000000 0.300644 0.000000 -0.953736 0.831845 0.831845 0.831845 +1308.348022 0.000000 2878.285889 0.000000 0.350267 0.000000 -0.936650 0.825437 0.825437 0.825437 1319.691040 0.000000 2854.751709 0.000000 0.701259 0.000000 0.712906 0.718686 0.718686 0.718686 +1288.100708 0.000000 2858.804932 0.000000 0.391993 0.000000 0.919968 0.747513 0.747513 0.747513 1302.571411 0.000000 2829.632324 0.000000 0.531466 0.000000 -0.847079 0.820585 0.820585 0.820585 1309.348389 0.000000 2817.036133 0.000000 0.732752 0.000000 -0.680495 0.848880 0.848880 0.848880 1286.632202 0.000000 2820.000000 0.000000 0.533435 0.000000 -0.845841 0.912353 0.912353 0.912353 1313.511230 0.000000 2856.181152 0.000000 0.769795 0.000000 -0.638292 0.821569 0.821569 0.821569 +1342.010986 0.000000 2866.398682 0.000000 0.876881 0.000000 -0.480708 0.815624 0.815624 0.815624 1303.325317 0.000000 2820.615479 0.000000 0.735260 0.000000 0.677785 0.750915 0.750915 0.750915 +1332.295410 0.000000 2840.415039 0.000000 0.740608 0.000000 0.671938 0.781458 0.781458 0.781458 +1305.250977 0.000000 2852.043213 0.000000 0.995755 0.000000 -0.092049 0.804142 0.804142 0.804142 1323.051147 0.000000 2837.092285 0.000000 0.788972 0.000000 0.614429 0.785728 0.785728 0.785728 +1317.827759 0.000000 2872.737305 0.000000 0.984108 0.000000 -0.177573 0.806525 0.806525 0.806525 +1293.827515 0.000000 2864.971924 0.000000 0.713936 0.000000 -0.700211 0.816732 0.816732 0.816732 +1288.010376 0.000000 2849.495850 0.000000 0.002812 0.000000 -0.999996 0.868583 0.868583 0.868583 1291.947144 0.000000 2820.918701 0.000000 0.993706 0.000000 -0.112016 0.810089 0.810089 0.810089 +1282.188721 0.000000 2835.890869 0.000000 0.945656 0.000000 -0.325169 0.814883 0.814883 0.814883 1306.033203 0.000000 2843.151855 0.000000 0.898452 0.000000 0.439072 0.756967 0.756967 0.756967 1306.096924 0.000000 2861.697998 0.000000 0.390183 0.000000 -0.920737 0.845566 0.845566 0.845566 1325.264648 0.000000 2841.182617 0.000000 0.996437 0.000000 0.084342 0.795548 0.795548 0.795548 1310.570190 0.000000 2859.506592 0.000000 0.837037 0.000000 -0.547146 0.814569 0.814569 0.814569 +1299.617432 0.000000 2863.650391 0.000000 0.185359 0.000000 0.982671 0.737790 0.737790 0.737790 +1343.432861 0.000000 2862.162842 0.000000 0.939514 0.000000 -0.342510 0.815710 0.815710 0.815710 +1291.902222 0.000000 2860.966553 0.000000 0.411849 0.000000 -0.911252 0.871431 0.871431 0.871431 1341.625000 0.000000 2831.778564 0.000000 0.093559 0.000000 0.995614 0.755748 0.755748 0.755748 +1334.539795 0.000000 2826.576416 0.000000 0.702721 0.000000 0.711465 0.766800 0.766800 0.766800 1298.218506 0.000000 2828.620605 0.000000 0.386239 0.000000 0.922399 0.640992 0.640992 0.640992 1284.012695 0.000000 2816.566162 0.000000 0.519744 0.000000 -0.854322 0.839890 0.839890 0.839890 1331.063232 0.000000 2818.761719 0.000000 0.291681 0.000000 0.956516 0.754170 0.754170 0.754170 +1299.392212 0.000000 2849.439697 0.000000 0.409175 0.000000 0.912456 0.748355 0.748355 0.748355 +1333.832886 0.000000 2877.378662 0.000000 0.987334 0.000000 0.158655 0.792840 0.792840 0.792840 1323.645630 0.000000 2855.391113 0.000000 0.715789 0.000000 0.698317 0.731912 0.731912 0.731912 +1284.260498 0.000000 2848.329590 0.000000 0.763568 0.000000 0.645727 0.768455 0.768455 0.768455 1283.124634 0.000000 2821.183838 0.000000 0.547494 0.000000 0.836810 0.728122 0.728122 0.728122 1317.125977 0.000000 2857.591797 0.000000 0.046720 0.000000 -0.998908 0.935150 0.935150 0.935150 1300.207520 0.000000 2818.943115 0.000000 0.133201 0.000000 -0.991089 0.894724 0.894724 0.894724 1338.221191 0.000000 2817.280762 0.000000 0.697218 0.000000 0.716859 0.747320 0.747320 0.747320 1287.927734 0.000000 2816.650391 0.000000 0.429404 0.000000 -0.903112 0.887107 0.887107 0.887107 1306.869873 0.000000 2819.859619 0.000000 0.975424 0.000000 0.220338 0.788419 0.788419 0.788419 +1302.062256 0.000000 2851.580566 0.000000 0.671636 0.000000 -0.740882 0.837495 0.837495 0.837495 +1321.085815 0.000000 2874.244873 0.000000 0.611023 0.000000 0.791613 0.758952 0.758952 0.758952 1342.700562 0.000000 2828.703369 0.000000 0.946308 0.000000 -0.323266 0.835305 0.835305 0.835305 1289.505615 0.000000 2819.292969 0.000000 0.832978 0.000000 -0.553306 0.840401 0.840401 0.840401 1309.988159 0.000000 2819.966553 0.000000 0.357056 0.000000 -0.934083 0.874408 0.874408 0.874408 @@ -20991,6 +21031,7 @@ 1388.782715 0.000000 2873.534180 0.000000 0.630624 0.000000 0.776089 0.700455 0.700455 0.700455 1386.444702 0.000000 2863.147217 0.000000 0.789946 0.000000 -0.613176 0.886219 0.886219 0.886219 1350.660522 0.000000 2830.216064 0.000000 0.705403 0.000000 0.708806 0.749021 0.749021 0.749021 +1346.598511 0.000000 2844.854736 0.000000 0.086602 0.000000 0.996243 0.733308 0.733308 0.733308 1381.819946 0.000000 2872.737305 0.000000 0.338271 0.000000 -0.941049 0.972588 0.972588 0.972588 1348.747437 0.000000 2868.733398 0.000000 0.987677 0.000000 -0.156507 0.820056 0.820056 0.820056 1370.025391 0.000000 2843.151855 0.000000 0.711738 0.000000 0.702445 0.763135 0.763135 0.763135 @@ -21021,14 +21062,27 @@ 1388.462891 0.000000 2870.580566 0.000000 0.845831 0.000000 -0.533451 0.849559 0.849559 0.849559 1351.376709 0.000000 2867.920898 0.000000 0.842579 0.000000 -0.538573 0.850094 0.850094 0.850094 1346.608643 0.000000 2833.450195 0.000000 0.426110 0.000000 -0.904671 0.887388 0.887388 0.887388 +1308.210815 0.000000 2886.961670 0.000000 0.684936 0.000000 0.728604 0.763318 0.763318 0.763318 +1334.896973 0.000000 2880.049072 0.000000 0.416146 0.000000 0.909298 0.769220 0.769220 0.769220 1291.216309 0.000000 2917.104980 0.000000 0.542318 0.000000 0.840173 0.725881 0.725881 0.725881 +1304.859131 0.000000 2901.629150 0.000000 0.608407 0.000000 -0.793625 0.820873 0.820873 0.820873 +1329.602539 0.000000 2892.778564 0.000000 0.649937 0.000000 -0.759988 0.832587 0.832587 0.832587 +1308.616333 0.000000 2894.607666 0.000000 0.911980 0.000000 0.410235 0.793668 0.793668 0.793668 1333.363281 0.000000 2909.519775 0.000000 0.967659 0.000000 0.252262 0.795569 0.795569 0.795569 +1282.161377 0.000000 2888.758789 0.000000 0.819210 0.000000 0.573493 0.780239 0.780239 0.780239 1332.295410 0.000000 2904.399414 0.000000 0.997040 0.000000 0.076888 0.797141 0.797141 0.797141 +1318.330322 0.000000 2899.970459 0.000000 0.154346 0.000000 -0.988017 0.834781 0.834781 0.834781 +1310.921021 0.000000 2890.709229 0.000000 0.555004 0.000000 -0.831847 0.844148 0.844148 0.844148 +1305.129150 0.000000 2897.249268 0.000000 0.627152 0.000000 0.778897 0.777530 0.777530 0.777530 +1325.367432 0.000000 2884.222900 0.000000 0.213540 0.000000 -0.976934 0.856044 0.856044 0.856044 +1283.124634 0.000000 2885.168213 0.000000 0.054322 0.000000 0.998523 0.731854 0.731854 0.731854 +1285.731567 0.000000 2887.192139 0.000000 0.936400 0.000000 0.350935 0.785820 0.785820 0.785820 1392.114136 0.000000 2901.240234 0.000000 0.261917 0.000000 0.965090 0.634916 0.634916 0.634916 1400.476196 0.000000 2931.651123 0.000000 0.760629 0.000000 -0.649187 0.800847 0.800847 0.800847 1372.203003 0.000000 2886.961670 0.000000 0.999902 0.000000 -0.013983 0.800109 0.800109 0.800109 1393.594727 0.000000 2892.778564 0.000000 0.956130 0.000000 0.292942 0.763304 0.763304 0.763304 1389.973755 0.000000 2909.583252 0.000000 0.378789 0.000000 -0.925483 0.853130 0.853130 0.853130 +1346.153564 0.000000 2888.758789 0.000000 0.855488 0.000000 0.517823 0.786955 0.786955 0.786955 1406.003174 0.000000 2930.383057 0.000000 0.299474 0.000000 -0.954104 0.847813 0.847813 0.847813 1405.483398 0.000000 2880.103516 0.000000 0.004304 0.000000 -0.999991 1.001799 1.001799 1.001799 1381.263062 0.000000 2885.041016 0.000000 0.271768 0.000000 -0.962363 0.949043 0.949043 0.949043 diff --git a/gfx/map/map_object_data/generated/tree_pine_01_a_generator_1.txt b/gfx/map/map_object_data/generated/tree_pine_01_a_generator_1.txt index 126f120a..111feec6 100644 --- a/gfx/map/map_object_data/generated/tree_pine_01_a_generator_1.txt +++ b/gfx/map/map_object_data/generated/tree_pine_01_a_generator_1.txt @@ -5,7 +5,7 @@ generated_content=yes layer="tree_high_layer" pdxmesh="tree_pine_single_01_a_mesh" - count=17544 + count=17543 transform="734.640503 0.000000 1707.787842 0.000000 0.525567 0.000000 0.850752 1.000000 1.000000 1.000000 734.009705 0.000000 1703.166260 0.000000 0.122439 0.000000 0.992476 1.000000 1.000000 1.000000 747.560608 0.000000 1706.191895 0.000000 0.112183 0.000000 0.993688 1.000000 1.000000 1.000000 @@ -222,7 +222,6 @@ 1445.335205 0.000000 2338.933105 0.000000 0.765746 0.000000 0.643144 1.000000 1.000000 1.000000 1429.640137 0.000000 2352.751953 0.000000 0.297604 0.000000 0.954690 1.000000 1.000000 1.000000 1433.918335 0.000000 2347.625488 0.000000 0.213225 0.000000 0.977003 1.000000 1.000000 1.000000 -1520.098511 0.000000 2325.380859 0.000000 0.846681 0.000000 0.532100 1.000000 1.000000 1.000000 1498.790039 0.000000 2345.242920 0.000000 0.603431 0.000000 0.797415 1.000000 1.000000 1.000000 1500.592896 0.000000 2318.748291 0.000000 0.285780 0.000000 0.958295 1.000000 1.000000 1.000000 1498.073486 0.000000 2349.822998 0.000000 0.452518 0.000000 0.891755 1.000000 1.000000 1.000000 @@ -17558,7 +17557,7 @@ object={ generated_content=yes layer="tree_high_layer" pdxmesh="tree_pine_single_01_b_mesh" - count=17691 + count=17689 transform="737.581482 0.000000 1704.462280 0.000000 0.891095 0.000000 -0.453816 1.000000 1.000000 1.000000 747.291992 0.000000 1708.547363 0.000000 0.931132 0.000000 0.364682 1.000000 1.000000 1.000000 736.671143 0.000000 1708.423096 0.000000 0.986811 0.000000 0.161879 1.000000 1.000000 1.000000 @@ -17719,7 +17718,6 @@ object={ 1282.533813 0.000000 2296.250000 0.000000 0.875772 0.000000 0.482725 1.000000 1.000000 1.000000 1284.286865 0.000000 2301.665771 0.000000 0.963809 0.000000 -0.266593 1.000000 1.000000 1.000000 1284.143921 0.000000 2300.035889 0.000000 0.993117 0.000000 -0.117127 1.000000 1.000000 1.000000 -1377.625244 0.000000 2260.364990 0.000000 0.995684 0.000000 0.092803 1.000000 1.000000 1.000000 1374.769775 0.000000 2267.712402 0.000000 0.983525 0.000000 -0.180774 1.000000 1.000000 1.000000 1385.270874 0.000000 2241.524414 0.000000 0.999949 0.000000 -0.010056 1.000000 1.000000 1.000000 1370.089111 0.000000 2285.838623 0.000000 0.940683 0.000000 0.339287 1.000000 1.000000 1.000000 @@ -17774,7 +17772,6 @@ object={ 1369.431519 0.000000 2374.735840 0.000000 0.997897 0.000000 0.064821 1.000000 1.000000 1.000000 1397.655151 0.000000 2372.730713 0.000000 0.890183 0.000000 -0.455603 1.000000 1.000000 1.000000 1425.909546 0.000000 2355.881592 0.000000 0.879745 0.000000 -0.475445 1.000000 1.000000 1.000000 -1413.080933 0.000000 2341.469727 0.000000 0.972663 0.000000 0.232220 1.000000 1.000000 1.000000 1443.841919 0.000000 2340.578125 0.000000 0.928707 0.000000 -0.370814 1.000000 1.000000 1.000000 1460.337158 0.000000 2353.983154 0.000000 0.965864 0.000000 -0.259048 1.000000 1.000000 1.000000 1455.459839 0.000000 2358.973877 0.000000 0.874826 0.000000 0.484436 1.000000 1.000000 1.000000 @@ -35258,7 +35255,7 @@ object={ generated_content=yes layer="tree_high_layer" pdxmesh="tree_pine_single_01_c_mesh" - count=17713 + count=17710 transform="733.429688 0.000000 1705.516357 0.000000 0.651082 0.000000 -0.759007 1.000000 1.000000 1.000000 741.986084 0.000000 1701.756592 0.000000 0.827406 0.000000 -0.561605 1.000000 1.000000 1.000000 738.672058 0.000000 1702.308350 0.000000 0.300280 0.000000 -0.953851 1.000000 1.000000 1.000000 @@ -35512,7 +35509,6 @@ object={ 1445.176147 0.000000 2336.567871 0.000000 0.615568 0.000000 -0.788084 1.000000 1.000000 1.000000 1431.499023 0.000000 2353.853027 0.000000 0.399741 0.000000 -0.916628 1.000000 1.000000 1.000000 1460.501709 0.000000 2349.756836 0.000000 0.292662 0.000000 -0.956216 1.000000 1.000000 1.000000 -1414.616577 0.000000 2308.125000 0.000000 0.713610 0.000000 -0.700543 1.000000 1.000000 1.000000 1459.003906 0.000000 2358.002930 0.000000 0.840248 0.000000 -0.542202 1.000000 1.000000 1.000000 1410.590698 0.000000 2332.979736 0.000000 0.112028 0.000000 -0.993705 1.000000 1.000000 1.000000 1427.601807 0.000000 2351.775391 0.000000 0.812079 0.000000 -0.583548 1.000000 1.000000 1.000000 @@ -35528,13 +35524,11 @@ object={ 1468.848633 0.000000 2317.967285 0.000000 0.088528 0.000000 -0.996074 1.000000 1.000000 1.000000 1462.111206 0.000000 2362.510010 0.000000 0.284870 0.000000 -0.958566 1.000000 1.000000 1.000000 1523.517212 0.000000 2340.271973 0.000000 0.168353 0.000000 -0.985727 1.000000 1.000000 1.000000 -1488.886841 0.000000 2320.854980 0.000000 0.137636 0.000000 -0.990483 1.000000 1.000000 1.000000 1513.361938 0.000000 2319.849609 0.000000 0.571411 0.000000 -0.820664 1.000000 1.000000 1.000000 1472.321289 0.000000 2354.554199 0.000000 0.832502 0.000000 -0.554022 1.000000 1.000000 1.000000 1525.339844 0.000000 2333.660400 0.000000 0.621429 0.000000 -0.783471 1.000000 1.000000 1.000000 1482.182129 0.000000 2365.135498 0.000000 0.202947 0.000000 -0.979190 1.000000 1.000000 1.000000 1506.071289 0.000000 2364.590576 0.000000 0.043966 0.000000 -0.999033 1.000000 1.000000 1.000000 -1524.271973 0.000000 2328.540039 0.000000 0.270449 0.000000 -0.962734 1.000000 1.000000 1.000000 1478.644897 0.000000 2318.341064 0.000000 0.610870 0.000000 -0.791731 1.000000 1.000000 1.000000 1535.179199 0.000000 2359.507324 0.000000 0.725718 0.000000 -0.687992 1.000000 1.000000 1.000000 1473.120361 0.000000 2359.983398 0.000000 0.199687 0.000000 -0.979860 1.000000 1.000000 1.000000 diff --git a/gfx/map/map_object_data/generated/tree_pine_01_b_generator_1.txt b/gfx/map/map_object_data/generated/tree_pine_01_b_generator_1.txt index b86e4ec3..4edbb4b8 100644 --- a/gfx/map/map_object_data/generated/tree_pine_01_b_generator_1.txt +++ b/gfx/map/map_object_data/generated/tree_pine_01_b_generator_1.txt @@ -5,7 +5,7 @@ generated_content=yes layer="tree_high_layer" pdxmesh="tree_pine_01_b_mesh" - count=80330 + count=80367 transform="734.629822 0.000000 1699.402466 0.000000 0.999811 0.000000 -0.019417 0.400000 0.400000 0.400000 739.927856 0.000000 1700.734497 0.000000 0.692424 0.000000 0.721491 0.400000 0.400000 0.400000 747.715881 0.000000 1703.672363 0.000000 0.488534 0.000000 -0.872545 0.400000 0.400000 0.400000 @@ -195,7 +195,6 @@ 1329.602539 0.000000 2188.950439 0.000000 0.585699 0.000000 0.810529 0.400000 0.400000 0.400000 1299.469116 0.000000 2213.687988 0.000000 0.847424 0.000000 -0.530917 0.400000 0.400000 0.400000 1319.691040 0.000000 2214.907959 0.000000 0.759702 0.000000 -0.650271 0.400000 0.400000 0.400000 -1333.363281 0.000000 2205.691650 0.000000 0.984300 0.000000 -0.176502 0.400000 0.400000 0.400000 1295.427002 0.000000 2208.417725 0.000000 0.989685 0.000000 0.143258 0.400000 0.400000 0.400000 1288.100708 0.000000 2218.961182 0.000000 0.427565 0.000000 0.903985 0.400000 0.400000 0.400000 1325.059570 0.000000 2211.858398 0.000000 0.362475 0.000000 0.931993 0.400000 0.400000 0.400000 @@ -212,7 +211,6 @@ 1310.704224 0.000000 2236.438477 0.000000 0.077736 0.000000 0.996974 0.400000 0.400000 0.400000 1299.077759 0.000000 2221.033203 0.000000 0.937978 0.000000 -0.346695 0.400000 0.400000 0.400000 1308.118652 0.000000 2230.489014 0.000000 0.240834 0.000000 0.970566 0.400000 0.400000 0.400000 -1364.802002 0.000000 2234.515137 0.000000 0.246385 0.000000 0.969172 0.400000 0.400000 0.400000 1383.763794 0.000000 2201.052490 0.000000 0.999642 0.000000 0.026760 0.400000 0.400000 0.400000 1385.270874 0.000000 2177.540039 0.000000 0.526729 0.000000 -0.850033 0.400000 0.400000 0.400000 1349.088745 0.000000 2213.500977 0.000000 0.792247 0.000000 0.610201 0.400000 0.400000 0.400000 @@ -270,6 +268,7 @@ 1498.790039 0.000000 2281.258545 0.000000 0.960590 0.000000 0.277969 0.400000 0.400000 0.400000 1483.192871 0.000000 2277.261230 0.000000 0.782497 0.000000 0.622654 0.400000 0.400000 0.400000 1502.536133 0.000000 2275.261963 0.000000 0.250173 0.000000 0.968201 0.400000 0.400000 0.400000 +1522.996094 0.000000 2294.018555 0.000000 0.390555 0.000000 -0.920580 0.400000 0.400000 0.400000 1474.582886 0.000000 2268.995361 0.000000 0.450855 0.000000 0.892597 0.400000 0.400000 0.400000 1490.572754 0.000000 2281.811768 0.000000 0.679418 0.000000 0.733751 0.400000 0.400000 0.400000 1471.844971 0.000000 2246.136963 0.000000 0.648793 0.000000 -0.760965 0.400000 0.400000 0.400000 @@ -329,24 +328,39 @@ 1452.774902 0.000000 2361.659180 0.000000 0.495573 0.000000 0.868566 0.400000 0.400000 0.400000 1414.652710 0.000000 2318.341064 0.000000 0.067749 0.000000 -0.997702 0.400000 0.400000 0.400000 1465.497681 0.000000 2351.132324 0.000000 0.988073 0.000000 0.153983 0.400000 0.400000 0.400000 +1520.098511 0.000000 2325.380859 0.000000 0.846681 0.000000 0.532100 0.400000 0.400000 0.400000 +1524.704590 0.000000 2310.740723 0.000000 0.799703 0.000000 0.600396 0.400000 0.400000 0.400000 +1525.932983 0.000000 2319.218506 0.000000 0.713303 0.000000 -0.700856 0.400000 0.400000 0.400000 1462.881348 0.000000 2368.174072 0.000000 0.562585 0.000000 0.826739 0.400000 0.400000 0.400000 1500.187378 0.000000 2375.086670 0.000000 0.974872 0.000000 -0.222764 0.400000 0.400000 0.400000 1507.316162 0.000000 2367.984375 0.000000 0.096093 0.000000 0.995372 0.400000 0.400000 0.400000 1537.112549 0.000000 2232.014648 0.000000 0.253934 0.000000 -0.967222 0.400000 0.400000 0.400000 +1541.374146 0.000000 2298.009033 0.000000 0.980112 0.000000 -0.198446 0.400000 0.400000 0.400000 1571.308350 0.000000 2240.015625 0.000000 0.838871 0.000000 -0.544330 0.400000 0.400000 0.400000 1560.827881 0.000000 2261.785400 0.000000 0.601061 0.000000 -0.799203 0.400000 0.400000 0.400000 1585.571289 0.000000 2252.934814 0.000000 0.547075 0.000000 -0.837083 0.400000 0.400000 0.400000 1588.696777 0.000000 2246.756348 0.000000 0.181620 0.000000 0.983369 0.400000 0.400000 0.400000 1555.688354 0.000000 2260.931885 0.000000 0.139669 0.000000 -0.990198 0.400000 0.400000 0.400000 +1573.796509 0.000000 2296.877930 0.000000 0.292484 0.000000 0.956270 0.400000 0.400000 0.400000 1663.393799 0.000000 2286.303467 0.000000 0.620271 0.000000 0.784387 0.400000 0.400000 0.400000 1643.606567 0.000000 2279.531738 0.000000 0.977121 0.000000 -0.212683 0.400000 0.400000 0.400000 1672.358154 0.000000 2289.321289 0.000000 0.937579 0.000000 -0.347773 0.400000 0.400000 0.400000 +1537.314697 0.000000 2319.293945 0.000000 0.347301 0.000000 0.937754 0.400000 0.400000 0.400000 1592.452759 0.000000 2355.791748 0.000000 0.255981 0.000000 0.966682 0.400000 0.400000 0.400000 1587.509399 0.000000 2340.271973 0.000000 0.370588 0.000000 -0.928797 0.400000 0.400000 0.400000 +1569.601807 0.000000 2324.349365 0.000000 0.955225 0.000000 0.295880 0.400000 0.400000 0.400000 +1573.160522 0.000000 2336.567871 0.000000 0.057579 0.000000 0.998341 0.400000 0.400000 0.400000 +1571.308350 0.000000 2304.000000 0.000000 0.784824 0.000000 -0.619718 0.400000 0.400000 0.400000 +1560.827881 0.000000 2325.769775 0.000000 0.492909 0.000000 -0.870081 0.400000 0.400000 0.400000 +1544.614014 0.000000 2323.765625 0.000000 0.579753 0.000000 -0.814793 0.400000 0.400000 0.400000 +1566.746338 0.000000 2331.696777 0.000000 0.757148 0.000000 -0.653244 0.400000 0.400000 0.400000 1588.486084 0.000000 2349.756836 0.000000 0.170092 0.000000 0.985428 0.400000 0.400000 0.400000 +1566.528320 0.000000 2339.246338 0.000000 0.773557 0.000000 0.633727 0.400000 0.400000 0.400000 1597.979736 0.000000 2354.523682 0.000000 0.723791 0.000000 0.690020 0.400000 0.400000 0.400000 1570.063477 0.000000 2364.590576 0.000000 0.869713 0.000000 -0.493558 0.400000 0.400000 0.400000 +1542.637085 0.000000 2318.341064 0.000000 0.318818 0.000000 0.947816 0.400000 0.400000 0.400000 1587.683228 0.000000 2345.144043 0.000000 0.917179 0.000000 -0.398477 0.400000 0.400000 0.400000 +1541.301025 0.000000 2321.759766 0.000000 0.117817 0.000000 0.993035 0.400000 0.400000 0.400000 1640.126343 0.000000 2365.378174 0.000000 0.652768 0.000000 0.757558 0.400000 0.400000 0.400000 1639.732544 0.000000 2329.021240 0.000000 0.983127 0.000000 -0.182923 0.400000 0.400000 0.400000 1628.308960 0.000000 2366.410889 0.000000 0.483946 0.000000 -0.875098 0.400000 0.400000 0.400000 @@ -370,6 +384,29 @@ 1675.169434 0.000000 2405.229980 0.000000 0.420232 0.000000 -0.907417 0.400000 0.400000 0.400000 1669.049683 0.000000 2405.454102 0.000000 0.478962 0.000000 -0.877836 0.400000 0.400000 0.400000 1663.830933 0.000000 2406.223145 0.000000 0.510114 0.000000 0.860107 0.400000 0.400000 0.400000 +1202.221313 0.000000 2811.720703 0.000000 0.670718 0.000000 0.741713 0.400000 0.400000 0.400000 +1203.035156 0.000000 2805.893555 0.000000 0.722451 0.000000 0.691422 0.400000 0.400000 0.400000 +1207.513672 0.000000 2809.078613 0.000000 0.072731 0.000000 0.997352 0.400000 0.400000 0.400000 +1050.844604 0.000000 2857.117920 0.000000 0.348190 0.000000 -0.937424 0.400000 0.400000 0.400000 +1055.189697 0.000000 2871.246338 0.000000 0.676425 0.000000 -0.736511 0.400000 0.400000 0.400000 +1048.890259 0.000000 2837.644775 0.000000 0.209338 0.000000 0.977843 0.400000 0.400000 0.400000 +1040.080811 0.000000 2841.900146 0.000000 0.100219 0.000000 -0.994965 0.400000 0.400000 0.400000 +1054.590820 0.000000 2851.121338 0.000000 0.963294 0.000000 -0.268449 0.400000 0.400000 0.400000 +1054.573853 0.000000 2863.979736 0.000000 0.930219 0.000000 -0.367004 0.400000 0.400000 0.400000 +1046.602539 0.000000 2829.632324 0.000000 0.272479 0.000000 0.962162 0.400000 0.400000 0.400000 +1030.663330 0.000000 2820.000000 0.000000 0.856134 0.000000 -0.516753 0.400000 0.400000 0.400000 +1057.542480 0.000000 2856.181152 0.000000 0.997447 0.000000 -0.071406 0.400000 0.400000 0.400000 +1035.978271 0.000000 2820.918701 0.000000 0.570190 0.000000 -0.821513 0.400000 0.400000 0.400000 +1206.912598 0.000000 2816.064697 0.000000 0.718043 0.000000 0.695998 0.400000 0.400000 0.400000 +1211.523804 0.000000 2821.689941 0.000000 0.998701 0.000000 0.050963 0.400000 0.400000 0.400000 +1213.506836 0.000000 2816.119141 0.000000 0.726719 0.000000 0.686934 0.400000 0.400000 0.400000 +1213.873779 0.000000 2825.580322 0.000000 0.670373 0.000000 -0.742024 0.400000 0.400000 0.400000 +1215.045410 0.000000 2822.215332 0.000000 0.994984 0.000000 -0.100038 0.400000 0.400000 0.400000 +1217.353760 0.000000 2831.168945 0.000000 0.703685 0.000000 -0.710512 0.400000 0.400000 0.400000 +1224.018555 0.000000 2844.636963 0.000000 0.851943 0.000000 -0.523634 0.400000 0.400000 0.400000 +1221.212646 0.000000 2839.638916 0.000000 0.733506 0.000000 -0.679683 0.400000 0.400000 0.400000 +1218.196533 0.000000 2835.890869 0.000000 0.157587 0.000000 0.987505 0.400000 0.400000 0.400000 +1215.876221 0.000000 2821.996338 0.000000 0.731909 0.000000 0.681403 0.400000 0.400000 0.400000 560.215637 0.000000 3093.193359 0.000000 0.383933 0.000000 0.923361 0.400000 0.400000 0.400000 533.511902 0.000000 3071.604004 0.000000 0.211971 0.000000 -0.977276 0.400000 0.400000 0.400000 598.903198 0.000000 3102.681885 0.000000 0.563092 0.000000 0.826394 0.400000 0.400000 0.400000 diff --git a/gfx/map/map_object_data/generated/tree_pine_impassable_01_a_generator_1.txt b/gfx/map/map_object_data/generated/tree_pine_impassable_01_a_generator_1.txt index c12a890d..4769b583 100644 --- a/gfx/map/map_object_data/generated/tree_pine_impassable_01_a_generator_1.txt +++ b/gfx/map/map_object_data/generated/tree_pine_impassable_01_a_generator_1.txt @@ -5,8 +5,48 @@ generated_content=yes layer="tree_high_layer" pdxmesh="tree_pine_impassable_01_a_mesh" - count=30725 - transform="1690.766602 0.000000 3177.039795 0.000000 0.519297 0.000000 -0.854594 0.400000 0.400000 0.400000 + count=30765 + transform="1317.191772 0.000000 2208.599121 0.000000 0.560048 0.000000 0.828460 0.400000 0.400000 0.400000 +1333.363281 0.000000 2205.691650 0.000000 0.984300 0.000000 -0.176502 0.400000 0.400000 0.400000 +1318.795776 0.000000 2227.857178 0.000000 0.221256 0.000000 -0.975216 0.400000 0.400000 0.400000 +1364.802002 0.000000 2234.515137 0.000000 0.246385 0.000000 0.969172 0.400000 0.400000 0.400000 +1354.197754 0.000000 2237.166748 0.000000 0.864745 0.000000 -0.502211 0.400000 0.400000 0.400000 +1341.858154 0.000000 2249.720947 0.000000 0.112361 0.000000 -0.993667 0.400000 0.400000 0.400000 +1355.217651 0.000000 2240.239990 0.000000 0.449239 0.000000 0.893411 0.400000 0.400000 0.400000 +1377.625244 0.000000 2260.364990 0.000000 0.995684 0.000000 0.092803 0.400000 0.400000 0.400000 +1344.208496 0.000000 2242.746338 0.000000 0.744258 0.000000 0.667893 0.400000 0.400000 0.400000 +1375.150635 0.000000 2295.386963 0.000000 0.987899 0.000000 0.155100 0.400000 0.400000 0.400000 +1365.410400 0.000000 2239.807129 0.000000 0.519134 0.000000 -0.854693 0.400000 0.400000 0.400000 +1383.683228 0.000000 2278.892334 0.000000 0.760634 0.000000 -0.649181 0.400000 0.400000 0.400000 +1361.917358 0.000000 2291.897217 0.000000 0.982827 0.000000 -0.184527 0.400000 0.400000 0.400000 +1516.767090 0.000000 2297.674805 0.000000 0.783132 0.000000 0.621855 0.400000 0.400000 0.400000 +1395.532837 0.000000 2340.271973 0.000000 0.361072 0.000000 -0.932538 0.400000 0.400000 0.400000 +1408.329102 0.000000 2354.554199 0.000000 0.973233 0.000000 0.229822 0.400000 0.400000 0.400000 +1421.255859 0.000000 2359.885498 0.000000 0.819446 0.000000 0.573156 0.400000 0.400000 0.400000 +1446.780151 0.000000 2355.825928 0.000000 0.843303 0.000000 -0.537439 0.400000 0.400000 0.400000 +1410.145752 0.000000 2312.899414 0.000000 0.998685 0.000000 -0.051276 0.400000 0.400000 0.400000 +1414.616577 0.000000 2308.125000 0.000000 0.713610 0.000000 -0.700543 0.400000 0.400000 0.400000 +1413.080933 0.000000 2341.469727 0.000000 0.972663 0.000000 0.232220 0.400000 0.400000 0.400000 +1526.873535 0.000000 2304.189697 0.000000 0.922932 0.000000 -0.384962 0.400000 0.400000 0.400000 +1488.886841 0.000000 2320.854980 0.000000 0.137636 0.000000 -0.990483 0.400000 0.400000 0.400000 +1530.231079 0.000000 2316.962891 0.000000 0.739212 0.000000 0.673473 0.400000 0.400000 0.400000 +1524.493896 0.000000 2349.756836 0.000000 0.824799 0.000000 -0.565426 0.400000 0.400000 0.400000 +1494.547974 0.000000 2317.757324 0.000000 0.697321 0.000000 -0.716759 0.400000 0.400000 0.400000 +1524.271973 0.000000 2328.540039 0.000000 0.270449 0.000000 -0.962734 0.400000 0.400000 0.400000 +1467.097656 0.000000 2394.014893 0.000000 0.960922 0.000000 0.276820 0.400000 0.400000 0.400000 +1488.886841 0.000000 2384.839355 0.000000 0.157014 0.000000 0.987596 0.400000 0.400000 0.400000 +1472.534302 0.000000 2401.587646 0.000000 0.569963 0.000000 -0.821670 0.400000 0.400000 0.400000 +1552.879028 0.000000 2320.854980 0.000000 0.742598 0.000000 -0.669738 0.400000 0.400000 0.400000 +1544.614014 0.000000 2387.750000 0.000000 0.924765 0.000000 -0.380538 0.400000 0.400000 0.400000 +1582.385498 0.000000 2384.752686 0.000000 0.739121 0.000000 -0.673572 0.400000 0.400000 0.400000 +1580.446167 0.000000 2380.080322 0.000000 0.913055 0.000000 -0.407836 0.400000 0.400000 0.400000 +1046.848511 0.000000 2846.744385 0.000000 0.995985 0.000000 0.089516 0.400000 0.400000 0.400000 +1045.377441 0.000000 2841.576660 0.000000 0.789053 0.000000 -0.614325 0.400000 0.400000 0.400000 +1049.282104 0.000000 2852.043213 0.000000 0.246714 0.000000 0.969088 0.400000 0.400000 0.400000 +1043.750854 0.000000 2836.791260 0.000000 0.290670 0.000000 -0.956823 0.400000 0.400000 0.400000 +1224.653076 0.000000 2835.640625 0.000000 0.236300 0.000000 0.971680 0.400000 0.400000 0.400000 +1218.169189 0.000000 2824.774414 0.000000 0.715242 0.000000 0.698876 0.400000 0.400000 0.400000 +1690.766602 0.000000 3177.039795 0.000000 0.519297 0.000000 -0.854594 0.400000 0.400000 0.400000 1695.111572 0.000000 3191.168213 0.000000 0.920899 0.000000 0.389801 0.400000 0.400000 0.400000 1687.467773 0.000000 3185.649902 0.000000 0.601822 0.000000 -0.798630 0.400000 0.400000 0.400000 1697.464355 0.000000 3176.103027 0.000000 0.521227 0.000000 -0.853418 0.400000 0.400000 0.400000 diff --git a/gfx/map/terrain/beach_02_mask.png b/gfx/map/terrain/beach_02_mask.png index 9275071b..33592fec 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:8257179d97183b5c378a76ec275cfd3d5eea712fb312f1c1a20c9ebdc747be2b -size 3030934 +oid sha256:79223c8abf43a91b91a4df0a993a0c16394ec4e46460eb264dde79adf0bad5dc +size 3031007 diff --git a/gfx/map/terrain/beach_02_pebbles_mask.png b/gfx/map/terrain/beach_02_pebbles_mask.png index 319f2512..db15666b 100644 --- a/gfx/map/terrain/beach_02_pebbles_mask.png +++ b/gfx/map/terrain/beach_02_pebbles_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:454e0cb5389ab1a01d42c66073ce665bdc7f0b778af9f421c2808dbaccc6f6cf -size 800229 +oid sha256:7563cafbfbe9f6eca1fd0f0d62ecb92e980555ee41e0a029a16eae7373aa5d2a +size 799949 diff --git a/gfx/map/terrain/coastline_cliff_grey_mask.png b/gfx/map/terrain/coastline_cliff_grey_mask.png index 735dbe60..2e2de189 100644 --- a/gfx/map/terrain/coastline_cliff_grey_mask.png +++ b/gfx/map/terrain/coastline_cliff_grey_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e8e163f0b880bf2f44a92f629ccfb6829c489bb1f5aaf59955041d6d41657e5 -size 1153655 +oid sha256:176a514adf7738f28074845eff99ac899c2fe43cf48aaba74d31e0591191c478 +size 1153613 diff --git a/gfx/map/terrain/detail_index.tga b/gfx/map/terrain/detail_index.tga index 2bb6f5e3..c4e5b2cb 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:3d72e343004e790245a80fbeb0b6fe2c289dde5be92394a619c0b21c8fab8174 +oid sha256:ddce5b2ab7e4e5d6f524166d72182d36c98d9b3010e19ac5d13dd7a987f4ac40 size 134217772 diff --git a/gfx/map/terrain/detail_intensity.tga b/gfx/map/terrain/detail_intensity.tga index fcfa231f..ab64da06 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:a54342f329c2592833704354c880cf11504fdf6d5f351576e0e88744c575d85b +oid sha256:dabe09ff85d8ec4feadf65d01713d0484ef13847c3aff82e4dc9ff743f78dc15 size 134217772 diff --git a/gfx/map/terrain/farmland_01_mask.png b/gfx/map/terrain/farmland_01_mask.png index d2359481..b568179c 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:ae40bd81ea94c6e8e62a957062dd3f88743eb072a3c531d228c32679abf34287 -size 209988 +oid sha256:07bb0c296abb640e25e5e2c5486876ab5af90efbbe824a477ee6458cdcc18193 +size 209992 diff --git a/gfx/map/terrain/forest_leaf_01_mask.png b/gfx/map/terrain/forest_leaf_01_mask.png index 40b229e6..a2009a31 100644 --- a/gfx/map/terrain/forest_leaf_01_mask.png +++ b/gfx/map/terrain/forest_leaf_01_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0973c67c11a16f1156f564891d13d5d1468220a315a9d1794732203ef0e9cce2 +oid sha256:3d9421d28e7ef842affc120444c7fe762db0da5bb92ed6fc19536ab0c83eb5d3 size 897200 diff --git a/gfx/map/terrain/hills_01_mask.png b/gfx/map/terrain/hills_01_mask.png index 0712702b..9463a885 100644 --- a/gfx/map/terrain/hills_01_mask.png +++ b/gfx/map/terrain/hills_01_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58390ae8a340f1abfb2c0560187a343547362799f91e14d007b6439df4978eb9 -size 2948171 +oid sha256:7835ed691203aac3120a4d382d44b464a5f2778b826d76bf7933428624db7cd3 +size 2948153 diff --git a/gfx/map/terrain/hills_01_rocks_mask.png b/gfx/map/terrain/hills_01_rocks_mask.png index 77588cd7..4b6056db 100644 --- a/gfx/map/terrain/hills_01_rocks_mask.png +++ b/gfx/map/terrain/hills_01_rocks_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27b1d652d2229ffcb9b177be2811a0c2a173e9593f3acad5f770e91c89675811 -size 2306134 +oid sha256:f81d912c9d8d1a2fa48d619e939448ac9b3cc83003704992b0c7160e67467c8c +size 2306108 diff --git a/gfx/map/terrain/hills_01_rocks_small_mask.png b/gfx/map/terrain/hills_01_rocks_small_mask.png index 7715ffe7..265dc5af 100644 --- a/gfx/map/terrain/hills_01_rocks_small_mask.png +++ b/gfx/map/terrain/hills_01_rocks_small_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c32c6d6a909117f9abfdfb1407a5d1c62a423dd4470d74c37206cc287618dbbc -size 1644022 +oid sha256:aff6c92430c8c41e6861666863d0d1b796e88ba6e918b905f46a99f9a8798a03 +size 1644000 diff --git a/gfx/map/terrain/mountain_02_b_mask.png b/gfx/map/terrain/mountain_02_b_mask.png index 6cf6dd31..e27ff893 100644 --- a/gfx/map/terrain/mountain_02_b_mask.png +++ b/gfx/map/terrain/mountain_02_b_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b26f1110470e829ef86610b898da1923bbe13832f83cc19a9b5898ddb9f6267 -size 1271744 +oid sha256:3969478224e16f8b15cf1b2f2cf0f75b14151f4ec3ae8a0b98a69ebd4fbbca6b +size 1271675 diff --git a/gfx/map/terrain/plains_01_dry_mask.png b/gfx/map/terrain/plains_01_dry_mask.png index 036795e5..6209f77b 100644 --- a/gfx/map/terrain/plains_01_dry_mask.png +++ b/gfx/map/terrain/plains_01_dry_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:887bedd3014c8f157eaef1107be83a649f6461535e31b7680c8c1dfb2b4b3c6b -size 2021779 +oid sha256:a3e8b34eef4495b4f7431da392ba5047fcc8820e9ee0667fd9578a5041295480 +size 2021780 diff --git a/gfx/map/terrain/plains_01_dry_mud_mask.png b/gfx/map/terrain/plains_01_dry_mud_mask.png index 45771c77..6d9f5dcf 100644 --- a/gfx/map/terrain/plains_01_dry_mud_mask.png +++ b/gfx/map/terrain/plains_01_dry_mud_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc1e11cd2af520389e97b5908c721dbfbe4a20d96a18330ef83b19373cdc9b33 -size 2019127 +oid sha256:4905bbcd78309992f21aa5e8504659fec3845a545c6b90744d8976452cbc31b9 +size 2019118 diff --git a/gfx/map/terrain/plains_01_mask.png b/gfx/map/terrain/plains_01_mask.png index de4d3df0..b6894f2e 100644 --- a/gfx/map/terrain/plains_01_mask.png +++ b/gfx/map/terrain/plains_01_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c847eccd325482f7f317b4ce37c0fc36fce9b4459a384054608a4b9ca031e196 -size 3145088 +oid sha256:7b2a3ff77e21080be89575bb61bfcc266028a6a16ea6d967ffe905c41cad666e +size 3145092 diff --git a/gfx/map/terrain/plains_01_noisy_mask.png b/gfx/map/terrain/plains_01_noisy_mask.png index a15a2e6c..3ed2a3fd 100644 --- a/gfx/map/terrain/plains_01_noisy_mask.png +++ b/gfx/map/terrain/plains_01_noisy_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83a636ed329f09de3c5fddce9fcd08b9b5fa3553b48d2be7cc0316e566182d78 -size 5005221 +oid sha256:02ec23de5d444ce6d6509f5a65841744e870cde094e3f270dc440e3ae38541ed +size 5005959 diff --git a/gfx/map/terrain/plains_01_rough_mask.png b/gfx/map/terrain/plains_01_rough_mask.png index 2eca91be..6659b6ef 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:884514fe0fe2de952da05039d3309d108d58f84ed13cfaf1c8c60d4629f6a847 -size 4629050 +oid sha256:51e2fa655f86511716179815f26c5423e241497037aeaaa6696d7d68ea2599f6 +size 4629009 diff --git a/gfx/map/terrain/steppe_01_mask.png b/gfx/map/terrain/steppe_01_mask.png index 74374475..f29ac909 100644 --- a/gfx/map/terrain/steppe_01_mask.png +++ b/gfx/map/terrain/steppe_01_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a09713e13e321bdbb85ae41c3e565938f2e030ec95d6c318a6af1c722d8cc381 -size 3379857 +oid sha256:044656ae67a8417e51d9d9c38ad23ec7fefe975b2d6b1bdd6c5ffd326a6bb07c +size 3379855 diff --git a/gfx/map/terrain/wetlands_02_mask.png b/gfx/map/terrain/wetlands_02_mask.png index 8eb07b5d..8efc0798 100644 --- a/gfx/map/terrain/wetlands_02_mask.png +++ b/gfx/map/terrain/wetlands_02_mask.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64e2c12322042e93a432de0233f911e874cbcc3125fe7e7d8d3a772f1ffb83c7 -size 430396 +oid sha256:50f21f07aeb1f35029f1816b18e9f04e15a19587b461d239b4e38121070b023f +size 432016 diff --git a/map_data/definition.csv b/map_data/definition.csv index 04b072fc..94607ad4 100644 --- a/map_data/definition.csv +++ b/map_data/definition.csv @@ -14151,4 +14151,4 @@ #14150;51;14;232;;x; #14151;52;14;236;;x; #14152;53;14;240;;x; -#14153;54;14;244;;x; +#14153;54;14;244;;x; \ No newline at end of file diff --git a/map_data/nodes.dat b/map_data/nodes.dat index 3a64b39db22720c1b38242bb73f83ddfec8d48e5..ed64e0ed14fda745ff439e70ab2a0ebe4d7022df 100644 GIT binary patch delta 1221 zcmZwFUr19?90%~Td#=~De`lN1t(rB{Y&LD0m8+>-x>u1N$|(D1A@q>FRP;xBDBISG zMf7L1@Q5K9MS(<#tF8|s_o;_K%1jH)TH-?xgs>=K2L0|X_Rwwc*>?G!bME(^bNeRx zb$wuJkm+w*(D6Ye4F!9-%%Eu7k_+`>FF{*qpE+)SWy>S}O4F*RjNSZLcxX zvrQZ{2aPCxI&rS9!{{;;iv#*1JwjqKQ`hmF-N99fi8JY89O-$Ltp0Hao2jK~bVS(0 zr8wmIl9>9{VmwvTD;T(07I{+9;Cw7NuakoFOveQN@Zca#j^aA}eP5fD9>voP?jNkD z<8SaG-?z*O;b_i97V&XWZ5)8Qae!)%IpiwuEt_zOZO2I7Pg}?EMs|6-U65{%VONgz zg_W;N+efx;P;*flp2TrIL5Nzc>D|I!_7g_ov$XXy-kf_6e`FAHXTDNGUBAn8T=EBq&KNo}IlFan6V%^w7^NI&IM`m; z6wv0%Dz~z^Y%lj|b7j7ohaG66HdmhFc6L5*m!+oy(dk0hf0KXqVgrm&TOfi;w0Y&< zyG+@-w`g-^zS?5OB73#@;%gfY`t$Eme*-CGjydS|1~Nk{8;k`8wc#T-UqP*xO$COo zY-3r^7pb{=&F3Q@jc+0a(!)l=IhYq#>B#}YJDK%nY3?McH8L_s*L9K=tn!xA=1x+t zi_n{$R5r+@KJw04sq96oFNs7?gn3pcJeDUQi~@Mb{3L F{sGfCP$>Wa delta 1282 zcmZvaUq}=|9LHy8_Po>kGxtx=O7kq!v(wfv>*`dt+f(YLgtCW@5Gv@;Ll7keqPLxa z6>%M%IKpLJPeD{lBKx4k_7e6WSg8+5Wm50LMF|%4+gp5bUHI%WeCGF?@62p={yCQg z#yV)QX)qIg?D$BLWwH(FPb)%MKyHCy-PSKXQQ4k$p!00Jhj!MJ;h%~0r{)pssoO#{ zTX?w;p%dwzmTqgRU`O<>rP6|?Bjal=-4p!u$Y&{iJvT+nH%7-Be`Sb0=~&2&No}Uz zCe$&PUi{N(-G4M8@%$V?*+>21)q(ITr-WB=_dH>-ARC_{Eu^NvujFRP7fikxYXAr7`-3dy}TEFYOT?0^|~+czT0c`0q}bNzqS`lI6!a3L(0e|A@1iF`C2MA zo-?Z(ycQyv_w63Fe)D?WqY8hc(Q6^}{zJAaiV&ilH6D9Auwj)tn5A8)9KKL~Bow)s z+2FM<5A$Ai*9AAP*S+jTO-8TnVlZDXx>aRVq8tY)%+mT*=-+)XLr;MysxtZp@cJr? zuHi#Quhr{**`WrEe*L$V!$R>>CbZFVtoqooHo6@5-ivS8ax*m3BR?w>>y2J(HU!9F z)go3Jy;iS#u^0u7UOSTEe7$TFmC<(k&x0r3%B#~<^kHOGR<6=!D;9aSr