diff --git a/core/assets/sounds/artillery.ogg b/core/assets/sounds/artillery.ogg index 4ebd3b9d57..de9aef9988 100644 Binary files a/core/assets/sounds/artillery.ogg and b/core/assets/sounds/artillery.ogg differ diff --git a/core/assets/sounds/bang.ogg b/core/assets/sounds/bang.ogg index dee05814d9..8debe8b262 100644 Binary files a/core/assets/sounds/bang.ogg and b/core/assets/sounds/bang.ogg differ diff --git a/core/assets/sounds/bang2.ogg b/core/assets/sounds/bang2.ogg deleted file mode 100644 index 241b8e806f..0000000000 Binary files a/core/assets/sounds/bang2.ogg and /dev/null differ diff --git a/core/assets/sounds/blast.ogg b/core/assets/sounds/blast.ogg deleted file mode 100644 index 6a8493d962..0000000000 Binary files a/core/assets/sounds/blast.ogg and /dev/null differ diff --git a/core/assets/sounds/break.ogg b/core/assets/sounds/break.ogg old mode 100644 new mode 100755 index 149dd8cd68..28266f8148 Binary files a/core/assets/sounds/break.ogg and b/core/assets/sounds/break.ogg differ diff --git a/core/assets/sounds/click.ogg b/core/assets/sounds/click.ogg new file mode 100755 index 0000000000..a993b2cd53 Binary files /dev/null and b/core/assets/sounds/click.ogg differ diff --git a/core/assets/sounds/die.ogg b/core/assets/sounds/die.ogg deleted file mode 100644 index 745c9e71e1..0000000000 Binary files a/core/assets/sounds/die.ogg and /dev/null differ diff --git a/core/assets/sounds/door.ogg b/core/assets/sounds/door.ogg new file mode 100755 index 0000000000..30b57f0189 Binary files /dev/null and b/core/assets/sounds/door.ogg differ diff --git a/core/assets/sounds/drill.ogg b/core/assets/sounds/drill.ogg new file mode 100755 index 0000000000..c2c005051e Binary files /dev/null and b/core/assets/sounds/drill.ogg differ diff --git a/core/assets/sounds/shootBig.ogg b/core/assets/sounds/shootBig.ogg new file mode 100644 index 0000000000..5b58211031 Binary files /dev/null and b/core/assets/sounds/shootBig.ogg differ diff --git a/core/assets/sounds/shootSnap.ogg b/core/assets/sounds/shootSnap.ogg index 5b58211031..c50b9ff90a 100644 Binary files a/core/assets/sounds/shootSnap.ogg and b/core/assets/sounds/shootSnap.ogg differ diff --git a/core/assets/sounds/thruster.ogg b/core/assets/sounds/thruster.ogg new file mode 100644 index 0000000000..91cad3ebc2 Binary files /dev/null and b/core/assets/sounds/thruster.ogg differ diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png index 884068b960..608d97218e 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 5543aadd45..7a58d8b576 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -6,3577 +6,3556 @@ filter: Nearest,Nearest repeat: none force-projector rotate: false - xy: 521, 478 + xy: 521, 480 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 force-projector-icon-full rotate: false - xy: 521, 478 + xy: 521, 480 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 force-projector-top rotate: false - xy: 489, 380 + xy: 489, 382 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mend-projector rotate: false - xy: 1610, 1595 + xy: 1610, 1597 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mend-projector-icon-full rotate: false - xy: 1610, 1595 + xy: 1610, 1597 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mend-projector-top rotate: false - xy: 1676, 1595 + xy: 1676, 1597 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mender rotate: false - xy: 1245, 1123 + xy: 1307, 1057 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mender-icon-full rotate: false - xy: 1245, 1123 + xy: 1307, 1057 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mender-top rotate: false - xy: 1279, 1123 + xy: 1341, 1091 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-projector rotate: false - xy: 1808, 1591 + xy: 1808, 1593 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overdrive-projector-icon-full rotate: false - xy: 1808, 1591 + xy: 1808, 1593 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overdrive-projector-top rotate: false - xy: 1874, 1591 + xy: 1874, 1593 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shock-mine rotate: false - xy: 1237, 715 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -shock-mine-icon-full - rotate: false - xy: 1237, 715 + xy: 1341, 717 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-arrow rotate: false - xy: 1203, 1013 + xy: 1763, 1319 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 1203, 843 + xy: 1113, 86 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-icon-full rotate: false - xy: 1203, 843 + xy: 1113, 86 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 1203, 809 + xy: 1113, 52 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 1203, 775 + xy: 1113, 18 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 center rotate: false - xy: 1203, 741 + xy: 1545, 1215 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 1490, 1221 + xy: 1137, 1033 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-icon-full rotate: false - xy: 1490, 1221 + xy: 1137, 1033 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 1524, 1221 + xy: 1137, 999 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 1558, 1221 + xy: 1137, 965 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 1592, 1221 + xy: 1137, 931 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 1626, 1221 + xy: 1137, 897 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 1456, 1187 + xy: 1137, 863 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 1490, 1187 + xy: 1137, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 1524, 1187 + xy: 1137, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 1558, 1187 + xy: 1137, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 1592, 1187 + xy: 1137, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 1626, 1187 + xy: 1137, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 1422, 1173 + xy: 2006, 1625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 1456, 1153 + xy: 2006, 1591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 1490, 1153 + xy: 2006, 1557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 1524, 1153 + xy: 2006, 1523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 1558, 1153 + xy: 2006, 1489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 1592, 1153 + xy: 1133, 659 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 1626, 1153 + xy: 1133, 625 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 1125, 645 + xy: 1133, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 1159, 649 + xy: 1133, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 1407, 935 + xy: 1235, 615 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-icon-full rotate: false - xy: 1407, 935 + xy: 1235, 615 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 1407, 901 + xy: 1269, 649 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 1407, 867 + xy: 1235, 581 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 1407, 833 + xy: 1269, 615 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 1407, 799 + xy: 1303, 649 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 1407, 765 + xy: 1269, 581 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 1407, 731 + xy: 1303, 615 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 1449, 1051 + xy: 1337, 649 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 1483, 1051 + xy: 1303, 581 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 1517, 1051 + xy: 1337, 615 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 1551, 1051 + xy: 1371, 649 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 1585, 1051 + xy: 1337, 581 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 1619, 1051 + xy: 1371, 615 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 1653, 1051 + xy: 1371, 581 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 1441, 1017 + xy: 1167, 547 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 1441, 983 + xy: 1201, 547 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 1475, 1017 + xy: 1235, 547 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 1441, 949 + xy: 1269, 547 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 1475, 983 + xy: 1303, 547 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1509, 1017 + xy: 1337, 547 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 distributor rotate: false - xy: 459, 118 + xy: 459, 120 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 distributor-icon-full rotate: false - xy: 459, 118 + xy: 459, 120 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 junction rotate: false - xy: 1864, 1123 + xy: 1239, 1091 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction-icon-full rotate: false - xy: 1864, 1123 + xy: 1239, 1091 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mass-driver-base rotate: false - xy: 651, 750 + xy: 651, 752 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 1237, 953 + xy: 1341, 1023 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overflow-gate-icon-full rotate: false - xy: 1237, 953 + xy: 1341, 1023 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 1237, 885 + xy: 1307, 955 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-icon-full rotate: false - xy: 1237, 885 + xy: 1307, 955 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 1271, 919 + xy: 1341, 989 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 1305, 953 + xy: 1375, 1023 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 1237, 851 + xy: 1171, 785 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 1339, 1029 + xy: 1205, 717 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router-icon-full rotate: false - xy: 1339, 1029 + xy: 1205, 717 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 1449, 1085 + xy: 1307, 683 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter-icon-full rotate: false - xy: 1449, 1085 + xy: 1307, 683 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blast-drill rotate: false - xy: 1804, 1917 + xy: 1804, 1919 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 blast-drill-rim rotate: false - xy: 526, 1595 + xy: 526, 1597 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 blast-drill-rotator rotate: false - xy: 453, 1392 + xy: 453, 1394 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 blast-drill-top rotate: false - xy: 163, 1031 + xy: 163, 1033 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 drill-top rotate: false - xy: 525, 52 + xy: 525, 54 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-liquid rotate: false - xy: 525, 52 + xy: 525, 54 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 laser-drill rotate: false - xy: 685, 184 + xy: 685, 186 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-rim rotate: false - xy: 583, 1436 + xy: 583, 1438 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 681, 1436 + xy: 681, 1438 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 609, 1338 + xy: 609, 1340 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mechanical-drill rotate: false - xy: 1346, 1557 + xy: 1346, 1559 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-rotator rotate: false - xy: 1478, 1595 + xy: 1478, 1597 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-top rotate: false - xy: 1544, 1595 + xy: 1544, 1597 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 oil-extractor rotate: false - xy: 749, 1142 + xy: 749, 1144 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-liquid rotate: false - xy: 749, 946 + xy: 749, 948 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-rotator rotate: false - xy: 749, 848 + xy: 749, 850 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-top rotate: false - xy: 749, 750 + xy: 749, 752 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 pneumatic-drill rotate: false - xy: 1148, 1491 + xy: 1148, 1493 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-rotator rotate: false - xy: 1280, 1491 + xy: 1280, 1493 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-top rotate: false - xy: 1346, 1491 + xy: 1346, 1493 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 979, 955 + xy: 913, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 979, 889 + xy: 913, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 913, 823 + xy: 979, 825 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 979, 823 + xy: 913, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-border rotate: false - xy: 1141, 683 + xy: 1943, 1361 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-middle rotate: false - xy: 1203, 1081 + xy: 1695, 1315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-select rotate: false - xy: 1203, 1047 + xy: 1729, 1319 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 1175, 683 + xy: 1103, 829 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 place-arrow rotate: false - xy: 717, 554 + xy: 717, 556 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 rubble-1-0 rotate: false - xy: 1676, 1463 + xy: 1676, 1465 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 1742, 1459 + xy: 1742, 1461 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 1808, 1459 + xy: 1808, 1461 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 1874, 1459 + xy: 1874, 1461 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-3-0 rotate: false - xy: 783, 260 + xy: 783, 262 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 rubble-3-1 rotate: false - xy: 783, 260 + xy: 783, 262 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 rubble-4-0 rotate: false - xy: 293, 742 + xy: 293, 744 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 rubble-4-1 rotate: false - xy: 293, 742 + xy: 293, 744 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 1203, 979 + xy: 1797, 1323 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-icon-full rotate: false - xy: 1203, 979 + xy: 1797, 1323 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 1203, 945 + xy: 1831, 1323 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 1203, 945 + xy: 1831, 1323 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 1203, 911 + xy: 1865, 1323 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 1203, 877 + xy: 1113, 120 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 1709, 1259 + xy: 1103, 1033 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 1743, 1259 + xy: 1103, 999 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 1777, 1259 + xy: 1103, 965 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 1811, 1259 + xy: 1103, 931 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 1811, 1259 + xy: 1103, 931 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 1811, 1259 + xy: 1103, 931 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 1811, 1259 + xy: 1103, 931 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 1845, 1259 + xy: 1103, 897 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 1913, 1267 + xy: 1103, 795 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 1320, 1191 + xy: 1103, 761 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 1313, 1157 + xy: 1103, 727 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 1354, 1199 + xy: 1103, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 1354, 1199 + xy: 1103, 693 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 1388, 1199 + xy: 1144, 1135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 1422, 1207 + xy: 1137, 1101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 1456, 1221 + xy: 1137, 1067 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 1932, 1083 + xy: 1205, 1023 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction-icon-full rotate: false - xy: 1932, 1083 + xy: 1205, 1023 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 1987, 1287 + xy: 1273, 1091 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 1981, 1219 + xy: 1205, 989 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 2015, 1253 + xy: 1239, 1023 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-tank-bottom rotate: false - xy: 651, 1240 + xy: 651, 1242 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-liquid rotate: false - xy: 651, 1044 + xy: 651, 1046 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-top rotate: false - xy: 651, 946 + xy: 651, 948 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 2000, 1083 + xy: 1239, 989 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-pump-icon-full rotate: false - xy: 2000, 1083 + xy: 1239, 989 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 1305, 1021 + xy: 1171, 819 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-icon-full rotate: false - xy: 1305, 1021 + xy: 1171, 819 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 1237, 919 + xy: 1205, 853 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 1271, 953 + xy: 1239, 887 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 1305, 987 + xy: 1273, 921 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 1237, 783 + xy: 1171, 751 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1271, 817 + xy: 1205, 785 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1305, 851 + xy: 1239, 819 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 1237, 749 + xy: 1273, 853 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 1271, 783 + xy: 1307, 887 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 1305, 817 + xy: 1341, 921 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 1544, 1463 + xy: 1544, 1465 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rotary-pump-icon-full rotate: false - xy: 1544, 1463 + xy: 1544, 1465 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 881, 162 + xy: 881, 164 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thermal-pump-icon-full rotate: false - xy: 881, 162 + xy: 881, 164 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 dart-mech-pad rotate: false - xy: 1009, 1483 + xy: 1009, 1485 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dart-mech-pad-icon-full rotate: false - xy: 1009, 1483 + xy: 1009, 1485 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 delta-mech-pad rotate: false - xy: 393, 58 + xy: 393, 60 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 delta-mech-pad-icon-full rotate: false - xy: 393, 58 + xy: 393, 60 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 glaive-ship-pad rotate: false - xy: 685, 282 + xy: 685, 284 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 glaive-ship-pad-icon-full rotate: false - xy: 685, 282 + xy: 685, 284 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 javelin-ship-pad rotate: false - xy: 1148, 1557 + xy: 1148, 1559 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 javelin-ship-pad-icon-full rotate: false - xy: 1148, 1557 + xy: 1148, 1559 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 omega-mech-pad rotate: false - xy: 749, 652 + xy: 749, 654 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 omega-mech-pad-icon-full rotate: false - xy: 749, 652 + xy: 749, 654 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 tau-mech-pad rotate: false - xy: 1035, 1351 + xy: 913, 1287 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 tau-mech-pad-icon-full rotate: false - xy: 1035, 1351 + xy: 913, 1287 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 trident-ship-pad rotate: false - xy: 979, 1153 + xy: 913, 1089 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 trident-ship-pad-icon-full rotate: false - xy: 979, 1153 + xy: 913, 1089 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 battery rotate: false - xy: 1203, 1115 + xy: 797, 1738 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 battery-icon-full rotate: false - xy: 1203, 1115 + xy: 797, 1738 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 battery-large rotate: false - xy: 293, 384 + xy: 293, 386 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 battery-large-icon-full rotate: false - xy: 293, 384 + xy: 293, 386 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 1286, 1191 + xy: 1103, 1101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-icon-full rotate: false - xy: 1286, 1191 + xy: 1103, 1101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 1279, 1157 + xy: 1103, 1067 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 differential-generator rotate: false - xy: 656, 1534 + xy: 656, 1536 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 differential-generator-icon-full rotate: false - xy: 656, 1534 + xy: 656, 1536 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 differential-generator-liquid rotate: false - xy: 293, 188 + xy: 293, 190 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 differential-generator-top rotate: false - xy: 391, 384 + xy: 391, 386 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 impact-reactor rotate: false - xy: 1888, 1787 + xy: 1888, 1789 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-bottom rotate: false - xy: 1498, 1661 + xy: 1498, 1663 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-light rotate: false - xy: 1758, 1657 + xy: 1758, 1659 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-plasma-0 rotate: false - xy: 1888, 1657 + xy: 1888, 1659 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-plasma-1 rotate: false - xy: 163, 251 + xy: 163, 253 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-plasma-2 rotate: false - xy: 155, 121 + xy: 155, 123 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-plasma-3 rotate: false - xy: 219, 1262 + xy: 219, 1264 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 power-node rotate: false - xy: 1305, 919 + xy: 1239, 853 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-icon-full rotate: false - xy: 1305, 919 + xy: 1239, 853 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 1412, 1491 + xy: 1412, 1493 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 power-node-large-icon-full rotate: false - xy: 1412, 1491 + xy: 1412, 1493 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 power-source rotate: false - xy: 1237, 817 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -power-source-icon-full - rotate: false - xy: 1237, 817 + xy: 1273, 887 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 1271, 851 + xy: 1341, 955 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void-icon-full rotate: false - xy: 1271, 851 + xy: 1341, 955 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 1610, 1463 + xy: 1610, 1465 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rtg-generator-icon-full rotate: false - xy: 1610, 1463 + xy: 1610, 1465 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 1339, 995 + xy: 1239, 751 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 1415, 1071 + xy: 1273, 683 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-icon-full rotate: false - xy: 1415, 1071 + xy: 1273, 683 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-large rotate: false - xy: 881, 260 + xy: 881, 262 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 solar-panel-large-icon-full rotate: false - xy: 881, 260 + xy: 881, 262 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 surge-tower rotate: false - xy: 1045, 1417 + xy: 913, 1419 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 surge-tower-icon-full rotate: false - xy: 1045, 1417 + xy: 913, 1419 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 913, 1285 + xy: 979, 1287 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-generator-icon-full rotate: false - xy: 913, 1285 + xy: 979, 1287 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-reactor rotate: false - xy: 754, 1632 + xy: 754, 1634 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thorium-reactor-icon-full rotate: false - xy: 754, 1632 + xy: 754, 1634 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thorium-reactor-center rotate: false - xy: 754, 1534 + xy: 754, 1536 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thorium-reactor-lights rotate: false - xy: 779, 1436 + xy: 779, 1438 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 turbine-generator rotate: false - xy: 913, 1087 + xy: 979, 1089 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-icon-full rotate: false - xy: 913, 1087 + xy: 979, 1089 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-top rotate: false - xy: 979, 1087 + xy: 913, 1023 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 alloy-smelter rotate: false - xy: 1, 1 + xy: 1, 3 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 alloy-smelter-icon-full rotate: false - xy: 1, 1 + xy: 1, 3 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 alloy-smelter-top rotate: false - xy: 1934, 1949 + xy: 1934, 1951 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 blast-mixer rotate: false - xy: 651, 586 + xy: 651, 588 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 blast-mixer-icon-full rotate: false - xy: 651, 586 + xy: 651, 588 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 coal-centrifuge rotate: false - xy: 295, 24 + xy: 295, 26 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 coal-centrifuge-icon-full rotate: false - xy: 295, 24 + xy: 295, 26 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 847, 1008 + xy: 847, 1010 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 847, 876 + xy: 847, 878 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 847, 810 + xy: 847, 812 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator rotate: false - xy: 847, 744 + xy: 847, 746 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 950, 1549 + xy: 950, 1551 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 1016, 1549 + xy: 1016, 1551 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 graphite-press rotate: false - xy: 1214, 1623 + xy: 1214, 1625 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 graphite-press-icon-full rotate: false - xy: 1214, 1623 + xy: 1214, 1625 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 incinerator rotate: false - xy: 1932, 1117 + xy: 1178, 1159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 incinerator-icon-full rotate: false - xy: 1932, 1117 + xy: 1178, 1159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 1660, 1119 + xy: 1382, 1125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source-icon-full rotate: false - xy: 1660, 1119 + xy: 1382, 1125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 1830, 1123 + xy: 1205, 1057 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void-icon-full rotate: false - xy: 1830, 1123 + xy: 1205, 1057 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 kiln rotate: false - xy: 1280, 1623 + xy: 1280, 1625 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 kiln-icon-full rotate: false - xy: 1280, 1623 + xy: 1280, 1625 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 kiln-top rotate: false - xy: 1214, 1557 + xy: 1214, 1559 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 1214, 1557 + xy: 1214, 1559 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 liquid-source rotate: false - xy: 2000, 1185 + xy: 1307, 1091 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-source-icon-full rotate: false - xy: 2000, 1185 + xy: 1307, 1091 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 1995, 1321 + xy: 1273, 1023 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter-icon-full rotate: false - xy: 1995, 1321 + xy: 1273, 1023 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 multi-press rotate: false - xy: 749, 1240 + xy: 749, 1242 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 multi-press-icon-full rotate: false - xy: 749, 1240 + xy: 749, 1242 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 phase-weaver rotate: false - xy: 1610, 1529 + xy: 1610, 1531 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 1676, 1529 + xy: 1676, 1531 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 1808, 1525 + xy: 1808, 1527 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 1874, 1525 + xy: 1874, 1527 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor-icon-full rotate: false - xy: 1874, 1525 + xy: 1874, 1527 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 1940, 1525 + xy: 1940, 1527 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 1271, 749 + xy: 1375, 955 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 1305, 749 + xy: 1205, 751 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 1347, 1097 + xy: 1239, 785 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 1478, 1463 + xy: 1478, 1465 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pyratite-mixer-icon-full rotate: false - xy: 1478, 1463 + xy: 1478, 1465 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator rotate: false - xy: 1273, 1425 + xy: 1339, 1427 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-icon-full rotate: false - xy: 1273, 1425 + xy: 1339, 1427 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 1339, 1425 + xy: 1405, 1427 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 1405, 1425 + xy: 1471, 1399 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter-icon-full rotate: false - xy: 1405, 1425 + xy: 1471, 1399 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press rotate: false - xy: 1603, 1397 + xy: 1669, 1399 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame0 rotate: false - xy: 1669, 1397 + xy: 1735, 1395 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame1 rotate: false - xy: 1735, 1393 + xy: 1801, 1395 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame2 rotate: false - xy: 1801, 1393 + xy: 1867, 1395 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-liquid rotate: false - xy: 1933, 1393 + xy: 979, 1419 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-top rotate: false - xy: 979, 1417 + xy: 1045, 1419 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 container rotate: false - xy: 950, 1615 + xy: 950, 1617 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 container-icon-full rotate: false - xy: 950, 1615 + xy: 950, 1617 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 core-foundation rotate: false - xy: 163, 381 + xy: 163, 383 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 core-foundation-icon-full rotate: false - xy: 163, 381 + xy: 163, 383 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 core-nucleus rotate: false - xy: 1, 999 + xy: 1, 1001 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 core-nucleus-icon-full rotate: false - xy: 1, 999 + xy: 1, 1001 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 core-shard rotate: false - xy: 293, 286 + xy: 293, 288 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 core-shard-icon-full rotate: false - xy: 293, 286 + xy: 293, 288 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 launch-pad rotate: false - xy: 707, 1338 + xy: 707, 1340 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 launch-pad-icon-full rotate: false - xy: 707, 1338 + xy: 707, 1340 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 launch-pad-large rotate: false - xy: 349, 1262 + xy: 349, 1264 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 launch-pad-large-icon-full rotate: false - xy: 349, 1262 + xy: 349, 1264 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 unloader rotate: false - xy: 1509, 983 + xy: 1163, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader-icon-full rotate: false - xy: 1509, 983 + xy: 1163, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 vault rotate: false - xy: 852, 1559 + xy: 852, 1561 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 vault-icon-full rotate: false - xy: 852, 1559 + xy: 852, 1561 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 arc-heat rotate: false - xy: 877, 1459 + xy: 877, 1461 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-1 rotate: false - xy: 797, 1736 + xy: 1909, 1361 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-2 rotate: false - xy: 717, 488 + xy: 717, 490 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-3 rotate: false - xy: 423, 514 + xy: 423, 516 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-4 rotate: false - xy: 163, 901 + xy: 163, 903 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 hail-heat rotate: false - xy: 609, 1296 + xy: 609, 1298 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 1280, 1557 + xy: 1280, 1559 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 meltdown-heat rotate: false - xy: 293, 1132 + xy: 293, 1134 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 ripple-heat rotate: false - xy: 783, 456 + xy: 783, 458 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 salvo-heat rotate: false - xy: 723, 96 + xy: 723, 98 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 855, 96 + xy: 855, 98 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 921, 96 + xy: 921, 98 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch-heat rotate: false - xy: 1339, 859 + xy: 1341, 819 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 913, 691 + xy: 979, 693 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 crawler-factory rotate: false - xy: 847, 1206 + xy: 847, 1208 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dagger-factory rotate: false - xy: 847, 1206 + xy: 847, 1208 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 draug-factory rotate: false - xy: 847, 1206 + xy: 847, 1208 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phantom-factory rotate: false - xy: 847, 1206 + xy: 847, 1208 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spirit-factory rotate: false - xy: 847, 1206 + xy: 847, 1208 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wraith-factory rotate: false - xy: 847, 1206 + xy: 847, 1208 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 crawler-factory-top rotate: false - xy: 847, 1074 + xy: 847, 1076 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dagger-factory-top rotate: false - xy: 943, 1483 + xy: 943, 1485 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 draug-factory-top rotate: false - xy: 459, 52 + xy: 459, 54 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress-factory rotate: false - xy: 489, 282 + xy: 489, 284 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 fortress-factory-top rotate: false - xy: 619, 478 + xy: 619, 480 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 ghoul-factory-top rotate: false - xy: 619, 478 + xy: 619, 480 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 titan-factory-top rotate: false - xy: 619, 478 + xy: 619, 480 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 ghoul-factory rotate: false - xy: 587, 184 + xy: 587, 186 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 phantom-factory-top rotate: false - xy: 1478, 1529 + xy: 1478, 1531 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 repair-point-base rotate: false - xy: 1415, 1105 + xy: 1307, 853 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 revenant-factory rotate: false - xy: 423, 1132 + xy: 423, 1134 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 revenant-factory-top rotate: false - xy: 423, 1002 + xy: 423, 1004 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 spirit-factory-top rotate: false - xy: 1537, 1397 + xy: 1603, 1399 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-factory rotate: false - xy: 805, 1338 + xy: 805, 1340 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 wraith-factory-top rotate: false - xy: 1045, 1285 + xy: 1045, 1221 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 copper-wall rotate: false - xy: 1125, 611 + xy: 1129, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-icon-full rotate: false - xy: 1125, 611 + xy: 1129, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-large rotate: false - xy: 1098, 1689 + xy: 1098, 1691 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 copper-wall-large-icon-full rotate: false - xy: 1098, 1689 + xy: 1098, 1691 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door rotate: false - xy: 1830, 1225 + xy: 1899, 1289 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-icon-full rotate: false - xy: 1830, 1225 + xy: 1899, 1289 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large rotate: false - xy: 525, 118 + xy: 525, 120 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-large-icon-full rotate: false - xy: 525, 118 + xy: 525, 120 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 591, 118 + xy: 591, 120 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-open rotate: false - xy: 1762, 1157 + xy: 1933, 1293 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 1271, 885 + xy: 1205, 819 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-icon-full rotate: false - xy: 1271, 885 + xy: 1205, 819 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large rotate: false - xy: 1544, 1529 + xy: 1544, 1531 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-wall-large-icon-full rotate: false - xy: 1544, 1529 + xy: 1544, 1531 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-gigantic rotate: false - xy: 423, 872 + xy: 423, 874 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-full rotate: false - xy: 423, 872 + xy: 423, 874 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 scrap-wall-huge1 rotate: false - xy: 783, 162 + xy: 783, 164 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-huge-icon-full rotate: false - xy: 783, 162 + xy: 783, 164 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-huge2 rotate: false - xy: 881, 456 + xy: 881, 458 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-huge3 rotate: false - xy: 881, 358 + xy: 881, 360 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-large1 rotate: false - xy: 855, 30 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -scrap-wall-large-icon-full - rotate: false - xy: 855, 30 + xy: 855, 32 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large2 rotate: false - xy: 921, 30 + xy: 921, 32 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large3 rotate: false - xy: 1141, 1425 + xy: 1141, 1427 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large4 rotate: false - xy: 1207, 1425 + xy: 1207, 1427 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall1 rotate: false - xy: 1339, 825 + xy: 1273, 717 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-icon-full rotate: false - xy: 1339, 825 + xy: 1273, 717 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall2 rotate: false - xy: 1373, 859 + xy: 1307, 751 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 1339, 791 + xy: 1341, 785 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 1373, 825 + xy: 1375, 819 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 1373, 825 + xy: 1375, 819 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 1619, 1085 + xy: 1201, 649 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-icon-full rotate: false - xy: 1619, 1085 + xy: 1201, 649 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large rotate: false - xy: 913, 1417 + xy: 903, 1353 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 surge-wall-large-icon-full rotate: false - xy: 913, 1417 + xy: 903, 1353 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 1407, 969 + xy: 1201, 581 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-icon-full rotate: false - xy: 1407, 969 + xy: 1201, 581 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 979, 1285 + xy: 913, 1221 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-wall-large-icon-full rotate: false - xy: 979, 1285 + xy: 913, 1221 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thruster rotate: false - xy: 293, 482 + xy: 293, 484 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 thruster-icon-full rotate: false - xy: 293, 482 + xy: 293, 484 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 titanium-wall rotate: false - xy: 1441, 915 + xy: 1371, 547 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-icon-full rotate: false - xy: 1441, 915 + xy: 1371, 547 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large rotate: false - xy: 913, 1153 + xy: 979, 1155 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titanium-wall-large-icon-full rotate: false - xy: 913, 1153 + xy: 979, 1155 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 bullet rotate: false - xy: 913, 579 + xy: 1029, 616 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 bullet-back rotate: false - xy: 971, 637 + xy: 1029, 562 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 casing rotate: false - xy: 903, 1423 + xy: 903, 1425 size: 8, 16 orig: 8, 16 offset: 0, 0 index: -1 circle-shadow rotate: false - xy: 645, 1844 + xy: 645, 1846 size: 201, 201 orig: 201, 201 offset: 0, 0 index: -1 error rotate: false - xy: 1111, 1267 + xy: 1083, 620 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 laser rotate: false - xy: 387, 40 + xy: 387, 42 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 laser-end rotate: false - xy: 759, 1770 + xy: 759, 1772 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 minelaser rotate: false - xy: 155, 301 + xy: 155, 303 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 minelaser-end rotate: false - xy: 950, 1681 + xy: 950, 1683 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 missile rotate: false - xy: 1961, 1355 + xy: 759, 1734 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 missile-back rotate: false - xy: 759, 1732 + xy: 1795, 1357 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 scale_marker rotate: false - xy: 459, 184 + xy: 459, 186 size: 4, 4 orig: 4, 4 offset: 0, 0 index: -1 scorch1 rotate: false - xy: 1441, 813 + xy: 1163, 377 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch2 rotate: false - xy: 1441, 711 + xy: 1163, 275 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch3 rotate: false - xy: 1471, 813 + xy: 1163, 173 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch4 rotate: false - xy: 1471, 711 + xy: 1409, 1023 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch5 rotate: false - xy: 1227, 613 + xy: 1409, 921 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 shell rotate: false - xy: 1103, 679 + xy: 1833, 1357 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shell-back rotate: false - xy: 1671, 1259 + xy: 1871, 1357 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shot rotate: false - xy: 1271, 715 + xy: 1375, 717 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 transfer rotate: false - xy: 155, 251 + xy: 155, 253 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 1475, 949 + xy: 1163, 513 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 transfer-end rotate: false - xy: 1024, 1681 + xy: 1024, 1683 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 white rotate: false - xy: 645, 1725 + xy: 645, 1727 size: 3, 3 orig: 3, 3 offset: 0, 0 index: -1 arc rotate: false - xy: 609, 1262 + xy: 609, 1264 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 arc-icon-full rotate: false - xy: 1421, 1241 + xy: 1029, 2 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blast-drill-icon-full rotate: false - xy: 323, 1392 + xy: 323, 1394 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 char-icon-full rotate: false - xy: 1252, 1191 + xy: 1579, 1223 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cliffs-icon-full rotate: false - xy: 1245, 1157 + xy: 1110, 1135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-icon-full rotate: false - xy: 1879, 1259 + xy: 1103, 863 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-0 rotate: false - xy: 1159, 615 + xy: 1129, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-1 rotate: false - xy: 1193, 649 + xy: 1129, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-2 rotate: false - xy: 1193, 615 + xy: 1129, 421 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-3 rotate: false - xy: 1961, 1321 + xy: 1129, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-4 rotate: false - xy: 1953, 1287 + xy: 1129, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-5 rotate: false - xy: 1947, 1253 + xy: 1129, 319 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-6 rotate: false - xy: 1913, 1233 + xy: 1129, 285 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-7 rotate: false - xy: 1947, 1219 + xy: 1129, 251 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-2-0 rotate: false - xy: 1016, 1615 + xy: 1016, 1617 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-1 rotate: false - xy: 1164, 1689 + xy: 1164, 1691 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-2 rotate: false - xy: 1230, 1689 + xy: 1230, 1691 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-3 rotate: false - xy: 1296, 1689 + xy: 1296, 1691 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-4 rotate: false - xy: 1362, 1689 + xy: 1362, 1691 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-5 rotate: false - xy: 1428, 1689 + xy: 1428, 1691 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-6 rotate: false - xy: 393, 124 + xy: 393, 126 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-7 rotate: false - xy: 847, 1272 + xy: 847, 1274 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-3-0 rotate: false - xy: 656, 1632 + xy: 656, 1634 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-1 rotate: false - xy: 553, 1164 + xy: 553, 1166 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-2 rotate: false - xy: 553, 1066 + xy: 553, 1068 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-3 rotate: false - xy: 553, 968 + xy: 553, 970 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-4 rotate: false - xy: 553, 870 + xy: 553, 872 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-5 rotate: false - xy: 553, 772 + xy: 553, 774 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-6 rotate: false - xy: 553, 674 + xy: 553, 676 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-7 rotate: false - xy: 553, 576 + xy: 553, 578 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-4-0 rotate: false - xy: 848, 1755 + xy: 848, 1757 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-1 rotate: false - xy: 978, 1755 + xy: 978, 1757 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-2 rotate: false - xy: 1108, 1755 + xy: 1108, 1757 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-3 rotate: false - xy: 1238, 1755 + xy: 1238, 1757 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-4 rotate: false - xy: 1368, 1755 + xy: 1368, 1757 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-5 rotate: false - xy: 1498, 1791 + xy: 1498, 1793 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-6 rotate: false - xy: 1628, 1791 + xy: 1628, 1793 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-7 rotate: false - xy: 1758, 1787 + xy: 1758, 1789 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-5-0 rotate: false - xy: 848, 1885 + xy: 848, 1887 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cracks-5-1 rotate: false - xy: 1, 837 + xy: 1, 839 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cracks-5-2 rotate: false - xy: 1010, 1885 + xy: 1010, 1887 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cracks-5-3 rotate: false - xy: 1, 675 + xy: 1, 677 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cracks-5-4 rotate: false - xy: 1172, 1885 + xy: 1172, 1887 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cracks-5-5 rotate: false - xy: 1, 513 + xy: 1, 515 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cracks-5-6 rotate: false - xy: 1334, 1885 + xy: 1334, 1887 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cracks-5-7 rotate: false - xy: 1, 351 + xy: 1, 353 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 craters-icon-full rotate: false - xy: 1660, 1221 + xy: 1129, 217 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 crawler-factory-icon-full rotate: false - xy: 847, 1140 + xy: 847, 1142 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-icon-full rotate: false - xy: 847, 942 + xy: 847, 944 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-icon-full rotate: false - xy: 847, 678 + xy: 847, 680 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cyclone rotate: false - xy: 99, 1 + xy: 99, 3 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cyclone-icon-full rotate: false - xy: 197, 23 + xy: 197, 25 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 dagger-factory-icon-full rotate: false - xy: 877, 1493 + xy: 877, 1495 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dark-metal-icon-full rotate: false - xy: 1660, 1187 + xy: 1129, 183 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-1-icon-full rotate: false - xy: 1660, 1153 + xy: 1899, 1323 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-2-icon-full rotate: false - xy: 1694, 1225 + xy: 1933, 1327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-3-icon-full rotate: false - xy: 1728, 1225 + xy: 1967, 1327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-4-icon-full rotate: false - xy: 1694, 1191 + xy: 2001, 1327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-5-icon-full rotate: false - xy: 1762, 1225 + xy: 1695, 1281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-6-icon-full rotate: false - xy: 1694, 1157 + xy: 1729, 1285 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-icon-full rotate: false - xy: 1728, 1191 + xy: 1763, 1285 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-tainted-water-icon-full rotate: false - xy: 1796, 1225 + xy: 1797, 1289 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-water-icon-full rotate: false - xy: 1728, 1157 + xy: 1831, 1289 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater-icon-full rotate: false - xy: 1762, 1191 + xy: 1865, 1289 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 draug-factory-icon-full rotate: false - xy: 657, 118 + xy: 657, 120 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dunerocks-icon-full rotate: false - xy: 1796, 1191 + xy: 1967, 1293 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 duo rotate: false - xy: 1864, 1225 + xy: 2001, 1293 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 duo-icon-full rotate: false - xy: 1796, 1157 + xy: 1545, 1181 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fortress-factory-icon-full rotate: false - xy: 489, 184 + xy: 489, 186 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 fuse rotate: false - xy: 587, 380 + xy: 587, 382 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 fuse-icon-full rotate: false - xy: 587, 282 + xy: 587, 284 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 ghoul-factory-icon-full rotate: false - xy: 685, 380 + xy: 685, 382 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 grass-icon-full rotate: false - xy: 1830, 1191 + xy: 1579, 1189 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hail rotate: false - xy: 1830, 1157 + xy: 1161, 1193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hail-icon-full rotate: false - xy: 1864, 1191 + xy: 1195, 1193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone-icon-full rotate: false - xy: 1864, 1157 + xy: 1229, 1193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock-icon-full rotate: false - xy: 1898, 1199 + xy: 1263, 1193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-icon-full rotate: false - xy: 1898, 1165 + xy: 1297, 1193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow-icon-full rotate: false - xy: 1932, 1185 + xy: 1331, 1193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icerocks-icon-full rotate: false - xy: 1932, 1151 + xy: 1365, 1193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ignarock-icon-full rotate: false - xy: 1898, 1131 + xy: 1399, 1193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 impact-reactor-icon-full rotate: false - xy: 1628, 1661 + xy: 1628, 1663 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 item-blast-compound-medium rotate: false - xy: 583, 1410 + xy: 583, 1412 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-blast-compound-small rotate: false - xy: 583, 1392 + xy: 583, 1394 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-blast-compound-xlarge rotate: false - xy: 1911, 1301 + xy: 987, 127 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-blast-compound-xxlarge rotate: false - xy: 1361, 1275 + xy: 1079, 354 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-coal-medium rotate: false - xy: 847, 652 + xy: 847, 654 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-coal-small rotate: false - xy: 155, 103 + xy: 1160, 1175 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-coal-xlarge rotate: false - xy: 1461, 1255 + xy: 1561, 1257 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-coal-xxlarge rotate: false - xy: 1411, 1275 + xy: 1079, 304 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-copper-medium rotate: false - xy: 873, 652 + xy: 873, 654 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-copper-small rotate: false - xy: 197, 5 + xy: 155, 105 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-copper-xlarge rotate: false - xy: 1503, 1255 + xy: 1611, 1307 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-copper-xxlarge rotate: false - xy: 1110, 1217 + xy: 1079, 254 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-graphite-medium rotate: false - xy: 1934, 1923 + xy: 1934, 1925 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-graphite-small rotate: false - xy: 852, 1541 + xy: 852, 1543 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-graphite-xlarge rotate: false - xy: 1545, 1255 + xy: 987, 85 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-graphite-xxlarge rotate: false - xy: 1160, 1217 + xy: 1079, 204 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-lead-medium rotate: false - xy: 521, 586 + xy: 521, 588 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-lead-small rotate: false - xy: 723, 166 + xy: 723, 168 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-lead-xlarge rotate: false - xy: 1587, 1255 + xy: 1029, 120 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-lead-xxlarge rotate: false - xy: 1103, 1167 + xy: 1079, 154 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-metaglass-medium rotate: false - xy: 423, 488 + xy: 423, 490 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-metaglass-small rotate: false - xy: 913, 561 + xy: 913, 559 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-metaglass-xlarge rotate: false - xy: 1629, 1255 + xy: 1653, 1307 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-metaglass-xxlarge rotate: false - xy: 1103, 1117 + xy: 1101, 1369 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-phase-fabric-medium rotate: false - xy: 219, 1162 + xy: 219, 1164 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-phase-fabric-small rotate: false - xy: 1451, 1407 + xy: 1451, 1409 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-phase-fabric-xlarge rotate: false - xy: 2006, 1615 + xy: 987, 43 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-phase-fabric-xxlarge rotate: false - xy: 1153, 1167 + xy: 1151, 1377 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-plastanium-medium rotate: false - xy: 361, 64 + xy: 361, 66 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-plastanium-small rotate: false - xy: 877, 1441 + xy: 197, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-plastanium-xlarge rotate: false - xy: 2006, 1573 + xy: 987, 1 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-plastanium-xxlarge rotate: false - xy: 1103, 1067 + xy: 1201, 1377 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-pyratite-medium rotate: false - xy: 1111, 1457 + xy: 1111, 1459 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-pyratite-small rotate: false - xy: 895, 1441 + xy: 877, 1443 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-pyratite-xlarge rotate: false - xy: 2006, 1531 + xy: 1029, 78 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-pyratite-xxlarge rotate: false - xy: 1153, 1117 + xy: 1251, 1377 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -3590,1596 +3569,1617 @@ item-sand-medium index: -1 item-sand-small rotate: false - xy: 1203, 723 + xy: 895, 1443 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-sand-xlarge rotate: false - xy: 2006, 1489 + xy: 1029, 36 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-sand-xxlarge rotate: false - xy: 1103, 1017 + xy: 1301, 1377 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-scrap-medium rotate: false - xy: 1509, 957 + xy: 1197, 487 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-scrap-small rotate: false - xy: 1283, 697 + xy: 1103, 675 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-scrap-xlarge rotate: false - xy: 1211, 1233 + xy: 1071, 112 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-scrap-xxlarge rotate: false - xy: 1153, 1067 + xy: 1351, 1377 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-silicon-medium rotate: false - xy: 1543, 991 + xy: 1231, 521 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-silicon-small rotate: false - xy: 1986, 1931 + xy: 1977, 1377 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-silicon-xlarge rotate: false - xy: 1253, 1225 + xy: 1071, 70 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-silicon-xxlarge rotate: false - xy: 1103, 967 + xy: 1401, 1377 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-spore-pod-medium rotate: false - xy: 1577, 1025 + xy: 1129, 157 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-small rotate: false - xy: 475, 496 + xy: 1986, 1933 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-spore-pod-xlarge rotate: false - xy: 1295, 1225 + xy: 1071, 28 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-spore-pod-xxlarge rotate: false - xy: 1153, 1017 + xy: 1111, 1319 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-surge-alloy-medium rotate: false - xy: 1475, 923 + xy: 1433, 1201 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-small rotate: false - xy: 271, 1170 + xy: 475, 498 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-surge-alloy-xlarge rotate: false - xy: 1337, 1233 + xy: 1461, 1207 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-surge-alloy-xxlarge rotate: false - xy: 1103, 917 + xy: 1111, 1269 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-thorium-medium rotate: false - xy: 1257, 689 + xy: 1409, 895 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-thorium-small rotate: false - xy: 1629, 1033 + xy: 271, 1172 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-thorium-xlarge rotate: false - xy: 1379, 1233 + xy: 1503, 1207 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-thorium-xxlarge rotate: false - xy: 1153, 967 + xy: 1111, 1219 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-titanium-medium rotate: false - xy: 1960, 1923 + xy: 1960, 1925 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-small rotate: false - xy: 1257, 645 + xy: 1283, 529 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-titanium-xlarge rotate: false - xy: 1210, 1191 + xy: 1711, 1353 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-titanium-xxlarge rotate: false - xy: 1103, 867 + xy: 1110, 1169 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lancer rotate: false - xy: 1346, 1623 + xy: 1346, 1625 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 lancer-icon-full rotate: false - xy: 1412, 1623 + xy: 1412, 1625 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 laser-drill-icon-full rotate: false - xy: 295, 90 + xy: 295, 92 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-router-icon-full rotate: false - xy: 1981, 1253 + xy: 1171, 955 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-tank-icon-full rotate: false - xy: 651, 1142 + xy: 651, 1144 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 magmarock-icon-full rotate: false - xy: 2000, 1117 + xy: 1205, 955 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mass-driver rotate: false - xy: 651, 848 + xy: 651, 850 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mass-driver-icon-full rotate: false - xy: 651, 652 + xy: 651, 654 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mech-icon-alpha-mech rotate: false - xy: 1103, 767 + xy: 1161, 1227 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mech-icon-dart-ship rotate: false - xy: 1153, 817 + xy: 1211, 1277 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mech-icon-delta-mech rotate: false - xy: 1103, 717 + xy: 1261, 1327 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +mech-icon-glaive-ship + rotate: false + xy: 1045, 960 + size: 56, 56 + orig: 56, 56 + offset: 0, 0 + index: -1 +mech-icon-javelin-ship + rotate: false + xy: 1211, 1227 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mech-icon-omega-mech rotate: false - xy: 1045, 1024 + xy: 584, 1539 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 mech-icon-tau-mech rotate: false - xy: 584, 1537 + xy: 1045, 902 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 mech-icon-trident-ship rotate: false - xy: 1045, 966 - size: 56, 56 - orig: 56, 56 - offset: 0, 0 - index: -1 -trident-ship - rotate: false - xy: 1045, 966 + xy: 1045, 844 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 mechanical-drill-icon-full rotate: false - xy: 1412, 1557 + xy: 1412, 1559 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 meltdown rotate: false - xy: 479, 1262 + xy: 479, 1264 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 meltdown-icon-full rotate: false - xy: 293, 1002 + xy: 293, 1004 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 metal-floor-2-icon-full rotate: false - xy: 1313, 1123 + xy: 1171, 887 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-3-icon-full rotate: false - xy: 1347, 1131 + xy: 1205, 921 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-5-icon-full rotate: false - xy: 1381, 1131 + xy: 1239, 955 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged-icon-full rotate: false - xy: 1237, 1089 + xy: 1273, 989 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-icon-full rotate: false - xy: 1237, 1055 + xy: 1307, 1023 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 moss-icon-full rotate: false - xy: 1271, 1089 + xy: 1341, 1057 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 oil-extractor-icon-full rotate: false - xy: 749, 1044 + xy: 749, 1046 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 ore-coal-icon-full rotate: false - xy: 1237, 1021 + xy: 1375, 1091 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-icon-medium rotate: false - xy: 1237, 1021 + xy: 1375, 1091 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-icon-large rotate: false - xy: 1153, 767 + xy: 1261, 1277 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-coal-icon-small rotate: false - xy: 449, 488 + xy: 449, 490 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-icon-full rotate: false - xy: 1271, 1055 + xy: 1171, 853 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-icon-medium rotate: false - xy: 1271, 1055 + xy: 1171, 853 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-icon-large rotate: false - xy: 1153, 717 + xy: 1311, 1327 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-copper-icon-small rotate: false - xy: 245, 1162 + xy: 245, 1164 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-icon-full rotate: false - xy: 1305, 1089 + xy: 1205, 887 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-icon-medium rotate: false - xy: 1305, 1089 + xy: 1205, 887 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-icon-large rotate: false - xy: 1461, 1347 + xy: 1261, 1227 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-lead-icon-small rotate: false - xy: 361, 38 + xy: 361, 40 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-icon-full rotate: false - xy: 1237, 987 + xy: 1239, 921 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-icon-medium rotate: false - xy: 1237, 987 + xy: 1239, 921 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-icon-large rotate: false - xy: 1511, 1347 + xy: 1311, 1277 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-scrap-icon-small rotate: false - xy: 1111, 1431 + xy: 1111, 1433 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-icon-full rotate: false - xy: 1271, 1021 + xy: 1273, 955 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-icon-medium rotate: false - xy: 1271, 1021 + xy: 1273, 955 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-icon-large rotate: false - xy: 1461, 1297 + xy: 1361, 1327 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-thorium-icon-small rotate: false - xy: 1603, 1025 + xy: 1257, 521 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-icon-full rotate: false - xy: 1305, 1055 + xy: 1307, 989 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-icon-medium rotate: false - xy: 1305, 1055 + xy: 1307, 989 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-icon-large rotate: false - xy: 1561, 1347 + xy: 1311, 1227 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-titanium-icon-small rotate: false - xy: 1257, 663 + xy: 1409, 869 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pebbles-icon-full rotate: false - xy: 1271, 987 + xy: 1375, 1057 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phantom-factory-icon-full rotate: false - xy: 1940, 1591 + xy: 1940, 1593 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-icon-full rotate: false - xy: 1742, 1525 + xy: 1742, 1527 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pine-icon-full rotate: false - xy: 1511, 1297 + xy: 1361, 1277 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pneumatic-drill-icon-full rotate: false - xy: 1214, 1491 + xy: 1214, 1493 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 +power-source-icon-full + rotate: false + xy: 1307, 921 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 pulse-conduit-icon-full rotate: false - xy: 1305, 885 + xy: 1375, 989 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-icon-full rotate: false - xy: 1305, 783 + xy: 1171, 717 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 repair-point rotate: false - xy: 1381, 1097 + xy: 1273, 819 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 repair-point-icon-full rotate: false - xy: 1339, 1063 + xy: 1341, 887 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 revenant-factory-icon-full rotate: false - xy: 293, 872 + xy: 293, 874 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 ripple rotate: false - xy: 815, 554 + xy: 815, 556 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 ripple-icon-full rotate: false - xy: 783, 358 + xy: 783, 360 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 rock-icon-full rotate: false - xy: 1661, 1347 + xy: 1411, 1277 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rocks-icon-full rotate: false - xy: 1373, 1063 + xy: 1375, 921 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salt-icon-full rotate: false - xy: 1373, 1029 + xy: 1273, 785 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 saltrocks-icon-full rotate: false - xy: 1339, 961 + xy: 1307, 819 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salvo rotate: false - xy: 1940, 1459 + xy: 1940, 1461 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-icon-full rotate: false - xy: 789, 96 + xy: 789, 98 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 sand-boulder-icon-full rotate: false - xy: 1373, 995 + xy: 1341, 853 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-icon-full rotate: false - xy: 1339, 927 + xy: 1375, 887 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water-icon-full rotate: false - xy: 1373, 961 + xy: 1239, 717 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sandrocks-icon-full rotate: false - xy: 1339, 893 + xy: 1273, 751 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scatter rotate: false - xy: 723, 30 + xy: 723, 32 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scatter-icon-full rotate: false - xy: 789, 30 + xy: 789, 32 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch rotate: false - xy: 1373, 927 + xy: 1307, 785 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scorch-icon-full rotate: false - xy: 1373, 893 + xy: 1375, 853 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +scrap-wall-large-icon-full + rotate: false + xy: 1273, 1427 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 shale-boulder-icon-full rotate: false - xy: 1339, 757 + xy: 1307, 717 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-icon-full rotate: false - xy: 1373, 791 + xy: 1341, 751 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shalerocks-icon-full rotate: false - xy: 1373, 757 + xy: 1375, 785 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +shock-mine-icon-full + rotate: false + xy: 1375, 751 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shrubs-icon-full rotate: false - xy: 1305, 715 + xy: 1171, 683 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow-icon-full rotate: false - xy: 1339, 723 + xy: 1205, 683 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow-pine-icon-full rotate: false - xy: 1661, 1297 + xy: 1461, 1349 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snowrock-icon-full rotate: false - xy: 1711, 1343 + xy: 1511, 1349 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snowrocks-icon-full rotate: false - xy: 1373, 723 + xy: 1239, 683 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spawn-icon-full rotate: false - xy: 1483, 1085 + xy: 1341, 683 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spectre rotate: false - xy: 293, 612 + xy: 293, 614 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 spectre-icon-full rotate: false - xy: 423, 742 + xy: 423, 744 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 spirit-factory-icon-full rotate: false - xy: 1471, 1397 + xy: 1537, 1399 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-cluster-icon-full rotate: false - xy: 1203, 1149 + xy: 1753, 1353 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-moss-icon-full rotate: false - xy: 1517, 1085 + xy: 1375, 683 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-pine-icon-full rotate: false - xy: 1811, 1343 + xy: 1561, 1349 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-press-icon-full rotate: false - xy: 1867, 1393 + xy: 1933, 1395 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 sporerocks-icon-full rotate: false - xy: 1551, 1085 + xy: 1167, 649 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-icon-full rotate: false - xy: 1585, 1085 + xy: 1167, 615 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer rotate: false - xy: 903, 1351 + xy: 969, 1353 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 swarmer-icon-full rotate: false - xy: 969, 1351 + xy: 1035, 1353 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 tainted-water-icon-full rotate: false - xy: 1653, 1085 + xy: 1167, 581 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-icon-full rotate: false - xy: 1407, 1037 + xy: 1201, 615 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tendrils-icon-full rotate: false - xy: 1407, 1003 + xy: 1235, 649 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titan-factory-icon-full rotate: false - xy: 852, 1657 + xy: 852, 1659 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 unit-icon-chaos-array rotate: false - xy: 423, 612 + xy: 423, 614 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 unit-icon-crawler rotate: false - xy: 1761, 1293 + xy: 1511, 1249 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-icon-dagger rotate: false - xy: 1811, 1293 + xy: 1561, 1299 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-icon-eradicator rotate: false - xy: 1, 99 + xy: 1, 101 size: 152, 124 orig: 152, 124 offset: 0, 0 index: -1 unit-icon-eruptor rotate: false - xy: 913, 1021 + xy: 979, 1023 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-icon-fortress rotate: false - xy: 979, 1021 + xy: 913, 957 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-icon-titan rotate: false - xy: 913, 955 + xy: 979, 957 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-icon-full rotate: false - xy: 913, 889 + xy: 979, 891 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-icon-full rotate: false - xy: 1543, 1017 + xy: 1197, 513 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave rotate: false - xy: 913, 757 + xy: 979, 759 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wave-icon-full rotate: false - xy: 979, 757 + xy: 913, 693 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 white-tree-dead-icon-full rotate: false - xy: 1, 1403 + xy: 1, 1405 size: 320, 320 orig: 320, 320 offset: 0, 0 index: -1 white-tree-icon-full rotate: false - xy: 323, 1725 + xy: 323, 1727 size: 320, 320 orig: 320, 320 offset: 0, 0 index: -1 wraith-factory-icon-full rotate: false - xy: 979, 691 + xy: 1045, 1287 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 1966, 1185 + xy: 1212, 1159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 1966, 1151 + xy: 1246, 1159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 1966, 1117 + xy: 1280, 1159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 1354, 1165 + xy: 1314, 1159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 1388, 1165 + xy: 1348, 1159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 1422, 1139 + xy: 1382, 1159 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 1456, 1119 + xy: 1178, 1125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 1490, 1119 + xy: 1212, 1125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 1524, 1119 + xy: 1246, 1125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 1558, 1119 + xy: 1280, 1125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 1592, 1119 + xy: 1314, 1125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 1626, 1119 + xy: 1348, 1125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod rotate: false - xy: 1694, 1123 + xy: 1171, 1091 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 1728, 1123 + xy: 1171, 1057 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 1762, 1123 + xy: 1205, 1091 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 1796, 1123 + xy: 1171, 1023 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 1898, 1097 + xy: 1171, 989 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 1966, 1083 + xy: 1239, 1057 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 2015, 1219 + xy: 1273, 1057 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 2000, 1151 + xy: 1171, 921 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 alpha-mech rotate: false - xy: 1999, 1409 + xy: 1999, 1411 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-mech-base rotate: false - xy: 1999, 1359 + xy: 1999, 1361 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-mech-leg rotate: false - xy: 1025, 626 + xy: 979, 527 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-mech rotate: false - xy: 1261, 1325 + xy: 1029, 262 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-mech-base rotate: false - xy: 1311, 1325 + xy: 979, 169 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-mech-leg rotate: false - xy: 1361, 1325 + xy: 1029, 212 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 omega-mech rotate: false - xy: 1045, 908 + xy: 1045, 786 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 omega-mech-armor rotate: false - xy: 1742, 1591 + xy: 1742, 1593 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 omega-mech-base rotate: false - xy: 1045, 850 + xy: 1045, 728 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 omega-mech-leg rotate: false - xy: 1045, 792 + xy: 1045, 670 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 tau-mech rotate: false - xy: 913, 633 + xy: 971, 635 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 tau-mech-base rotate: false - xy: 1911, 1343 + xy: 1511, 1299 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau-mech-leg rotate: false - xy: 1711, 1293 + xy: 1611, 1349 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dart-ship rotate: false - xy: 1211, 1325 + xy: 979, 219 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 glaive-ship rotate: false - xy: 526, 1537 - size: 56, 56 - orig: 56, 56 - offset: 0, 0 - index: -1 -mech-icon-glaive-ship - rotate: false - xy: 526, 1537 + xy: 526, 1539 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 javelin-ship rotate: false - xy: 1153, 917 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -mech-icon-javelin-ship - rotate: false - xy: 1153, 917 + xy: 1161, 1327 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 javelin-ship-shield rotate: false - xy: 1103, 817 + xy: 1161, 1277 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 +trident-ship + rotate: false + xy: 971, 577 + size: 56, 56 + orig: 56, 56 + offset: 0, 0 + index: -1 blank rotate: false - xy: 1103, 1217 + xy: 1129, 154 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 circle rotate: false - xy: 323, 1522 + xy: 323, 1524 size: 201, 201 orig: 201, 201 offset: 0, 0 index: -1 shape-3 rotate: false - xy: 1045, 1220 + xy: 1045, 1156 size: 63, 63 orig: 63, 63 offset: 0, 0 index: -1 chaos-array rotate: false - xy: 163, 771 + xy: 163, 773 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 chaos-array-base rotate: false - xy: 163, 641 + xy: 163, 643 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 chaos-array-leg rotate: false - xy: 163, 511 + xy: 163, 513 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 crawler rotate: false - xy: 1251, 1375 + xy: 979, 369 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-base rotate: false - xy: 1301, 1375 + xy: 1029, 412 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-leg rotate: false - xy: 1351, 1375 + xy: 979, 319 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger rotate: false - xy: 1401, 1375 + xy: 1029, 362 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 1111, 1317 + xy: 979, 269 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 1161, 1325 + xy: 1029, 312 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 draug rotate: false - xy: 1411, 1325 + xy: 1029, 162 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 eradicator rotate: false - xy: 1496, 1921 + xy: 1496, 1923 size: 152, 124 orig: 152, 124 offset: 0, 0 index: -1 eradicator-base rotate: false - xy: 1, 225 + xy: 1, 227 size: 152, 124 orig: 152, 124 offset: 0, 0 index: -1 eradicator-leg rotate: false - xy: 1650, 1921 + xy: 1650, 1923 size: 152, 124 orig: 152, 124 offset: 0, 0 index: -1 eruptor rotate: false - xy: 591, 52 + xy: 591, 54 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 eruptor-base rotate: false - xy: 657, 52 + xy: 657, 54 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 eruptor-leg rotate: false - xy: 1082, 1615 + xy: 1082, 1617 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress rotate: false - xy: 1082, 1549 + xy: 1082, 1551 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress-base rotate: false - xy: 1075, 1483 + xy: 1075, 1485 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-base rotate: false - xy: 1075, 1483 + xy: 1075, 1485 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress-leg rotate: false - xy: 1148, 1623 + xy: 1148, 1625 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 ghoul rotate: false - xy: 219, 1188 + xy: 219, 1190 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 lich rotate: false - xy: 1, 1161 + xy: 1, 1163 size: 216, 240 orig: 216, 240 offset: 0, 0 index: -1 phantom rotate: false - xy: 1045, 734 + xy: 913, 635 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 power-cell rotate: false - xy: 1045, 676 + xy: 913, 577 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 reaper rotate: false - xy: 1, 1725 + xy: 1, 1727 size: 320, 320 orig: 320, 320 offset: 0, 0 index: -1 revenant rotate: false - xy: 645, 1730 + xy: 645, 1732 size: 112, 112 orig: 112, 112 offset: 0, 0 index: -1 spirit rotate: false - xy: 1761, 1343 + xy: 1461, 1299 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titan rotate: false - xy: 913, 1219 + xy: 979, 1221 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-leg rotate: false - xy: 979, 1219 + xy: 913, 1155 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wraith rotate: false - xy: 1861, 1293 + xy: 1661, 1349 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 artillery-equip rotate: false - xy: 1075, 618 + xy: 979, 469 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 1101, 1367 + xy: 1029, 512 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 bomber-equip rotate: false - xy: 1151, 1375 + xy: 979, 419 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles-equip rotate: false - xy: 1151, 1375 + xy: 979, 419 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 chain-blaster-equip rotate: false - xy: 1201, 1375 + xy: 1029, 462 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 chaos-equip rotate: false - xy: 1045, 1082 + xy: 1045, 1018 size: 56, 136 orig: 56, 136 offset: 0, 0 index: -1 eradication-equip rotate: false - xy: 391, 190 + xy: 391, 192 size: 96, 192 orig: 96, 192 offset: 0, 0 index: -1 eruption-equip rotate: false - xy: 1161, 1267 + xy: 1083, 562 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 flakgun-equip rotate: false - xy: 1211, 1275 + xy: 1079, 512 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flamethrower-equip rotate: false - xy: 1261, 1267 + xy: 1079, 454 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 heal-blaster-equip rotate: false - xy: 1311, 1275 + xy: 1079, 404 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lich-missiles-equip rotate: false - xy: 1153, 867 + xy: 1211, 1327 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 reaper-gun-equip rotate: false - xy: 1611, 1347 + xy: 1361, 1227 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 revenant-missiles-equip rotate: false - xy: 1561, 1297 + xy: 1411, 1327 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 1611, 1297 + xy: 1411, 1227 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 swarmer-equip rotate: false - xy: 1861, 1343 + xy: 1461, 1249 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -6100,13 +6100,6 @@ editor-pebbles1 orig: 32, 32 offset: 0, 0 index: -1 -pebbles-icon-editor - rotate: false - xy: 669, 25 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 editor-pebbles2 rotate: false xy: 703, 25 @@ -6233,13 +6226,6 @@ editor-spawn orig: 32, 32 offset: 0, 0 index: -1 -spawn-icon-editor - rotate: false - xy: 771, 25 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 editor-spore-moss1 rotate: false xy: 733, 827 @@ -6331,13 +6317,6 @@ editor-tendrils1 orig: 32, 32 offset: 0, 0 index: -1 -tendrils-icon-editor - rotate: false - xy: 1005, 827 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 editor-tendrils2 rotate: false xy: 1039, 827 @@ -6611,6 +6590,13 @@ overflow-gate-icon-editor orig: 32, 32 offset: 0, 0 index: -1 +pebbles-icon-editor + rotate: false + xy: 1583, 827 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 phantom-factory-icon-editor rotate: false xy: 551, 829 @@ -6620,21 +6606,21 @@ phantom-factory-icon-editor index: -1 phase-conduit-icon-editor rotate: false - xy: 1583, 827 + xy: 1617, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-icon-editor rotate: false - xy: 1617, 827 + xy: 1651, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-icon-editor rotate: false - xy: 1651, 827 + xy: 1685, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6676,7 +6662,7 @@ pneumatic-drill-icon-editor index: -1 power-node-icon-editor rotate: false - xy: 1685, 827 + xy: 1719, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6690,28 +6676,28 @@ power-node-large-icon-editor index: -1 power-source-icon-editor rotate: false - xy: 1719, 827 + xy: 1753, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void-icon-editor rotate: false - xy: 1753, 827 + xy: 1787, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-icon-editor rotate: false - xy: 1787, 827 + xy: 1821, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-icon-editor rotate: false - xy: 1821, 827 + xy: 1855, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6725,7 +6711,7 @@ pyratite-mixer-icon-editor index: -1 repair-point-icon-editor rotate: false - xy: 1855, 827 + xy: 1889, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6753,7 +6739,7 @@ rock-icon-editor index: -1 rocks-icon-editor rotate: false - xy: 1889, 827 + xy: 1923, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6767,7 +6753,7 @@ rotary-pump-icon-editor index: -1 router-icon-editor rotate: false - xy: 1923, 827 + xy: 1957, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6781,7 +6767,7 @@ rtg-generator-icon-editor index: -1 saltrocks-icon-editor rotate: false - xy: 1957, 827 + xy: 717, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6795,14 +6781,14 @@ salvo-icon-editor index: -1 sand-boulder-icon-editor rotate: false - xy: 717, 793 + xy: 717, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sandrocks-icon-editor rotate: false - xy: 717, 759 + xy: 751, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6816,7 +6802,7 @@ scatter-icon-editor index: -1 scorch-icon-editor rotate: false - xy: 751, 793 + xy: 785, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6837,7 +6823,7 @@ scrap-wall-huge-icon-editor index: -1 scrap-wall-icon-editor rotate: false - xy: 785, 793 + xy: 717, 725 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6858,28 +6844,28 @@ separator-icon-editor index: -1 shale-boulder-icon-editor rotate: false - xy: 717, 725 + xy: 751, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shalerocks-icon-editor rotate: false - xy: 751, 759 + xy: 785, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shock-mine-icon-editor rotate: false - xy: 785, 759 + xy: 819, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shrubs-icon-editor rotate: false - xy: 819, 793 + xy: 717, 691 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6893,7 +6879,7 @@ silicon-smelter-icon-editor index: -1 snow-icon-editor rotate: false - xy: 717, 691 + xy: 751, 725 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6914,14 +6900,14 @@ snowrock-icon-editor index: -1 snowrocks-icon-editor rotate: false - xy: 751, 725 + xy: 785, 725 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-icon-editor rotate: false - xy: 785, 725 + xy: 819, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6935,7 +6921,14 @@ solar-panel-large-icon-editor index: -1 sorter-icon-editor rotate: false - xy: 819, 759 + xy: 853, 793 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +spawn-icon-editor + rotate: false + xy: 717, 657 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6977,7 +6970,7 @@ spore-press-icon-editor index: -1 sporerocks-icon-editor rotate: false - xy: 853, 793 + xy: 751, 691 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6991,7 +6984,7 @@ surge-tower-icon-editor index: -1 surge-wall-icon-editor rotate: false - xy: 717, 657 + xy: 785, 691 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7017,6 +7010,13 @@ tau-mech-pad-icon-editor orig: 64, 64 offset: 0, 0 index: -1 +tendrils-icon-editor + rotate: false + xy: 819, 725 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 thermal-generator-icon-editor rotate: false xy: 651, 697 @@ -7040,7 +7040,7 @@ thorium-reactor-icon-editor index: -1 thorium-wall-icon-editor rotate: false - xy: 751, 691 + xy: 853, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7068,14 +7068,14 @@ titan-factory-icon-editor index: -1 titanium-conveyor-icon-editor rotate: false - xy: 785, 691 + xy: 887, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-icon-editor rotate: false - xy: 819, 725 + xy: 717, 623 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7103,7 +7103,7 @@ turbine-generator-icon-editor index: -1 unloader-icon-editor rotate: false - xy: 853, 759 + xy: 751, 657 size: 32, 32 orig: 32, 32 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 14fd5cf6a0..190f1e42a0 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 17d34445fb..03c100c4da 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 55caa55966..1776b09b12 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 edf406b5a5..84ad928d4c 100644 Binary files a/core/assets/sprites/sprites4.png and b/core/assets/sprites/sprites4.png differ diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index 9622e28a7a..73cbe15ff0 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -1323,6 +1323,7 @@ public class Blocks implements ContentList{ shootCone = 35f; health = 200 * size * size; + shootSound = Sounds.shootSnap; }}; scorch = new ItemTurret("scorch"){{ diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index 66e95da67b..0e7758b361 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -1,7 +1,7 @@ package io.anuke.mindustry.core; -import io.anuke.arc.*; import io.anuke.arc.Application.*; +import io.anuke.arc.*; import io.anuke.arc.graphics.*; import io.anuke.arc.graphics.g2d.*; import io.anuke.arc.input.*; diff --git a/core/src/io/anuke/mindustry/entities/type/TileEntity.java b/core/src/io/anuke/mindustry/entities/type/TileEntity.java index f34815cf92..2c442a00a4 100644 --- a/core/src/io/anuke/mindustry/entities/type/TileEntity.java +++ b/core/src/io/anuke/mindustry/entities/type/TileEntity.java @@ -12,9 +12,9 @@ import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.entities.impl.BaseEntity; import io.anuke.mindustry.entities.traits.HealthTrait; import io.anuke.mindustry.entities.traits.TargetTrait; +import io.anuke.mindustry.game.*; import io.anuke.mindustry.game.EventType.BlockDestroyEvent; -import io.anuke.mindustry.game.Team; -import io.anuke.mindustry.gen.Call; +import io.anuke.mindustry.gen.*; import io.anuke.mindustry.world.*; import io.anuke.mindustry.world.modules.*; @@ -45,6 +45,7 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{ private boolean dead = false; private boolean sleeping; private float sleepTime; + private @Nullable SoundLoop sound; @Remote(called = Loc.server, unreliable = true) public static void onTileDamage(Tile tile, float health){ @@ -69,6 +70,9 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{ x = tile.drawx(); y = tile.drawy(); block = tile.block(); + if(block.idleSound != Sounds.none){ + sound = new SoundLoop(block.idleSound, block.idleSoundVolume); + } health = block.health; timer = new Interval(block.timers); @@ -231,6 +235,13 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{ return proximity; } + @Override + public void removed(){ + if(sound != null){ + sound.stop(); + } + } + @Override public void health(float health){ this.health = health; @@ -286,6 +297,10 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{ return; //no need to update anymore } + if(sound != null){ + sound.update(x, y, block.shouldIdleSound(tile)); + } + Block previous = block; block.update(tile); if(block == previous && cons != null){ diff --git a/core/src/io/anuke/mindustry/game/SoundLoop.java b/core/src/io/anuke/mindustry/game/SoundLoop.java index a9c7f39fd9..b470713ead 100644 --- a/core/src/io/anuke/mindustry/game/SoundLoop.java +++ b/core/src/io/anuke/mindustry/game/SoundLoop.java @@ -1,4 +1,49 @@ package io.anuke.mindustry.game; +import io.anuke.arc.audio.*; +import io.anuke.arc.math.*; +import io.anuke.arc.util.*; + +/** A simple class for playing a looping sound at a position.*/ public class SoundLoop{ + private static final float fadeSpeed = 0.05f; + + private final Sound sound; + private long id = -1; + private float volume, baseVolume; + + public SoundLoop(Sound sound, float baseVolume){ + this.sound = sound; + this.baseVolume = baseVolume; + } + + public void update(float x, float y, boolean play){ + if(baseVolume < 0) return; + + if(id < 0){ + if(play){ + id = sound.loop(sound.calcVolume(x, y) * volume * baseVolume, 1f, sound.calcPan(x, y)); + } + }else{ + //fade the sound in or out + if(play){ + volume = Mathf.clamp(volume + fadeSpeed * Time.delta()); + }else{ + volume = Mathf.clamp(volume - fadeSpeed * Time.delta()); + if(volume <= 0.001f){ + sound.stop(id); + id = -1; + } + } + sound.setPan(id, sound.calcPan(x, y), sound.calcVolume(x, y) * volume * baseVolume); + } + } + + public void stop(){ + if(id != -1){ + sound.stop(id); + id = -1; + volume = baseVolume = -1; + } + } } diff --git a/core/src/io/anuke/mindustry/input/InputHandler.java b/core/src/io/anuke/mindustry/input/InputHandler.java index 03048e75b5..6ed371a7ec 100644 --- a/core/src/io/anuke/mindustry/input/InputHandler.java +++ b/core/src/io/anuke/mindustry/input/InputHandler.java @@ -160,6 +160,7 @@ public abstract class InputHandler implements InputProcessor{ if(((!frag.config.isShown() && tile.block().shouldShowConfigure(tile, player)) //if the config fragment is hidden, show //alternatively, the current selected block can 'agree' to switch config tiles || (frag.config.isShown() && frag.config.getSelectedTile().block().onConfigureTileTapped(frag.config.getSelectedTile(), tile)))){ + Sounds.click.at(tile); frag.config.showConfig(tile); } //otherwise... diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java index 2a56882dcd..45e107ca24 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -184,6 +184,7 @@ public class SettingsMenuDialog extends SettingsDialog{ @Override public void add(SettingsTable table){ table.addButton("$tutorial.retake", () -> { + hide(); control.playTutorial(); }).size(220f, 60f).pad(6).left(); table.add(); diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java index 98b79b3df6..e9d9936c68 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java @@ -638,15 +638,17 @@ public class HudFragment extends Fragment{ } private boolean canSkipWave(){ - return state.rules.waves && ((Net.server() || player.isAdmin) || !Net.active()) && state.enemies() == 0 && !world.spawner.isSpawning(); + return state.rules.waves && ((Net.server() || player.isAdmin) || !Net.active()) && state.enemies() == 0 && !world.spawner.isSpawning() && !state.rules.tutorial; } private void addPlayButton(Table table){ table.right().addImageButton("icon-play", "right", 30f, () -> { if(Net.client() && player.isAdmin){ Call.onAdminRequest(player, AdminAction.wave); - }else{ + }else if(inLaunchWave()){ ui.showConfirm("$confirm", "$launch.skip.confirm", () -> !canSkipWave(), () -> state.wavetime = 0f); + }else{ + state.wavetime = 0f; } }).growY().fillX().right().width(40f) .visible(this::canSkipWave); diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java index 5bc5700909..5e5e80154c 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/core/src/io/anuke/mindustry/world/Block.java @@ -99,7 +99,11 @@ public class Block extends BlockStorage{ /** Whether this block has a shadow under it. */ public boolean hasShadow = true; /** Sounds made when this block breaks.*/ - public Sound breakSound = Sounds.die; + public Sound breakSound = Sounds.boom; + /** The sound that this block makes while active.*/ + public Sound idleSound = Sounds.none; + /** Idle sound base volume. */ + public float idleSoundVolume = 0.5f; /** Cost of constructing this block. */ public ItemStack[] buildRequirements = new ItemStack[]{}; @@ -207,6 +211,11 @@ public class Block extends BlockStorage{ return progressIncrease; } + /** @return whether this block should play its idle sound.*/ + public boolean shouldIdleSound(Tile tile){ + return canProduce(tile); + } + public void drawLayer(Tile tile){ } diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/Door.java b/core/src/io/anuke/mindustry/world/blocks/defense/Door.java index 34a855dae8..1653b57840 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/Door.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/Door.java @@ -1,17 +1,17 @@ package io.anuke.mindustry.world.blocks.defense; import io.anuke.annotations.Annotations.*; -import io.anuke.arc.Core; -import io.anuke.arc.Graphics.Cursor; -import io.anuke.arc.Graphics.Cursor.SystemCursor; +import io.anuke.arc.*; +import io.anuke.arc.Graphics.*; +import io.anuke.arc.Graphics.Cursor.*; import io.anuke.arc.graphics.g2d.*; -import io.anuke.arc.math.geom.Rectangle; -import io.anuke.mindustry.content.Fx; +import io.anuke.arc.math.geom.*; +import io.anuke.mindustry.content.*; import io.anuke.mindustry.entities.*; -import io.anuke.mindustry.entities.Effects.Effect; +import io.anuke.mindustry.entities.Effects.*; import io.anuke.mindustry.entities.type.*; -import io.anuke.mindustry.gen.Call; -import io.anuke.mindustry.world.Tile; +import io.anuke.mindustry.gen.*; +import io.anuke.mindustry.world.*; import java.io.*; @@ -45,6 +45,7 @@ public class Door extends Wall{ }else{ Effects.effect(door.closefx, tile.drawx(), tile.drawy()); } + Sounds.door.at(tile); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java index cf084cfea7..60ea278080 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java @@ -64,6 +64,9 @@ public class Drill extends Block{ hasLiquids = true; liquidCapacity = 5f; hasItems = true; + + //idleSound = Sounds.drill; + //idleSoundVolume = 0.5f; } @Override diff --git a/desktop-sdl/src/io/anuke/mindustry/desktopsdl/DesktopPlatform.java b/desktop-sdl/src/io/anuke/mindustry/desktopsdl/DesktopPlatform.java index c9014b689d..e055f2c684 100644 --- a/desktop-sdl/src/io/anuke/mindustry/desktopsdl/DesktopPlatform.java +++ b/desktop-sdl/src/io/anuke/mindustry/desktopsdl/DesktopPlatform.java @@ -17,6 +17,7 @@ import java.util.*; import static io.anuke.mindustry.Vars.*; + public class DesktopPlatform extends Platform{ static boolean useDiscord = OS.is64Bit; final static String applicationId = "610508934456934412"; diff --git a/tools/build.gradle b/tools/build.gradle index d2e7209aff..f1c6ccbb9e 100644 --- a/tools/build.gradle +++ b/tools/build.gradle @@ -320,7 +320,7 @@ task pack(dependsOn: classes){ //antialias everything except UI elements fileTree(dir: '../core/assets-raw/sprites_out/', include: "**/*.png").visit{ file -> - if(file.isDirectory() || (file.toString().replace("\\", "/").contains("/ui/"))) return + if(file.isDirectory() || (file.toString().replace("\\", "/").contains("/ui/") && !file.toString().contains("icon-small") && !file.toString().contains("icon-medium") && !file.toString().contains("icon-large"))) return antialias(file.file) }