diff --git a/core/assets-raw/sprites/effects/circle-end.png b/core/assets-raw/sprites/effects/circle-end.png new file mode 100644 index 0000000000..e63f104191 Binary files /dev/null and b/core/assets-raw/sprites/effects/circle-end.png differ diff --git a/core/assets-raw/sprites/effects/circle-mid.png b/core/assets-raw/sprites/effects/circle-mid.png new file mode 100644 index 0000000000..c6805a606c Binary files /dev/null and b/core/assets-raw/sprites/effects/circle-mid.png differ diff --git a/core/assets-raw/sprites/effects/circle-shadow.png b/core/assets-raw/sprites/effects/circle-shadow.png index 2e9aaec802..129b74296d 100644 Binary files a/core/assets-raw/sprites/effects/circle-shadow.png and b/core/assets-raw/sprites/effects/circle-shadow.png differ diff --git a/core/assets/shaders/light.fragment.glsl b/core/assets/shaders/light.fragment.glsl index ba35623dab..c1a831668a 100644 --- a/core/assets/shaders/light.fragment.glsl +++ b/core/assets/shaders/light.fragment.glsl @@ -13,5 +13,6 @@ varying vec2 v_texCoord; void main(){ vec4 color = texture2D(u_texture, v_texCoord.xy); + //color.a = clamp(color.a, 0.0, 0.8); gl_FragColor = clamp(vec4(mix(u_ambient.rgb, color.rgb, color.a), u_ambient.a - color.a), 0.0, 1.0); } diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png index 054b843a47..a39f251dbe 100644 Binary files a/core/assets/sprites/block_colors.png and b/core/assets/sprites/block_colors.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 2cea67fe6a..4b3b8ca059 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -6,504 +6,504 @@ filter: Nearest,Nearest repeat: none force-projector-top rotate: false - xy: 553, 735 + xy: 619, 340 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mend-projector-top rotate: false - xy: 1267, 1299 + xy: 1077, 662 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mender-top rotate: false - xy: 1301, 187 + xy: 1686, 925 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-projector-top rotate: false - xy: 1399, 1299 + xy: 1077, 596 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shock-mine rotate: false - xy: 1471, 765 + xy: 1992, 959 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-arrow rotate: false - xy: 1301, 731 + xy: 1920, 1129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 1233, 629 + xy: 1920, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 1267, 663 + xy: 1954, 1129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 center rotate: false - xy: 1301, 697 + xy: 1988, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-0 rotate: false - xy: 2009, 1069 + xy: 1278, 971 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-armored-conveyor-full rotate: false - xy: 2009, 1069 + xy: 1278, 971 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-1 rotate: false - xy: 1029, 835 + xy: 890, 851 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-2 rotate: false - xy: 1029, 801 + xy: 1278, 937 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-3 rotate: false - xy: 1029, 767 + xy: 389, 15 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-0 rotate: false - xy: 1029, 733 + xy: 423, 10 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-1 rotate: false - xy: 1029, 699 + xy: 457, 10 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-2 rotate: false - xy: 1029, 665 + xy: 491, 10 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-3 rotate: false - xy: 1029, 631 + xy: 525, 10 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-0 rotate: false - xy: 1029, 597 + xy: 559, 10 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-1 rotate: false - xy: 1029, 563 + xy: 593, 10 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-2 rotate: false - xy: 1029, 529 + xy: 627, 12 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-3 rotate: false - xy: 1029, 495 + xy: 661, 12 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-0 rotate: false - xy: 1029, 461 + xy: 1236, 887 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-1 rotate: false - xy: 1029, 427 + xy: 1312, 971 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-2 rotate: false - xy: 1029, 393 + xy: 1312, 937 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-3 rotate: false - xy: 1029, 359 + xy: 911, 11 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-0 rotate: false - xy: 1029, 325 + xy: 945, 11 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-1 rotate: false - xy: 1029, 291 + xy: 1278, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-2 rotate: false - xy: 1029, 257 + xy: 1312, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-3 rotate: false - xy: 1029, 223 + xy: 1209, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 1199, 493 + xy: 1818, 1027 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 1233, 527 + xy: 1852, 1027 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 1267, 561 + xy: 1886, 1027 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 1301, 595 + xy: 1920, 1027 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 1335, 629 + xy: 1954, 1027 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 1165, 425 + xy: 1988, 1027 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 1199, 459 + xy: 1368, 1035 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 1233, 493 + xy: 1402, 1027 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 1267, 527 + xy: 1436, 1019 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 1301, 561 + xy: 1470, 1019 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 1335, 595 + xy: 1504, 1019 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 1165, 391 + xy: 1301, 835 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 1199, 425 + xy: 1335, 835 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 1233, 459 + xy: 1369, 843 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 1267, 493 + xy: 1369, 809 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 1301, 527 + xy: 1538, 993 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 1335, 561 + xy: 1572, 993 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 1165, 357 + xy: 1606, 993 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 1199, 391 + xy: 1640, 993 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 1369, 629 + xy: 1992, 925 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 1403, 663 + xy: 1992, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 1437, 697 + xy: 1505, 849 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 1471, 731 + xy: 1505, 815 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 1505, 765 + xy: 1505, 781 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 1369, 595 + xy: 1539, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 1403, 629 + xy: 1539, 823 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 1437, 663 + xy: 1573, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 1471, 697 + xy: 1539, 789 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 1505, 731 + xy: 1573, 823 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 1369, 561 + xy: 1607, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 1403, 595 + xy: 1573, 789 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 1437, 629 + xy: 1607, 823 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 1471, 663 + xy: 1641, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 1505, 697 + xy: 1607, 789 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 1369, 527 + xy: 1641, 823 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 1403, 561 + xy: 1675, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 1437, 595 + xy: 1641, 789 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1471, 629 + xy: 1675, 823 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mass-driver-base rotate: false - xy: 717, 261 + xy: 1939, 1431 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 1301, 153 + xy: 1754, 959 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 1335, 187 + xy: 1720, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 1267, 85 + xy: 1754, 925 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -538,217 +538,217 @@ blast-drill-top index: -1 drill-top rotate: false - xy: 913, 391 + xy: 1026, 1124 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-liquid rotate: false - xy: 913, 391 + xy: 1026, 1124 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 laser-drill rotate: false - xy: 619, 343 + xy: 717, 632 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-rim rotate: false - xy: 619, 245 + xy: 717, 534 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 619, 147 + xy: 717, 436 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 619, 49 + xy: 717, 338 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mechanical-drill rotate: false - xy: 1069, 1299 + xy: 1011, 662 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-rotator rotate: false - xy: 1135, 1299 + xy: 1077, 728 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-top rotate: false - xy: 1201, 1299 + xy: 1011, 596 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 oil-extractor rotate: false - xy: 717, 163 + xy: 758, 849 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-liquid rotate: false - xy: 717, 65 + xy: 749, 751 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-rotator rotate: false - xy: 749, 751 + xy: 815, 653 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-top rotate: false - xy: 815, 653 + xy: 815, 555 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 pneumatic-drill rotate: false - xy: 1795, 1299 + xy: 1053, 266 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-rotator rotate: false - xy: 1861, 1299 + xy: 1119, 398 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-top rotate: false - xy: 1927, 1299 + xy: 1119, 332 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 1845, 1167 + xy: 1135, 1365 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 1911, 1167 + xy: 1201, 1431 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 956, 1101 + xy: 1201, 1365 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 956, 1035 + xy: 1135, 1299 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-border rotate: false - xy: 1029, 87 + xy: 1209, 691 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-middle rotate: false - xy: 1131, 762 + xy: 1580, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-select rotate: false - xy: 1233, 799 + xy: 1818, 1197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 1335, 697 + xy: 1546, 1027 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 place-arrow rotate: false - xy: 815, 555 + xy: 815, 457 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 rubble-1-0 rotate: false - xy: 1003, 1233 + xy: 1111, 200 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 1069, 1233 + xy: 1111, 134 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 1135, 1233 + xy: 1111, 68 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 1201, 1233 + xy: 1003, 1388 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-3-0 rotate: false - xy: 815, 261 + xy: 815, 163 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 rubble-3-1 rotate: false - xy: 815, 261 + xy: 815, 163 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -825,259 +825,259 @@ rubble-8-1 index: -1 bridge-conduit-arrow rotate: false - xy: 1335, 765 + xy: 1954, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 1335, 765 + xy: 1954, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 1165, 561 + xy: 1988, 1197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 1199, 595 + xy: 1886, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 1165, 527 + xy: 1954, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 1199, 561 + xy: 1988, 1129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 1233, 595 + xy: 1954, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 1267, 629 + xy: 1988, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 1267, 629 + xy: 1988, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 1267, 629 + xy: 1988, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 1267, 629 + xy: 1988, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 1301, 663 + xy: 1988, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 1165, 493 + xy: 1580, 1027 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 1199, 527 + xy: 1614, 1027 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 1233, 561 + xy: 1648, 1027 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 1267, 595 + xy: 1682, 1027 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 1267, 595 + xy: 1682, 1027 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 1301, 629 + xy: 1716, 1027 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 1335, 663 + xy: 1750, 1027 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 1165, 459 + xy: 1784, 1027 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 1233, 153 + xy: 1584, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 1267, 187 + xy: 1618, 925 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 1301, 221 + xy: 1652, 959 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-tank-bottom rotate: false - xy: 717, 653 + xy: 717, 240 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-liquid rotate: false - xy: 717, 555 + xy: 717, 142 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-top rotate: false - xy: 717, 457 + xy: 717, 44 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 1335, 221 + xy: 1720, 959 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 1233, 85 + xy: 1686, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 1267, 119 + xy: 1720, 925 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 1335, 153 + xy: 1754, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1301, 85 + xy: 1788, 925 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1335, 119 + xy: 1822, 959 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 1335, 85 + xy: 1788, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 1369, 799 + xy: 1822, 925 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 1369, 765 + xy: 1856, 959 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 battery rotate: false - xy: 1029, 189 + xy: 1209, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-battery-full rotate: false - xy: 1029, 189 + xy: 1209, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1098,21 +1098,21 @@ block-battery-large-full index: -1 combustion-generator-top rotate: false - xy: 1335, 731 + xy: 1920, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 differential-generator-liquid rotate: false - xy: 521, 343 + xy: 660, 849 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 differential-generator-top rotate: false - xy: 521, 245 + xy: 619, 632 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -1168,35 +1168,35 @@ impact-reactor-plasma-3 index: -1 power-source rotate: false - xy: 1301, 119 + xy: 1788, 959 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 1403, 731 + xy: 1924, 959 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-reactor-center rotate: false - xy: 549, 1583 + xy: 913, 653 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thorium-reactor-lights rotate: false - xy: 647, 1583 + xy: 913, 555 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 turbine-generator-top rotate: false - xy: 1581, 1167 + xy: 1069, 1431 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1224,196 +1224,196 @@ alloy-smelter-top index: -1 blast-mixer rotate: false - xy: 1976, 1821 + xy: 549, 1513 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-blast-mixer-full rotate: false - xy: 1976, 1821 + xy: 549, 1513 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 890, 985 + xy: 945, 1454 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 890, 919 + xy: 937, 1388 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 890, 853 + xy: 937, 1322 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator rotate: false - xy: 913, 787 + xy: 937, 1256 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 913, 721 + xy: 921, 1190 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 913, 655 + xy: 987, 1190 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 kiln-top rotate: false - xy: 937, 1322 + xy: 1011, 794 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 937, 1322 + xy: 1011, 794 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver rotate: false - xy: 1531, 1299 + xy: 1077, 530 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 1597, 1299 + xy: 1077, 464 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 1663, 1299 + xy: 1053, 398 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 1729, 1299 + xy: 1053, 332 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 1403, 799 + xy: 1822, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 1369, 731 + xy: 1856, 925 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 1403, 765 + xy: 1890, 959 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 1861, 1233 + xy: 1143, 728 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press rotate: false - xy: 987, 1167 + xy: 1143, 596 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame0 rotate: false - xy: 1053, 1167 + xy: 1143, 530 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame1 rotate: false - xy: 1119, 1167 + xy: 1143, 464 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame2 rotate: false - xy: 1185, 1167 + xy: 1185, 398 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-liquid rotate: false - xy: 1251, 1167 + xy: 1185, 332 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-top rotate: false - xy: 1317, 1167 + xy: 1185, 266 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unloader-center rotate: false - xy: 1369, 493 + xy: 1675, 789 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 arc-heat rotate: false - xy: 2009, 1103 + xy: 856, 851 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-1 rotate: false - xy: 1029, 155 + xy: 1209, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-2 rotate: false - xy: 1976, 1755 + xy: 913, 243 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1434,14 +1434,14 @@ block-4 index: -1 hail-heat rotate: false - xy: 1206, 867 + xy: 1069, 1257 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 1003, 1299 + xy: 1011, 728 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1455,161 +1455,161 @@ meltdown-heat index: -1 ripple-heat rotate: false - xy: 815, 359 + xy: 815, 261 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 salvo-heat rotate: false - xy: 1333, 1233 + xy: 1003, 1256 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 1399, 1233 + xy: 1053, 1190 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 1465, 1233 + xy: 1092, 1124 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch-heat rotate: false - xy: 1471, 799 + xy: 1924, 925 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 956, 969 + xy: 1267, 1365 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 crawler-factory rotate: false - xy: 890, 1117 + xy: 871, 1281 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dagger-factory rotate: false - xy: 890, 1117 + xy: 871, 1281 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 draug-factory rotate: false - xy: 890, 1117 + xy: 871, 1281 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phantom-factory rotate: false - xy: 890, 1117 + xy: 871, 1281 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spirit-factory rotate: false - xy: 890, 1117 + xy: 871, 1281 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wraith-factory rotate: false - xy: 890, 1117 + xy: 871, 1281 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 crawler-factory-top rotate: false - xy: 890, 1051 + xy: 945, 1520 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dagger-factory-top rotate: false - xy: 913, 589 + xy: 960, 1124 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 draug-factory-top rotate: false - xy: 913, 457 + xy: 960, 992 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress-factory rotate: false - xy: 651, 751 + xy: 619, 242 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 fortress-factory-top rotate: false - xy: 619, 637 + xy: 619, 144 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 ghoul-factory-top rotate: false - xy: 619, 637 + xy: 619, 144 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 titan-factory-top rotate: false - xy: 619, 637 + xy: 619, 144 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 ghoul-factory rotate: false - xy: 619, 441 + xy: 651, 730 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 phantom-factory-top rotate: false - xy: 1465, 1299 + xy: 1011, 464 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rally-point rotate: false - xy: 921, 1183 + xy: 1119, 266 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 repair-point-base rotate: false - xy: 1369, 697 + xy: 1890, 925 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1630,133 +1630,133 @@ revenant-factory-top index: -1 spirit-factory-top rotate: false - xy: 1927, 1233 + xy: 1143, 662 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-factory rotate: false - xy: 745, 1579 + xy: 913, 457 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 wraith-factory-top rotate: false - xy: 1022, 1035 + xy: 1201, 1299 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 913, 523 + xy: 960, 1058 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-open rotate: false - xy: 1301, 459 + xy: 1946, 993 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 insulator-wall rotate: false - xy: 1199, 323 + xy: 1301, 801 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 insulator-wall-large rotate: false - xy: 871, 1249 + xy: 945, 794 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-huge2 rotate: false - xy: 815, 163 + xy: 815, 65 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-huge3 rotate: false - xy: 815, 65 + xy: 847, 751 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-large1 rotate: false - xy: 1597, 1233 + xy: 1092, 992 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large2 rotate: false - xy: 1663, 1233 + xy: 1120, 926 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large3 rotate: false - xy: 1729, 1233 + xy: 1120, 860 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large4 rotate: false - xy: 1795, 1233 + xy: 1143, 794 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall2 rotate: false - xy: 1369, 663 + xy: 1958, 959 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 1403, 697 + xy: 1924, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 1437, 731 + xy: 1958, 925 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 1437, 731 + xy: 1958, 925 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bullet rotate: false - xy: 1501, 1113 + xy: 1095, 7 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 bullet-back rotate: false - xy: 1555, 1113 + xy: 1149, 14 size: 52, 52 orig: 52, 52 offset: 0, 0 @@ -1768,6 +1768,20 @@ casing orig: 8, 16 offset: 0, 0 index: -1 +circle-end + rotate: false + xy: 464, 926 + size: 100, 199 + orig: 100, 199 + offset: 0, 0 + index: -1 +circle-mid + rotate: false + xy: 2022, 1030 + size: 1, 199 + orig: 1, 199 + offset: 0, 0 + index: -1 circle-shadow rotate: false xy: 863, 1846 @@ -1777,154 +1791,154 @@ circle-shadow index: -1 error rotate: false - xy: 1959, 1117 + xy: 1991, 1331 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 laser rotate: false - xy: 2043, 1087 + xy: 1053, 1536 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 laser-end rotate: false - xy: 549, 1509 + xy: 913, 383 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 minelaser rotate: false - xy: 2043, 1037 + xy: 1053, 1486 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 minelaser-end rotate: false - xy: 623, 1509 + xy: 549, 1579 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 missile rotate: false - xy: 1146, 964 + xy: 863, 1808 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 missile-back rotate: false - xy: 863, 1808 + xy: 921, 1152 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 scale_marker rotate: false - xy: 607, 1371 + xy: 723, 1143 size: 4, 4 orig: 4, 4 offset: 0, 0 index: -1 scorch1 rotate: false - xy: 1369, 391 + xy: 1243, 673 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch2 rotate: false - xy: 1369, 289 + xy: 1243, 571 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch3 rotate: false - xy: 1369, 187 + xy: 1243, 469 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch4 rotate: false - xy: 1369, 85 + xy: 1251, 367 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch5 rotate: false - xy: 1496, 1007 + xy: 1273, 673 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 shell rotate: false - xy: 993, 15 + xy: 873, 27 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shell-back rotate: false - xy: 2009, 1137 + xy: 1186, 861 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shot rotate: false - xy: 1505, 799 + xy: 1958, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 transfer rotate: false - xy: 195, 894 + xy: 979, 259 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 1505, 663 + xy: 1709, 857 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 transfer-end rotate: false - xy: 607, 1435 + xy: 913, 309 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 white rotate: false - xy: 1164, 959 + xy: 1209, 464 size: 3, 3 orig: 3, 3 offset: 0, 0 index: -1 arc rotate: false - xy: 723, 1145 + xy: 389, 49 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-arc-full rotate: false - xy: 1029, 121 + xy: 1209, 725 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1938,147 +1952,147 @@ block-blast-drill-full index: -1 block-bridge-conduit-full rotate: false - xy: 1029, 53 + xy: 1209, 657 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 1029, 53 + xy: 1209, 657 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-bridge-conveyor-full rotate: false - xy: 1063, 830 + xy: 1209, 623 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 1063, 830 + xy: 1209, 623 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-char-full rotate: false - xy: 1097, 830 + xy: 1209, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cliffs-full rotate: false - xy: 1063, 796 + xy: 1209, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-coal-centrifuge-full rotate: false - xy: 1969, 1689 + xy: 913, 177 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 coal-centrifuge rotate: false - xy: 1969, 1689 + xy: 913, 177 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-combustion-generator-full rotate: false - xy: 1063, 762 + xy: 1209, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 1063, 762 + xy: 1209, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-command-center-full rotate: false - xy: 843, 1537 + xy: 913, 111 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 command-center rotate: false - xy: 843, 1537 + xy: 913, 111 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-conduit-full rotate: false - xy: 1097, 796 + xy: 1209, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-container-full rotate: false - xy: 909, 1520 + xy: 1976, 1821 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 container rotate: false - xy: 909, 1520 + xy: 1976, 1821 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-conveyor-full rotate: false - xy: 1063, 728 + xy: 695, 10 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 1063, 728 + xy: 695, 10 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-copper-wall-full rotate: false - xy: 1097, 762 + xy: 729, 10 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall rotate: false - xy: 1097, 762 + xy: 729, 10 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-copper-wall-large-full rotate: false - xy: 975, 1520 + xy: 1976, 1755 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 copper-wall-large rotate: false - xy: 975, 1520 + xy: 1976, 1755 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2127,28 +2141,28 @@ core-shard index: -1 block-craters-full rotate: false - xy: 1063, 694 + xy: 763, 10 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-crawler-factory-full rotate: false - xy: 697, 1513 + xy: 1969, 1689 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-cryofluidmixer-full rotate: false - xy: 763, 1513 + xy: 913, 45 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-cultivator-full rotate: false - xy: 681, 1443 + xy: 623, 1615 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2162,112 +2176,112 @@ block-cyclone-full index: -1 block-dagger-factory-full rotate: false - xy: 747, 1447 + xy: 689, 1615 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-dark-metal-full rotate: false - xy: 1097, 728 + xy: 1334, 1013 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-1-full rotate: false - xy: 1063, 660 + xy: 1346, 979 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-2-full rotate: false - xy: 1097, 694 + xy: 1346, 945 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-3-full rotate: false - xy: 1063, 626 + xy: 1346, 911 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-4-full rotate: false - xy: 1097, 660 + xy: 1270, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-5-full rotate: false - xy: 1063, 592 + xy: 1304, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dark-panel-6-full rotate: false - xy: 1097, 626 + xy: 1346, 877 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-full rotate: false - xy: 1063, 558 + xy: 1342, 1181 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-tainted-water-full rotate: false - xy: 1097, 592 + xy: 1342, 1147 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-water-full rotate: false - xy: 1063, 524 + xy: 1342, 1113 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dart-mech-pad-full rotate: false - xy: 813, 1447 + xy: 623, 1549 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dart-mech-pad rotate: false - xy: 813, 1447 + xy: 623, 1549 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-deepwater-full rotate: false - xy: 1097, 558 + xy: 1342, 1079 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-delta-mech-pad-full rotate: false - xy: 879, 1454 + xy: 689, 1549 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 delta-mech-pad rotate: false - xy: 879, 1454 + xy: 689, 1549 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2288,182 +2302,182 @@ differential-generator index: -1 block-distributor-full rotate: false - xy: 945, 1454 + xy: 615, 1483 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 distributor rotate: false - xy: 945, 1454 + xy: 615, 1483 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-door-full rotate: false - xy: 1063, 490 + xy: 1376, 1205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door rotate: false - xy: 1063, 490 + xy: 1376, 1205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-door-large-full rotate: false - xy: 681, 1377 + xy: 681, 1483 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-large rotate: false - xy: 681, 1377 + xy: 681, 1483 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-draug-factory-full rotate: false - xy: 747, 1381 + xy: 607, 1417 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-dunerocks-full rotate: false - xy: 1097, 524 + xy: 1376, 1171 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-duo-full rotate: false - xy: 1063, 456 + xy: 1376, 1137 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-force-projector-full rotate: false - xy: 464, 1029 + xy: 464, 828 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 force-projector rotate: false - xy: 464, 1029 + xy: 464, 828 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-fortress-factory-full rotate: false - xy: 464, 931 + xy: 455, 730 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-fuse-full rotate: false - xy: 464, 833 + xy: 423, 632 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-ghoul-factory-full rotate: false - xy: 455, 735 + xy: 423, 534 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-glaive-ship-pad-full rotate: false - xy: 625, 1143 + xy: 423, 436 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 glaive-ship-pad rotate: false - xy: 625, 1143 + xy: 423, 436 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-graphite-press-full rotate: false - xy: 813, 1381 + xy: 673, 1417 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 graphite-press rotate: false - xy: 813, 1381 + xy: 673, 1417 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-grass-full rotate: false - xy: 1097, 490 + xy: 1376, 1103 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hail-full rotate: false - xy: 1063, 422 + xy: 1410, 1197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-holostone-full rotate: false - xy: 1097, 456 + xy: 1410, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hotrock-full rotate: false - xy: 1063, 388 + xy: 1410, 1129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-full rotate: false - xy: 1097, 422 + xy: 1410, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-snow-full rotate: false - xy: 1063, 354 + xy: 1376, 1069 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icerocks-full rotate: false - xy: 1097, 388 + xy: 1410, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ignarock-full rotate: false - xy: 1063, 320 + xy: 1444, 1189 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2477,126 +2491,126 @@ block-impact-reactor-full index: -1 block-incinerator-full rotate: false - xy: 1097, 354 + xy: 1444, 1155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 incinerator rotate: false - xy: 1097, 354 + xy: 1444, 1155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-inverted-sorter-full rotate: false - xy: 1063, 286 + xy: 1478, 1189 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 inverted-sorter rotate: false - xy: 1063, 286 + xy: 1478, 1189 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-item-source-full rotate: false - xy: 1097, 320 + xy: 1444, 1121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 1097, 320 + xy: 1444, 1121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-item-void-full rotate: false - xy: 1063, 252 + xy: 1478, 1155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 1063, 252 + xy: 1478, 1155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-javelin-ship-pad-full rotate: false - xy: 879, 1388 + xy: 987, 391 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 javelin-ship-pad rotate: false - xy: 879, 1388 + xy: 987, 391 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-junction-full rotate: false - xy: 1097, 286 + xy: 1444, 1087 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction rotate: false - xy: 1097, 286 + xy: 1444, 1087 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-kiln-full rotate: false - xy: 945, 1388 + xy: 987, 325 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 kiln rotate: false - xy: 945, 1388 + xy: 987, 325 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-lancer-full rotate: false - xy: 673, 1311 + xy: 755, 1611 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-laser-drill-full rotate: false - xy: 562, 1045 + xy: 423, 338 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-launch-pad-full rotate: false - xy: 562, 947 + xy: 423, 240 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 launch-pad rotate: false - xy: 562, 947 + xy: 423, 240 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -2617,77 +2631,77 @@ launch-pad-large index: -1 block-liquid-junction-full rotate: false - xy: 1063, 218 + xy: 1478, 1121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 1063, 218 + xy: 1478, 1121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-liquid-router-full rotate: false - xy: 1097, 252 + xy: 1478, 1087 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-liquid-source-full rotate: false - xy: 1063, 184 + xy: 1444, 1053 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-source rotate: false - xy: 1063, 184 + xy: 1444, 1053 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-liquid-tank-full rotate: false - xy: 562, 849 + xy: 423, 142 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-magmarock-full rotate: false - xy: 1097, 218 + xy: 1478, 1053 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mass-driver-full rotate: false - xy: 660, 1045 + xy: 423, 44 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-mechanical-drill-full rotate: false - xy: 673, 1245 + xy: 821, 1611 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-mechanical-pump-full rotate: false - xy: 1063, 150 + xy: 1512, 1189 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 1063, 150 + xy: 1512, 1189 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2701,630 +2715,630 @@ block-meltdown-full index: -1 block-melter-full rotate: false - xy: 1097, 184 + xy: 1512, 1155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 1097, 184 + xy: 1512, 1155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mend-projector-full rotate: false - xy: 1011, 1431 + xy: 755, 1545 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mend-projector rotate: false - xy: 1011, 1431 + xy: 755, 1545 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-mender-full rotate: false - xy: 1063, 116 + xy: 1512, 1121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mender rotate: false - xy: 1063, 116 + xy: 1512, 1121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-message-full rotate: false - xy: 1097, 150 + xy: 1512, 1087 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 message rotate: false - xy: 1097, 150 + xy: 1512, 1087 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-metal-floor-2-full rotate: false - xy: 1063, 82 + xy: 1512, 1053 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-metal-floor-3-full rotate: false - xy: 1097, 116 + xy: 1546, 1197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-metal-floor-5-full rotate: false - xy: 1097, 82 + xy: 1546, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-metal-floor-damaged-full rotate: false - xy: 1131, 830 + xy: 1580, 1197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-metal-floor-full rotate: false - xy: 1131, 796 + xy: 1546, 1129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-moss-full rotate: false - xy: 1131, 728 + xy: 1614, 1197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-multi-press-full rotate: false - xy: 660, 947 + xy: 625, 1143 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 multi-press rotate: false - xy: 660, 947 + xy: 625, 1143 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-oil-extractor-full rotate: false - xy: 660, 849 + xy: 566, 1045 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-omega-mech-pad-full rotate: false - xy: 423, 635 + xy: 566, 947 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 omega-mech-pad rotate: false - xy: 423, 635 + xy: 566, 947 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-ore-coal-full rotate: false - xy: 1131, 694 + xy: 1546, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-coal-medium rotate: false - xy: 1131, 694 + xy: 1546, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-coal-large rotate: false - xy: 1407, 1455 + xy: 887, 1635 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-coal-small rotate: false - xy: 259, 1379 + xy: 873, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-coal-tiny rotate: false - xy: 1041, 1568 + xy: 797, 26 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-ore-coal-xlarge rotate: false - xy: 1809, 1117 + xy: 1448, 1381 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-ore-copper-full rotate: false - xy: 1131, 660 + xy: 1580, 1129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-copper-medium rotate: false - xy: 1131, 660 + xy: 1580, 1129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-copper-large rotate: false - xy: 549, 1685 + xy: 887, 1593 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-copper-small rotate: false - xy: 847, 757 + xy: 1342, 1053 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-copper-tiny rotate: false - xy: 1041, 1550 + xy: 797, 8 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-ore-copper-xlarge rotate: false - xy: 1859, 1117 + xy: 1498, 1381 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-ore-lead-full rotate: false - xy: 1131, 626 + xy: 1614, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-lead-medium rotate: false - xy: 1131, 626 + xy: 1614, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-lead-large rotate: false - xy: 571, 9 + xy: 887, 1551 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-lead-small rotate: false - xy: 1993, 1239 + xy: 1224, 861 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-lead-tiny rotate: false - xy: 1041, 1532 + xy: 204, 1129 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-ore-lead-xlarge rotate: false - xy: 1909, 1117 + xy: 1548, 1381 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-ore-scrap-full rotate: false - xy: 1131, 592 + xy: 1648, 1197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-scrap-medium rotate: false - xy: 1131, 592 + xy: 1648, 1197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-scrap-large rotate: false - xy: 867, 23 + xy: 607, 1375 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-scrap-small rotate: false - xy: 901, 1820 + xy: 259, 1379 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-scrap-tiny rotate: false - xy: 1041, 1514 + xy: 566, 929 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-ore-scrap-xlarge rotate: false - xy: 979, 803 + xy: 1598, 1381 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-ore-thorium-full rotate: false - xy: 1131, 558 + xy: 1546, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-thorium-medium rotate: false - xy: 1131, 558 + xy: 1546, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-thorium-large rotate: false - xy: 1164, 867 + xy: 673, 1243 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-thorium-small rotate: false - xy: 1063, 56 + xy: 960, 966 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-thorium-tiny rotate: false - xy: 1031, 1 + xy: 660, 831 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-ore-thorium-xlarge rotate: false - xy: 979, 753 + xy: 1648, 1381 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-ore-titanium-full rotate: false - xy: 1131, 524 + xy: 1580, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-titanium-medium rotate: false - xy: 1131, 524 + xy: 1580, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-titanium-large rotate: false - xy: 1364, 917 + xy: 945, 752 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-ore-titanium-small rotate: false - xy: 1403, 535 + xy: 901, 1820 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-ore-titanium-tiny rotate: false - xy: 1049, 1 + xy: 749, 733 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-ore-titanium-xlarge rotate: false - xy: 979, 703 + xy: 1698, 1381 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-overdrive-projector-full rotate: false - xy: 1077, 1431 + xy: 821, 1545 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overdrive-projector rotate: false - xy: 1077, 1431 + xy: 821, 1545 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-overflow-gate-full rotate: false - xy: 1131, 490 + xy: 1614, 1129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 1131, 490 + xy: 1614, 1129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pebbles-full rotate: false - xy: 1131, 456 + xy: 1648, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-phantom-factory-full rotate: false - xy: 1143, 1431 + xy: 747, 1479 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-phase-conduit-full rotate: false - xy: 1131, 422 + xy: 1682, 1197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 1131, 422 + xy: 1682, 1197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-phase-conveyor-full rotate: false - xy: 1131, 388 + xy: 1580, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 1131, 388 + xy: 1580, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-phase-wall-full rotate: false - xy: 1131, 354 + xy: 1614, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 1131, 354 + xy: 1614, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-phase-wall-large-full rotate: false - xy: 1209, 1431 + xy: 813, 1479 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-wall-large rotate: false - xy: 1209, 1431 + xy: 813, 1479 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-phase-weaver-full rotate: false - xy: 1275, 1431 + xy: 739, 1413 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-pine-full rotate: false - xy: 979, 653 + xy: 1748, 1381 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-plastanium-compressor-full rotate: false - xy: 1341, 1431 + xy: 805, 1413 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 1341, 1431 + xy: 805, 1413 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-plastanium-wall-full rotate: false - xy: 1131, 320 + xy: 1648, 1129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-wall rotate: false - xy: 1131, 320 + xy: 1648, 1129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-plastanium-wall-large-full rotate: false - xy: 1011, 1365 + xy: 673, 1351 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-wall-large rotate: false - xy: 1011, 1365 + xy: 673, 1351 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-pneumatic-drill-full rotate: false - xy: 1077, 1365 + xy: 673, 1285 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-power-node-full rotate: false - xy: 1131, 286 + xy: 1682, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node rotate: false - xy: 1131, 286 + xy: 1682, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-power-node-large-full rotate: false - xy: 1143, 1365 + xy: 739, 1347 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 1143, 1365 + xy: 739, 1347 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-power-source-full rotate: false - xy: 1131, 252 + xy: 1716, 1197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-power-void-full rotate: false - xy: 1131, 218 + xy: 1614, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 1131, 218 + xy: 1614, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pulse-conduit-full rotate: false - xy: 1131, 184 + xy: 1648, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pulverizer-full rotate: false - xy: 1131, 150 + xy: 1682, 1129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pyratite-mixer-full rotate: false - xy: 1209, 1365 + xy: 805, 1347 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 1209, 1365 + xy: 805, 1347 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-repair-point-full rotate: false - xy: 1131, 116 + xy: 1716, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3338,140 +3352,140 @@ block-revenant-factory-full index: -1 block-ripple-full rotate: false - xy: 423, 537 + xy: 664, 1045 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-rock-full rotate: false - xy: 979, 603 + xy: 1798, 1381 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-rocks-full rotate: false - xy: 1131, 82 + xy: 1750, 1197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-rotary-pump-full rotate: false - xy: 1275, 1365 + xy: 739, 1281 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 1275, 1365 + xy: 739, 1281 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-router-full rotate: false - xy: 1031, 19 + xy: 1648, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 1031, 19 + xy: 1648, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-rtg-generator-full rotate: false - xy: 1341, 1365 + xy: 805, 1281 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 1341, 1365 + xy: 805, 1281 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-salt-full rotate: false - xy: 1165, 833 + xy: 1682, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-saltrocks-full rotate: false - xy: 1165, 799 + xy: 1716, 1129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-salvo-full rotate: false - xy: 1407, 1365 + xy: 987, 259 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-sand-boulder-full rotate: false - xy: 1199, 833 + xy: 1750, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-full rotate: false - xy: 1165, 765 + xy: 1784, 1197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-water-full rotate: false - xy: 1199, 799 + xy: 1682, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sandrocks-full rotate: false - xy: 1233, 833 + xy: 1716, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scatter-full rotate: false - xy: 1473, 1365 + xy: 979, 193 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-scorch-full rotate: false - xy: 1165, 731 + xy: 1750, 1129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-full rotate: false - xy: 1199, 765 + xy: 1784, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall1 rotate: false - xy: 1199, 765 + xy: 1784, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3492,161 +3506,161 @@ scrap-wall-gigantic index: -1 block-scrap-wall-huge-full rotate: false - xy: 423, 439 + xy: 664, 947 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-huge1 rotate: false - xy: 423, 439 + xy: 664, 947 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-scrap-wall-large-full rotate: false - xy: 1539, 1365 + xy: 979, 127 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-separator-full rotate: false - xy: 1605, 1365 + xy: 979, 61 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator rotate: false - xy: 1605, 1365 + xy: 979, 61 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-shale-boulder-full rotate: false - xy: 1267, 833 + xy: 1716, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-full rotate: false - xy: 1165, 697 + xy: 1750, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shalerocks-full rotate: false - xy: 1199, 731 + xy: 1784, 1129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shock-mine-full rotate: false - xy: 1233, 765 + xy: 1818, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shrubs-full rotate: false - xy: 1267, 799 + xy: 1852, 1197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-silicon-smelter-full rotate: false - xy: 1671, 1365 + xy: 723, 1215 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 1671, 1365 + xy: 723, 1215 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-snow-full rotate: false - xy: 1301, 833 + xy: 1750, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-pine-full rotate: false - xy: 979, 553 + xy: 1848, 1381 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-snowrock-full rotate: false - xy: 979, 503 + xy: 1898, 1381 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-snowrocks-full rotate: false - xy: 1165, 663 + xy: 1784, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-solar-panel-full rotate: false - xy: 1199, 697 + xy: 1818, 1129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 1199, 697 + xy: 1818, 1129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-solar-panel-large-full rotate: false - xy: 423, 341 + xy: 1449, 1431 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 solar-panel-large rotate: false - xy: 423, 341 + xy: 1449, 1431 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-sorter-full rotate: false - xy: 1233, 731 + xy: 1852, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 1233, 731 + xy: 1852, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-spawn-full rotate: false - xy: 1267, 765 + xy: 1886, 1197 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3660,203 +3674,203 @@ block-spectre-full index: -1 block-spirit-factory-full rotate: false - xy: 1737, 1365 + xy: 723, 1149 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-spore-cluster-full rotate: false - xy: 591, 1685 + xy: 1011, 1544 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-spore-moss-full rotate: false - xy: 1301, 799 + xy: 1784, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-spore-pine-full rotate: false - xy: 979, 453 + xy: 1948, 1381 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-spore-press-full rotate: false - xy: 1803, 1365 + xy: 789, 1215 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-sporerocks-full rotate: false - xy: 1335, 833 + xy: 1818, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-stone-full rotate: false - xy: 1165, 629 + xy: 1852, 1129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-surge-tower-full rotate: false - xy: 1869, 1365 + xy: 789, 1149 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 surge-tower rotate: false - xy: 1869, 1365 + xy: 789, 1149 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-surge-wall-full rotate: false - xy: 1199, 663 + xy: 1886, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 1199, 663 + xy: 1886, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-surge-wall-large-full rotate: false - xy: 1935, 1365 + xy: 762, 1083 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 surge-wall-large rotate: false - xy: 1935, 1365 + xy: 762, 1083 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-swarmer-full rotate: false - xy: 723, 1179 + xy: 762, 1017 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-tainted-water-full rotate: false - xy: 1233, 697 + xy: 1920, 1197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-tar-full rotate: false - xy: 1267, 731 + xy: 1818, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-tau-mech-pad-full rotate: false - xy: 739, 1311 + xy: 762, 951 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 tau-mech-pad rotate: false - xy: 739, 1311 + xy: 762, 951 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-tendrils-full rotate: false - xy: 1301, 765 + xy: 1852, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-thermal-generator-full rotate: false - xy: 739, 1245 + xy: 828, 1083 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 739, 1245 + xy: 828, 1083 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-thermal-pump-full rotate: false - xy: 423, 243 + xy: 1547, 1431 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 423, 243 + xy: 1547, 1431 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-thorium-reactor-full rotate: false - xy: 423, 145 + xy: 1645, 1431 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thorium-reactor rotate: false - xy: 423, 145 + xy: 1645, 1431 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-thorium-wall-full rotate: false - xy: 1335, 799 + xy: 1886, 1129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 1335, 799 + xy: 1886, 1129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-thorium-wall-large-full rotate: false - xy: 805, 1315 + xy: 828, 1017 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 805, 1315 + xy: 828, 1017 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3877,126 +3891,126 @@ thruster index: -1 block-titan-factory-full rotate: false - xy: 423, 47 + xy: 1743, 1431 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-titanium-conveyor-full rotate: false - xy: 1165, 595 + xy: 1920, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 1165, 595 + xy: 1920, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-titanium-wall-full rotate: false - xy: 1199, 629 + xy: 1954, 1197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall rotate: false - xy: 1199, 629 + xy: 1954, 1197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-titanium-wall-large-full rotate: false - xy: 805, 1249 + xy: 828, 951 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titanium-wall-large rotate: false - xy: 805, 1249 + xy: 828, 951 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-trident-ship-pad-full rotate: false - xy: 789, 1179 + xy: 856, 885 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 trident-ship-pad rotate: false - xy: 789, 1179 + xy: 856, 885 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-turbine-generator-full rotate: false - xy: 758, 1113 + xy: 855, 1215 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator rotate: false - xy: 758, 1113 + xy: 855, 1215 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-unloader-full rotate: false - xy: 1233, 663 + xy: 1852, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader rotate: false - xy: 1233, 663 + xy: 1852, 1061 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-vault-full rotate: false - xy: 1449, 1431 + xy: 1841, 1431 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 vault rotate: false - xy: 1449, 1431 + xy: 1841, 1431 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-water-extractor-full rotate: false - xy: 758, 1047 + xy: 855, 1149 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-water-full rotate: false - xy: 1267, 697 + xy: 1886, 1095 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-wave-full rotate: false - xy: 758, 981 + xy: 894, 1083 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4017,175 +4031,175 @@ block-white-tree-full index: -1 block-wraith-factory-full rotate: false - xy: 758, 915 + xy: 894, 1017 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-1-0 rotate: false - xy: 1233, 425 + xy: 1674, 993 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-1 rotate: false - xy: 1267, 459 + xy: 1708, 993 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-2 rotate: false - xy: 1301, 493 + xy: 1742, 993 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-3 rotate: false - xy: 1335, 527 + xy: 1776, 993 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-4 rotate: false - xy: 1165, 323 + xy: 1810, 993 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-5 rotate: false - xy: 1199, 357 + xy: 1844, 993 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-6 rotate: false - xy: 1233, 391 + xy: 1878, 993 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-7 rotate: false - xy: 1267, 425 + xy: 1912, 993 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-2-0 rotate: false - xy: 758, 849 + xy: 894, 951 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-1 rotate: false - xy: 824, 1113 + xy: 922, 885 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-2 rotate: false - xy: 824, 1047 + xy: 1045, 193 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-3 rotate: false - xy: 824, 981 + xy: 1045, 127 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-4 rotate: false - xy: 824, 915 + xy: 1045, 61 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-5 rotate: false - xy: 824, 849 + xy: 879, 1479 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-6 rotate: false - xy: 847, 783 + xy: 871, 1413 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-7 rotate: false - xy: 855, 1183 + xy: 871, 1347 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-3-0 rotate: false - xy: 1547, 1431 + xy: 521, 632 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-1 rotate: false - xy: 1645, 1431 + xy: 521, 534 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-2 rotate: false - xy: 1743, 1431 + xy: 521, 436 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-3 rotate: false - xy: 1841, 1431 + xy: 521, 338 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-4 rotate: false - xy: 1939, 1529 + xy: 521, 240 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-5 rotate: false - xy: 1939, 1431 + xy: 521, 142 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-6 rotate: false - xy: 521, 637 + xy: 521, 44 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-7 rotate: false - xy: 521, 539 + xy: 553, 730 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -4304,763 +4318,763 @@ cracks-5-7 index: -1 cyclone rotate: false - xy: 521, 441 + xy: 562, 828 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 duo rotate: false - xy: 1335, 493 + xy: 1980, 993 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fuse rotate: false - xy: 619, 539 + xy: 619, 46 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 hail rotate: false - xy: 1165, 289 + xy: 2014, 993 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-blast-compound-large rotate: false - xy: 1406, 917 + xy: 1219, 1257 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-blast-compound-medium rotate: false - xy: 1267, 391 + xy: 1369, 775 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-blast-compound-small rotate: false - xy: 1437, 569 + xy: 1709, 831 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-blast-compound-tiny rotate: false - xy: 204, 1129 + xy: 623, 1709 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-blast-compound-xlarge rotate: false - xy: 1759, 1067 + xy: 1575, 1281 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-coal-large rotate: false - xy: 1248, 867 + xy: 1219, 1215 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-coal-medium rotate: false - xy: 1335, 459 + xy: 1380, 925 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal-small rotate: false - xy: 1471, 603 + xy: 1743, 865 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-coal-tiny rotate: false - xy: 1407, 1437 + xy: 649, 1399 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-coal-xlarge rotate: false - xy: 1809, 1067 + xy: 1625, 1281 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-copper-large rotate: false - xy: 1448, 917 + xy: 1208, 1007 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-copper-medium rotate: false - xy: 1199, 289 + xy: 1380, 993 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper-small rotate: false - xy: 1505, 637 + xy: 1243, 775 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-copper-tiny rotate: false - xy: 2001, 1371 + xy: 987, 776 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-copper-xlarge rotate: false - xy: 1859, 1067 + xy: 1675, 1281 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-graphite-large rotate: false - xy: 1290, 867 + xy: 1011, 1502 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-graphite-medium rotate: false - xy: 1267, 357 + xy: 1414, 951 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite-small rotate: false - xy: 1496, 981 + xy: 1251, 341 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-graphite-tiny rotate: false - xy: 697, 31 + xy: 924, 867 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-graphite-xlarge rotate: false - xy: 1909, 1067 + xy: 1725, 1281 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-lead-large rotate: false - xy: 99, 2 + xy: 1011, 1460 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-lead-medium rotate: false - xy: 1335, 425 + xy: 1414, 917 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead-small rotate: false - xy: 285, 1379 + xy: 1273, 647 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-lead-tiny rotate: false - xy: 1496, 963 + xy: 924, 849 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-lead-xlarge rotate: false - xy: 1959, 1067 + xy: 1775, 1281 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-metaglass-large rotate: false - xy: 2001, 1389 + xy: 99, 2 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-metaglass-medium rotate: false - xy: 1199, 255 + xy: 1482, 985 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass-small rotate: false - xy: 873, 757 + xy: 285, 1379 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-metaglass-tiny rotate: false - xy: 1297, 67 + xy: 1345, 1239 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-metaglass-xlarge rotate: false - xy: 1014, 919 + xy: 1825, 1281 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-phase-fabric-large rotate: false - xy: 613, 7 + xy: 1261, 1215 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-phase-fabric-medium rotate: false - xy: 1267, 323 + xy: 1482, 951 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric-small rotate: false - xy: 1089, 56 + xy: 1709, 805 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-phase-fabric-tiny rotate: false - xy: 1011, 1502 + xy: 1345, 1221 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-phase-fabric-xlarge rotate: false - xy: 1014, 869 + xy: 1875, 1281 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-plastanium-large rotate: false - xy: 655, 7 + xy: 1303, 1215 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-plastanium-medium rotate: false - xy: 1335, 391 + xy: 1414, 883 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium-small rotate: false - xy: 1403, 509 + xy: 1769, 865 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-plastanium-tiny rotate: false - xy: 222, 1129 + xy: 1516, 1001 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-plastanium-xlarge rotate: false - xy: 1064, 914 + xy: 1925, 1281 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-pyratite-large rotate: false - xy: 909, 19 + xy: 1258, 1173 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-pyratite-medium rotate: false - xy: 1199, 221 + xy: 1482, 883 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite-small rotate: false - xy: 1115, 56 + xy: 1269, 775 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-pyratite-tiny rotate: false - xy: 1425, 1437 + xy: 2026, 975 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-pyratite-xlarge rotate: false - xy: 1064, 864 + xy: 1975, 1281 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-sand-large rotate: false - xy: 1332, 867 + xy: 1258, 1131 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-sand-medium rotate: false - xy: 1267, 289 + xy: 1403, 815 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand-small rotate: false - xy: 2019, 1239 + xy: 1295, 775 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-sand-tiny rotate: false - xy: 2019, 1371 + xy: 1209, 469 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-sand-xlarge rotate: false - xy: 1114, 914 + xy: 1267, 1257 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-scrap-large rotate: false - xy: 1374, 875 + xy: 1300, 1173 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-scrap-medium rotate: false - xy: 1335, 357 + xy: 1403, 781 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap-small rotate: false - xy: 1141, 56 + xy: 1251, 315 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-scrap-tiny rotate: false - xy: 697, 13 + xy: 1250, 869 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-scrap-xlarge rotate: false - xy: 1114, 864 + xy: 1317, 1257 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-silicon-large rotate: false - xy: 1416, 875 + xy: 1258, 1089 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-silicon-medium rotate: false - xy: 1199, 187 + xy: 1471, 849 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon-small rotate: false - xy: 1065, 30 + xy: 1273, 621 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-silicon-tiny rotate: false - xy: 1315, 67 + xy: 1347, 783 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-silicon-xlarge rotate: false - xy: 1993, 1315 + xy: 1367, 1239 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-spore-pod-large rotate: false - xy: 1458, 875 + xy: 1300, 1131 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-spore-pod-medium rotate: false - xy: 1267, 255 + xy: 1471, 815 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod-small rotate: false - xy: 1091, 30 + xy: 1795, 865 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-tiny rotate: false - xy: 240, 1129 + xy: 1329, 757 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-spore-pod-xlarge rotate: false - xy: 1993, 1265 + xy: 1417, 1231 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-surge-alloy-large rotate: false - xy: 1490, 917 + xy: 1300, 1089 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-surge-alloy-medium rotate: false - xy: 1335, 323 + xy: 1516, 959 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy-small rotate: false - xy: 1117, 30 + xy: 1321, 775 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-tiny rotate: false - xy: 1333, 67 + xy: 1251, 271 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-surge-alloy-xlarge rotate: false - xy: 1146, 1052 + xy: 1467, 1223 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-thorium-large rotate: false - xy: 1500, 875 + xy: 1258, 1047 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-thorium-medium rotate: false - xy: 1199, 153 + xy: 1550, 959 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium-small rotate: false - xy: 1143, 30 + xy: 1303, 749 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-thorium-tiny rotate: false - xy: 1351, 67 + xy: 1847, 873 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-thorium-xlarge rotate: false - xy: 1146, 1002 + xy: 1525, 1231 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-titanium-large rotate: false - xy: 1374, 833 + xy: 1300, 1047 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-titanium-medium rotate: false - xy: 1267, 221 + xy: 1550, 925 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium-small rotate: false - xy: 1167, 59 + xy: 1251, 289 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-tiny rotate: false - xy: 1369, 67 + xy: 1303, 705 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-titanium-xlarge rotate: false - xy: 1196, 1059 + xy: 1575, 1231 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lancer rotate: false - xy: 937, 1256 + xy: 1077, 794 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 liquid-cryofluid-large rotate: false - xy: 1416, 833 + xy: 1250, 1005 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-cryofluid-medium rotate: false - xy: 1335, 289 + xy: 1550, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid-small rotate: false - xy: 1193, 59 + xy: 1273, 595 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-cryofluid-tiny rotate: false - xy: 1403, 491 + xy: 1273, 551 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-cryofluid-xlarge rotate: false - xy: 1296, 1059 + xy: 1775, 1231 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-oil-large rotate: false - xy: 1458, 833 + xy: 1292, 1005 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-oil-medium rotate: false - xy: 1199, 119 + xy: 1618, 959 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil-small rotate: false - xy: 1219, 59 + xy: 1821, 865 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-oil-tiny rotate: false - xy: 1169, 41 + xy: 222, 1129 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-oil-xlarge rotate: false - xy: 1296, 1009 + xy: 1825, 1231 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-slag-large rotate: false - xy: 1500, 833 + xy: 1236, 963 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-slag-medium rotate: false - xy: 1199, 85 + xy: 1652, 925 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag-small rotate: false - xy: 1245, 59 + xy: 1303, 723 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-slag-tiny rotate: false - xy: 1187, 41 + xy: 584, 929 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-slag-xlarge rotate: false - xy: 1346, 1059 + xy: 1875, 1231 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-water-large rotate: false - xy: 951, 11 + xy: 1236, 921 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-water-medium rotate: false - xy: 1267, 153 + xy: 1652, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water-small rotate: false - xy: 1271, 59 + xy: 1273, 569 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-water-tiny rotate: false - xy: 1205, 41 + xy: 678, 831 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-water-xlarge rotate: false - xy: 1346, 1009 + xy: 1925, 1231 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mass-driver rotate: false - xy: 717, 359 + xy: 1939, 1529 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mech-alpha-mech-full rotate: false - xy: 1396, 1059 + xy: 1975, 1231 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mech-dart-ship-full rotate: false - xy: 1396, 1009 + xy: 1119, 1249 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mech-delta-mech-full rotate: false - xy: 1446, 1059 + xy: 1169, 1249 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5074,28 +5088,28 @@ mech-glaive-ship-full index: -1 mech-javelin-ship-full rotate: false - xy: 1446, 1009 + xy: 1119, 1199 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mech-omega-mech-full rotate: false - xy: 607, 1377 + xy: 1333, 1374 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 mech-tau-mech-full rotate: false - xy: 1153, 1109 + xy: 1243, 70 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 mech-trident-ship-full rotate: false - xy: 956, 911 + xy: 1267, 1307 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -5109,35 +5123,35 @@ meltdown index: -1 repair-point rotate: false - xy: 1437, 799 + xy: 1856, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ripple rotate: false - xy: 815, 457 + xy: 815, 359 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 salvo rotate: false - xy: 1267, 1233 + xy: 1003, 1322 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scatter rotate: false - xy: 1531, 1233 + xy: 1092, 1058 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch rotate: false - xy: 1437, 765 + xy: 1890, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5151,7 +5165,7 @@ spectre index: -1 swarmer rotate: false - xy: 1383, 1167 + xy: 1177, 200 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -5165,14 +5179,14 @@ unit-chaos-array-full index: -1 unit-crawler-full rotate: false - xy: 1214, 909 + xy: 1208, 1149 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-dagger-full rotate: false - xy: 1264, 909 + xy: 1208, 1099 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5186,266 +5200,266 @@ unit-eradicator-full index: -1 unit-eruptor-full rotate: false - xy: 1647, 1167 + xy: 1069, 1365 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-fortress-full rotate: false - xy: 1713, 1167 + xy: 1135, 1431 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-titan-full rotate: false - xy: 1779, 1167 + xy: 1069, 1299 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wave rotate: false - xy: 1022, 1101 + xy: 1267, 1431 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 1233, 357 + xy: 1335, 801 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 1301, 425 + xy: 1380, 959 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 1165, 255 + xy: 1380, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 1233, 323 + xy: 1414, 985 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 1301, 391 + xy: 1448, 985 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 1165, 221 + xy: 1448, 951 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 1233, 289 + xy: 1448, 917 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 1301, 357 + xy: 1482, 917 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 1165, 187 + xy: 1448, 883 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 1233, 255 + xy: 1403, 849 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 1301, 323 + xy: 1437, 849 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 1165, 153 + xy: 1437, 815 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod rotate: false - xy: 1233, 221 + xy: 1437, 781 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 1301, 289 + xy: 1471, 781 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 1165, 119 + xy: 1516, 925 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 1233, 187 + xy: 1516, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 1301, 255 + xy: 1584, 959 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 1165, 85 + xy: 1584, 925 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 1335, 255 + xy: 1618, 891 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 1233, 119 + xy: 1686, 959 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 alpha-mech rotate: false - xy: 521, 1 + xy: 1398, 1447 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-mech-base rotate: false - xy: 1609, 1117 + xy: 1203, 18 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-mech-leg rotate: false - xy: 1659, 1117 + xy: 1253, 20 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-mech rotate: false - xy: 207, 33 + xy: 1791, 1331 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-mech-base rotate: false - xy: 257, 33 + xy: 1841, 1331 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-mech-leg rotate: false - xy: 307, 33 + xy: 1891, 1331 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 omega-mech rotate: false - xy: 956, 853 + xy: 157, 25 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 omega-mech-armor rotate: false - xy: 1333, 1299 + xy: 1011, 530 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 omega-mech-base rotate: false - xy: 1022, 977 + xy: 215, 25 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 omega-mech-leg rotate: false - xy: 1211, 1109 + xy: 273, 25 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 tau-mech rotate: false - xy: 1385, 1109 + xy: 979, 3 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 tau-mech-base rotate: false - xy: 1446, 959 + xy: 1186, 949 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau-mech-leg rotate: false - xy: 1164, 909 + xy: 1186, 899 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dart-ship rotate: false - xy: 157, 33 + xy: 1741, 1331 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5459,28 +5473,28 @@ glaive-ship index: -1 javelin-ship rotate: false - xy: 1196, 1009 + xy: 1625, 1231 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 javelin-ship-shield rotate: false - xy: 1246, 1059 + xy: 1675, 1231 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 trident-ship rotate: false - xy: 1443, 1109 + xy: 1037, 3 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 blank rotate: false - xy: 1, 1 + xy: 423, 730 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -5494,7 +5508,7 @@ circle index: -1 shape-3 rotate: false - xy: 1088, 1102 + xy: 1333, 1432 size: 63, 63 orig: 63, 63 offset: 0, 0 @@ -5522,49 +5536,49 @@ chaos-array-leg index: -1 crawler rotate: false - xy: 979, 303 + xy: 1441, 1331 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-base rotate: false - xy: 979, 253 + xy: 1491, 1331 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-leg rotate: false - xy: 979, 203 + xy: 1541, 1331 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger rotate: false - xy: 979, 153 + xy: 1591, 1331 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 979, 103 + xy: 1641, 1331 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 979, 53 + xy: 1691, 1331 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 draug rotate: false - xy: 357, 33 + xy: 1941, 1331 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5592,56 +5606,56 @@ eradicator-leg index: -1 eruptor rotate: false - xy: 913, 325 + xy: 1026, 1058 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 eruptor-base rotate: false - xy: 913, 259 + xy: 1026, 992 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 eruptor-leg rotate: false - xy: 913, 193 + xy: 988, 926 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress rotate: false - xy: 913, 127 + xy: 988, 860 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress-base rotate: false - xy: 913, 61 + xy: 1054, 926 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-base rotate: false - xy: 913, 61 + xy: 1054, 926 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress-leg rotate: false - xy: 871, 1315 + xy: 1054, 860 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 ghoul rotate: false - xy: 843, 1603 + xy: 549, 1653 size: 72, 72 orig: 72, 72 offset: 0, 0 @@ -5655,14 +5669,14 @@ lich index: -1 phantom rotate: false - xy: 1269, 1109 + xy: 331, 25 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 power-cell rotate: false - xy: 1327, 1109 + xy: 815, 7 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -5683,140 +5697,140 @@ revenant index: -1 spirit rotate: false - xy: 1346, 959 + xy: 1158, 1049 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titan rotate: false - xy: 1449, 1167 + xy: 1177, 134 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-leg rotate: false - xy: 1515, 1167 + xy: 1177, 68 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wraith rotate: false - xy: 1314, 909 + xy: 1208, 1049 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 artillery-equip rotate: false - xy: 1709, 1109 + xy: 1325, 1307 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 1759, 1117 + xy: 1398, 1397 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 bomber-equip rotate: false - xy: 979, 403 + xy: 1998, 1381 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles-equip rotate: false - xy: 979, 403 + xy: 1998, 1381 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 chain-blaster-equip rotate: false - xy: 979, 353 + xy: 1391, 1347 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 chaos-equip rotate: false - xy: 1088, 964 + xy: 1243, 128 size: 56, 136 orig: 56, 136 offset: 0, 0 index: -1 eradication-equip rotate: false - xy: 521, 51 + xy: 619, 438 size: 96, 192 orig: 96, 192 offset: 0, 0 index: -1 eruption-equip rotate: false - xy: 1977, 1175 + xy: 1375, 1289 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 flakgun-equip rotate: false - xy: 717, 15 + xy: 1425, 1281 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flamethrower-equip rotate: false - xy: 767, 7 + xy: 1475, 1273 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 heal-blaster-equip rotate: false - xy: 817, 15 + xy: 1525, 1281 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lich-missiles-equip rotate: false - xy: 1246, 1009 + xy: 1725, 1231 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 reaper-gun-equip rotate: false - xy: 1196, 959 + xy: 1169, 1199 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 revenant-missiles-equip rotate: false - xy: 1246, 959 + xy: 1158, 1149 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 1296, 959 + xy: 1158, 1099 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 swarmer-equip rotate: false - xy: 1396, 959 + xy: 1158, 999 size: 48, 48 orig: 48, 48 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 41e02f104a..1267024e62 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index fc713253ff..4dad59002c 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -48,7 +48,7 @@ public class Blocks implements ContentList{ melter, separator, sporePress, pulverizer, incinerator, coalCentrifuge, //sandbox - powerVoid, powerSource, itemSource, liquidSource, itemVoid, message, + powerVoid, powerSource, itemSource, liquidSource, itemVoid, message, light, //defense scrapWall, scrapWallLarge, scrapWallHuge, scrapWallGigantic, thruster, //ok, these names are getting ridiculous, but at least I don't have humongous walls yet @@ -736,6 +736,10 @@ public class Blocks implements ContentList{ message = new MessageBlock("message"){{ requirements(Category.effect, ItemStack.with(Items.graphite, 5)); }}; + light = new LightBlock("light"){{ + requirements(Category.effect, ItemStack.with(Items.graphite, 5)); + consumes.power(0.05f); + }}; //endregion //region defense diff --git a/core/src/io/anuke/mindustry/content/Fx.java b/core/src/io/anuke/mindustry/content/Fx.java index 397f15e67b..d7aeed4c65 100644 --- a/core/src/io/anuke/mindustry/content/Fx.java +++ b/core/src/io/anuke/mindustry/content/Fx.java @@ -13,7 +13,7 @@ import io.anuke.mindustry.graphics.*; import io.anuke.mindustry.type.*; import io.anuke.mindustry.ui.Cicon; -import static io.anuke.mindustry.Vars.tilesize; +import static io.anuke.mindustry.Vars.*; public class Fx implements ContentList{ public static Effect @@ -456,6 +456,8 @@ public class Fx implements ContentList{ }); Draw.color(); + + renderer.lights.add(e.x, e.y, 20f * e.fslope(), Pal.lightFlame, 0.5f); }); fireSmoke = new Effect(35f, e -> { diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index 891c451329..7843f86719 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -257,6 +257,7 @@ public class Renderer implements ApplicationListener{ drawFlyerShadows(); blocks.drawBlocks(Layer.power); + blocks.drawBlocks(Layer.lights); drawAllTeams(true); diff --git a/core/src/io/anuke/mindustry/entities/type/Player.java b/core/src/io/anuke/mindustry/entities/type/Player.java index d6612c2358..b9f9df688d 100644 --- a/core/src/io/anuke/mindustry/entities/type/Player.java +++ b/core/src/io/anuke/mindustry/entities/type/Player.java @@ -19,7 +19,6 @@ import io.anuke.mindustry.entities.*; import io.anuke.mindustry.entities.traits.*; import io.anuke.mindustry.game.*; import io.anuke.mindustry.gen.*; -import io.anuke.mindustry.graphics.*; import io.anuke.mindustry.input.*; import io.anuke.mindustry.io.*; import io.anuke.mindustry.net.Administration.*; @@ -343,8 +342,6 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{ } Draw.reset(); - - renderer.lights.add(x, y, 100f, Pal.powerLight, 0.6f); } @Override @@ -353,6 +350,7 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{ Draw.rect(getPowerCellRegion(), x + Angles.trnsx(rotation, mech.cellTrnsY, 0f), y + Angles.trnsy(rotation, mech.cellTrnsY, 0f), rotation - 90); Draw.reset(); drawBackItems(itemtime, isLocal); + drawLight(); } @Override diff --git a/core/src/io/anuke/mindustry/entities/type/Unit.java b/core/src/io/anuke/mindustry/entities/type/Unit.java index 8211476cef..a0c568f6e6 100644 --- a/core/src/io/anuke/mindustry/entities/type/Unit.java +++ b/core/src/io/anuke/mindustry/entities/type/Unit.java @@ -399,6 +399,12 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ Draw.color(); drawBackItems(item.amount > 0 ? 1f : 0f, false); + + drawLight(); + } + + public void drawLight(){ + renderer.lights.add(x, y, 50f, Pal.powerLight, 0.6f); } public void drawBackItems(float itemtime, boolean number){ diff --git a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java index 6d3a8a5281..9d75bbf47e 100644 --- a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java @@ -9,10 +9,9 @@ import io.anuke.arc.graphics.glutils.*; import io.anuke.arc.math.*; import io.anuke.arc.util.*; import io.anuke.mindustry.content.*; -import io.anuke.mindustry.game.*; import io.anuke.mindustry.game.EventType.*; import io.anuke.mindustry.game.Teams.*; -import io.anuke.mindustry.ui.Cicon; +import io.anuke.mindustry.ui.*; import io.anuke.mindustry.world.*; import static io.anuke.arc.Core.camera; @@ -219,6 +218,9 @@ public class BlockRenderer implements Disposable{ addRequest(tile, Layer.block); } + //TODO don't add at daytime / disabled lights + addRequest(tile, Layer.lights); + if(block.expanded || !expanded){ if(block.layer != null){ @@ -274,6 +276,9 @@ public class BlockRenderer implements Disposable{ if(block.synthetic() && request.tile.getTeam() != player.getTeam()){ block.drawTeam(request.tile); } + + }else if(request.layer == Layer.lights){ + block.drawLight(request.tile); }else if(request.layer == block.layer){ block.drawLayer(request.tile); }else if(request.layer == block.layer2){ @@ -282,39 +287,6 @@ public class BlockRenderer implements Disposable{ } } - public void drawTeamBlocks(Layer layer, Team team){ - int index = this.iterateidx; - - for(; index < requestidx; index++){ - - if(index < requests.size && requests.get(index).layer.ordinal() > layer.ordinal()){ - break; - } - - BlockRequest req = requests.get(index); - if(req.tile.getTeam() != team) continue; - - Block block = req.tile.block(); - - if(req.layer == Layer.block){ - block.draw(req.tile); - }else if(req.layer == block.layer){ - block.drawLayer(req.tile); - }else if(req.layer == block.layer2){ - block.drawLayer2(req.tile); - } - - } - } - - public void skipLayer(Layer stopAt){ - for(; iterateidx < requestidx; iterateidx++){ - if(iterateidx < requests.size && requests.get(iterateidx).layer.ordinal() > stopAt.ordinal()){ - break; - } - } - } - private void addRequest(Tile tile, Layer layer){ if(requestidx >= requests.size){ requests.add(new BlockRequest()); diff --git a/core/src/io/anuke/mindustry/graphics/Drawf.java b/core/src/io/anuke/mindustry/graphics/Drawf.java index ecbd7eec09..036db1eca0 100644 --- a/core/src/io/anuke/mindustry/graphics/Drawf.java +++ b/core/src/io/anuke/mindustry/graphics/Drawf.java @@ -6,6 +6,8 @@ import io.anuke.arc.graphics.g2d.*; import io.anuke.arc.math.*; import io.anuke.arc.util.*; +import static io.anuke.mindustry.Vars.renderer; + public class Drawf{ public static void dashCircle(float x, float y, float rad, Color color){ @@ -40,15 +42,6 @@ public class Drawf{ square(x, y, radius, Pal.accent); } - /* - public static void square(float x, float y, float radius){ - Lines.stroke(1f, Pal.gray); - Lines.square(x, y - 1f, radius + 1f, 45); - Lines.stroke(1f, Pal.accent); - Lines.square(x, y, radius + 1f, 45); - Draw.reset(); - }*/ - public static void arrow(float x, float y, float x2, float y2, float length, float radius){ float angle = Angles.angle(x, y, x2, y2); float space = 2f; @@ -81,6 +74,8 @@ public class Drawf{ Lines.line(line, x + Tmp.v1.x, y + Tmp.v1.y, x2 - Tmp.v1.x, y2 - Tmp.v1.y, CapStyle.none, 0f); Lines.precise(false); Lines.stroke(1f); + + renderer.lights.line(x, y, x2, y2); } public static void tri(float x, float y, float width, float length, float rotation){ diff --git a/core/src/io/anuke/mindustry/graphics/Layer.java b/core/src/io/anuke/mindustry/graphics/Layer.java index 206da3d6e0..1ba9c76ec6 100644 --- a/core/src/io/anuke/mindustry/graphics/Layer.java +++ b/core/src/io/anuke/mindustry/graphics/Layer.java @@ -10,5 +10,7 @@ public enum Layer{ /** "High" blocks, like turrets. */ turret, /** Power lasers. */ - power + power, + /** Extra layer that's always on top.*/ + lights } diff --git a/core/src/io/anuke/mindustry/graphics/LightRenderer.java b/core/src/io/anuke/mindustry/graphics/LightRenderer.java index bfd5a3c7c0..d49031f6da 100644 --- a/core/src/io/anuke/mindustry/graphics/LightRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/LightRenderer.java @@ -5,9 +5,13 @@ import io.anuke.arc.collection.*; import io.anuke.arc.graphics.*; import io.anuke.arc.graphics.g2d.*; import io.anuke.arc.graphics.glutils.*; +import io.anuke.arc.math.*; +import io.anuke.arc.math.geom.*; +import io.anuke.arc.util.*; public class LightRenderer{ private static final int scaling = 4; + private float[] vertices = new float[24]; private FrameBuffer buffer = new FrameBuffer(2, 2); private Array lights = new Array<>(); @@ -22,6 +26,134 @@ public class LightRenderer{ }); } + public void add(float x, float y, TextureRegion region, Color color, float opacity){ + add(() -> { + Draw.color(color, opacity); + Draw.rect(region, x, y); + }); + } + + public void line(float x, float y, float x2, float y2){ + add(() -> { + Draw.color(Color.orange, 0.5f); + + float stroke = 10f; + float rot = Mathf.angleExact(x2 - x, y2 - y); + TextureRegion ledge = Core.atlas.find("circle-end"), lmid = Core.atlas.find("circle-mid"); + + float color = Draw.getColor().toFloatBits(); + float u = lmid.getU(); + float v = lmid.getV2(); + float u2 = lmid.getU2(); + float v2 = lmid.getV(); + + + Vector2 v1 = Tmp.v1.trnsExact(rot + 90f, stroke); + float lx1 = x - v1.x, ly1 = y - v1.y, + lx2 = x + v1.x, ly2 = y + v1.y, + lx3 = x2 + v1.x, ly3 = y2 + v1.y, + lx4 = x2 - v1.x, ly4 = y2 - v1.y; + + vertices[0] = lx1; + vertices[1] = ly1; + vertices[2] = color; + vertices[3] = u; + vertices[4] = v; + vertices[5] = 0; + + vertices[6] = lx2; + vertices[7] = ly2; + vertices[8] = color; + vertices[9] = u; + vertices[10] = v2; + vertices[11] = 0; + + vertices[12] = lx3; + vertices[13] = ly3; + vertices[14] = color; + vertices[15] = u2; + vertices[16] = v2; + vertices[17] = 0; + + vertices[18] = lx4; + vertices[19] = ly4; + vertices[20] = color; + vertices[21] = u2; + vertices[22] = v; + vertices[23] = 0; + + Draw.vert(ledge.getTexture(), vertices, 0, vertices.length); + + + Vector2 v3 = Tmp.v2.trnsExact(rot, stroke); + + u = ledge.getU(); + v = ledge.getV2(); + u2 = ledge.getU2(); + v2 = ledge.getV(); + + vertices[0] = lx4; + vertices[1] = ly4; + vertices[2] = color; + vertices[3] = u; + vertices[4] = v; + vertices[5] = 0; + + vertices[6] = lx3; + vertices[7] = ly3; + vertices[8] = color; + vertices[9] = u; + vertices[10] = v2; + vertices[11] = 0; + + vertices[12] = lx3 + v3.x; + vertices[13] = ly3 + v3.y; + vertices[14] = color; + vertices[15] = u2; + vertices[16] = v2; + vertices[17] = 0; + + vertices[18] = lx4 + v3.x; + vertices[19] = ly4 + v3.y; + vertices[20] = color; + vertices[21] = u2; + vertices[22] = v; + vertices[23] = 0; + + Draw.vert(ledge.getTexture(), vertices, 0, vertices.length); + + vertices[0] = lx2; + vertices[1] = ly2; + vertices[2] = color; + vertices[3] = u; + vertices[4] = v; + vertices[5] = 0; + + vertices[6] = lx1; + vertices[7] = ly1; + vertices[8] = color; + vertices[9] = u; + vertices[10] = v2; + vertices[11] = 0; + + vertices[12] = lx1 - v3.x; + vertices[13] = ly1 - v3.y; + vertices[14] = color; + vertices[15] = u2; + vertices[16] = v2; + vertices[17] = 0; + + vertices[18] = lx2 - v3.x; + vertices[19] = ly2 - v3.y; + vertices[20] = color; + vertices[21] = u2; + vertices[22] = v; + vertices[23] = 0; + + Draw.vert(ledge.getTexture(), vertices, 0, vertices.length); + }); + } + public void draw(){ if(buffer.getWidth() != Core.graphics.getWidth()/scaling || buffer.getHeight() != Core.graphics.getHeight()/scaling){ buffer.resize(Core.graphics.getWidth()/scaling, Core.graphics.getHeight()/scaling); @@ -29,7 +161,7 @@ public class LightRenderer{ Draw.color(); buffer.beginDraw(Color.clear); - Draw.blend(Blending.additive); + Draw.blend(Blending.normal); for(Runnable run : lights){ run.run(); } diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java index 9eca2e4611..d64edbd706 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/core/src/io/anuke/mindustry/world/Block.java @@ -295,6 +295,10 @@ public class Block extends BlockStorage{ Draw.rect(region, tile.drawx(), tile.drawy(), rotate ? tile.rotation() * 90 : 0); } + public void drawLight(Tile tile){ + + } + public void drawTeam(Tile tile){ Draw.color(tile.getTeam().color); Draw.rect("block-border", tile.drawx() - size * tilesize / 2f + 4, tile.drawy() - size * tilesize / 2f + 4); diff --git a/core/src/io/anuke/mindustry/world/BlockStorage.java b/core/src/io/anuke/mindustry/world/BlockStorage.java index 477ca3504f..6b37683f99 100644 --- a/core/src/io/anuke/mindustry/world/BlockStorage.java +++ b/core/src/io/anuke/mindustry/world/BlockStorage.java @@ -117,7 +117,7 @@ public abstract class BlockStorage extends UnlockableContent{ other = other.block().getLiquidDestination(other, tile); - if(other.getTeam() == tile.getTeam() && other.block().hasLiquids && canDumpLiquid(tile, other, liquid) && other.entity.liquids != null){ + if(other != null && other.getTeam() == tile.getTeam() && other.block().hasLiquids && canDumpLiquid(tile, other, liquid) && other.entity.liquids != null){ float ofract = other.entity.liquids.get(liquid) / other.block().liquidCapacity; float fract = tile.entity.liquids.get(liquid) / liquidCapacity; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java index 30c261e0e1..57aa0944de 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java @@ -132,6 +132,11 @@ public class MendProjector extends Block{ Draw.reset(); } + @Override + public void drawLight(Tile tile){ + renderer.lights.add(tile.drawx(), tile.drawy(), 50f * tile.entity.power.satisfaction, color, 0.7f * tile.entity.power.satisfaction); + } + @Override public TileEntity newEntity(){ return new MendEntity(); diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java index a9177fa1c7..bcb2371b66 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java @@ -66,6 +66,11 @@ public class OverdriveProjector extends Block{ stats.add(BlockStat.boostEffect, (int)((speedBoost + speedBoostPhase) * 100f), StatUnit.percent); } + @Override + public void drawLight(Tile tile){ + renderer.lights.add(tile.drawx(), tile.drawy(), 50f * tile.entity.power.satisfaction, color, 0.7f * tile.entity.power.satisfaction); + } + @Override public void update(Tile tile){ OverdriveEntity entity = tile.entity(); diff --git a/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java index 88a0c28f3b..5f24af369a 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java @@ -172,6 +172,11 @@ public class ItemLiquidGenerator extends PowerGenerator{ Draw.rect(liquidRegion, tile.drawx(), tile.drawy()); Draw.color(); } + } + + @Override + public void drawLight(Tile tile){ + ItemLiquidGeneratorEntity entity = tile.entity(); renderer.lights.add(tile.drawx(), tile.drawy(), (60f + Mathf.absin(10f, 5f)) * entity.productionEfficiency * size, Color.orange, 0.5f); } diff --git a/core/src/io/anuke/mindustry/world/blocks/power/LightBlock.java b/core/src/io/anuke/mindustry/world/blocks/power/LightBlock.java new file mode 100644 index 0000000000..47639c3066 --- /dev/null +++ b/core/src/io/anuke/mindustry/world/blocks/power/LightBlock.java @@ -0,0 +1,22 @@ +package io.anuke.mindustry.world.blocks.power; + +import io.anuke.arc.graphics.*; +import io.anuke.mindustry.world.*; + +import static io.anuke.mindustry.Vars.renderer; + +public class LightBlock extends Block{ + protected Color color = Color.royal; + protected float radius = 200f; + + public LightBlock(String name){ + super(name); + hasPower = true; + update = true; + } + + @Override + public void drawLight(Tile tile){ + renderer.lights.add(tile.drawx(), tile.drawy(), radius, color, 0.5f * tile.entity.power.satisfaction); + } +} diff --git a/core/src/io/anuke/mindustry/world/blocks/production/GenericSmelter.java b/core/src/io/anuke/mindustry/world/blocks/production/GenericSmelter.java index 99eb3628bf..828decc1e0 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/GenericSmelter.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/GenericSmelter.java @@ -1,11 +1,11 @@ package io.anuke.mindustry.world.blocks.production; -import io.anuke.arc.Core; -import io.anuke.arc.graphics.Color; +import io.anuke.arc.*; +import io.anuke.arc.graphics.*; import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.math.Mathf; -import io.anuke.arc.util.Time; -import io.anuke.mindustry.world.Tile; +import io.anuke.arc.math.*; +import io.anuke.arc.util.*; +import io.anuke.mindustry.world.*; import static io.anuke.mindustry.Vars.renderer; @@ -45,8 +45,13 @@ public class GenericSmelter extends GenericCrafter{ Fill.circle(tile.drawx(), tile.drawy(), 1.9f + Mathf.absin(Time.time(), 5f, 1f) + cr); Draw.color(); - - renderer.lights.add(tile.drawx(), tile.drawy(), (60f + Mathf.absin(10f, 5f)) * entity.warmup * size, flameColor, 0.65f); } } + + @Override + public void drawLight(Tile tile){ + GenericCrafterEntity entity = tile.entity(); + + renderer.lights.add(tile.drawx(), tile.drawy(), (60f + Mathf.absin(10f, 5f)) * entity.warmup * size, flameColor, 0.65f); + } } diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java index 09552c2bef..24ce233ae5 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java @@ -63,6 +63,11 @@ public class CoreBlock extends StorageBlock{ )); } + @Override + public void drawLight(Tile tile){ + renderer.lights.add(tile.drawx(), tile.drawy(), 30f * size, Pal.accent, 0.5f + Mathf.absin(20f, 0.1f)); + } + @Override public boolean acceptItem(Item item, Tile tile, Tile source){ return tile.entity.items.get(item) < getMaximumAccepted(tile, item);