diff --git a/core/assets-raw/sprites/units/reaper.aseprite b/core/assets-raw/sprites/units/reaper.aseprite new file mode 100644 index 0000000000..cae9a5c2ec Binary files /dev/null and b/core/assets-raw/sprites/units/reaper.aseprite differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 4e77e32b2b..3affe791ee 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -20,49 +20,49 @@ force-projector-top index: -1 mend-projector rotate: false - xy: 1017, 1037 + xy: 1653, 1057 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mend-projector-top rotate: false - xy: 951, 905 + xy: 1719, 1057 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mender rotate: false - xy: 1451, 561 + xy: 1271, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mender-top rotate: false - xy: 1485, 595 + xy: 1271, 5 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-projector rotate: false - xy: 1083, 1037 + xy: 1851, 1065 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overdrive-projector-top rotate: false - xy: 1017, 905 + xy: 1917, 1065 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shock-mine rotate: false - xy: 1281, 187 + xy: 1355, 515 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -83,112 +83,112 @@ block-unloader index: -1 bridge-arrow rotate: false - xy: 1213, 629 + xy: 1594, 841 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 1077, 459 + xy: 1764, 841 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 1111, 493 + xy: 1798, 841 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 1145, 527 + xy: 1594, 807 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 center rotate: false - xy: 1179, 561 + xy: 1628, 807 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-0 rotate: false - xy: 616, 1241 + xy: 1513, 1759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-armored-conveyor-full rotate: false - xy: 616, 1241 + xy: 1513, 1759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-1 rotate: false - xy: 951, 1104 + xy: 1628, 1629 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-2 rotate: false - xy: 817, 782 + xy: 219, 848 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-3 rotate: false - xy: 1529, 739 + xy: 616, 1241 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-0 rotate: false - xy: 933, 143 + xy: 1083, 507 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-1 rotate: false - xy: 257, 848 + xy: 1547, 1759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-2 rotate: false - xy: 1547, 1759 + xy: 1662, 1629 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-3 rotate: false - xy: 1662, 1629 + xy: 253, 848 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-0 rotate: false - xy: 1563, 739 + xy: 287, 848 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-1 rotate: false - xy: 933, 109 + xy: 1083, 473 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -202,399 +202,399 @@ armored-conveyor-2-2 index: -1 armored-conveyor-2-3 rotate: false - xy: 1597, 739 + xy: 1083, 439 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-0 rotate: false - xy: 1631, 739 + xy: 1083, 405 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-1 rotate: false - xy: 616, 1207 + xy: 1083, 371 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-2 rotate: false - xy: 801, 58 + xy: 1083, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-3 rotate: false - xy: 801, 24 + xy: 1083, 303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-0 rotate: false - xy: 1665, 735 + xy: 1083, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-1 rotate: false - xy: 1699, 735 + xy: 1083, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-2 rotate: false - xy: 983, 697 + xy: 1083, 201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-3 rotate: false - xy: 1017, 697 + xy: 1083, 167 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 1009, 323 + xy: 1397, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 1043, 357 + xy: 1431, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 1077, 391 + xy: 1465, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 1111, 425 + xy: 1499, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 1145, 459 + xy: 1533, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 1179, 493 + xy: 1087, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 1213, 527 + xy: 1091, 685 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 1247, 561 + xy: 1121, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 1281, 595 + xy: 1125, 685 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 1315, 629 + xy: 1125, 651 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 1349, 663 + xy: 1125, 617 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 975, 255 + xy: 1125, 583 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 1009, 289 + xy: 1125, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 1043, 323 + xy: 1155, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 1077, 357 + xy: 1159, 685 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 1111, 391 + xy: 1159, 651 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 1145, 425 + xy: 1159, 617 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 1179, 459 + xy: 1159, 583 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 1213, 493 + xy: 1159, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor rotate: false - xy: 1485, 561 + xy: 1287, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-0 rotate: false - xy: 1145, 187 + xy: 1287, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-1 rotate: false - xy: 1179, 221 + xy: 1287, 277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-2 rotate: false - xy: 1213, 255 + xy: 1287, 243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-edge rotate: false - xy: 1247, 289 + xy: 1287, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-stack rotate: false - xy: 1281, 323 + xy: 1287, 175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 1485, 323 + xy: 1363, 685 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 1383, 187 + xy: 1363, 651 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 1417, 221 + xy: 1363, 617 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 1451, 255 + xy: 1363, 583 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 1485, 289 + xy: 1363, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 1417, 187 + xy: 1389, 515 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 1451, 221 + xy: 1389, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 1485, 255 + xy: 1389, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 1451, 187 + xy: 1389, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 1485, 221 + xy: 1389, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 1485, 187 + xy: 1389, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 975, 153 + xy: 1389, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 1009, 153 + xy: 1389, 277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 1043, 153 + xy: 1389, 243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 1077, 153 + xy: 1389, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 1111, 153 + xy: 1389, 175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 1145, 153 + xy: 1389, 141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 1179, 153 + xy: 1407, 107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1213, 153 + xy: 1407, 73 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cross rotate: false - xy: 1111, 357 + xy: 1151, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 distributor rotate: false - xy: 1399, 1103 + xy: 1587, 1103 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 inverted-sorter rotate: false - xy: 975, 187 + xy: 1185, 277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction rotate: false - xy: 1213, 357 + xy: 1223, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -629,56 +629,56 @@ mass-driver-base index: -1 overflow-gate rotate: false - xy: 1145, 221 + xy: 1261, 685 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 1315, 391 + xy: 1287, 515 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 1349, 425 + xy: 1287, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 1383, 459 + xy: 1287, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 1417, 493 + xy: 1287, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 1417, 391 + xy: 1321, 141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 1349, 255 + xy: 1355, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 underflow-gate rotate: false - xy: 1315, 153 + xy: 1393, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -713,14 +713,14 @@ blast-drill-top index: -1 drill-top rotate: false - xy: 1597, 1103 + xy: 1653, 1189 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-liquid rotate: false - xy: 1597, 1103 + xy: 1653, 1189 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -755,21 +755,21 @@ laser-drill-top index: -1 mechanical-drill rotate: false - xy: 721, 838 + xy: 1983, 1197 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-rotator rotate: false - xy: 951, 1037 + xy: 1917, 1131 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-top rotate: false - xy: 951, 971 + xy: 1983, 1131 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -804,84 +804,84 @@ oil-extractor-top index: -1 pneumatic-drill rotate: false - xy: 1281, 1037 + xy: 885, 948 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-rotator rotate: false - xy: 1215, 905 + xy: 951, 1014 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-top rotate: false - xy: 1281, 971 + xy: 951, 948 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 1545, 773 + xy: 1941, 933 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 1611, 773 + xy: 853, 882 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 1663, 1205 + xy: 919, 882 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 1663, 1139 + xy: 985, 882 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-border rotate: false - xy: 1187, 697 + xy: 2011, 1471 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-middle rotate: false - xy: 1009, 561 + xy: 2011, 753 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-select rotate: false - xy: 1077, 527 + xy: 1186, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 1111, 459 + xy: 1125, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 message rotate: false - xy: 1111, 187 + xy: 1257, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -895,189 +895,189 @@ place-arrow index: -1 bridge-conduit rotate: false - xy: 1247, 663 + xy: 1628, 841 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 975, 357 + xy: 1662, 841 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 975, 357 + xy: 1662, 841 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 1009, 391 + xy: 1696, 841 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 1043, 425 + xy: 1730, 841 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 1281, 663 + xy: 1730, 807 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 975, 323 + xy: 1764, 807 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 1009, 357 + xy: 1798, 807 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 1043, 391 + xy: 1053, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 1043, 391 + xy: 1053, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 1043, 391 + xy: 1053, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 1043, 391 + xy: 1053, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 1077, 425 + xy: 1091, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 1145, 493 + xy: 1159, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 1179, 527 + xy: 1193, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 1213, 561 + xy: 1227, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 1247, 595 + xy: 1261, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 1247, 595 + xy: 1261, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 1281, 629 + xy: 1295, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 1315, 663 + xy: 1329, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 975, 289 + xy: 1363, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 1315, 459 + xy: 1227, 617 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate rotate: false - xy: 1417, 561 + xy: 1253, 515 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate-top rotate: false - xy: 1451, 595 + xy: 1253, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 1485, 629 + xy: 1253, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 1077, 187 + xy: 1253, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 1111, 221 + xy: 1253, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1105,161 +1105,161 @@ liquid-tank-top index: -1 mechanical-pump rotate: false - xy: 1349, 459 + xy: 1253, 141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-pump-liquid rotate: false - xy: 1383, 493 + xy: 1271, 107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-liquid rotate: false - xy: 1383, 493 + xy: 1271, 107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-liquid rotate: false - xy: 1383, 493 + xy: 1271, 107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 1179, 255 + xy: 1261, 651 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 1213, 289 + xy: 1261, 617 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 1247, 323 + xy: 1261, 583 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 1281, 357 + xy: 1261, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-cap rotate: false - xy: 1349, 391 + xy: 1305, 107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-0 rotate: false - xy: 1383, 425 + xy: 1305, 73 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-1 rotate: false - xy: 1417, 459 + xy: 1305, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-2 rotate: false - xy: 1451, 493 + xy: 1305, 5 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-3 rotate: false - xy: 1485, 527 + xy: 1291, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-4 rotate: false - xy: 1179, 187 + xy: 1295, 685 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-5 rotate: false - xy: 1213, 221 + xy: 1295, 651 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-6 rotate: false - xy: 1247, 255 + xy: 1295, 617 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 1383, 391 + xy: 1321, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1417, 425 + xy: 1321, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1451, 459 + xy: 1321, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 1485, 493 + xy: 1321, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 1213, 187 + xy: 1321, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 1247, 221 + xy: 1321, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 1413, 1037 + xy: 1149, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1273,7 +1273,7 @@ thermal-pump index: -1 battery rotate: false - xy: 1051, 697 + xy: 1083, 133 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1294,21 +1294,21 @@ battery-large-top index: -1 battery-top rotate: false - xy: 1085, 697 + xy: 616, 1207 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 1213, 595 + xy: 1662, 807 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 1247, 629 + xy: 1696, 807 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1336,28 +1336,28 @@ differential-generator-top index: -1 diode rotate: false - xy: 1145, 391 + xy: 1151, 175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 diode-arrow rotate: false - xy: 1179, 425 + xy: 1151, 141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator rotate: false - xy: 1349, 595 + xy: 1185, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator-top rotate: false - xy: 1383, 629 + xy: 1185, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1413,49 +1413,49 @@ impact-reactor-plasma-3 index: -1 power-node rotate: false - xy: 1281, 289 + xy: 1295, 583 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 1347, 1037 + xy: 1017, 1014 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 power-source rotate: false - xy: 1315, 323 + xy: 1295, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 1349, 357 + xy: 1321, 515 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 1347, 905 + xy: 1083, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 1451, 425 + xy: 1339, 107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 1315, 221 + xy: 1355, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1469,14 +1469,14 @@ solar-panel-large index: -1 surge-tower rotate: false - xy: 1479, 839 + xy: 1083, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 885, 808 + xy: 1281, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1504,14 +1504,14 @@ thorium-reactor-lights index: -1 turbine-generator rotate: false - xy: 1347, 773 + xy: 1743, 925 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-top rotate: false - xy: 1413, 773 + xy: 1809, 933 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1546,119 +1546,119 @@ block-launcher index: -1 coal-centrifuge rotate: false - xy: 1388, 1235 + xy: 1440, 1235 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 1531, 1169 + xy: 1059, 1103 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 1597, 1169 + xy: 1125, 1103 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 1003, 1103 + xy: 1191, 1103 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator rotate: false - xy: 1069, 1103 + xy: 1257, 1103 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 1135, 1103 + xy: 1323, 1103 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 1201, 1103 + xy: 1389, 1103 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 graphite-press rotate: false - xy: 885, 1072 + xy: 1785, 1197 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 incinerator rotate: false - xy: 1417, 663 + xy: 1185, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 1349, 527 + xy: 1219, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 1179, 323 + xy: 1237, 5 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 kiln rotate: false - xy: 885, 1006 + xy: 1785, 1131 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 kiln-top rotate: false - xy: 885, 940 + xy: 1851, 1197 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 885, 940 + xy: 1851, 1197 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 liquid-source rotate: false - xy: 1213, 323 + xy: 1253, 277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-void rotate: false - xy: 1247, 357 + xy: 1253, 243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 1417, 527 + xy: 1271, 73 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1672,203 +1672,203 @@ multi-press index: -1 phase-weaver rotate: false - xy: 1149, 1037 + xy: 861, 1080 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 1083, 905 + xy: 927, 1080 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 1149, 971 + xy: 993, 1080 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 1215, 1037 + xy: 819, 1014 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 1149, 905 + xy: 819, 948 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 1281, 255 + xy: 1321, 277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 1315, 289 + xy: 1321, 243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 1281, 905 + xy: 1017, 948 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator rotate: false - xy: 1611, 971 + xy: 1413, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 1611, 905 + xy: 1545, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-spinner rotate: false - xy: 951, 839 + xy: 1479, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 1017, 839 + xy: 1545, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press rotate: false - xy: 1083, 839 + xy: 1611, 991 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame0 rotate: false - xy: 1149, 839 + xy: 1677, 991 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame1 rotate: false - xy: 1215, 839 + xy: 1743, 991 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame2 rotate: false - xy: 1281, 839 + xy: 1809, 999 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-liquid rotate: false - xy: 1347, 839 + xy: 1875, 999 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-top rotate: false - xy: 1413, 839 + xy: 1941, 999 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rock1 rotate: false - xy: 833, 373 + xy: 941, 166 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rock2 rotate: false - xy: 833, 323 + xy: 941, 116 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-boulder1 rotate: false - xy: 1485, 459 + xy: 1339, 73 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-boulder2 rotate: false - xy: 1247, 187 + xy: 1339, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder1 rotate: false - xy: 1451, 391 + xy: 1329, 583 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder2 rotate: false - xy: 1485, 425 + xy: 1329, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrock1 rotate: false - xy: 833, 173 + xy: 991, 666 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snowrock2 rotate: false - xy: 833, 123 + xy: 991, 616 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-cluster1 rotate: false - xy: 933, 219 + xy: 1083, 625 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster2 rotate: false - xy: 1487, 731 + xy: 1083, 583 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster3 rotate: false - xy: 933, 177 + xy: 1083, 541 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -1889,7 +1889,7 @@ white-tree-dead index: -1 container rotate: false - xy: 1520, 1235 + xy: 1572, 1235 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1938,21 +1938,21 @@ launch-pad-light index: -1 launchpod rotate: false - xy: 869, 1138 + xy: 844, 1212 size: 66, 64 orig: 66, 64 offset: 0, 0 index: -1 unloader rotate: false - xy: 1349, 153 + xy: 1397, 685 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader-center rotate: false - xy: 1383, 153 + xy: 1397, 651 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1966,21 +1966,21 @@ vault index: -1 arc-heat rotate: false - xy: 1628, 1629 + xy: 251, 27 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-1 rotate: false - xy: 1119, 697 + xy: 1059, 3 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-2 rotate: false - xy: 1983, 1303 + xy: 912, 1212 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2001,14 +2001,14 @@ block-4 index: -1 hail-heat rotate: false - xy: 933, 681 + xy: 2007, 1023 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 885, 874 + xy: 1917, 1197 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2029,35 +2029,35 @@ ripple-heat index: -1 salvo-heat rotate: false - xy: 1479, 1037 + xy: 1149, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 1413, 905 + xy: 1281, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 1479, 971 + xy: 1215, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch-heat rotate: false - xy: 1315, 255 + xy: 1325, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 1729, 1139 + xy: 919, 816 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2085,21 +2085,21 @@ block-forge index: -1 command-center rotate: false - xy: 1454, 1235 + xy: 1506, 1235 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dagger-factory rotate: false - xy: 1267, 1103 + xy: 1455, 1103 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dagger-factory-top rotate: false - xy: 1333, 1103 + xy: 1521, 1103 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2141,14 +2141,14 @@ naval-factory index: -1 rally-point rotate: false - xy: 1347, 971 + xy: 1083, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 repair-point-base rotate: false - xy: 1383, 357 + xy: 1321, 175 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2169,70 +2169,70 @@ revenant-factory-top index: -1 copper-wall rotate: false - xy: 1247, 527 + xy: 1151, 515 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-large rotate: false - xy: 1586, 1235 + xy: 1059, 1169 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door rotate: false - xy: 1213, 459 + xy: 1185, 515 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large rotate: false - xy: 1465, 1103 + xy: 721, 838 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 1531, 1103 + xy: 787, 838 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-open rotate: false - xy: 1247, 493 + xy: 1185, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 1451, 527 + xy: 1287, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large rotate: false - xy: 1083, 971 + xy: 1983, 1065 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-wall rotate: false - xy: 1315, 357 + xy: 1287, 141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-wall-large rotate: false - xy: 1215, 971 + xy: 885, 1014 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2260,84 +2260,84 @@ scrap-wall-huge3 index: -1 scrap-wall-large1 rotate: false - xy: 1479, 905 + xy: 1281, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large2 rotate: false - xy: 1545, 971 + xy: 1413, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large3 rotate: false - xy: 1545, 905 + xy: 1347, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large4 rotate: false - xy: 1611, 1037 + xy: 1479, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall2 rotate: false - xy: 1349, 289 + xy: 1329, 685 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 1383, 323 + xy: 1329, 651 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 1417, 357 + xy: 1329, 617 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 1417, 357 + xy: 1329, 617 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 1417, 255 + xy: 1373, 5 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large rotate: false - xy: 1545, 839 + xy: 1149, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 1451, 289 + xy: 1359, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 951, 773 + xy: 1347, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2351,35 +2351,35 @@ thruster index: -1 titanium-wall rotate: false - xy: 1247, 153 + xy: 1407, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large rotate: false - xy: 1281, 773 + xy: 1677, 925 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 bullet rotate: false - xy: 713, 784 + xy: 841, 704 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 bullet-back rotate: false - xy: 151, 7 + xy: 899, 762 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 casing rotate: false - xy: 409, 792 + xy: 1983, 1351 size: 8, 16 orig: 8, 16 offset: 0, 0 @@ -2393,7 +2393,7 @@ circle-end index: -1 circle-mid rotate: false - xy: 1519, 496 + xy: 2033, 1774 size: 1, 199 orig: 1, 199 offset: 0, 0 @@ -2407,56 +2407,56 @@ circle-shadow index: -1 error rotate: false - xy: 1793, 1048 + xy: 1761, 875 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 laser rotate: false - xy: 650, 1225 + xy: 2043, 1319 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 laser-end rotate: false - xy: 844, 1204 + xy: 1845, 1263 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 minelaser rotate: false - xy: 848, 1757 + xy: 650, 1225 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 minelaser-end rotate: false - xy: 795, 1130 + xy: 1919, 1263 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 missile rotate: false - xy: 2011, 1501 + xy: 2011, 901 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 missile-back rotate: false - xy: 2011, 1463 + xy: 2011, 863 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 particle rotate: false - xy: 1445, 731 + xy: 1059, 37 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -2470,49 +2470,49 @@ scale_marker index: -1 shell rotate: false - xy: 783, 92 + xy: 2011, 825 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shell-back rotate: false - xy: 219, 844 + xy: 2011, 787 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 transfer rotate: false - xy: 854, 1757 + xy: 2043, 1269 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 1281, 153 + xy: 1407, 5 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white rotate: false - xy: 2044, 1298 + xy: 848, 1604 size: 3, 3 orig: 3, 3 offset: 0, 0 index: -1 arc rotate: false - xy: 1513, 1759 + xy: 819, 914 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-arc-full rotate: false - xy: 1153, 697 + xy: 2011, 1505 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2526,56 +2526,56 @@ block-blast-drill-full index: -1 block-char-full rotate: false - xy: 1221, 697 + xy: 2011, 1437 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cliffs-full rotate: false - xy: 1255, 697 + xy: 1117, 507 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conduit-full rotate: false - xy: 1289, 697 + xy: 1117, 473 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conveyor-full rotate: false - xy: 1323, 697 + xy: 1117, 439 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 1323, 697 + xy: 1117, 439 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-craters-full rotate: false - xy: 1357, 697 + xy: 1117, 405 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cryofluidmixer-full rotate: false - xy: 937, 1138 + xy: 795, 1138 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-cultivator-full rotate: false - xy: 735, 26 + xy: 861, 1146 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2589,28 +2589,28 @@ block-cyclone-full index: -1 block-dark-metal-full rotate: false - xy: 1391, 697 + xy: 1117, 371 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-full rotate: false - xy: 1425, 697 + xy: 1117, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dunerocks-full rotate: false - xy: 1459, 697 + xy: 1117, 303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-duo-full rotate: false - xy: 1493, 697 + xy: 1117, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2624,56 +2624,56 @@ block-fuse-full index: -1 block-grass-full rotate: false - xy: 975, 663 + xy: 1117, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hail-full rotate: false - xy: 975, 629 + xy: 1117, 201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-holostone-full rotate: false - xy: 1009, 663 + xy: 1117, 167 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hotrock-full rotate: false - xy: 975, 595 + xy: 1117, 133 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-full rotate: false - xy: 1009, 629 + xy: 1101, 99 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-snow-full rotate: false - xy: 1043, 663 + xy: 1101, 65 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icerocks-full rotate: false - xy: 975, 561 + xy: 1101, 31 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ignarock-full rotate: false - xy: 1009, 595 + xy: 1135, 99 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2687,7 +2687,7 @@ block-impact-reactor-full index: -1 block-lancer-full rotate: false - xy: 1977, 1597 + xy: 927, 1146 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2701,7 +2701,7 @@ block-laser-drill-full index: -1 block-liquid-router-full rotate: false - xy: 1043, 629 + xy: 1135, 65 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2715,7 +2715,7 @@ block-liquid-tank-full index: -1 block-magmarock-full rotate: false - xy: 1077, 663 + xy: 1135, 31 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2743,7 +2743,7 @@ block-mass-driver-full index: -1 block-mechanical-drill-full rotate: false - xy: 1689, 1271 + xy: 1977, 1597 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2757,14 +2757,14 @@ block-meltdown-full index: -1 block-metal-floor-damaged-full rotate: false - xy: 975, 527 + xy: 895, 724 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-moss-full rotate: false - xy: 1043, 595 + xy: 1050, 848 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2778,91 +2778,91 @@ block-oil-extractor-full index: -1 block-ore-coal-full rotate: false - xy: 1077, 629 + xy: 1084, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-copper-full rotate: false - xy: 1111, 663 + xy: 1118, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-lead-full rotate: false - xy: 975, 493 + xy: 1152, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-scrap-full rotate: false - xy: 1009, 527 + xy: 1186, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-thorium-full rotate: false - xy: 1043, 561 + xy: 1220, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-titanium-full rotate: false - xy: 1077, 595 + xy: 1254, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pebbles-full rotate: false - xy: 1111, 629 + xy: 1288, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-phase-weaver-full rotate: false - xy: 1755, 1271 + xy: 743, 26 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-plated-conduit-full rotate: false - xy: 1145, 663 + xy: 1322, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pneumatic-drill-full rotate: false - xy: 1821, 1271 + xy: 978, 1212 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-pulse-conduit-full rotate: false - xy: 975, 459 + xy: 1356, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pulverizer-full rotate: false - xy: 1009, 493 + xy: 1390, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-repair-point-full rotate: false - xy: 1043, 527 + xy: 1424, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2876,77 +2876,77 @@ block-ripple-full index: -1 block-rock-full rotate: false - xy: 783, 680 + xy: 841, 446 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-rocks-full rotate: false - xy: 1077, 561 + xy: 1458, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-saltrocks-full rotate: false - xy: 1111, 595 + xy: 1492, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-salvo-full rotate: false - xy: 1887, 1271 + xy: 993, 1146 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-sand-boulder-full rotate: false - xy: 1145, 629 + xy: 1526, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-full rotate: false - xy: 1179, 663 + xy: 1560, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sandrocks-full rotate: false - xy: 975, 425 + xy: 1084, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scatter-full rotate: false - xy: 992, 1235 + xy: 1044, 1235 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-scorch-full rotate: false - xy: 1009, 459 + xy: 1118, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-full rotate: false - xy: 1043, 493 + xy: 1152, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall1 rotate: false - xy: 1043, 493 + xy: 1152, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2967,56 +2967,56 @@ scrap-wall-huge1 index: -1 block-scrap-wall-large-full rotate: false - xy: 1058, 1235 + xy: 1110, 1235 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-shale-boulder-full rotate: false - xy: 1111, 561 + xy: 1220, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-full rotate: false - xy: 1145, 595 + xy: 1254, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shalerocks-full rotate: false - xy: 1179, 629 + xy: 1288, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shrubs-full rotate: false - xy: 1213, 663 + xy: 1322, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-full rotate: false - xy: 975, 391 + xy: 1356, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snowrock-full rotate: false - xy: 783, 630 + xy: 841, 396 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-snowrocks-full rotate: false - xy: 1009, 425 + xy: 1390, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3030,189 +3030,189 @@ block-spectre-full index: -1 block-spore-cluster-full rotate: false - xy: 983, 731 + xy: 1611, 1061 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-spore-moss-full rotate: false - xy: 1043, 459 + xy: 1424, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-spore-press-full rotate: false - xy: 1124, 1235 + xy: 1176, 1235 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-sporerocks-full rotate: false - xy: 1077, 493 + xy: 1458, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-stone-full rotate: false - xy: 1111, 527 + xy: 1492, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-swarmer-full rotate: false - xy: 1190, 1235 + xy: 1242, 1235 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-tendrils-full rotate: false - xy: 1145, 561 + xy: 1526, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-titanium-conveyor-full rotate: false - xy: 1179, 595 + xy: 1560, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 1179, 595 + xy: 1560, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-water-extractor-full rotate: false - xy: 1256, 1235 + xy: 1308, 1235 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-wave-full rotate: false - xy: 1322, 1235 + xy: 1374, 1235 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-1-0 rotate: false - xy: 1281, 561 + xy: 1151, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-1 rotate: false - xy: 1315, 595 + xy: 1151, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-2 rotate: false - xy: 1349, 629 + xy: 1151, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-3 rotate: false - xy: 1383, 663 + xy: 1151, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-4 rotate: false - xy: 975, 221 + xy: 1151, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-5 rotate: false - xy: 1009, 255 + xy: 1151, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-6 rotate: false - xy: 1043, 289 + xy: 1151, 277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-7 rotate: false - xy: 1077, 323 + xy: 1151, 243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-2-0 rotate: false - xy: 1003, 1169 + xy: 1125, 1169 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-1 rotate: false - xy: 1069, 1169 + xy: 1191, 1169 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-2 rotate: false - xy: 1135, 1169 + xy: 1257, 1169 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-3 rotate: false - xy: 1201, 1169 + xy: 1323, 1169 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-4 rotate: false - xy: 1267, 1169 + xy: 1389, 1169 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-5 rotate: false - xy: 1333, 1169 + xy: 1455, 1169 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-6 rotate: false - xy: 1399, 1169 + xy: 1521, 1169 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-7 rotate: false - xy: 1465, 1169 + xy: 1587, 1169 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3394,7 +3394,7 @@ cyclone index: -1 duo rotate: false - xy: 1281, 527 + xy: 1185, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3408,665 +3408,665 @@ fuse index: -1 hail rotate: false - xy: 1315, 561 + xy: 1185, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-blast-compound-large rotate: false - xy: 1025, 731 + xy: 2007, 981 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-blast-compound-medium rotate: false - xy: 1043, 255 + xy: 1185, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-blast-compound-small rotate: false - xy: 1689, 1471 + xy: 251, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-blast-compound-tiny rotate: false - xy: 867, 848 + xy: 1091, 667 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-blast-compound-xlarge rotate: false - xy: 1793, 782 + xy: 1993, 1319 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-coal-large rotate: false - xy: 933, 639 + xy: 2007, 939 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-coal-medium rotate: false - xy: 1111, 323 + xy: 1185, 141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal-small rotate: false - xy: 1652, 1275 + xy: 783, 94 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-coal-tiny rotate: false - xy: 933, 790 + xy: 786, 1424 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-coal-xlarge rotate: false - xy: 1785, 732 + xy: 1993, 1269 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-copper-large rotate: false - xy: 1067, 731 + xy: 819, 1096 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-copper-medium rotate: false - xy: 1179, 391 + xy: 1169, 73 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper-small rotate: false - xy: 255, 35 + xy: 1689, 1471 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-copper-tiny rotate: false - xy: 985, 1120 + xy: 937, 1479 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-copper-xlarge rotate: false - xy: 1918, 1171 + xy: 1861, 833 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-graphite-large rotate: false - xy: 933, 597 + xy: 1638, 1259 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-graphite-medium rotate: false - xy: 1247, 459 + xy: 1203, 107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite-small rotate: false - xy: 787, 878 + xy: 1051, 922 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-graphite-tiny rotate: false - xy: 867, 830 + xy: 391, 792 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-graphite-xlarge rotate: false - xy: 1845, 1098 + xy: 1911, 825 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-lead-large rotate: false - xy: 1109, 731 + xy: 1041, 625 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-lead-medium rotate: false - xy: 1315, 527 + xy: 1203, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead-small rotate: false - xy: 2018, 1277 + xy: 1050, 822 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-lead-tiny rotate: false - xy: 867, 812 + xy: 982, 1358 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-lead-xlarge rotate: false - xy: 1843, 1048 + xy: 1961, 833 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-metaglass-large rotate: false - xy: 933, 555 + xy: 1041, 583 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-metaglass-medium rotate: false - xy: 1383, 595 + xy: 1203, 5 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass-small rotate: false - xy: 1953, 1311 + xy: 1832, 849 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-metaglass-tiny rotate: false - xy: 848, 1609 + xy: 1059, 1085 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-metaglass-xlarge rotate: false - xy: 1843, 998 + xy: 809, 46 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-phase-fabric-large rotate: false - xy: 1151, 731 + xy: 1041, 541 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-phase-fabric-medium rotate: false - xy: 1451, 663 + xy: 1193, 685 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric-small rotate: false - xy: 2011, 1437 + xy: 1567, 811 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-phase-fabric-tiny rotate: false - xy: 786, 1424 + xy: 898, 1609 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-phase-fabric-xlarge rotate: false - xy: 1843, 948 + xy: 859, 46 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-plastanium-large rotate: false - xy: 933, 513 + xy: 1041, 499 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-plastanium-medium rotate: false - xy: 1043, 221 + xy: 1193, 617 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium-small rotate: false - xy: 291, 856 + xy: 1397, 625 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-plastanium-tiny rotate: false - xy: 937, 1479 + xy: 795, 1120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-plastanium-xlarge rotate: false - xy: 1843, 898 + xy: 1961, 783 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-pyratite-large rotate: false - xy: 1193, 731 + xy: 1041, 457 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-pyratite-medium rotate: false - xy: 1111, 289 + xy: 1193, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite-small rotate: false - xy: 1417, 161 + xy: 1689, 1445 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-pyratite-tiny rotate: false - xy: 391, 792 + xy: 481, 8 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-pyratite-xlarge rotate: false - xy: 1843, 848 + xy: 953, 716 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-sand-large rotate: false - xy: 933, 471 + xy: 1041, 415 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-sand-medium rotate: false - xy: 1179, 357 + xy: 1219, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand-small rotate: false - xy: 1689, 1445 + xy: 1051, 896 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-sand-tiny rotate: false - xy: 481, 8 + xy: 1696, 1645 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-sand-xlarge rotate: false - xy: 1843, 798 + xy: 1003, 717 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-scrap-large rotate: false - xy: 1235, 731 + xy: 1041, 373 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-scrap-medium rotate: false - xy: 1247, 425 + xy: 1219, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap-small rotate: false - xy: 787, 852 + xy: 1832, 823 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-scrap-tiny rotate: false - xy: 982, 1358 + xy: 1696, 1627 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-scrap-xlarge rotate: false - xy: 1843, 748 + xy: 891, 654 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-silicon-large rotate: false - xy: 933, 429 + xy: 1041, 331 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-silicon-medium rotate: false - xy: 1315, 493 + xy: 1219, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon-small rotate: false - xy: 2018, 1251 + xy: 1397, 599 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-silicon-tiny rotate: false - xy: 795, 1112 + xy: 895, 706 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-silicon-xlarge rotate: false - xy: 1835, 698 + xy: 891, 604 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-spore-pod-large rotate: false - xy: 1277, 731 + xy: 1041, 289 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-spore-pod-medium rotate: false - xy: 1417, 595 + xy: 1219, 243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod-small rotate: false - xy: 1443, 161 + xy: 1397, 573 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-tiny rotate: false - xy: 1696, 1645 + xy: 809, 102 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-spore-pod-xlarge rotate: false - xy: 1885, 698 + xy: 891, 554 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-surge-alloy-large rotate: false - xy: 933, 387 + xy: 1041, 247 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-surge-alloy-medium rotate: false - xy: 1485, 663 + xy: 1219, 175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy-small rotate: false - xy: 2018, 1225 + xy: 293, 822 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-tiny rotate: false - xy: 1696, 1627 + xy: 1397, 555 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-surge-alloy-xlarge rotate: false - xy: 1853, 1156 + xy: 891, 504 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-thorium-large rotate: false - xy: 1319, 731 + xy: 1041, 205 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-thorium-medium rotate: false - xy: 1077, 221 + xy: 1237, 107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium-small rotate: false - xy: 1469, 161 + xy: 1093, 5 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-thorium-tiny rotate: false - xy: 866, 1609 + xy: 1145, 13 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-thorium-xlarge rotate: false - xy: 1968, 1253 + xy: 891, 454 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-titanium-large rotate: false - xy: 933, 345 + xy: 1041, 163 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-titanium-medium rotate: false - xy: 1145, 289 + xy: 1237, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium-small rotate: false - xy: 2018, 1199 + xy: 1119, 5 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-tiny rotate: false - xy: 786, 1406 + xy: 1884, 815 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-titanium-xlarge rotate: false - xy: 1968, 1203 + xy: 891, 404 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lancer rotate: false - xy: 819, 866 + xy: 1851, 1131 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 liquid-cryofluid-large rotate: false - xy: 1361, 731 + xy: 1041, 121 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-cryofluid-medium rotate: false - xy: 1281, 425 + xy: 1227, 651 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid-small rotate: false - xy: 2018, 1173 + xy: 1053, 796 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-cryofluid-tiny rotate: false - xy: 955, 1479 + xy: 786, 1406 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-cryofluid-xlarge rotate: false - xy: 1893, 848 + xy: 891, 104 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-oil-large rotate: false - xy: 933, 303 + xy: 809, 4 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-oil-medium rotate: false - xy: 1383, 527 + xy: 1227, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil-small rotate: false - xy: 255, 9 + xy: 1053, 770 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-oil-tiny rotate: false - xy: 499, 8 + xy: 955, 1479 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-oil-xlarge rotate: false - xy: 1893, 798 + xy: 941, 666 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-slag-large rotate: false - xy: 1403, 731 + xy: 851, 4 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-slag-medium rotate: false - xy: 1179, 289 + xy: 1253, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag-small rotate: false - xy: 1495, 161 + xy: 1832, 797 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4080,42 +4080,42 @@ liquid-slag-tiny index: -1 liquid-slag-xlarge rotate: false - xy: 1893, 748 + xy: 941, 616 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-water-large rotate: false - xy: 933, 261 + xy: 1059, 79 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-water-medium rotate: false - xy: 1315, 425 + xy: 1253, 175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water-small rotate: false - xy: 2018, 1147 + xy: 1858, 807 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-water-tiny rotate: false - xy: 884, 1609 + xy: 916, 1609 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-water-xlarge rotate: false - xy: 1935, 698 + xy: 941, 566 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4136,7 +4136,7 @@ meltdown index: -1 repair-point rotate: false - xy: 1349, 323 + xy: 1321, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4150,21 +4150,21 @@ ripple index: -1 salvo rotate: false - xy: 1413, 971 + xy: 1215, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scatter rotate: false - xy: 1545, 1037 + xy: 1347, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch rotate: false - xy: 1281, 221 + xy: 1339, 5 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4178,126 +4178,133 @@ spectre index: -1 splash-0 rotate: false - xy: 1383, 289 + xy: 1355, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-1 rotate: false - xy: 1417, 323 + xy: 1355, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-10 rotate: false - xy: 1349, 187 + xy: 1373, 73 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-11 rotate: false - xy: 1383, 221 + xy: 1373, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-2 rotate: false - xy: 1451, 357 + xy: 1355, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-3 rotate: false - xy: 1485, 391 + xy: 1355, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-4 rotate: false - xy: 1315, 187 + xy: 1355, 277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-5 rotate: false - xy: 1349, 221 + xy: 1355, 243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-6 rotate: false - xy: 1383, 255 + xy: 1355, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-7 rotate: false - xy: 1417, 289 + xy: 1355, 175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-8 rotate: false - xy: 1451, 323 + xy: 1355, 141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-9 rotate: false - xy: 1485, 357 + xy: 1373, 107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer rotate: false - xy: 1611, 839 + xy: 1215, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-alpha-full rotate: false - xy: 883, 558 + xy: 991, 366 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 +unit-cix-full + rotate: false + xy: 481, 26 + size: 88, 64 + orig: 88, 64 + offset: 0, 0 + index: -1 unit-crawler-full rotate: false - xy: 883, 508 + xy: 991, 316 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-dagger-full rotate: false - xy: 883, 458 + xy: 991, 266 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-draug-full rotate: false - xy: 883, 408 + xy: 991, 216 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-eruptor-full rotate: false - xy: 481, 26 + xy: 571, 26 size: 88, 64 orig: 88, 64 offset: 0, 0 @@ -4311,7 +4318,7 @@ unit-fortress-full index: -1 unit-ghoul-full rotate: false - xy: 918, 1204 + xy: 770, 1204 size: 72, 72 orig: 72, 72 offset: 0, 0 @@ -4325,7 +4332,7 @@ unit-oculon-full index: -1 unit-phantom-full rotate: false - xy: 1677, 769 + xy: 713, 780 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -4339,189 +4346,189 @@ unit-reaper-full index: -1 unit-spirit-full rotate: false - xy: 883, 358 + xy: 991, 166 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-tau-full rotate: false - xy: 1735, 791 + xy: 841, 758 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 unit-titan-full rotate: false - xy: 1479, 773 + xy: 1875, 933 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-vanguard-full rotate: false - xy: 883, 308 + xy: 991, 116 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-wraith-full rotate: false - xy: 883, 258 + xy: 1009, 66 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wave rotate: false - xy: 1729, 1205 + xy: 853, 816 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 1009, 221 + xy: 1185, 243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 1077, 289 + xy: 1185, 175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 1145, 357 + xy: 1169, 107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 1213, 425 + xy: 1169, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 1281, 493 + xy: 1203, 73 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 1349, 561 + xy: 1169, 5 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 1417, 629 + xy: 1189, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 1009, 187 + xy: 1193, 651 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 1077, 255 + xy: 1193, 583 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 1145, 323 + xy: 1219, 515 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 1213, 391 + xy: 1219, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 1281, 459 + xy: 1219, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod rotate: false - xy: 1383, 561 + xy: 1219, 277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 1451, 629 + xy: 1219, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 1043, 187 + xy: 1219, 141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 1111, 255 + xy: 1237, 73 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 1247, 391 + xy: 1227, 685 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 1349, 493 + xy: 1227, 583 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 1145, 255 + xy: 1253, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 1281, 391 + xy: 1253, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blank rotate: false - xy: 219, 841 + xy: 1050, 819 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -4535,21 +4542,21 @@ circle index: -1 shape-3 rotate: false - xy: 1795, 1206 + xy: 985, 817 size: 63, 63 orig: 63, 63 offset: 0, 0 index: -1 alpha rotate: false - xy: 205, 11 + xy: 841, 654 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-cell rotate: false - xy: 1918, 1221 + xy: 841, 604 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4582,93 +4589,114 @@ chaos-array-leg orig: 128, 128 offset: 0, 0 index: -1 +cix + rotate: false + xy: 1, 1 + size: 88, 64 + orig: 88, 64 + offset: 0, 0 + index: -1 +eruptor + rotate: false + xy: 1, 1 + size: 88, 64 + orig: 88, 64 + offset: 0, 0 + index: -1 +cix-leg + rotate: false + xy: 848, 1609 + size: 48, 16 + orig: 48, 16 + offset: 0, 0 + index: -1 crawler rotate: false - xy: 783, 580 + xy: 841, 346 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-base rotate: false - xy: 783, 530 + xy: 841, 296 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-cell rotate: false - xy: 783, 480 + xy: 841, 246 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-leg rotate: false - xy: 783, 430 + xy: 841, 196 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger rotate: false - xy: 783, 380 + xy: 841, 146 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 783, 330 + xy: 151, 11 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 783, 280 + xy: 201, 11 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta rotate: false - xy: 783, 230 + xy: 953, 766 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-base rotate: false - xy: 783, 180 + xy: 1003, 767 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-cell rotate: false - xy: 783, 130 + xy: 841, 96 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-leg rotate: false - xy: 1735, 741 + xy: 1611, 875 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 draug rotate: false - xy: 817, 816 + xy: 1661, 875 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 draug-cell rotate: false - xy: 1795, 1098 + xy: 1711, 875 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4701,16 +4729,9 @@ eradicator-leg orig: 152, 124 offset: 0, 0 index: -1 -eruptor - rotate: false - xy: 1, 1 - size: 88, 64 - orig: 88, 64 - offset: 0, 0 - index: -1 eruptor-base rotate: false - xy: 819, 1064 + xy: 1653, 1123 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4724,7 +4745,7 @@ eruptor-cell index: -1 eruptor-leg rotate: false - xy: 819, 998 + xy: 1719, 1189 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4738,7 +4759,7 @@ fortress index: -1 fortress-base rotate: false - xy: 819, 932 + xy: 1719, 1123 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4752,7 +4773,7 @@ fortress-cell index: -1 fortress-leg rotate: false - xy: 571, 30 + xy: 661, 30 size: 80, 60 orig: 80, 60 offset: 0, 0 @@ -4766,7 +4787,7 @@ ghoul index: -1 ghoul-cell rotate: false - xy: 770, 1204 + xy: 1771, 1263 size: 72, 72 orig: 72, 72 offset: 0, 0 @@ -4780,28 +4801,28 @@ glaive index: -1 glaive-cell rotate: false - xy: 1795, 1148 + xy: 783, 642 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 javelin rotate: false - xy: 1968, 1153 + xy: 891, 354 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 javelin-cell rotate: false - xy: 1893, 1048 + xy: 891, 304 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 javelin-shield rotate: false - xy: 1893, 998 + xy: 891, 254 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4829,77 +4850,77 @@ oculon index: -1 oculon-base rotate: false - xy: 833, 623 + xy: 941, 416 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 oculon-cell rotate: false - xy: 833, 573 + xy: 941, 366 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 oculon-leg rotate: false - xy: 833, 523 + xy: 941, 316 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 omega rotate: false - xy: 653, 10 + xy: 1689, 1255 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 omega-armor rotate: false - xy: 1017, 971 + xy: 1785, 1065 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 omega-base rotate: false - xy: 1860, 1213 + xy: 783, 584 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 omega-cell rotate: false - xy: 1677, 943 + xy: 783, 526 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 omega-leg rotate: false - xy: 1735, 1081 + xy: 783, 468 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 phantom rotate: false - xy: 1677, 885 + xy: 783, 410 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 phantom-cell rotate: false - xy: 1735, 1023 + xy: 783, 352 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 power-cell rotate: false - xy: 1677, 827 + xy: 783, 294 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -4934,70 +4955,70 @@ revenant-cell index: -1 spirit rotate: false - xy: 883, 758 + xy: 991, 566 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spirit-cell rotate: false - xy: 883, 708 + xy: 991, 516 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau rotate: false - xy: 1735, 965 + xy: 783, 236 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 tau-base rotate: false - xy: 883, 658 + xy: 991, 466 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau-cell rotate: false - xy: 1735, 907 + xy: 783, 178 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 tau-leg rotate: false - xy: 883, 608 + xy: 991, 416 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titan rotate: false - xy: 1017, 773 + xy: 1413, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-base rotate: false - xy: 1083, 773 + xy: 1479, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-cell rotate: false - xy: 1149, 773 + xy: 1545, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-leg rotate: false - xy: 1215, 773 + xy: 1611, 925 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -5011,49 +5032,49 @@ trident index: -1 trident-cell rotate: false - xy: 1735, 849 + xy: 783, 120 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 vanguard rotate: false - xy: 883, 208 + xy: 959, 16 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 vanguard-cell rotate: false - xy: 883, 158 + xy: 1009, 16 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wraith rotate: false - xy: 933, 723 + xy: 1041, 667 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 artillery rotate: false - xy: 767, 780 + xy: 841, 546 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 beam-weapon rotate: false - xy: 783, 730 + xy: 841, 496 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 chaos rotate: false - xy: 1677, 1001 + xy: 783, 700 size: 56, 136 orig: 56, 136 offset: 0, 0 @@ -5067,91 +5088,91 @@ eradication index: -1 eruption rotate: false - xy: 1793, 990 + xy: 1811, 875 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 flakgun rotate: false - xy: 1793, 940 + xy: 1861, 883 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flamethrower rotate: false - xy: 1793, 882 + xy: 1911, 875 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 heal-weapon rotate: false - xy: 1793, 832 + xy: 1961, 883 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 large-weapon rotate: false - xy: 1893, 948 + xy: 891, 204 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lich-missiles rotate: false - xy: 1893, 898 + xy: 891, 154 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles rotate: false - xy: 833, 723 + xy: 941, 516 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mount-weapon rotate: false - xy: 833, 673 + xy: 941, 466 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 reaper-weapon rotate: false - xy: 833, 473 + xy: 941, 266 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 revenant-missiles rotate: false - xy: 833, 423 + xy: 941, 216 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-basic-weapon rotate: false - xy: 833, 273 + xy: 909, 54 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-weapon rotate: false - xy: 833, 223 + xy: 959, 66 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 weapon rotate: false - xy: 883, 108 + xy: 909, 4 size: 48, 48 orig: 48, 48 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 4520efad7a..af37d7929a 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 fe865f7278..2d4c27988d 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 83151fe2da..e216ce0e01 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1274,7 +1274,7 @@ public class Blocks implements ContentList{ //region storage coreShard = new CoreBlock("core-shard"){{ - requirements(Category.effect, BuildVisibility.debugOnly, ItemStack.with()); + requirements(Category.effect, BuildVisibility.hidden, ItemStack.with()); alwaysUnlocked = true; health = 1100; @@ -1283,7 +1283,7 @@ public class Blocks implements ContentList{ }}; coreFoundation = new CoreBlock("core-foundation"){{ - requirements(Category.effect, BuildVisibility.debugOnly, ItemStack.with()); + requirements(Category.effect, BuildVisibility.hidden, ItemStack.with()); health = 2000; itemCapacity = 9000; @@ -1291,7 +1291,7 @@ public class Blocks implements ContentList{ }}; coreNucleus = new CoreBlock("core-nucleus"){{ - requirements(Category.effect, BuildVisibility.debugOnly, ItemStack.with()); + requirements(Category.effect, BuildVisibility.hidden, ItemStack.with()); health = 4000; itemCapacity = 13000; diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 7748f7acc4..6f2fed2344 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -17,6 +17,9 @@ public class UnitTypes implements ContentList{ //ground + builder public static @EntityDef({Unitc.class, Mechc.class, Builderc.class}) UnitType oculon, tau; + //legs + public static @EntityDef({Unitc.class, Legsc.class}) UnitType cix; + //air public static @EntityDef({Unitc.class}) UnitType wraith, reaper, ghoul, revenant, lich; @@ -65,6 +68,15 @@ public class UnitTypes implements ContentList{ }}); }}; + cix = new UnitType("cix"){{ + drag = 0.1f; + speed = 0.8f; + hitsize = 8f; + health = 130; + + legCount = 6; + }}; + titan = new UnitType("titan"){{ dagger.upgrade = this; tier = 2; diff --git a/core/src/mindustry/entities/Leg.java b/core/src/mindustry/entities/Leg.java new file mode 100644 index 0000000000..a5efa0d900 --- /dev/null +++ b/core/src/mindustry/entities/Leg.java @@ -0,0 +1,8 @@ +package mindustry.entities; + +import arc.math.geom.*; + +public class Leg{ + public final Vec2 joint = new Vec2(), base = new Vec2(), target = new Vec2(); + public boolean moving = false; +} diff --git a/core/src/mindustry/entities/comp/BlockUnitComp.java b/core/src/mindustry/entities/comp/BlockUnitComp.java index 77e9fc17b4..3270da0571 100644 --- a/core/src/mindustry/entities/comp/BlockUnitComp.java +++ b/core/src/mindustry/entities/comp/BlockUnitComp.java @@ -1,6 +1,5 @@ package mindustry.entities.comp; -import arc.util.ArcAnnotate.*; import mindustry.annotations.Annotations.*; import mindustry.game.*; import mindustry.gen.*; @@ -9,7 +8,7 @@ import static mindustry.Vars.tilesize; @Component abstract class BlockUnitComp implements Unitc{ - @ReadOnly @NonNull Tilec tile; + @ReadOnly Tilec tile; public void tile(Tilec tile){ this.tile = tile; @@ -33,11 +32,13 @@ abstract class BlockUnitComp implements Unitc{ @Replace public boolean dead(){ - return tile.dead(); + return tile == null || tile.dead(); } @Replace public void team(Team team){ - tile.team(team); + if(tile != null){ + tile.team(team); + } } } diff --git a/core/src/mindustry/entities/comp/LegsComp.java b/core/src/mindustry/entities/comp/LegsComp.java new file mode 100644 index 0000000000..94defdd804 --- /dev/null +++ b/core/src/mindustry/entities/comp/LegsComp.java @@ -0,0 +1,75 @@ +package mindustry.entities.comp; + +import arc.math.*; +import arc.util.*; +import mindustry.annotations.Annotations.*; +import mindustry.entities.*; +import mindustry.gen.*; + +@Component +abstract class LegsComp implements Posc, Rotc, Hitboxc, Flyingc, Unitc{ + @Import float x, y, rotation, elevation; + + transient Leg[] legs = {}; + transient float totalLength; + + @Override + public void update(){ + int count = type().legCount; + float legLength = type().legLength; + + if(legs.length != type().legCount){ + this.legs = new Leg[count]; + + float spacing = 360f / count; + + for(int i = 0; i < legs.length; i++){ + Leg l = new Leg(); + + l.joint.trns(i * spacing + rotation, legLength/2f).add(x, y); + l.base.trns(i * spacing + rotation, legLength).add(x, y); + + legs[i] = l; + } + } + + float moveSpeed = 0.1f; + + int div = Math.max(legs.length / 3, 2); + + float moveSpace = legLength / 1.6f / (div / 2f); + + elevation = 0.5f; + + totalLength += Mathf.dst(deltaX(), deltaY()); + + int stage = (int)(totalLength / moveSpace); + int odd = stage % div; + float movespace = 360f / legs.length / 4f; + float trns = vel().len() * 12.5f * div/2f; + + Tmp.v4.trns(rotation, trns); + + for(int i = 0; i < legs.length; i++){ + float dstRot = rotation + 360f / legs.length * i + (360f / legs.length / 2f); + float rot2 = Angles.moveToward(dstRot, rotation + (Angles.angleDist(dstRot, rotation) < 90f ? 180f : 0), movespace); + + //float ox = Mathf.randomSeedRange(i, 6f), oy = Mathf.randomSeedRange(i, 6f); + + Leg l = legs[i]; + + //Tmp.v3.trns(Mathf.randomSeed(stage + i*3, 360f), 10f); + Tmp.v3.setZero(); + + Tmp.v1.trns(dstRot, legLength).add(x, y).add(Tmp.v3).add(Tmp.v4); + Tmp.v2.trns(rot2, legLength / 2f).add(x, y).add(Tmp.v3).add(Tmp.v4); + + if(i % div == odd){ + l.base.lerpDelta(Tmp.v1, moveSpeed); + l.joint.lerpDelta(Tmp.v2, moveSpeed / 4f); + } + + l.joint.lerpDelta(Tmp.v2, moveSpeed / 4f); + } + } +} diff --git a/core/src/mindustry/graphics/Pal.java b/core/src/mindustry/graphics/Pal.java index 3d6a533ca9..a7f40ca968 100644 --- a/core/src/mindustry/graphics/Pal.java +++ b/core/src/mindustry/graphics/Pal.java @@ -15,6 +15,7 @@ public class Pal{ bulletYellowBack = Color.valueOf("f9c27a"), darkMetal = Color.valueOf("6e7080"), + darkerMetal = Color.valueOf("565666"), missileYellow = Color.valueOf("ffd2ae"), missileYellowBack = Color.valueOf("e58956"), diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index 4b795ee748..70e6eafab1 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -14,6 +14,7 @@ import arc.util.ArcAnnotate.*; import mindustry.ai.types.*; import mindustry.annotations.Annotations.*; import mindustry.ctype.*; +import mindustry.entities.*; import mindustry.entities.units.*; import mindustry.game.*; import mindustry.gen.*; @@ -38,6 +39,8 @@ public class UnitType extends UnlockableContent{ public boolean targetAir = true, targetGround = true; public boolean faceTarget = true, isCounted = true, lowAltitude = false; public boolean canBoost = false; + public int legCount = 4; + public float legLength = 24f; public float sway = 1f; public int itemCapacity = 30; @@ -140,13 +143,17 @@ public class UnitType extends UnlockableContent{ Draw.z(z - 0.02f); if(legs != null){ - drawLegs(legs); + drawMech(legs); float ft = Mathf.sin(legs.walkTime(), 3f, 3f); legOffset.trns(legs.baseRotation(), 0f, Mathf.lerp(ft * 0.18f * sway, 0f, unit.elevation())); unit.trns(legOffset.x, legOffset.y); } + if(unit instanceof Legsc){ + drawLegs((Legsc)unit); + } + Draw.z(Math.min(z - 0.01f, Layer.bullet - 1f)); drawOcclusion(unit); @@ -309,7 +316,33 @@ public class UnitType extends UnlockableContent{ } } - public void drawLegs(Mechc unit){ + public void drawLegs(Legsc unit){ + Leg[] legs = unit.legs(); + + Lines.stroke(4f, Color.gray); + float srad = 2.1f; + + for(Leg leg : legs){ + + Draw.color(); + + Lines.line(legRegion, unit.x(), unit.y(), leg.joint.x, leg.joint.y, CapStyle.none, 0); + Lines.line(legRegion, leg.joint.x, leg.joint.y, leg.base.x, leg.base.y, CapStyle.none, 0); + + Draw.color(Pal.darkMetal); + Fill.circle(leg.joint.x, leg.joint.y, srad); + + Draw.color(Pal.darkerMetal); + Fill.circle(leg.base.x, leg.base.y, srad); + + Draw.color(); + //Lines.line(unit.x(), unit.y(), leg.base.x, leg.base.y); + } + + Draw.reset(); + } + + public void drawMech(Mechc unit){ Draw.reset(); Draw.mixcol(Color.white, unit.hitTime()); diff --git a/core/src/mindustry/world/blocks/liquid/Conduit.java b/core/src/mindustry/world/blocks/liquid/Conduit.java index a26b3d66c3..7b5101d2d3 100644 --- a/core/src/mindustry/world/blocks/liquid/Conduit.java +++ b/core/src/mindustry/world/blocks/liquid/Conduit.java @@ -22,7 +22,7 @@ public class Conduit extends LiquidBlock implements Autotiler{ public Color botColor = Color.valueOf("565656"); public @Load(value = "@-top-#", length = 7) TextureRegion[] topRegions; - public @Load(value = "@-bottom-#", length = 7, fallback = "conduit") TextureRegion[] botRegions; + public @Load(value = "@-bottom-#", length = 7, fallback = "conduit-bottom-#") TextureRegion[] botRegions; public float leakResistance = 1.5f; @@ -44,8 +44,6 @@ public class Conduit extends LiquidBlock implements Autotiler{ Draw.alpha(0.5f); Draw.rect(botRegions[bits[0]], req.drawx(), req.drawy(), req.rotation * 90); Draw.color(); - - Draw.rect(topRegions[bits[0]], req.drawx(), req.drawy(), req.rotation * 90); }