diff --git a/core/assets-raw/sprites/units/pulsar-base.png b/core/assets-raw/sprites/units/pulsar-base.png index 61fb31cf47..f076436987 100644 Binary files a/core/assets-raw/sprites/units/pulsar-base.png and b/core/assets-raw/sprites/units/pulsar-base.png differ diff --git a/core/assets-raw/sprites/units/pulsar-cell.png b/core/assets-raw/sprites/units/pulsar-cell.png index 8930e79cf5..9268d38651 100644 Binary files a/core/assets-raw/sprites/units/pulsar-cell.png and b/core/assets-raw/sprites/units/pulsar-cell.png differ diff --git a/core/assets-raw/sprites/units/pulsar-leg.png b/core/assets-raw/sprites/units/pulsar-leg.png index d1f2fae6d6..9d3a4ec2af 100644 Binary files a/core/assets-raw/sprites/units/pulsar-leg.png and b/core/assets-raw/sprites/units/pulsar-leg.png differ diff --git a/core/assets-raw/sprites/units/quasar-cell.png b/core/assets-raw/sprites/units/quasar-cell.png index 1ee9c9c5fc..d15d720349 100644 Binary files a/core/assets-raw/sprites/units/quasar-cell.png and b/core/assets-raw/sprites/units/quasar-cell.png differ diff --git a/core/assets/sprites/fallback/sprites.atlas b/core/assets/sprites/fallback/sprites.atlas index a070946cc5..41e88ed35f 100644 --- a/core/assets/sprites/fallback/sprites.atlas +++ b/core/assets/sprites/fallback/sprites.atlas @@ -537,14 +537,14 @@ mend-projector-top index: -1 mender rotate: false - xy: 1557, 361 + xy: 1303, 115 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mender-top rotate: false - xy: 1591, 361 + xy: 1337, 149 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -565,7 +565,7 @@ overdrive-projector-top index: -1 shock-mine rotate: false - xy: 1811, 467 + xy: 1507, 87 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -586,497 +586,497 @@ block-unloader index: -1 bridge-arrow rotate: false - xy: 1923, 773 + xy: 1201, 175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 1957, 807 + xy: 1167, 73 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 1957, 773 + xy: 1201, 73 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 1957, 739 + xy: 1407, 699 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 center rotate: false - xy: 1957, 705 + xy: 1441, 699 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-0 rotate: false - xy: 507, 1 + xy: 1051, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-armored-conveyor-full rotate: false - xy: 507, 1 + xy: 1051, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-1 rotate: false - xy: 1979, 1591 + xy: 473, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-2 rotate: false - xy: 1233, 541 + xy: 507, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-3 rotate: false - xy: 1, 3 + xy: 1979, 1591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-0 rotate: false - xy: 35, 3 + xy: 1233, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-1 rotate: false - xy: 69, 3 + xy: 1, 3 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-2 rotate: false - xy: 2013, 1591 + xy: 1267, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-3 rotate: false - xy: 2005, 1557 + xy: 35, 3 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-0 rotate: false - xy: 2005, 1523 + xy: 1301, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-1 rotate: false - xy: 2005, 1489 + xy: 69, 3 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-2 rotate: false - xy: 2005, 1455 + xy: 1335, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-3 rotate: false - xy: 2005, 1421 + xy: 2013, 1591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-0 rotate: false - xy: 207, 5 + xy: 2005, 1557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-1 rotate: false - xy: 1275, 583 + xy: 2005, 1523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-2 rotate: false - xy: 1309, 591 + xy: 2005, 1489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-3 rotate: false - xy: 1343, 591 + xy: 2005, 1455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-0 rotate: false - xy: 1377, 591 + xy: 2005, 1421 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-1 rotate: false - xy: 1411, 591 + xy: 207, 5 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-2 rotate: false - xy: 1445, 591 + xy: 1175, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-3 rotate: false - xy: 1479, 591 + xy: 1175, 515 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 1445, 557 + xy: 1379, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 1479, 557 + xy: 1379, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 1513, 557 + xy: 1379, 421 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 1301, 523 + xy: 1379, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 1335, 523 + xy: 1379, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 1369, 523 + xy: 1379, 319 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 1403, 523 + xy: 1379, 285 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 1437, 523 + xy: 1475, 699 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 1471, 523 + xy: 1959, 947 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 1505, 523 + xy: 1993, 947 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 1301, 489 + xy: 1984, 913 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 1335, 489 + xy: 1984, 879 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 1369, 489 + xy: 1994, 845 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 1403, 489 + xy: 1994, 811 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 1437, 489 + xy: 679, 13 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 1471, 489 + xy: 713, 13 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 1505, 489 + xy: 747, 13 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 1551, 599 + xy: 781, 13 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 1585, 600 + xy: 815, 13 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor rotate: false - xy: 1891, 637 + xy: 1269, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-0 rotate: false - xy: 1925, 637 + xy: 1303, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-1 rotate: false - xy: 1653, 603 + xy: 1337, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-2 rotate: false - xy: 1687, 603 + xy: 1371, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-edge rotate: false - xy: 1721, 603 + xy: 1201, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-stack rotate: false - xy: 1755, 603 + xy: 1201, 5 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 1761, 399 + xy: 1661, 757 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 1795, 433 + xy: 1695, 791 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 1727, 331 + xy: 1661, 723 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 1761, 365 + xy: 1695, 757 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 1795, 399 + xy: 1729, 791 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 1829, 433 + xy: 1695, 723 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 1761, 331 + xy: 1729, 757 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 1795, 365 + xy: 1763, 791 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 1829, 399 + xy: 1729, 723 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 1863, 433 + xy: 1763, 757 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 1795, 331 + xy: 1797, 791 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 1829, 365 + xy: 1763, 723 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 1863, 399 + xy: 1797, 757 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 1897, 433 + xy: 1831, 791 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 1829, 331 + xy: 1797, 723 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 1863, 365 + xy: 1831, 757 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 1897, 399 + xy: 1865, 791 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 1863, 331 + xy: 1831, 723 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1897, 365 + xy: 1865, 757 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cross rotate: false - xy: 1855, 671 + xy: 1403, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1090,14 +1090,14 @@ distributor index: -1 inverted-sorter rotate: false - xy: 1607, 497 + xy: 1413, 427 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction rotate: false - xy: 1523, 421 + xy: 1413, 257 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1139,7 +1139,7 @@ mass-driver-base index: -1 overflow-gate rotate: false - xy: 1659, 362 + xy: 1303, 81 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1167,49 +1167,49 @@ payload-router-over index: -1 phase-conveyor rotate: false - xy: 1721, 637 + xy: 1371, 81 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 1755, 637 + xy: 1525, 723 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 1789, 637 + xy: 1559, 723 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 1823, 637 + xy: 1593, 723 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 1709, 501 + xy: 1439, 121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 1879, 535 + xy: 1507, 53 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 underflow-gate rotate: false - xy: 1931, 399 + xy: 1899, 757 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1356,63 +1356,63 @@ pneumatic-drill-top index: -1 water-extractor rotate: false - xy: 1893, 933 + xy: 1233, 867 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 1233, 867 + xy: 1299, 867 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 1299, 867 + xy: 1365, 867 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 1365, 867 + xy: 1431, 867 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-border rotate: false - xy: 1585, 634 + xy: 1175, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-middle rotate: false - xy: 1753, 841 + xy: 1311, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-select rotate: false - xy: 1889, 841 + xy: 1345, 319 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 1267, 541 + xy: 1593, 791 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 message rotate: false - xy: 1625, 361 + xy: 1371, 183 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1426,161 +1426,161 @@ place-arrow index: -1 bridge-conduit rotate: false - xy: 1889, 705 + xy: 1167, 141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 1923, 739 + xy: 1201, 141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 1923, 739 + xy: 1201, 141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 1923, 705 + xy: 1167, 107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 1957, 841 + xy: 1201, 107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 1991, 777 + xy: 1525, 791 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 1991, 743 + xy: 1525, 757 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 1991, 709 + xy: 1559, 791 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 1233, 507 + xy: 1559, 757 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 1233, 507 + xy: 1559, 757 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 1233, 507 + xy: 1559, 757 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 1267, 507 + xy: 1593, 757 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 1309, 557 + xy: 1375, 641 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 1343, 557 + xy: 1369, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 1377, 557 + xy: 1379, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 1377, 557 + xy: 1379, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 1411, 557 + xy: 1379, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 1625, 429 + xy: 1515, 257 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate rotate: false - xy: 1591, 395 + xy: 1269, 217 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate-top rotate: false - xy: 1625, 395 + xy: 1235, 149 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 1659, 396 + xy: 1269, 183 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 1183, 431 + xy: 1303, 217 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 1217, 431 + xy: 1235, 115 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1608,133 +1608,133 @@ liquid-tank-top index: -1 mechanical-pump rotate: false - xy: 1455, 387 + xy: 1337, 183 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-pump-liquid rotate: false - xy: 1489, 387 + xy: 1371, 217 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-liquid rotate: false - xy: 1489, 387 + xy: 1371, 217 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-liquid rotate: false - xy: 1489, 387 + xy: 1371, 217 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 1659, 328 + xy: 1337, 115 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 1619, 607 + xy: 1371, 149 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 1653, 637 + xy: 1337, 81 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 1687, 637 + xy: 1371, 115 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-cap rotate: false - xy: 1823, 603 + xy: 1269, 13 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-0 rotate: false - xy: 1857, 603 + xy: 1303, 13 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-1 rotate: false - xy: 1891, 603 + xy: 1337, 13 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-2 rotate: false - xy: 1925, 603 + xy: 1371, 13 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-3 rotate: false - xy: 1649, 569 + xy: 1405, 217 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-4 rotate: false - xy: 1683, 569 + xy: 1405, 183 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 1819, 569 + xy: 1405, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1853, 569 + xy: 1405, 13 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1887, 569 + xy: 1439, 223 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 1921, 569 + xy: 1439, 189 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 1189, 1011 + xy: 1255, 999 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1748,7 +1748,7 @@ thermal-pump index: -1 battery rotate: false - xy: 1513, 591 + xy: 1175, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1769,21 +1769,21 @@ battery-large-top index: -1 battery-top rotate: false - xy: 2005, 1167 + xy: 1175, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 1991, 845 + xy: 1491, 783 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 1991, 811 + xy: 1491, 749 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1811,28 +1811,28 @@ differential-generator-top index: -1 diode rotate: false - xy: 1889, 671 + xy: 1437, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 diode-arrow rotate: false - xy: 1923, 671 + xy: 1471, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator rotate: false - xy: 1573, 531 + xy: 1447, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator-top rotate: false - xy: 1573, 497 + xy: 1413, 461 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1888,7 +1888,7 @@ impact-reactor-plasma-3 index: -1 power-node rotate: false - xy: 1717, 569 + xy: 1405, 149 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1902,35 +1902,35 @@ power-node-large index: -1 power-source rotate: false - xy: 1751, 569 + xy: 1405, 115 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 1785, 569 + xy: 1405, 81 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 1255, 999 + xy: 1321, 999 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 1743, 535 + xy: 1473, 155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 1845, 501 + xy: 1473, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1944,14 +1944,14 @@ solar-panel-large index: -1 surge-tower rotate: false - xy: 1167, 945 + xy: 1167, 879 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 1299, 933 + xy: 1365, 933 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1979,35 +1979,35 @@ thorium-reactor-top index: -1 turbine-generator rotate: false - xy: 1497, 933 + xy: 1563, 933 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-cap rotate: false - xy: 1563, 933 + xy: 1629, 933 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-top rotate: false - xy: 1629, 933 + xy: 1695, 933 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-turbine0 rotate: false - xy: 1695, 933 + xy: 1761, 933 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-turbine1 rotate: false - xy: 1761, 933 + xy: 1827, 933 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2119,21 +2119,21 @@ graphite-press index: -1 incinerator rotate: false - xy: 1607, 531 + xy: 1447, 495 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 1455, 455 + xy: 1515, 427 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 1489, 421 + xy: 1379, 251 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2161,21 +2161,21 @@ silicon-smelter-top index: -1 liquid-source rotate: false - xy: 1319, 387 + xy: 1337, 217 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-void rotate: false - xy: 1353, 387 + xy: 1235, 81 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 1523, 387 + xy: 1269, 81 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2224,42 +2224,42 @@ plastanium-compressor-top index: -1 pulverizer rotate: false - xy: 1675, 535 + xy: 1473, 223 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 1675, 501 + xy: 1439, 155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 835, 113 + xy: 835, 47 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator rotate: false - xy: 867, 377 + xy: 867, 311 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 867, 311 + xy: 901, 245 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-spinner rotate: false - xy: 901, 245 + xy: 901, 179 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2280,126 +2280,126 @@ silicon-crucible-top index: -1 silicon-smelter rotate: false - xy: 901, 179 + xy: 901, 113 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press rotate: false - xy: 901, 113 + xy: 901, 47 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame0 rotate: false - xy: 901, 47 + xy: 1035, 999 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame1 rotate: false - xy: 1035, 999 + xy: 1035, 933 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame2 rotate: false - xy: 1035, 933 + xy: 1101, 965 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-liquid rotate: false - xy: 1101, 965 + xy: 1101, 899 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-top rotate: false - xy: 1101, 899 + xy: 1167, 945 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rock1 rotate: false - xy: 1517, 717 + xy: 1157, 729 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rock2 rotate: false - xy: 1567, 718 + xy: 1157, 679 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-boulder1 rotate: false - xy: 1709, 467 + xy: 1507, 189 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-boulder2 rotate: false - xy: 1743, 501 + xy: 1439, 87 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder1 rotate: false - xy: 1811, 501 + xy: 1439, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder2 rotate: false - xy: 1845, 535 + xy: 1473, 53 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrock1 rotate: false - xy: 1267, 667 + xy: 1207, 767 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snowrock2 rotate: false - xy: 1317, 667 + xy: 1307, 817 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-cluster1 rotate: false - xy: 1191, 575 + xy: 1133, 335 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster2 rotate: false - xy: 1191, 533 + xy: 1133, 293 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster3 rotate: false - xy: 1233, 575 + xy: 1191, 583 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -2448,14 +2448,14 @@ core-shard-team index: -1 unloader rotate: false - xy: 1931, 365 + xy: 1933, 791 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader-center rotate: false - xy: 1931, 331 + xy: 1899, 723 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2469,14 +2469,14 @@ vault index: -1 arc-heat rotate: false - xy: 473, 1 + xy: 1017, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-1 rotate: false - xy: 2005, 1133 + xy: 1175, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2504,7 +2504,7 @@ block-4 index: -1 hail-heat rotate: false - xy: 1109, 1 + xy: 1159, 1 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -2532,35 +2532,35 @@ ripple-heat index: -1 salvo-heat rotate: false - xy: 1387, 999 + xy: 1453, 999 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 1453, 999 + xy: 1519, 999 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 1519, 999 + xy: 1585, 999 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch-heat rotate: false - xy: 1743, 467 + xy: 1507, 155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 1497, 867 + xy: 1563, 867 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2658,28 +2658,28 @@ naval-factory index: -1 rally-point rotate: false - xy: 835, 47 + xy: 1123, 1031 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 repair-point-base rotate: false - xy: 1675, 467 + xy: 1507, 223 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 resupply-point rotate: false - xy: 1123, 1031 + xy: 1189, 1011 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 copper-wall rotate: false - xy: 1547, 565 + xy: 849, 13 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2693,7 +2693,7 @@ copper-wall-large index: -1 door rotate: false - xy: 1957, 671 + xy: 1413, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2714,14 +2714,14 @@ door-large-open index: -1 door-open rotate: false - xy: 1991, 675 + xy: 1413, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 1857, 637 + xy: 1235, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2735,7 +2735,7 @@ phase-wall-large index: -1 plastanium-wall rotate: false - xy: 1789, 603 + xy: 1235, 13 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2770,84 +2770,84 @@ scrap-wall-huge3 index: -1 scrap-wall-large1 rotate: false - xy: 1651, 999 + xy: 1717, 999 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large2 rotate: false - xy: 1717, 999 + xy: 1783, 999 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large3 rotate: false - xy: 1783, 999 + xy: 1849, 999 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large4 rotate: false - xy: 1849, 999 + xy: 1915, 999 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall2 rotate: false - xy: 1777, 501 + xy: 1439, 53 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 1811, 535 + xy: 1473, 87 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 1777, 467 + xy: 1507, 121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 1777, 467 + xy: 1507, 121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 1693, 331 + xy: 569, 1401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large rotate: false - xy: 1167, 879 + xy: 1233, 933 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 1727, 365 + xy: 1661, 791 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 1365, 933 + xy: 1431, 933 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2861,14 +2861,14 @@ thruster index: -1 titanium-wall rotate: false - xy: 1897, 331 + xy: 1899, 791 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large rotate: false - xy: 1431, 933 + xy: 1497, 933 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2889,7 +2889,7 @@ bullet-back index: -1 casing rotate: false - xy: 2039, 1833 + xy: 1157, 881 size: 8, 16 orig: 8, 16 offset: 0, 0 @@ -2903,14 +2903,14 @@ circle-end index: -1 circle-mid rotate: false - xy: 2025, 678 + xy: 1549, 522 size: 1, 199 orig: 1, 199 offset: 0, 0 index: -1 error rotate: false - xy: 1017, 93 + xy: 983, 285 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -2931,7 +2931,7 @@ laser-end index: -1 minelaser rotate: false - xy: 1985, 621 + xy: 715, 1435 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -2959,7 +2959,7 @@ missile-back index: -1 parallax-laser rotate: false - xy: 715, 1435 + xy: 1123, 1097 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -2973,7 +2973,7 @@ parallax-laser-end index: -1 particle rotate: false - xy: 1509, 625 + xy: 1133, 377 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -3001,70 +3001,70 @@ shell-back index: -1 transfer rotate: false - xy: 1123, 1097 + xy: 721, 1435 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 1931, 433 + xy: 1865, 723 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white rotate: false - xy: 1619, 641 + xy: 479, 1558 size: 3, 3 orig: 3, 3 offset: 0, 0 index: -1 alpha-wreck0 rotate: false - xy: 1981, 981 + xy: 883, 543 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-wreck1 rotate: false - xy: 883, 543 + xy: 881, 493 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-wreck2 rotate: false - xy: 933, 543 + xy: 881, 443 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 arc rotate: false - xy: 1015, 1 + xy: 1057, 899 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 beta-wreck0 rotate: false - xy: 933, 393 + xy: 933, 427 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 beta-wreck1 rotate: false - xy: 933, 343 + xy: 933, 377 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 beta-wreck2 rotate: false - xy: 991, 593 + xy: 933, 327 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -3085,7 +3085,7 @@ block-air-factory-full index: -1 block-arc-full rotate: false - xy: 1551, 633 + xy: 1175, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3099,35 +3099,35 @@ block-blast-drill-full index: -1 block-char-full rotate: false - xy: 1959, 947 + xy: 1175, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cliffs-full rotate: false - xy: 1993, 947 + xy: 1209, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conduit-full rotate: false - xy: 1976, 913 + xy: 1209, 515 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conveyor-full rotate: false - xy: 1976, 879 + xy: 1209, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 1976, 879 + xy: 1209, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3148,7 +3148,7 @@ block-core-shard-full index: -1 block-craters-full rotate: false - xy: 2010, 913 + xy: 1209, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3176,28 +3176,28 @@ block-cyclone-full index: -1 block-dark-metal-full rotate: false - xy: 2010, 879 + xy: 1209, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-full rotate: false - xy: 1617, 834 + xy: 1209, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dunerocks-full rotate: false - xy: 1617, 800 + xy: 1209, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-duo-full rotate: false - xy: 1617, 766 + xy: 1209, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3211,7 +3211,7 @@ block-fuse-full index: -1 block-grass-full rotate: false - xy: 1617, 732 + xy: 1243, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3225,49 +3225,49 @@ block-ground-factory-full index: -1 block-hail-full rotate: false - xy: 1617, 698 + xy: 1243, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-holostone-full rotate: false - xy: 1651, 841 + xy: 1277, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hotrock-full rotate: false - xy: 1651, 807 + xy: 1243, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-full rotate: false - xy: 1685, 841 + xy: 1277, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-snow-full rotate: false - xy: 1651, 773 + xy: 1311, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icerocks-full rotate: false - xy: 1685, 807 + xy: 1243, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ignarock-full rotate: false - xy: 1719, 841 + xy: 1277, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3295,7 +3295,7 @@ block-laser-drill-full index: -1 block-liquid-router-full rotate: false - xy: 1651, 739 + xy: 1311, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3309,7 +3309,7 @@ block-liquid-tank-full index: -1 block-magmarock-full rotate: false - xy: 1685, 773 + xy: 1243, 421 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3351,14 +3351,14 @@ block-meltdown-full index: -1 block-metal-floor-damaged-full rotate: false - xy: 1719, 807 + xy: 1277, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-moss-full rotate: false - xy: 1651, 705 + xy: 1243, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3379,42 +3379,42 @@ block-oil-extractor-full index: -1 block-ore-coal-full rotate: false - xy: 1685, 739 + xy: 1277, 421 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-copper-full rotate: false - xy: 1719, 773 + xy: 1311, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-lead-full rotate: false - xy: 1753, 807 + xy: 1243, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-scrap-full rotate: false - xy: 1787, 841 + xy: 1277, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-thorium-full rotate: false - xy: 1685, 705 + xy: 1311, 421 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-titanium-full rotate: false - xy: 1719, 739 + xy: 1243, 319 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3442,7 +3442,7 @@ payload-router-icon index: -1 block-pebbles-full rotate: false - xy: 1753, 773 + xy: 1277, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3456,7 +3456,7 @@ block-phase-weaver-full index: -1 block-plated-conduit-full rotate: false - xy: 1787, 807 + xy: 1311, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3470,21 +3470,21 @@ block-pneumatic-drill-full index: -1 block-pulse-conduit-full rotate: false - xy: 1821, 841 + xy: 1277, 319 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pulverizer-full rotate: false - xy: 1719, 705 + xy: 1311, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-repair-point-full rotate: false - xy: 1753, 739 + xy: 1311, 319 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3498,21 +3498,21 @@ block-ripple-full index: -1 block-rock-full rotate: false - xy: 983, 543 + xy: 1049, 593 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-rocks-full rotate: false - xy: 1787, 773 + xy: 1345, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-saltrocks-full rotate: false - xy: 1821, 807 + xy: 1345, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3526,21 +3526,21 @@ block-salvo-full index: -1 block-sand-boulder-full rotate: false - xy: 1855, 841 + xy: 1345, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-full rotate: false - xy: 1753, 705 + xy: 1345, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sandrocks-full rotate: false - xy: 1787, 739 + xy: 1345, 421 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3554,21 +3554,21 @@ block-scatter-full index: -1 block-scorch-full rotate: false - xy: 1821, 773 + xy: 1345, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-full rotate: false - xy: 1855, 807 + xy: 1345, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall1 rotate: false - xy: 1855, 807 + xy: 1345, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3603,49 +3603,49 @@ block-segment-full index: -1 block-shale-boulder-full rotate: false - xy: 1787, 705 + xy: 1175, 277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-full rotate: false - xy: 1821, 739 + xy: 1209, 277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shalerocks-full rotate: false - xy: 1855, 773 + xy: 1243, 285 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shrubs-full rotate: false - xy: 1889, 807 + xy: 1277, 285 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-full rotate: false - xy: 1923, 841 + xy: 1311, 285 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snowrock-full rotate: false - xy: 981, 493 + xy: 1033, 543 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-snowrocks-full rotate: false - xy: 1821, 705 + xy: 1345, 285 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3659,14 +3659,14 @@ block-spectre-full index: -1 block-spore-cluster-full rotate: false - xy: 881, 443 + xy: 353, 1032 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-spore-moss-full rotate: false - xy: 1855, 739 + xy: 1167, 243 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3680,14 +3680,14 @@ block-spore-press-full index: -1 block-sporerocks-full rotate: false - xy: 1889, 773 + xy: 1201, 243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-stone-full rotate: false - xy: 1923, 807 + xy: 1167, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3701,21 +3701,21 @@ block-swarmer-full index: -1 block-tendrils-full rotate: false - xy: 1855, 705 + xy: 1201, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-titanium-conveyor-full rotate: false - xy: 1889, 739 + xy: 1167, 175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 1889, 739 + xy: 1167, 175 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3806,56 +3806,56 @@ core-shard-team-sharded index: -1 cracks-1-0 rotate: false - xy: 1539, 523 + xy: 883, 13 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-1 rotate: false - xy: 1539, 489 + xy: 917, 13 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-2 rotate: false - xy: 1651, 671 + xy: 1409, 665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-3 rotate: false - xy: 1685, 671 + xy: 1443, 665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-4 rotate: false - xy: 1719, 671 + xy: 1477, 665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-5 rotate: false - xy: 1753, 671 + xy: 1409, 631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-6 rotate: false - xy: 1787, 671 + xy: 1443, 631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-7 rotate: false - xy: 1821, 671 + xy: 1477, 631 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4086,21 +4086,21 @@ cracks-5-7 index: -1 crawler-wreck0 rotate: false - xy: 967, 243 + xy: 983, 435 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-wreck1 rotate: false - xy: 967, 193 + xy: 1033, 443 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-wreck2 rotate: false - xy: 967, 143 + xy: 983, 385 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4114,28 +4114,28 @@ cyclone index: -1 dagger-wreck0 rotate: false - xy: 1017, 243 + xy: 1033, 343 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-wreck1 rotate: false - xy: 1017, 193 + xy: 1083, 393 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-wreck2 rotate: false - xy: 1017, 143 + xy: 1083, 343 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 duo rotate: false - xy: 1191, 499 + xy: 1447, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4191,21 +4191,21 @@ fuse index: -1 gamma-wreck0 rotate: false - xy: 883, 709 + xy: 1752, 875 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 gamma-wreck1 rotate: false - xy: 1686, 875 + xy: 883, 651 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 gamma-wreck2 rotate: false - xy: 883, 651 + xy: 1810, 875 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -4233,7 +4233,7 @@ ghoul-wreck2 index: -1 hail rotate: false - xy: 1581, 565 + xy: 1413, 495 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4247,7 +4247,7 @@ item-blast-compound-large index: -1 item-blast-compound-medium rotate: false - xy: 1607, 463 + xy: 1413, 393 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4268,21 +4268,21 @@ item-blast-compound-tiny index: -1 item-blast-compound-xlarge rotate: false - xy: 1031, 443 + xy: 1017, 185 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-coal-large rotate: false - xy: 351, 1032 + xy: 1407, 775 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-coal-medium rotate: false - xy: 1615, 566 + xy: 1413, 359 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4296,28 +4296,28 @@ item-coal-small index: -1 item-coal-tiny rotate: false - xy: 1149, 681 + xy: 2031, 1013 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-coal-xlarge rotate: false - xy: 1033, 393 + xy: 967, 77 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-copper-large rotate: false - xy: 679, 1 + xy: 1507, 825 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-copper-medium rotate: false - xy: 1641, 498 + xy: 1413, 325 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4331,63 +4331,63 @@ item-copper-small index: -1 item-copper-tiny rotate: false - xy: 1049, 17 + xy: 2031, 1225 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-copper-xlarge rotate: false - xy: 1033, 343 + xy: 1017, 135 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-graphite-large rotate: false - xy: 1057, 891 + xy: 1357, 675 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-graphite-medium rotate: false - xy: 569, 1435 + xy: 1413, 291 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite-small rotate: false - xy: 933, 317 + xy: 1085, 9 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-graphite-tiny rotate: false - xy: 2031, 1225 + xy: 1959, 981 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-graphite-xlarge rotate: false - xy: 1067, 293 + xy: 1017, 85 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-lead-large rotate: false - xy: 1299, 625 + xy: 1407, 733 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-lead-medium rotate: false - xy: 1081, 509 + xy: 1447, 291 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4401,399 +4401,399 @@ item-lead-small index: -1 item-lead-tiny rotate: false - xy: 1959, 981 + xy: 2031, 995 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-lead-xlarge rotate: false - xy: 1067, 243 + xy: 967, 27 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-metaglass-large rotate: false - xy: 721, 1 + xy: 1449, 775 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-metaglass-medium rotate: false - xy: 1115, 495 + xy: 1481, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass-small rotate: false - xy: 2005, 1395 + xy: 103, 11 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-metaglass-tiny rotate: false - xy: 2031, 1013 + xy: 2031, 1207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-metaglass-xlarge rotate: false - xy: 1067, 193 + xy: 1017, 35 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-phase-fabric-large rotate: false - xy: 1057, 849 + xy: 1549, 825 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-phase-fabric-medium rotate: false - xy: 1115, 461 + xy: 1481, 461 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric-small rotate: false - xy: 1617, 672 + xy: 2005, 1395 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-phase-fabric-tiny rotate: false - xy: 2031, 1207 + xy: 2031, 977 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-phase-fabric-xlarge rotate: false - xy: 1067, 143 + xy: 1067, 235 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-plastanium-large rotate: false - xy: 1341, 625 + xy: 1449, 733 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-plastanium-medium rotate: false - xy: 1183, 465 + xy: 1481, 393 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium-small rotate: false - xy: 1081, 449 + xy: 1167, 47 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-plastanium-tiny rotate: false - xy: 2031, 995 + xy: 2031, 1403 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-plastanium-xlarge rotate: false - xy: 1067, 93 + xy: 1067, 185 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-pyratite-large rotate: false - xy: 763, 1 + xy: 1207, 625 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-pyratite-medium rotate: false - xy: 1251, 473 + xy: 1481, 325 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite-small rotate: false - xy: 1959, 645 + xy: 1933, 765 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-pyratite-tiny rotate: false - xy: 1099, 881 + xy: 1439, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-pyratite-xlarge rotate: false - xy: 1067, 43 + xy: 1067, 135 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-sand-large rotate: false - xy: 1057, 807 + xy: 1249, 625 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-sand-medium rotate: false - xy: 1285, 455 + xy: 1505, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand-small rotate: false - xy: 131, 1025 + xy: 1967, 799 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-sand-tiny rotate: false - xy: 1099, 863 + xy: 1457, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-sand-xlarge rotate: false - xy: 1117, 849 + xy: 1067, 85 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-scrap-large rotate: false - xy: 1383, 625 + xy: 1291, 625 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-scrap-medium rotate: false - xy: 1353, 455 + xy: 1515, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap-small rotate: false - xy: 1959, 619 + xy: 131, 1025 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-scrap-tiny rotate: false - xy: 1099, 845 + xy: 1475, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-scrap-xlarge rotate: false - xy: 1167, 829 + xy: 1067, 35 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-silicon-large rotate: false - xy: 805, 1 + xy: 1591, 825 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-silicon-medium rotate: false - xy: 1421, 455 + xy: 1515, 461 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon-small rotate: false - xy: 1619, 646 + xy: 1933, 739 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-silicon-tiny rotate: false - xy: 1099, 827 + xy: 1493, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-silicon-xlarge rotate: false - xy: 1217, 817 + xy: 1117, 243 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-spore-pod-large rotate: false - xy: 1057, 765 + xy: 1633, 826 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-spore-pod-medium rotate: false - xy: 1523, 455 + xy: 1515, 359 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod-small rotate: false - xy: 317, 1281 + xy: 951, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-tiny rotate: false - xy: 1099, 809 + xy: 1511, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-spore-pod-xlarge rotate: false - xy: 1267, 817 + xy: 1117, 193 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-surge-alloy-large rotate: false - xy: 1425, 625 + xy: 1333, 625 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-surge-alloy-medium rotate: false - xy: 1319, 421 + xy: 1515, 291 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy-small rotate: false - xy: 343, 1281 + xy: 977, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-tiny rotate: false - xy: 1099, 791 + xy: 1529, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-surge-alloy-xlarge rotate: false - xy: 1317, 817 + xy: 1117, 143 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-thorium-large rotate: false - xy: 847, 1 + xy: 2005, 1159 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-thorium-medium rotate: false - xy: 1387, 421 + xy: 1277, 251 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium-small rotate: false - xy: 369, 1281 + xy: 317, 1281 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-thorium-tiny rotate: false - xy: 1099, 773 + xy: 1547, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-thorium-xlarge rotate: false - xy: 1367, 817 + xy: 1117, 93 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-titanium-large rotate: false - xy: 1057, 723 + xy: 1149, 587 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-titanium-medium rotate: false - xy: 1455, 421 + xy: 1345, 251 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium-small rotate: false - xy: 641, 1605 + xy: 343, 1281 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-tiny rotate: false - xy: 1099, 755 + xy: 1565, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-titanium-xlarge rotate: false - xy: 1417, 817 + xy: 1117, 43 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4807,140 +4807,140 @@ lancer index: -1 liquid-cryofluid-large rotate: false - xy: 1467, 625 + xy: 1133, 545 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-cryofluid-medium rotate: false - xy: 1591, 429 + xy: 1481, 257 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid-small rotate: false - xy: 667, 1605 + xy: 369, 1281 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-cryofluid-tiny rotate: false - xy: 1099, 737 + xy: 927, 1607 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-cryofluid-xlarge rotate: false - xy: 1567, 818 + xy: 1794, 825 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-oil-large rotate: false - xy: 889, 1 + xy: 1133, 503 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-oil-medium rotate: false - xy: 1557, 395 + xy: 1235, 183 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil-small rotate: false - xy: 693, 1605 + xy: 641, 1605 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-oil-tiny rotate: false - xy: 2031, 977 + xy: 1319, 1591 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-oil-xlarge rotate: false - xy: 1117, 799 + xy: 1844, 825 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-slag-large rotate: false - xy: 931, 1 + xy: 1133, 461 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-slag-medium rotate: false - xy: 1285, 387 + xy: 1303, 183 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag-small rotate: false - xy: 479, 1443 + xy: 667, 1605 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-slag-tiny rotate: false - xy: 1099, 719 + xy: 885, 1313 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-slag-xlarge rotate: false - xy: 1167, 779 + xy: 1894, 825 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-water-large rotate: false - xy: 973, 1 + xy: 1133, 419 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-water-medium rotate: false - xy: 1421, 387 + xy: 1303, 149 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water-small rotate: false - xy: 505, 1443 + xy: 693, 1605 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-water-tiny rotate: false - xy: 2031, 1403 + xy: 1279, 1199 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-water-xlarge rotate: false - xy: 1217, 767 + xy: 1944, 825 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5003,42 +5003,42 @@ meltdown index: -1 mono-wreck0 rotate: false - xy: 1467, 767 + xy: 1107, 799 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-wreck1 rotate: false - xy: 1517, 767 + xy: 1057, 699 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-wreck2 rotate: false - xy: 1567, 768 + xy: 1107, 749 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 nova-wreck0 rotate: false - xy: 1802, 875 + xy: 1926, 875 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-wreck1 rotate: false - xy: 1860, 875 + xy: 941, 875 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-wreck2 rotate: false - xy: 1918, 875 + xy: 999, 875 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -5052,42 +5052,42 @@ parallax index: -1 poly-wreck0 rotate: false - xy: 941, 817 + xy: 999, 817 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly-wreck1 rotate: false - xy: 941, 759 + xy: 941, 701 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly-wreck2 rotate: false - xy: 999, 817 + xy: 999, 759 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 pulsar-wreck0 rotate: false - xy: 1989, 1293 + xy: 1989, 1243 size: 58, 48 orig: 58, 48 offset: 0, 0 index: -1 pulsar-wreck1 rotate: false - xy: 1989, 1243 + xy: 1989, 1081 size: 58, 48 orig: 58, 48 offset: 0, 0 index: -1 pulsar-wreck2 rotate: false - xy: 1989, 1081 + xy: 1989, 1031 size: 58, 48 orig: 58, 48 offset: 0, 0 @@ -5115,7 +5115,7 @@ quasar-wreck2 index: -1 repair-point rotate: false - xy: 1709, 535 + xy: 1473, 189 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5150,28 +5150,28 @@ ripple index: -1 salvo rotate: false - xy: 1321, 999 + xy: 1387, 999 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scatter rotate: false - xy: 1585, 999 + xy: 1651, 999 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch rotate: false - xy: 1777, 535 + xy: 1473, 121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 segment rotate: false - xy: 1915, 999 + xy: 867, 377 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -5185,105 +5185,105 @@ spectre index: -1 splash-0 rotate: false - xy: 1845, 467 + xy: 1507, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-1 rotate: false - xy: 1879, 501 + xy: 1541, 223 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-10 rotate: false - xy: 1727, 399 + xy: 1627, 723 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-11 rotate: false - xy: 1761, 433 + xy: 569, 1435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-2 rotate: false - xy: 1913, 535 + xy: 1541, 189 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-3 rotate: false - xy: 1879, 467 + xy: 1541, 155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-4 rotate: false - xy: 1913, 501 + xy: 1541, 121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-5 rotate: false - xy: 1913, 467 + xy: 1541, 87 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-6 rotate: false - xy: 1693, 433 + xy: 1541, 53 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-7 rotate: false - xy: 1693, 399 + xy: 1541, 19 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-8 rotate: false - xy: 1727, 433 + xy: 1627, 791 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-9 rotate: false - xy: 1693, 365 + xy: 1627, 757 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer rotate: false - xy: 1233, 933 + xy: 1299, 933 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-alpha-full rotate: false - xy: 1367, 667 + xy: 1207, 717 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-beta-full rotate: false - xy: 1417, 667 + xy: 1257, 767 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5297,14 +5297,14 @@ unit-cix-full index: -1 unit-crawler-full rotate: false - xy: 1467, 667 + xy: 1357, 817 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-dagger-full rotate: false - xy: 1517, 667 + xy: 1207, 667 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5325,7 +5325,7 @@ unit-fortress-full index: -1 unit-gamma-full rotate: false - xy: 999, 759 + xy: 999, 701 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -5339,7 +5339,7 @@ unit-ghoul-full index: -1 unit-mace-full rotate: false - xy: 1827, 933 + xy: 1893, 933 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -5353,28 +5353,28 @@ unit-mega-full index: -1 unit-mono-full rotate: false - xy: 1567, 668 + xy: 1257, 717 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-nova-full rotate: false - xy: 941, 643 + xy: 999, 643 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 unit-poly-full rotate: false - xy: 999, 701 + xy: 941, 585 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 unit-pulsar-full rotate: false - xy: 1989, 1031 + xy: 293, 1024 size: 58, 48 orig: 58, 48 offset: 0, 0 @@ -5395,217 +5395,217 @@ unit-revenant-full index: -1 unit-wraith-full rotate: false - xy: 1099, 649 + xy: 1307, 767 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wave rotate: false - xy: 1431, 867 + xy: 1497, 867 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wraith-wreck0 rotate: false - xy: 1141, 529 + xy: 1457, 817 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wraith-wreck1 rotate: false - xy: 1199, 617 + xy: 1307, 667 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wraith-wreck2 rotate: false - xy: 1249, 617 + xy: 1357, 717 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 1573, 463 + xy: 1447, 461 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 1991, 641 + xy: 1447, 427 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 1641, 532 + xy: 1447, 393 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 1641, 464 + xy: 1447, 359 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 569, 1401 + xy: 1447, 325 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 1081, 475 + xy: 1481, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 1149, 495 + xy: 1481, 495 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 1149, 461 + xy: 1481, 427 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 1217, 465 + xy: 1481, 359 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 1251, 439 + xy: 1481, 291 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 1319, 455 + xy: 1515, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 1387, 455 + xy: 1515, 495 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod rotate: false - xy: 1489, 455 + xy: 1515, 393 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 1285, 421 + xy: 1515, 325 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 1353, 421 + xy: 1243, 251 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 1421, 421 + xy: 1311, 251 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 1557, 429 + xy: 1447, 257 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 1659, 430 + xy: 1235, 217 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 1251, 405 + xy: 1269, 149 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 1387, 387 + xy: 1269, 115 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blank rotate: false - xy: 1649, 566 + xy: 484, 1560 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 shape-3 rotate: false - xy: 1563, 868 + xy: 1629, 868 size: 63, 63 orig: 63, 63 offset: 0, 0 index: -1 alpha rotate: false - xy: 941, 593 + xy: 999, 593 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-cell rotate: false - xy: 999, 651 + xy: 1981, 981 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 beta rotate: false - xy: 931, 493 + xy: 931, 477 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 beta-cell rotate: false - xy: 931, 443 + xy: 983, 535 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5668,7 +5668,7 @@ cix-joint-base index: -1 cix-leg rotate: false - xy: 293, 1016 + xy: 1981, 1793 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -5689,49 +5689,49 @@ cix-old index: -1 crawler rotate: false - xy: 981, 443 + xy: 1083, 543 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-base rotate: false - xy: 983, 393 + xy: 983, 485 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-cell rotate: false - xy: 983, 343 + xy: 1033, 493 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-leg rotate: false - xy: 967, 293 + xy: 1083, 493 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger rotate: false - xy: 967, 93 + xy: 1033, 393 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 967, 43 + xy: 1083, 443 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 1017, 293 + xy: 983, 335 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5787,28 +5787,28 @@ eruptor-cell index: -1 eruptor-foot rotate: false - xy: 1067, 1 + xy: 1117, 1 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 eruptor-joint rotate: false - xy: 103, 9 + xy: 841, 1761 size: 26, 26 orig: 26, 26 offset: 0, 0 index: -1 eruptor-leg rotate: false - xy: 803, 1761 + xy: 2005, 1131 size: 36, 26 orig: 36, 26 offset: 0, 0 index: -1 eruptor-leg-base rotate: false - xy: 841, 1761 + xy: 803, 1761 size: 36, 26 orig: 36, 26 offset: 0, 0 @@ -5843,14 +5843,14 @@ fortress-leg index: -1 gamma rotate: false - xy: 1981, 1793 + xy: 1694, 875 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 gamma-cell rotate: false - xy: 1628, 875 + xy: 883, 709 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -5913,63 +5913,63 @@ mega-cell index: -1 mono rotate: false - xy: 1367, 767 + xy: 1057, 799 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-cell rotate: false - xy: 1417, 767 + xy: 1057, 749 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 nova rotate: false - xy: 1744, 875 + xy: 883, 593 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-base rotate: false - xy: 1167, 729 + xy: 1107, 699 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 nova-cell rotate: false - xy: 883, 593 + xy: 1868, 875 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-leg rotate: false - xy: 1217, 717 + xy: 1107, 649 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 poly rotate: false - xy: 941, 875 + xy: 941, 817 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly-cell rotate: false - xy: 999, 875 + xy: 941, 759 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 power-cell rotate: false - xy: 941, 701 + xy: 941, 643 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -5983,23 +5983,23 @@ pulsar index: -1 pulsar-base rotate: false - xy: 1267, 717 + xy: 1099, 599 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pulsar-cell rotate: false - xy: 1317, 717 - size: 48, 48 - orig: 48, 48 + xy: 1989, 1293 + size: 58, 48 + orig: 58, 48 offset: 0, 0 index: -1 pulsar-leg rotate: false - xy: 1367, 717 - size: 48, 48 - orig: 48, 48 + xy: 835, 113 + size: 64, 64 + orig: 64, 64 offset: 0, 0 index: -1 quasar @@ -6046,21 +6046,21 @@ revenant-cell index: -1 vanguard rotate: false - xy: 1091, 599 + xy: 1407, 817 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 vanguard-cell rotate: false - xy: 1149, 629 + xy: 1257, 667 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 artillery rotate: false - xy: 881, 485 + xy: 933, 527 size: 48, 56 orig: 48, 56 offset: 0, 0 @@ -6088,119 +6088,126 @@ eradication index: -1 eruption rotate: false - xy: 1017, 35 + xy: 1033, 285 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 flakgun rotate: false - xy: 1049, 651 + xy: 1083, 293 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flamethrower rotate: false - xy: 1041, 593 + xy: 967, 227 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 +heal-shotgun-weapon + rotate: false + xy: 967, 177 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 heal-weapon rotate: false - xy: 1033, 543 + xy: 1017, 235 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 heal-weapon-mount rotate: false - xy: 1031, 493 + xy: 967, 127 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 large-weapon rotate: false - xy: 1467, 817 + xy: 1694, 825 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lich-missiles rotate: false - xy: 1517, 817 + xy: 1744, 825 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles rotate: false - xy: 1267, 767 + xy: 1057, 849 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles-mount rotate: false - xy: 1317, 767 + xy: 1107, 849 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mount-weapon rotate: false - xy: 1117, 749 + xy: 1057, 649 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 reaper-weapon rotate: false - xy: 1417, 717 + xy: 1157, 829 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 revenant-missiles rotate: false - xy: 1467, 717 + xy: 1157, 779 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-basic-weapon rotate: false - xy: 1117, 699 + xy: 1157, 629 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-mount-weapon rotate: false - xy: 1167, 679 + xy: 1207, 817 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-weapon rotate: false - xy: 1217, 667 + xy: 1257, 817 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 weapon rotate: false - xy: 1141, 579 + xy: 1307, 717 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wraith rotate: false - xy: 1091, 549 + xy: 1357, 767 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 134bc47b87..1a843b13d0 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 36ddb2ac6f..8228c88313 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 c0ca05a1a0..13d26d4ee9 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -104,14 +104,14 @@ mend-projector-top index: -1 mender rotate: false - xy: 3681, 987 + xy: 3414, 273 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mender-top rotate: false - xy: 3647, 953 + xy: 3244, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -132,7 +132,7 @@ overdrive-projector-top index: -1 shock-mine rotate: false - xy: 3987, 869 + xy: 3618, 155 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -153,35 +153,35 @@ block-unloader index: -1 bridge-arrow rotate: false - xy: 3606, 171 + xy: 3991, 971 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 3640, 137 + xy: 2391, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 3674, 137 + xy: 2425, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 3708, 137 + xy: 2459, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 center rotate: false - xy: 3660, 497 + xy: 2493, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -335,315 +335,315 @@ armored-conveyor-4-3 index: -1 conveyor-0-1 rotate: false - xy: 3663, 1123 + xy: 2726, 349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 3697, 1123 + xy: 2760, 349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 3731, 1123 + xy: 2794, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 3649, 1089 + xy: 2828, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 3649, 1055 + xy: 2862, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 3683, 1089 + xy: 2896, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 3717, 1089 + xy: 2930, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 3683, 1055 + xy: 2734, 315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 3717, 1055 + xy: 2734, 281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 3649, 1021 + xy: 2768, 315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 3683, 1021 + xy: 2768, 281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 3717, 1021 + xy: 2802, 319 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 3751, 1075 + xy: 2836, 319 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 3751, 1041 + xy: 2802, 285 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 3785, 1075 + xy: 2870, 319 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 3785, 1041 + xy: 2836, 285 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 3819, 1075 + xy: 2904, 319 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 3819, 1041 + xy: 2870, 285 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 3853, 1075 + xy: 2904, 285 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor rotate: false - xy: 3715, 851 + xy: 3278, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-0 rotate: false - xy: 3749, 973 + xy: 3312, 171 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-1 rotate: false - xy: 3783, 973 + xy: 3346, 171 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-2 rotate: false - xy: 3749, 939 + xy: 3380, 171 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-edge rotate: false - xy: 3817, 973 + xy: 3414, 171 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-stack rotate: false - xy: 3749, 905 + xy: 3448, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 4055, 861 + xy: 2765, 111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 4055, 827 + xy: 2802, 183 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 3749, 803 + xy: 2836, 183 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 3783, 803 + xy: 2870, 183 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 3817, 803 + xy: 2904, 183 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 3851, 803 + xy: 2938, 183 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 3885, 803 + xy: 2972, 183 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 3919, 803 + xy: 2799, 149 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 3953, 801 + xy: 2833, 149 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 3987, 801 + xy: 2799, 115 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 4021, 801 + xy: 2867, 149 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 4055, 793 + xy: 2833, 115 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 3611, 786 + xy: 2901, 149 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 3611, 752 + xy: 2867, 115 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 3645, 783 + xy: 2935, 149 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 3679, 783 + xy: 2901, 115 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 3713, 783 + xy: 2969, 149 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 3645, 749 + xy: 2935, 115 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 3679, 749 + xy: 2969, 115 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cross rotate: false - xy: 3887, 1007 + xy: 2700, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -657,14 +657,14 @@ distributor index: -1 inverted-sorter rotate: false - xy: 2428, 295 + xy: 2870, 217 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction rotate: false - xy: 3002, 211 + xy: 3176, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -706,7 +706,7 @@ mass-driver-base index: -1 overflow-gate rotate: false - xy: 3681, 953 + xy: 3312, 239 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -734,49 +734,49 @@ payload-router-over index: -1 phase-conveyor rotate: false - xy: 3715, 919 + xy: 3346, 205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 3681, 885 + xy: 3380, 205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 3647, 851 + xy: 3414, 205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 3715, 885 + xy: 3210, 187 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 3919, 871 + xy: 3312, 137 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 4055, 963 + xy: 3652, 155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 underflow-gate rotate: false - xy: 3781, 769 + xy: 3003, 141 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -923,28 +923,28 @@ pneumatic-drill-top index: -1 water-extractor rotate: false - xy: 2191, 229 + xy: 2191, 163 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 2191, 163 + xy: 2140, 91 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 2140, 91 + xy: 2140, 25 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 2140, 25 + xy: 2206, 97 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -958,28 +958,28 @@ block-border index: -1 block-middle rotate: false - xy: 2850, 287 + xy: 2323, 257 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-select rotate: false - xy: 3618, 205 + xy: 2527, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 3581, 1024 + xy: 2595, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 message rotate: false - xy: 3715, 987 + xy: 3278, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -993,161 +993,161 @@ place-arrow index: -1 bridge-conduit rotate: false - xy: 3640, 171 + xy: 4025, 971 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 3674, 171 + xy: 4059, 997 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 3674, 171 + xy: 4059, 997 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 3708, 171 + xy: 4059, 963 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 3606, 137 + xy: 2357, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 3547, 1058 + xy: 2598, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 3547, 1024 + xy: 2632, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 3581, 1092 + xy: 2666, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 3581, 1058 + xy: 2700, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 3581, 1058 + xy: 2700, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 3581, 1058 + xy: 2700, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 3595, 1126 + xy: 2595, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 3615, 1092 + xy: 2629, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 3615, 1058 + xy: 2629, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 3615, 1024 + xy: 2663, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 3615, 1024 + xy: 2663, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 3629, 1130 + xy: 2663, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 2900, 185 + xy: 3176, 243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate rotate: false - xy: 3002, 177 + xy: 3210, 255 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate-top rotate: false - xy: 3579, 990 + xy: 3108, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 3613, 990 + xy: 3142, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 3579, 956 + xy: 3176, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 3579, 922 + xy: 3210, 221 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1175,133 +1175,133 @@ liquid-tank-top index: -1 mechanical-pump rotate: false - xy: 3613, 854 + xy: 3312, 273 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-pump-liquid rotate: false - xy: 3613, 820 + xy: 3346, 273 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-liquid rotate: false - xy: 3613, 820 + xy: 3346, 273 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-liquid rotate: false - xy: 3613, 820 + xy: 3346, 273 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 3647, 919 + xy: 3346, 239 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 3715, 953 + xy: 3380, 239 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 3681, 919 + xy: 3414, 239 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 3647, 885 + xy: 3312, 205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-cap rotate: false - xy: 3851, 973 + xy: 3482, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-0 rotate: false - xy: 3749, 871 + xy: 3482, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-1 rotate: false - xy: 3783, 905 + xy: 3516, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-2 rotate: false - xy: 3817, 939 + xy: 3516, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-3 rotate: false - xy: 3885, 973 + xy: 3550, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-4 rotate: false - xy: 3783, 871 + xy: 3550, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 3817, 871 + xy: 3550, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 3851, 905 + xy: 3074, 183 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 3885, 939 + xy: 3108, 175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 3851, 871 + xy: 3142, 175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 3270, 581 + xy: 3336, 581 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1343,14 +1343,14 @@ battery-top index: -1 combustion-generator rotate: false - xy: 3561, 1126 + xy: 2527, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 3547, 1092 + xy: 2561, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1378,28 +1378,28 @@ differential-generator-top index: -1 diode rotate: false - xy: 3921, 1007 + xy: 2697, 201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 diode-arrow rotate: false - xy: 3955, 1005 + xy: 2964, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator rotate: false - xy: 2322, 257 + xy: 2768, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator-top rotate: false - xy: 2360, 295 + xy: 2802, 217 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1455,7 +1455,7 @@ impact-reactor-plasma-3 index: -1 power-node rotate: false - xy: 3817, 905 + xy: 3448, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1469,35 +1469,35 @@ power-node-large index: -1 power-source rotate: false - xy: 3851, 939 + xy: 3482, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 3919, 973 + xy: 3516, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 3336, 581 + xy: 3402, 581 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 3953, 971 + xy: 3346, 137 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 4021, 869 + xy: 3652, 189 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1511,14 +1511,14 @@ solar-panel-large index: -1 surge-tower rotate: false - xy: 2008, 89 + xy: 2008, 23 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 2059, 155 + xy: 2074, 89 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1546,35 +1546,35 @@ thorium-reactor-top index: -1 turbine-generator rotate: false - xy: 2164, 361 + xy: 2078, 289 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-cap rotate: false - xy: 2078, 289 + xy: 2144, 295 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-top rotate: false - xy: 2144, 295 + xy: 2210, 295 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-turbine0 rotate: false - xy: 2210, 295 + xy: 2125, 223 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-turbine1 rotate: false - xy: 2125, 223 + xy: 2125, 157 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1686,21 +1686,21 @@ graphite-press index: -1 incinerator rotate: false - xy: 2394, 295 + xy: 2836, 217 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 2730, 223 + xy: 3074, 251 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 2968, 211 + xy: 3142, 277 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1728,21 +1728,21 @@ silicon-smelter-top index: -1 liquid-source rotate: false - xy: 3613, 922 + xy: 3244, 281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-void rotate: false - xy: 3579, 854 + xy: 3278, 281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 3647, 987 + xy: 3380, 273 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1791,42 +1791,42 @@ plastanium-compressor-top index: -1 pulverizer rotate: false - xy: 3885, 905 + xy: 3176, 175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 3919, 939 + xy: 3210, 153 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 3383, 647 + xy: 3449, 655 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator rotate: false - xy: 3600, 531 + xy: 1861, 221 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 1861, 221 + xy: 1861, 155 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-spinner rotate: false - xy: 1861, 155 + xy: 1927, 221 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1847,126 +1847,126 @@ silicon-crucible-top index: -1 silicon-smelter rotate: false - xy: 1927, 221 + xy: 1927, 155 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press rotate: false - xy: 1927, 155 + xy: 1993, 221 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame0 rotate: false - xy: 1993, 221 + xy: 1993, 155 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame1 rotate: false - xy: 1993, 155 + xy: 2012, 287 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame2 rotate: false - xy: 2012, 287 + xy: 1942, 89 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-liquid rotate: false - xy: 1942, 89 + xy: 1942, 23 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-top rotate: false - xy: 1942, 23 + xy: 2008, 89 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rock1 rotate: false - xy: 3398, 307 + xy: 2848, 421 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rock2 rotate: false - xy: 3448, 315 + xy: 2898, 421 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-boulder1 rotate: false - xy: 3953, 937 + xy: 3380, 137 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-boulder2 rotate: false - xy: 3987, 971 + xy: 3414, 137 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder1 rotate: false - xy: 4021, 903 + xy: 3584, 155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder2 rotate: false - xy: 3953, 869 + xy: 3618, 189 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrock1 rotate: false - xy: 3648, 323 + xy: 3605, 1102 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snowrock2 rotate: false - xy: 3048, 271 + xy: 3605, 1052 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-cluster1 rotate: false - xy: 2570, 329 + xy: 2444, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster2 rotate: false - xy: 3519, 1155 + xy: 2486, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster3 rotate: false - xy: 3561, 1160 + xy: 2528, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -2036,14 +2036,14 @@ core-shard-team index: -1 unloader rotate: false - xy: 3815, 769 + xy: 3037, 141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader-center rotate: false - xy: 3849, 769 + xy: 3003, 107 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2120,35 +2120,35 @@ ripple-heat index: -1 salvo-heat rotate: false - xy: 3468, 589 + xy: 3534, 589 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 3534, 589 + xy: 3270, 515 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 3270, 515 + xy: 3336, 515 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch-heat rotate: false - xy: 3987, 937 + xy: 3482, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 2206, 31 + xy: 2257, 229 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2288,21 +2288,21 @@ naval-factory index: -1 rally-point rotate: false - xy: 3449, 655 + xy: 3515, 655 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 repair-point-base rotate: false - xy: 3919, 905 + xy: 3278, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 resupply-point rotate: false - xy: 3515, 655 + xy: 3270, 581 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2323,7 +2323,7 @@ tetrative-reconstructor-top index: -1 copper-wall rotate: false - xy: 3853, 1041 + xy: 2938, 319 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2337,7 +2337,7 @@ copper-wall-large index: -1 door rotate: false - xy: 3989, 1005 + xy: 2972, 319 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2358,14 +2358,14 @@ door-large-open index: -1 door-open rotate: false - xy: 4023, 1005 + xy: 2972, 285 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 3681, 851 + xy: 3244, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2379,7 +2379,7 @@ phase-wall-large index: -1 plastanium-wall rotate: false - xy: 3783, 939 + xy: 3448, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2414,84 +2414,84 @@ scrap-wall-huge3 index: -1 scrap-wall-large1 rotate: false - xy: 3402, 515 + xy: 3468, 523 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large2 rotate: false - xy: 3468, 523 + xy: 3534, 523 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large3 rotate: false - xy: 3534, 523 + xy: 3581, 663 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large4 rotate: false - xy: 3581, 663 + xy: 3600, 597 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall2 rotate: false - xy: 4021, 971 + xy: 3516, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 3987, 903 + xy: 3550, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 4021, 937 + xy: 3584, 189 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 4021, 937 + xy: 3584, 189 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 3987, 835 + xy: 2697, 133 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large rotate: false - xy: 2008, 23 + xy: 2059, 221 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 4021, 835 + xy: 2731, 111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 2074, 89 + xy: 2074, 23 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2505,28 +2505,28 @@ thruster index: -1 titanium-wall rotate: false - xy: 3713, 749 + xy: 3006, 175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large rotate: false - xy: 2074, 23 + xy: 2164, 361 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 bullet rotate: false - xy: 2712, 467 + xy: 2654, 467 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 bullet-back rotate: false - xy: 2766, 467 + xy: 2708, 467 size: 52, 52 orig: 52, 52 offset: 0, 0 @@ -2547,7 +2547,7 @@ circle-end index: -1 circle-mid rotate: false - xy: 4089, 780 + xy: 4073, 1240 size: 1, 199 orig: 1, 199 offset: 0, 0 @@ -2561,7 +2561,7 @@ circle-shadow index: -1 error rotate: false - xy: 2598, 413 + xy: 3162, 379 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -2596,21 +2596,21 @@ minelaser-end index: -1 missile rotate: false - xy: 3598, 377 + xy: 1903, 117 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 missile-back rotate: false - xy: 1903, 117 + xy: 2570, 333 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 parallax-laser rotate: false - xy: 4091, 981 + xy: 639, 1033 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -2624,7 +2624,7 @@ parallax-laser-end index: -1 particle rotate: false - xy: 2528, 329 + xy: 2402, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -2638,56 +2638,56 @@ scale_marker index: -1 shell rotate: false - xy: 2608, 375 + xy: 2608, 333 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shell-back rotate: false - xy: 3603, 1164 + xy: 2646, 333 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 transfer rotate: false - xy: 639, 1033 + xy: 929, 1097 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 3747, 769 + xy: 3040, 175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white rotate: false - xy: 3547, 993 + xy: 1060, 113 size: 3, 3 orig: 3, 3 offset: 0, 0 index: -1 alpha-wreck0 rotate: false - xy: 2870, 471 + xy: 2862, 471 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-wreck1 rotate: false - xy: 2920, 471 + xy: 2912, 471 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-wreck2 rotate: false - xy: 2970, 471 + xy: 2962, 471 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -2701,21 +2701,21 @@ arc index: -1 beta-wreck0 rotate: false - xy: 2317, 180 + xy: 2248, 409 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 beta-wreck1 rotate: false - xy: 2330, 130 + xy: 3486, 415 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 beta-wreck2 rotate: false - xy: 2330, 80 + xy: 3536, 415 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -2750,35 +2750,35 @@ block-blast-drill-full index: -1 block-char-full rotate: false - xy: 2612, 341 + xy: 3519, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cliffs-full rotate: false - xy: 2646, 371 + xy: 3553, 1168 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conduit-full rotate: false - xy: 2646, 337 + xy: 3855, 983 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conveyor-full rotate: false - xy: 2612, 307 + xy: 3889, 983 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 2612, 307 + xy: 3889, 983 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2806,7 +2806,7 @@ block-core-shard-full index: -1 block-craters-full rotate: false - xy: 2646, 303 + xy: 3923, 983 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2834,28 +2834,28 @@ block-cyclone-full index: -1 block-dark-metal-full rotate: false - xy: 2680, 329 + xy: 2684, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-full rotate: false - xy: 2714, 329 + xy: 2692, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dunerocks-full rotate: false - xy: 2748, 325 + xy: 2726, 383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-duo-full rotate: false - xy: 2680, 295 + xy: 2760, 383 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2876,7 +2876,7 @@ block-fuse-full index: -1 block-grass-full rotate: false - xy: 2714, 295 + xy: 3655, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2890,49 +2890,49 @@ block-ground-factory-full index: -1 block-hail-full rotate: false - xy: 2748, 291 + xy: 3689, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-holostone-full rotate: false - xy: 3240, 223 + xy: 3723, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hotrock-full rotate: false - xy: 3274, 223 + xy: 3757, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-full rotate: false - xy: 3308, 223 + xy: 3791, 975 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-snow-full rotate: false - xy: 3342, 223 + xy: 2798, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icerocks-full rotate: false - xy: 3376, 223 + xy: 2832, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ignarock-full rotate: false - xy: 3410, 223 + xy: 2866, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2960,7 +2960,7 @@ block-laser-drill-full index: -1 block-liquid-router-full rotate: false - xy: 2272, 8 + xy: 2900, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2974,7 +2974,7 @@ block-liquid-tank-full index: -1 block-magmarock-full rotate: false - xy: 2782, 283 + xy: 2934, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3016,14 +3016,14 @@ block-meltdown-full index: -1 block-metal-floor-damaged-full rotate: false - xy: 2816, 283 + xy: 2323, 291 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-moss-full rotate: false - xy: 2884, 287 + xy: 2323, 223 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3051,42 +3051,42 @@ block-oil-extractor-full index: -1 block-ore-coal-full rotate: false - xy: 2918, 287 + xy: 2322, 189 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-copper-full rotate: false - xy: 2952, 287 + xy: 2360, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-lead-full rotate: false - xy: 2986, 279 + xy: 2394, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-scrap-full rotate: false - xy: 3448, 231 + xy: 2428, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-thorium-full rotate: false - xy: 3482, 231 + xy: 2462, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-titanium-full rotate: false - xy: 3516, 231 + xy: 2496, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3114,7 +3114,7 @@ payload-router-icon index: -1 block-pebbles-full rotate: false - xy: 3550, 231 + xy: 2530, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3128,7 +3128,7 @@ block-phase-weaver-full index: -1 block-plated-conduit-full rotate: false - xy: 3584, 231 + xy: 2357, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3142,21 +3142,21 @@ block-pneumatic-drill-full index: -1 block-pulse-conduit-full rotate: false - xy: 3618, 239 + xy: 2357, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pulverizer-full rotate: false - xy: 3652, 239 + xy: 2391, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-repair-point-full rotate: false - xy: 3686, 239 + xy: 2425, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3170,21 +3170,21 @@ block-ripple-full index: -1 block-rock-full rotate: false - xy: 2330, 30 + xy: 3586, 415 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-rocks-full rotate: false - xy: 3198, 203 + xy: 2391, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-saltrocks-full rotate: false - xy: 3232, 189 + xy: 2459, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3198,21 +3198,21 @@ block-salvo-full index: -1 block-sand-boulder-full rotate: false - xy: 3266, 189 + xy: 2425, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-full rotate: false - xy: 3300, 189 + xy: 2493, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sandrocks-full rotate: false - xy: 3334, 189 + xy: 2459, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3226,21 +3226,21 @@ block-scatter-full index: -1 block-scorch-full rotate: false - xy: 3368, 189 + xy: 2527, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-full rotate: false - xy: 3402, 189 + xy: 2493, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall1 rotate: false - xy: 3402, 189 + xy: 2493, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3275,49 +3275,49 @@ block-segment-full index: -1 block-shale-boulder-full rotate: false - xy: 3652, 205 + xy: 2564, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-full rotate: false - xy: 3686, 205 + xy: 2561, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shalerocks-full rotate: false - xy: 3436, 189 + xy: 2561, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shrubs-full rotate: false - xy: 3470, 197 + xy: 2598, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-full rotate: false - xy: 3504, 197 + xy: 2632, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snowrock-full rotate: false - xy: 3486, 415 + xy: 3636, 423 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-snowrocks-full rotate: false - xy: 3538, 197 + xy: 2666, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3338,7 +3338,7 @@ block-spore-cluster-full index: -1 block-spore-moss-full rotate: false - xy: 3572, 197 + xy: 2700, 303 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3352,14 +3352,14 @@ block-spore-press-full index: -1 block-sporerocks-full rotate: false - xy: 3470, 163 + xy: 3957, 1005 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-stone-full rotate: false - xy: 3504, 163 + xy: 3991, 1005 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3373,7 +3373,7 @@ block-swarmer-full index: -1 block-tendrils-full rotate: false - xy: 3538, 163 + xy: 4025, 1005 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3387,14 +3387,14 @@ block-tetrative-reconstructor-full index: -1 block-titanium-conveyor-full rotate: false - xy: 3572, 163 + xy: 3957, 971 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 3572, 163 + xy: 3957, 971 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3485,56 +3485,56 @@ core-shard-team-sharded index: -1 cracks-1-0 rotate: false - xy: 3887, 1075 + xy: 2938, 285 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-1 rotate: false - xy: 3887, 1041 + xy: 2734, 247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-2 rotate: false - xy: 3921, 1075 + xy: 2768, 247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-3 rotate: false - xy: 3921, 1041 + xy: 2802, 251 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-4 rotate: false - xy: 3751, 1007 + xy: 2836, 251 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-5 rotate: false - xy: 3785, 1007 + xy: 2870, 251 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-6 rotate: false - xy: 3819, 1007 + xy: 2904, 251 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-7 rotate: false - xy: 3853, 1007 + xy: 2938, 251 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3989,21 +3989,21 @@ cracks-9-7 index: -1 crawler-wreck0 rotate: false - xy: 3120, 429 + xy: 3636, 373 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-wreck1 rotate: false - xy: 3170, 429 + xy: 2298, 409 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-wreck2 rotate: false - xy: 3636, 373 + xy: 2348, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4017,28 +4017,28 @@ cyclone index: -1 dagger-wreck0 rotate: false - xy: 2448, 413 + xy: 2548, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-wreck1 rotate: false - xy: 2498, 413 + xy: 2598, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-wreck2 rotate: false - xy: 2548, 413 + xy: 3112, 379 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 duo rotate: false - xy: 4057, 997 + xy: 2972, 251 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4094,21 +4094,21 @@ fuse index: -1 gamma-wreck0 rotate: false - xy: 3138, 479 + xy: 839, 30 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 gamma-wreck1 rotate: false - xy: 3196, 479 + xy: 3138, 479 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 gamma-wreck2 rotate: false - xy: 3254, 457 + xy: 3196, 479 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -4136,7 +4136,7 @@ ghoul-wreck2 index: -1 hail rotate: false - xy: 2322, 291 + xy: 2734, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4150,7 +4150,7 @@ item-blast-compound-large index: -1 item-blast-compound-medium rotate: false - xy: 2496, 295 + xy: 2938, 217 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4171,7 +4171,7 @@ item-blast-compound-tiny index: -1 item-blast-compound-xlarge rotate: false - xy: 2898, 421 + xy: 3212, 357 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4185,28 +4185,28 @@ item-coal-large index: -1 item-coal-medium rotate: false - xy: 2564, 295 + xy: 2731, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal-small rotate: false - xy: 3641, 1176 + xy: 3112, 495 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-coal-tiny rotate: false - xy: 3120, 503 + xy: 3587, 1184 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-coal-xlarge rotate: false - xy: 2948, 421 + xy: 3262, 349 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4220,483 +4220,483 @@ item-copper-large index: -1 item-copper-medium rotate: false - xy: 2390, 261 + xy: 2697, 167 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper-small rotate: false - xy: 3795, 1305 + xy: 3547, 993 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-copper-tiny rotate: false - xy: 2680, 387 + xy: 19, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-copper-xlarge rotate: false - xy: 2998, 413 + xy: 3312, 357 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-graphite-large rotate: false - xy: 3198, 237 + xy: 3855, 1017 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-graphite-medium rotate: false - xy: 2458, 261 + xy: 2765, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite-small rotate: false - xy: 613, 1057 + xy: 3686, 197 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-graphite-tiny rotate: false - xy: 2832, 265 + xy: 37, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-graphite-xlarge rotate: false - xy: 2698, 363 + xy: 3362, 357 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-lead-large rotate: false - xy: 663, 5 + xy: 3897, 1017 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-lead-medium rotate: false - xy: 2526, 261 + xy: 3032, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead-small rotate: false - xy: 967, 1733 + xy: 3795, 1305 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-lead-tiny rotate: false - xy: 19, 1 + xy: 55, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-lead-xlarge rotate: false - xy: 2748, 359 + xy: 3412, 357 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-metaglass-large rotate: false - xy: 2230, 367 + xy: 663, 5 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-metaglass-medium rotate: false - xy: 2850, 253 + xy: 3006, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass-small rotate: false - xy: 903, 1121 + xy: 3573, 993 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-metaglass-tiny rotate: false - xy: 3120, 485 + xy: 73, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-metaglass-xlarge rotate: false - xy: 2798, 367 + xy: 3462, 365 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-phase-fabric-large rotate: false - xy: 2272, 367 + xy: 2230, 367 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-phase-fabric-medium rotate: false - xy: 2918, 253 + xy: 3006, 277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric-small rotate: false - xy: 871, 863 + xy: 613, 1057 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-phase-fabric-tiny rotate: false - xy: 2680, 369 + xy: 91, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-phase-fabric-xlarge rotate: false - xy: 2848, 371 + xy: 3512, 365 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-plastanium-large rotate: false - xy: 2314, 367 + xy: 2272, 367 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-plastanium-medium rotate: false - xy: 2986, 245 + xy: 3040, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium-small rotate: false - xy: 1161, 1185 + xy: 903, 1121 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-plastanium-tiny rotate: false - xy: 37, 1 + xy: 109, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-plastanium-xlarge rotate: false - xy: 2898, 371 + xy: 3562, 365 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-pyratite-large rotate: false - xy: 2356, 371 + xy: 2314, 367 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-pyratite-medium rotate: false - xy: 2628, 269 + xy: 3040, 277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite-small rotate: false - xy: 1129, 959 + xy: 871, 863 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-pyratite-tiny rotate: false - xy: 55, 1 + xy: 127, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-pyratite-xlarge rotate: false - xy: 2948, 371 + xy: 2372, 6 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-sand-large rotate: false - xy: 2398, 371 + xy: 2356, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-sand-medium rotate: false - xy: 2696, 261 + xy: 3006, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand-small rotate: false - xy: 1097, 733 + xy: 1161, 1185 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-sand-tiny rotate: false - xy: 73, 1 + xy: 145, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-sand-xlarge rotate: false - xy: 2998, 363 + xy: 3312, 307 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-scrap-large rotate: false - xy: 2440, 371 + xy: 2398, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-scrap-medium rotate: false - xy: 2662, 227 + xy: 3074, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap-small rotate: false - xy: 1097, 537 + xy: 1129, 959 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-scrap-tiny rotate: false - xy: 91, 1 + xy: 705, 29 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-scrap-xlarge rotate: false - xy: 3048, 371 + xy: 3362, 307 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-silicon-large rotate: false - xy: 2482, 371 + xy: 2440, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-silicon-medium rotate: false - xy: 2730, 257 + xy: 3074, 285 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon-small rotate: false - xy: 1451, 1507 + xy: 1097, 733 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-silicon-tiny rotate: false - xy: 109, 1 + xy: 3587, 1166 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-silicon-xlarge rotate: false - xy: 3098, 371 + xy: 3412, 307 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-spore-pod-large rotate: false - xy: 2524, 371 + xy: 2482, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-spore-pod-medium rotate: false - xy: 2798, 249 + xy: 3108, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod-small rotate: false - xy: 323, 767 + xy: 1097, 537 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-tiny rotate: false - xy: 127, 1 + xy: 2230, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-spore-pod-xlarge rotate: false - xy: 3148, 379 + xy: 3462, 315 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-surge-alloy-large rotate: false - xy: 2566, 371 + xy: 2524, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-surge-alloy-medium rotate: false - xy: 2798, 215 + xy: 3108, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy-small rotate: false - xy: 897, 62 + xy: 1451, 1507 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-tiny rotate: false - xy: 145, 1 + xy: 3239, 1515 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-surge-alloy-xlarge rotate: false - xy: 3198, 379 + xy: 3512, 315 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-thorium-large rotate: false - xy: 2276, 325 + xy: 2566, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-thorium-medium rotate: false - xy: 2866, 219 + xy: 3108, 277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium-small rotate: false - xy: 3220, 453 + xy: 323, 767 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-thorium-tiny rotate: false - xy: 705, 29 + xy: 1957, 1043 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-thorium-xlarge rotate: false - xy: 3248, 407 + xy: 3562, 315 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-titanium-large rotate: false - xy: 2318, 325 + xy: 2608, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-titanium-medium rotate: false - xy: 2934, 219 + xy: 3108, 243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium-small rotate: false - xy: 3519, 1129 + xy: 897, 62 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-tiny rotate: false - xy: 2230, 417 + xy: 1615, 729 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-titanium-xlarge rotate: false - xy: 3298, 407 + xy: 3612, 323 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4731,140 +4731,140 @@ lich-wreck2 index: -1 liquid-cryofluid-large rotate: false - xy: 2360, 329 + xy: 2650, 371 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-cryofluid-medium rotate: false - xy: 2866, 185 + xy: 3176, 277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid-small rotate: false - xy: 2276, 299 + xy: 1005, 1733 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-cryofluid-tiny rotate: false - xy: 3239, 1515 + xy: 1060, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-cryofluid-xlarge rotate: false - xy: 3248, 357 + xy: 3512, 265 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-oil-large rotate: false - xy: 2402, 329 + xy: 2276, 325 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-oil-medium rotate: false - xy: 2968, 177 + xy: 3210, 289 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil-small rotate: false - xy: 2322, 231 + xy: 3519, 1137 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-oil-tiny rotate: false - xy: 1957, 1043 + xy: 1745, 565 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-oil-xlarge rotate: false - xy: 3298, 357 + xy: 3562, 265 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-slag-large rotate: false - xy: 2444, 329 + xy: 2318, 325 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-slag-medium rotate: false - xy: 3579, 888 + xy: 3278, 315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag-small rotate: false - xy: 3020, 287 + xy: 3825, 983 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-slag-tiny rotate: false - xy: 1615, 729 + xy: 3251, 629 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-slag-xlarge rotate: false - xy: 3348, 357 + xy: 3612, 273 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-water-large rotate: false - xy: 2486, 329 + xy: 2360, 329 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-water-medium rotate: false - xy: 3579, 820 + xy: 3278, 247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water-small rotate: false - xy: 3547, 998 + xy: 2276, 299 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-water-tiny rotate: false - xy: 1060, 118 + xy: 3212, 461 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-water-xlarge rotate: false - xy: 3398, 357 + xy: 3662, 273 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4927,42 +4927,42 @@ meltdown index: -1 mono-wreck0 rotate: false - xy: 2848, 321 + xy: 3686, 381 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-wreck1 rotate: false - xy: 2898, 321 + xy: 3712, 331 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-wreck2 rotate: false - xy: 2948, 321 + xy: 3712, 281 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 nova-wreck0 rotate: false - xy: 3428, 457 + xy: 3370, 457 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-wreck1 rotate: false - xy: 3486, 465 + xy: 3428, 457 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-wreck2 rotate: false - xy: 3544, 465 + xy: 3486, 465 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -4976,42 +4976,42 @@ parallax index: -1 poly-wreck0 rotate: false - xy: 2306, 463 + xy: 2248, 459 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly-wreck1 rotate: false - xy: 2364, 463 + xy: 2306, 463 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly-wreck2 rotate: false - xy: 2422, 463 + xy: 2364, 463 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 pulsar-wreck0 rotate: false - xy: 1485, 893 + xy: 3501, 1239 size: 58, 48 orig: 58, 48 offset: 0, 0 index: -1 pulsar-wreck1 rotate: false - xy: 3501, 1239 + xy: 663, 47 size: 58, 48 orig: 58, 48 offset: 0, 0 index: -1 pulsar-wreck2 rotate: false - xy: 2257, 180 + xy: 1545, 893 size: 58, 48 orig: 58, 48 offset: 0, 0 @@ -5060,7 +5060,7 @@ reaper-wreck2 index: -1 repair-point rotate: false - xy: 3885, 871 + xy: 3244, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5095,28 +5095,28 @@ ripple index: -1 salvo rotate: false - xy: 3402, 581 + xy: 3468, 589 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scatter rotate: false - xy: 3336, 515 + xy: 3402, 515 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch rotate: false - xy: 3953, 903 + xy: 3448, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 segment rotate: false - xy: 3600, 597 + xy: 3600, 531 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -5130,105 +5130,105 @@ spectre index: -1 splash-0 rotate: false - xy: 4055, 929 + xy: 3584, 121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-1 rotate: false - xy: 4055, 895 + xy: 3618, 121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-10 rotate: false - xy: 3919, 837 + xy: 2629, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-11 rotate: false - xy: 3953, 835 + xy: 2663, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-2 rotate: false - xy: 3647, 817 + xy: 3652, 121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-3 rotate: false - xy: 3681, 817 + xy: 3686, 147 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-4 rotate: false - xy: 3715, 817 + xy: 3720, 147 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-5 rotate: false - xy: 3749, 837 + xy: 3686, 113 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-6 rotate: false - xy: 3783, 837 + xy: 3720, 113 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-7 rotate: false - xy: 3817, 837 + xy: 3754, 147 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-8 rotate: false - xy: 3851, 837 + xy: 3754, 113 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-9 rotate: false - xy: 3885, 837 + xy: 2595, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer rotate: false - xy: 2059, 221 + xy: 2059, 155 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-alpha-full rotate: false - xy: 3098, 271 + xy: 3655, 1107 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-beta-full rotate: false - xy: 3148, 279 + xy: 3705, 1107 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5242,14 +5242,14 @@ unit-cix-full index: -1 unit-crawler-full rotate: false - xy: 3198, 279 + xy: 3655, 1057 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-dagger-full rotate: false - xy: 3248, 257 + xy: 3705, 1057 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5270,7 +5270,7 @@ unit-fortress-full index: -1 unit-gamma-full rotate: false - xy: 2538, 463 + xy: 2480, 463 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -5291,7 +5291,7 @@ unit-lich-full index: -1 unit-mace-full rotate: false - xy: 2125, 157 + xy: 2191, 229 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -5305,28 +5305,28 @@ unit-mega-full index: -1 unit-mono-full rotate: false - xy: 3298, 257 + xy: 3755, 1059 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-nova-full rotate: false - xy: 2596, 463 + xy: 2538, 463 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 unit-poly-full rotate: false - xy: 2654, 463 + xy: 2596, 463 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 unit-pulsar-full rotate: false - xy: 663, 47 + xy: 2272, 114 size: 58, 48 orig: 58, 48 offset: 0, 0 @@ -5354,182 +5354,182 @@ unit-revenant-full index: -1 unit-wraith-full rotate: false - xy: 3348, 257 + xy: 3805, 1059 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wave rotate: false - xy: 2206, 97 + xy: 2206, 31 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wraith-wreck0 rotate: false - xy: 3598, 273 + xy: 3705, 1007 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wraith-wreck1 rotate: false - xy: 3648, 273 + xy: 3755, 1009 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wraith-wreck2 rotate: false - xy: 3148, 229 + xy: 3805, 1009 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 2462, 295 + xy: 2904, 217 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 2530, 295 + xy: 2972, 217 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 2356, 261 + xy: 2765, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 2424, 261 + xy: 2731, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 2492, 261 + xy: 2998, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 2560, 261 + xy: 3066, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 2884, 253 + xy: 3006, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 2952, 253 + xy: 3006, 243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 2594, 261 + xy: 3040, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 2662, 261 + xy: 3040, 243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 2628, 235 + xy: 3040, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 2696, 227 + xy: 3074, 319 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod rotate: false - xy: 2764, 249 + xy: 3074, 217 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 2764, 215 + xy: 3142, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 2832, 219 + xy: 3176, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 2900, 219 + xy: 3142, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 2832, 185 + xy: 3142, 243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 2934, 185 + xy: 3210, 323 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 3613, 956 + xy: 3244, 315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 3613, 888 + xy: 3244, 247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blank rotate: false - xy: 1139, 327 + xy: 2357, 322 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -5543,35 +5543,35 @@ circle index: -1 shape-3 rotate: false - xy: 2257, 230 + xy: 2257, 164 size: 63, 63 orig: 63, 63 offset: 0, 0 index: -1 alpha rotate: false - xy: 1545, 893 + xy: 2762, 471 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-cell rotate: false - xy: 2820, 471 + xy: 2812, 471 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 beta rotate: false - xy: 3070, 471 + xy: 3062, 471 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 beta-cell rotate: false - xy: 2248, 409 + xy: 2272, 6 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5634,7 +5634,7 @@ cix-joint-base index: -1 cix-leg rotate: false - xy: 723, 30 + xy: 2272, 56 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -5655,49 +5655,49 @@ cix-old index: -1 crawler rotate: false - xy: 3536, 415 + xy: 3062, 421 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-base rotate: false - xy: 3586, 415 + xy: 3112, 429 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-cell rotate: false - xy: 3636, 423 + xy: 3162, 429 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-leg rotate: false - xy: 3070, 421 + xy: 2322, 6 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger rotate: false - xy: 2298, 409 + xy: 2398, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 2348, 413 + xy: 2448, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 2398, 413 + xy: 2498, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5774,7 +5774,7 @@ eruptor-leg index: -1 eruptor-leg-base rotate: false - xy: 3448, 429 + xy: 967, 1731 size: 36, 26 orig: 36, 26 offset: 0, 0 @@ -5809,14 +5809,14 @@ fortress-leg index: -1 gamma rotate: false - xy: 781, 30 + xy: 723, 30 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 gamma-cell rotate: false - xy: 839, 30 + xy: 781, 30 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -5893,63 +5893,63 @@ mega-cell index: -1 mono rotate: false - xy: 3548, 365 + xy: 3660, 481 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-cell rotate: false - xy: 2798, 317 + xy: 3686, 431 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 nova rotate: false - xy: 3312, 457 + xy: 3254, 457 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-base rotate: false - xy: 3048, 321 + xy: 3712, 181 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 nova-cell rotate: false - xy: 3370, 457 + xy: 3312, 457 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 nova-leg rotate: false - xy: 3098, 321 + xy: 2648, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 poly rotate: false - xy: 3602, 473 + xy: 3544, 465 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 poly-cell rotate: false - xy: 2248, 459 + xy: 3602, 473 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 power-cell rotate: false - xy: 2480, 463 + xy: 2422, 463 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -5963,23 +5963,23 @@ pulsar index: -1 pulsar-base rotate: false - xy: 3148, 329 + xy: 2698, 417 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pulsar-cell rotate: false - xy: 3198, 329 - size: 48, 48 - orig: 48, 48 + xy: 1485, 893 + size: 58, 48 + orig: 58, 48 offset: 0, 0 index: -1 pulsar-leg rotate: false - xy: 3248, 307 - size: 48, 48 - orig: 48, 48 + xy: 3383, 647 + size: 64, 64 + orig: 64, 64 offset: 0, 0 index: -1 quasar @@ -6040,21 +6040,21 @@ revenant-cell index: -1 vanguard rotate: false - xy: 3398, 257 + xy: 3855, 1059 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 vanguard-cell rotate: false - xy: 3448, 265 + xy: 3905, 1059 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 artillery rotate: false - xy: 3020, 463 + xy: 3012, 463 size: 48, 56 orig: 48, 56 offset: 0, 0 @@ -6068,7 +6068,7 @@ beam-weapon index: -1 chaos rotate: false - xy: 2272, 42 + xy: 3547, 1019 size: 56, 136 orig: 56, 136 offset: 0, 0 @@ -6082,119 +6082,126 @@ eradication index: -1 eruption rotate: false - xy: 2648, 405 + xy: 2330, 56 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 flakgun rotate: false - xy: 2698, 413 + xy: 3212, 407 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flamethrower rotate: false - xy: 2748, 409 + xy: 3262, 399 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 +heal-shotgun-weapon + rotate: false + xy: 3312, 407 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 heal-weapon rotate: false - xy: 2798, 417 + xy: 3362, 407 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 heal-weapon-mount rotate: false - xy: 2848, 421 + xy: 3412, 407 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 large-weapon rotate: false - xy: 3348, 407 + xy: 3662, 323 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lich-missiles rotate: false - xy: 3398, 407 + xy: 3462, 265 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles rotate: false - xy: 3448, 365 + xy: 3612, 223 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles-mount rotate: false - xy: 3498, 365 + xy: 3662, 223 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mount-weapon rotate: false - xy: 2998, 313 + xy: 3712, 231 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 reaper-weapon rotate: false - xy: 3298, 307 + xy: 2748, 417 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 revenant-missiles rotate: false - xy: 3348, 307 + xy: 2798, 421 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-basic-weapon rotate: false - xy: 3498, 315 + xy: 2948, 421 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-mount-weapon rotate: false - xy: 3548, 315 + xy: 2998, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-weapon rotate: false - xy: 3598, 323 + xy: 3605, 1152 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 weapon rotate: false - xy: 3498, 265 + xy: 3605, 1002 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wraith rotate: false - xy: 3548, 265 + xy: 3655, 1007 size: 48, 48 orig: 48, 48 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 2bcea6e1c5..e4c26cb2a4 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 470cc43c90..a211f66953 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index a44c86953c..024baa7b14 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1535,7 +1535,7 @@ public class Blocks implements ContentList{ @Override public void init(Bullet b){ for(int i = 0; i < rays; i++){ - Damage.collideLine(b, b.team(), hitEffect, b.x(), b.y(), b.rotation(), rayLength - Math.abs(i - (rays / 2)) * 20f); + Damage.collideLine(b, b.team(), hitEffect, b.x, b.y, b.rotation(), rayLength - Math.abs(i - (rays / 2)) * 20f); } } @@ -1547,11 +1547,11 @@ public class Blocks implements ContentList{ for(int i = 0; i < 7; i++){ Tmp.v1.trns(b.rotation(), i * 8f); float sl = Mathf.clamp(b.fout() - 0.5f) * (80f - i * 10); - Drawf.tri(b.x() + Tmp.v1.x, b.y() + Tmp.v1.y, 4f, sl, b.rotation() + 90); - Drawf.tri(b.x() + Tmp.v1.x, b.y() + Tmp.v1.y, 4f, sl, b.rotation() - 90); + Drawf.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, 4f, sl, b.rotation() + 90); + Drawf.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, 4f, sl, b.rotation() - 90); } - Drawf.tri(b.x(), b.y(), 20f * b.fout(), (rayLength + 50), b.rotation()); - Drawf.tri(b.x(), b.y(), 20f * b.fout(), 10f, b.rotation() + 180f); + Drawf.tri(b.x, b.y, 20f * b.fout(), (rayLength + 50), b.rotation()); + Drawf.tri(b.x, b.y, 20f * b.fout(), 10f, b.rotation() + 180f); Draw.reset(); } }); diff --git a/core/src/mindustry/content/Bullets.java b/core/src/mindustry/content/Bullets.java index eafb421961..069a8a7f3c 100644 --- a/core/src/mindustry/content/Bullets.java +++ b/core/src/mindustry/content/Bullets.java @@ -437,31 +437,31 @@ public class Bullets implements ContentList{ @Override public void init(Bullet b){ - b.vel().setLength(0.6f + Mathf.random(2f)); + b.vel.setLength(0.6f + Mathf.random(2f)); } @Override public void draw(Bullet b){ Draw.color(Pal.lightFlame, Pal.darkFlame, Color.gray, b.fin()); - Fill.circle(b.x(), b.y(), 3f * b.fout()); + Fill.circle(b.x, b.y, 3f * b.fout()); Draw.reset(); } @Override public void update(Bullet b){ if(Mathf.chance(0.04 * Time.delta())){ - Tile tile = world.tileWorld(b.x(), b.y()); + Tile tile = world.tileWorld(b.x, b.y); if(tile != null){ Fires.create(tile); } } if(Mathf.chance(0.1 * Time.delta())){ - Fx.fireballsmoke.at(b.x(), b.y()); + Fx.fireballsmoke.at(b.x, b.y); } if(Mathf.chance(0.1 * Time.delta())){ - Fx.ballfire.at(b.x(), b.y()); + Fx.ballfire.at(b.x, b.y); } } }; diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index b9b044f685..002c075f88 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -6,6 +6,7 @@ import mindustry.ai.types.*; import mindustry.annotations.Annotations.*; import mindustry.ctype.*; import mindustry.entities.bullet.*; +import mindustry.entities.units.*; import mindustry.gen.*; import mindustry.graphics.*; import mindustry.type.*; @@ -55,7 +56,7 @@ public class UnitTypes implements ContentList{ dagger = new UnitType("dagger"){{ speed = 0.5f; hitsize = 8f; - health = 130; + health = 140; weapons.add(new Weapon("large-weapon"){{ reload = 14f; x = 4f; @@ -69,7 +70,8 @@ public class UnitTypes implements ContentList{ speed = 0.4f; hitsize = 9f; range = 10f; - health = 460; + health = 500; + armor = 1f; immunities.add(StatusEffects.burning); @@ -88,7 +90,9 @@ public class UnitTypes implements ContentList{ hitsize = 13f; rotateSpeed = 3f; targetAir = false; - health = 750; + health = 790; + armor = 4f; + weapons.add(new Weapon("artillery"){{ y = 1f; x = 9f; @@ -104,7 +108,7 @@ public class UnitTypes implements ContentList{ width = height = 14f; collides = true; collidesTiles = true; - splashDamageRadius = 20f; + splashDamageRadius = 24f; splashDamage = 38f; backColor = Pal.bulletYellowBack; frontColor = Pal.bulletYellow; @@ -119,10 +123,11 @@ public class UnitTypes implements ContentList{ itemCapacity = 60; canBoost = true; boostMultiplier = 1.5f; - speed = 0.5f; + speed = 0.52f; hitsize = 8f; - health = 100f; + health = 110f; buildSpeed = 0.8f; + armor = 1f; weapons.add(new Weapon("heal-weapon"){{ shootY = 2f; @@ -140,35 +145,63 @@ public class UnitTypes implements ContentList{ itemCapacity = 60; canBoost = true; boostMultiplier = 1.5f; - speed = 0.5f; - hitsize = 8f; - health = 100f; - buildSpeed = 0.8f; + speed = 0.48f; + hitsize = 10f; + health = 300f; + buildSpeed = 0.9f; + armor = 3f; - weapons.add(new Weapon("heal-weapon"){{ - shootY = 2f; - reload = 24f; - x = 4.5f; - alternate = false; + mineTier = 2; + mineSpeed = 5f; + commandLimit = 8; + + abilities.add(new HealFieldAbility(10f, 200f, 60f)); + + weapons.add(new Weapon("heal-shotgun-weapon"){{ + x = 5f; + shake = 2.2f; + y = 0.5f; + shootY = 5f; + + shootY = 2.5f; + reload = 38f; + shots = 3; + inaccuracy = 35; + shotDelay = 0.5f; + spacing = 0f; ejectEffect = Fx.none; - recoil = 2f; - bullet = Bullets.healBullet; + recoil = 2.5f; shootSound = Sounds.pew; + + bullet = new LightningBulletType(){{ + lightningColor = hitColor = Pal.heal; + damage = 11f; + lightningLength = 7; + lightningLengthRand = 7; + shootEffect = Fx.shootHeal; + }}; }}); }}; quasar = new UnitType("quasar"){{ mineTier = 1; - hitsize = 9f; + hitsize = 12f; boostMultiplier = 2f; - itemCapacity = 20; - health = 230f; - buildSpeed = 1.5f; + itemCapacity = 80; + health = 640f; + buildSpeed = 1.7f; canBoost = true; + armor = 6f; + landShake = 2f; speed = 0.4f; hitsize = 10f; + mineTier = 2; + mineSpeed = 7f; + + abilities.add(new HealFieldAbility(15f, 170f, 60f)); + weapons.add(new Weapon("beam-weapon"){{ shake = 2f; shootY = 4f; @@ -178,7 +211,7 @@ public class UnitTypes implements ContentList{ shootSound = Sounds.laser; bullet = new LaserBulletType(){{ - damage = 20f; + damage = 27f; recoil = 1f; sideAngle = 45f; sideWidth = 1f; diff --git a/core/src/mindustry/entities/bullet/ArtilleryBulletType.java b/core/src/mindustry/entities/bullet/ArtilleryBulletType.java index fcbb331bb3..08d02fe8f5 100644 --- a/core/src/mindustry/entities/bullet/ArtilleryBulletType.java +++ b/core/src/mindustry/entities/bullet/ArtilleryBulletType.java @@ -28,7 +28,7 @@ public class ArtilleryBulletType extends BasicBulletType{ super.update(b); if(b.timer(0, 3 + b.fslope() * 2f)){ - trailEffect.at(b.x(), b.y(), b.fslope() * 4f, backColor); + trailEffect.at(b.x, b.y, b.fslope() * 4f, backColor); } } @@ -40,9 +40,9 @@ public class ArtilleryBulletType extends BasicBulletType{ float height = this.height * ((1f - shrinkY) + shrinkY * b.fout()); Draw.color(backColor); - Draw.rect(backRegion, b.x(), b.y(), width * scale, height * scale, b.rotation() - 90); + Draw.rect(backRegion, b.x, b.y, width * scale, height * scale, b.rotation() - 90); Draw.color(frontColor); - Draw.rect(frontRegion, b.x(), b.y(), width * scale, height * scale, b.rotation() - 90); + Draw.rect(frontRegion, b.x, b.y, width * scale, height * scale, b.rotation() - 90); Draw.color(); } } diff --git a/core/src/mindustry/entities/bullet/BasicBulletType.java b/core/src/mindustry/entities/bullet/BasicBulletType.java index f4f7a75d97..96b3bfc3bc 100644 --- a/core/src/mindustry/entities/bullet/BasicBulletType.java +++ b/core/src/mindustry/entities/bullet/BasicBulletType.java @@ -44,9 +44,9 @@ public class BasicBulletType extends BulletType{ float width = this.width * ((1f - shrinkX) + shrinkX * b.fout()); Draw.color(backColor); - Draw.rect(backRegion, b.x(), b.y(), width, height, b.rotation() - 90); + Draw.rect(backRegion, b.x, b.y, width, height, b.rotation() - 90); Draw.color(frontColor); - Draw.rect(frontRegion, b.x(), b.y(), width, height, b.rotation() - 90); + Draw.rect(frontRegion, b.x, b.y, width, height, b.rotation() - 90); Draw.color(); } } diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java index cd37fc677e..baad95b1bc 100644 --- a/core/src/mindustry/entities/bullet/BulletType.java +++ b/core/src/mindustry/entities/bullet/BulletType.java @@ -15,7 +15,7 @@ import mindustry.graphics.*; import mindustry.type.*; public abstract class BulletType extends Content{ - public float lifetime; + public float lifetime = 40f; public float speed; public float damage; public float hitSize = 4; @@ -100,7 +100,6 @@ public abstract class BulletType extends Content{ public BulletType(float speed, float damage){ this.speed = speed; this.damage = damage; - lifetime = 40f; hitEffect = Fx.hitBulletSmall; despawnEffect = Fx.hitBulletSmall; } @@ -183,12 +182,12 @@ public abstract class BulletType extends Content{ if(homingPower > 0.0001f){ Teamc target = Units.closestTarget(b.team(), b.getX(), b.getY(), homingRange, e -> (e.isGrounded() && collidesGround) || (e.isFlying() && collidesAir), t -> collidesGround); if(target != null){ - b.vel().setAngle(Mathf.slerpDelta(b.rotation(), b.angleTo(target), homingPower)); + b.vel.setAngle(Mathf.slerpDelta(b.rotation(), b.angleTo(target), homingPower)); } } if(weaveMag > 0){ - b.vel().rotate(Mathf.sin(Time.time() + b.id() * 3, weaveScale, weaveMag) * Time.delta()); + b.vel.rotate(Mathf.sin(Time.time() + b.id() * 3, weaveScale, weaveMag) * Time.delta()); } } @@ -226,8 +225,8 @@ public abstract class BulletType extends Content{ 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.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); @@ -235,7 +234,7 @@ public abstract class BulletType extends Content{ bullet.damage(damage < 0 ? this.damage : damage); bullet.add(); - if(keepVelocity && owner instanceof Hitboxc) bullet.vel().add(((Hitboxc)owner).deltaX(), ((Hitboxc)owner).deltaY()); + if(keepVelocity && owner instanceof Hitboxc) bullet.vel.add(((Hitboxc)owner).deltaX(), ((Hitboxc)owner).deltaY()); return bullet; } diff --git a/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java b/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java index 910569957c..c38bb7e32f 100644 --- a/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java +++ b/core/src/mindustry/entities/bullet/ContinuousLaserBulletType.java @@ -48,7 +48,7 @@ public class ContinuousLaserBulletType extends BulletType{ //damage every 5 ticks if(b.timer(1, 5f)){ - Damage.collideLine(b, b.team(), hitEffect, b.x(), b.y(), b.rotation(), length, true); + Damage.collideLine(b, b.team(), hitEffect, b.x, b.y, b.rotation(), length, true); } if(shake > 0){ @@ -60,19 +60,19 @@ public class ContinuousLaserBulletType extends BulletType{ public void draw(Bullet b){ float baseLen = length * b.fout(); - Lines.lineAngle(b.x(), b.y(), b.rotation(), baseLen); + Lines.lineAngle(b.x, b.y, b.rotation(), baseLen); for(int s = 0; s < colors.length; s++){ Draw.color(Tmp.c1.set(colors[s]).mul(1f + Mathf.absin(Time.time(), 1f, 0.1f))); for(int i = 0; i < tscales.length; i++){ Tmp.v1.trns(b.rotation() + 180f, (lenscales[i] - 1f) * 35f); Lines.stroke((9f + Mathf.absin(Time.time(), 0.8f, 1.5f)) * b.fout() * strokes[s] * tscales[i]); - Lines.lineAngle(b.x() + Tmp.v1.x, b.y() + Tmp.v1.y, b.rotation(), baseLen * lenscales[i], CapStyle.none); + Lines.lineAngle(b.x + Tmp.v1.x, b.y + Tmp.v1.y, b.rotation(), baseLen * lenscales[i], CapStyle.none); } } Tmp.v1.trns(b.rotation(), baseLen * 1.1f); - Drawf.light(b.team(), b.x(), b.y(), b.x() + Tmp.v1.x, b.y() + Tmp.v1.y, 40, Color.orange, 0.7f); + Drawf.light(b.team(), b.x, b.y, b.x + Tmp.v1.x, b.y + Tmp.v1.y, 40, Color.orange, 0.7f); Draw.reset(); } diff --git a/core/src/mindustry/entities/bullet/FlakBulletType.java b/core/src/mindustry/entities/bullet/FlakBulletType.java index 489f3e6c4e..5c3e9bc2ec 100644 --- a/core/src/mindustry/entities/bullet/FlakBulletType.java +++ b/core/src/mindustry/entities/bullet/FlakBulletType.java @@ -28,7 +28,7 @@ public class FlakBulletType extends BasicBulletType{ if(b.data() instanceof Integer) return; if(b.timer(2, 6)){ - Units.nearbyEnemies(b.team(), Tmp.r1.setSize(explodeRange * 2f).setCenter(b.x(), b.y()), unit -> { + Units.nearbyEnemies(b.team(), Tmp.r1.setSize(explodeRange * 2f).setCenter(b.x, b.y), unit -> { if(b.data() instanceof Float || !unit.checkTarget(collidesAir, collidesGround)) return; if(unit.dst(b) < explodeRange){ diff --git a/core/src/mindustry/entities/bullet/HealBulletType.java b/core/src/mindustry/entities/bullet/HealBulletType.java index 9a1b890bb7..deaf47fd27 100644 --- a/core/src/mindustry/entities/bullet/HealBulletType.java +++ b/core/src/mindustry/entities/bullet/HealBulletType.java @@ -9,7 +9,7 @@ import mindustry.world.blocks.*; public class HealBulletType extends BulletType{ protected float healPercent = 3f; - protected float bulletHeight = 7f, bulletWidth = 2f; + protected float height = 7f, width = 2f; protected Color backColor = Pal.heal, frontColor = Color.white; public HealBulletType(float speed, float damage){ @@ -35,10 +35,10 @@ public class HealBulletType extends BulletType{ @Override public void draw(Bullet b){ Draw.color(backColor); - Lines.stroke(bulletWidth); - Lines.lineAngleCenter(b.x(), b.y(), b.rotation(), bulletHeight); + Lines.stroke(width); + Lines.lineAngleCenter(b.x, b.y, b.rotation(), height); Draw.color(frontColor); - Lines.lineAngleCenter(b.x(), b.y(), b.rotation(), bulletHeight / 2f); + Lines.lineAngleCenter(b.x, b.y, b.rotation(), height / 2f); Draw.reset(); } diff --git a/core/src/mindustry/entities/bullet/LaserBulletType.java b/core/src/mindustry/entities/bullet/LaserBulletType.java index 5931899511..4c5e3b3a40 100644 --- a/core/src/mindustry/entities/bullet/LaserBulletType.java +++ b/core/src/mindustry/entities/bullet/LaserBulletType.java @@ -53,15 +53,15 @@ public class LaserBulletType extends BulletType{ furthest = null; - world.raycast(b.tileX(), b.tileY(), world.toTile(b.x() + Tmp.v1.x), world.toTile(b.y() + Tmp.v1.y), + world.raycast(b.tileX(), b.tileY(), world.toTile(b.x + Tmp.v1.x), world.toTile(b.y + Tmp.v1.y), (x, y) -> (furthest = world.tile(x, y)) != null && furthest.team() != b.team() && furthest.block().absorbLasers); float resultLength = furthest != null ? Math.max(6f, b.dst(furthest.worldx(), furthest.worldy())) : length; - Damage.collideLine(b, b.team(), hitEffect, b.x(), b.y(), b.rotation(), resultLength); + Damage.collideLine(b, b.team(), hitEffect, b.x, b.y, b.rotation(), resultLength); if(furthest != null) b.data(resultLength); - laserEffect.at(b.x(), b.y(), b.rotation(), resultLength * 0.75f); + laserEffect.at(b.x, b.y, b.rotation(), resultLength * 0.75f); } @Override @@ -73,18 +73,18 @@ public class LaserBulletType extends BulletType{ float cwidth = width; float compound = 1f; - Lines.lineAngle(b.x(), b.y(), b.rotation(), baseLen); + Lines.lineAngle(b.x, b.y, b.rotation(), baseLen); Lines.precise(true); for(Color color : colors){ Draw.color(color); Lines.stroke((cwidth *= lengthFalloff) * b.fout()); - Lines.lineAngle(b.x(), b.y(), b.rotation(), baseLen, CapStyle.none); + Lines.lineAngle(b.x, b.y, b.rotation(), baseLen, CapStyle.none); Tmp.v1.trns(b.rotation(), baseLen); - Drawf.tri(b.x() + Tmp.v1.x, b.y() + Tmp.v1.y, Lines.getStroke() * 1.22f, cwidth * 2f + width / 2f, b.rotation()); + Drawf.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, Lines.getStroke() * 1.22f, cwidth * 2f + width / 2f, b.rotation()); - Fill.circle(b.x(), b.y(), 1f * cwidth * b.fout()); + Fill.circle(b.x, b.y, 1f * cwidth * b.fout()); for(int i : Mathf.signs){ - Drawf.tri(b.x(), b.y(), sideWidth * b.fout() * cwidth, sideLength * compound, b.rotation() + sideAngle * i); + Drawf.tri(b.x, b.y, sideWidth * b.fout() * cwidth, sideLength * compound, b.rotation() + sideAngle * i); } compound *= lengthFalloff; @@ -93,7 +93,7 @@ public class LaserBulletType extends BulletType{ Draw.reset(); Tmp.v1.trns(b.rotation(), baseLen * 1.1f); - Drawf.light(b.team(), b.x(), b.y(), b.x() + Tmp.v1.x, b.y() + Tmp.v1.y, width * 1.4f * b.fout(), colors[0], 0.6f); + Drawf.light(b.team(), b.x, b.y, b.x + Tmp.v1.x, b.y + Tmp.v1.y, width * 1.4f * b.fout(), colors[0], 0.6f); } @Override diff --git a/core/src/mindustry/entities/bullet/LightningBulletType.java b/core/src/mindustry/entities/bullet/LightningBulletType.java index e8d6a749dc..901f7a2f0e 100644 --- a/core/src/mindustry/entities/bullet/LightningBulletType.java +++ b/core/src/mindustry/entities/bullet/LightningBulletType.java @@ -1,6 +1,7 @@ package mindustry.entities.bullet; import arc.graphics.*; +import arc.math.*; import mindustry.content.*; import mindustry.entities.*; import mindustry.gen.*; @@ -8,7 +9,7 @@ import mindustry.graphics.*; public class LightningBulletType extends BulletType{ protected Color lightningColor = Pal.lancerLaser; - protected int lightningLength = 25; + protected int lightningLength = 25, lightningLengthRand = 0; public LightningBulletType(){ super(0.0001f, 1f); @@ -22,7 +23,7 @@ public class LightningBulletType extends BulletType{ @Override public float range(){ - return lightningLength * 2.33f; + return (lightningLength + lightningLengthRand/2f) * 6f; } @Override @@ -31,6 +32,6 @@ public class LightningBulletType extends BulletType{ @Override public void init(Bullet b){ - Lightning.create(b.team(), lightningColor, damage, b.x(), b.y(), b.rotation(), lightningLength); + Lightning.create(b.team(), lightningColor, damage, b.x, b.y, b.rotation(), lightningLength + Mathf.random(lightningLengthRand)); } } diff --git a/core/src/mindustry/entities/bullet/LiquidBulletType.java b/core/src/mindustry/entities/bullet/LiquidBulletType.java index 534cc8a416..accaff23c3 100644 --- a/core/src/mindustry/entities/bullet/LiquidBulletType.java +++ b/core/src/mindustry/entities/bullet/LiquidBulletType.java @@ -48,7 +48,7 @@ public class LiquidBulletType extends BulletType{ super.update(b); if(liquid.canExtinguish()){ - Tile tile = world.tileWorld(b.x(), b.y()); + Tile tile = world.tileWorld(b.x, b.y); if(tile != null && Fires.has(tile.x, tile.y)){ Fires.extinguish(tile, 100f); b.remove(); @@ -61,14 +61,14 @@ public class LiquidBulletType extends BulletType{ public void draw(Bullet b){ Draw.color(liquid.color, Color.white, b.fout() / 100f); - Fill.circle(b.x(), b.y(), 3f); + Fill.circle(b.x, b.y, 3f); } @Override public void despawned(Bullet b){ super.despawned(b); - hit(b, b.x(), b.y()); + hit(b, b.x, b.y); } @Override diff --git a/core/src/mindustry/entities/bullet/MassDriverBolt.java b/core/src/mindustry/entities/bullet/MassDriverBolt.java index 384f86f5de..61c6d4c2bc 100644 --- a/core/src/mindustry/entities/bullet/MassDriverBolt.java +++ b/core/src/mindustry/entities/bullet/MassDriverBolt.java @@ -26,10 +26,10 @@ public class MassDriverBolt extends BulletType{ float w = 11f, h = 13f; Draw.color(Pal.bulletYellowBack); - Draw.rect("shell-back", b.x(), b.y(), w, h, b.rotation() + 90); + Draw.rect("shell-back", b.x, b.y, w, h, b.rotation() + 90); Draw.color(Pal.bulletYellow); - Draw.rect("shell", b.x(), b.y(), w, h, b.rotation() + 90); + Draw.rect("shell", b.x, b.y, w, h, b.rotation() + 90); Draw.reset(); } @@ -92,7 +92,7 @@ public class MassDriverBolt extends BulletType{ int amountDropped = Mathf.random(0, data.items[i]); if(amountDropped > 0){ float angle = b.rotation() + Mathf.range(100f); - Fx.dropItem.at(b.x(), b.y(), angle, Color.white, content.item(i)); + Fx.dropItem.at(b.x, b.y, angle, Color.white, content.item(i)); } } } diff --git a/core/src/mindustry/entities/bullet/MissileBulletType.java b/core/src/mindustry/entities/bullet/MissileBulletType.java index b2f4ca0d6a..6e15bd5b8b 100644 --- a/core/src/mindustry/entities/bullet/MissileBulletType.java +++ b/core/src/mindustry/entities/bullet/MissileBulletType.java @@ -26,7 +26,7 @@ public class MissileBulletType extends BasicBulletType{ super.update(b); if(Mathf.chanceDelta(0.2)){ - Fx.missileTrail.at(b.x(), b.y(), 2f, trailColor); + Fx.missileTrail.at(b.x, b.y, 2f, trailColor); } } } diff --git a/core/src/mindustry/entities/comp/BulletComp.java b/core/src/mindustry/entities/comp/BulletComp.java index a1d0233100..f8096bee81 100644 --- a/core/src/mindustry/entities/comp/BulletComp.java +++ b/core/src/mindustry/entities/comp/BulletComp.java @@ -113,14 +113,14 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw Building tile = world.ent(x, y); if(tile == null) return false; - if(tile.collide(base()) && type.collides(base(), tile) && !tile.dead() && (type.collidesTeam || tile.team() != team())){ + if(tile.collide(base()) && type.collides(base(), tile) && !tile.dead() && (type.collidesTeam || tile.team != team)){ boolean remove = false; - if(tile.team() != team()){ + if(tile.team != team){ remove = tile.collision(base()); } - if(remove){ + if(remove || type.collidesTeam){ type.hitTile(base(), tile); remove(); } diff --git a/core/src/mindustry/entities/comp/HealthComp.java b/core/src/mindustry/entities/comp/HealthComp.java index 3c7428f9fb..7d95d22964 100644 --- a/core/src/mindustry/entities/comp/HealthComp.java +++ b/core/src/mindustry/entities/comp/HealthComp.java @@ -93,8 +93,14 @@ abstract class HealthComp implements Entityc{ health = Mathf.clamp(health, 0, maxHealth); } + /** Heals by a flat amount. */ void heal(float amount){ health += amount; clampHealth(); } + + /** Heals by a 0-1 fraction of max health. */ + void healFract(float amount){ + heal(amount * maxHealth); + } } diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java index 2363ea3a08..faa5643029 100644 --- a/core/src/mindustry/entities/comp/UnitComp.java +++ b/core/src/mindustry/entities/comp/UnitComp.java @@ -33,6 +33,8 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I private UnitType type; boolean spawnedByCore; + transient float timer1, timer2; + public void moveAt(Vec2 vector){ moveAt(vector, type.accel); } diff --git a/core/src/mindustry/entities/units/Ability.java b/core/src/mindustry/entities/units/Ability.java new file mode 100644 index 0000000000..cdd6d7fc6a --- /dev/null +++ b/core/src/mindustry/entities/units/Ability.java @@ -0,0 +1,8 @@ +package mindustry.entities.units; + +import mindustry.gen.*; + +public interface Ability{ + default void update(Unit unit){} + default void draw(Unit unit){} +} diff --git a/core/src/mindustry/entities/units/HealFieldAbility.java b/core/src/mindustry/entities/units/HealFieldAbility.java new file mode 100644 index 0000000000..7925410913 --- /dev/null +++ b/core/src/mindustry/entities/units/HealFieldAbility.java @@ -0,0 +1,45 @@ +package mindustry.entities.units; + +import arc.util.*; +import mindustry.content.*; +import mindustry.entities.*; +import mindustry.gen.*; + +public class HealFieldAbility implements Ability{ + public float amount = 1, reload = 100, range = 60; + public Effect healEffect = Fx.heal; + public Effect activeEffect = Fx.healWave; + + private boolean wasHealed = false; + + HealFieldAbility(){} + + public HealFieldAbility(float amount, float reload, float range){ + this.amount = amount; + this.reload = reload; + this.range = range; + } + + @Override + public void update(Unit unit){ + unit.timer1 += Time.delta(); + + if(unit.timer1 >= reload){ + wasHealed = false; + + Units.nearby(unit.team, unit.x, unit.y, range, other -> { + if(other.damaged()){ + healEffect.at(unit); + wasHealed = true; + } + other.heal(amount); + }); + + if(wasHealed){ + activeEffect.at(unit); + } + + unit.timer1 = 0f; + } + } +} diff --git a/core/src/mindustry/entities/units/StatusFieldAbility.java b/core/src/mindustry/entities/units/StatusFieldAbility.java new file mode 100644 index 0000000000..2df5fda9fb --- /dev/null +++ b/core/src/mindustry/entities/units/StatusFieldAbility.java @@ -0,0 +1,40 @@ +package mindustry.entities.units; + +import arc.util.ArcAnnotate.*; +import arc.util.*; +import mindustry.content.*; +import mindustry.entities.*; +import mindustry.gen.*; +import mindustry.type.*; + +public class StatusFieldAbility implements Ability{ + public @NonNull StatusEffect effect; + public float duration = 60, reload = 100, range = 20; + public Effect applyEffect = Fx.heal; + public Effect activeEffect = Fx.healWave; + + StatusFieldAbility(){} + + public StatusFieldAbility(@NonNull StatusEffect effect, float duration, float reload, float range){ + this.duration = duration; + this.reload = reload; + this.range = range; + this.effect = effect; + } + + @Override + public void update(Unit unit){ + unit.timer2 += Time.delta(); + + if(unit.timer2 >= reload){ + + Units.nearby(unit.team, unit.x, unit.y, range, other -> { + other.apply(effect, duration); + }); + + activeEffect.at(unit); + + unit.timer2 = 0f; + } + } +} diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index 60f43ca213..453f68369a 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -50,6 +50,7 @@ public class UnitType extends UnlockableContent{ public float deathShake = 2f; public Effect fallEffect = Fx.fallSmoke; public Effect fallThrusterEffect = Fx.fallSmoke; + public Seq abilities = new Seq<>(); //TODO document public int legCount = 4, legGroupSize = 2; @@ -103,7 +104,13 @@ public class UnitType extends UnlockableContent{ return weapons.size > 0; } - public void update(Unit unit){} + public void update(Unit unit){ + if(abilities.size > 0){ + for(Ability a : abilities){ + a.update(unit); + } + } + } public void landed(Unit unit){} @@ -252,6 +259,12 @@ public class UnitType extends UnlockableContent{ drawShield(unit); } + if(abilities.size > 0){ + for(Ability a : abilities){ + a.draw(unit); + } + } + if(legs != null){ unit.trns(-legOffset.x, -legOffset.y); } diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java index c9b5d9f2d1..c9f9505c2e 100644 --- a/core/src/mindustry/type/Weapon.java +++ b/core/src/mindustry/type/Weapon.java @@ -32,7 +32,7 @@ public class Weapon{ /** amount of shots per fire */ public int shots = 1; /** spacing in degrees between multiple shots, if applicable */ - public float spacing = 12f; + public float spacing = 0; /** inaccuracy of degrees of each shot */ public float inaccuracy = 0f; /** intensity and duration of each shot's screen shake */ diff --git a/core/src/mindustry/type/Weather.java b/core/src/mindustry/type/Weather.java index 6111dbed92..6ea132e428 100644 --- a/core/src/mindustry/type/Weather.java +++ b/core/src/mindustry/type/Weather.java @@ -124,7 +124,7 @@ public abstract class Weather extends MappableContent{ if(life < fadeTime){ opacity = life / fadeTime; }else{ - opacity = Mathf.lerpDelta(opacity, 1f, 0.01f); + opacity = Mathf.lerpDelta(opacity, 1f, 0.004f); } life -= Time.delta(); diff --git a/core/src/mindustry/world/blocks/defense/PointDefenseTurret.java b/core/src/mindustry/world/blocks/defense/PointDefenseTurret.java index f4e3dd2ef7..656f1bde0e 100644 --- a/core/src/mindustry/world/blocks/defense/PointDefenseTurret.java +++ b/core/src/mindustry/world/blocks/defense/PointDefenseTurret.java @@ -90,7 +90,7 @@ public class PointDefenseTurret extends Block{ beamEffect.at(x + Tmp.v1.x, y + Tmp.v1.y, rotation, color, new Vec2().set(target)); shootEffect.at(x + Tmp.v1.x, y + Tmp.v1.y, rotation, color); - hitEffect.at(target.x(), target.y(), color); + hitEffect.at(target.x, target.y, color); reload = reloadTime; } }else{ diff --git a/core/src/mindustry/world/blocks/defense/Wall.java b/core/src/mindustry/world/blocks/defense/Wall.java index f3002bf3e0..09ca13b6c5 100644 --- a/core/src/mindustry/world/blocks/defense/Wall.java +++ b/core/src/mindustry/world/blocks/defense/Wall.java @@ -101,14 +101,14 @@ public class Wall extends Block{ if(bullet.damage() > maxDamageDeflect) return true; //translate bullet back to where it was upon collision - bullet.trns(-bullet.vel().x, -bullet.vel().y); + bullet.trns(-bullet.vel.x, -bullet.vel.y); - float penX = Math.abs(x - bullet.x()), penY = Math.abs(y - bullet.y()); + float penX = Math.abs(x - bullet.x), penY = Math.abs(y - bullet.y); if(penX > penY){ - bullet.vel().x *= -1; + bullet.vel.x *= -1; }else{ - bullet.vel().y *= -1; + bullet.vel.y *= -1; } bullet.owner(this);