diff --git a/core/assets-raw/sprites/units/arkyid-old.png b/core/assets-raw/sprites/units/arkyid-old.png deleted file mode 100644 index 7996cd3aa4..0000000000 Binary files a/core/assets-raw/sprites/units/arkyid-old.png and /dev/null differ diff --git a/core/assets-raw/sprites/units/atrax-cell.png b/core/assets-raw/sprites/units/atrax-cell.png index f98bfd223b..9b8baf165d 100644 Binary files a/core/assets-raw/sprites/units/atrax-cell.png and b/core/assets-raw/sprites/units/atrax-cell.png differ diff --git a/core/assets/sprites/fallback/sprites.atlas b/core/assets/sprites/fallback/sprites.atlas index ab936c55ec..514a7620f1 100644 --- a/core/assets/sprites/fallback/sprites.atlas +++ b/core/assets/sprites/fallback/sprites.atlas @@ -453,7 +453,7 @@ data-processor index: -1 data-processor-2 rotate: false - xy: 749, 443 + xy: 831, 531 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -523,49 +523,49 @@ large-overdrive-projector-top index: -1 mend-projector rotate: false - xy: 1857, 1065 + xy: 903, 603 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mend-projector-top rotate: false - xy: 1923, 1065 + xy: 897, 537 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mender rotate: false - xy: 1101, 281 + xy: 1991, 725 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mender-top rotate: false - xy: 1135, 315 + xy: 1983, 691 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-projector rotate: false - xy: 637, 253 + xy: 983, 751 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overdrive-projector-top rotate: false - xy: 637, 187 + xy: 979, 685 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shock-mine rotate: false - xy: 1203, 259 + xy: 1939, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -586,518 +586,518 @@ block-unloader index: -1 bridge-arrow rotate: false - xy: 1033, 373 + xy: 1787, 733 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 1067, 305 + xy: 1813, 665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 1067, 271 + xy: 1805, 631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 1067, 237 + xy: 1805, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 center rotate: false - xy: 1067, 203 + xy: 1839, 631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-0 rotate: false - xy: 507, 1 + xy: 473, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-armored-conveyor-full rotate: false - xy: 507, 1 + xy: 473, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-1 rotate: false - xy: 1979, 1591 + xy: 507, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-2 rotate: false - xy: 931, 13 + xy: 1979, 1591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-3 rotate: false - xy: 965, 1 + xy: 1073, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-0 rotate: false - xy: 999, 1 + xy: 1667, 913 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-1 rotate: false - xy: 1033, 1 + xy: 1583, 787 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-2 rotate: false - xy: 1225, 633 + xy: 1625, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-3 rotate: false - xy: 1, 3 + xy: 1499, 661 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-0 rotate: false - xy: 1259, 633 + xy: 1541, 703 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-1 rotate: false - xy: 35, 3 + xy: 1667, 879 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-2 rotate: false - xy: 1293, 633 + xy: 1583, 753 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-3 rotate: false - xy: 69, 3 + xy: 2013, 1591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-0 rotate: false - xy: 1327, 633 + xy: 2005, 1557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-1 rotate: false - xy: 1361, 633 + xy: 2005, 1523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-2 rotate: false - xy: 1395, 633 + xy: 2005, 1489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-3 rotate: false - xy: 1429, 633 + xy: 2005, 1455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-0 rotate: false - xy: 1463, 633 + xy: 2005, 1421 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-1 rotate: false - xy: 1497, 633 + xy: 207, 5 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-2 rotate: false - xy: 1531, 633 + xy: 1107, 6 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-3 rotate: false - xy: 1565, 633 + xy: 1141, 6 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 1917, 765 + xy: 1299, 623 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 1867, 731 + xy: 1297, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 1867, 697 + xy: 1293, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 1901, 731 + xy: 1293, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 1901, 697 + xy: 1327, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 1867, 663 + xy: 1327, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 1901, 663 + xy: 1331, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 1833, 647 + xy: 1365, 593 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 1935, 731 + xy: 1399, 593 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 1935, 697 + xy: 1311, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 1935, 663 + xy: 1311, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 1867, 629 + xy: 1345, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 1901, 629 + xy: 1345, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 1935, 629 + xy: 1321, 419 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 1243, 531 + xy: 1321, 385 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 1277, 531 + xy: 1355, 419 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 1311, 531 + xy: 1355, 385 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 1345, 531 + xy: 1346, 351 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 1379, 531 + xy: 1346, 317 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor rotate: false - xy: 1135, 111 + xy: 2009, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-0 rotate: false - xy: 1101, 43 + xy: 1973, 895 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-1 rotate: false - xy: 1135, 77 + xy: 1973, 861 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-2 rotate: false - xy: 1135, 43 + xy: 1999, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-edge rotate: false - xy: 1101, 9 + xy: 1463, 585 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-stack rotate: false - xy: 1135, 9 + xy: 1463, 551 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 1339, 327 + xy: 2007, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 1373, 361 + xy: 1481, 491 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 1407, 395 + xy: 1481, 457 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 1441, 429 + xy: 1515, 491 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 1203, 157 + xy: 1515, 457 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 1237, 191 + xy: 1491, 423 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 1271, 225 + xy: 1491, 389 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 1305, 259 + xy: 1525, 423 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 1339, 293 + xy: 1525, 389 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 1373, 327 + xy: 1516, 355 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 1407, 361 + xy: 1516, 321 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 1441, 395 + xy: 1516, 287 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 1475, 429 + xy: 1549, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 1203, 123 + xy: 1583, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 1237, 157 + xy: 1559, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 1271, 191 + xy: 1559, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 1305, 225 + xy: 1593, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 1339, 259 + xy: 1593, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1373, 293 + xy: 1559, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cross rotate: false - xy: 1707, 641 + xy: 1389, 385 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 distributor rotate: false - xy: 815, 443 + xy: 851, 267 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 inverted-sorter rotate: false - xy: 1719, 471 + xy: 1429, 525 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction rotate: false - xy: 1969, 711 + xy: 1897, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1139,7 +1139,7 @@ mass-driver-base index: -1 overflow-gate rotate: false - xy: 1135, 281 + xy: 1907, 623 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1167,49 +1167,49 @@ payload-router-over index: -1 phase-conveyor rotate: false - xy: 1101, 145 + xy: 1907, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 1135, 179 + xy: 1941, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 1101, 111 + xy: 1975, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 1135, 145 + xy: 2009, 657 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 1237, 395 + xy: 1701, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 1271, 327 + xy: 2007, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 underflow-gate rotate: false - xy: 1475, 395 + xy: 1550, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1244,14 +1244,14 @@ blast-drill-top index: -1 drill-top rotate: false - xy: 969, 933 + xy: 851, 69 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-liquid rotate: false - xy: 969, 933 + xy: 851, 69 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1286,21 +1286,21 @@ laser-drill-top index: -1 mechanical-drill rotate: false - xy: 1659, 1065 + xy: 917, 801 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-rotator rotate: false - xy: 1725, 1065 + xy: 913, 735 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-top rotate: false - xy: 1791, 1065 + xy: 913, 669 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1335,84 +1335,84 @@ oil-extractor-top index: -1 pneumatic-drill rotate: false - xy: 703, 47 + xy: 1051, 1031 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-rotator rotate: false - xy: 769, 47 + xy: 1051, 965 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-top rotate: false - xy: 835, 245 + xy: 1051, 899 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 1233, 867 + xy: 1079, 445 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 1299, 867 + xy: 1073, 379 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 1365, 867 + xy: 1145, 425 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 1431, 867 + xy: 1139, 359 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-border rotate: false - xy: 2005, 1489 + xy: 1277, 461 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-middle rotate: false - xy: 1395, 599 + xy: 1735, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-select rotate: false - xy: 1583, 565 + xy: 1669, 631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 1201, 523 + xy: 1821, 733 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 message rotate: false - xy: 1101, 247 + xy: 1907, 657 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1426,161 +1426,161 @@ place-arrow index: -1 bridge-conduit rotate: false - xy: 1067, 373 + xy: 1787, 699 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 1033, 339 + xy: 1779, 665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 1033, 339 + xy: 1779, 665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 1067, 339 + xy: 1771, 631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 1033, 305 + xy: 1771, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 1067, 101 + xy: 1769, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 1067, 67 + xy: 1769, 835 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 1067, 33 + xy: 1795, 801 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 1167, 519 + xy: 1821, 767 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 1167, 519 + xy: 1821, 767 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 1167, 519 + xy: 1821, 767 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 1833, 749 + xy: 1821, 699 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 1833, 715 + xy: 1847, 665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 1833, 681 + xy: 1873, 631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 1791, 639 + xy: 1873, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 1791, 639 + xy: 1873, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 1883, 765 + xy: 1419, 1047 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 2003, 745 + xy: 1855, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate rotate: false - xy: 2003, 643 + xy: 1923, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate-top rotate: false - xy: 1969, 609 + xy: 1889, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 2003, 609 + xy: 1923, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 1101, 485 + xy: 1889, 725 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 1135, 485 + xy: 1923, 725 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1608,133 +1608,133 @@ liquid-tank-top index: -1 mechanical-pump rotate: false - xy: 1135, 383 + xy: 1949, 691 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-pump-liquid rotate: false - xy: 1101, 315 + xy: 1991, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-liquid rotate: false - xy: 1101, 315 + xy: 1991, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-liquid rotate: false - xy: 1101, 315 + xy: 1991, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 1101, 213 + xy: 1941, 657 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 1135, 247 + xy: 1941, 623 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 1101, 179 + xy: 1975, 657 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 1135, 213 + xy: 1975, 623 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-cap rotate: false - xy: 1169, 421 + xy: 1531, 593 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-0 rotate: false - xy: 1169, 387 + xy: 1497, 559 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-1 rotate: false - xy: 1169, 353 + xy: 1531, 559 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-2 rotate: false - xy: 1169, 319 + xy: 1565, 583 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-3 rotate: false - xy: 1169, 285 + xy: 1599, 583 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-4 rotate: false - xy: 1169, 251 + xy: 1565, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 1169, 115 + xy: 1667, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1169, 81 + xy: 1701, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1169, 47 + xy: 1735, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 1169, 13 + xy: 1769, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 1255, 999 + xy: 1173, 1151 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1748,7 +1748,7 @@ thermal-pump index: -1 battery rotate: false - xy: 1599, 633 + xy: 1175, 10 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1769,21 +1769,21 @@ battery-large-top index: -1 battery-top rotate: false - xy: 2013, 1591 + xy: 1457, 619 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 1067, 169 + xy: 1839, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 1067, 135 + xy: 1769, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1811,28 +1811,28 @@ differential-generator-top index: -1 diode rotate: false - xy: 1701, 607 + xy: 1413, 491 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 diode-arrow rotate: false - xy: 1719, 573 + xy: 1413, 457 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator rotate: false - xy: 1719, 505 + xy: 1448, 355 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator-top rotate: false - xy: 1753, 505 + xy: 1448, 321 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1888,49 +1888,49 @@ impact-reactor-plasma-3 index: -1 power-node rotate: false - xy: 1169, 217 + xy: 1599, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 835, 179 + xy: 1051, 833 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 power-source rotate: false - xy: 1169, 183 + xy: 1633, 573 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 1169, 149 + xy: 1633, 539 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 1321, 999 + xy: 1051, 767 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 1271, 429 + xy: 1735, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 1237, 293 + xy: 1973, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1944,14 +1944,14 @@ solar-panel-large index: -1 surge-tower rotate: false - xy: 1167, 879 + xy: 983, 69 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 1365, 933 + xy: 1049, 141 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1979,35 +1979,35 @@ thorium-reactor-top index: -1 turbine-generator rotate: false - xy: 1563, 933 + xy: 1115, 643 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-cap rotate: false - xy: 1629, 933 + xy: 1111, 577 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-top rotate: false - xy: 1695, 933 + xy: 1181, 623 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-turbine0 rotate: false - xy: 1761, 933 + xy: 1177, 557 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-turbine1 rotate: false - xy: 1827, 933 + xy: 1111, 511 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2028,7 +2028,7 @@ alloy-smelter-top index: -1 blast-mixer rotate: false - xy: 1981, 1917 + xy: 1981, 1851 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2042,49 +2042,49 @@ block-forge index: -1 coal-centrifuge rotate: false - xy: 817, 641 + xy: 677, 355 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 1873, 1131 + xy: 785, 69 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 1939, 1131 + xy: 777, 3 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 751, 575 + xy: 985, 817 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator rotate: false - xy: 817, 575 + xy: 815, 465 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 749, 509 + xy: 809, 399 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 815, 509 + xy: 809, 333 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2112,70 +2112,70 @@ disassembler-spinner index: -1 graphite-press rotate: false - xy: 801, 377 + xy: 881, 465 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 incinerator rotate: false - xy: 1685, 498 + xy: 1429, 559 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 1541, 463 + xy: 1871, 895 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 1969, 745 + xy: 1863, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 kiln rotate: false - xy: 669, 335 + xy: 875, 399 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 kiln-top rotate: false - xy: 735, 311 + xy: 875, 333 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 735, 311 + xy: 875, 333 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 liquid-source rotate: false - xy: 1135, 451 + xy: 1957, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-void rotate: false - xy: 1101, 383 + xy: 1957, 725 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 1135, 349 + xy: 1991, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2189,77 +2189,77 @@ multi-press index: -1 phase-weaver rotate: false - xy: 703, 245 + xy: 963, 537 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 703, 179 + xy: 1013, 471 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 769, 245 + xy: 1041, 1163 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 703, 113 + xy: 1041, 1097 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 769, 179 + xy: 1107, 1171 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 1203, 429 + xy: 1803, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 1203, 395 + xy: 1837, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 835, 47 + xy: 1117, 973 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator rotate: false - xy: 867, 311 + xy: 1117, 709 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 901, 245 + xy: 1183, 689 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-spinner rotate: false - xy: 901, 179 + xy: 975, 3 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2280,133 +2280,133 @@ silicon-crucible-top index: -1 silicon-smelter rotate: false - xy: 901, 113 + xy: 941, 399 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press rotate: false - xy: 901, 47 + xy: 941, 333 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame0 rotate: false - xy: 1035, 999 + xy: 1007, 405 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame1 rotate: false - xy: 1035, 933 + xy: 1007, 339 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame2 rotate: false - xy: 1101, 965 + xy: 983, 267 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-liquid rotate: false - xy: 1101, 899 + xy: 983, 201 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-top rotate: false - xy: 1167, 945 + xy: 983, 135 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rock1 rotate: false - xy: 1507, 667 + xy: 1273, 51 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rock2 rotate: false - xy: 1557, 667 + xy: 1273, 1 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-boulder1 rotate: false - xy: 1203, 327 + xy: 1769, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-boulder2 rotate: false - xy: 1237, 361 + xy: 1803, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder1 rotate: false - xy: 1305, 395 + xy: 2007, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder2 rotate: false - xy: 1339, 429 + xy: 1905, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrock1 rotate: false - xy: 1607, 667 + xy: 1247, 595 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snowrock2 rotate: false - xy: 1657, 818 + xy: 1243, 545 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-cluster1 rotate: false - xy: 847, 5 + xy: 1457, 653 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster2 rotate: false - xy: 889, 5 + xy: 1499, 695 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster3 rotate: false - xy: 1183, 625 + xy: 1541, 737 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 container rotate: false - xy: 969, 999 + xy: 743, 399 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2448,14 +2448,14 @@ core-shard-team index: -1 unloader rotate: false - xy: 1509, 429 + xy: 1584, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader-center rotate: false - xy: 1203, 89 + xy: 1584, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2469,21 +2469,21 @@ vault index: -1 arc-heat rotate: false - xy: 473, 1 + xy: 569, 1387 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-1 rotate: false - xy: 2005, 1557 + xy: 1667, 845 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-2 rotate: false - xy: 1981, 1851 + xy: 765, 531 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2504,14 +2504,14 @@ block-4 index: -1 hail-heat rotate: false - xy: 1057, 649 + xy: 837, 599 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 1131, 1097 + xy: 917, 201 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2532,35 +2532,35 @@ ripple-heat index: -1 salvo-heat rotate: false - xy: 1453, 999 + xy: 1049, 701 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 1519, 999 + xy: 1045, 635 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 1585, 999 + xy: 1045, 569 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch-heat rotate: false - xy: 1305, 429 + xy: 1871, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 1563, 867 + xy: 1205, 359 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2588,7 +2588,7 @@ air-factory index: -1 command-center rotate: false - xy: 903, 999 + xy: 749, 465 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2658,91 +2658,91 @@ naval-factory index: -1 rally-point rotate: false - xy: 1123, 1031 + xy: 1117, 907 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 repair-point-base rotate: false - xy: 1203, 361 + xy: 1667, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 resupply-point rotate: false - xy: 1189, 1011 + xy: 1117, 841 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 copper-wall rotate: false - xy: 1413, 531 + xy: 1380, 351 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-large rotate: false - xy: 1279, 1131 + xy: 743, 333 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door rotate: false - xy: 1719, 539 + xy: 1423, 423 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large rotate: false - xy: 1979, 1625 + xy: 851, 201 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 903, 933 + xy: 851, 135 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-open rotate: false - xy: 1735, 607 + xy: 1423, 389 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 1101, 77 + xy: 2009, 623 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large rotate: false - xy: 637, 55 + xy: 947, 471 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-wall rotate: false - xy: 1169, 455 + xy: 1497, 593 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-wall-large rotate: false - xy: 769, 113 + xy: 1107, 1105 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2770,84 +2770,84 @@ scrap-wall-huge3 index: -1 scrap-wall-large1 rotate: false - xy: 1717, 999 + xy: 1183, 1019 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large2 rotate: false - xy: 1783, 999 + xy: 1183, 953 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large3 rotate: false - xy: 1849, 999 + xy: 1183, 887 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large4 rotate: false - xy: 1915, 999 + xy: 1183, 821 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall2 rotate: false - xy: 1203, 293 + xy: 1905, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 1237, 327 + xy: 1939, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 1271, 361 + xy: 1973, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 1271, 361 + xy: 1973, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 1271, 259 + xy: 1939, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large rotate: false - xy: 1233, 933 + xy: 1049, 273 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 1305, 293 + xy: 1973, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 1431, 933 + xy: 1049, 75 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2861,35 +2861,35 @@ thruster index: -1 titanium-wall rotate: false - xy: 1407, 327 + xy: 1593, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large rotate: false - xy: 1497, 933 + xy: 1041, 3 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 bullet rotate: false - xy: 571, 1 + xy: 1365, 1027 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 bullet-back rotate: false - xy: 625, 1 + xy: 1423, 1085 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 casing rotate: false - xy: 1157, 881 + xy: 837, 723 size: 8, 16 orig: 8, 16 offset: 0, 0 @@ -2903,77 +2903,77 @@ circle-end index: -1 circle-mid rotate: false - xy: 1787, 456 + xy: 1323, 84 size: 1, 199 orig: 1, 199 offset: 0, 0 index: -1 error rotate: false - xy: 1017, 35 + xy: 1631, 1097 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 laser rotate: false - xy: 2043, 945 + xy: 157, 1027 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 laser-end rotate: false - xy: 677, 833 + xy: 779, 963 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 minelaser rotate: false - xy: 157, 1027 + xy: 1297, 1167 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 minelaser-end rotate: false - xy: 677, 759 + xy: 777, 889 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 missile rotate: false - xy: 2011, 1755 + xy: 2011, 1763 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 missile-back rotate: false - xy: 2011, 1717 + xy: 2011, 1725 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 parallax-laser rotate: false - xy: 255, 55 + xy: 715, 1435 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 parallax-laser-end rotate: false - xy: 677, 685 + xy: 773, 815 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 particle rotate: false - xy: 805, 5 + xy: 1625, 863 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -3001,49 +3001,49 @@ shell-back index: -1 transfer rotate: false - xy: 715, 1435 + xy: 2041, 1801 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 1441, 361 + xy: 1550, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white rotate: false - xy: 479, 1558 + xy: 1107, 1 size: 3, 3 orig: 3, 3 offset: 0, 0 index: -1 alpha-wreck0 rotate: false - xy: 883, 543 + xy: 1365, 977 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-wreck1 rotate: false - xy: 881, 493 + xy: 1531, 1147 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-wreck2 rotate: false - xy: 881, 443 + xy: 1307, 865 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 arc rotate: false - xy: 1057, 899 + xy: 2011, 1691 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3071,42 +3071,42 @@ arkyid-wreck2 index: -1 atrax-wreck0 rotate: false - xy: 587, 665 + xy: 689, 977 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 atrax-wreck1 rotate: false - xy: 587, 599 + xy: 687, 911 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 atrax-wreck2 rotate: false - xy: 587, 533 + xy: 683, 845 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 beta-wreck0 rotate: false - xy: 933, 427 + xy: 1681, 1147 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 beta-wreck1 rotate: false - xy: 933, 377 + xy: 1307, 707 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 beta-wreck2 rotate: false - xy: 933, 327 + xy: 1731, 1147 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -3127,7 +3127,7 @@ block-air-factory-full index: -1 block-arc-full rotate: false - xy: 2005, 1523 + xy: 1583, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3141,35 +3141,35 @@ block-blast-drill-full index: -1 block-char-full rotate: false - xy: 2005, 1455 + xy: 1277, 427 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cliffs-full rotate: false - xy: 2005, 1421 + xy: 1715, 1005 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conduit-full rotate: false - xy: 1183, 591 + xy: 1715, 971 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conveyor-full rotate: false - xy: 207, 5 + xy: 1707, 937 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 207, 5 + xy: 1707, 937 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3190,21 +3190,21 @@ block-core-shard-full index: -1 block-craters-full rotate: false - xy: 1175, 557 + xy: 1701, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cryofluidmixer-full rotate: false - xy: 587, 319 + xy: 853, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-cultivator-full rotate: false - xy: 571, 253 + xy: 1979, 1625 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3218,28 +3218,28 @@ block-cyclone-full index: -1 block-dark-metal-full rotate: false - xy: 1633, 633 + xy: 1701, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-full rotate: false - xy: 1667, 634 + xy: 1701, 835 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dunerocks-full rotate: false - xy: 1757, 657 + xy: 1617, 787 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-duo-full rotate: false - xy: 1133, 519 + xy: 1617, 753 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3253,7 +3253,7 @@ block-fuse-full index: -1 block-grass-full rotate: false - xy: 1799, 741 + xy: 1617, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3267,49 +3267,49 @@ block-ground-factory-full index: -1 block-hail-full rotate: false - xy: 1799, 707 + xy: 1499, 627 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-holostone-full rotate: false - xy: 1799, 673 + xy: 1533, 661 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hotrock-full rotate: false - xy: 1849, 791 + xy: 1533, 627 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-full rotate: false - xy: 1883, 799 + xy: 1575, 685 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-snow-full rotate: false - xy: 1917, 799 + xy: 1609, 685 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icerocks-full rotate: false - xy: 1225, 599 + xy: 1567, 651 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ignarock-full rotate: false - xy: 1259, 599 + xy: 1601, 651 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3323,7 +3323,7 @@ block-impact-reactor-full index: -1 block-lancer-full rotate: false - xy: 571, 187 + xy: 653, 269 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3337,7 +3337,7 @@ block-laser-drill-full index: -1 block-liquid-router-full rotate: false - xy: 1293, 599 + xy: 1567, 617 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3351,7 +3351,7 @@ block-liquid-tank-full index: -1 block-magmarock-full rotate: false - xy: 1327, 599 + xy: 1601, 617 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3379,7 +3379,7 @@ block-mass-driver-full index: -1 block-mechanical-drill-full rotate: false - xy: 571, 121 + xy: 653, 203 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3393,14 +3393,14 @@ block-meltdown-full index: -1 block-metal-floor-damaged-full rotate: false - xy: 1361, 599 + xy: 1741, 937 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-moss-full rotate: false - xy: 1429, 599 + xy: 1735, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3421,49 +3421,49 @@ block-oil-extractor-full index: -1 block-ore-coal-full rotate: false - xy: 1463, 599 + xy: 1735, 835 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-copper-full rotate: false - xy: 1497, 599 + xy: 1659, 811 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-lead-full rotate: false - xy: 1531, 599 + xy: 1651, 777 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-scrap-full rotate: false - xy: 1565, 599 + xy: 1651, 743 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-thorium-full rotate: false - xy: 1599, 599 + xy: 1651, 709 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-titanium-full rotate: false - xy: 1633, 599 + xy: 1693, 801 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-parallax-full rotate: false - xy: 571, 55 + xy: 653, 137 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3484,49 +3484,49 @@ payload-router-icon index: -1 block-pebbles-full rotate: false - xy: 1667, 600 + xy: 1727, 801 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-phase-weaver-full rotate: false - xy: 771, 971 + xy: 653, 71 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-plated-conduit-full rotate: false - xy: 1209, 557 + xy: 1685, 767 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pneumatic-drill-full rotate: false - xy: 837, 971 + xy: 645, 5 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-pulse-conduit-full rotate: false - xy: 1243, 565 + xy: 1685, 733 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pulverizer-full rotate: false - xy: 1277, 565 + xy: 1719, 767 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-repair-point-full rotate: false - xy: 1311, 565 + xy: 1719, 733 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3540,77 +3540,77 @@ block-ripple-full index: -1 block-rock-full rotate: false - xy: 983, 435 + xy: 1781, 1147 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-rocks-full rotate: false - xy: 1345, 565 + xy: 1685, 699 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-saltrocks-full rotate: false - xy: 1379, 565 + xy: 1719, 699 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-salvo-full rotate: false - xy: 755, 905 + xy: 919, 999 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-sand-boulder-full rotate: false - xy: 1413, 565 + xy: 1643, 675 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-full rotate: false - xy: 1447, 565 + xy: 1635, 641 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sandrocks-full rotate: false - xy: 1481, 565 + xy: 1635, 607 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scatter-full rotate: false - xy: 821, 905 + xy: 985, 1015 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-scorch-full rotate: false - xy: 1515, 565 + xy: 1677, 665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-full rotate: false - xy: 1549, 565 + xy: 1711, 665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall1 rotate: false - xy: 1549, 565 + xy: 1711, 665 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3631,63 +3631,63 @@ scrap-wall-huge1 index: -1 block-scrap-wall-large-full rotate: false - xy: 751, 839 + xy: 919, 933 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-segment-full rotate: false - xy: 751, 773 + xy: 985, 949 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-shale-boulder-full rotate: false - xy: 1617, 565 + xy: 1703, 631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-full rotate: false - xy: 1651, 565 + xy: 1669, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shalerocks-full rotate: false - xy: 1685, 566 + xy: 1703, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shrubs-full rotate: false - xy: 1033, 509 + xy: 1761, 801 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-full rotate: false - xy: 1067, 509 + xy: 1753, 767 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snowrock-full rotate: false - xy: 983, 385 + xy: 1831, 1147 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-snowrocks-full rotate: false - xy: 1033, 475 + xy: 1753, 733 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3701,84 +3701,84 @@ block-spectre-full index: -1 block-spore-cluster-full rotate: false - xy: 1989, 1201 + xy: 1415, 927 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-spore-moss-full rotate: false - xy: 1067, 475 + xy: 1753, 699 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-spore-press-full rotate: false - xy: 817, 839 + xy: 853, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-sporerocks-full rotate: false - xy: 1033, 441 + xy: 1745, 665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-stone-full rotate: false - xy: 1067, 441 + xy: 1737, 631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-swarmer-full rotate: false - xy: 751, 707 + xy: 919, 867 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-tendrils-full rotate: false - xy: 1033, 407 + xy: 1737, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-titanium-conveyor-full rotate: false - xy: 1067, 407 + xy: 1787, 767 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 1067, 407 + xy: 1787, 767 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-turbine-generator-full rotate: false - xy: 817, 773 + xy: 985, 883 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-water-extractor-full rotate: false - xy: 751, 641 + xy: 683, 487 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-wave-full rotate: false - xy: 817, 707 + xy: 677, 421 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3827,112 +3827,112 @@ core-shard-team-sharded index: -1 cracks-1-0 rotate: false - xy: 1447, 531 + xy: 1380, 317 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-1 rotate: false - xy: 1481, 531 + xy: 1361, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-2 rotate: false - xy: 1515, 531 + xy: 1361, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-3 rotate: false - xy: 1549, 531 + xy: 1395, 559 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-4 rotate: false - xy: 1583, 531 + xy: 1395, 525 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-5 rotate: false - xy: 1617, 531 + xy: 1379, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-6 rotate: false - xy: 1651, 531 + xy: 1379, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-7 rotate: false - xy: 1685, 532 + xy: 1389, 419 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-2-0 rotate: false - xy: 1345, 1131 + xy: 719, 267 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-1 rotate: false - xy: 1411, 1131 + xy: 719, 201 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-2 rotate: false - xy: 1477, 1131 + xy: 719, 135 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-3 rotate: false - xy: 1543, 1131 + xy: 719, 69 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-4 rotate: false - xy: 1609, 1131 + xy: 711, 3 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-5 rotate: false - xy: 1675, 1131 + xy: 785, 267 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-6 rotate: false - xy: 1741, 1131 + xy: 785, 201 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-7 rotate: false - xy: 1807, 1131 + xy: 785, 135 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4107,21 +4107,21 @@ cracks-5-7 index: -1 crawler-wreck0 rotate: false - xy: 983, 285 + xy: 1357, 877 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-wreck1 rotate: false - xy: 967, 235 + xy: 1357, 827 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-wreck2 rotate: false - xy: 967, 185 + xy: 1357, 777 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4135,49 +4135,49 @@ cyclone index: -1 dagger-wreck0 rotate: false - xy: 1017, 235 + xy: 1357, 627 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-wreck1 rotate: false - xy: 1017, 185 + xy: 1481, 1097 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-wreck2 rotate: false - xy: 1017, 135 + xy: 1531, 1097 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 duo rotate: false - xy: 1753, 573 + xy: 1414, 351 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 flare-wreck0 rotate: false - xy: 1107, 791 + xy: 1881, 1097 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flare-wreck1 rotate: false - xy: 1057, 691 + xy: 1931, 1097 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flare-wreck2 rotate: false - xy: 1107, 741 + xy: 1981, 1093 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4212,777 +4212,777 @@ fuse index: -1 gamma-wreck0 rotate: false - xy: 1752, 875 + xy: 1249, 1101 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 gamma-wreck1 rotate: false - xy: 883, 651 + xy: 1249, 1043 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 gamma-wreck2 rotate: false - xy: 1810, 875 + xy: 1249, 985 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 hail rotate: false - xy: 1753, 539 + xy: 1414, 317 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 horizon-wreck0 rotate: false - xy: 1049, 1073 + xy: 967, 1081 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 horizon-wreck1 rotate: false - xy: 1205, 1143 + xy: 1123, 1237 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 horizon-wreck2 rotate: false - xy: 681, 907 + xy: 571, 15 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 item-blast-compound-large rotate: false - xy: 1099, 649 + xy: 1665, 947 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-blast-compound-medium rotate: false - xy: 1201, 489 + xy: 1447, 457 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-blast-compound-small rotate: false - xy: 689, 1361 + xy: 1803, 835 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-blast-compound-tiny rotate: false - xy: 885, 1047 + xy: 1293, 503 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-blast-compound-xlarge rotate: false - xy: 1157, 729 + xy: 1881, 1047 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-coal-large rotate: false - xy: 1757, 733 + xy: 1457, 905 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-coal-medium rotate: false - xy: 1269, 497 + xy: 1457, 389 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal-small rotate: false - xy: 2011, 1691 + xy: 1829, 801 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-coal-tiny rotate: false - xy: 2031, 1225 + xy: 2031, 1175 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-coal-xlarge rotate: false - xy: 1157, 679 + xy: 1931, 1047 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-copper-large rotate: false - xy: 1807, 783 + xy: 1457, 863 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-copper-medium rotate: false - xy: 1337, 497 + xy: 1482, 321 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper-small rotate: false - xy: 1203, 463 + xy: 1855, 699 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-copper-tiny rotate: false - xy: 1959, 981 + xy: 2031, 1157 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-copper-xlarge rotate: false - xy: 1207, 817 + xy: 1981, 1043 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-graphite-large rotate: false - xy: 1857, 833 + xy: 1499, 905 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-graphite-medium rotate: false - xy: 1405, 497 + xy: 1482, 287 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite-small rotate: false - xy: 131, 1051 + xy: 1881, 665 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-graphite-tiny rotate: false - xy: 2031, 1013 + xy: 2031, 1139 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-graphite-xlarge rotate: false - xy: 1207, 767 + xy: 1407, 877 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-lead-large rotate: false - xy: 1757, 691 + xy: 1457, 821 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-lead-medium rotate: false - xy: 1473, 497 + xy: 1749, 971 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead-small rotate: false - xy: 541, 9 + xy: 689, 1361 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-lead-tiny rotate: false - xy: 2031, 1207 + xy: 2031, 1121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-lead-xlarge rotate: false - xy: 1257, 817 + xy: 1407, 827 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-metaglass-large rotate: false - xy: 1899, 833 + xy: 1499, 863 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-metaglass-medium rotate: false - xy: 1541, 497 + xy: 1783, 1005 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass-small rotate: false - xy: 103, 11 + xy: 1463, 525 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-metaglass-tiny rotate: false - xy: 2031, 995 + xy: 2031, 1103 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-metaglass-xlarge rotate: false - xy: 1207, 717 + xy: 1407, 777 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-phase-fabric-large rotate: false - xy: 1941, 833 + xy: 1541, 905 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-phase-fabric-medium rotate: false - xy: 1609, 497 + xy: 1817, 963 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric-small rotate: false - xy: 2005, 1395 + xy: 1433, 593 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-phase-fabric-tiny rotate: false - xy: 2031, 1403 + xy: 2031, 1085 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-phase-fabric-xlarge rotate: false - xy: 1257, 767 + xy: 1407, 727 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-plastanium-large rotate: false - xy: 1099, 607 + xy: 1457, 779 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-plastanium-medium rotate: false - xy: 1235, 463 + xy: 1885, 963 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium-small rotate: false - xy: 1067, 7 + xy: 131, 1051 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-plastanium-tiny rotate: false - xy: 927, 1607 + xy: 2031, 1067 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-plastanium-xlarge rotate: false - xy: 1307, 817 + xy: 1407, 677 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-pyratite-large rotate: false - xy: 1141, 637 + xy: 1499, 821 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-pyratite-medium rotate: false - xy: 1303, 463 + xy: 1809, 929 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite-small rotate: false - xy: 1169, 493 + xy: 101, 11 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-pyratite-tiny rotate: false - xy: 1319, 1591 + xy: 2031, 1049 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-pyratite-xlarge rotate: false - xy: 1257, 717 + xy: 1407, 627 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-sand-large rotate: false - xy: 1141, 595 + xy: 1541, 863 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-sand-medium rotate: false - xy: 1371, 463 + xy: 1877, 929 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand-small rotate: false - xy: 1237, 131 + xy: 541, 9 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-sand-tiny rotate: false - xy: 885, 1313 + xy: 2031, 1031 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-sand-xlarge rotate: false - xy: 1307, 767 + xy: 1477, 1047 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-scrap-large rotate: false - xy: 1133, 553 + xy: 1583, 905 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-scrap-medium rotate: false - xy: 1439, 463 + xy: 1803, 895 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap-small rotate: false - xy: 1271, 165 + xy: 2005, 1395 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-scrap-tiny rotate: false - xy: 1279, 1199 + xy: 2031, 1013 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-scrap-xlarge rotate: false - xy: 1357, 817 + xy: 1527, 1047 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-silicon-large rotate: false - xy: 2005, 1159 + xy: 1457, 737 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-silicon-medium rotate: false - xy: 1507, 463 + xy: 1837, 895 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon-small rotate: false - xy: 1305, 199 + xy: 1953, 971 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-silicon-tiny rotate: false - xy: 1167, 1013 + xy: 2031, 995 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-silicon-xlarge rotate: false - xy: 1307, 717 + xy: 1577, 1047 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-spore-pod-large rotate: false - xy: 1959, 939 + xy: 1499, 779 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-spore-pod-medium rotate: false - xy: 1609, 463 + xy: 1905, 895 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod-small rotate: false - xy: 1339, 233 + xy: 131, 1025 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-tiny rotate: false - xy: 237, 87 + xy: 2031, 977 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-spore-pod-xlarge rotate: false - xy: 1357, 767 + xy: 1627, 1047 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-surge-alloy-large rotate: false - xy: 2001, 939 + xy: 1541, 821 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-surge-alloy-medium rotate: false - xy: 1677, 464 + xy: 1905, 861 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy-small rotate: false - xy: 1373, 267 + xy: 1550, 285 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-tiny rotate: false - xy: 1033, 287 + xy: 2031, 959 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-surge-alloy-xlarge rotate: false - xy: 1407, 817 + xy: 1677, 1039 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-thorium-large rotate: false - xy: 1984, 897 + xy: 1583, 863 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-thorium-medium rotate: false - xy: 569, 1401 + xy: 1939, 895 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium-small rotate: false - xy: 1407, 301 + xy: 1576, 285 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-thorium-tiny rotate: false - xy: 569, 1383 + xy: 2031, 941 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-thorium-xlarge rotate: false - xy: 1357, 717 + xy: 1831, 997 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-titanium-large rotate: false - xy: 1984, 855 + xy: 1625, 905 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-titanium-medium rotate: false - xy: 1985, 779 + xy: 1829, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium-small rotate: false - xy: 1441, 335 + xy: 1979, 967 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-tiny rotate: false - xy: 1951, 815 + xy: 2031, 1403 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-titanium-xlarge rotate: false - xy: 1407, 767 + xy: 1881, 997 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lancer rotate: false - xy: 801, 311 + xy: 917, 267 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 liquid-cryofluid-large rotate: false - xy: 1983, 813 + xy: 1457, 695 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-cryofluid-medium rotate: false - xy: 1969, 643 + xy: 1855, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid-small rotate: false - xy: 1475, 369 + xy: 2005, 967 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-cryofluid-tiny rotate: false - xy: 1101, 525 + xy: 927, 1607 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-cryofluid-xlarge rotate: false - xy: 1407, 717 + xy: 1981, 993 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-oil-large rotate: false - xy: 679, 5 + xy: 1499, 737 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-oil-medium rotate: false - xy: 2003, 677 + xy: 1855, 725 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil-small rotate: false - xy: 1509, 403 + xy: 1979, 941 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-oil-tiny rotate: false - xy: 869, 1771 + xy: 1319, 1591 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-oil-xlarge rotate: false - xy: 1457, 767 + xy: 1173, 244 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-slag-large rotate: false - xy: 721, 5 + xy: 1541, 779 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-slag-medium rotate: false - xy: 1101, 417 + xy: 1957, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag-small rotate: false - xy: 1543, 437 + xy: 2005, 941 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-slag-tiny rotate: false - xy: 689, 1343 + xy: 885, 1313 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-slag-xlarge rotate: false - xy: 1507, 817 + xy: 1173, 194 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-water-large rotate: false - xy: 763, 5 + xy: 1583, 821 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-water-medium rotate: false - xy: 1101, 349 + xy: 1915, 691 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water-small rotate: false - xy: 1203, 63 + xy: 317, 1281 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-water-tiny rotate: false - xy: 131, 1033 + xy: 677, 337 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-water-xlarge rotate: false - xy: 1457, 717 + xy: 1173, 144 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mace-wreck0 rotate: false - xy: 1461, 1065 + xy: 847, 773 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-wreck1 rotate: false - xy: 1527, 1065 + xy: 847, 707 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-wreck2 rotate: false - xy: 1593, 1065 + xy: 837, 641 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -5024,70 +5024,70 @@ meltdown index: -1 mono-wreck0 rotate: false - xy: 1557, 717 + xy: 1223, 151 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-wreck1 rotate: false - xy: 1207, 667 + xy: 1223, 101 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-wreck2 rotate: false - xy: 1257, 667 + xy: 1223, 51 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 nova-wreck0 rotate: false - xy: 1926, 875 + xy: 1249, 811 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-wreck1 rotate: false - xy: 941, 875 + xy: 1249, 753 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-wreck2 rotate: false - xy: 999, 875 + xy: 1249, 695 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 parallax rotate: false - xy: 637, 121 + xy: 979, 619 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 poly-wreck0 rotate: false - xy: 999, 817 + xy: 1307, 1139 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly-wreck1 rotate: false - xy: 941, 701 + xy: 1307, 1081 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly-wreck2 rotate: false - xy: 999, 759 + xy: 1365, 1139 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -5101,42 +5101,42 @@ pulsar-wreck0 index: -1 pulsar-wreck1 rotate: false - xy: 1989, 1081 + xy: 1989, 1193 size: 58, 48 orig: 58, 48 offset: 0, 0 index: -1 pulsar-wreck2 rotate: false - xy: 1989, 1031 + xy: 293, 1024 size: 58, 48 orig: 58, 48 offset: 0, 0 index: -1 quasar-wreck0 rotate: false - xy: 967, 1147 + xy: 885, 1229 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-wreck1 rotate: false - xy: 1049, 1229 + xy: 885, 1147 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-wreck2 rotate: false - xy: 967, 1065 + xy: 967, 1229 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 repair-point rotate: false - xy: 1237, 429 + xy: 1871, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5150,28 +5150,28 @@ ripple index: -1 salvo rotate: false - xy: 1387, 999 + xy: 1117, 775 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scatter rotate: false - xy: 1651, 999 + xy: 1183, 1085 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch rotate: false - xy: 1271, 395 + xy: 1837, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 segment rotate: false - xy: 867, 377 + xy: 1183, 755 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -5183,100 +5183,121 @@ spectre orig: 128, 128 offset: 0, 0 index: -1 +spiroct-wreck0 + rotate: false + xy: 587, 764 + size: 94, 75 + orig: 94, 75 + offset: 0, 0 + index: -1 +spiroct-wreck1 + rotate: false + xy: 587, 687 + size: 94, 75 + orig: 94, 75 + offset: 0, 0 + index: -1 +spiroct-wreck2 + rotate: false + xy: 587, 610 + size: 94, 75 + orig: 94, 75 + offset: 0, 0 + index: -1 splash-0 rotate: false - xy: 1305, 361 + xy: 1531, 525 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-1 rotate: false - xy: 1339, 395 + xy: 1565, 515 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-10 rotate: false - xy: 1203, 191 + xy: 1871, 495 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-11 rotate: false - xy: 1237, 225 + xy: 1905, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-2 rotate: false - xy: 1373, 429 + xy: 1599, 515 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-3 rotate: false - xy: 1203, 225 + xy: 1633, 505 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-4 rotate: false - xy: 1237, 259 + xy: 1667, 495 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-5 rotate: false - xy: 1271, 293 + xy: 1701, 495 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-6 rotate: false - xy: 1305, 327 + xy: 1735, 495 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-7 rotate: false - xy: 1339, 361 + xy: 1769, 495 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-8 rotate: false - xy: 1373, 395 + xy: 1803, 495 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-9 rotate: false - xy: 1407, 429 + xy: 1837, 495 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer rotate: false - xy: 1299, 933 + xy: 1049, 207 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-alpha-full rotate: false - xy: 1657, 768 + xy: 1243, 495 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5290,35 +5311,35 @@ unit-arkyid-full index: -1 unit-atrax-full rotate: false - xy: 587, 467 + xy: 683, 779 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 unit-beta-full rotate: false - xy: 1657, 718 + xy: 1465, 997 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-crawler-full rotate: false - xy: 1657, 668 + xy: 1515, 997 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-dagger-full rotate: false - xy: 1707, 825 + xy: 1565, 997 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-flare-full rotate: false - xy: 1707, 775 + xy: 1615, 997 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5332,21 +5353,21 @@ unit-fortress-full index: -1 unit-gamma-full rotate: false - xy: 999, 701 + xy: 1365, 1081 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 unit-horizon-full rotate: false - xy: 677, 611 + xy: 773, 741 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 unit-mace-full rotate: false - xy: 1893, 933 + xy: 1177, 491 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -5360,39 +5381,46 @@ unit-mega-full index: -1 unit-mono-full rotate: false - xy: 1757, 825 + xy: 1665, 989 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-nova-full rotate: false - xy: 999, 643 + xy: 1423, 1139 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 unit-poly-full rotate: false - xy: 941, 585 + xy: 1307, 965 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 unit-pulsar-full rotate: false - xy: 293, 1024 + xy: 1981, 1801 size: 58, 48 orig: 58, 48 offset: 0, 0 index: -1 unit-quasar-full rotate: false - xy: 1049, 1147 + xy: 885, 1065 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 +unit-spiroct-full + rotate: false + xy: 587, 533 + size: 94, 75 + orig: 94, 75 + offset: 0, 0 + index: -1 unit-zenith-full rotate: false xy: 261, 251 @@ -5402,7 +5430,7 @@ unit-zenith-full index: -1 wave rotate: false - xy: 1497, 867 + xy: 1211, 425 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -5430,168 +5458,168 @@ zenith-wreck2 index: -1 item-blast-compound rotate: false - xy: 1753, 471 + xy: 1447, 491 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 1235, 497 + xy: 1457, 423 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 1303, 497 + xy: 1482, 355 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 1371, 497 + xy: 1448, 287 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 1439, 497 + xy: 1749, 1005 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 1507, 497 + xy: 1775, 937 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 1575, 497 + xy: 1783, 971 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 1643, 497 + xy: 1851, 963 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 1269, 463 + xy: 1919, 963 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 1337, 463 + xy: 1843, 929 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 1405, 463 + xy: 1911, 929 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 1473, 463 + xy: 1803, 861 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod rotate: false - xy: 1575, 463 + xy: 1837, 861 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 1643, 463 + xy: 1871, 861 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 569, 1435 + xy: 1945, 929 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 1951, 779 + xy: 1939, 861 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 1969, 677 + xy: 1931, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 2003, 711 + xy: 1889, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 1101, 451 + xy: 1965, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 1135, 417 + xy: 1881, 691 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blank rotate: false - xy: 484, 1560 + xy: 479, 1560 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 shape-3 rotate: false - xy: 1629, 868 + xy: 1115, 294 size: 63, 63 orig: 63, 63 offset: 0, 0 index: -1 alpha rotate: false - xy: 999, 593 + xy: 1481, 1147 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-cell rotate: false - xy: 1981, 981 + xy: 1307, 915 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5612,28 +5640,28 @@ chaos-array index: -1 arkyid-cell rotate: false - xy: 591, 929 + xy: 587, 467 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 arkyid-foot rotate: false - xy: 677, 539 + xy: 765, 669 size: 70, 70 orig: 70, 70 offset: 0, 0 index: -1 arkyid-joint-base rotate: false - xy: 677, 467 + xy: 765, 597 size: 70, 70 orig: 70, 70 offset: 0, 0 index: -1 arkyid-leg rotate: false - xy: 1981, 1793 + xy: 1239, 1159 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -5645,30 +5673,23 @@ arkyid-leg-base orig: 104, 64 offset: 0, 0 index: -1 -arkyid-old - rotate: false - xy: 587, 863 - size: 88, 64 - orig: 88, 64 - offset: 0, 0 - index: -1 atrax rotate: false - xy: 587, 797 + xy: 587, 401 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 atrax-base rotate: false - xy: 669, 401 + xy: 1981, 1917 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 atrax-cell rotate: false - xy: 587, 731 + xy: 587, 335 size: 88, 64 orig: 88, 64 offset: 0, 0 @@ -5682,35 +5703,35 @@ atrax-foot index: -1 atrax-joint rotate: false - xy: 841, 1761 + xy: 885, 1037 size: 26, 26 orig: 26, 26 offset: 0, 0 index: -1 atrax-leg rotate: false - xy: 2005, 1131 + xy: 803, 1761 size: 36, 26 orig: 36, 26 offset: 0, 0 index: -1 atrax-leg-base rotate: false - xy: 803, 1761 + xy: 841, 1761 size: 36, 26 orig: 36, 26 offset: 0, 0 index: -1 beta rotate: false - xy: 983, 535 + xy: 1631, 1147 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 beta-cell rotate: false - xy: 981, 485 + xy: 1307, 757 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5738,49 +5759,49 @@ chaos-array-leg index: -1 crawler rotate: false - xy: 983, 335 + xy: 1881, 1147 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-base rotate: false - xy: 1049, 593 + xy: 1931, 1147 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-cell rotate: false - xy: 1033, 543 + xy: 1981, 1143 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-leg rotate: false - xy: 1083, 543 + xy: 1365, 927 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger rotate: false - xy: 967, 135 + xy: 1357, 727 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 967, 85 + xy: 1357, 677 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 967, 35 + xy: 1307, 657 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5815,7 +5836,7 @@ eradicator-leg index: -1 flare rotate: false - xy: 1057, 741 + xy: 1831, 1097 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5829,7 +5850,7 @@ fortress index: -1 fortress-base rotate: false - xy: 735, 377 + xy: 843, 3 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -5843,63 +5864,63 @@ fortress-cell index: -1 fortress-leg rotate: false - xy: 689, 981 + xy: 683, 635 size: 80, 60 orig: 80, 60 offset: 0, 0 index: -1 gamma rotate: false - xy: 1694, 875 + xy: 1180, 301 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 gamma-cell rotate: false - xy: 883, 709 + xy: 1115, 98 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 horizon rotate: false - xy: 1131, 1237 + xy: 967, 1155 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 horizon-cell rotate: false - xy: 1131, 1163 + xy: 1049, 1237 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 mace rotate: false - xy: 1197, 1077 + xy: 917, 135 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-base rotate: false - xy: 1263, 1065 + xy: 917, 69 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-cell rotate: false - xy: 1329, 1065 + xy: 909, 3 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-leg rotate: false - xy: 1395, 1065 + xy: 851, 839 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -5920,63 +5941,63 @@ mega-cell index: -1 mono rotate: false - xy: 1507, 717 + xy: 1223, 251 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-cell rotate: false - xy: 1557, 767 + xy: 1223, 201 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 nova rotate: false - xy: 883, 593 + xy: 1249, 927 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-base rotate: false - xy: 1357, 667 + xy: 1273, 201 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 nova-cell rotate: false - xy: 1868, 875 + xy: 1249, 869 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-leg rotate: false - xy: 1407, 667 + xy: 1273, 151 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 poly rotate: false - xy: 941, 817 + xy: 1238, 301 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly-cell rotate: false - xy: 941, 759 + xy: 1115, 40 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 power-cell rotate: false - xy: 941, 643 + xy: 1307, 1023 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -5990,7 +6011,7 @@ pulsar index: -1 pulsar-base rotate: false - xy: 1457, 667 + xy: 1273, 101 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -6004,84 +6025,126 @@ pulsar-cell index: -1 pulsar-leg rotate: false - xy: 835, 113 + xy: 1117, 1039 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 quasar rotate: false - xy: 885, 1229 + xy: 683, 553 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-base rotate: false - xy: 885, 1147 + xy: 571, 253 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-cell rotate: false - xy: 967, 1229 + xy: 571, 171 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-leg rotate: false - xy: 885, 1065 + xy: 571, 89 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 +spiroct + rotate: false + xy: 591, 918 + size: 94, 75 + orig: 94, 75 + offset: 0, 0 + index: -1 +spiroct-cell + rotate: false + xy: 587, 841 + size: 94, 75 + orig: 94, 75 + offset: 0, 0 + index: -1 +spiroct-foot + rotate: false + xy: 569, 1421 + size: 46, 46 + orig: 46, 46 + offset: 0, 0 + index: -1 +spiroct-joint + rotate: false + xy: 1497, 525 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +spiroct-leg + rotate: false + xy: 1, 1 + size: 48, 34 + orig: 48, 34 + offset: 0, 0 + index: -1 +spiroct-leg-base + rotate: false + xy: 51, 1 + size: 48, 34 + orig: 48, 34 + offset: 0, 0 + index: -1 vanguard rotate: false - xy: 1707, 725 + xy: 1465, 947 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 vanguard-cell rotate: false - xy: 1757, 775 + xy: 1515, 947 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 antumbra-missiles rotate: false - xy: 933, 535 + xy: 1581, 1147 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 artillery rotate: false - xy: 931, 477 + xy: 1307, 807 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 beam-weapon rotate: false - xy: 587, 385 + xy: 683, 697 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 chaos rotate: false - xy: 883, 767 + xy: 1115, 156 size: 56, 136 orig: 56, 136 offset: 0, 0 index: -1 eclipse-weapon rotate: false - xy: 1017, 85 + xy: 1581, 1097 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -6095,105 +6158,119 @@ eradication index: -1 eruption rotate: false - xy: 1057, 841 + xy: 1681, 1089 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 flakgun rotate: false - xy: 1057, 791 + xy: 1731, 1097 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flamethrower rotate: false - xy: 1107, 841 + xy: 1781, 1089 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 heal-shotgun-weapon rotate: false - xy: 1107, 691 + xy: 1731, 1047 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 heal-weapon rotate: false - xy: 1157, 829 + xy: 1781, 1039 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 heal-weapon-mount rotate: false - xy: 1157, 779 + xy: 1831, 1047 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 large-weapon rotate: false - xy: 1457, 817 + xy: 1931, 997 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles rotate: false - xy: 1507, 767 + xy: 1173, 94 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles-mount rotate: false - xy: 1557, 817 + xy: 1173, 44 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +mount-purple-weapon + rotate: false + xy: 1223, 1 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mount-weapon rotate: false - xy: 1307, 667 + xy: 1273, 251 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-basic-weapon rotate: false - xy: 1607, 817 + xy: 1271, 375 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-mount-weapon rotate: false - xy: 1607, 767 + xy: 1296, 325 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-weapon rotate: false - xy: 1607, 717 + xy: 1249, 645 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 +spiroct-weapon + rotate: false + xy: 1415, 969 + size: 48, 56 + orig: 48, 56 + offset: 0, 0 + index: -1 weapon rotate: false - xy: 1807, 825 + xy: 1565, 947 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 zenith-missiles rotate: false - xy: 1707, 675 + xy: 1615, 947 size: 48, 48 orig: 48, 48 offset: 0, 0 diff --git a/core/assets/sprites/fallback/sprites2.png b/core/assets/sprites/fallback/sprites2.png index 2c145fa65e..68e5843bdb 100644 Binary files a/core/assets/sprites/fallback/sprites2.png and b/core/assets/sprites/fallback/sprites2.png differ diff --git a/core/assets/sprites/fallback/sprites3.png b/core/assets/sprites/fallback/sprites3.png index ad2a58f9d1..dfa1d65281 100644 Binary files a/core/assets/sprites/fallback/sprites3.png and b/core/assets/sprites/fallback/sprites3.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 79a5ccff6f..2066ad7f01 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -20,7 +20,7 @@ data-processor index: -1 data-processor-2 rotate: false - xy: 3151, 977 + xy: 3415, 1051 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -55,7 +55,7 @@ launch-pad-light index: -1 launchpod rotate: false - xy: 1878, 287 + xy: 1796, 242 size: 66, 64 orig: 66, 64 offset: 0, 0 @@ -90,49 +90,49 @@ large-overdrive-projector-top index: -1 mend-projector rotate: false - xy: 3381, 853 + xy: 3413, 721 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mend-projector-top rotate: false - xy: 3381, 787 + xy: 3479, 721 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mender rotate: false - xy: 2802, 167 + xy: 3420, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mender-top rotate: false - xy: 2836, 159 + xy: 3454, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-projector rotate: false - xy: 3347, 713 + xy: 3481, 1051 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overdrive-projector-top rotate: false - xy: 3447, 919 + xy: 3481, 985 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shock-mine rotate: false - xy: 3647, 953 + xy: 3817, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -153,518 +153,518 @@ block-unloader index: -1 bridge-arrow rotate: false - xy: 2778, 303 + xy: 3819, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 2812, 269 + xy: 3989, 1005 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 2846, 261 + xy: 4023, 1005 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 2880, 287 + xy: 4057, 997 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 center rotate: false - xy: 2914, 287 + xy: 2464, 279 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-0 rotate: false - xy: 337, 1 + xy: 303, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-armored-conveyor-full rotate: false - xy: 337, 1 + xy: 303, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-1 rotate: false - xy: 371, 1 + xy: 337, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-2 rotate: false - xy: 405, 1 + xy: 371, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-3 rotate: false - xy: 439, 1 + xy: 405, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-0 rotate: false - xy: 473, 1 + xy: 439, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-1 rotate: false - xy: 4063, 1201 + xy: 473, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-2 rotate: false - xy: 4063, 1167 + xy: 4063, 1201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-3 rotate: false - xy: 4063, 1133 + xy: 4063, 1167 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-0 rotate: false - xy: 4063, 1099 + xy: 4063, 1133 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-1 rotate: false - xy: 4063, 1065 + xy: 4063, 1099 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-2 rotate: false - xy: 4063, 1031 + xy: 4063, 1065 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-3 rotate: false - xy: 4061, 2015 + xy: 4063, 1031 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-0 rotate: false - xy: 3215, 679 + xy: 4061, 2015 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-1 rotate: false - xy: 2608, 337 + xy: 1861, 110 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-2 rotate: false - xy: 4061, 1981 + xy: 3154, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-3 rotate: false - xy: 2642, 337 + xy: 895, 54 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-0 rotate: false - xy: 4061, 1947 + xy: 3511, 1119 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-1 rotate: false - xy: 4061, 1913 + xy: 3266, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-2 rotate: false - xy: 4061, 1879 + xy: 4061, 1981 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-3 rotate: false - xy: 4061, 1845 + xy: 3300, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 3843, 1075 + xy: 2634, 287 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 3809, 1041 + xy: 2668, 287 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 3775, 1007 + xy: 2601, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 3877, 1075 + xy: 2601, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 3843, 1041 + xy: 2635, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 3809, 1007 + xy: 2635, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 3911, 1075 + xy: 2669, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 3877, 1041 + xy: 2669, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 3843, 1007 + xy: 3672, 223 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 3911, 1041 + xy: 3182, 223 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 3877, 1007 + xy: 3216, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 3911, 1007 + xy: 3250, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 3741, 973 + xy: 3284, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 3775, 973 + xy: 3318, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 3809, 973 + xy: 3352, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 3843, 973 + xy: 3386, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 3877, 973 + xy: 3420, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 3911, 973 + xy: 3454, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 3945, 1005 + xy: 3488, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor rotate: false - xy: 2765, 133 + xy: 3579, 948 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-0 rotate: false - xy: 2799, 133 + xy: 3647, 982 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-1 rotate: false - xy: 2833, 125 + xy: 3579, 914 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-2 rotate: false - xy: 2867, 117 + xy: 3613, 948 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-edge rotate: false - xy: 2901, 117 + xy: 3579, 880 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-stack rotate: false - xy: 2935, 117 + xy: 3613, 914 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 3679, 783 + xy: 3953, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 3645, 749 + xy: 3987, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 3679, 749 + xy: 4021, 937 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 3647, 715 + xy: 3987, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 3647, 681 + xy: 4021, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 3681, 715 + xy: 4021, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 3681, 681 + xy: 3953, 835 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 3666, 647 + xy: 3987, 835 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 3666, 613 + xy: 4021, 835 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 3666, 579 + xy: 4055, 929 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 3666, 545 + xy: 4055, 895 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 3700, 647 + xy: 4055, 861 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 3700, 613 + xy: 4055, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 3700, 579 + xy: 3749, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 3700, 545 + xy: 3783, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 3710, 511 + xy: 3817, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 3715, 939 + xy: 3851, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 3749, 939 + xy: 3885, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 3715, 905 + xy: 3919, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cross rotate: false - xy: 2323, 223 + xy: 3921, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 distributor rotate: false - xy: 3217, 1043 + xy: 3349, 985 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 inverted-sorter rotate: false - xy: 2391, 261 + xy: 3284, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction rotate: false - xy: 2802, 201 + xy: 2574, 11 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -706,7 +706,7 @@ mass-driver-base index: -1 overflow-gate rotate: false - xy: 2904, 151 + xy: 3522, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -734,49 +734,49 @@ payload-router-over index: -1 phase-conveyor rotate: false - xy: 2595, 163 + xy: 3692, 155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 2629, 167 + xy: 3658, 121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 2663, 167 + xy: 3692, 121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 2697, 141 + xy: 3579, 982 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 2867, 49 + xy: 3681, 817 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 3681, 953 + xy: 3783, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 underflow-gate rotate: false - xy: 3715, 871 + xy: 4021, 801 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -811,14 +811,14 @@ blast-drill-top index: -1 drill-top rotate: false - xy: 3183, 845 + xy: 3183, 853 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-liquid rotate: false - xy: 3183, 845 + xy: 3183, 853 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -853,21 +853,21 @@ laser-drill-top index: -1 mechanical-drill rotate: false - xy: 3315, 845 + xy: 3447, 919 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-rotator rotate: false - xy: 3315, 779 + xy: 3447, 853 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-top rotate: false - xy: 3381, 919 + xy: 3447, 787 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -902,84 +902,84 @@ oil-extractor-top index: -1 pneumatic-drill rotate: false - xy: 3513, 795 + xy: 3519, 655 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-rotator rotate: false - xy: 3545, 729 + xy: 3255, 589 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-top rotate: false - xy: 3251, 647 + xy: 3321, 589 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 2191, 163 + xy: 3088, 465 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 2140, 91 + xy: 3154, 471 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 2140, 25 + xy: 3220, 457 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 2206, 97 + xy: 3286, 457 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-border rotate: false - xy: 4063, 1675 + xy: 4061, 1879 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-middle rotate: false - xy: 3616, 205 + xy: 3547, 1016 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-select rotate: false - xy: 3673, 987 + xy: 3785, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 3741, 1075 + xy: 2533, 249 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 message rotate: false - xy: 2870, 151 + xy: 3488, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -993,161 +993,161 @@ place-arrow index: -1 bridge-conduit rotate: false - xy: 2812, 303 + xy: 3853, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 2846, 295 + xy: 3887, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 2846, 295 + xy: 3887, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 2744, 281 + xy: 3921, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 2778, 269 + xy: 3955, 1005 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 2880, 253 + xy: 2465, 245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 2914, 253 + xy: 2465, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 2948, 253 + xy: 2499, 249 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 2982, 253 + xy: 2499, 215 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 2982, 253 + xy: 2499, 215 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 2982, 253 + xy: 2499, 215 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 3775, 1075 + xy: 2533, 215 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 3741, 1041 + xy: 2566, 283 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 3809, 1075 + xy: 2567, 249 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 3775, 1041 + xy: 2567, 215 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 3775, 1041 + xy: 2567, 215 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 3741, 1007 + xy: 2600, 287 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 2870, 219 + xy: 2608, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate rotate: false - xy: 2972, 219 + xy: 2608, 49 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate-top rotate: false - xy: 2870, 185 + xy: 2642, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 2904, 185 + xy: 2608, 15 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 2938, 185 + xy: 2642, 49 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 2972, 185 + xy: 2642, 15 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1175,133 +1175,133 @@ liquid-tank-top index: -1 mechanical-pump rotate: false - xy: 2663, 201 + xy: 3318, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-pump-liquid rotate: false - xy: 2734, 179 + xy: 3352, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-liquid rotate: false - xy: 2734, 179 + xy: 3352, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-liquid rotate: false - xy: 2734, 179 + xy: 3352, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 2938, 151 + xy: 3556, 147 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 2972, 151 + xy: 3590, 147 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 3006, 151 + xy: 3624, 147 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 2697, 175 + xy: 3658, 155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-cap rotate: false - xy: 3003, 117 + xy: 3579, 846 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-0 rotate: false - xy: 2731, 111 + xy: 3613, 880 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-1 rotate: false - xy: 2765, 99 + xy: 3647, 914 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-2 rotate: false - xy: 2799, 99 + xy: 3579, 812 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-3 rotate: false - xy: 2833, 91 + xy: 3613, 846 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-4 rotate: false - xy: 2867, 83 + xy: 3647, 880 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 3003, 83 + xy: 3681, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 2629, 133 + xy: 3715, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 2663, 133 + xy: 3681, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 2697, 107 + xy: 3715, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 3336, 581 + xy: 3189, 537 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1315,7 +1315,7 @@ thermal-pump index: -1 battery rotate: false - xy: 4061, 1811 + xy: 4061, 1947 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1336,21 +1336,21 @@ battery-large-top index: -1 battery-top rotate: false - xy: 4063, 1777 + xy: 3334, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 2948, 287 + xy: 2498, 283 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 2982, 287 + xy: 2532, 283 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1378,28 +1378,28 @@ differential-generator-top index: -1 diode rotate: false - xy: 2322, 189 + xy: 3955, 971 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 diode-arrow rotate: false - xy: 2360, 295 + xy: 3989, 971 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator rotate: false - xy: 2530, 295 + xy: 2669, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator-top rotate: false - xy: 2357, 261 + xy: 3216, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1455,49 +1455,49 @@ impact-reactor-plasma-3 index: -1 power-node rotate: false - xy: 2901, 83 + xy: 3613, 812 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 3317, 647 + xy: 3387, 589 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 power-source rotate: false - xy: 2935, 83 + xy: 3647, 846 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 2969, 83 + xy: 3647, 812 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 3402, 581 + xy: 3255, 523 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 2901, 49 + xy: 3715, 817 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 3613, 919 + xy: 3885, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1511,14 +1511,14 @@ solar-panel-large index: -1 surge-tower rotate: false - xy: 2008, 23 + xy: 2362, 521 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 2074, 89 + xy: 2560, 521 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1546,35 +1546,35 @@ thorium-reactor-top index: -1 turbine-generator rotate: false - xy: 2078, 289 + xy: 2758, 521 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-cap rotate: false - xy: 2144, 295 + xy: 2824, 521 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-top rotate: false - xy: 2210, 295 + xy: 2890, 521 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-turbine0 rotate: false - xy: 2125, 223 + xy: 2956, 521 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-turbine1 rotate: false - xy: 2125, 157 + xy: 3022, 521 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1595,7 +1595,7 @@ alloy-smelter-top index: -1 blast-mixer rotate: false - xy: 1946, 287 + xy: 2214, 424 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1609,49 +1609,49 @@ block-forge index: -1 coal-centrifuge rotate: false - xy: 2280, 521 + xy: 2059, 128 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 3072, 521 + xy: 3151, 985 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 2182, 435 + xy: 3217, 1051 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 3138, 537 + xy: 3283, 1051 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator rotate: false - xy: 3185, 603 + xy: 3217, 985 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 3204, 537 + xy: 3349, 1051 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 3151, 1043 + xy: 3283, 985 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1679,70 +1679,70 @@ disassembler-spinner index: -1 graphite-press rotate: false - xy: 3249, 911 + xy: 3183, 787 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 incinerator rotate: false - xy: 2357, 227 + xy: 3250, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 2666, 269 + xy: 2472, 11 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 2768, 201 + xy: 2574, 45 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 kiln rotate: false - xy: 3249, 845 + xy: 3315, 919 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 kiln-top rotate: false - xy: 3249, 779 + xy: 3249, 853 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 3249, 779 + xy: 3249, 853 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 liquid-source rotate: false - xy: 2632, 235 + xy: 2676, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-void rotate: false - xy: 2666, 235 + xy: 2676, 49 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 2768, 167 + xy: 3386, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1756,77 +1756,77 @@ multi-press index: -1 phase-weaver rotate: false - xy: 3413, 721 + xy: 3513, 787 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 3479, 721 + xy: 3545, 721 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 3481, 1059 + xy: 3255, 655 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 3481, 993 + xy: 3321, 655 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 3513, 927 + xy: 3387, 655 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 2731, 77 + xy: 3681, 885 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 2765, 65 + xy: 3715, 885 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 3449, 655 + xy: 3519, 589 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator rotate: false - xy: 1861, 221 + xy: 2555, 587 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 1861, 155 + xy: 2621, 587 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-spinner rotate: false - xy: 1927, 221 + xy: 2687, 587 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1847,126 +1847,126 @@ silicon-crucible-top index: -1 silicon-smelter rotate: false - xy: 1927, 155 + xy: 2753, 587 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press rotate: false - xy: 1993, 221 + xy: 2819, 587 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame0 rotate: false - xy: 1993, 155 + xy: 2885, 587 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame1 rotate: false - xy: 2012, 287 + xy: 2951, 587 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame2 rotate: false - xy: 1942, 89 + xy: 3017, 587 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-liquid rotate: false - xy: 1942, 23 + xy: 2230, 517 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-top rotate: false - xy: 2008, 89 + xy: 2296, 521 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rock1 rotate: false - xy: 2948, 321 + xy: 3530, 365 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rock2 rotate: false - xy: 2998, 321 + xy: 3530, 315 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-boulder1 rotate: false - xy: 2935, 49 + xy: 3749, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-boulder2 rotate: false - xy: 2969, 49 + xy: 3783, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder1 rotate: false - xy: 3579, 828 + xy: 3749, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder2 rotate: false - xy: 3613, 953 + xy: 3783, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrock1 rotate: false - xy: 3198, 279 + xy: 3630, 307 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snowrock2 rotate: false - xy: 3248, 257 + xy: 3530, 265 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-cluster1 rotate: false - xy: 2444, 329 + xy: 3064, 231 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster2 rotate: false - xy: 2486, 329 + xy: 3106, 229 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster3 rotate: false - xy: 2528, 329 + xy: 3148, 257 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -1987,7 +1987,7 @@ white-tree-dead index: -1 container rotate: false - xy: 2412, 521 + xy: 2125, 144 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2036,14 +2036,14 @@ core-shard-team index: -1 unloader rotate: false - xy: 3817, 939 + xy: 4055, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader-center rotate: false - xy: 3783, 905 + xy: 3611, 778 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2057,21 +2057,21 @@ vault index: -1 arc-heat rotate: false - xy: 303, 1 + xy: 269, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-1 rotate: false - xy: 4063, 1743 + xy: 4061, 1913 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-2 rotate: false - xy: 2195, 583 + xy: 2124, 342 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2092,14 +2092,14 @@ block-4 index: -1 hail-heat rotate: false - xy: 1501, 1069 + xy: 2380, 263 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 3281, 713 + xy: 3315, 853 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2120,35 +2120,35 @@ ripple-heat index: -1 salvo-heat rotate: false - xy: 3534, 589 + xy: 3387, 523 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 3270, 515 + xy: 3453, 523 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 3336, 515 + xy: 3519, 523 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch-heat rotate: false - xy: 3579, 964 + xy: 3817, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 2257, 229 + xy: 3418, 457 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2176,7 +2176,7 @@ air-factory index: -1 command-center rotate: false - xy: 2346, 521 + xy: 2074, 62 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2288,21 +2288,21 @@ naval-factory index: -1 rally-point rotate: false - xy: 3515, 655 + xy: 3585, 655 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 repair-point-base rotate: false - xy: 2833, 57 + xy: 3715, 851 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 resupply-point rotate: false - xy: 3270, 581 + xy: 3585, 589 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2323,70 +2323,70 @@ tetrative-reconstructor-top index: -1 copper-wall rotate: false - xy: 3979, 1005 + xy: 3522, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-large rotate: false - xy: 2478, 521 + xy: 2191, 152 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door rotate: false - xy: 2394, 295 + xy: 4023, 971 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large rotate: false - xy: 3217, 977 + xy: 3415, 985 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 3183, 911 + xy: 3183, 919 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-open rotate: false - xy: 2428, 295 + xy: 4057, 963 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 2731, 145 + xy: 3613, 982 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large rotate: false - xy: 3447, 787 + xy: 3513, 853 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-wall rotate: false - xy: 2969, 117 + xy: 3647, 948 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-wall-large rotate: false - xy: 3513, 861 + xy: 3453, 655 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2414,84 +2414,84 @@ scrap-wall-huge3 index: -1 scrap-wall-large1 rotate: false - xy: 3468, 523 + xy: 2225, 583 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large2 rotate: false - xy: 3534, 523 + xy: 2291, 587 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large3 rotate: false - xy: 3581, 663 + xy: 2357, 587 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large4 rotate: false - xy: 3600, 597 + xy: 2423, 587 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall2 rotate: false - xy: 3579, 930 + xy: 3749, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 3579, 896 + xy: 3783, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 3579, 862 + xy: 3851, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 3579, 862 + xy: 3851, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 3611, 749 + xy: 3953, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large rotate: false - xy: 2059, 221 + xy: 2428, 521 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 3645, 783 + xy: 3987, 937 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 2074, 23 + xy: 2626, 521 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2505,35 +2505,35 @@ thruster index: -1 titanium-wall rotate: false - xy: 3783, 939 + xy: 3953, 801 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large rotate: false - xy: 2164, 361 + xy: 2692, 521 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 bullet rotate: false - xy: 2654, 467 + xy: 2470, 467 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 bullet-back rotate: false - xy: 2708, 467 + xy: 2524, 467 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 casing rotate: false - xy: 3141, 1091 + xy: 3141, 1099 size: 8, 16 orig: 8, 16 offset: 0, 0 @@ -2547,7 +2547,7 @@ circle-end index: -1 circle-mid rotate: false - xy: 4073, 1240 + xy: 4089, 762 size: 1, 199 orig: 1, 199 offset: 0, 0 @@ -2561,70 +2561,70 @@ circle-shadow index: -1 error rotate: false - xy: 2748, 417 + xy: 2630, 371 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 laser rotate: false - xy: 3965, 1255 + xy: 3661, 1152 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 laser-end rotate: false - xy: 2034, 427 + xy: 3215, 1117 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 minelaser rotate: false - xy: 1543, 1061 + xy: 3965, 1255 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 minelaser-end rotate: false - xy: 2108, 427 + xy: 3289, 1117 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 missile rotate: false - xy: 3598, 377 + xy: 663, 1 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 missile-back rotate: false - xy: 3648, 335 + xy: 3215, 683 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 parallax-laser rotate: false - xy: 639, 1033 + xy: 4091, 981 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 parallax-laser-end rotate: false - xy: 1878, 353 + xy: 3363, 1117 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 particle rotate: false - xy: 2402, 329 + xy: 3022, 237 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -2638,56 +2638,56 @@ scale_marker index: -1 shell rotate: false - xy: 1903, 117 + xy: 3190, 261 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shell-back rotate: false - xy: 2570, 333 + xy: 3228, 261 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 transfer rotate: false - xy: 929, 1097 + xy: 639, 1033 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 3749, 905 + xy: 3987, 801 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white rotate: false - xy: 1060, 113 + xy: 2225, 578 size: 3, 3 orig: 3, 3 offset: 0, 0 index: -1 alpha-wreck0 rotate: false - xy: 2862, 471 + xy: 2628, 471 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-wreck1 rotate: false - xy: 2912, 471 + xy: 2678, 471 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-wreck2 rotate: false - xy: 2962, 471 + xy: 2728, 471 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -2715,7 +2715,7 @@ antumbra-wreck2 index: -1 arc rotate: false - xy: 269, 1 + xy: 3083, 619 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2743,42 +2743,42 @@ arkyid-wreck2 index: -1 atrax-wreck0 rotate: false - xy: 2015, 583 + xy: 1796, 374 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 atrax-wreck1 rotate: false - xy: 2105, 583 + xy: 1976, 506 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 atrax-wreck2 rotate: false - xy: 1796, 517 + xy: 1886, 440 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 beta-wreck0 rotate: false - xy: 3486, 415 + xy: 2878, 471 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 beta-wreck1 rotate: false - xy: 3536, 415 + xy: 2380, 305 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 beta-wreck2 rotate: false - xy: 3586, 415 + xy: 2928, 471 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -2799,7 +2799,7 @@ block-air-factory-full index: -1 block-arc-full rotate: false - xy: 4063, 1709 + xy: 3368, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2813,35 +2813,35 @@ block-blast-drill-full index: -1 block-char-full rotate: false - xy: 4063, 1641 + xy: 3402, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cliffs-full rotate: false - xy: 4063, 1607 + xy: 4061, 1845 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conduit-full rotate: false - xy: 3519, 1163 + xy: 3436, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conveyor-full rotate: false - xy: 3553, 1168 + xy: 4061, 1811 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 3553, 1168 + xy: 4061, 1811 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2869,21 +2869,21 @@ block-core-shard-full index: -1 block-craters-full rotate: false - xy: 3587, 1168 + xy: 4063, 1777 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cryofluidmixer-full rotate: false - xy: 2261, 587 + xy: 2124, 276 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-cultivator-full rotate: false - xy: 2327, 587 + xy: 2190, 350 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2897,28 +2897,28 @@ block-cyclone-full index: -1 block-dark-metal-full rotate: false - xy: 3621, 1168 + xy: 4063, 1743 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-full rotate: false - xy: 3605, 1134 + xy: 4063, 1709 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dunerocks-full rotate: false - xy: 3605, 1100 + xy: 4063, 1675 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-duo-full rotate: false - xy: 3605, 1066 + xy: 4063, 1641 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2939,7 +2939,7 @@ block-fuse-full index: -1 block-grass-full rotate: false - xy: 3605, 1032 + xy: 4063, 1607 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2953,49 +2953,49 @@ block-ground-factory-full index: -1 block-hail-full rotate: false - xy: 3582, 231 + xy: 3470, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-holostone-full rotate: false - xy: 3616, 239 + xy: 3148, 223 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hotrock-full rotate: false - xy: 3650, 247 + xy: 895, 20 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-full rotate: false - xy: 3684, 247 + xy: 2280, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-snow-full rotate: false - xy: 3718, 247 + xy: 3545, 1118 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icerocks-full rotate: false - xy: 2676, 337 + xy: 3579, 1118 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ignarock-full rotate: false - xy: 3605, 998 + xy: 3613, 1118 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3009,7 +3009,7 @@ block-impact-reactor-full index: -1 block-lancer-full rotate: false - xy: 2393, 587 + xy: 2190, 284 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3023,7 +3023,7 @@ block-laser-drill-full index: -1 block-liquid-router-full rotate: false - xy: 3498, 189 + xy: 3547, 1084 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3037,7 +3037,7 @@ block-liquid-tank-full index: -1 block-magmarock-full rotate: false - xy: 3532, 189 + xy: 3547, 1050 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3065,7 +3065,7 @@ block-mass-driver-full index: -1 block-mechanical-drill-full rotate: false - xy: 2459, 587 + xy: 2124, 210 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3079,14 +3079,14 @@ block-meltdown-full index: -1 block-metal-floor-damaged-full rotate: false - xy: 3566, 189 + xy: 3581, 1084 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-moss-full rotate: false - xy: 3650, 213 + xy: 3581, 1050 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3114,49 +3114,49 @@ block-oil-extractor-full index: -1 block-ore-coal-full rotate: false - xy: 3684, 213 + xy: 3581, 1016 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-copper-full rotate: false - xy: 3718, 213 + xy: 3615, 1084 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-lead-full rotate: false - xy: 3650, 179 + xy: 3615, 1050 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-scrap-full rotate: false - xy: 3684, 179 + xy: 3615, 1016 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-thorium-full rotate: false - xy: 3718, 179 + xy: 3647, 1118 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-titanium-full rotate: false - xy: 3639, 1123 + xy: 3649, 1084 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-parallax-full rotate: false - xy: 2525, 587 + xy: 2190, 218 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3177,49 +3177,49 @@ payload-router-icon index: -1 block-pebbles-full rotate: false - xy: 3673, 1123 + xy: 3649, 1050 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-phase-weaver-full rotate: false - xy: 2591, 587 + xy: 2256, 358 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-plated-conduit-full rotate: false - xy: 3639, 1089 + xy: 3649, 1016 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pneumatic-drill-full rotate: false - xy: 2657, 587 + xy: 2256, 292 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-pulse-conduit-full rotate: false - xy: 3707, 1123 + xy: 3681, 1123 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pulverizer-full rotate: false - xy: 3639, 1055 + xy: 3715, 1123 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-repair-point-full rotate: false - xy: 3673, 1089 + xy: 3683, 1089 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3233,77 +3233,77 @@ block-ripple-full index: -1 block-rock-full rotate: false - xy: 3636, 423 + xy: 2978, 471 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-rocks-full rotate: false - xy: 3639, 1021 + xy: 3683, 1055 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-saltrocks-full rotate: false - xy: 3673, 1055 + xy: 3683, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-salvo-full rotate: false - xy: 2723, 587 + xy: 2256, 226 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-sand-boulder-full rotate: false - xy: 3707, 1089 + xy: 3717, 1089 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-full rotate: false - xy: 3673, 1021 + xy: 3717, 1055 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sandrocks-full rotate: false - xy: 3707, 1055 + xy: 3717, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scatter-full rotate: false - xy: 2789, 587 + xy: 1864, 210 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-scorch-full rotate: false - xy: 3707, 1021 + xy: 3751, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-full rotate: false - xy: 3639, 987 + xy: 3751, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall1 rotate: false - xy: 3639, 987 + xy: 3751, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3324,63 +3324,63 @@ scrap-wall-huge1 index: -1 block-scrap-wall-large-full rotate: false - xy: 2855, 587 + xy: 1861, 144 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-segment-full rotate: false - xy: 2921, 587 + xy: 1930, 194 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-shale-boulder-full rotate: false - xy: 3707, 987 + xy: 3785, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-full rotate: false - xy: 2692, 379 + xy: 3819, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shalerocks-full rotate: false - xy: 2726, 383 + xy: 3819, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shrubs-full rotate: false - xy: 2760, 383 + xy: 3853, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-full rotate: false - xy: 2710, 345 + xy: 3853, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snowrock-full rotate: false - xy: 2322, 6 + xy: 3028, 471 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-snowrocks-full rotate: false - xy: 2744, 349 + xy: 3887, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3401,42 +3401,42 @@ block-spore-cluster-full index: -1 block-spore-moss-full rotate: false - xy: 2710, 311 + xy: 3887, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-spore-press-full rotate: false - xy: 2987, 587 + xy: 1996, 194 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-sporerocks-full rotate: false - xy: 2744, 315 + xy: 3921, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-stone-full rotate: false - xy: 2778, 337 + xy: 3921, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-swarmer-full rotate: false - xy: 3053, 587 + xy: 1927, 128 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-tendrils-full rotate: false - xy: 2812, 337 + xy: 3751, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3450,35 +3450,35 @@ block-tetrative-reconstructor-full index: -1 block-titanium-conveyor-full rotate: false - xy: 2846, 329 + xy: 3785, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 2846, 329 + xy: 3785, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-turbine-generator-full rotate: false - xy: 3119, 603 + xy: 1993, 128 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-water-extractor-full rotate: false - xy: 3453, 1125 + xy: 1942, 62 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-wave-full rotate: false - xy: 2214, 517 + xy: 2008, 62 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3527,112 +3527,112 @@ core-shard-team-sharded index: -1 cracks-1-0 rotate: false - xy: 4013, 1005 + xy: 3672, 189 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-1 rotate: false - xy: 3945, 971 + xy: 3683, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-2 rotate: false - xy: 3979, 971 + xy: 3717, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-3 rotate: false - xy: 4013, 971 + xy: 3751, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-4 rotate: false - xy: 4047, 997 + xy: 3785, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-5 rotate: false - xy: 4047, 963 + xy: 3819, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-6 rotate: false - xy: 2323, 291 + xy: 3853, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-7 rotate: false - xy: 2323, 257 + xy: 3887, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-2-0 rotate: false - xy: 2544, 521 + xy: 2257, 160 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-1 rotate: false - xy: 2610, 521 + xy: 2140, 78 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-2 rotate: false - xy: 2676, 521 + xy: 2206, 86 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-3 rotate: false - xy: 2742, 521 + xy: 2272, 94 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-4 rotate: false - xy: 2808, 521 + xy: 2140, 12 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-5 rotate: false - xy: 2874, 521 + xy: 2206, 20 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-6 rotate: false - xy: 2940, 521 + xy: 2272, 28 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-7 rotate: false - xy: 3006, 521 + xy: 3151, 1051 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4031,21 +4031,21 @@ cracks-9-7 index: -1 crawler-wreck0 rotate: false - xy: 2498, 413 + xy: 2480, 367 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-wreck1 rotate: false - xy: 2548, 413 + xy: 2480, 317 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-wreck2 rotate: false - xy: 2598, 413 + xy: 2530, 417 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4059,28 +4059,28 @@ cyclone index: -1 dagger-wreck0 rotate: false - xy: 3686, 381 + xy: 2630, 421 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-wreck1 rotate: false - xy: 3686, 331 + xy: 2580, 371 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-wreck2 rotate: false - xy: 2648, 413 + xy: 2680, 421 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 duo rotate: false - xy: 2462, 295 + xy: 2601, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4108,21 +4108,21 @@ eclipse-wreck2 index: -1 flare-wreck0 rotate: false - xy: 2948, 421 + xy: 2830, 421 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flare-wreck1 rotate: false - xy: 2998, 421 + xy: 2680, 321 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flare-wreck2 rotate: false - xy: 3048, 413 + xy: 2730, 363 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4157,63 +4157,63 @@ fuse index: -1 gamma-wreck0 rotate: false - xy: 839, 30 + xy: 2060, 4 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 gamma-wreck1 rotate: false - xy: 3138, 479 + xy: 721, 30 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 gamma-wreck2 rotate: false - xy: 3196, 479 + xy: 779, 30 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 hail rotate: false - xy: 2496, 295 + xy: 2635, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 horizon-wreck0 rotate: false - xy: 3379, 1117 + xy: 2050, 334 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 horizon-wreck1 rotate: false - xy: 1886, 427 + xy: 2050, 260 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 horizon-wreck2 rotate: false - xy: 1960, 427 + xy: 3141, 1117 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 item-blast-compound-large rotate: false - xy: 1796, 245 + xy: 2980, 279 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-blast-compound-medium rotate: false - xy: 2425, 261 + xy: 3352, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4234,91 +4234,91 @@ item-blast-compound-tiny index: -1 item-blast-compound-xlarge rotate: false - xy: 3248, 407 + xy: 2930, 421 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-coal-large rotate: false - xy: 1861, 113 + xy: 3022, 279 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-coal-medium rotate: false - xy: 2459, 261 + xy: 3420, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal-small rotate: false - xy: 3112, 495 + xy: 3154, 537 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-coal-tiny rotate: false - xy: 2880, 345 + xy: 19, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-coal-xlarge rotate: false - xy: 3298, 407 + xy: 2880, 371 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-copper-large rotate: false - xy: 3501, 1197 + xy: 3502, 416 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-copper-medium rotate: false - xy: 2493, 261 + xy: 3488, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper-small rotate: false - xy: 3547, 993 + xy: 3504, 273 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-copper-tiny rotate: false - xy: 3647, 663 + xy: 37, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-copper-xlarge rotate: false - xy: 3348, 407 + xy: 2980, 421 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-graphite-large rotate: false - xy: 3498, 223 + xy: 2381, 221 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-graphite-medium rotate: false - xy: 2527, 261 + xy: 3556, 215 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4332,602 +4332,602 @@ item-graphite-small index: -1 item-graphite-tiny rotate: false - xy: 19, 1 + xy: 55, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-graphite-xlarge rotate: false - xy: 3398, 407 + xy: 2930, 371 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-lead-large rotate: false - xy: 3540, 223 + xy: 3064, 273 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-lead-medium rotate: false - xy: 2564, 295 + xy: 3556, 181 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead-small rotate: false - xy: 3112, 469 + xy: 613, 1057 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-lead-tiny rotate: false - xy: 2880, 327 + xy: 73, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-lead-xlarge rotate: false - xy: 3148, 379 + xy: 2980, 371 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-metaglass-large rotate: false - xy: 663, 5 + xy: 2381, 179 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-metaglass-medium rotate: false - xy: 2561, 227 + xy: 3624, 181 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass-small rotate: false - xy: 613, 1057 + xy: 903, 1121 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-metaglass-tiny rotate: false - xy: 37, 1 + xy: 91, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-metaglass-xlarge rotate: false - xy: 3198, 379 + xy: 3030, 421 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-phase-fabric-large rotate: false - xy: 2230, 367 + xy: 2388, 137 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-phase-fabric-medium rotate: false - xy: 2632, 303 + xy: 2533, 181 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric-small rotate: false - xy: 967, 1733 + xy: 871, 863 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-phase-fabric-tiny rotate: false - xy: 55, 1 + xy: 109, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-phase-fabric-xlarge rotate: false - xy: 3248, 357 + xy: 3030, 371 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-plastanium-large rotate: false - xy: 2272, 367 + xy: 2388, 95 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-plastanium-medium rotate: false - xy: 2357, 193 + xy: 2472, 147 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium-small rotate: false - xy: 903, 1121 + xy: 1161, 1185 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-plastanium-tiny rotate: false - xy: 73, 1 + xy: 127, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-plastanium-xlarge rotate: false - xy: 3298, 357 + xy: 2730, 313 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-pyratite-large rotate: false - xy: 2314, 367 + xy: 2388, 53 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-pyratite-medium rotate: false - xy: 2425, 193 + xy: 2506, 147 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite-small rotate: false - xy: 871, 863 + xy: 1129, 959 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-pyratite-tiny rotate: false - xy: 91, 1 + xy: 145, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-pyratite-xlarge rotate: false - xy: 3348, 357 + xy: 2780, 313 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-sand-large rotate: false - xy: 2356, 371 + xy: 2388, 11 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-sand-medium rotate: false - xy: 2493, 193 + xy: 2506, 113 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand-small rotate: false - xy: 1161, 1185 + xy: 1097, 733 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-sand-tiny rotate: false - xy: 109, 1 + xy: 3239, 1515 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-sand-xlarge rotate: false - xy: 3398, 357 + xy: 2830, 321 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-scrap-large rotate: false - xy: 2398, 371 + xy: 3106, 271 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-scrap-medium rotate: false - xy: 2561, 193 + xy: 2472, 45 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap-small rotate: false - xy: 1129, 959 + xy: 1451, 1507 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-scrap-tiny rotate: false - xy: 127, 1 + xy: 1957, 1043 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-scrap-xlarge rotate: false - xy: 2798, 371 + xy: 2880, 321 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-silicon-large rotate: false - xy: 2440, 371 + xy: 2422, 263 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-silicon-medium rotate: false - xy: 2632, 269 + xy: 2540, 113 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon-small rotate: false - xy: 1097, 733 + xy: 323, 767 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-silicon-tiny rotate: false - xy: 145, 1 + xy: 1615, 729 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-silicon-xlarge rotate: false - xy: 2848, 363 + xy: 2930, 321 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-spore-pod-large rotate: false - xy: 2482, 371 + xy: 2423, 221 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-spore-pod-medium rotate: false - xy: 2595, 197 + xy: 2540, 79 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod-small rotate: false - xy: 1097, 537 + xy: 2230, 491 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-tiny rotate: false - xy: 705, 29 + xy: 1060, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-spore-pod-xlarge rotate: false - xy: 2898, 371 + xy: 2980, 321 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-surge-alloy-large rotate: false - xy: 2524, 371 + xy: 2423, 179 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-surge-alloy-medium rotate: false - xy: 2700, 243 + xy: 2540, 45 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy-small rotate: false - xy: 1451, 1507 + xy: 1005, 1733 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-tiny rotate: false - xy: 2230, 417 + xy: 1864, 290 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-surge-alloy-xlarge rotate: false - xy: 2948, 371 + xy: 3030, 321 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-thorium-large rotate: false - xy: 2566, 371 + xy: 2430, 137 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-thorium-medium rotate: false - xy: 2768, 235 + xy: 2574, 147 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium-small rotate: false - xy: 323, 767 + xy: 1895, 118 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-thorium-tiny rotate: false - xy: 3239, 1515 + xy: 3151, 967 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-thorium-xlarge rotate: false - xy: 2998, 371 + xy: 3080, 415 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-titanium-large rotate: false - xy: 2608, 371 + xy: 2430, 95 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-titanium-medium rotate: false - xy: 2734, 213 + xy: 2574, 79 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium-small rotate: false - xy: 897, 62 + xy: 2702, 295 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-tiny rotate: false - xy: 1957, 1043 + xy: 3183, 769 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-titanium-xlarge rotate: false - xy: 3048, 363 + xy: 3080, 365 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lancer rotate: false - xy: 3215, 713 + xy: 3381, 919 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 liquid-cryofluid-large rotate: false - xy: 2650, 371 + xy: 2430, 53 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-cryofluid-medium rotate: false - xy: 2836, 193 + xy: 2642, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid-small rotate: false - xy: 3519, 1137 + xy: 2465, 185 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-cryofluid-tiny rotate: false - xy: 1615, 729 + xy: 2118, 44 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-cryofluid-xlarge rotate: false - xy: 3148, 329 + xy: 3130, 363 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-oil-large rotate: false - xy: 2276, 325 + xy: 2430, 11 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-oil-medium rotate: false - xy: 2938, 219 + xy: 2642, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil-small rotate: false - xy: 3741, 1131 + xy: 3547, 990 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-oil-tiny rotate: false - xy: 1060, 118 + xy: 1595, 925 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-oil-xlarge rotate: false - xy: 3198, 329 + xy: 3130, 313 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-slag-large rotate: false - xy: 2318, 325 + xy: 3630, 215 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-slag-medium rotate: false - xy: 3006, 185 + xy: 2676, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag-small rotate: false - xy: 2276, 299 + xy: 3645, 786 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-slag-tiny rotate: false - xy: 1745, 565 + xy: 3130, 447 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-slag-xlarge rotate: false - xy: 3248, 307 + xy: 3180, 349 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-water-large rotate: false - xy: 2360, 329 + xy: 2980, 237 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-water-medium rotate: false - xy: 2629, 201 + xy: 3284, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water-small rotate: false - xy: 3016, 295 + xy: 3611, 752 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-water-tiny rotate: false - xy: 3251, 629 + xy: 701, 21 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-water-xlarge rotate: false - xy: 3298, 307 + xy: 3230, 349 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mace-wreck0 rotate: false - xy: 3415, 1051 + xy: 3215, 721 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-wreck1 rotate: false - xy: 3415, 985 + xy: 3281, 721 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-wreck2 rotate: false - xy: 3315, 911 + xy: 3347, 721 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4969,70 +4969,70 @@ meltdown index: -1 mono-wreck0 rotate: false - xy: 3448, 315 + xy: 3180, 299 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-wreck1 rotate: false - xy: 3548, 365 + xy: 3230, 299 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-wreck2 rotate: false - xy: 3498, 315 + xy: 3280, 299 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 nova-wreck0 rotate: false - xy: 3370, 457 + xy: 2323, 203 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-wreck1 rotate: false - xy: 3428, 457 + xy: 3549, 415 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-wreck2 rotate: false - xy: 3486, 465 + xy: 3607, 407 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 parallax rotate: false - xy: 3447, 853 + xy: 3513, 919 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 poly-wreck0 rotate: false - xy: 2248, 459 + xy: 3270, 399 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly-wreck1 rotate: false - xy: 2306, 463 + xy: 3328, 399 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly-wreck2 rotate: false - xy: 2364, 463 + xy: 3386, 399 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -5046,42 +5046,42 @@ pulsar-wreck0 index: -1 pulsar-wreck1 rotate: false - xy: 663, 47 + xy: 2062, 210 size: 58, 48 orig: 58, 48 offset: 0, 0 index: -1 pulsar-wreck2 rotate: false - xy: 1545, 893 + xy: 1942, 12 size: 58, 48 orig: 58, 48 offset: 0, 0 index: -1 quasar-wreck0 rotate: false - xy: 2132, 501 + xy: 1968, 342 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-wreck1 rotate: false - xy: 4003, 1515 + xy: 1886, 276 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-wreck2 rotate: false - xy: 3141, 1109 + xy: 1968, 260 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 repair-point rotate: false - xy: 2799, 65 + xy: 3681, 851 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5095,28 +5095,28 @@ ripple index: -1 salvo rotate: false - xy: 3468, 589 + xy: 3321, 523 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scatter rotate: false - xy: 3402, 515 + xy: 3585, 523 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch rotate: false - xy: 3003, 49 + xy: 3749, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 segment rotate: false - xy: 3600, 531 + xy: 2489, 587 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -5128,100 +5128,121 @@ spectre orig: 128, 128 offset: 0, 0 index: -1 +spiroct-wreck0 + rotate: false + xy: 1841, 572 + size: 94, 75 + orig: 94, 75 + offset: 0, 0 + index: -1 +spiroct-wreck1 + rotate: false + xy: 1937, 572 + size: 94, 75 + orig: 94, 75 + offset: 0, 0 + index: -1 +spiroct-wreck2 + rotate: false + xy: 2033, 572 + size: 94, 75 + orig: 94, 75 + offset: 0, 0 + index: -1 splash-0 rotate: false - xy: 3647, 919 + xy: 3851, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-1 rotate: false - xy: 3613, 885 + xy: 3919, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-10 rotate: false - xy: 3681, 817 + xy: 3919, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-11 rotate: false - xy: 3611, 783 + xy: 3953, 937 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-2 rotate: false - xy: 3647, 885 + xy: 3817, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-3 rotate: false - xy: 3681, 919 + xy: 3851, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-4 rotate: false - xy: 3613, 851 + xy: 3885, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-5 rotate: false - xy: 3647, 851 + xy: 3851, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-6 rotate: false - xy: 3681, 885 + xy: 3885, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-7 rotate: false - xy: 3681, 851 + xy: 3919, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-8 rotate: false - xy: 3613, 817 + xy: 3885, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-9 rotate: false - xy: 3647, 817 + xy: 3919, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer rotate: false - xy: 2059, 155 + xy: 2494, 521 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-alpha-full rotate: false - xy: 3298, 257 + xy: 3630, 257 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5242,28 +5263,28 @@ unit-arkyid-full index: -1 unit-atrax-full rotate: false - xy: 1796, 451 + xy: 1796, 308 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 unit-beta-full rotate: false - xy: 3348, 257 + xy: 3511, 1153 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-crawler-full rotate: false - xy: 3398, 257 + xy: 3561, 1152 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-dagger-full rotate: false - xy: 3448, 265 + xy: 3611, 1152 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5277,7 +5298,7 @@ unit-eclipse-full index: -1 unit-flare-full rotate: false - xy: 3498, 265 + xy: 2338, 117 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5291,21 +5312,21 @@ unit-fortress-full index: -1 unit-gamma-full rotate: false - xy: 2480, 463 + xy: 2296, 463 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 unit-horizon-full rotate: false - xy: 1952, 353 + xy: 3437, 1117 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 unit-mace-full rotate: false - xy: 2191, 229 + xy: 3088, 531 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -5319,39 +5340,46 @@ unit-mega-full index: -1 unit-mono-full rotate: false - xy: 3548, 265 + xy: 2338, 67 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-nova-full rotate: false - xy: 2538, 463 + xy: 2354, 463 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 unit-poly-full rotate: false - xy: 2596, 463 + xy: 2412, 463 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 unit-pulsar-full rotate: false - xy: 2272, 114 + xy: 3549, 473 size: 58, 48 orig: 58, 48 offset: 0, 0 index: -1 unit-quasar-full rotate: false - xy: 3223, 1109 + xy: 2058, 408 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 +unit-spiroct-full + rotate: false + xy: 2129, 572 + size: 94, 75 + orig: 94, 75 + offset: 0, 0 + index: -1 unit-zenith-full rotate: false xy: 163, 67 @@ -5361,7 +5389,7 @@ unit-zenith-full index: -1 wave rotate: false - xy: 2206, 31 + xy: 3352, 457 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -5389,147 +5417,147 @@ zenith-wreck2 index: -1 item-blast-compound rotate: false - xy: 2391, 227 + xy: 3318, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 2425, 227 + xy: 3386, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 2459, 227 + xy: 3454, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 2493, 227 + xy: 3522, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 2527, 227 + xy: 3590, 215 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 2561, 261 + xy: 3590, 181 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 2598, 299 + xy: 2499, 181 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 2666, 303 + xy: 2567, 181 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 2391, 193 + xy: 2472, 113 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 2459, 193 + xy: 2472, 79 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 2527, 193 + xy: 2540, 147 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 2598, 265 + xy: 2506, 79 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod rotate: false - xy: 2595, 231 + xy: 2506, 45 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 2700, 277 + xy: 2506, 11 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 2734, 247 + xy: 2540, 11 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 2802, 235 + xy: 2574, 113 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 2836, 227 + xy: 2608, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 2904, 219 + xy: 2608, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 3006, 219 + xy: 2676, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 2700, 209 + xy: 2676, 15 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blank rotate: false - xy: 2357, 322 + xy: 509, 631 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -5543,21 +5571,21 @@ circle index: -1 shape-3 rotate: false - xy: 2257, 164 + xy: 3484, 458 size: 63, 63 orig: 63, 63 offset: 0, 0 index: -1 alpha rotate: false - xy: 2762, 471 + xy: 1545, 893 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-cell rotate: false - xy: 2812, 471 + xy: 2578, 471 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5592,7 +5620,7 @@ chaos-array index: -1 arkyid-cell rotate: false - xy: 509, 645 + xy: 1796, 506 size: 88, 64 orig: 88, 64 offset: 0, 0 @@ -5606,14 +5634,14 @@ arkyid-foot index: -1 arkyid-joint-base rotate: false - xy: 2026, 355 + xy: 3117, 597 size: 70, 70 orig: 70, 70 offset: 0, 0 index: -1 arkyid-leg rotate: false - xy: 2272, 56 + xy: 663, 39 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -5625,30 +5653,23 @@ arkyid-leg-base orig: 104, 64 offset: 0, 0 index: -1 -arkyid-old - rotate: false - xy: 1745, 583 - size: 88, 64 - orig: 88, 64 - offset: 0, 0 - index: -1 atrax rotate: false - xy: 1835, 583 + xy: 1796, 440 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 atrax-base rotate: false - xy: 2098, 361 + xy: 3189, 603 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 atrax-cell rotate: false - xy: 1925, 583 + xy: 1886, 506 size: 88, 64 orig: 88, 64 offset: 0, 0 @@ -5669,28 +5690,28 @@ atrax-joint index: -1 atrax-leg rotate: false - xy: 1501, 1041 + xy: 967, 1731 size: 36, 26 orig: 36, 26 offset: 0, 0 index: -1 atrax-leg-base rotate: false - xy: 3448, 429 + xy: 1097, 535 size: 36, 26 orig: 36, 26 offset: 0, 0 index: -1 beta rotate: false - xy: 2272, 6 + xy: 2828, 471 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 beta-cell rotate: false - xy: 2248, 409 + xy: 2380, 355 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5718,49 +5739,49 @@ chaos-array-leg index: -1 crawler rotate: false - xy: 2298, 409 + xy: 2430, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-base rotate: false - xy: 2348, 413 + xy: 2430, 363 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-cell rotate: false - xy: 2398, 413 + xy: 2430, 313 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-leg rotate: false - xy: 2448, 413 + xy: 2480, 417 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger rotate: false - xy: 3636, 373 + xy: 2530, 367 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 3660, 481 + xy: 2530, 317 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 3686, 431 + xy: 2580, 421 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5809,7 +5830,7 @@ eradicator-leg index: -1 flare rotate: false - xy: 2898, 421 + xy: 2630, 321 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5823,7 +5844,7 @@ fortress index: -1 fortress-base rotate: false - xy: 3183, 779 + xy: 3249, 919 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -5844,14 +5865,14 @@ fortress-leg index: -1 gamma rotate: false - xy: 723, 30 + xy: 2322, 261 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 gamma-cell rotate: false - xy: 781, 30 + xy: 2002, 4 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -5865,35 +5886,35 @@ horizon index: -1 horizon-cell rotate: false - xy: 3305, 1117 + xy: 2140, 416 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 mace rotate: false - xy: 3283, 1043 + xy: 3249, 787 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-base rotate: false - xy: 3283, 977 + xy: 3381, 853 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-cell rotate: false - xy: 3349, 1051 + xy: 3315, 787 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mace-leg rotate: false - xy: 3349, 985 + xy: 3381, 787 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -5914,63 +5935,63 @@ mega-cell index: -1 mono rotate: false - xy: 3448, 365 + xy: 3380, 349 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-cell rotate: false - xy: 3498, 365 + xy: 3430, 349 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 nova rotate: false - xy: 3254, 457 + xy: 837, 30 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-base rotate: false - xy: 3598, 323 + xy: 3430, 299 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 nova-cell rotate: false - xy: 3312, 457 + xy: 3609, 465 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-leg rotate: false - xy: 2372, 6 + xy: 3480, 349 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 poly rotate: false - xy: 3544, 465 + xy: 3154, 413 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly-cell rotate: false - xy: 3602, 473 + xy: 3212, 399 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 power-cell rotate: false - xy: 2422, 463 + xy: 3444, 399 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -5984,7 +6005,7 @@ pulsar index: -1 pulsar-base rotate: false - xy: 2898, 321 + xy: 3480, 299 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5998,84 +6019,126 @@ pulsar-cell index: -1 pulsar-leg rotate: false - xy: 3383, 647 + xy: 3453, 589 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 quasar rotate: false - xy: 1796, 369 + xy: 2066, 490 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-base rotate: false - xy: 1968, 501 + xy: 2148, 490 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-cell rotate: false - xy: 1796, 287 + xy: 1976, 424 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 quasar-leg rotate: false - xy: 2050, 501 + xy: 4003, 1515 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 +spiroct + rotate: false + xy: 509, 634 + size: 94, 75 + orig: 94, 75 + offset: 0, 0 + index: -1 +spiroct-cell + rotate: false + xy: 1745, 572 + size: 94, 75 + orig: 94, 75 + offset: 0, 0 + index: -1 +spiroct-foot + rotate: false + xy: 1501, 1063 + size: 46, 46 + orig: 46, 46 + offset: 0, 0 + index: -1 +spiroct-joint + rotate: false + xy: 3817, 871 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +spiroct-leg + rotate: false + xy: 3501, 1203 + size: 48, 34 + orig: 48, 34 + offset: 0, 0 + index: -1 +spiroct-leg-base + rotate: false + xy: 2323, 167 + size: 48, 34 + orig: 48, 34 + offset: 0, 0 + index: -1 vanguard rotate: false - xy: 3598, 273 + xy: 2338, 17 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 vanguard-cell rotate: false - xy: 3648, 281 + xy: 2830, 271 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 antumbra-missiles rotate: false - xy: 3012, 471 + xy: 2778, 471 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 artillery rotate: false - xy: 3062, 463 + xy: 2380, 405 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 beam-weapon rotate: false - xy: 1886, 501 + xy: 1886, 358 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 chaos rotate: false - xy: 3547, 1019 + xy: 2322, 319 size: 56, 136 orig: 56, 136 offset: 0, 0 index: -1 eclipse-weapon rotate: false - xy: 2698, 417 + xy: 2580, 321 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -6089,105 +6152,119 @@ eradication index: -1 eruption rotate: false - xy: 2330, 56 + xy: 2730, 413 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 flakgun rotate: false - xy: 2798, 421 + xy: 2680, 371 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flamethrower rotate: false - xy: 2848, 413 + xy: 2780, 413 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 heal-shotgun-weapon rotate: false - xy: 3098, 413 + xy: 2880, 421 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 heal-weapon rotate: false - xy: 3148, 429 + xy: 2780, 363 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 heal-weapon-mount rotate: false - xy: 3198, 429 + xy: 2830, 371 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 large-weapon rotate: false - xy: 3098, 363 + xy: 3080, 315 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles rotate: false - xy: 3348, 307 + xy: 3280, 349 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles-mount rotate: false - xy: 3398, 307 + xy: 3330, 349 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +mount-purple-weapon + rotate: false + xy: 3330, 299 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mount-weapon rotate: false - xy: 3548, 315 + xy: 3380, 299 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-basic-weapon rotate: false - xy: 3048, 313 + xy: 3580, 357 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-mount-weapon rotate: false - xy: 3098, 313 + xy: 3580, 307 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-weapon rotate: false - xy: 3148, 279 + xy: 3630, 357 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 +spiroct-weapon + rotate: false + xy: 3580, 249 + size: 48, 56 + orig: 48, 56 + offset: 0, 0 + index: -1 weapon rotate: false - xy: 3698, 281 + xy: 2880, 271 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 zenith-missiles rotate: false - xy: 3448, 215 + xy: 2930, 271 size: 48, 48 orig: 48, 48 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 373c3f99ef..5850b6cf32 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png index 6d7cbaf94d..33652412a6 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index abbb25d80d..0b2c5e26cf 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -266,6 +266,7 @@ public class UnitTypes implements ContentList{ legLength = 9f; legTrns = 0.6f; legMoveSpace = 1.4f; + hovering = true; weapons.add(new Weapon("eruption"){{ shootY = 3f; @@ -281,37 +282,61 @@ public class UnitTypes implements ContentList{ drag = 0.01f; shootEffect = Fx.shootSmall; lifetime = 56f; + collidesAir = false; }}; }}); }}; - //TODO this is just a clone spiroct = new UnitType("spiroct"){{ speed = 0.4f; drag = 0.4f; hitsize = 10f; rotateSpeed = 3f; - targetAir = false; health = 600; immunities = ObjectSet.with(StatusEffects.burning, StatusEffects.melting); legCount = 6; - legLength = 11f; - legTrns = 0.6f; + legLength = 13f; + legTrns = 0.7f; legMoveSpace = 1.4f; + legBaseOffset = 2f; + hovering = true; - weapons.add(new Weapon("eruption"){{ - shootY = 3f; - reload = 10f; + weapons.add(new Weapon("spiroct-weapon"){{ + shootY = 4f; + reload = 15f; ejectEffect = Fx.none; - recoil = 1f; - x = 7f; + recoil = 2f; + rotate = true; shootSound = Sounds.flame; - bullet = new LiquidBulletType(Liquids.slag){{ - damage = 11; - speed = 2.3f; - drag = 0.02f; + x = 8.5f; + y = -1.5f; + + bullet = new SapBulletType(){{ + length = 75f; + damage = 14; shootEffect = Fx.shootSmall; + hitColor = color = Color.valueOf("bf92f9"); + despawnEffect = Fx.none; + width = 0.54f; + lifetime = 35f; + }}; + }}); + + weapons.add(new Weapon("mount-purple-weapon"){{ + reload = 20f; + rotate = true; + x = 4f; + y = 3f; + + bullet = new SapBulletType(){{ + length = 40f; + damage = 9; + shootEffect = Fx.shootSmall; + hitColor = color = Color.valueOf("bf92f9"); + despawnEffect = Fx.none; + width = 0.4f; + lifetime = 25f; }}; }}); }}; diff --git a/core/src/mindustry/entities/Damage.java b/core/src/mindustry/entities/Damage.java index 7bf8c5b9ef..7e2f977871 100644 --- a/core/src/mindustry/entities/Damage.java +++ b/core/src/mindustry/entities/Damage.java @@ -26,6 +26,8 @@ public class Damage{ private static GridBits bits = new GridBits(30, 30); private static IntQueue propagation = new IntQueue(); private static IntSet collidedBlocks = new IntSet(); + private static Building tmpBuilding; + private static Unit tmpUnit; /** Creates a dynamic explosion based on specified parameters. */ public static void dynamicExplosion(float x, float y, float flammability, float explosiveness, float power, float radius, Color color){ @@ -88,7 +90,7 @@ public class Damage{ if(tile != null && !collidedBlocks.contains(tile.pos()) && tile.team() != team && tile.collide(hitter)){ tile.collision(hitter); collidedBlocks.add(tile.pos()); - hitter.type().hit(hitter, tile.x, tile.y); + hitter.type.hit(hitter, tile.x, tile.y); } }; @@ -146,6 +148,73 @@ public class Damage{ Units.nearbyEnemies(team, rect, cons); } + /** + * Casts forward in a line. + * @return the first encountered object. + */ + public static Healthc linecast(Bullet hitter, float x, float y, float angle, float length){ + tr.trns(angle, length); + + if(hitter.type.collidesGround){ + tmpBuilding = null; + + world.raycastEachWorld(x, y, x + tr.x, y + tr.y, (cx, cy) -> { + Building tile = world.ent(cx, cy); + if(tile != null && tile.team != hitter.team){ + tmpBuilding = tile; + //TODO return tile + return true; + } + return false; + }); + + if(tmpBuilding != null) return tmpBuilding; + } + + rect.setPosition(x, y).setSize(tr.x, tr.y); + float x2 = tr.x + x, y2 = tr.y + y; + + if(rect.width < 0){ + rect.x += rect.width; + rect.width *= -1; + } + + if(rect.height < 0){ + rect.y += rect.height; + rect.height *= -1; + } + + float expand = 3f; + + rect.y -= expand; + rect.x -= expand; + rect.width += expand * 2; + rect.height += expand * 2; + + tmpUnit = null; + + Cons cons = e -> { + if((tmpUnit != null && e.dst2(x, y) > tmpUnit.dst2(x, y)) || !e.checkTarget(hitter.type.collidesAir, hitter.type.collidesGround)) return; + + e.hitbox(hitrect); + Rect other = hitrect; + other.y -= expand; + other.x -= expand; + other.width += expand * 2; + other.height += expand * 2; + + Vec2 vec = Geometry.raycastRect(x, y, x2, y2, other); + + if(vec != null){ + tmpUnit = e; + } + }; + + Units.nearbyEnemies(hitter.team, rect, cons); + + return tmpUnit; + } + /** Damages all entities and blocks in a radius that are enemies of the team. */ public static void damageUnits(Team team, float x, float y, float size, float damage, Boolf predicate, Cons acceptor){ Cons cons = entity -> { diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java index 1f89c77a3e..460aa9608c 100644 --- a/core/src/mindustry/entities/bullet/BulletType.java +++ b/core/src/mindustry/entities/bullet/BulletType.java @@ -162,7 +162,7 @@ public abstract class BulletType extends Content{ } public void despawned(Bullet b){ - despawnEffect.at(b.x, b.y, b.rotation()); + despawnEffect.at(b.x, b.y, b.rotation(), hitColor); hitSound.at(b); if(fragBullet != null || splashDamageRadius > 0 || lightning > 0){ @@ -237,16 +237,16 @@ public abstract class BulletType extends Content{ public Bullet create(@Nullable Entityc owner, Team team, float x, float y, float angle, float damage, float velocityScl, float lifetimeScl, Object data){ Bullet bullet = Bullet.create(); - bullet.type(this); - bullet.owner(owner); - bullet.team(team); + bullet.type = this; + bullet.owner = owner; + bullet.team = team; bullet.vel.trns(angle, speed * velocityScl); bullet.set(x - bullet.vel.x * Time.delta(), y - bullet.vel.y * Time.delta()); - bullet.lifetime(lifetime * lifetimeScl); - bullet.data(data); - bullet.drag(drag); - bullet.hitSize(hitSize); - bullet.damage(damage < 0 ? this.damage : damage); + bullet.lifetime = lifetime * lifetimeScl; + bullet.data = data; + bullet.drag = drag; + bullet.hitSize = hitSize; + bullet.damage = damage < 0 ? this.damage : damage; bullet.add(); if(keepVelocity && owner instanceof Hitboxc) bullet.vel.add(((Hitboxc)owner).deltaX(), ((Hitboxc)owner).deltaY()); diff --git a/core/src/mindustry/entities/bullet/SapBulletType.java b/core/src/mindustry/entities/bullet/SapBulletType.java new file mode 100644 index 0000000000..e3007ac0f1 --- /dev/null +++ b/core/src/mindustry/entities/bullet/SapBulletType.java @@ -0,0 +1,80 @@ +package mindustry.entities.bullet; + +import arc.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.math.geom.*; +import arc.util.*; +import mindustry.content.*; +import mindustry.entities.*; +import mindustry.gen.*; +import mindustry.graphics.*; + +public class SapBulletType extends BulletType{ + public float length = 100f; + public float sapStrength = 0.5f; + public Color color = Color.white.cpy(); + public float width = 0.4f; + + public SapBulletType(){ + speed = 0.0001f; + despawnEffect = Fx.none; + pierce = true; + hitSize = 0f; + hittable = false; + hitEffect = Fx.hitLiquid; + } + + @Override + public void draw(Bullet b){ + if(b.data instanceof Position){ + Position data = (Position)b.data; + Tmp.v1.set(data).lerp(b, b.fin()); + + Draw.color(color); + Drawf.laser(b.team, Core.atlas.find("laser"), Core.atlas.find("laser-end"), + b.x, b.y, Tmp.v1.x, Tmp.v1.y, width * b.fout()); + + Draw.reset(); + + Drawf.light(b.team, b.x, b.y, b.x + Tmp.v1.x, b.y + Tmp.v1.y, 15f * b.fout(), lightColor, 0.6f); + } + } + + @Override + public float range(){ + return length; + } + + @Override + public void init(Bullet b){ + super.init(b); + + Healthc target = Damage.linecast(b, b.x, b.y, b.rotation(), length); + b.data = target; + + if(target != null){ + float result = Math.min(target.health(), damage); + + if(b.owner instanceof Healthc){ + ((Healthc)b.owner).heal(result * sapStrength); + } + } + + if(target instanceof Hitboxc){ + Hitboxc hit = (Hitboxc)target; + + hit.collision(b, hit.x(), hit.y()); + b.collision(hit, hit.x(), hit.y()); + }else if(target instanceof Building){ + Building tile = (Building)target; + + if(tile.collide(b)){ + tile.collision(b); + hit(b, tile.x, tile.y); + } + }else{ + b.data = new Vec2().trns(b.rotation(), length).add(b.x, b.y); + } + } +} diff --git a/core/src/mindustry/entities/comp/FlyingComp.java b/core/src/mindustry/entities/comp/FlyingComp.java index 202ac6d4b5..68dd062da8 100644 --- a/core/src/mindustry/entities/comp/FlyingComp.java +++ b/core/src/mindustry/entities/comp/FlyingComp.java @@ -19,6 +19,7 @@ abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{ @SyncLocal float elevation; private transient boolean wasFlying; + transient boolean hovering; transient float drownTime; transient float splashTimer; @@ -35,7 +36,7 @@ abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{ } boolean canDrown(){ - return isGrounded(); + return isGrounded() && !hovering; } void landed(){ @@ -54,7 +55,7 @@ abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{ } float floorSpeedMultiplier(){ - Floor on = isFlying() ? Blocks.air.asFloor() : floorOn(); + Floor on = isFlying() || hovering ? Blocks.air.asFloor() : floorOn(); return on.speedMultiplier; } @@ -72,7 +73,7 @@ abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{ wasFlying = isFlying(); } - if(isGrounded() && floor.isLiquid){ + if(!hovering && isGrounded() && floor.isLiquid){ if((splashTimer += Mathf.dst(deltaX(), deltaY())) >= 7f){ floor.walkEffect.at(x, y, 1f, floor.mapColor); splashTimer = 0f; diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java index faa5643029..b9b6b7e6e5 100644 --- a/core/src/mindustry/entities/comp/UnitComp.java +++ b/core/src/mindustry/entities/comp/UnitComp.java @@ -25,6 +25,7 @@ import static mindustry.Vars.*; @Component(base = true) abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, Itemsc, Rotc, Unitc, Weaponsc, Drawc, Boundedc, Syncc, Shieldc, Displayable{ + @Import boolean hovering; @Import float x, y, rotation, elevation, maxHealth, drag, armor, hitSize, health; @Import boolean dead; @Import Team team; @@ -124,6 +125,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I this.elevation = type.flying ? 1f : type.baseElevation; this.armor = type.armor; this.hitSize = type.hitsize; + this.hovering = type.hovering; if(controller == null) controller(type.createController()); if(mounts().length != type.weapons.size) setupWeapons(type); diff --git a/core/src/mindustry/entities/comp/WeaponsComp.java b/core/src/mindustry/entities/comp/WeaponsComp.java index 9659469281..d815a4d02a 100644 --- a/core/src/mindustry/entities/comp/WeaponsComp.java +++ b/core/src/mindustry/entities/comp/WeaponsComp.java @@ -17,7 +17,7 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc{ @Import float x, y, rotation; /** minimum cursor distance from unit, fixes 'cross-eyed' shooting */ - static final float minAimDst = 20f; + static final float minAimDst = 18f; /** temporary weapon sequence number */ static int sequenceNum = 0; @@ -93,11 +93,10 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc{ //rotate if applicable if(weapon.rotate && (mount.rotate || mount.shoot)){ - float axisXOffset = weapon.x; - float axisX = this.x + Angles.trnsx(rotation, axisXOffset, weapon.y), - axisY = this.y + Angles.trnsy(rotation, axisXOffset, weapon.y); + float axisX = this.x + Angles.trnsx(rotation - 90, weapon.x, weapon.y), + axisY = this.y + Angles.trnsy(rotation - 90, weapon.x, weapon.y); - mount.targetRotation = Angles.angle(axisX, axisY, mount.aimX, mount.aimY) - rotation(); + mount.targetRotation = Angles.angle(axisX, axisY, mount.aimX, mount.aimY) - rotation; mount.rotation = Angles.moveToward(mount.rotation, mount.targetRotation, weapon.rotateSpeed * Time.delta()); }else{ mount.rotation = 0; diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java index a2fea83cc9..68fe8b32de 100644 --- a/core/src/mindustry/input/DesktopInput.java +++ b/core/src/mindustry/input/DesktopInput.java @@ -572,7 +572,7 @@ public class DesktopInput extends InputHandler{ boolean boosted = (unit instanceof Mechc && unit.isFlying()); movement.set(xa, ya).nor().scl(speed); - float mouseAngle = Angles.mouseAngle(unit.x(), unit.y()); + float mouseAngle = Angles.mouseAngle(unit.x, unit.y); boolean aimCursor = omni && player.shooting && unit.type().hasWeapons() && unit.type().faceTarget && !boosted && unit.type().rotateShooting; if(aimCursor){ @@ -586,7 +586,7 @@ public class DesktopInput extends InputHandler{ if(omni){ unit.moveAt(movement); }else{ - unit.moveAt(Tmp.v2.trns(unit.rotation(), movement.len())); + unit.moveAt(Tmp.v2.trns(unit.rotation, movement.len())); if(!movement.isZero() && legs){ unit.vel().rotateTo(movement.angle(), unit.type().rotateSpeed * Time.delta()); } diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index 55c22cb37a..62817030ef 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -48,6 +48,7 @@ public class UnitType extends UnlockableContent{ public int commandLimit = 24; public float baseElevation = 0f; public float deathShake = 2f; + public boolean hovering = false; public Effect fallEffect = Fx.fallSmoke; public Effect fallThrusterEffect = Fx.fallSmoke; public Seq abilities = new Seq<>();