diff --git a/core/assets-raw/sprites/blocks/campaign/core-silo.png b/core/assets-raw/sprites/blocks/campaign/core-silo.png new file mode 100644 index 0000000000..dbb0b6d70c Binary files /dev/null and b/core/assets-raw/sprites/blocks/campaign/core-silo.png differ diff --git a/core/assets-raw/sprites/blocks/campaign/data-processor.png b/core/assets-raw/sprites/blocks/campaign/data-processor.png new file mode 100644 index 0000000000..6383dcfbe2 Binary files /dev/null and b/core/assets-raw/sprites/blocks/campaign/data-processor.png differ diff --git a/core/assets-raw/sprites/blocks/storage/launch-pad-large.png b/core/assets-raw/sprites/blocks/campaign/launch-pad-large.png similarity index 100% rename from core/assets-raw/sprites/blocks/storage/launch-pad-large.png rename to core/assets-raw/sprites/blocks/campaign/launch-pad-large.png diff --git a/core/assets-raw/sprites/blocks/storage/launch-pad-light.png b/core/assets-raw/sprites/blocks/campaign/launch-pad-light.png similarity index 100% rename from core/assets-raw/sprites/blocks/storage/launch-pad-light.png rename to core/assets-raw/sprites/blocks/campaign/launch-pad-light.png diff --git a/core/assets-raw/sprites/blocks/storage/launch-pad.png b/core/assets-raw/sprites/blocks/campaign/launch-pad.png similarity index 100% rename from core/assets-raw/sprites/blocks/storage/launch-pad.png rename to core/assets-raw/sprites/blocks/campaign/launch-pad.png diff --git a/core/assets-raw/sprites/blocks/storage/launchpod.png b/core/assets-raw/sprites/blocks/campaign/launchpod.png similarity index 100% rename from core/assets-raw/sprites/blocks/storage/launchpod.png rename to core/assets-raw/sprites/blocks/campaign/launchpod.png diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index ffff50224c..2f9e178cec 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -4,1871 +4,1913 @@ size: 2048,2048 format: RGBA8888 filter: Nearest,Nearest repeat: none +core-silo + rotate: false + xy: 1, 679 + size: 160, 160 + orig: 160, 160 + offset: 0, 0 + index: -1 +data-processor + rotate: false + xy: 623, 970 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +launch-pad + rotate: false + xy: 685, 361 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +launch-pad-large + rotate: false + xy: 1628, 1627 + size: 128, 128 + orig: 128, 128 + offset: 0, 0 + index: -1 +launch-pad-light + rotate: false + xy: 685, 263 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 +launchpod + rotate: false + xy: 1981, 1983 + size: 66, 64 + orig: 66, 64 + offset: 0, 0 + index: -1 force-projector rotate: false - xy: 489, 188 + xy: 587, 69 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 force-projector-top rotate: false - xy: 293, 124 + xy: 615, 753 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mend-projector rotate: false - xy: 1141, 1037 + xy: 917, 1029 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mend-projector-top rotate: false - xy: 1207, 1037 + xy: 983, 1029 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mender rotate: false - xy: 1691, 727 + xy: 1389, 767 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mender-top rotate: false - xy: 1725, 727 + xy: 1389, 733 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-projector rotate: false - xy: 823, 1064 + xy: 983, 963 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overdrive-projector-top rotate: false - xy: 823, 998 + xy: 913, 897 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shock-mine rotate: false - xy: 1895, 649 + xy: 1593, 699 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-loader rotate: false - xy: 1199, 1399 + xy: 391, 386 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-unloader rotate: false - xy: 419, 790 + xy: 525, 1047 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 bridge-arrow rotate: false - xy: 1017, 70 + xy: 1381, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 1039, 415 + xy: 1517, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 1039, 381 + xy: 1483, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 1039, 347 + xy: 1551, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 center rotate: false - xy: 1039, 313 + xy: 1517, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-0 rotate: false - xy: 1843, 853 + xy: 1087, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-armored-conveyor-full rotate: false - xy: 1843, 853 + xy: 1087, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-1 rotate: false - xy: 257, 848 + xy: 1773, 1759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-2 rotate: false - xy: 1563, 1759 + xy: 1888, 1629 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-3 rotate: false - xy: 1678, 1629 + xy: 1131, 291 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-0 rotate: false - xy: 616, 1203 + xy: 1807, 1759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-1 rotate: false - xy: 1893, 987 + xy: 1922, 1629 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-2 rotate: false - xy: 1927, 995 + xy: 1165, 291 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-3 rotate: false - xy: 1961, 995 + xy: 1841, 1759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-0 rotate: false - xy: 1995, 995 + xy: 1956, 1629 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-1 rotate: false - xy: 1203, 673 + xy: 1990, 1629 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-2 rotate: false - xy: 1237, 681 + xy: 1977, 1595 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-3 rotate: false - xy: 1271, 681 + xy: 1977, 1561 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-0 rotate: false - xy: 1203, 639 + xy: 1977, 1527 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-1 rotate: false - xy: 1237, 647 + xy: 1047, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-2 rotate: false - xy: 1271, 647 + xy: 1081, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-3 rotate: false - xy: 1305, 681 + xy: 1046, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-0 rotate: false - xy: 1305, 647 + xy: 1080, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-1 rotate: false - xy: 1339, 689 + xy: 1081, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-2 rotate: false - xy: 1339, 655 + xy: 1115, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-3 rotate: false - xy: 1373, 663 + xy: 1114, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 1073, 245 + xy: 1517, 835 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 1073, 211 + xy: 1551, 835 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 1073, 177 + xy: 1585, 835 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 1073, 143 + xy: 1619, 835 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 1073, 109 + xy: 1653, 835 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 1085, 75 + xy: 1257, 801 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 1085, 41 + xy: 1291, 801 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 1085, 7 + xy: 1325, 801 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 1107, 431 + xy: 1359, 801 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 1107, 397 + xy: 1393, 801 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 1141, 431 + xy: 1427, 801 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 1107, 363 + xy: 1461, 801 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 1141, 397 + xy: 1495, 801 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 1107, 329 + xy: 1529, 801 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 1141, 363 + xy: 1563, 801 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 1107, 295 + xy: 1597, 801 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 1141, 329 + xy: 1631, 801 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 1107, 261 + xy: 1665, 801 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 1141, 295 + xy: 1687, 885 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor rotate: false - xy: 1475, 571 + xy: 1287, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-0 rotate: false - xy: 1509, 605 + xy: 1423, 699 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-1 rotate: false - xy: 1543, 639 + xy: 1389, 665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-2 rotate: false - xy: 1577, 673 + xy: 1355, 631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-edge rotate: false - xy: 1509, 571 + xy: 1321, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-stack rotate: false - xy: 1543, 605 + xy: 1491, 767 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 1815, 539 + xy: 1559, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 1849, 539 + xy: 1525, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 1883, 547 + xy: 1491, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 1917, 615 + xy: 1661, 665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 1917, 581 + xy: 1627, 631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 1917, 547 + xy: 1593, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 1951, 621 + xy: 1559, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 1951, 587 + xy: 1525, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 1985, 621 + xy: 1661, 631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 1951, 553 + xy: 1627, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 1985, 587 + xy: 1593, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 1985, 553 + xy: 1559, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 1679, 523 + xy: 1661, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 1713, 523 + xy: 1627, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 1747, 523 + xy: 1593, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 1781, 505 + xy: 1661, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 1815, 505 + xy: 1627, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 1849, 505 + xy: 1661, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1883, 513 + xy: 1695, 749 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cross rotate: false - xy: 1119, 91 + xy: 1767, 809 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 distributor rotate: false - xy: 1794, 1237 + xy: 1774, 1185 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 inverted-sorter rotate: false - xy: 1175, 295 + xy: 1903, 751 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction rotate: false - xy: 1487, 775 + xy: 1277, 65 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mass-conveyor rotate: false - xy: 615, 774 + xy: 811, 768 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mass-conveyor-edge rotate: false - xy: 623, 872 + xy: 783, 655 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mass-conveyor-top rotate: false - xy: 721, 888 + xy: 783, 557 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mass-driver-base rotate: false - xy: 685, 578 + xy: 783, 361 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 1441, 673 + xy: 1355, 699 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 1509, 673 + xy: 1389, 699 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 1441, 571 + xy: 1355, 665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 1475, 605 + xy: 1321, 631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 1509, 639 + xy: 1457, 767 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 1725, 659 + xy: 1355, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 1963, 655 + xy: 1525, 631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 underflow-gate rotate: false - xy: 1985, 519 + xy: 1695, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blast-drill rotate: false - xy: 323, 1072 + xy: 526, 1275 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 blast-drill-rim rotate: false - xy: 526, 1275 + xy: 656, 1312 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 blast-drill-rotator rotate: false - xy: 656, 1312 + xy: 863, 1757 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 blast-drill-top rotate: false - xy: 863, 1757 + xy: 993, 1757 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 drill-top rotate: false - xy: 1728, 1171 + xy: 888, 1095 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-liquid rotate: false - xy: 1728, 1171 + xy: 888, 1095 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 laser-drill rotate: false - xy: 285, 26 + xy: 815, 866 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-rim rotate: false - xy: 383, 6 + xy: 685, 655 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 587, 676 + xy: 685, 557 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 587, 578 + xy: 685, 459 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mechanical-drill rotate: false - xy: 943, 1080 + xy: 1482, 1135 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-rotator rotate: false - xy: 1009, 1037 + xy: 1548, 1135 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-top rotate: false - xy: 1075, 1037 + xy: 1614, 1135 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 oil-extractor rotate: false - xy: 685, 284 + xy: 783, 67 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-liquid rotate: false - xy: 685, 186 + xy: 937, 1399 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-rotator rotate: false - xy: 685, 88 + xy: 1035, 1399 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 oil-extractor-top rotate: false - xy: 713, 774 + xy: 1133, 1399 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 pneumatic-drill rotate: false - xy: 955, 971 + xy: 1181, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-rotator rotate: false - xy: 955, 905 + xy: 1247, 1069 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-top rotate: false - xy: 1021, 971 + xy: 1247, 1003 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 1013, 641 + xy: 881, 369 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 1079, 707 + xy: 947, 435 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 947, 509 + xy: 1013, 501 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 1013, 575 + xy: 881, 303 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-border rotate: false - xy: 1661, 783 + xy: 1073, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-middle rotate: false - xy: 1237, 613 + xy: 1353, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-select rotate: false - xy: 1373, 561 + xy: 1211, 887 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 1051, 75 + xy: 1245, 835 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 message rotate: false - xy: 1759, 727 + xy: 1287, 631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 place-arrow rotate: false - xy: 783, 676 + xy: 1231, 1399 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 1017, 36 + xy: 1449, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 1017, 2 + xy: 1415, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 1017, 2 + xy: 1415, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 1689, 1401 + xy: 1483, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 1401, 801 + xy: 1449, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 1039, 211 + xy: 1619, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 1039, 177 + xy: 1585, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 1039, 143 + xy: 1653, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 1039, 109 + xy: 1619, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 1039, 109 + xy: 1619, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 1039, 109 + xy: 1619, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 1039, 109 + xy: 1619, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 1046, 449 + xy: 1653, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 1051, 41 + xy: 1279, 835 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 1051, 7 + xy: 1313, 835 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 1073, 415 + xy: 1347, 835 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 1073, 381 + xy: 1381, 835 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 1073, 381 + xy: 1381, 835 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 1073, 347 + xy: 1415, 835 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 1073, 313 + xy: 1449, 835 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 1073, 279 + xy: 1483, 835 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 1589, 775 + xy: 1223, 31 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate rotate: false - xy: 1453, 741 + xy: 1325, 31 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate-top rotate: false - xy: 1487, 741 + xy: 1359, 31 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 1521, 741 + xy: 1379, 99 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 1555, 741 + xy: 1379, 65 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 1589, 741 + xy: 1393, 31 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-tank-bottom rotate: false - xy: 587, 284 + xy: 685, 165 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-liquid rotate: false - xy: 587, 186 + xy: 685, 67 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 liquid-tank-top rotate: false - xy: 587, 88 + xy: 713, 753 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 1589, 707 + xy: 1355, 733 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-pump-liquid rotate: false - xy: 1623, 707 + xy: 1287, 665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-liquid rotate: false - xy: 1623, 707 + xy: 1287, 665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-liquid rotate: false - xy: 1623, 707 + xy: 1287, 665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 1441, 639 + xy: 1321, 665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 1475, 673 + xy: 1423, 767 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 1441, 605 + xy: 1423, 733 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 1475, 639 + xy: 1287, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-cap rotate: false - xy: 1611, 673 + xy: 1287, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-0 rotate: false - xy: 1543, 571 + xy: 1457, 699 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-1 rotate: false - xy: 1577, 605 + xy: 1423, 665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-2 rotate: false - xy: 1611, 639 + xy: 1389, 631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-3 rotate: false - xy: 1577, 571 + xy: 1355, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-4 rotate: false - xy: 1611, 605 + xy: 1321, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-5 rotate: false - xy: 1611, 571 + xy: 1525, 767 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-6 rotate: false - xy: 1691, 693 + xy: 1525, 733 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 1827, 709 + xy: 1389, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1657, 681 + xy: 1355, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1645, 647 + xy: 1321, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 1645, 613 + xy: 1559, 767 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 1645, 579 + xy: 1559, 733 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 1793, 675 + xy: 1525, 699 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 1153, 971 + xy: 1379, 1003 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 783, 88 + xy: 1819, 1399 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 battery rotate: false - xy: 1407, 663 + xy: 1115, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 battery-large rotate: false - xy: 1815, 1435 + xy: 293, 520 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 battery-large-top rotate: false - xy: 1913, 1435 + xy: 293, 422 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 battery-top rotate: false - xy: 1013, 483 + xy: 1149, 257 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 1039, 279 + xy: 1585, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 1039, 245 + xy: 1551, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 differential-generator rotate: false - xy: 391, 398 + xy: 721, 964 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 differential-generator-liquid rotate: false - xy: 391, 300 + xy: 819, 964 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 differential-generator-top rotate: false - xy: 391, 202 + xy: 587, 655 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 diode rotate: false - xy: 1119, 57 + xy: 1801, 809 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 diode-arrow rotate: false - xy: 1119, 23 + xy: 1733, 775 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator rotate: false - xy: 1175, 397 + xy: 1835, 767 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator-top rotate: false - xy: 1175, 363 + xy: 1869, 767 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 impact-reactor rotate: false - xy: 163, 191 + xy: 807, 1474 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-bottom rotate: false - xy: 155, 61 + xy: 937, 1497 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-light rotate: false - xy: 807, 1474 + xy: 1067, 1497 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-plasma-0 rotate: false - xy: 937, 1497 + xy: 1197, 1497 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-plasma-1 rotate: false - xy: 1067, 1497 + xy: 1327, 1497 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-plasma-2 rotate: false - xy: 1197, 1497 + xy: 1457, 1497 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 impact-reactor-plasma-3 rotate: false - xy: 1327, 1497 + xy: 1587, 1497 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 power-node rotate: false - xy: 1725, 693 + xy: 1491, 699 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 1021, 905 + xy: 1313, 1069 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 power-source rotate: false - xy: 1759, 693 + xy: 1457, 665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 1793, 709 + xy: 1423, 631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 1153, 905 + xy: 1445, 1069 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 1759, 659 + xy: 1593, 767 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 1929, 655 + xy: 1559, 665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-large rotate: false - xy: 783, 186 + xy: 1721, 1399 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 surge-tower rotate: false - xy: 881, 222 + xy: 1041, 765 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 951, 773 + xy: 947, 699 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-reactor rotate: false - xy: 1003, 1301 + xy: 1917, 1399 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thorium-reactor-center rotate: false - xy: 1101, 1301 + xy: 921, 1301 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 thorium-reactor-lights rotate: false - xy: 1199, 1301 + xy: 1019, 1301 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 turbine-generator rotate: false - xy: 947, 641 + xy: 881, 435 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-top rotate: false - xy: 1013, 707 + xy: 947, 501 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 alloy-smelter rotate: false - xy: 725, 986 + xy: 321, 814 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 alloy-smelter-top rotate: false - xy: 525, 872 + xy: 293, 716 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 blast-mixer rotate: false - xy: 1002, 1235 + xy: 457, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-launcher rotate: false - xy: 1003, 1399 + xy: 391, 582 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 coal-centrifuge rotate: false - xy: 811, 1130 + xy: 1378, 1267 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 1797, 1369 + xy: 1152, 1169 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 1863, 1369 + xy: 1642, 1267 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 1929, 1369 + xy: 1642, 1201 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator rotate: false - xy: 1731, 1303 + xy: 1708, 1251 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 1797, 1303 + xy: 1774, 1251 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 1863, 1303 + xy: 1840, 1259 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 graphite-press rotate: false - xy: 1009, 1103 + xy: 1152, 1103 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 incinerator rotate: false - xy: 1175, 329 + xy: 1903, 785 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 2013, 859 + xy: 1285, 133 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 1453, 775 + xy: 1243, 65 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 kiln rotate: false - xy: 1075, 1103 + xy: 1218, 1135 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 kiln-top rotate: false - xy: 1141, 1103 + xy: 1284, 1135 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 1141, 1103 + xy: 1284, 1135 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 liquid-source rotate: false - xy: 1453, 707 + xy: 1321, 767 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-void rotate: false - xy: 1487, 707 + xy: 1321, 733 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 1657, 715 + xy: 1321, 699 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 multi-press rotate: false - xy: 685, 480 + xy: 783, 263 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 phase-weaver rotate: false - xy: 823, 932 + xy: 1049, 1029 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 819, 866 + xy: 1049, 963 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 811, 800 + xy: 1045, 897 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 889, 1014 + xy: 1115, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 889, 948 + xy: 1115, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 1827, 675 + xy: 1491, 665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 1861, 683 + xy: 1457, 631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 1087, 971 + xy: 1313, 1003 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator rotate: false - xy: 1285, 839 + xy: 1379, 937 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 885, 816 + xy: 1445, 937 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-spinner rotate: false - xy: 881, 750 + xy: 1511, 937 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 881, 684 + xy: 1577, 937 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press rotate: false - xy: 881, 618 + xy: 1643, 937 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame0 rotate: false - xy: 881, 552 + xy: 913, 831 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame1 rotate: false - xy: 881, 486 + xy: 979, 831 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame2 rotate: false - xy: 881, 420 + xy: 1045, 831 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-liquid rotate: false - xy: 881, 354 + xy: 909, 765 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-top rotate: false - xy: 881, 288 + xy: 975, 765 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rock1 rotate: false - xy: 1797, 1121 + xy: 1237, 721 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rock2 rotate: false - xy: 1797, 1071 + xy: 1237, 671 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-boulder1 rotate: false - xy: 1679, 625 + xy: 1593, 733 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-boulder2 rotate: false - xy: 1679, 591 + xy: 1559, 699 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder1 rotate: false - xy: 1827, 641 + xy: 1627, 767 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder2 rotate: false - xy: 1861, 649 + xy: 1627, 733 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrock1 rotate: false - xy: 1897, 1121 + xy: 1237, 521 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snowrock2 rotate: false - xy: 1897, 1071 + xy: 1233, 471 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-cluster1 rotate: false - xy: 1113, 499 + xy: 1331, 345 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster2 rotate: false - xy: 1843, 929 + xy: 1331, 303 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster3 rotate: false - xy: 1843, 887 + xy: 1039, 169 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -1889,14 +1931,14 @@ white-tree-dead index: -1 container rotate: false - xy: 943, 1146 + xy: 1510, 1267 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 core-foundation rotate: false - xy: 1513, 1793 + xy: 1498, 1627 size: 128, 128 orig: 128, 128 offset: 0, 0 @@ -1910,476 +1952,448 @@ core-nucleus index: -1 core-shard rotate: false - xy: 517, 774 + xy: 525, 949 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 -launch-pad - rotate: false - xy: 587, 480 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -launch-pad-large - rotate: false - xy: 1457, 1497 - size: 128, 128 - orig: 128, 128 - offset: 0, 0 - index: -1 -launch-pad-light - rotate: false - xy: 587, 382 - size: 96, 96 - orig: 96, 96 - offset: 0, 0 - index: -1 -launchpod - rotate: false - xy: 934, 1212 - size: 66, 64 - orig: 66, 64 - offset: 0, 0 - index: -1 unloader rotate: false - xy: 1441, 537 + xy: 1695, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader-center rotate: false - xy: 1475, 537 + xy: 1695, 579 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 vault rotate: false - xy: 1297, 1301 + xy: 1117, 1301 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 arc-heat rotate: false - xy: 1661, 817 + xy: 1053, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-1 rotate: false - xy: 1012, 449 + xy: 1081, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-2 rotate: false - xy: 1068, 1235 + xy: 523, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-3 rotate: false - xy: 807, 1376 + xy: 293, 324 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-4 rotate: false - xy: 993, 1757 + xy: 1123, 1757 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 hail-heat rotate: false - xy: 1851, 979 + xy: 1972, 1141 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 1273, 1103 + xy: 1416, 1135 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 meltdown-heat rotate: false - xy: 1628, 1663 + xy: 1773, 1793 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 ripple-heat rotate: false - xy: 783, 480 + xy: 1427, 1399 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 salvo-heat rotate: false - xy: 1219, 905 + xy: 1511, 1069 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 1285, 971 + xy: 1511, 1003 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 1285, 905 + xy: 1577, 1069 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch-heat rotate: false - xy: 1713, 591 + xy: 1491, 631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 1145, 707 + xy: 1013, 435 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 air-factory rotate: false - xy: 627, 986 + xy: 423, 876 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 basic-reconstructor rotate: false - xy: 1717, 1435 + xy: 293, 618 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-forge rotate: false - xy: 1717, 1435 + xy: 293, 618 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 command-center rotate: false - xy: 877, 1130 + xy: 1444, 1267 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dagger-factory rotate: false - xy: 1929, 1303 + xy: 1906, 1259 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dagger-factory-top rotate: false - xy: 1728, 1237 + xy: 1708, 1185 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 factory-in rotate: false - xy: 489, 482 + xy: 587, 363 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 factory-out rotate: false - xy: 489, 384 + xy: 587, 265 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 factory-top rotate: false - xy: 489, 286 + xy: 587, 167 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 ground-factory rotate: false - xy: 489, 90 + xy: 717, 866 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 naval-factory rotate: false - xy: 685, 382 + xy: 783, 165 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 rally-point rotate: false - xy: 1087, 905 + xy: 1379, 1069 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 repair-point-base rotate: false - xy: 1691, 659 + xy: 1389, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 revenant-factory rotate: false - xy: 1758, 1663 + xy: 1903, 1793 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 revenant-factory-top rotate: false - xy: 1888, 1663 + xy: 1717, 1497 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 copper-wall rotate: false - xy: 1107, 227 + xy: 1687, 851 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-large rotate: false - xy: 1009, 1169 + xy: 1576, 1267 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door rotate: false - xy: 1153, 91 + xy: 1767, 775 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large rotate: false - xy: 1860, 1237 + xy: 1840, 1193 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 1926, 1237 + xy: 1906, 1193 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-open rotate: false - xy: 1153, 57 + xy: 1801, 775 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 1543, 673 + xy: 1457, 733 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large rotate: false - xy: 867, 22 + xy: 979, 897 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-wall rotate: false - xy: 1577, 639 + xy: 1491, 733 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-wall-large rotate: false - xy: 889, 882 + xy: 1181, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-gigantic rotate: false - xy: 1587, 1497 + xy: 1758, 1627 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 scrap-wall-huge2 rotate: false - xy: 783, 382 + xy: 1525, 1399 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-huge3 rotate: false - xy: 783, 284 + xy: 1623, 1399 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-large1 rotate: false - xy: 1021, 839 + xy: 1643, 1069 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large2 rotate: false - xy: 1087, 839 + xy: 1643, 1003 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large3 rotate: false - xy: 1153, 839 + xy: 1247, 937 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large4 rotate: false - xy: 1219, 839 + xy: 1313, 937 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall2 rotate: false - xy: 1747, 625 + xy: 1457, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 1747, 591 + xy: 1423, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 1793, 641 + xy: 1389, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 1793, 641 + xy: 1389, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 1645, 545 + xy: 1627, 665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large rotate: false - xy: 881, 156 + xy: 881, 699 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 1781, 539 + xy: 1593, 631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 1017, 773 + xy: 881, 567 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thruster rotate: false - xy: 1847, 1533 + xy: 1847, 1497 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 titanium-wall rotate: false - xy: 1917, 513 + xy: 1695, 715 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large rotate: false - xy: 947, 707 + xy: 1013, 633 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 bullet rotate: false - xy: 1995, 1381 + xy: 1079, 479 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 bullet-back rotate: false - xy: 1995, 1327 + xy: 1079, 425 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 casing rotate: false - xy: 2039, 1445 + xy: 2039, 1965 size: 8, 16 orig: 8, 16 offset: 0, 0 @@ -2393,7 +2407,7 @@ circle-end index: -1 circle-mid rotate: false - xy: 1209, 304 + xy: 2043, 764 size: 1, 199 orig: 1, 199 offset: 0, 0 @@ -2407,616 +2421,616 @@ circle-shadow index: -1 error rotate: false - xy: 1351, 989 + xy: 1859, 935 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 laser rotate: false - xy: 848, 1757 + xy: 2043, 1065 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 laser-end rotate: false - xy: 645, 14 + xy: 383, 18 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 minelaser rotate: false - xy: 854, 1757 + xy: 2043, 1015 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 minelaser-end rotate: false - xy: 719, 14 + xy: 900, 1227 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 missile rotate: false - xy: 2011, 1501 + xy: 219, 844 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 missile-back rotate: false - xy: 2011, 1463 + xy: 257, 844 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 particle rotate: false - xy: 1113, 541 + xy: 1297, 387 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 scale_marker rotate: false - xy: 947, 90 + xy: 721, 1062 size: 4, 4 orig: 4, 4 offset: 0, 0 index: -1 shell rotate: false - xy: 219, 844 + xy: 1055, 287 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shell-back rotate: false - xy: 616, 1237 + xy: 1093, 287 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 transfer rotate: false - xy: 877, 816 + xy: 2043, 965 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 1951, 519 + xy: 1695, 681 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white rotate: false - xy: 1992, 1172 + xy: 1972, 1320 size: 3, 3 orig: 3, 3 offset: 0, 0 index: -1 arc rotate: false - xy: 251, 27 + xy: 1019, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-arc-full rotate: false - xy: 1113, 465 + xy: 1115, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-blast-drill-full rotate: false - xy: 1123, 1757 + xy: 1253, 1757 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 block-char-full rotate: false - xy: 1695, 795 + xy: 1073, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cliffs-full rotate: false - xy: 1729, 795 + xy: 1107, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conduit-full rotate: false - xy: 1763, 795 + xy: 1107, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conveyor-full rotate: false - xy: 1797, 811 + xy: 1103, 49 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 1797, 811 + xy: 1103, 49 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-craters-full rotate: false - xy: 1797, 777 + xy: 1183, 257 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cryofluidmixer-full rotate: false - xy: 1134, 1235 + xy: 1048, 1235 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-cultivator-full rotate: false - xy: 1200, 1235 + xy: 589, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-cyclone-full rotate: false - xy: 786, 1278 + xy: 293, 226 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-dark-metal-full rotate: false - xy: 1831, 811 + xy: 1217, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-full rotate: false - xy: 1831, 777 + xy: 1251, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dunerocks-full rotate: false - xy: 1695, 761 + xy: 1285, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-duo-full rotate: false - xy: 1729, 761 + xy: 1319, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-fuse-full rotate: false - xy: 905, 1376 + xy: 419, 778 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-grass-full rotate: false - xy: 1763, 761 + xy: 1353, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hail-full rotate: false - xy: 1797, 743 + xy: 2011, 1595 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-holostone-full rotate: false - xy: 1831, 743 + xy: 2011, 1561 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hotrock-full rotate: false - xy: 1877, 853 + xy: 2011, 1527 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-full rotate: false - xy: 1865, 819 + xy: 2015, 1493 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-snow-full rotate: false - xy: 1865, 785 + xy: 2015, 1459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icerocks-full rotate: false - xy: 1865, 751 + xy: 2015, 1425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ignarock-full rotate: false - xy: 1899, 819 + xy: 1217, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-impact-reactor-full rotate: false - xy: 1253, 1757 + xy: 1383, 1757 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 block-lancer-full rotate: false - xy: 1266, 1235 + xy: 655, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-laser-drill-full rotate: false - xy: 884, 1278 + xy: 391, 680 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-liquid-router-full rotate: false - xy: 1899, 785 + xy: 1251, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-liquid-tank-full rotate: false - xy: 1101, 1399 + xy: 391, 484 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-magmarock-full rotate: false - xy: 1899, 751 + xy: 1285, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-mass-conveyor-full rotate: false - xy: 1297, 1399 + xy: 391, 288 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 mass-conveyor-icon rotate: false - xy: 1297, 1399 + xy: 391, 288 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-mass-driver-full rotate: false - xy: 1395, 1399 + xy: 391, 190 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-mechanical-drill-full rotate: false - xy: 1332, 1235 + xy: 721, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-meltdown-full rotate: false - xy: 1383, 1757 + xy: 1513, 1757 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 block-metal-floor-damaged-full rotate: false - xy: 1137, 607 + xy: 1319, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-moss-full rotate: false - xy: 1271, 613 + xy: 2014, 1149 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-oil-extractor-full rotate: false - xy: 1493, 1399 + xy: 293, 128 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-ore-coal-full rotate: false - xy: 1305, 613 + xy: 1141, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-copper-full rotate: false - xy: 1339, 621 + xy: 1141, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-lead-full rotate: false - xy: 1373, 629 + xy: 1137, 49 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-scrap-full rotate: false - xy: 1407, 629 + xy: 1121, 15 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-thorium-full rotate: false - xy: 1147, 465 + xy: 1155, 15 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-titanium-full rotate: false - xy: 1893, 953 + xy: 1171, 49 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pebbles-full rotate: false - xy: 1927, 961 + xy: 1189, 15 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-phase-weaver-full rotate: false - xy: 1977, 1597 + xy: 787, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-plated-conduit-full rotate: false - xy: 1961, 961 + xy: 2014, 1115 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pneumatic-drill-full rotate: false - xy: 1398, 1267 + xy: 853, 1 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-pulse-conduit-full rotate: false - xy: 1995, 961 + xy: 2009, 1081 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pulverizer-full rotate: false - xy: 1885, 919 + xy: 2009, 1047 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-repair-point-full rotate: false - xy: 1865, 717 + xy: 2009, 1013 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ripple-full rotate: false - xy: 1591, 1399 + xy: 391, 92 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-rock-full rotate: false - xy: 1397, 1043 + xy: 1709, 969 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-rocks-full rotate: false - xy: 1899, 717 + xy: 2009, 979 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-saltrocks-full rotate: false - xy: 1339, 587 + xy: 2009, 945 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-salvo-full rotate: false - xy: 1464, 1267 + xy: 1114, 1235 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-sand-boulder-full rotate: false - xy: 1373, 595 + xy: 2009, 911 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-full rotate: false - xy: 1407, 595 + xy: 2009, 877 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sandrocks-full rotate: false - xy: 1927, 927 + xy: 2009, 843 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scatter-full rotate: false - xy: 1530, 1267 + xy: 888, 1161 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-scorch-full rotate: false - xy: 1961, 927 + xy: 2009, 809 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-full rotate: false - xy: 1995, 927 + xy: 2009, 775 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall1 rotate: false - xy: 1995, 927 + xy: 2009, 775 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-huge-full rotate: false - xy: 321, 810 + xy: 285, 30 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 scrap-wall-huge1 rotate: false - xy: 321, 810 + xy: 285, 30 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 block-scrap-wall-large-full rotate: false - xy: 1596, 1267 + xy: 954, 1161 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-shale-boulder-full rotate: false - xy: 1407, 561 + xy: 1211, 853 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-full rotate: false - xy: 1005, 410 + xy: 1245, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shalerocks-full rotate: false - xy: 1005, 376 + xy: 1279, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shrubs-full rotate: false - xy: 1005, 342 + xy: 1245, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-full rotate: false - xy: 1005, 308 + xy: 1313, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snowrock-full rotate: false - xy: 1447, 1101 + xy: 1759, 1027 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-snowrocks-full rotate: false - xy: 1005, 274 + xy: 1279, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3030,1008 +3044,1008 @@ block-spectre-full index: -1 block-spore-cluster-full rotate: false - xy: 955, 1038 + xy: 477, 1160 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 block-spore-moss-full rotate: false - xy: 1005, 240 + xy: 1347, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-spore-press-full rotate: false - xy: 1398, 1201 + xy: 1977, 1333 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-sporerocks-full rotate: false - xy: 1005, 206 + xy: 1313, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-stone-full rotate: false - xy: 1005, 172 + xy: 1381, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-swarmer-full rotate: false - xy: 1464, 1201 + xy: 1180, 1235 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-tendrils-full rotate: false - xy: 1005, 138 + xy: 1347, 869 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-titanium-conveyor-full rotate: false - xy: 1005, 104 + xy: 1415, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 1005, 104 + xy: 1415, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-water-extractor-full rotate: false - xy: 1530, 1201 + xy: 1246, 1267 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-wave-full rotate: false - xy: 1596, 1201 + xy: 1312, 1267 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-1-0 rotate: false - xy: 1141, 261 + xy: 1721, 885 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-1 rotate: false - xy: 1107, 193 + xy: 1721, 851 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-2 rotate: false - xy: 1141, 227 + xy: 1755, 843 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-3 rotate: false - xy: 1107, 159 + xy: 1789, 843 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-4 rotate: false - xy: 1141, 193 + xy: 1823, 843 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-5 rotate: false - xy: 1107, 125 + xy: 1699, 817 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-6 rotate: false - xy: 1141, 159 + xy: 1699, 783 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-7 rotate: false - xy: 1141, 125 + xy: 1733, 809 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-2-0 rotate: false - xy: 1075, 1169 + xy: 1246, 1201 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-1 rotate: false - xy: 1141, 1169 + xy: 1312, 1201 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-2 rotate: false - xy: 1207, 1169 + xy: 1378, 1201 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-3 rotate: false - xy: 1273, 1169 + xy: 1444, 1201 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-4 rotate: false - xy: 1665, 1333 + xy: 1510, 1201 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-5 rotate: false - xy: 1662, 1267 + xy: 1576, 1201 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-6 rotate: false - xy: 1662, 1201 + xy: 1020, 1161 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-7 rotate: false - xy: 1731, 1369 + xy: 1086, 1169 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-3-0 rotate: false - xy: 293, 712 + xy: 521, 851 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-1 rotate: false - xy: 293, 614 + xy: 517, 753 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-2 rotate: false - xy: 293, 516 + xy: 489, 655 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-3 rotate: false - xy: 293, 418 + xy: 489, 557 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-4 rotate: false - xy: 293, 320 + xy: 489, 459 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-5 rotate: false - xy: 293, 222 + xy: 489, 361 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-6 rotate: false - xy: 391, 692 + xy: 489, 263 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-3-7 rotate: false - xy: 391, 594 + xy: 489, 165 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 cracks-4-0 rotate: false - xy: 1643, 1793 + xy: 526, 1145 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-1 rotate: false - xy: 1773, 1793 + xy: 656, 1182 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-2 rotate: false - xy: 453, 1072 + xy: 163, 711 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-3 rotate: false - xy: 1903, 1793 + xy: 163, 581 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-4 rotate: false - xy: 163, 711 + xy: 163, 451 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-5 rotate: false - xy: 163, 581 + xy: 163, 321 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-6 rotate: false - xy: 163, 451 + xy: 163, 191 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-4-7 rotate: false - xy: 163, 321 + xy: 155, 61 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 cracks-5-0 rotate: false - xy: 1, 679 + xy: 645, 1442 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cracks-5-1 rotate: false - xy: 645, 1442 + xy: 1025, 1887 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cracks-5-2 rotate: false - xy: 1025, 1887 + xy: 1, 517 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cracks-5-3 rotate: false - xy: 1, 517 + xy: 1187, 1887 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cracks-5-4 rotate: false - xy: 1187, 1887 + xy: 1, 355 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cracks-5-5 rotate: false - xy: 1, 355 + xy: 1349, 1887 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cracks-5-6 rotate: false - xy: 1349, 1887 + xy: 1, 193 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cracks-5-7 rotate: false - xy: 1, 193 + xy: 1511, 1887 size: 160, 160 orig: 160, 160 offset: 0, 0 index: -1 cyclone rotate: false - xy: 391, 496 + xy: 489, 67 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 duo rotate: false - xy: 1153, 23 + xy: 1835, 801 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fuse rotate: false - xy: 391, 104 + xy: 619, 851 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 hail rotate: false - xy: 1175, 431 + xy: 1869, 801 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-blast-compound-large rotate: false - xy: 1901, 1029 + xy: 989, 119 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-blast-compound-medium rotate: false - xy: 1175, 227 + xy: 1971, 751 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-blast-compound-small rotate: false - xy: 811, 774 + xy: 295, 856 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-blast-compound-tiny rotate: false - xy: 770, 1198 + xy: 267, 43 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-blast-compound-xlarge rotate: false - xy: 1351, 831 + xy: 1959, 985 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-coal-large rotate: false - xy: 1801, 887 + xy: 477, 1118 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-coal-medium rotate: false - xy: 1175, 159 + xy: 1283, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal-small rotate: false - xy: 837, 774 + xy: 2015, 1399 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-coal-tiny rotate: false - xy: 788, 1198 + xy: 1687, 919 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-coal-xlarge rotate: false - xy: 1401, 835 + xy: 1959, 935 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-copper-large rotate: false - xy: 1943, 1029 + xy: 477, 1076 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-copper-medium rotate: false - xy: 1187, 91 + xy: 1183, 223 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper-small rotate: false - xy: 251, 1 + xy: 295, 830 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-copper-tiny rotate: false - xy: 863, 782 + xy: 267, 25 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-copper-xlarge rotate: false - xy: 1347, 781 + xy: 1959, 885 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-graphite-large rotate: false - xy: 1701, 829 + xy: 1175, 429 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-graphite-medium rotate: false - xy: 1187, 23 + xy: 1149, 155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite-small rotate: false - xy: 1697, 1175 + xy: 623, 1119 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-graphite-tiny rotate: false - xy: 806, 1198 + xy: 848, 1609 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-graphite-xlarge rotate: false - xy: 1451, 1001 + xy: 1959, 835 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-lead-large rotate: false - xy: 1743, 829 + xy: 989, 77 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-lead-medium rotate: false - xy: 1171, 605 + xy: 1217, 201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead-small rotate: false - xy: 291, 856 + xy: 1215, 1307 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-lead-tiny rotate: false - xy: 2031, 671 + xy: 786, 1424 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-lead-xlarge rotate: false - xy: 1451, 951 + xy: 1121, 375 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-metaglass-large rotate: false - xy: 1801, 845 + xy: 1217, 429 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-metaglass-medium rotate: false - xy: 1967, 893 + xy: 1251, 201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass-small rotate: false - xy: 1597, 1767 + xy: 1218, 1209 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-metaglass-tiny rotate: false - xy: 2031, 653 + xy: 489, 760 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-metaglass-xlarge rotate: false - xy: 1501, 1001 + xy: 947, 261 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-phase-fabric-large rotate: false - xy: 1451, 809 + xy: 1171, 387 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-phase-fabric-medium rotate: false - xy: 1911, 859 + xy: 1285, 201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric-small rotate: false - xy: 1689, 1471 + xy: 1218, 1109 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-phase-fabric-tiny rotate: false - xy: 848, 1609 + xy: 623, 952 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-phase-fabric-xlarge rotate: false - xy: 1451, 901 + xy: 946, 211 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-plastanium-large rotate: false - xy: 1493, 809 + xy: 1213, 387 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-plastanium-medium rotate: false - xy: 1979, 859 + xy: 1319, 201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium-small rotate: false - xy: 1205, 613 + xy: 881, 74 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-plastanium-tiny rotate: false - xy: 786, 1424 + xy: 900, 1342 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-plastanium-xlarge rotate: false - xy: 1501, 951 + xy: 939, 161 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-pyratite-large rotate: false - xy: 1535, 809 + xy: 1205, 345 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-pyratite-medium rotate: false - xy: 1933, 791 + xy: 1353, 201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite-small rotate: false - xy: 1885, 893 + xy: 1977, 1501 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-pyratite-tiny rotate: false - xy: 937, 1479 + xy: 457, 74 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-pyratite-xlarge rotate: false - xy: 1551, 1001 + xy: 939, 111 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-sand-large rotate: false - xy: 1577, 809 + xy: 1259, 429 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-sand-medium rotate: false - xy: 1933, 757 + xy: 1353, 167 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand-small rotate: false - xy: 1155, 501 + xy: 1215, 945 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-sand-tiny rotate: false - xy: 391, 792 + xy: 1937, 801 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-sand-xlarge rotate: false - xy: 1451, 851 + xy: 939, 61 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-scrap-large rotate: false - xy: 1619, 809 + xy: 1255, 387 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-scrap-medium rotate: false - xy: 1933, 723 + xy: 1175, 87 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap-small rotate: false - xy: 1509, 545 + xy: 1211, 827 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-scrap-tiny rotate: false - xy: 481, 6 + xy: 1215, 927 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-scrap-xlarge rotate: false - xy: 1501, 901 + xy: 919, 11 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-silicon-large rotate: false - xy: 933, 48 + xy: 1247, 345 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-silicon-medium rotate: false - xy: 1967, 723 + xy: 1251, 133 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon-small rotate: false - xy: 1689, 1445 + xy: 1257, 775 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-silicon-tiny rotate: false - xy: 982, 1358 + xy: 623, 1075 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-silicon-xlarge rotate: false - xy: 1551, 951 + xy: 969, 11 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-spore-pod-large rotate: false - xy: 933, 6 + xy: 1205, 303 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-spore-pod-medium rotate: false - xy: 2001, 791 + xy: 1353, 133 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod-small rotate: false - xy: 1535, 545 + xy: 1695, 553 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-tiny rotate: false - xy: 1047, 499 + xy: 1729, 705 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-spore-pod-xlarge rotate: false - xy: 1601, 1001 + xy: 1115, 921 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-surge-alloy-large rotate: false - xy: 975, 54 + xy: 1247, 303 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-surge-alloy-medium rotate: false - xy: 2001, 723 + xy: 1243, 99 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy-small rotate: false - xy: 1561, 545 + xy: 623, 1093 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-tiny rotate: false - xy: 1419, 709 + xy: 1755, 731 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-surge-alloy-xlarge rotate: false - xy: 1501, 851 + xy: 1165, 921 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-thorium-large rotate: false - xy: 975, 12 + xy: 1031, 119 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-thorium-medium rotate: false - xy: 1967, 689 + xy: 1311, 99 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium-small rotate: false - xy: 1587, 545 + xy: 907, 74 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-thorium-tiny rotate: false - xy: 1137, 589 + xy: 1807, 757 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-thorium-xlarge rotate: false - xy: 1551, 901 + xy: 1111, 871 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-titanium-large rotate: false - xy: 1377, 739 + xy: 1031, 77 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-titanium-medium rotate: false - xy: 1155, 527 + xy: 1209, 65 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium-small rotate: false - xy: 1613, 545 + xy: 1695, 527 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-tiny rotate: false - xy: 2018, 1723 + xy: 267, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-titanium-xlarge rotate: false - xy: 1601, 951 + xy: 1161, 871 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lancer rotate: false - xy: 1207, 1103 + xy: 1350, 1135 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 liquid-cryofluid-large rotate: false - xy: 1377, 697 + xy: 1019, 35 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-cryofluid-medium rotate: false - xy: 1555, 775 + xy: 1345, 65 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid-small rotate: false - xy: 1155, 561 + xy: 1729, 749 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-cryofluid-tiny rotate: false - xy: 824, 1198 + xy: 285, 12 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-cryofluid-xlarge rotate: false - xy: 1651, 901 + xy: 1137, 671 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-oil-large rotate: false - xy: 1985, 1029 + xy: 1061, 35 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-oil-medium rotate: false - xy: 1419, 767 + xy: 1291, 31 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil-small rotate: false - xy: 1080, 465 + xy: 1755, 749 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4045,28 +4059,28 @@ liquid-oil-tiny index: -1 liquid-oil-xlarge rotate: false - xy: 1651, 851 + xy: 1137, 621 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-slag-large rotate: false - xy: 1071, 533 + xy: 1289, 345 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-slag-medium rotate: false - xy: 1657, 749 + xy: 1287, 733 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag-small rotate: false - xy: 2018, 1767 + xy: 1729, 723 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4080,259 +4094,259 @@ liquid-slag-tiny index: -1 liquid-slag-xlarge rotate: false - xy: 151, 11 + xy: 1137, 571 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-water-large rotate: false - xy: 1071, 491 + xy: 1289, 303 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-water-medium rotate: false - xy: 1555, 707 + xy: 1355, 767 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water-small rotate: false - xy: 2018, 1741 + xy: 1781, 749 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-water-tiny rotate: false - xy: 955, 1479 + xy: 641, 952 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-water-xlarge rotate: false - xy: 201, 11 + xy: 1137, 521 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mass-driver rotate: false - xy: 685, 676 + xy: 783, 459 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 meltdown rotate: false - xy: 1498, 1627 + xy: 1643, 1757 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 repair-point rotate: false - xy: 1895, 683 + xy: 1423, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ripple rotate: false - xy: 783, 578 + xy: 1329, 1399 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 salvo rotate: false - xy: 1219, 971 + xy: 1445, 1003 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scatter rotate: false - xy: 955, 839 + xy: 1577, 1003 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scorch rotate: false - xy: 1713, 625 + xy: 1525, 665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spectre rotate: false - xy: 1717, 1533 + xy: 1888, 1663 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 splash-0 rotate: false - xy: 1997, 655 + xy: 1491, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-1 rotate: false - xy: 1781, 607 + xy: 1457, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-10 rotate: false - xy: 1713, 557 + xy: 1457, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-11 rotate: false - xy: 1747, 557 + xy: 1661, 699 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-2 rotate: false - xy: 1815, 607 + xy: 1423, 529 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-3 rotate: false - xy: 1781, 573 + xy: 1661, 767 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-4 rotate: false - xy: 1815, 573 + xy: 1661, 733 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-5 rotate: false - xy: 1849, 607 + xy: 1627, 699 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-6 rotate: false - xy: 1849, 573 + xy: 1593, 665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-7 rotate: false - xy: 1883, 615 + xy: 1559, 631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-8 rotate: false - xy: 1883, 581 + xy: 1525, 597 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-9 rotate: false - xy: 1679, 557 + xy: 1491, 563 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer rotate: false - xy: 881, 90 + xy: 881, 633 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-alpha-full rotate: false - xy: 1701, 1021 + xy: 1959, 785 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-cix-full rotate: false - xy: 1575, 1333 + xy: 1485, 1333 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 unit-crawler-full rotate: false - xy: 1701, 971 + xy: 1977, 1283 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-dagger-full rotate: false - xy: 1751, 1021 + xy: 1972, 1233 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-draug-full rotate: false - xy: 1701, 921 + xy: 1972, 1183 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-eruptor-full rotate: false - xy: 481, 24 + xy: 1575, 1333 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 unit-fortress-full rotate: false - xy: 423, 888 + xy: 770, 1062 size: 100, 80 orig: 100, 80 offset: 0, 0 index: -1 unit-ghoul-full rotate: false - xy: 793, 14 + xy: 974, 1227 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 unit-oculon-full rotate: false - xy: 1973, 1925 + xy: 91, 17 size: 58, 48 orig: 58, 48 offset: 0, 0 index: -1 unit-phantom-full rotate: false - xy: 947, 154 + xy: 1079, 591 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -4346,203 +4360,203 @@ unit-reaper-full index: -1 unit-revenant-full rotate: false - xy: 697, 1084 + xy: 786, 1246 size: 112, 112 orig: 112, 112 offset: 0, 0 index: -1 unit-spirit-full rotate: false - xy: 1751, 971 + xy: 1005, 319 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-tau-full rotate: false - xy: 947, 96 + xy: 1079, 533 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 unit-titan-full rotate: false - xy: 947, 575 + xy: 1013, 567 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-trident-full rotate: false - xy: 525, 970 + xy: 423, 974 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 unit-vanguard-full rotate: false - xy: 1801, 1021 + xy: 1055, 325 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-wraith-full rotate: false - xy: 1701, 871 + xy: 1105, 325 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wave rotate: false - xy: 1079, 641 + xy: 947, 369 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 1175, 261 + xy: 1937, 751 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 1175, 193 + xy: 2005, 741 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 1175, 125 + xy: 1149, 223 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 1187, 57 + xy: 1149, 189 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 1419, 727 + xy: 1183, 189 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 1933, 893 + xy: 1183, 155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 2001, 893 + xy: 1217, 167 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 1945, 859 + xy: 1251, 167 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 1933, 825 + xy: 1285, 167 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 1967, 825 + xy: 1319, 167 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 1967, 791 + xy: 1175, 121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 1967, 757 + xy: 1217, 133 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod rotate: false - xy: 2001, 825 + xy: 1319, 133 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 2001, 757 + xy: 1209, 99 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 1933, 689 + xy: 1277, 99 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 2001, 689 + xy: 1345, 99 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 1521, 775 + xy: 1311, 65 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 1623, 775 + xy: 1257, 31 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 1623, 741 + xy: 1287, 767 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 1521, 707 + xy: 1287, 699 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blank rotate: false - xy: 1395, 1330 + xy: 1856, 1132 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -4556,21 +4570,21 @@ circle index: -1 shape-3 rotate: false - xy: 947, 444 + xy: 881, 238 size: 63, 63 orig: 63, 63 offset: 0, 0 index: -1 alpha rotate: false - xy: 889, 1080 + xy: 1071, 375 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-cell rotate: false - xy: 1397, 1151 + xy: 1709, 1077 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4612,259 +4626,259 @@ cix index: -1 cix-cell rotate: false - xy: 526, 1209 + xy: 1215, 1333 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 cix-foot rotate: false - xy: 1801, 929 + xy: 1133, 429 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 cix-joint rotate: false - xy: 2011, 1435 + xy: 391, 786 size: 26, 26 orig: 26, 26 offset: 0, 0 index: -1 cix-leg rotate: false - xy: 1513, 1765 + xy: 1673, 1895 size: 48, 26 orig: 48, 26 offset: 0, 0 index: -1 cix-leg-base rotate: false - xy: 1628, 1635 + xy: 1723, 1895 size: 48, 26 orig: 48, 26 offset: 0, 0 index: -1 crawler rotate: false - xy: 1497, 1151 + xy: 1759, 977 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-base rotate: false - xy: 1447, 1051 + xy: 1809, 1077 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-cell rotate: false - xy: 1497, 1101 + xy: 1809, 1027 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-leg rotate: false - xy: 1547, 1151 + xy: 1809, 977 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger rotate: false - xy: 1497, 1051 + xy: 1859, 1085 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 1547, 1101 + xy: 1859, 1035 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 1597, 1151 + xy: 1909, 1085 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta rotate: false - xy: 1547, 1051 + xy: 1859, 985 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-base rotate: false - xy: 1597, 1101 + xy: 1909, 1035 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-cell rotate: false - xy: 1647, 1151 + xy: 1909, 985 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-leg rotate: false - xy: 1597, 1051 + xy: 1709, 919 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 draug rotate: false - xy: 1647, 1101 + xy: 1759, 927 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 draug-cell rotate: false - xy: 1647, 1051 + xy: 1809, 927 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 eradicator rotate: false - xy: 1511, 1923 + xy: 1, 67 size: 152, 124 orig: 152, 124 offset: 0, 0 index: -1 eradicator-base rotate: false - xy: 1, 67 + xy: 1673, 1923 size: 152, 124 orig: 152, 124 offset: 0, 0 index: -1 eradicator-cell rotate: false - xy: 1665, 1923 + xy: 1827, 1923 size: 152, 124 orig: 152, 124 offset: 0, 0 index: -1 eradicator-leg rotate: false - xy: 1819, 1923 + xy: 323, 1076 size: 152, 124 orig: 152, 124 offset: 0, 0 index: -1 eruptor rotate: false - xy: 1395, 1333 + xy: 1305, 1333 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 eruptor-base rotate: false - xy: 1794, 1171 + xy: 954, 1095 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 eruptor-cell rotate: false - xy: 1485, 1333 + xy: 1395, 1333 size: 88, 64 orig: 88, 64 offset: 0, 0 index: -1 eruptor-leg rotate: false - xy: 1860, 1171 + xy: 1020, 1095 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress rotate: false - xy: 321, 990 + xy: 321, 994 size: 100, 80 orig: 100, 80 offset: 0, 0 index: -1 fortress-base rotate: false - xy: 1926, 1171 + xy: 1086, 1103 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress-cell rotate: false - xy: 321, 908 + xy: 321, 912 size: 100, 80 orig: 100, 80 offset: 0, 0 index: -1 fortress-leg rotate: false - xy: 770, 1216 + xy: 1665, 1337 size: 80, 60 orig: 80, 60 offset: 0, 0 index: -1 ghoul rotate: false - xy: 1973, 1975 + xy: 1829, 1325 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 ghoul-cell rotate: false - xy: 571, 14 + xy: 1903, 1325 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 glaive rotate: false - xy: 1977, 1539 + xy: 1981, 1925 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 glaive-cell rotate: false - xy: 1013, 517 + xy: 947, 311 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 javelin rotate: false - xy: 1551, 851 + xy: 1111, 821 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 javelin-cell rotate: false - xy: 1601, 901 + xy: 1161, 821 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 javelin-shield rotate: false - xy: 1601, 851 + xy: 1107, 771 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4885,84 +4899,84 @@ lich-cell index: -1 oculon rotate: false - xy: 91, 17 + xy: 1680, 1135 size: 58, 48 orig: 58, 48 offset: 0, 0 index: -1 oculon-base rotate: false - xy: 1327, 723 + xy: 1187, 621 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 oculon-cell rotate: false - xy: 1697, 1121 + xy: 1187, 571 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 oculon-leg rotate: false - xy: 1697, 1071 + xy: 1187, 521 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 omega rotate: false - xy: 852, 1196 + xy: 1747, 1317 size: 80, 80 orig: 80, 80 offset: 0, 0 index: -1 omega-armor rotate: false - xy: 1273, 1037 + xy: 917, 963 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 omega-base rotate: false - xy: 1079, 583 + xy: 1013, 377 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 omega-cell rotate: false - xy: 1145, 649 + xy: 1740, 1127 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 omega-leg rotate: false - xy: 1211, 715 + xy: 1798, 1127 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 phantom rotate: false - xy: 947, 386 + xy: 1856, 1135 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 phantom-cell rotate: false - xy: 1339, 1039 + xy: 1914, 1135 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 power-cell rotate: false - xy: 1269, 715 + xy: 151, 3 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -4983,252 +4997,252 @@ reaper-cell index: -1 revenant rotate: false - xy: 656, 1198 + xy: 656, 1068 size: 112, 112 orig: 112, 112 offset: 0, 0 index: -1 revenant-cell rotate: false - xy: 583, 1084 + xy: 807, 1360 size: 112, 112 orig: 112, 112 offset: 0, 0 index: -1 spirit rotate: false - xy: 1947, 1121 + xy: 1759, 877 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spirit-cell rotate: false - xy: 1947, 1071 + xy: 1809, 877 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau rotate: false - xy: 947, 328 + xy: 209, 3 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 tau-base rotate: false - xy: 1997, 1127 + xy: 1859, 835 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau-cell rotate: false - xy: 947, 270 + xy: 1079, 707 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 tau-leg rotate: false - xy: 1997, 1077 + xy: 1909, 819 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titan rotate: false - xy: 1083, 773 + xy: 947, 633 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-base rotate: false - xy: 1149, 773 + xy: 1013, 699 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-cell rotate: false - xy: 1215, 773 + xy: 881, 501 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-leg rotate: false - xy: 1281, 773 + xy: 947, 567 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 trident rotate: false - xy: 423, 970 + xy: 786, 1144 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 trident-cell rotate: false - xy: 947, 212 + xy: 1079, 649 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 vanguard rotate: false - xy: 1751, 921 + xy: 1155, 325 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 vanguard-cell rotate: false - xy: 1801, 971 + xy: 997, 261 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wraith rotate: false - xy: 1751, 871 + xy: 989, 161 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 artillery rotate: false - xy: 1397, 1093 + xy: 1709, 1019 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 beam-weapon rotate: false - xy: 1447, 1151 + xy: 1759, 1077 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 chaos rotate: false - xy: 1339, 1097 + xy: 881, 100 size: 56, 136 orig: 56, 136 offset: 0, 0 index: -1 eradication rotate: false - xy: 489, 580 + xy: 587, 461 size: 96, 192 orig: 96, 192 offset: 0, 0 index: -1 eruption rotate: false - xy: 1351, 931 + xy: 1909, 927 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 flakgun rotate: false - xy: 1351, 881 + xy: 1859, 885 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flamethrower rotate: false - xy: 1401, 985 + xy: 1909, 869 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 heal-weapon rotate: false - xy: 1401, 935 + xy: 1959, 1085 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 heal-weapon-mount rotate: false - xy: 1401, 885 + xy: 1959, 1035 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 large-weapon rotate: false - xy: 1651, 1001 + xy: 1157, 771 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lich-missiles rotate: false - xy: 1651, 951 + xy: 1137, 721 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles rotate: false - xy: 1995, 1277 + xy: 1133, 471 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles-mount rotate: false - xy: 1992, 1227 + xy: 1187, 721 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mount-weapon rotate: false - xy: 1992, 1177 + xy: 1187, 671 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 reaper-weapon rotate: false - xy: 1747, 1121 + xy: 1183, 471 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 revenant-missiles rotate: false - xy: 1747, 1071 + xy: 1207, 771 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-basic-weapon rotate: false - xy: 1847, 1121 + xy: 1237, 621 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-weapon rotate: false - xy: 1847, 1071 + xy: 1237, 571 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 weapon rotate: false - xy: 1851, 1021 + xy: 996, 211 size: 48, 48 orig: 48, 48 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 67a9cf23d7..e76256302d 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 eb5cfd0115..e13d8db207 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 7142c4f48d..c5e5830351 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -14,7 +14,7 @@ import mindustry.graphics.*; import mindustry.type.*; import mindustry.world.*; import mindustry.world.blocks.*; -import mindustry.world.blocks.campaign.LaunchPad; +import mindustry.world.blocks.campaign.*; import mindustry.world.blocks.defense.*; import mindustry.world.blocks.defense.turrets.*; import mindustry.world.blocks.distribution.*; @@ -71,7 +71,7 @@ public class Blocks implements ContentList{ mechanicalDrill, pneumaticDrill, laserDrill, blastDrill, waterExtractor, oilExtractor, cultivator, //storage - coreShard, coreFoundation, coreNucleus, vault, container, unloader, launchPad, launchPadLarge, + coreShard, coreFoundation, coreNucleus, vault, container, unloader, //turrets duo, scatter, scorch, hail, arc, wave, lancer, swarmer, salvo, fuse, ripple, cyclone, spectre, meltdown, @@ -79,8 +79,10 @@ public class Blocks implements ContentList{ //units groundFactory, airFactory, navalFactory, basicReconstructor, repairPoint, - //misc experimental + //campaign + launchPad, launchPadLarge, coreSilo, dataProcessor, + //misc experimental blockForge, blockLauncher, blockLoader, blockUnloader; @Override @@ -1316,25 +1318,6 @@ public class Blocks implements ContentList{ speed = 7f; }}; - launchPad = new mindustry.world.blocks.campaign.LaunchPad("launch-pad"){{ - requirements(Category.effect, BuildVisibility.campaignOnly, ItemStack.with(Items.copper, 350, Items.silicon, 140, Items.lead, 200, Items.titanium, 150)); - size = 3; - itemCapacity = 100; - launchTime = 60f * 20; - hasPower = true; - consumes.power(4f); - }}; - - launchPadLarge = new LaunchPad("launch-pad-large"){{ - requirements(Category.effect, BuildVisibility.campaignOnly, ItemStack.with(Items.titanium, 200, Items.silicon, 150, Items.lead, 250, Items.plastanium, 75)); - size = 4; - itemCapacity = 300; - launchTime = 60f * 35; - hasPower = true; - consumes.power(6f); - }}; - - //endregion //region turrets @@ -1780,6 +1763,41 @@ public class Blocks implements ContentList{ new LegacyCommandCenter("legacy-command-center"); //endregion + //region campaign + + launchPad = new LaunchPad("launch-pad"){{ + requirements(Category.effect, BuildVisibility.campaignOnly, ItemStack.with(Items.copper, 350, Items.silicon, 140, Items.lead, 200, Items.titanium, 150)); + size = 3; + itemCapacity = 100; + launchTime = 60f * 20; + hasPower = true; + consumes.power(4f); + }}; + + launchPadLarge = new LaunchPad("launch-pad-large"){{ + requirements(Category.effect, BuildVisibility.campaignOnly, ItemStack.with(Items.titanium, 200, Items.silicon, 150, Items.lead, 250, Items.plastanium, 75)); + size = 4; + itemCapacity = 300; + launchTime = 60f * 35; + hasPower = true; + consumes.power(6f); + }}; + + coreSilo = new CoreLauncher("core-silo"){{ + requirements(Category.effect, BuildVisibility.campaignOnly, ItemStack.with(Items.copper, 350, Items.silicon, 140, Items.lead, 200, Items.titanium, 150)); + size = 5; + itemCapacity = 1000; + hasPower = true; + consumes.power(4f); + }}; + + dataProcessor = new ResearchBlock("data-processor"){{ + requirements(Category.effect, BuildVisibility.campaignOnly, ItemStack.with(Items.copper, 350, Items.silicon, 140, Items.lead, 200, Items.titanium, 150)); + + size = 3; + }}; + + //endregion campaign //region experimental blockForge = new BlockForge("block-forge"){{ diff --git a/core/src/mindustry/game/Universe.java b/core/src/mindustry/game/Universe.java index ed7ca1ba2c..ce5a2813db 100644 --- a/core/src/mindustry/game/Universe.java +++ b/core/src/mindustry/game/Universe.java @@ -2,11 +2,12 @@ package mindustry.game; import arc.*; import arc.math.*; -import arc.struct.ObjectFloatMap.*; +import arc.struct.*; import arc.util.*; import mindustry.*; import mindustry.content.*; import mindustry.game.EventType.*; +import mindustry.game.SectorInfo.*; import mindustry.io.*; import mindustry.type.*; @@ -80,9 +81,9 @@ public class Universe{ if(sector.hasBase() && !sector.isBeingPlayed()){ SaveMeta meta = sector.save.meta; - for(Entry entry : meta.exportRates){ + for(ObjectMap.Entry entry : meta.secinfo.export){ //total is calculated by items/sec (value) * turn duration in seconds - int total = (int)(entry.value * turnDuration / 60f); + int total = (int)(entry.value.mean * turnDuration / 60f); exports[entry.key.id] += total; } diff --git a/core/src/mindustry/input/MobileInput.java b/core/src/mindustry/input/MobileInput.java index ca94abe2ba..35f42dec93 100644 --- a/core/src/mindustry/input/MobileInput.java +++ b/core/src/mindustry/input/MobileInput.java @@ -272,25 +272,6 @@ public class MobileInput extends InputHandler implements GestureListener{ }); } - @Override - protected int schemOriginX(){ - Tmp.v1.setZero(); - selectRequests.each(r -> Tmp.v1.add(r.drawx(), r.drawy())); - return world.toTile(Tmp.v1.scl(1f / selectRequests.size).x); - } - - @Override - protected int schemOriginY(){ - Tmp.v1.setZero(); - selectRequests.each(r -> Tmp.v1.add(r.drawx(), r.drawy())); - return world.toTile(Tmp.v1.scl(1f / selectRequests.size).y); - } - - @Override - public boolean isPlacing(){ - return super.isPlacing() && mode == placing; - } - @Override public void drawBottom(){ Lines.stroke(1f); @@ -409,7 +390,26 @@ public class MobileInput extends InputHandler implements GestureListener{ } //endregion - //region input events + //region input events, overrides + + @Override + protected int schemOriginX(){ + Tmp.v1.setZero(); + selectRequests.each(r -> Tmp.v1.add(r.drawx(), r.drawy())); + return world.toTile(Tmp.v1.scl(1f / selectRequests.size).x); + } + + @Override + protected int schemOriginY(){ + Tmp.v1.setZero(); + selectRequests.each(r -> Tmp.v1.add(r.drawx(), r.drawy())); + return world.toTile(Tmp.v1.scl(1f / selectRequests.size).y); + } + + @Override + public boolean isPlacing(){ + return super.isPlacing() && mode == placing; + } @Override public boolean isBreaking(){ diff --git a/core/src/mindustry/world/blocks/campaign/CoreLauncher.java b/core/src/mindustry/world/blocks/campaign/CoreLauncher.java index c3d2f2520c..a22c4a9e31 100644 --- a/core/src/mindustry/world/blocks/campaign/CoreLauncher.java +++ b/core/src/mindustry/world/blocks/campaign/CoreLauncher.java @@ -11,6 +11,7 @@ public class CoreLauncher extends Block{ hasItems = true; configurable = true; + update = true; } public class CoreLauncherEntity extends TileEntity{ diff --git a/core/src/mindustry/world/blocks/campaign/ResearchBlock.java b/core/src/mindustry/world/blocks/campaign/ResearchBlock.java index 9e10526f72..1445820406 100644 --- a/core/src/mindustry/world/blocks/campaign/ResearchBlock.java +++ b/core/src/mindustry/world/blocks/campaign/ResearchBlock.java @@ -34,6 +34,14 @@ public class ResearchBlock extends Block{ } + @Override + public boolean configTapped(){ + //TODO select target + Vars.ui.tech.show(); + + return false; + } + @Override public void write(Writes write){ super.write(write); diff --git a/tools/build.gradle b/tools/build.gradle index a187320aab..baa2953413 100644 --- a/tools/build.gradle +++ b/tools/build.gradle @@ -11,7 +11,7 @@ import java.awt.image.BufferedImage import java.util.List import java.util.concurrent.ExecutorService import java.util.concurrent.Executors -import java.util.concurrent.TimeUnit +import java.util.concurrent.TimeUnit def genFolder = "../core/assets-raw/sprites_out/generated/" def doAntialias = !project.hasProperty("disableAntialias") @@ -33,7 +33,7 @@ def transformColors = { List> list -> //d4816b -transformColors([["6e7080", "989aa4", "b0bac0"], ["bc5452", "ea8878", "feb380"], ["de9458", "f8c266", "ffe18f"], ["feb380", "ea8878", "bc5452"]]) +transformColors([["a387ea", "8a73c6", "5c5e9f"], ["6e7080", "989aa4", "b0bac0"], ["bc5452", "ea8878", "feb380"], ["de9458", "f8c266", "ffe18f"], ["feb380", "ea8878", "bc5452"]]) def antialias = { File file -> if(!doAntialias) return @@ -189,6 +189,17 @@ def scaleImage = { File file -> def tileImage = { File file -> def image = ImageIO.read(file) + for(x in 0..image.width-1){ + for(y in 0..image.height-1){ + if(x > (image.height - 1 - y)){ + def rx = image.height - 1 - y + def ry = x + + image.setRGB(x, y, image.getRGB(rx, image.height - 1 - ry)) + } + } + } + def result = new BufferedImage(image.width * 2, image.height * 2, image.getType()) Graphics2D graphics = result.createGraphics() graphics.drawImage(image, image.width, 0, -image.width, image.height, null)