diff --git a/core/assets-raw/sprites/pack.json b/core/assets-raw/sprites/pack.json index 2612f17acc..20fcb26963 100644 --- a/core/assets-raw/sprites/pack.json +++ b/core/assets-raw/sprites/pack.json @@ -4,5 +4,6 @@ flattenPaths: true, maxWidth: 2048, maxHeight: 2048, - fast: true + fast: true, + bleedIterations: 4 } diff --git a/core/assets-raw/sprites/units/omega.png b/core/assets-raw/sprites/units/omega.png index c87d423365..01ce5ebe35 100644 Binary files a/core/assets-raw/sprites/units/omega.png and b/core/assets-raw/sprites/units/omega.png differ diff --git a/core/assets-raw/sprites/units/tau-base.png b/core/assets-raw/sprites/units/tau-base.png index 6c83eaa41a..28386147bf 100644 Binary files a/core/assets-raw/sprites/units/tau-base.png and b/core/assets-raw/sprites/units/tau-base.png differ diff --git a/core/assets-raw/sprites/units/tau-cell.png b/core/assets-raw/sprites/units/tau-cell.png index 805329d07a..f690a34497 100644 Binary files a/core/assets-raw/sprites/units/tau-cell.png and b/core/assets-raw/sprites/units/tau-cell.png differ diff --git a/core/assets-raw/sprites/units/tau-leg.png b/core/assets-raw/sprites/units/tau-leg.png index cf45f61eb9..eaab48a296 100644 Binary files a/core/assets-raw/sprites/units/tau-leg.png and b/core/assets-raw/sprites/units/tau-leg.png differ diff --git a/core/assets-raw/sprites/units/tau.png b/core/assets-raw/sprites/units/tau.png index 0dfdea349c..baf46e3fa6 100644 Binary files a/core/assets-raw/sprites/units/tau.png and b/core/assets-raw/sprites/units/tau.png differ diff --git a/core/assets-raw/sprites/weapons/heal-weapon.png b/core/assets-raw/sprites/weapons/heal-weapon.png index 94b67429ce..e7b61dd884 100644 Binary files a/core/assets-raw/sprites/weapons/heal-weapon.png and b/core/assets-raw/sprites/weapons/heal-weapon.png differ diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index 40229caebc..789999603d 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -232,3 +232,4 @@ 63512=crater|crater 63511=naval-factory|block-naval-factory-medium 63510=air-factory|block-air-factory-medium +63509=basic-reconstructor|block-basic-reconstructor-medium diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png index 358ce26fd0..9d8aa3bcf8 100644 Binary files a/core/assets/sprites/block_colors.png and b/core/assets/sprites/block_colors.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index b37246bbed..8eab1cc5d8 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -20,567 +20,567 @@ force-projector-top index: -1 mend-projector rotate: false - xy: 1067, 971 + xy: 1017, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mend-projector-top rotate: false - xy: 1133, 971 + xy: 1083, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mender rotate: false - xy: 1899, 999 + xy: 1753, 472 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mender-top rotate: false - xy: 1933, 1203 + xy: 1787, 506 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-projector rotate: false - xy: 1265, 971 + xy: 1083, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overdrive-projector-top rotate: false - xy: 1331, 971 + xy: 1149, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shock-mine rotate: false - xy: 1963, 829 + xy: 1583, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-arrow rotate: false - xy: 1333, 369 + xy: 869, 22 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 1117, 135 + xy: 975, 271 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 1151, 135 + xy: 975, 237 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 1185, 169 + xy: 975, 203 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 center rotate: false - xy: 1185, 135 + xy: 975, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-0 rotate: false - xy: 819, 906 + xy: 1628, 1629 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-armored-conveyor-full rotate: false - xy: 819, 906 + xy: 1628, 1629 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-1 rotate: false - xy: 257, 848 + xy: 951, 1104 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-2 rotate: false - xy: 1547, 1759 + xy: 1443, 697 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-3 rotate: false - xy: 1662, 1629 + xy: 257, 848 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-0 rotate: false - xy: 1581, 1759 + xy: 1547, 1759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-1 rotate: false - xy: 616, 1203 + xy: 1662, 1629 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-2 rotate: false - xy: 973, 79 + xy: 1477, 697 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-3 rotate: false - xy: 970, 45 + xy: 1581, 1759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-0 rotate: false - xy: 916, 10 + xy: 1511, 697 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-1 rotate: false - xy: 950, 10 + xy: 1545, 697 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-2 rotate: false - xy: 984, 11 + xy: 1579, 697 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-3 rotate: false - xy: 1004, 45 + xy: 1613, 697 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-0 rotate: false - xy: 1007, 79 + xy: 616, 1203 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-1 rotate: false - xy: 1018, 11 + xy: 1647, 697 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-2 rotate: false - xy: 1038, 45 + xy: 801, 58 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-3 rotate: false - xy: 1052, 11 + xy: 801, 24 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-0 rotate: false - xy: 1688, 1237 + xy: 835, 74 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-1 rotate: false - xy: 1722, 1237 + xy: 835, 40 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-2 rotate: false - xy: 1756, 1237 + xy: 835, 6 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-3 rotate: false - xy: 1790, 1237 + xy: 1681, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 1585, 593 + xy: 1565, 629 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 1619, 627 + xy: 1599, 629 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 1585, 559 + xy: 1633, 629 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 1619, 593 + xy: 1667, 651 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 1619, 559 + xy: 1701, 651 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 1653, 695 + xy: 1667, 617 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 1653, 661 + xy: 1701, 617 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 1653, 627 + xy: 1735, 642 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 1653, 593 + xy: 1769, 642 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 1653, 559 + xy: 1803, 642 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 1551, 525 + xy: 1735, 608 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 1585, 525 + xy: 1769, 608 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 1619, 525 + xy: 1803, 608 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 1653, 525 + xy: 1243, 579 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 1517, 509 + xy: 1243, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 1483, 501 + xy: 1277, 579 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 1551, 491 + xy: 1243, 511 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 1585, 491 + xy: 1277, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 1619, 491 + xy: 1311, 579 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor rotate: false - xy: 1711, 931 + xy: 1855, 574 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-0 rotate: false - xy: 1677, 863 + xy: 1855, 540 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-1 rotate: false - xy: 1779, 965 + xy: 1855, 506 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-2 rotate: false - xy: 1745, 931 + xy: 1855, 472 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-edge rotate: false - xy: 1711, 897 + xy: 1855, 438 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-stack rotate: false - xy: 1813, 965 + xy: 1025, 355 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 1787, 795 + xy: 1145, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 1787, 761 + xy: 1077, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 1821, 795 + xy: 1111, 259 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 1821, 761 + xy: 1145, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 1855, 795 + xy: 1077, 191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 1855, 761 + xy: 1111, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 1889, 795 + xy: 1145, 259 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 1889, 761 + xy: 1111, 191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 1923, 795 + xy: 1145, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 1923, 761 + xy: 1145, 191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 1957, 795 + xy: 1087, 157 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 1957, 761 + xy: 1087, 123 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 1991, 795 + xy: 1121, 157 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 1991, 761 + xy: 1087, 89 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 1072, 77 + xy: 1121, 123 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 1106, 67 + xy: 1087, 55 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 1140, 67 + xy: 1121, 89 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 1174, 67 + xy: 1121, 55 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1208, 67 + xy: 1155, 157 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cross rotate: false - xy: 1685, 763 + xy: 1345, 511 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 distributor rotate: false - xy: 1529, 1103 + xy: 1597, 1103 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 inverted-sorter rotate: false - xy: 1661, 1203 + xy: 1243, 443 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction rotate: false - xy: 1899, 1169 + xy: 1617, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -615,56 +615,56 @@ mass-driver-base index: -1 overflow-gate rotate: false - xy: 1933, 1135 + xy: 1719, 438 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 1677, 965 + xy: 1821, 506 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 1677, 931 + xy: 1821, 472 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 1711, 965 + xy: 1821, 438 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 1677, 897 + xy: 1837, 642 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 1949, 931 + xy: 1075, 405 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 1075, 111 + xy: 1651, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 underflow-gate rotate: false - xy: 1219, 167 + xy: 1155, 55 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -699,14 +699,14 @@ blast-drill-top index: -1 drill-top rotate: false - xy: 869, 1072 + xy: 819, 932 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-liquid rotate: false - xy: 869, 1072 + xy: 819, 932 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -741,21 +741,21 @@ laser-drill-top index: -1 mechanical-drill rotate: false - xy: 1595, 1037 + xy: 951, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-rotator rotate: false - xy: 935, 1014 + xy: 1017, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-top rotate: false - xy: 1001, 971 + xy: 1083, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -790,84 +790,84 @@ oil-extractor-top index: -1 pneumatic-drill rotate: false - xy: 819, 940 + xy: 1281, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-rotator rotate: false - xy: 885, 948 + xy: 1347, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-top rotate: false - xy: 885, 882 + xy: 1413, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 849, 420 + xy: 1795, 1205 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 849, 354 + xy: 1795, 1139 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 849, 288 + xy: 1861, 1205 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 849, 222 + xy: 1861, 1139 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-border rotate: false - xy: 1415, 655 + xy: 1735, 948 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-middle rotate: false - xy: 1175, 203 + xy: 951, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-select rotate: false - xy: 1049, 179 + xy: 1803, 948 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 1585, 695 + xy: 1293, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 message rotate: false - xy: 1933, 1169 + xy: 1787, 472 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -881,189 +881,189 @@ place-arrow index: -1 bridge-conduit rotate: false - xy: 1083, 179 + xy: 903, 56 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 1083, 145 + xy: 903, 22 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 1083, 145 + xy: 903, 22 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 1117, 169 + xy: 975, 339 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 1151, 169 + xy: 975, 305 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 1517, 611 + xy: 1209, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 1517, 577 + xy: 1209, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 1517, 543 + xy: 1209, 495 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 1551, 695 + xy: 1125, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 1551, 695 + xy: 1125, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 1551, 695 + xy: 1125, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 1551, 695 + xy: 1125, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 1551, 661 + xy: 1259, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 1551, 627 + xy: 1327, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 1585, 661 + xy: 1361, 621 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 1619, 695 + xy: 1395, 621 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 1551, 593 + xy: 1429, 621 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 1551, 593 + xy: 1429, 621 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 1585, 627 + xy: 1463, 629 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 1619, 661 + xy: 1497, 629 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 1551, 559 + xy: 1531, 629 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 1797, 1067 + xy: 1651, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate rotate: false - xy: 1899, 1135 + xy: 1651, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate-top rotate: false - xy: 1865, 1101 + xy: 1685, 515 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 1831, 1067 + xy: 1685, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 1797, 1033 + xy: 1651, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 1763, 999 + xy: 1685, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1091,161 +1091,161 @@ liquid-tank-top index: -1 mechanical-pump rotate: false - xy: 1831, 999 + xy: 1719, 472 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-pump-liquid rotate: false - xy: 1899, 1033 + xy: 1753, 506 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-liquid rotate: false - xy: 1899, 1033 + xy: 1753, 506 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-liquid rotate: false - xy: 1899, 1033 + xy: 1753, 506 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 1933, 1101 + xy: 1753, 438 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 1933, 1067 + xy: 1787, 438 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 1933, 1033 + xy: 1821, 574 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 1933, 999 + xy: 1821, 540 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-cap rotate: false - xy: 1745, 897 + xy: 1009, 287 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-0 rotate: false - xy: 1711, 863 + xy: 1009, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-1 rotate: false - xy: 1847, 965 + xy: 1009, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-2 rotate: false - xy: 1813, 931 + xy: 1009, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-3 rotate: false - xy: 1779, 897 + xy: 1043, 321 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-4 rotate: false - xy: 1745, 863 + xy: 1043, 287 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-5 rotate: false - xy: 1881, 965 + xy: 1043, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-6 rotate: false - xy: 1847, 931 + xy: 1043, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 1881, 931 + xy: 1019, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1847, 897 + xy: 1053, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1813, 863 + xy: 985, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 1915, 931 + xy: 951, 95 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 1881, 897 + xy: 1019, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 1847, 863 + xy: 1053, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 1149, 905 + xy: 1413, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1266,14 +1266,14 @@ alpha-mech-pad index: -1 dart-ship-pad rotate: false - xy: 1397, 1103 + xy: 1465, 1103 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 delta-mech-pad rotate: false - xy: 1463, 1103 + xy: 1531, 1103 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1287,7 +1287,7 @@ glaive-ship-pad index: -1 javelin-ship-pad rotate: false - xy: 1265, 1037 + xy: 885, 874 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1301,21 +1301,21 @@ omega-mech-pad index: -1 tau-mech-pad rotate: false - xy: 783, 508 + xy: 1149, 773 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 trident-ship-pad rotate: false - xy: 849, 684 + xy: 1663, 1205 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 battery rotate: false - xy: 1824, 1237 + xy: 1681, 685 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1336,21 +1336,21 @@ battery-large-top index: -1 battery-top rotate: false - xy: 1858, 1237 + xy: 1715, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 1517, 679 + xy: 985, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 1517, 645 + xy: 1209, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1378,28 +1378,28 @@ differential-generator-top index: -1 diode rotate: false - xy: 1685, 729 + xy: 1345, 477 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 diode-arrow rotate: false - xy: 1687, 695 + xy: 1379, 587 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator rotate: false - xy: 1687, 525 + xy: 1379, 485 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator-top rotate: false - xy: 1687, 491 + xy: 1413, 519 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1455,49 +1455,49 @@ impact-reactor-plasma-3 index: -1 power-node rotate: false - xy: 1813, 897 + xy: 1043, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 951, 905 + xy: 1347, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 power-source rotate: false - xy: 1779, 863 + xy: 1019, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 1915, 965 + xy: 1053, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 1215, 905 + xy: 1479, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 1949, 897 + xy: 1109, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 1041, 111 + xy: 1617, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1511,14 +1511,14 @@ solar-panel-large index: -1 surge-tower rotate: false - xy: 783, 706 + xy: 951, 773 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 783, 442 + xy: 1215, 773 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1546,14 +1546,14 @@ thorium-reactor-lights index: -1 turbine-generator rotate: false - xy: 849, 618 + xy: 1663, 1139 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-top rotate: false - xy: 849, 552 + xy: 1729, 1205 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1588,119 +1588,119 @@ block-launcher index: -1 coal-centrifuge rotate: false - xy: 1382, 1235 + xy: 1454, 1235 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 1529, 1169 + xy: 1597, 1169 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 1595, 1169 + xy: 1003, 1103 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 1001, 1103 + xy: 1069, 1103 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator rotate: false - xy: 1067, 1103 + xy: 1135, 1103 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 1133, 1103 + xy: 1201, 1103 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 1199, 1103 + xy: 1267, 1103 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 graphite-press rotate: false - xy: 1199, 1037 + xy: 819, 866 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 incinerator rotate: false - xy: 1687, 457 + xy: 1413, 485 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 1763, 1101 + xy: 1583, 561 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 1695, 999 + xy: 1617, 493 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 kiln rotate: false - xy: 1331, 1037 + xy: 721, 838 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 kiln-top rotate: false - xy: 1397, 1037 + xy: 951, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 1397, 1037 + xy: 951, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 liquid-source rotate: false - xy: 1831, 1033 + xy: 1753, 574 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-void rotate: false - xy: 1797, 999 + xy: 1719, 506 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 1865, 999 + xy: 1787, 540 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1714,203 +1714,203 @@ multi-press index: -1 phase-weaver rotate: false - xy: 1463, 971 + xy: 1149, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 1529, 971 + xy: 1215, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 1595, 971 + xy: 1281, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 721, 838 + xy: 1215, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 787, 838 + xy: 1281, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 1915, 897 + xy: 985, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 1881, 863 + xy: 1019, 49 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 1017, 905 + xy: 1413, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator rotate: false - xy: 1149, 839 + xy: 1083, 839 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 1215, 839 + xy: 1149, 839 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-spinner rotate: false - xy: 1281, 839 + xy: 1215, 839 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 1347, 839 + xy: 1281, 839 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press rotate: false - xy: 1413, 839 + xy: 1347, 839 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame0 rotate: false - xy: 1479, 839 + xy: 1413, 839 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame1 rotate: false - xy: 1545, 839 + xy: 1479, 839 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame2 rotate: false - xy: 1611, 839 + xy: 1545, 839 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-liquid rotate: false - xy: 853, 816 + xy: 1611, 839 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-top rotate: false - xy: 783, 772 + xy: 885, 808 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rock1 rotate: false - xy: 1373, 739 + xy: 983, 573 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rock2 rotate: false - xy: 1423, 789 + xy: 1033, 623 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-boulder1 rotate: false - xy: 1949, 863 + xy: 1059, 371 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-boulder2 rotate: false - xy: 1691, 829 + xy: 1143, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder1 rotate: false - xy: 1895, 829 + xy: 1515, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder2 rotate: false - xy: 1929, 829 + xy: 1549, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrock1 rotate: false - xy: 1073, 381 + xy: 933, 473 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snowrock2 rotate: false - xy: 1123, 439 + xy: 983, 523 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-cluster1 rotate: false - xy: 1165, 305 + xy: 1317, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster2 rotate: false - xy: 1223, 405 + xy: 1359, 689 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster3 rotate: false - xy: 1373, 563 + xy: 1401, 689 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -1931,7 +1931,7 @@ white-tree-dead index: -1 container rotate: false - xy: 1514, 1235 + xy: 1586, 1235 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1980,21 +1980,21 @@ launch-pad-light index: -1 launchpod rotate: false - xy: 918, 1212 + xy: 869, 1138 size: 66, 64 orig: 66, 64 offset: 0, 0 index: -1 unloader rotate: false - xy: 1253, 201 + xy: 1179, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader-center rotate: false - xy: 1253, 167 + xy: 1179, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2008,21 +2008,21 @@ vault index: -1 arc-heat rotate: false - xy: 1628, 1629 + xy: 1513, 1759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-1 rotate: false - xy: 1892, 1237 + xy: 1715, 685 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-2 rotate: false - xy: 727, 26 + xy: 937, 1138 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2043,14 +2043,14 @@ block-4 index: -1 hail-heat rotate: false - xy: 951, 972 + xy: 1183, 631 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 1529, 1037 + xy: 1017, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2071,35 +2071,35 @@ ripple-heat index: -1 salvo-heat rotate: false - xy: 1347, 905 + xy: 1479, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 1413, 905 + xy: 1545, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 1479, 905 + xy: 1545, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch-heat rotate: false - xy: 1759, 829 + xy: 1379, 417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 849, 90 + xy: 1677, 1007 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2127,21 +2127,21 @@ block-forge index: -1 command-center rotate: false - xy: 1448, 1235 + xy: 1520, 1235 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dagger-factory rotate: false - xy: 1265, 1103 + xy: 1333, 1103 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dagger-factory-top rotate: false - xy: 1331, 1103 + xy: 1399, 1103 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2183,14 +2183,14 @@ naval-factory index: -1 rally-point rotate: false - xy: 1083, 905 + xy: 1479, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 repair-point-base rotate: false - xy: 1949, 965 + xy: 1109, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2211,70 +2211,70 @@ revenant-factory-top index: -1 copper-wall rotate: false - xy: 1653, 491 + xy: 1277, 511 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-large rotate: false - xy: 1580, 1235 + xy: 1003, 1169 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door rotate: false - xy: 1687, 661 + xy: 1413, 587 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large rotate: false - xy: 1595, 1103 + xy: 819, 1064 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 935, 1080 + xy: 819, 998 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-open rotate: false - xy: 1687, 627 + xy: 1379, 553 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 1745, 965 + xy: 1837, 608 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large rotate: false - xy: 1397, 971 + xy: 1215, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-wall rotate: false - xy: 1779, 931 + xy: 1009, 321 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-wall-large rotate: false - xy: 819, 1006 + xy: 1347, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2302,84 +2302,84 @@ scrap-wall-huge3 index: -1 scrap-wall-large1 rotate: false - xy: 1611, 905 + xy: 1611, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large2 rotate: false - xy: 951, 839 + xy: 1611, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large3 rotate: false - xy: 1017, 839 + xy: 951, 839 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large4 rotate: false - xy: 1083, 839 + xy: 1017, 839 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall2 rotate: false - xy: 1793, 829 + xy: 1413, 417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 1827, 829 + xy: 1447, 417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 1861, 829 + xy: 1481, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 1861, 829 + xy: 1481, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 1753, 795 + xy: 1077, 259 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large rotate: false - xy: 783, 640 + xy: 1017, 773 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 1753, 761 + xy: 1111, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 783, 376 + xy: 1281, 773 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2393,35 +2393,35 @@ thruster index: -1 titanium-wall rotate: false - xy: 1242, 67 + xy: 1155, 123 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large rotate: false - xy: 849, 750 + xy: 1611, 773 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 bullet rotate: false - xy: 916, 44 + xy: 1985, 1133 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 bullet-back rotate: false - xy: 151, 7 + xy: 771, 784 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 casing rotate: false - xy: 1209, 217 + xy: 875, 848 size: 8, 16 orig: 8, 16 offset: 0, 0 @@ -2435,7 +2435,7 @@ circle-end index: -1 circle-mid rotate: false - xy: 1721, 534 + xy: 1837, 832 size: 1, 199 orig: 1, 199 offset: 0, 0 @@ -2449,35 +2449,35 @@ circle-shadow index: -1 error rotate: false - xy: 1023, 589 + xy: 833, 716 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 laser rotate: false - xy: 945, 832 + xy: 2043, 1253 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 laser-end rotate: false - xy: 770, 1204 + xy: 844, 1204 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 minelaser rotate: false - xy: 879, 890 + xy: 2043, 1203 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 minelaser-end rotate: false - xy: 844, 1204 + xy: 795, 1130 size: 72, 72 orig: 72, 72 offset: 0, 0 @@ -2498,7 +2498,7 @@ missile-back index: -1 particle rotate: false - xy: 1123, 305 + xy: 1133, 497 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -2526,35 +2526,35 @@ shell-back index: -1 transfer rotate: false - xy: 848, 1757 + xy: 2043, 1613 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 1219, 201 + xy: 1155, 89 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white rotate: false - xy: 1067, 106 + xy: 933, 158 size: 3, 3 orig: 3, 3 offset: 0, 0 index: -1 arc rotate: false - xy: 1513, 1759 + xy: 783, 92 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-arc-full rotate: false - xy: 1926, 1237 + xy: 1743, 982 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2568,56 +2568,56 @@ block-blast-drill-full index: -1 block-char-full rotate: false - xy: 1415, 621 + xy: 1735, 914 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cliffs-full rotate: false - xy: 1415, 587 + xy: 1735, 880 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conduit-full rotate: false - xy: 1415, 553 + xy: 1735, 846 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conveyor-full rotate: false - xy: 1465, 705 + xy: 1735, 812 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 1465, 705 + xy: 1735, 812 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-craters-full rotate: false - xy: 1515, 755 + xy: 1735, 778 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cryofluidmixer-full rotate: false - xy: 869, 1138 + xy: 735, 26 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-cultivator-full rotate: false - xy: 935, 1146 + xy: 1977, 1597 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2631,28 +2631,28 @@ block-cyclone-full index: -1 block-dark-metal-full rotate: false - xy: 1549, 763 + xy: 1777, 982 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-full rotate: false - xy: 1583, 763 + xy: 1769, 948 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dunerocks-full rotate: false - xy: 1617, 763 + xy: 1769, 914 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-duo-full rotate: false - xy: 1651, 763 + xy: 1769, 880 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2666,56 +2666,56 @@ block-fuse-full index: -1 block-grass-full rotate: false - xy: 1265, 455 + xy: 1769, 846 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hail-full rotate: false - xy: 1265, 421 + xy: 1769, 812 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-holostone-full rotate: false - xy: 1265, 387 + xy: 1769, 778 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hotrock-full rotate: false - xy: 1315, 505 + xy: 1749, 744 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-full rotate: false - xy: 1107, 255 + xy: 1749, 710 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-snow-full rotate: false - xy: 1141, 271 + xy: 1749, 676 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icerocks-full rotate: false - xy: 1175, 271 + xy: 1783, 744 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ignarock-full rotate: false - xy: 1141, 237 + xy: 1783, 710 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2729,7 +2729,7 @@ block-impact-reactor-full index: -1 block-lancer-full rotate: false - xy: 1977, 1597 + xy: 1689, 1271 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2743,7 +2743,7 @@ block-laser-drill-full index: -1 block-liquid-router-full rotate: false - xy: 1175, 237 + xy: 1783, 676 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2757,7 +2757,7 @@ block-liquid-tank-full index: -1 block-magmarock-full rotate: false - xy: 1107, 221 + xy: 883, 124 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2785,7 +2785,7 @@ block-mass-driver-full index: -1 block-mechanical-drill-full rotate: false - xy: 1689, 1271 + xy: 1755, 1271 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2799,14 +2799,14 @@ block-meltdown-full index: -1 block-metal-floor-damaged-full rotate: false - xy: 1141, 203 + xy: 917, 124 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-moss-full rotate: false - xy: 1449, 663 + xy: 1175, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2820,91 +2820,91 @@ block-oil-extractor-full index: -1 block-ore-coal-full rotate: false - xy: 1449, 629 + xy: 1175, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-copper-full rotate: false - xy: 1449, 595 + xy: 1175, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-lead-full rotate: false - xy: 1449, 561 + xy: 1175, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-scrap-full rotate: false - xy: 1365, 529 + xy: 1225, 639 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-thorium-full rotate: false - xy: 1499, 713 + xy: 1259, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-titanium-full rotate: false - xy: 1549, 729 + xy: 1293, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pebbles-full rotate: false - xy: 1583, 729 + xy: 1327, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-phase-weaver-full rotate: false - xy: 1755, 1271 + xy: 1821, 1271 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-plated-conduit-full rotate: false - xy: 1617, 729 + xy: 1361, 655 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pneumatic-drill-full rotate: false - xy: 1821, 1271 + xy: 1887, 1271 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-pulse-conduit-full rotate: false - xy: 1651, 729 + xy: 1395, 655 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pulverizer-full rotate: false - xy: 1299, 463 + xy: 1429, 655 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-repair-point-full rotate: false - xy: 1299, 429 + xy: 1463, 663 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2918,77 +2918,77 @@ block-ripple-full index: -1 block-rock-full rotate: false - xy: 973, 739 + xy: 783, 526 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-rocks-full rotate: false - xy: 1299, 395 + xy: 1497, 663 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-saltrocks-full rotate: false - xy: 1215, 371 + xy: 1531, 663 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-salvo-full rotate: false - xy: 1887, 1271 + xy: 992, 1235 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-sand-boulder-full rotate: false - xy: 1207, 337 + xy: 1565, 663 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-full rotate: false - xy: 1023, 213 + xy: 1599, 663 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sandrocks-full rotate: false - xy: 1057, 213 + xy: 1633, 663 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scatter-full rotate: false - xy: 986, 1235 + xy: 1058, 1235 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-scorch-full rotate: false - xy: 1015, 179 + xy: 1025, 389 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-full rotate: false - xy: 1015, 145 + xy: 1075, 439 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall1 rotate: false - xy: 1015, 145 + xy: 1075, 439 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3009,56 +3009,56 @@ scrap-wall-huge1 index: -1 block-scrap-wall-large-full rotate: false - xy: 1052, 1235 + xy: 1124, 1235 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-shale-boulder-full rotate: false - xy: 1049, 145 + xy: 1803, 914 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-full rotate: false - xy: 1483, 671 + xy: 1803, 880 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shalerocks-full rotate: false - xy: 1483, 637 + xy: 1803, 846 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shrubs-full rotate: false - xy: 1483, 603 + xy: 1803, 812 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-full rotate: false - xy: 1483, 569 + xy: 1803, 778 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snowrock-full rotate: false - xy: 1023, 789 + xy: 783, 476 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-snowrocks-full rotate: false - xy: 1449, 527 + xy: 1817, 744 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3072,189 +3072,189 @@ block-spectre-full index: -1 block-spore-cluster-full rotate: false - xy: 1646, 1259 + xy: 1133, 581 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-spore-moss-full rotate: false - xy: 1483, 535 + xy: 1817, 710 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-spore-press-full rotate: false - xy: 1118, 1235 + xy: 1190, 1235 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-sporerocks-full rotate: false - xy: 1333, 471 + xy: 1817, 676 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-stone-full rotate: false - xy: 1333, 437 + xy: 875, 90 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-swarmer-full rotate: false - xy: 1184, 1235 + xy: 1256, 1235 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-tendrils-full rotate: false - xy: 1333, 403 + xy: 909, 90 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-titanium-conveyor-full rotate: false - xy: 1299, 361 + xy: 869, 56 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 1299, 361 + xy: 869, 56 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-water-extractor-full rotate: false - xy: 1250, 1235 + xy: 1322, 1235 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-wave-full rotate: false - xy: 1316, 1235 + xy: 1388, 1235 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-1-0 rotate: false - xy: 1517, 475 + xy: 1311, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-1 rotate: false - xy: 1551, 457 + xy: 1311, 511 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-2 rotate: false - xy: 1585, 457 + xy: 1243, 477 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-3 rotate: false - xy: 1619, 457 + xy: 1277, 477 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-4 rotate: false - xy: 1653, 457 + xy: 1311, 477 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-5 rotate: false - xy: 1399, 519 + xy: 1209, 461 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-6 rotate: false - xy: 1241, 337 + xy: 1345, 579 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-7 rotate: false - xy: 1333, 335 + xy: 1345, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-2-0 rotate: false - xy: 1001, 1169 + xy: 1069, 1169 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-1 rotate: false - xy: 1067, 1169 + xy: 1135, 1169 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-2 rotate: false - xy: 1133, 1169 + xy: 1201, 1169 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-3 rotate: false - xy: 1199, 1169 + xy: 1267, 1169 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-4 rotate: false - xy: 1265, 1169 + xy: 1333, 1169 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-5 rotate: false - xy: 1331, 1169 + xy: 1399, 1169 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-6 rotate: false - xy: 1397, 1169 + xy: 1465, 1169 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-7 rotate: false - xy: 1463, 1169 + xy: 1531, 1169 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3436,7 +3436,7 @@ cyclone index: -1 duo rotate: false - xy: 1687, 593 + xy: 1379, 519 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3450,714 +3450,714 @@ fuse index: -1 hail rotate: false - xy: 1687, 559 + xy: 1413, 553 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-blast-compound-large rotate: false - xy: 1373, 647 + xy: 1233, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-blast-compound-medium rotate: false - xy: 1695, 1203 + xy: 1311, 443 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-blast-compound-small rotate: false - xy: 1015, 119 + xy: 1689, 1471 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-blast-compound-tiny rotate: false - xy: 1117, 203 + xy: 267, 43 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-blast-compound-xlarge rotate: false - xy: 973, 489 + xy: 833, 450 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-coal-large rotate: false - xy: 1423, 697 + xy: 1333, 731 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-coal-medium rotate: false - xy: 1729, 1203 + xy: 1379, 451 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal-small rotate: false - xy: 1689, 1471 + xy: 1652, 1275 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-coal-tiny rotate: false - xy: 848, 1609 + xy: 933, 790 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-coal-xlarge rotate: false - xy: 1023, 539 + xy: 833, 400 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-copper-large rotate: false - xy: 1473, 747 + xy: 933, 331 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-copper-medium rotate: false - xy: 1661, 1101 + xy: 1447, 587 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper-small rotate: false - xy: 853, 914 + xy: 1953, 1311 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-copper-tiny rotate: false - xy: 786, 1424 + xy: 985, 1120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-copper-xlarge rotate: false - xy: 1073, 581 + xy: 833, 350 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-graphite-large rotate: false - xy: 1523, 797 + xy: 983, 381 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-graphite-medium rotate: false - xy: 1729, 1169 + xy: 1447, 519 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite-small rotate: false - xy: 919, 856 + xy: 787, 878 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-graphite-tiny rotate: false - xy: 937, 1479 + xy: 267, 25 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-graphite-xlarge rotate: false - xy: 1123, 639 + xy: 833, 300 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-lead-large rotate: false - xy: 973, 197 + xy: 1033, 431 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-lead-medium rotate: false - xy: 1661, 1067 + xy: 1447, 451 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead-small rotate: false - xy: 255, 35 + xy: 2011, 1437 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-lead-tiny rotate: false - xy: 391, 792 + xy: 848, 1609 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-lead-xlarge rotate: false - xy: 1173, 681 + xy: 833, 250 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-metaglass-large rotate: false - xy: 1023, 247 + xy: 1083, 481 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-metaglass-medium rotate: false - xy: 1763, 1169 + xy: 1515, 595 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass-small rotate: false - xy: 2011, 1437 + xy: 291, 856 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-metaglass-tiny rotate: false - xy: 481, 8 + xy: 786, 1424 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-metaglass-xlarge rotate: false - xy: 1223, 739 + xy: 833, 200 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-phase-fabric-large rotate: false - xy: 1073, 289 + xy: 1133, 539 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-phase-fabric-medium rotate: false - xy: 1695, 1101 + xy: 1549, 595 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric-small rotate: false - xy: 291, 856 + xy: 1179, 267 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-phase-fabric-tiny rotate: false - xy: 982, 1358 + xy: 937, 1479 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-phase-fabric-xlarge rotate: false - xy: 1273, 789 + xy: 833, 150 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-plastanium-large rotate: false - xy: 1123, 347 + xy: 1275, 681 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-plastanium-medium rotate: false - xy: 1831, 1203 + xy: 1515, 561 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium-small rotate: false - xy: 1953, 1311 + xy: 1689, 1445 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-plastanium-tiny rotate: false - xy: 783, 94 + xy: 391, 792 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-plastanium-xlarge rotate: false - xy: 973, 439 + xy: 883, 758 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-pyratite-large rotate: false - xy: 1173, 389 + xy: 1375, 731 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-pyratite-medium rotate: false - xy: 1763, 1135 + xy: 1481, 493 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite-small rotate: false - xy: 1691, 803 + xy: 1953, 1285 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-pyratite-tiny rotate: false - xy: 795, 1112 + xy: 481, 8 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-pyratite-xlarge rotate: false - xy: 1023, 489 + xy: 883, 708 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-sand-large rotate: false - xy: 1223, 447 + xy: 933, 289 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-sand-medium rotate: false - xy: 1695, 1067 + xy: 1549, 561 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand-small rotate: false - xy: 1719, 735 + xy: 787, 852 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-sand-tiny rotate: false - xy: 1696, 1645 + xy: 982, 1358 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-sand-xlarge rotate: false - xy: 1073, 531 + xy: 883, 658 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-scrap-large rotate: false - xy: 1273, 497 + xy: 1417, 731 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-scrap-medium rotate: false - xy: 1865, 1203 + xy: 1481, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap-small rotate: false - xy: 1041, 85 + xy: 1179, 241 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-scrap-tiny rotate: false - xy: 1696, 1627 + xy: 795, 1112 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-scrap-xlarge rotate: false - xy: 1123, 589 + xy: 883, 608 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-silicon-large rotate: false - xy: 1323, 547 + xy: 933, 247 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-silicon-medium rotate: false - xy: 1797, 1135 + xy: 1549, 527 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon-small rotate: false - xy: 1072, 51 + xy: 1179, 215 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-silicon-tiny rotate: false - xy: 1646, 1241 + xy: 1696, 1645 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-silicon-xlarge rotate: false - xy: 1173, 631 + xy: 883, 558 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-spore-pod-large rotate: false - xy: 1373, 605 + xy: 1459, 731 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-spore-pod-medium rotate: false - xy: 1695, 1033 + xy: 1549, 493 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod-small rotate: false - xy: 1219, 141 + xy: 2018, 1767 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-tiny rotate: false - xy: 1797, 743 + xy: 1696, 1627 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-spore-pod-xlarge rotate: false - xy: 1223, 689 + xy: 883, 508 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-surge-alloy-large rotate: false - xy: 1565, 797 + xy: 933, 205 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-surge-alloy-medium rotate: false - xy: 1865, 1169 + xy: 1617, 561 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy-small rotate: false - xy: 1245, 141 + xy: 2018, 1741 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-tiny rotate: false - xy: 866, 1609 + xy: 1179, 197 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-surge-alloy-xlarge rotate: false - xy: 1273, 739 + xy: 883, 458 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-thorium-large rotate: false - xy: 973, 155 + xy: 1501, 731 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-thorium-medium rotate: false - xy: 1797, 1101 + xy: 1583, 493 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium-small rotate: false - xy: 1689, 1445 + xy: 2018, 1715 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-thorium-tiny rotate: false - xy: 786, 1406 + xy: 293, 812 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-thorium-xlarge rotate: false - xy: 1323, 789 + xy: 883, 408 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-titanium-large rotate: false - xy: 1065, 247 + xy: 933, 163 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-titanium-medium rotate: false - xy: 1729, 1033 + xy: 1583, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium-small rotate: false - xy: 919, 830 + xy: 2018, 1689 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-tiny rotate: false - xy: 955, 1479 + xy: 1533, 407 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-titanium-xlarge rotate: false - xy: 973, 389 + xy: 883, 358 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lancer rotate: false - xy: 1463, 1037 + xy: 951, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 liquid-cryofluid-large rotate: false - xy: 1165, 347 + xy: 1543, 731 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-cryofluid-medium rotate: false - xy: 1831, 1101 + xy: 1685, 583 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid-small rotate: false - xy: 255, 9 + xy: 2018, 1663 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-cryofluid-tiny rotate: false - xy: 499, 8 + xy: 267, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-cryofluid-xlarge rotate: false - xy: 1273, 689 + xy: 983, 723 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-oil-large rotate: false - xy: 1607, 797 + xy: 1585, 731 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-oil-medium rotate: false - xy: 1729, 999 + xy: 1685, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil-small rotate: false - xy: 1953, 1285 + xy: 293, 830 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-oil-tiny rotate: false - xy: 982, 1340 + xy: 285, 8 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-oil-xlarge rotate: false - xy: 1323, 739 + xy: 933, 673 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-slag-large rotate: false - xy: 973, 113 + xy: 1627, 731 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-slag-medium rotate: false - xy: 1865, 1067 + xy: 1719, 540 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag-small rotate: false - xy: 1745, 735 + xy: 1481, 399 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-slag-tiny rotate: false - xy: 801, 94 + xy: 866, 1609 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-slag-xlarge rotate: false - xy: 1373, 789 + xy: 1033, 723 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-water-large rotate: false - xy: 1649, 797 + xy: 833, 108 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-water-medium rotate: false - xy: 1865, 1033 + xy: 1787, 574 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water-small rotate: false - xy: 1771, 735 + xy: 1507, 399 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-water-tiny rotate: false - xy: 1664, 1241 + xy: 786, 1406 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-water-xlarge rotate: false - xy: 973, 339 + xy: 933, 623 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4178,7 +4178,7 @@ meltdown index: -1 repair-point rotate: false - xy: 1915, 863 + xy: 1053, 49 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4192,21 +4192,21 @@ ripple index: -1 salvo rotate: false - xy: 1281, 905 + xy: 1545, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scatter rotate: false - xy: 1545, 905 + xy: 1611, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch rotate: false - xy: 1725, 829 + xy: 1143, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4220,119 +4220,119 @@ spectre index: -1 splash-0 rotate: false - xy: 1109, 101 + xy: 1685, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-1 rotate: false - xy: 1143, 101 + xy: 1719, 404 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-10 rotate: false - xy: 1719, 795 + xy: 1077, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-11 rotate: false - xy: 1719, 761 + xy: 1111, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-2 rotate: false - xy: 1177, 101 + xy: 1753, 404 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-3 rotate: false - xy: 1211, 101 + xy: 1787, 404 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-4 rotate: false - xy: 1209, 303 + xy: 1821, 404 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-5 rotate: false - xy: 1209, 269 + xy: 1855, 404 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-6 rotate: false - xy: 1209, 235 + xy: 1093, 361 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-7 rotate: false - xy: 1243, 303 + xy: 1127, 361 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-8 rotate: false - xy: 1243, 269 + xy: 1161, 361 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-9 rotate: false - xy: 1243, 235 + xy: 1077, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer rotate: false - xy: 783, 574 + xy: 1083, 773 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-alpha-full rotate: false - xy: 1373, 689 + xy: 933, 423 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-crawler-full rotate: false - xy: 1423, 739 + xy: 983, 473 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-dagger-full rotate: false - xy: 1473, 789 + xy: 1033, 523 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-draug-full rotate: false - xy: 973, 239 + xy: 1083, 573 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4353,7 +4353,7 @@ unit-fortress-full index: -1 unit-ghoul-full rotate: false - xy: 795, 1130 + xy: 918, 1204 size: 72, 72 orig: 72, 72 offset: 0, 0 @@ -4367,7 +4367,7 @@ unit-oculon-full index: -1 unit-phantom-full rotate: false - xy: 713, 780 + xy: 1985, 1245 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -4381,182 +4381,189 @@ unit-reaper-full index: -1 unit-spirit-full rotate: false - xy: 1023, 289 + xy: 1133, 623 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 +unit-tau-full + rotate: false + xy: 1985, 1187 + size: 56, 56 + orig: 56, 56 + offset: 0, 0 + index: -1 unit-titan-full rotate: false - xy: 849, 486 + xy: 1729, 1139 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-vanguard-full rotate: false - xy: 1073, 331 + xy: 1183, 673 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-wraith-full rotate: false - xy: 1123, 389 + xy: 1283, 723 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wave rotate: false - xy: 849, 156 + xy: 1677, 1073 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 1661, 1169 + xy: 1277, 443 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 1661, 1135 + xy: 1345, 443 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 1695, 1169 + xy: 1413, 451 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 1763, 1203 + xy: 1447, 553 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 1695, 1135 + xy: 1447, 485 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 1797, 1203 + xy: 1481, 595 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 1729, 1135 + xy: 1481, 561 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 1661, 1033 + xy: 1481, 527 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 1797, 1169 + xy: 1583, 595 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 1729, 1101 + xy: 1515, 527 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 1661, 999 + xy: 1617, 595 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 1831, 1169 + xy: 1515, 493 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod rotate: false - xy: 1729, 1067 + xy: 1515, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 1899, 1203 + xy: 1583, 527 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 1831, 1135 + xy: 1549, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 1763, 1067 + xy: 1617, 527 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 1865, 1135 + xy: 1651, 583 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 1763, 1033 + xy: 1651, 515 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 1899, 1101 + xy: 1719, 574 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 1899, 1067 + xy: 1753, 540 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blank rotate: false - xy: 219, 841 + xy: 1924, 1136 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -4570,21 +4577,21 @@ circle index: -1 shape-3 rotate: false - xy: 793, 25 + xy: 1743, 1074 size: 63, 63 orig: 63, 63 offset: 0, 0 index: -1 alpha rotate: false - xy: 885, 1022 + xy: 783, 734 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-cell rotate: false - xy: 819, 1080 + xy: 783, 684 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4619,91 +4626,91 @@ chaos-array-leg index: -1 crawler rotate: false - xy: 973, 689 + xy: 783, 426 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-base rotate: false - xy: 1023, 739 + xy: 783, 376 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-cell rotate: false - xy: 1073, 789 + xy: 783, 326 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-leg rotate: false - xy: 973, 639 + xy: 783, 276 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger rotate: false - xy: 1023, 689 + xy: 783, 226 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 1073, 739 + xy: 783, 176 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 1123, 789 + xy: 783, 126 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta rotate: false - xy: 973, 589 + xy: 825, 816 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-base rotate: false - xy: 1023, 639 + xy: 1927, 1105 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-cell rotate: false - xy: 1073, 689 + xy: 1924, 1055 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-leg rotate: false - xy: 1123, 739 + xy: 1977, 1083 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 draug rotate: false - xy: 1173, 789 + xy: 1974, 1033 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 draug-cell rotate: false - xy: 973, 539 + xy: 833, 766 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4745,7 +4752,7 @@ eruptor index: -1 eruptor-base rotate: false - xy: 1001, 1037 + xy: 885, 1072 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4759,7 +4766,7 @@ eruptor-cell index: -1 eruptor-leg rotate: false - xy: 1067, 1037 + xy: 885, 1006 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4773,7 +4780,7 @@ fortress index: -1 fortress-base rotate: false - xy: 1133, 1037 + xy: 885, 940 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4801,7 +4808,7 @@ ghoul index: -1 ghoul-cell rotate: false - xy: 653, 18 + xy: 770, 1204 size: 72, 72 orig: 72, 72 offset: 0, 0 @@ -4815,28 +4822,28 @@ glaive index: -1 glaive-cell rotate: false - xy: 915, 620 + xy: 1743, 1016 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 javelin rotate: false - xy: 1023, 439 + xy: 883, 308 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 javelin-cell rotate: false - xy: 1073, 481 + xy: 883, 258 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 javelin-shield rotate: false - xy: 1123, 539 + xy: 883, 208 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4864,77 +4871,77 @@ oculon index: -1 oculon-base rotate: false - xy: 1123, 489 + xy: 933, 573 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 oculon-cell rotate: false - xy: 1173, 531 + xy: 983, 623 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 oculon-leg rotate: false - xy: 1223, 589 + xy: 1033, 673 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 omega rotate: false - xy: 915, 562 - size: 56, 56 - orig: 56, 56 + xy: 653, 10 + size: 80, 80 + orig: 80, 80 offset: 0, 0 index: -1 omega-armor rotate: false - xy: 1199, 971 + xy: 1149, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 omega-base rotate: false - xy: 915, 504 + xy: 1808, 1081 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 omega-cell rotate: false - xy: 915, 446 + xy: 1677, 811 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 omega-leg rotate: false - xy: 915, 388 + xy: 1866, 1081 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 phantom rotate: false - xy: 915, 330 + xy: 713, 780 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 phantom-cell rotate: false - xy: 915, 272 + xy: 151, 3 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 power-cell rotate: false - xy: 915, 214 + xy: 209, 3 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -4969,70 +4976,70 @@ revenant-cell index: -1 spirit rotate: false - xy: 1173, 481 + xy: 1033, 573 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spirit-cell rotate: false - xy: 1223, 539 + xy: 1083, 623 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau rotate: false - xy: 915, 156 + xy: 1677, 753 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 tau-base rotate: false - xy: 1273, 589 + xy: 1133, 673 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau-cell rotate: false - xy: 915, 98 + xy: 1927, 1213 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 tau-leg rotate: false - xy: 1323, 639 + xy: 1233, 723 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titan rotate: false - xy: 783, 310 + xy: 1347, 773 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-base rotate: false - xy: 783, 244 + xy: 1413, 773 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-cell rotate: false - xy: 783, 178 + xy: 1479, 773 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-leg rotate: false - xy: 783, 112 + xy: 1545, 773 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -5046,49 +5053,49 @@ trident index: -1 trident-cell rotate: false - xy: 858, 32 + xy: 1927, 1155 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 vanguard rotate: false - xy: 1173, 431 + xy: 933, 373 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 vanguard-cell rotate: false - xy: 1223, 489 + xy: 983, 423 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wraith rotate: false - xy: 1323, 589 + xy: 1083, 523 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 artillery rotate: false - xy: 205, 3 + xy: 783, 626 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 beam-weapon rotate: false - xy: 973, 789 + xy: 783, 576 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 chaos rotate: false - xy: 915, 678 + xy: 1677, 869 size: 56, 136 orig: 56, 136 offset: 0, 0 @@ -5102,91 +5109,91 @@ eradication index: -1 eruption rotate: false - xy: 1073, 631 + xy: 833, 658 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 flakgun rotate: false - xy: 1123, 689 + xy: 833, 608 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flamethrower rotate: false - xy: 1173, 731 + xy: 833, 550 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 heal-weapon rotate: false - xy: 1223, 789 + xy: 833, 500 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 large-weapon rotate: false - xy: 1173, 581 + xy: 883, 158 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lich-missiles rotate: false - xy: 1223, 639 + xy: 933, 723 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles rotate: false - xy: 1023, 389 + xy: 983, 673 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mount-weapon rotate: false - xy: 1073, 431 + xy: 1083, 723 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 reaper-weapon rotate: false - xy: 1273, 639 + xy: 1133, 723 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 revenant-missiles rotate: false - xy: 1323, 689 + xy: 933, 523 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-basic-weapon rotate: false - xy: 973, 289 + xy: 1083, 673 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-weapon rotate: false - xy: 1023, 339 + xy: 1183, 723 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 weapon rotate: false - xy: 1273, 539 + xy: 1033, 473 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -6875,6 +6882,20 @@ armored-conveyor-icon-editor orig: 32, 32 offset: 0, 0 index: -1 +basic-reconstructor-icon-editor + rotate: false + xy: 1035, 405 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +block-forge-icon-editor + rotate: false + xy: 1035, 405 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 battery-icon-editor rotate: false xy: 2015, 401 @@ -6884,7 +6905,7 @@ battery-icon-editor index: -1 battery-large-icon-editor rotate: false - xy: 1035, 405 + xy: 1133, 405 size: 96, 96 orig: 96, 96 offset: 0, 0 @@ -6910,13 +6931,6 @@ block-border-editor orig: 32, 32 offset: 0, 0 index: -1 -block-forge-icon-editor - rotate: false - xy: 1133, 405 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 block-launcher-icon-editor rotate: false xy: 1231, 405 @@ -8990,175 +9004,210 @@ block-armored-conveyor-xlarge orig: 48, 48 offset: 0, 0 index: -1 -block-battery-large +block-basic-reconstructor-large rotate: false xy: 501, 524 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-battery-large-large +block-block-forge-large rotate: false - xy: 551, 574 + xy: 501, 524 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-battery-large-medium +block-basic-reconstructor-medium rotate: false xy: 1809, 941 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-battery-large-small +block-block-forge-medium + rotate: false + xy: 1809, 941 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-basic-reconstructor-small rotate: false xy: 1709, 711 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-battery-large-tiny +block-block-forge-small + rotate: false + xy: 1709, 711 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-basic-reconstructor-tiny rotate: false xy: 331, 598 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-battery-large-xlarge +block-block-forge-tiny + rotate: false + xy: 331, 598 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-basic-reconstructor-xlarge rotate: false xy: 259, 819 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-battery-medium +block-block-forge-xlarge rotate: false - xy: 1843, 941 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -block-battery-small - rotate: false - xy: 1811, 739 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-battery-tiny - rotate: false - xy: 761, 598 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-battery-xlarge - rotate: false - xy: 1, 428 + xy: 259, 819 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-blast-drill-large +block-battery-large + rotate: false + xy: 551, 574 + size: 40, 40 + orig: 40, 40 + offset: 0, 0 + index: -1 +block-battery-large-large rotate: false xy: 351, 324 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-blast-drill-medium +block-battery-large-medium + rotate: false + xy: 1843, 941 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +block-battery-large-small + rotate: false + xy: 1811, 739 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-battery-large-tiny + rotate: false + xy: 761, 598 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-battery-large-xlarge + rotate: false + xy: 1, 428 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +block-battery-medium rotate: false xy: 1877, 941 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-blast-drill-small +block-battery-small rotate: false xy: 915, 606 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-blast-drill-tiny +block-battery-tiny rotate: false xy: 132, 10 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-blast-drill-xlarge +block-battery-xlarge rotate: false xy: 51, 478 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-blast-mixer-large +block-blast-drill-large rotate: false xy: 401, 374 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-blast-mixer-medium +block-blast-drill-medium rotate: false xy: 1911, 941 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-blast-mixer-small +block-blast-drill-small rotate: false xy: 106, 2 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-blast-mixer-tiny +block-blast-drill-tiny rotate: false xy: 1802, 641 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-blast-mixer-xlarge +block-blast-drill-xlarge rotate: false xy: 131, 558 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -block-block-forge-large +block-blast-mixer-large rotate: false xy: 451, 432 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 -block-block-forge-medium +block-blast-mixer-medium rotate: false xy: 1945, 941 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -block-block-forge-small +block-blast-mixer-small rotate: false xy: 1735, 711 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-block-forge-tiny +block-blast-mixer-tiny rotate: false xy: 955, 518 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-block-forge-xlarge +block-blast-mixer-xlarge rotate: false xy: 181, 608 size: 48, 48 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 88cf200f90..a2be99c317 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 49f00c1d4b..a4b451e8e6 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/assets/sprites/sprites3.png b/core/assets/sprites/sprites3.png index 97e679515f..3c818547c8 100644 Binary files a/core/assets/sprites/sprites3.png and b/core/assets/sprites/sprites3.png differ diff --git a/core/assets/sprites/sprites4.png b/core/assets/sprites/sprites4.png index c0f19c8130..8a69917cb9 100644 Binary files a/core/assets/sprites/sprites4.png and b/core/assets/sprites/sprites4.png differ diff --git a/core/assets/sprites/sprites5.png b/core/assets/sprites/sprites5.png index 3c8f6c4031..e6735f0b2b 100644 Binary files a/core/assets/sprites/sprites5.png and b/core/assets/sprites/sprites5.png differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 2e6d181b72..a906ba79af 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1672,8 +1672,9 @@ public class Blocks implements ContentList{ groundFactory = new UnitFactory("ground-factory"){{ requirements(Category.units, ItemStack.with(Items.copper, 30, Items.lead, 70)); plans = new UnitPlan[]{ - new UnitPlan(UnitTypes.dagger, 200f, ItemStack.with(Items.silicon, 10)), - new UnitPlan(UnitTypes.titan, 800f, ItemStack.with(Items.silicon, 20, Items.titanium, 10)), + new UnitPlan(UnitTypes.dagger, 200f, ItemStack.with(Items.silicon, 10, Items.lead, 10)), + new UnitPlan(UnitTypes.crawler, 200f, ItemStack.with(Items.silicon, 10, Items.blastCompound, 5)), + new UnitPlan(UnitTypes.tau, 200f, ItemStack.with(Items.silicon, 20, Items.lead, 10)), }; size = 3; consumes.power(1.2f); @@ -1683,7 +1684,9 @@ public class Blocks implements ContentList{ requirements(Category.units, ItemStack.with(Items.copper, 30, Items.lead, 70)); plans = new UnitPlan[]{ new UnitPlan(UnitTypes.wraith, 200f, ItemStack.with(Items.silicon, 10)), - //new UnitPlan(UnitTypes.ghoul, 200f, ItemStack.with(Items.silicon, 10)), + new UnitPlan(UnitTypes.spirit, 200f, ItemStack.with(Items.silicon, 10)), + new UnitPlan(UnitTypes.draug, 200f, ItemStack.with(Items.silicon, 10)), + new UnitPlan(UnitTypes.phantom, 200f, ItemStack.with(Items.silicon, 10)), }; size = 3; consumes.power(1.2f); @@ -1706,7 +1709,8 @@ public class Blocks implements ContentList{ consumes.power(3f); consumes.items(ItemStack.with(Items.silicon, 30, Items.graphite, 30)); itemCapacity = 30; - constructTime = 200f; + + constructTime = 60f * 5f; }}; repairPoint = new RepairPoint("repair-point"){{ diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 5eb2b89fad..708723f084 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -15,7 +15,7 @@ public class UnitTypes implements ContentList{ public static @EntityDef({Unitc.class, Legsc.class}) UnitType titan, dagger, crawler, fortress, eruptor, chaosArray, eradicator; //ground + builder - public static @EntityDef({Unitc.class, Legsc.class, Builderc.class}) UnitType oculon; + public static @EntityDef({Unitc.class, Legsc.class, Builderc.class}) UnitType oculon, tau; //air public static @EntityDef({Unitc.class}) UnitType wraith, reaper, ghoul, revenant, lich; @@ -96,9 +96,59 @@ public class UnitTypes implements ContentList{ }}); }}; + tau = new UnitType("tau"){{ + itemCapacity = 60; + canBoost = true; + boostMultiplier = 1.5f; + speed = 0.5f; + hitsize = 8f; + health = 100f; + buildSpeed = 0.8f; + + weapons.add(new Weapon("heal-weapon"){{ + shootY = 1.5f; + reload = 24f; + x = 1f; + shootX = 3.5f; + alternate = false; + ejectEffect = Fx.none; + recoil = 2f; + bullet = Bullets.healBullet; + shootSound = Sounds.pew; + }}); + } + + /* + + float healRange = 60f; + float healAmount = 10f; + float healReload = 160f; + boolean wasHealed; + + @Override + public void update(Unitc player){ + + if(player.timer().get(Playerc.timerAbility, healReload)){ + wasHealed = false; + + Units.nearby(player.team(), player.x, player.y, healRange, unit -> { + if(unit.health < unit.maxHealth()){ + Fx.heal.at(unit); + wasHealed = true; + } + unit.heal(healAmount); + }); + + if(wasHealed){ + Fx.healWave.at(player); + } + } + }*/ + }; + fortress = new UnitType("fortress"){{ titan.upgrade = this; - tier = 2; + tier = 3; speed = 0.38f; mass = 5f; diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java index b95c1aa8d6..5c1fc43c4b 100644 --- a/core/src/mindustry/entities/bullet/BulletType.java +++ b/core/src/mindustry/entities/bullet/BulletType.java @@ -162,7 +162,7 @@ public abstract class BulletType extends Content{ public void update(Bulletc b){ if(homingPower > 0.0001f){ - Teamc target = Units.closestTarget(b.team(), b.getX(), b.getY(), homingRange, e -> (e.isGrounded() && collidesGround) || (e.isFlying() && collidesAir)); + 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)); } @@ -178,8 +178,6 @@ public abstract class BulletType extends Content{ return ContentType.bullet; } - //TODO change 'create' to 'at' - public Bulletc create(Teamc owner, float x, float y, float angle){ return create(owner, owner.team(), x, y, angle); } diff --git a/core/src/mindustry/world/blocks/units/Reconstructor.java b/core/src/mindustry/world/blocks/units/Reconstructor.java index 1904e8585e..1d658bc81e 100644 --- a/core/src/mindustry/world/blocks/units/Reconstructor.java +++ b/core/src/mindustry/world/blocks/units/Reconstructor.java @@ -11,6 +11,7 @@ import mindustry.gen.*; import mindustry.graphics.*; import mindustry.ui.*; import mindustry.world.blocks.payloads.*; +import mindustry.world.meta.*; import static mindustry.Vars.state; @@ -38,6 +39,13 @@ public class Reconstructor extends UnitBlock{ bars.add("progress", entity -> new Bar("bar.progress", Pal.ammo, ((ReconstructorEntity)entity)::fraction)); } + @Override + public void setStats(){ + super.setStats(); + + stats.add(BlockStat.productionTime, constructTime / 60f, StatUnit.seconds); + } + public class ReconstructorEntity extends UnitBlockEntity{ public float fraction(){