diff --git a/annotations/src/main/resources/classids.properties b/annotations/src/main/resources/classids.properties index 3ad501266e..318d8b74da 100644 --- a/annotations/src/main/resources/classids.properties +++ b/annotations/src/main/resources/classids.properties @@ -4,6 +4,8 @@ alpha=0 block=1 cix=2 draug=3 +flare=36 +horizon=35 mace=4 mega=28 mindustry.entities.comp.BuildingComp=22 diff --git a/core/assets/sprites/fallback/sprites.atlas b/core/assets/sprites/fallback/sprites.atlas index 41e88ed35f..0778183255 100644 --- a/core/assets/sprites/fallback/sprites.atlas +++ b/core/assets/sprites/fallback/sprites.atlas @@ -88,6 +88,27 @@ circle-shadow orig: 201, 201 offset: 0, 0 index: -1 +antumbra-wreck0 + rotate: false + xy: 1437, 446 + size: 216, 240 + orig: 216, 240 + offset: 0, 0 + index: -1 +antumbra-wreck1 + rotate: false + xy: 1655, 446 + size: 216, 240 + orig: 216, 240 + offset: 0, 0 + index: -1 +antumbra-wreck2 + rotate: false + xy: 1437, 204 + size: 216, 240 + orig: 216, 240 + offset: 0, 0 + index: -1 block-core-nucleus-full rotate: false xy: 1837, 1492 @@ -340,56 +361,35 @@ cracks-9-7 orig: 288, 288 offset: 0, 0 index: -1 -lich-wreck0 - rotate: false - xy: 1437, 446 - size: 216, 240 - orig: 216, 240 - offset: 0, 0 - index: -1 -lich-wreck1 - rotate: false - xy: 1655, 446 - size: 216, 240 - orig: 216, 240 - offset: 0, 0 - index: -1 -lich-wreck2 - rotate: false - xy: 1437, 204 - size: 216, 240 - orig: 216, 240 - offset: 0, 0 - index: -1 -reaper-wreck0 +eclipse-wreck0 rotate: false xy: 1, 1076 size: 320, 320 orig: 320, 320 offset: 0, 0 index: -1 -reaper-wreck1 +eclipse-wreck1 rotate: false xy: 1, 754 size: 320, 320 orig: 320, 320 offset: 0, 0 index: -1 -reaper-wreck2 +eclipse-wreck2 rotate: false xy: 1, 432 size: 320, 320 orig: 320, 320 offset: 0, 0 index: -1 -unit-lich-full +unit-antumbra-full rotate: false xy: 1655, 204 size: 216, 240 orig: 216, 240 offset: 0, 0 index: -1 -unit-reaper-full +unit-eclipse-full rotate: false xy: 1, 110 size: 320, 320 @@ -403,28 +403,28 @@ circle orig: 201, 201 offset: 0, 0 index: -1 -lich +antumbra rotate: false xy: 1001, 220 size: 216, 240 orig: 216, 240 offset: 0, 0 index: -1 -lich-cell +antumbra-cell rotate: false xy: 1219, 220 size: 216, 240 orig: 216, 240 offset: 0, 0 index: -1 -reaper +eclipse rotate: false xy: 1, 1720 size: 320, 320 orig: 320, 320 offset: 0, 0 index: -1 -reaper-cell +eclipse-cell rotate: false xy: 1, 1398 size: 320, 320 @@ -537,14 +537,14 @@ mend-projector-top index: -1 mender rotate: false - xy: 1303, 115 + xy: 1101, 281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mender-top rotate: false - xy: 1337, 149 + xy: 1135, 315 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -565,7 +565,7 @@ overdrive-projector-top index: -1 shock-mine rotate: false - xy: 1507, 87 + xy: 1203, 259 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -586,497 +586,497 @@ block-unloader index: -1 bridge-arrow rotate: false - xy: 1201, 175 + xy: 1033, 373 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 1167, 73 + xy: 1067, 305 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 1201, 73 + xy: 1067, 271 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 1407, 699 + xy: 1067, 237 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 center rotate: false - xy: 1441, 699 + xy: 1067, 203 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-0 rotate: false - xy: 1051, 1 + xy: 507, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-armored-conveyor-full rotate: false - xy: 1051, 1 + xy: 507, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-1 rotate: false - xy: 473, 1 + xy: 1979, 1591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-2 rotate: false - xy: 507, 1 + xy: 931, 13 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-0-3 rotate: false - xy: 1979, 1591 + xy: 965, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-0 rotate: false - xy: 1233, 591 + xy: 999, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-1 rotate: false - xy: 1, 3 + xy: 1033, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-2 rotate: false - xy: 1267, 591 + xy: 1225, 633 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-1-3 rotate: false - xy: 35, 3 + xy: 1, 3 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-0 rotate: false - xy: 1301, 591 + xy: 1259, 633 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-1 rotate: false - xy: 69, 3 + xy: 35, 3 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-2 rotate: false - xy: 1335, 591 + xy: 1293, 633 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-2-3 rotate: false - xy: 2013, 1591 + xy: 69, 3 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-0 rotate: false - xy: 2005, 1557 + xy: 1327, 633 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-1 rotate: false - xy: 2005, 1523 + xy: 1361, 633 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-2 rotate: false - xy: 2005, 1489 + xy: 1395, 633 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-3 rotate: false - xy: 2005, 1455 + xy: 1429, 633 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-0 rotate: false - xy: 2005, 1421 + xy: 1463, 633 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-1 rotate: false - xy: 207, 5 + xy: 1497, 633 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-2 rotate: false - xy: 1175, 549 + xy: 1531, 633 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-3 rotate: false - xy: 1175, 515 + xy: 1565, 633 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 1379, 489 + xy: 1917, 765 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 1379, 455 + xy: 1867, 731 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 1379, 421 + xy: 1867, 697 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 1379, 387 + xy: 1901, 731 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 1379, 353 + xy: 1901, 697 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 1379, 319 + xy: 1867, 663 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 1379, 285 + xy: 1901, 663 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 1475, 699 + xy: 1833, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 1959, 947 + xy: 1935, 731 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 1993, 947 + xy: 1935, 697 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 1984, 913 + xy: 1935, 663 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 1984, 879 + xy: 1867, 629 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 1994, 845 + xy: 1901, 629 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 1994, 811 + xy: 1935, 629 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 679, 13 + xy: 1243, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 713, 13 + xy: 1277, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 747, 13 + xy: 1311, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 781, 13 + xy: 1345, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 815, 13 + xy: 1379, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor rotate: false - xy: 1269, 47 + xy: 1135, 111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-0 rotate: false - xy: 1303, 47 + xy: 1101, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-1 rotate: false - xy: 1337, 47 + xy: 1135, 77 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-2 rotate: false - xy: 1371, 47 + xy: 1135, 43 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-edge rotate: false - xy: 1201, 39 + xy: 1101, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-stack rotate: false - xy: 1201, 5 + xy: 1135, 9 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 1661, 757 + xy: 1339, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 1695, 791 + xy: 1373, 361 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 1661, 723 + xy: 1407, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 1695, 757 + xy: 1441, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 1729, 791 + xy: 1203, 157 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 1695, 723 + xy: 1237, 191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 1729, 757 + xy: 1271, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 1763, 791 + xy: 1305, 259 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 1729, 723 + xy: 1339, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 1763, 757 + xy: 1373, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 1797, 791 + xy: 1407, 361 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 1763, 723 + xy: 1441, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 1797, 757 + xy: 1475, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 1831, 791 + xy: 1203, 123 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 1797, 723 + xy: 1237, 157 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 1831, 757 + xy: 1271, 191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 1865, 791 + xy: 1305, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 1831, 723 + xy: 1339, 259 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1865, 757 + xy: 1373, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cross rotate: false - xy: 1403, 597 + xy: 1707, 641 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1090,14 +1090,14 @@ distributor index: -1 inverted-sorter rotate: false - xy: 1413, 427 + xy: 1719, 471 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction rotate: false - xy: 1413, 257 + xy: 1969, 711 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1139,7 +1139,7 @@ mass-driver-base index: -1 overflow-gate rotate: false - xy: 1303, 81 + xy: 1135, 281 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1167,49 +1167,49 @@ payload-router-over index: -1 phase-conveyor rotate: false - xy: 1371, 81 + xy: 1101, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 1525, 723 + xy: 1135, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 1559, 723 + xy: 1101, 111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 1593, 723 + xy: 1135, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 1439, 121 + xy: 1237, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 1507, 53 + xy: 1271, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 underflow-gate rotate: false - xy: 1899, 757 + xy: 1475, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1384,35 +1384,35 @@ water-extractor-top index: -1 block-border rotate: false - xy: 1175, 345 + xy: 2005, 1489 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-middle rotate: false - xy: 1311, 489 + xy: 1395, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-select rotate: false - xy: 1345, 319 + xy: 1583, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 1593, 791 + xy: 1201, 523 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 message rotate: false - xy: 1371, 183 + xy: 1101, 247 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1426,161 +1426,161 @@ place-arrow index: -1 bridge-conduit rotate: false - xy: 1167, 141 + xy: 1067, 373 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 1201, 141 + xy: 1033, 339 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 1201, 141 + xy: 1033, 339 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 1167, 107 + xy: 1067, 339 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 1201, 107 + xy: 1033, 305 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 1525, 791 + xy: 1067, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 1525, 757 + xy: 1067, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 1559, 791 + xy: 1067, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 1559, 757 + xy: 1167, 519 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 1559, 757 + xy: 1167, 519 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 1559, 757 + xy: 1167, 519 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 1593, 757 + xy: 1833, 749 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 1375, 641 + xy: 1833, 715 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 1369, 591 + xy: 1833, 681 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 1379, 557 + xy: 1791, 639 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 1379, 557 + xy: 1791, 639 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 1379, 523 + xy: 1883, 765 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 1515, 257 + xy: 2003, 745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate rotate: false - xy: 1269, 217 + xy: 2003, 643 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate-top rotate: false - xy: 1235, 149 + xy: 1969, 609 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 1269, 183 + xy: 2003, 609 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 1303, 217 + xy: 1101, 485 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 1235, 115 + xy: 1135, 485 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1608,126 +1608,126 @@ liquid-tank-top index: -1 mechanical-pump rotate: false - xy: 1337, 183 + xy: 1135, 383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-pump-liquid rotate: false - xy: 1371, 217 + xy: 1101, 315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-liquid rotate: false - xy: 1371, 217 + xy: 1101, 315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-liquid rotate: false - xy: 1371, 217 + xy: 1101, 315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 1337, 115 + xy: 1101, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 1371, 149 + xy: 1135, 247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 1337, 81 + xy: 1101, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 1371, 115 + xy: 1135, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-cap rotate: false - xy: 1269, 13 + xy: 1169, 421 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-0 rotate: false - xy: 1303, 13 + xy: 1169, 387 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-1 rotate: false - xy: 1337, 13 + xy: 1169, 353 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-2 rotate: false - xy: 1371, 13 + xy: 1169, 319 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-3 rotate: false - xy: 1405, 217 + xy: 1169, 285 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-4 rotate: false - xy: 1405, 183 + xy: 1169, 251 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 1405, 47 + xy: 1169, 115 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1405, 13 + xy: 1169, 81 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1439, 223 + xy: 1169, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 1439, 189 + xy: 1169, 13 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1748,7 +1748,7 @@ thermal-pump index: -1 battery rotate: false - xy: 1175, 481 + xy: 1599, 633 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1769,21 +1769,21 @@ battery-large-top index: -1 battery-top rotate: false - xy: 1175, 447 + xy: 2013, 1591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 1491, 783 + xy: 1067, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 1491, 749 + xy: 1067, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1811,28 +1811,28 @@ differential-generator-top index: -1 diode rotate: false - xy: 1437, 597 + xy: 1701, 607 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 diode-arrow rotate: false - xy: 1471, 597 + xy: 1719, 573 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator rotate: false - xy: 1447, 529 + xy: 1719, 505 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator-top rotate: false - xy: 1413, 461 + xy: 1753, 505 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1888,7 +1888,7 @@ impact-reactor-plasma-3 index: -1 power-node rotate: false - xy: 1405, 149 + xy: 1169, 217 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1902,14 +1902,14 @@ power-node-large index: -1 power-source rotate: false - xy: 1405, 115 + xy: 1169, 183 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 1405, 81 + xy: 1169, 149 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1923,14 +1923,14 @@ rtg-generator index: -1 rtg-generator-top rotate: false - xy: 1473, 155 + xy: 1271, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 1473, 19 + xy: 1237, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2119,21 +2119,21 @@ graphite-press index: -1 incinerator rotate: false - xy: 1447, 495 + xy: 1685, 498 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 1515, 427 + xy: 1541, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 1379, 251 + xy: 1969, 745 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2161,21 +2161,21 @@ silicon-smelter-top index: -1 liquid-source rotate: false - xy: 1337, 217 + xy: 1135, 451 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-void rotate: false - xy: 1235, 81 + xy: 1101, 383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 1269, 81 + xy: 1135, 349 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2224,14 +2224,14 @@ plastanium-compressor-top index: -1 pulverizer rotate: false - xy: 1473, 223 + xy: 1203, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 1439, 155 + xy: 1203, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2329,77 +2329,77 @@ spore-press-top index: -1 rock1 rotate: false - xy: 1157, 729 + xy: 1507, 667 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rock2 rotate: false - xy: 1157, 679 + xy: 1557, 667 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-boulder1 rotate: false - xy: 1507, 189 + xy: 1203, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-boulder2 rotate: false - xy: 1439, 87 + xy: 1237, 361 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder1 rotate: false - xy: 1439, 19 + xy: 1305, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder2 rotate: false - xy: 1473, 53 + xy: 1339, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrock1 rotate: false - xy: 1207, 767 + xy: 1607, 667 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snowrock2 rotate: false - xy: 1307, 817 + xy: 1657, 818 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-cluster1 rotate: false - xy: 1133, 335 + xy: 847, 5 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster2 rotate: false - xy: 1133, 293 + xy: 889, 5 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster3 rotate: false - xy: 1191, 583 + xy: 1183, 625 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -2448,14 +2448,14 @@ core-shard-team index: -1 unloader rotate: false - xy: 1933, 791 + xy: 1509, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader-center rotate: false - xy: 1899, 723 + xy: 1203, 89 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2469,14 +2469,14 @@ vault index: -1 arc-heat rotate: false - xy: 1017, 1 + xy: 473, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-1 rotate: false - xy: 1175, 413 + xy: 2005, 1557 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2504,7 +2504,7 @@ block-4 index: -1 hail-heat rotate: false - xy: 1159, 1 + xy: 1057, 649 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -2553,7 +2553,7 @@ salvo-panel-right index: -1 scorch-heat rotate: false - xy: 1507, 155 + xy: 1305, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2665,7 +2665,7 @@ rally-point index: -1 repair-point-base rotate: false - xy: 1507, 223 + xy: 1203, 361 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2679,7 +2679,7 @@ resupply-point index: -1 copper-wall rotate: false - xy: 849, 13 + xy: 1413, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2693,7 +2693,7 @@ copper-wall-large index: -1 door rotate: false - xy: 1413, 563 + xy: 1719, 539 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2714,14 +2714,14 @@ door-large-open index: -1 door-open rotate: false - xy: 1413, 529 + xy: 1735, 607 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 1235, 47 + xy: 1101, 77 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2735,7 +2735,7 @@ phase-wall-large index: -1 plastanium-wall rotate: false - xy: 1235, 13 + xy: 1169, 455 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2798,35 +2798,35 @@ scrap-wall-large4 index: -1 scrap-wall2 rotate: false - xy: 1439, 53 + xy: 1203, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 1473, 87 + xy: 1237, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 1507, 121 + xy: 1271, 361 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 1507, 121 + xy: 1271, 361 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 569, 1401 + xy: 1271, 259 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2840,7 +2840,7 @@ surge-wall-large index: -1 thorium-wall rotate: false - xy: 1661, 791 + xy: 1305, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2861,7 +2861,7 @@ thruster index: -1 titanium-wall rotate: false - xy: 1899, 791 + xy: 1407, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2903,21 +2903,21 @@ circle-end index: -1 circle-mid rotate: false - xy: 1549, 522 + xy: 1787, 456 size: 1, 199 orig: 1, 199 offset: 0, 0 index: -1 error rotate: false - xy: 983, 285 + xy: 1017, 35 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 laser rotate: false - xy: 157, 1027 + xy: 2043, 945 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -2931,7 +2931,7 @@ laser-end index: -1 minelaser rotate: false - xy: 715, 1435 + xy: 157, 1027 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -2959,7 +2959,7 @@ missile-back index: -1 parallax-laser rotate: false - xy: 1123, 1097 + xy: 255, 55 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -2973,7 +2973,7 @@ parallax-laser-end index: -1 particle rotate: false - xy: 1133, 377 + xy: 805, 5 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -3001,14 +3001,14 @@ shell-back index: -1 transfer rotate: false - xy: 721, 1435 + xy: 715, 1435 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 1865, 723 + xy: 1441, 361 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3085,7 +3085,7 @@ block-air-factory-full index: -1 block-arc-full rotate: false - xy: 1175, 379 + xy: 2005, 1523 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3099,35 +3099,35 @@ block-blast-drill-full index: -1 block-char-full rotate: false - xy: 1175, 311 + xy: 2005, 1455 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cliffs-full rotate: false - xy: 1209, 549 + xy: 2005, 1421 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conduit-full rotate: false - xy: 1209, 515 + xy: 1183, 591 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conveyor-full rotate: false - xy: 1209, 481 + xy: 207, 5 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 1209, 481 + xy: 207, 5 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3148,7 +3148,7 @@ block-core-shard-full index: -1 block-craters-full rotate: false - xy: 1209, 447 + xy: 1175, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3176,28 +3176,28 @@ block-cyclone-full index: -1 block-dark-metal-full rotate: false - xy: 1209, 413 + xy: 1633, 633 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-full rotate: false - xy: 1209, 379 + xy: 1667, 634 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dunerocks-full rotate: false - xy: 1209, 345 + xy: 1757, 657 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-duo-full rotate: false - xy: 1209, 311 + xy: 1133, 519 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3211,7 +3211,7 @@ block-fuse-full index: -1 block-grass-full rotate: false - xy: 1243, 557 + xy: 1799, 741 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3225,49 +3225,49 @@ block-ground-factory-full index: -1 block-hail-full rotate: false - xy: 1243, 523 + xy: 1799, 707 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-holostone-full rotate: false - xy: 1277, 557 + xy: 1799, 673 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hotrock-full rotate: false - xy: 1243, 489 + xy: 1849, 791 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-full rotate: false - xy: 1277, 523 + xy: 1883, 799 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-snow-full rotate: false - xy: 1311, 557 + xy: 1917, 799 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icerocks-full rotate: false - xy: 1243, 455 + xy: 1225, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ignarock-full rotate: false - xy: 1277, 489 + xy: 1259, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3295,7 +3295,7 @@ block-laser-drill-full index: -1 block-liquid-router-full rotate: false - xy: 1311, 523 + xy: 1293, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3309,7 +3309,7 @@ block-liquid-tank-full index: -1 block-magmarock-full rotate: false - xy: 1243, 421 + xy: 1327, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3351,14 +3351,14 @@ block-meltdown-full index: -1 block-metal-floor-damaged-full rotate: false - xy: 1277, 455 + xy: 1361, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-moss-full rotate: false - xy: 1243, 387 + xy: 1429, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3379,42 +3379,42 @@ block-oil-extractor-full index: -1 block-ore-coal-full rotate: false - xy: 1277, 421 + xy: 1463, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-copper-full rotate: false - xy: 1311, 455 + xy: 1497, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-lead-full rotate: false - xy: 1243, 353 + xy: 1531, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-scrap-full rotate: false - xy: 1277, 387 + xy: 1565, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-thorium-full rotate: false - xy: 1311, 421 + xy: 1599, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-titanium-full rotate: false - xy: 1243, 319 + xy: 1633, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3442,7 +3442,7 @@ payload-router-icon index: -1 block-pebbles-full rotate: false - xy: 1277, 353 + xy: 1667, 600 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3456,7 +3456,7 @@ block-phase-weaver-full index: -1 block-plated-conduit-full rotate: false - xy: 1311, 387 + xy: 1209, 557 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3470,21 +3470,21 @@ block-pneumatic-drill-full index: -1 block-pulse-conduit-full rotate: false - xy: 1277, 319 + xy: 1243, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pulverizer-full rotate: false - xy: 1311, 353 + xy: 1277, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-repair-point-full rotate: false - xy: 1311, 319 + xy: 1311, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3498,21 +3498,21 @@ block-ripple-full index: -1 block-rock-full rotate: false - xy: 1049, 593 + xy: 983, 435 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-rocks-full rotate: false - xy: 1345, 557 + xy: 1345, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-saltrocks-full rotate: false - xy: 1345, 523 + xy: 1379, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3526,21 +3526,21 @@ block-salvo-full index: -1 block-sand-boulder-full rotate: false - xy: 1345, 489 + xy: 1413, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-full rotate: false - xy: 1345, 455 + xy: 1447, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sandrocks-full rotate: false - xy: 1345, 421 + xy: 1481, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3554,21 +3554,21 @@ block-scatter-full index: -1 block-scorch-full rotate: false - xy: 1345, 387 + xy: 1515, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-full rotate: false - xy: 1345, 353 + xy: 1549, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall1 rotate: false - xy: 1345, 353 + xy: 1549, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3603,49 +3603,49 @@ block-segment-full index: -1 block-shale-boulder-full rotate: false - xy: 1175, 277 + xy: 1617, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-full rotate: false - xy: 1209, 277 + xy: 1651, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shalerocks-full rotate: false - xy: 1243, 285 + xy: 1685, 566 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shrubs-full rotate: false - xy: 1277, 285 + xy: 1033, 509 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-full rotate: false - xy: 1311, 285 + xy: 1067, 509 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snowrock-full rotate: false - xy: 1033, 543 + xy: 983, 385 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-snowrocks-full rotate: false - xy: 1345, 285 + xy: 1033, 475 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3666,7 +3666,7 @@ block-spore-cluster-full index: -1 block-spore-moss-full rotate: false - xy: 1167, 243 + xy: 1067, 475 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3680,14 +3680,14 @@ block-spore-press-full index: -1 block-sporerocks-full rotate: false - xy: 1201, 243 + xy: 1033, 441 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-stone-full rotate: false - xy: 1167, 209 + xy: 1067, 441 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3701,21 +3701,21 @@ block-swarmer-full index: -1 block-tendrils-full rotate: false - xy: 1201, 209 + xy: 1033, 407 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-titanium-conveyor-full rotate: false - xy: 1167, 175 + xy: 1067, 407 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 1167, 175 + xy: 1067, 407 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3806,56 +3806,56 @@ core-shard-team-sharded index: -1 cracks-1-0 rotate: false - xy: 883, 13 + xy: 1447, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-1 rotate: false - xy: 917, 13 + xy: 1481, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-2 rotate: false - xy: 1409, 665 + xy: 1515, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-3 rotate: false - xy: 1443, 665 + xy: 1549, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-4 rotate: false - xy: 1477, 665 + xy: 1583, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-5 rotate: false - xy: 1409, 631 + xy: 1617, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-6 rotate: false - xy: 1443, 631 + xy: 1651, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-7 rotate: false - xy: 1477, 631 + xy: 1685, 532 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4086,21 +4086,21 @@ cracks-5-7 index: -1 crawler-wreck0 rotate: false - xy: 983, 435 + xy: 983, 285 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-wreck1 rotate: false - xy: 1033, 443 + xy: 967, 235 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-wreck2 rotate: false - xy: 983, 385 + xy: 967, 185 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4114,28 +4114,28 @@ cyclone index: -1 dagger-wreck0 rotate: false - xy: 1033, 343 + xy: 1017, 235 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-wreck1 rotate: false - xy: 1083, 393 + xy: 1017, 185 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-wreck2 rotate: false - xy: 1083, 343 + xy: 1017, 135 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 duo rotate: false - xy: 1447, 563 + xy: 1753, 573 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4161,6 +4161,27 @@ eruptor-wreck2 orig: 88, 64 offset: 0, 0 index: -1 +flare-wreck0 + rotate: false + xy: 1107, 791 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +flare-wreck1 + rotate: false + xy: 1057, 691 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +flare-wreck2 + rotate: false + xy: 1107, 741 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 fortress-wreck0 rotate: false xy: 1097, 1707 @@ -4210,44 +4231,44 @@ gamma-wreck2 orig: 56, 56 offset: 0, 0 index: -1 -ghoul-wreck0 +hail + rotate: false + xy: 1753, 539 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +horizon-wreck0 rotate: false xy: 1049, 1073 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 -ghoul-wreck1 +horizon-wreck1 rotate: false xy: 1205, 1143 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 -ghoul-wreck2 +horizon-wreck2 rotate: false xy: 681, 907 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 -hail - rotate: false - xy: 1413, 495 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 item-blast-compound-large rotate: false - xy: 1989, 1201 + xy: 1099, 649 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-blast-compound-medium rotate: false - xy: 1413, 393 + xy: 1201, 489 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4268,21 +4289,21 @@ item-blast-compound-tiny index: -1 item-blast-compound-xlarge rotate: false - xy: 1017, 185 + xy: 1157, 729 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-coal-large rotate: false - xy: 1407, 775 + xy: 1757, 733 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-coal-medium rotate: false - xy: 1413, 359 + xy: 1269, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4296,98 +4317,98 @@ item-coal-small index: -1 item-coal-tiny rotate: false - xy: 2031, 1013 + xy: 2031, 1225 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-coal-xlarge rotate: false - xy: 967, 77 + xy: 1157, 679 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-copper-large rotate: false - xy: 1507, 825 + xy: 1807, 783 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-copper-medium rotate: false - xy: 1413, 325 + xy: 1337, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper-small rotate: false - xy: 131, 1051 + xy: 1203, 463 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-copper-tiny rotate: false - xy: 2031, 1225 + xy: 1959, 981 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-copper-xlarge rotate: false - xy: 1017, 135 + xy: 1207, 817 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-graphite-large rotate: false - xy: 1357, 675 + xy: 1857, 833 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-graphite-medium rotate: false - xy: 1413, 291 + xy: 1405, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite-small rotate: false - xy: 1085, 9 + xy: 131, 1051 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-graphite-tiny rotate: false - xy: 1959, 981 + xy: 2031, 1013 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-graphite-xlarge rotate: false - xy: 1017, 85 + xy: 1207, 767 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-lead-large rotate: false - xy: 1407, 733 + xy: 1757, 691 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-lead-medium rotate: false - xy: 1447, 291 + xy: 1473, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4401,28 +4422,28 @@ item-lead-small index: -1 item-lead-tiny rotate: false - xy: 2031, 995 + xy: 2031, 1207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-lead-xlarge rotate: false - xy: 967, 27 + xy: 1257, 817 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-metaglass-large rotate: false - xy: 1449, 775 + xy: 1899, 833 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-metaglass-medium rotate: false - xy: 1481, 529 + xy: 1541, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4436,28 +4457,28 @@ item-metaglass-small index: -1 item-metaglass-tiny rotate: false - xy: 2031, 1207 + xy: 2031, 995 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-metaglass-xlarge rotate: false - xy: 1017, 35 + xy: 1207, 717 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-phase-fabric-large rotate: false - xy: 1549, 825 + xy: 1941, 833 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-phase-fabric-medium rotate: false - xy: 1481, 461 + xy: 1609, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4471,329 +4492,329 @@ item-phase-fabric-small index: -1 item-phase-fabric-tiny rotate: false - xy: 2031, 977 + xy: 2031, 1403 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-phase-fabric-xlarge rotate: false - xy: 1067, 235 + xy: 1257, 767 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-plastanium-large rotate: false - xy: 1449, 733 + xy: 1099, 607 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-plastanium-medium rotate: false - xy: 1481, 393 + xy: 1235, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium-small rotate: false - xy: 1167, 47 + xy: 1067, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-plastanium-tiny rotate: false - xy: 2031, 1403 + xy: 927, 1607 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-plastanium-xlarge rotate: false - xy: 1067, 185 + xy: 1307, 817 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-pyratite-large rotate: false - xy: 1207, 625 + xy: 1141, 637 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-pyratite-medium rotate: false - xy: 1481, 325 + xy: 1303, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite-small rotate: false - xy: 1933, 765 + xy: 1169, 493 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-pyratite-tiny rotate: false - xy: 1439, 1 + xy: 1319, 1591 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-pyratite-xlarge rotate: false - xy: 1067, 135 + xy: 1257, 717 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-sand-large rotate: false - xy: 1249, 625 + xy: 1141, 595 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-sand-medium rotate: false - xy: 1505, 597 + xy: 1371, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand-small rotate: false - xy: 1967, 799 + xy: 1237, 131 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-sand-tiny rotate: false - xy: 1457, 1 + xy: 885, 1313 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-sand-xlarge rotate: false - xy: 1067, 85 + xy: 1307, 767 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-scrap-large rotate: false - xy: 1291, 625 + xy: 1133, 553 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-scrap-medium rotate: false - xy: 1515, 529 + xy: 1439, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap-small rotate: false - xy: 131, 1025 + xy: 1271, 165 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-scrap-tiny rotate: false - xy: 1475, 1 + xy: 1279, 1199 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-scrap-xlarge rotate: false - xy: 1067, 35 + xy: 1357, 817 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-silicon-large rotate: false - xy: 1591, 825 + xy: 2005, 1159 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-silicon-medium rotate: false - xy: 1515, 461 + xy: 1507, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon-small rotate: false - xy: 1933, 739 + xy: 1305, 199 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-silicon-tiny rotate: false - xy: 1493, 1 + xy: 1167, 1013 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-silicon-xlarge rotate: false - xy: 1117, 243 + xy: 1307, 717 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-spore-pod-large rotate: false - xy: 1633, 826 + xy: 1959, 939 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-spore-pod-medium rotate: false - xy: 1515, 359 + xy: 1609, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod-small rotate: false - xy: 951, 1 + xy: 1339, 233 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-tiny rotate: false - xy: 1511, 1 + xy: 237, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-spore-pod-xlarge rotate: false - xy: 1117, 193 + xy: 1357, 767 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-surge-alloy-large rotate: false - xy: 1333, 625 + xy: 2001, 939 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-surge-alloy-medium rotate: false - xy: 1515, 291 + xy: 1677, 464 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy-small rotate: false - xy: 977, 1 + xy: 1373, 267 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-tiny rotate: false - xy: 1529, 1 + xy: 1033, 287 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-surge-alloy-xlarge rotate: false - xy: 1117, 143 + xy: 1407, 817 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-thorium-large rotate: false - xy: 2005, 1159 + xy: 1984, 897 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-thorium-medium rotate: false - xy: 1277, 251 + xy: 569, 1401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium-small rotate: false - xy: 317, 1281 + xy: 1407, 301 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-thorium-tiny rotate: false - xy: 1547, 1 + xy: 569, 1383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-thorium-xlarge rotate: false - xy: 1117, 93 + xy: 1357, 717 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-titanium-large rotate: false - xy: 1149, 587 + xy: 1984, 855 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-titanium-medium rotate: false - xy: 1345, 251 + xy: 1985, 779 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium-small rotate: false - xy: 343, 1281 + xy: 1441, 335 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-tiny rotate: false - xy: 1565, 1 + xy: 1951, 815 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-titanium-xlarge rotate: false - xy: 1117, 43 + xy: 1407, 767 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4807,140 +4828,140 @@ lancer index: -1 liquid-cryofluid-large rotate: false - xy: 1133, 545 + xy: 1983, 813 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-cryofluid-medium rotate: false - xy: 1481, 257 + xy: 1969, 643 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid-small rotate: false - xy: 369, 1281 + xy: 1475, 369 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-cryofluid-tiny rotate: false - xy: 927, 1607 + xy: 1101, 525 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-cryofluid-xlarge rotate: false - xy: 1794, 825 + xy: 1407, 717 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-oil-large rotate: false - xy: 1133, 503 + xy: 679, 5 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-oil-medium rotate: false - xy: 1235, 183 + xy: 2003, 677 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil-small rotate: false - xy: 641, 1605 + xy: 1509, 403 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-oil-tiny rotate: false - xy: 1319, 1591 + xy: 869, 1771 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-oil-xlarge rotate: false - xy: 1844, 825 + xy: 1457, 767 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-slag-large rotate: false - xy: 1133, 461 + xy: 721, 5 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-slag-medium rotate: false - xy: 1303, 183 + xy: 1101, 417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag-small rotate: false - xy: 667, 1605 + xy: 1543, 437 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-slag-tiny rotate: false - xy: 885, 1313 + xy: 689, 1343 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-slag-xlarge rotate: false - xy: 1894, 825 + xy: 1507, 817 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-water-large rotate: false - xy: 1133, 419 + xy: 763, 5 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 liquid-water-medium rotate: false - xy: 1303, 149 + xy: 1101, 349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water-small rotate: false - xy: 693, 1605 + xy: 1203, 63 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-water-tiny rotate: false - xy: 1279, 1199 + xy: 131, 1033 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-water-xlarge rotate: false - xy: 1944, 825 + xy: 1457, 717 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5003,21 +5024,21 @@ meltdown index: -1 mono-wreck0 rotate: false - xy: 1107, 799 + xy: 1557, 717 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-wreck1 rotate: false - xy: 1057, 699 + xy: 1207, 667 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-wreck2 rotate: false - xy: 1107, 749 + xy: 1257, 667 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5115,32 +5136,11 @@ quasar-wreck2 index: -1 repair-point rotate: false - xy: 1473, 189 + xy: 1237, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -revenant-wreck0 - rotate: false - xy: 261, 23 - size: 112, 112 - orig: 112, 112 - offset: 0, 0 - index: -1 -revenant-wreck1 - rotate: false - xy: 455, 1323 - size: 112, 112 - orig: 112, 112 - offset: 0, 0 - index: -1 -revenant-wreck2 - rotate: false - xy: 617, 1485 - size: 112, 112 - orig: 112, 112 - offset: 0, 0 - index: -1 ripple rotate: false xy: 1793, 1197 @@ -5164,7 +5164,7 @@ scatter index: -1 scorch rotate: false - xy: 1473, 121 + xy: 1271, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5185,84 +5185,84 @@ spectre index: -1 splash-0 rotate: false - xy: 1507, 19 + xy: 1305, 361 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-1 rotate: false - xy: 1541, 223 + xy: 1339, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-10 rotate: false - xy: 1627, 723 + xy: 1203, 191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-11 rotate: false - xy: 569, 1435 + xy: 1237, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-2 rotate: false - xy: 1541, 189 + xy: 1373, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-3 rotate: false - xy: 1541, 155 + xy: 1203, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-4 rotate: false - xy: 1541, 121 + xy: 1237, 259 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-5 rotate: false - xy: 1541, 87 + xy: 1271, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-6 rotate: false - xy: 1541, 53 + xy: 1305, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-7 rotate: false - xy: 1541, 19 + xy: 1339, 361 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-8 rotate: false - xy: 1627, 791 + xy: 1373, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-9 rotate: false - xy: 1627, 757 + xy: 1407, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5276,14 +5276,14 @@ swarmer index: -1 unit-alpha-full rotate: false - xy: 1207, 717 + xy: 1657, 768 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-beta-full rotate: false - xy: 1257, 767 + xy: 1657, 718 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5297,14 +5297,14 @@ unit-cix-full index: -1 unit-crawler-full rotate: false - xy: 1357, 817 + xy: 1657, 668 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-dagger-full rotate: false - xy: 1207, 667 + xy: 1707, 825 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5316,6 +5316,13 @@ unit-eruptor-full orig: 88, 64 offset: 0, 0 index: -1 +unit-flare-full + rotate: false + xy: 1707, 775 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 unit-fortress-full rotate: false xy: 893, 1625 @@ -5330,7 +5337,7 @@ unit-gamma-full orig: 56, 56 offset: 0, 0 index: -1 -unit-ghoul-full +unit-horizon-full rotate: false xy: 677, 611 size: 72, 72 @@ -5353,7 +5360,7 @@ unit-mega-full index: -1 unit-mono-full rotate: false - xy: 1257, 717 + xy: 1757, 825 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5386,20 +5393,13 @@ unit-quasar-full orig: 80, 80 offset: 0, 0 index: -1 -unit-revenant-full +unit-zenith-full rotate: false - xy: 779, 1647 + xy: 261, 251 size: 112, 112 orig: 112, 112 offset: 0, 0 index: -1 -unit-wraith-full - rotate: false - xy: 1307, 767 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 wave rotate: false xy: 1497, 867 @@ -5407,163 +5407,163 @@ wave orig: 64, 64 offset: 0, 0 index: -1 -wraith-wreck0 +zenith-wreck0 rotate: false - xy: 1457, 817 - size: 48, 48 - orig: 48, 48 + xy: 455, 1323 + size: 112, 112 + orig: 112, 112 offset: 0, 0 index: -1 -wraith-wreck1 +zenith-wreck1 rotate: false - xy: 1307, 667 - size: 48, 48 - orig: 48, 48 + xy: 617, 1485 + size: 112, 112 + orig: 112, 112 offset: 0, 0 index: -1 -wraith-wreck2 +zenith-wreck2 rotate: false - xy: 1357, 717 - size: 48, 48 - orig: 48, 48 + xy: 779, 1647 + size: 112, 112 + orig: 112, 112 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 1447, 461 + xy: 1753, 471 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 1447, 427 + xy: 1235, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 1447, 393 + xy: 1303, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 1447, 359 + xy: 1371, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 1447, 325 + xy: 1439, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 1481, 563 + xy: 1507, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 1481, 495 + xy: 1575, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 1481, 427 + xy: 1643, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 1481, 359 + xy: 1269, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 1481, 291 + xy: 1337, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 1515, 563 + xy: 1405, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 1515, 495 + xy: 1473, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod rotate: false - xy: 1515, 393 + xy: 1575, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 1515, 325 + xy: 1643, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 1243, 251 + xy: 569, 1435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 1311, 251 + xy: 1951, 779 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 1447, 257 + xy: 1969, 677 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 1235, 217 + xy: 2003, 711 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 1269, 149 + xy: 1101, 451 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 1269, 115 + xy: 1135, 417 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5598,14 +5598,14 @@ alpha-cell index: -1 beta rotate: false - xy: 931, 477 + xy: 983, 535 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 beta-cell rotate: false - xy: 983, 535 + xy: 981, 485 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5689,49 +5689,49 @@ cix-old index: -1 crawler rotate: false - xy: 1083, 543 + xy: 983, 335 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-base rotate: false - xy: 983, 485 + xy: 1049, 593 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-cell rotate: false - xy: 1033, 493 + xy: 1033, 543 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-leg rotate: false - xy: 1083, 493 + xy: 1083, 543 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger rotate: false - xy: 1033, 393 + xy: 967, 135 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 1083, 443 + xy: 967, 85 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 983, 335 + xy: 967, 35 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5787,7 +5787,7 @@ eruptor-cell index: -1 eruptor-foot rotate: false - xy: 1117, 1 + xy: 1989, 1201 size: 40, 40 orig: 40, 40 offset: 0, 0 @@ -5813,6 +5813,13 @@ eruptor-leg-base orig: 36, 26 offset: 0, 0 index: -1 +flare + rotate: false + xy: 1057, 741 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 fortress rotate: false xy: 893, 1707 @@ -5855,14 +5862,14 @@ gamma-cell orig: 56, 56 offset: 0, 0 index: -1 -ghoul +horizon rotate: false xy: 1131, 1237 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 -ghoul-cell +horizon-cell rotate: false xy: 1131, 1163 size: 72, 72 @@ -5913,14 +5920,14 @@ mega-cell index: -1 mono rotate: false - xy: 1057, 799 + xy: 1507, 717 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-cell rotate: false - xy: 1057, 749 + xy: 1557, 767 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5934,7 +5941,7 @@ nova index: -1 nova-base rotate: false - xy: 1107, 699 + xy: 1357, 667 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5948,7 +5955,7 @@ nova-cell index: -1 nova-leg rotate: false - xy: 1107, 649 + xy: 1407, 667 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5983,7 +5990,7 @@ pulsar index: -1 pulsar-base rotate: false - xy: 1099, 599 + xy: 1457, 667 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -6030,37 +6037,30 @@ quasar-leg orig: 80, 80 offset: 0, 0 index: -1 -revenant - rotate: false - xy: 261, 251 - size: 112, 112 - orig: 112, 112 - offset: 0, 0 - index: -1 -revenant-cell - rotate: false - xy: 261, 137 - size: 112, 112 - orig: 112, 112 - offset: 0, 0 - index: -1 vanguard rotate: false - xy: 1407, 817 + xy: 1707, 725 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 vanguard-cell rotate: false - xy: 1257, 667 + xy: 1757, 775 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +antumbra-missiles + rotate: false + xy: 933, 535 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 artillery rotate: false - xy: 933, 527 + xy: 931, 477 size: 48, 56 orig: 48, 56 offset: 0, 0 @@ -6079,6 +6079,13 @@ chaos orig: 56, 136 offset: 0, 0 index: -1 +eclipse-weapon + rotate: false + xy: 1017, 85 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 eradication rotate: false xy: 473, 133 @@ -6088,130 +6095,123 @@ eradication index: -1 eruption rotate: false - xy: 1033, 285 + xy: 1057, 841 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 flakgun rotate: false - xy: 1083, 293 + xy: 1057, 791 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flamethrower rotate: false - xy: 967, 227 + xy: 1107, 841 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 heal-shotgun-weapon rotate: false - xy: 967, 177 + xy: 1107, 691 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 heal-weapon rotate: false - xy: 1017, 235 + xy: 1157, 829 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 heal-weapon-mount rotate: false - xy: 967, 127 + xy: 1157, 779 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 large-weapon rotate: false - xy: 1694, 825 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -lich-missiles - rotate: false - xy: 1744, 825 + xy: 1457, 817 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles rotate: false - xy: 1057, 849 + xy: 1507, 767 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles-mount rotate: false - xy: 1107, 849 + xy: 1557, 817 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mount-weapon rotate: false - xy: 1057, 649 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -reaper-weapon - rotate: false - xy: 1157, 829 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -revenant-missiles - rotate: false - xy: 1157, 779 + xy: 1307, 667 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-basic-weapon rotate: false - xy: 1157, 629 + xy: 1607, 817 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-mount-weapon rotate: false - xy: 1207, 817 + xy: 1607, 767 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-weapon rotate: false - xy: 1257, 817 + xy: 1607, 717 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 weapon rotate: false - xy: 1307, 717 + xy: 1807, 825 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -wraith +zenith-missiles rotate: false - xy: 1357, 767 + xy: 1707, 675 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 +zenith + rotate: false + xy: 261, 137 + size: 112, 112 + orig: 112, 112 + offset: 0, 0 + index: -1 +zenith-cell + rotate: false + xy: 261, 23 + size: 112, 112 + orig: 112, 112 + offset: 0, 0 + index: -1 sprites3.png size: 2048,1024 diff --git a/core/assets/sprites/fallback/sprites.png b/core/assets/sprites/fallback/sprites.png index de40a9670b..fdea4d65dd 100644 Binary files a/core/assets/sprites/fallback/sprites.png and b/core/assets/sprites/fallback/sprites.png differ diff --git a/core/assets/sprites/fallback/sprites2.png b/core/assets/sprites/fallback/sprites2.png index 1a843b13d0..87ea4bccc2 100644 Binary files a/core/assets/sprites/fallback/sprites2.png and b/core/assets/sprites/fallback/sprites2.png differ diff --git a/core/assets/sprites/fallback/sprites3.png b/core/assets/sprites/fallback/sprites3.png index 8228c88313..809e26c5ed 100644 Binary files a/core/assets/sprites/fallback/sprites3.png and b/core/assets/sprites/fallback/sprites3.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 13d26d4ee9..356426471c 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -104,14 +104,14 @@ mend-projector-top index: -1 mender rotate: false - xy: 3414, 273 + xy: 2802, 167 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mender-top rotate: false - xy: 3244, 213 + xy: 2836, 159 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -132,7 +132,7 @@ overdrive-projector-top index: -1 shock-mine rotate: false - xy: 3618, 155 + xy: 3647, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -153,35 +153,35 @@ block-unloader index: -1 bridge-arrow rotate: false - xy: 3991, 971 + xy: 2778, 303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 2391, 193 + xy: 2812, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 2425, 193 + xy: 2846, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 2459, 193 + xy: 2880, 287 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 center rotate: false - xy: 2493, 193 + xy: 2914, 287 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -286,364 +286,364 @@ armored-conveyor-3-0 index: -1 armored-conveyor-3-1 rotate: false - xy: 4061, 1981 + xy: 2608, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-2 rotate: false - xy: 4061, 1947 + xy: 4061, 1981 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-3-3 rotate: false - xy: 4061, 1913 + xy: 2642, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-0 rotate: false - xy: 4061, 1879 + xy: 4061, 1947 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-1 rotate: false - xy: 4061, 1845 + xy: 4061, 1913 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-2 rotate: false - xy: 4061, 1811 + xy: 4061, 1879 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 armored-conveyor-4-3 rotate: false - xy: 4063, 1777 + xy: 4061, 1845 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 2726, 349 + xy: 3843, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 2760, 349 + xy: 3809, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 2794, 353 + xy: 3775, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 2828, 353 + xy: 3877, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 2862, 353 + xy: 3843, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 2896, 353 + xy: 3809, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 2930, 353 + xy: 3911, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 2734, 315 + xy: 3877, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 2734, 281 + xy: 3843, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 2768, 315 + xy: 3911, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 2768, 281 + xy: 3877, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 2802, 319 + xy: 3911, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 2836, 319 + xy: 3741, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 2802, 285 + xy: 3775, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 2870, 319 + xy: 3809, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 2836, 285 + xy: 3843, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 2904, 319 + xy: 3877, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 2870, 285 + xy: 3911, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 2904, 285 + xy: 3945, 1005 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor rotate: false - xy: 3278, 179 + xy: 2765, 133 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-0 rotate: false - xy: 3312, 171 + xy: 2799, 133 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-1 rotate: false - xy: 3346, 171 + xy: 2833, 125 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-2 rotate: false - xy: 3380, 171 + xy: 2867, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-edge rotate: false - xy: 3414, 171 + xy: 2901, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-conveyor-stack rotate: false - xy: 3448, 231 + xy: 2935, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 2765, 111 + xy: 3679, 783 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 2802, 183 + xy: 3645, 749 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 2836, 183 + xy: 3679, 749 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 2870, 183 + xy: 3647, 715 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 2904, 183 + xy: 3647, 681 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 2938, 183 + xy: 3681, 715 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 2972, 183 + xy: 3681, 681 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 2799, 149 + xy: 3666, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 2833, 149 + xy: 3666, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 2799, 115 + xy: 3666, 579 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 2867, 149 + xy: 3666, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 2833, 115 + xy: 3700, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 2901, 149 + xy: 3700, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 2867, 115 + xy: 3700, 579 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 2935, 149 + xy: 3700, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 2901, 115 + xy: 3710, 511 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 2969, 149 + xy: 3715, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 2935, 115 + xy: 3749, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 2969, 115 + xy: 3715, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cross rotate: false - xy: 2700, 235 + xy: 2323, 223 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -657,14 +657,14 @@ distributor index: -1 inverted-sorter rotate: false - xy: 2870, 217 + xy: 2391, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction rotate: false - xy: 3176, 311 + xy: 2802, 201 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -706,7 +706,7 @@ mass-driver-base index: -1 overflow-gate rotate: false - xy: 3312, 239 + xy: 2904, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -734,49 +734,49 @@ payload-router-over index: -1 phase-conveyor rotate: false - xy: 3346, 205 + xy: 2595, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 3380, 205 + xy: 2629, 167 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 3414, 205 + xy: 2663, 167 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 3210, 187 + xy: 2697, 141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 3312, 137 + xy: 2867, 49 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 3652, 155 + xy: 3681, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 underflow-gate rotate: false - xy: 3003, 141 + xy: 3715, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -951,35 +951,35 @@ water-extractor-top index: -1 block-border rotate: false - xy: 4063, 1607 + xy: 4063, 1675 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-middle rotate: false - xy: 2323, 257 + xy: 3616, 205 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-select rotate: false - xy: 2527, 227 + xy: 3673, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 2595, 231 + xy: 3741, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 message rotate: false - xy: 3278, 213 + xy: 2870, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -993,161 +993,161 @@ place-arrow index: -1 bridge-conduit rotate: false - xy: 4025, 971 + xy: 2812, 303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 4059, 997 + xy: 2846, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 4059, 997 + xy: 2846, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 4059, 963 + xy: 2744, 281 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 2357, 193 + xy: 2778, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 2598, 265 + xy: 2880, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 2632, 265 + xy: 2914, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 2666, 265 + xy: 2948, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 2700, 269 + xy: 2982, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 2700, 269 + xy: 2982, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 2700, 269 + xy: 2982, 253 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 2595, 197 + xy: 3775, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 2629, 231 + xy: 3741, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 2629, 197 + xy: 3809, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 2663, 231 + xy: 3775, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 2663, 231 + xy: 3775, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 2663, 197 + xy: 3741, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 3176, 243 + xy: 2870, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate rotate: false - xy: 3210, 255 + xy: 2972, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-overflow-gate-top rotate: false - xy: 3108, 209 + xy: 2870, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 3142, 209 + xy: 2904, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 3176, 209 + xy: 2938, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 3210, 221 + xy: 2972, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1175,126 +1175,126 @@ liquid-tank-top index: -1 mechanical-pump rotate: false - xy: 3312, 273 + xy: 2663, 201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-pump-liquid rotate: false - xy: 3346, 273 + xy: 2734, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-liquid rotate: false - xy: 3346, 273 + xy: 2734, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-liquid rotate: false - xy: 3346, 273 + xy: 2734, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 3346, 239 + xy: 2938, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 3380, 239 + xy: 2972, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 3414, 239 + xy: 3006, 151 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 3312, 205 + xy: 2697, 175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-cap rotate: false - xy: 3482, 231 + xy: 3003, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-0 rotate: false - xy: 3482, 197 + xy: 2731, 111 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-1 rotate: false - xy: 3516, 231 + xy: 2765, 99 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-2 rotate: false - xy: 3516, 197 + xy: 2799, 99 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-3 rotate: false - xy: 3550, 231 + xy: 2833, 91 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plated-conduit-top-4 rotate: false - xy: 3550, 197 + xy: 2867, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 3550, 163 + xy: 3003, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 3074, 183 + xy: 2629, 133 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 3108, 175 + xy: 2663, 133 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 3142, 175 + xy: 2697, 107 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1315,7 +1315,7 @@ thermal-pump index: -1 battery rotate: false - xy: 4063, 1743 + xy: 4061, 1811 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1336,21 +1336,21 @@ battery-large-top index: -1 battery-top rotate: false - xy: 4063, 1709 + xy: 4063, 1777 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 2527, 193 + xy: 2948, 287 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 2561, 193 + xy: 2982, 287 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1378,28 +1378,28 @@ differential-generator-top index: -1 diode rotate: false - xy: 2697, 201 + xy: 2322, 189 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 diode-arrow rotate: false - xy: 2964, 353 + xy: 2360, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator rotate: false - xy: 2768, 213 + xy: 2530, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 illuminator-top rotate: false - xy: 2802, 217 + xy: 2357, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1455,7 +1455,7 @@ impact-reactor-plasma-3 index: -1 power-node rotate: false - xy: 3448, 163 + xy: 2901, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1469,14 +1469,14 @@ power-node-large index: -1 power-source rotate: false - xy: 3482, 163 + xy: 2935, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 3516, 163 + xy: 2969, 83 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1490,14 +1490,14 @@ rtg-generator index: -1 rtg-generator-top rotate: false - xy: 3346, 137 + xy: 2901, 49 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 3652, 189 + xy: 3613, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1686,21 +1686,21 @@ graphite-press index: -1 incinerator rotate: false - xy: 2836, 217 + xy: 2357, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 3074, 251 + xy: 2666, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 3142, 277 + xy: 2768, 201 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1728,21 +1728,21 @@ silicon-smelter-top index: -1 liquid-source rotate: false - xy: 3244, 281 + xy: 2632, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-void rotate: false - xy: 3278, 281 + xy: 2666, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 3380, 273 + xy: 2768, 167 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1791,14 +1791,14 @@ plastanium-compressor-top index: -1 pulverizer rotate: false - xy: 3176, 175 + xy: 2731, 77 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 3210, 153 + xy: 2765, 65 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1896,56 +1896,56 @@ spore-press-top index: -1 rock1 rotate: false - xy: 2848, 421 + xy: 2948, 321 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rock2 rotate: false - xy: 2898, 421 + xy: 2998, 321 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-boulder1 rotate: false - xy: 3380, 137 + xy: 2935, 49 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-boulder2 rotate: false - xy: 3414, 137 + xy: 2969, 49 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder1 rotate: false - xy: 3584, 155 + xy: 3579, 828 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder2 rotate: false - xy: 3618, 189 + xy: 3613, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrock1 rotate: false - xy: 3605, 1102 + xy: 3198, 279 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snowrock2 rotate: false - xy: 3605, 1052 + xy: 3248, 257 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -2036,14 +2036,14 @@ core-shard-team index: -1 unloader rotate: false - xy: 3037, 141 + xy: 3817, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader-center rotate: false - xy: 3003, 107 + xy: 3783, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2064,7 +2064,7 @@ arc-heat index: -1 block-1 rotate: false - xy: 4063, 1675 + xy: 4063, 1743 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2141,7 +2141,7 @@ salvo-panel-right index: -1 scorch-heat rotate: false - xy: 3482, 129 + xy: 3579, 964 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2295,7 +2295,7 @@ rally-point index: -1 repair-point-base rotate: false - xy: 3278, 145 + xy: 2833, 57 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2323,7 +2323,7 @@ tetrative-reconstructor-top index: -1 copper-wall rotate: false - xy: 2938, 319 + xy: 3979, 1005 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2337,7 +2337,7 @@ copper-wall-large index: -1 door rotate: false - xy: 2972, 319 + xy: 2394, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2358,14 +2358,14 @@ door-large-open index: -1 door-open rotate: false - xy: 2972, 285 + xy: 2428, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 3244, 179 + xy: 2731, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2379,7 +2379,7 @@ phase-wall-large index: -1 plastanium-wall rotate: false - xy: 3448, 197 + xy: 2969, 117 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2442,35 +2442,35 @@ scrap-wall-large4 index: -1 scrap-wall2 rotate: false - xy: 3516, 129 + xy: 3579, 930 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 3550, 129 + xy: 3579, 896 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 3584, 189 + xy: 3579, 862 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 3584, 189 + xy: 3579, 862 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 2697, 133 + xy: 3611, 749 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2484,7 +2484,7 @@ surge-wall-large index: -1 thorium-wall rotate: false - xy: 2731, 111 + xy: 3645, 783 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2505,7 +2505,7 @@ thruster index: -1 titanium-wall rotate: false - xy: 3006, 175 + xy: 3783, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2561,7 +2561,7 @@ circle-shadow index: -1 error rotate: false - xy: 3162, 379 + xy: 2748, 417 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -2596,14 +2596,14 @@ minelaser-end index: -1 missile rotate: false - xy: 1903, 117 + xy: 3598, 377 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 missile-back rotate: false - xy: 2570, 333 + xy: 3648, 335 size: 36, 36 orig: 36, 36 offset: 0, 0 @@ -2638,14 +2638,14 @@ scale_marker index: -1 shell rotate: false - xy: 2608, 333 + xy: 1903, 117 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shell-back rotate: false - xy: 2646, 333 + xy: 2570, 333 size: 36, 36 orig: 36, 36 offset: 0, 0 @@ -2659,7 +2659,7 @@ transfer index: -1 transfer-arrow rotate: false - xy: 3040, 175 + xy: 3749, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2692,6 +2692,27 @@ alpha-wreck2 orig: 48, 48 offset: 0, 0 index: -1 +antumbra-wreck0 + rotate: false + xy: 509, 389 + size: 216, 240 + orig: 216, 240 + offset: 0, 0 + index: -1 +antumbra-wreck1 + rotate: false + xy: 509, 147 + size: 216, 240 + orig: 216, 240 + offset: 0, 0 + index: -1 +antumbra-wreck2 + rotate: false + xy: 291, 35 + size: 216, 240 + orig: 216, 240 + offset: 0, 0 + index: -1 arc rotate: false xy: 269, 1 @@ -2701,21 +2722,21 @@ arc index: -1 beta-wreck0 rotate: false - xy: 2248, 409 + xy: 3486, 415 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 beta-wreck1 rotate: false - xy: 3486, 415 + xy: 3536, 415 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 beta-wreck2 rotate: false - xy: 3536, 415 + xy: 3586, 415 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -2736,7 +2757,7 @@ block-air-factory-full index: -1 block-arc-full rotate: false - xy: 4063, 1641 + xy: 4063, 1709 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2750,35 +2771,35 @@ block-blast-drill-full index: -1 block-char-full rotate: false - xy: 3519, 1163 + xy: 4063, 1641 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-cliffs-full rotate: false - xy: 3553, 1168 + xy: 4063, 1607 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conduit-full rotate: false - xy: 3855, 983 + xy: 3519, 1163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-conveyor-full rotate: false - xy: 3889, 983 + xy: 3553, 1168 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 3889, 983 + xy: 3553, 1168 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2806,7 +2827,7 @@ block-core-shard-full index: -1 block-craters-full rotate: false - xy: 3923, 983 + xy: 3587, 1168 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2834,28 +2855,28 @@ block-cyclone-full index: -1 block-dark-metal-full rotate: false - xy: 2684, 337 + xy: 3621, 1168 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-darksand-full rotate: false - xy: 2692, 379 + xy: 3605, 1134 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-dunerocks-full rotate: false - xy: 2726, 383 + xy: 3605, 1100 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-duo-full rotate: false - xy: 2760, 383 + xy: 3605, 1066 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2876,7 +2897,7 @@ block-fuse-full index: -1 block-grass-full rotate: false - xy: 3655, 973 + xy: 3605, 1032 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2890,49 +2911,49 @@ block-ground-factory-full index: -1 block-hail-full rotate: false - xy: 3689, 973 + xy: 3582, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-holostone-full rotate: false - xy: 3723, 973 + xy: 3616, 239 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-hotrock-full rotate: false - xy: 3757, 975 + xy: 3650, 247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-full rotate: false - xy: 3791, 975 + xy: 3684, 247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ice-snow-full rotate: false - xy: 2798, 387 + xy: 3718, 247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icerocks-full rotate: false - xy: 2832, 387 + xy: 2676, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ignarock-full rotate: false - xy: 2866, 387 + xy: 3605, 998 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2960,7 +2981,7 @@ block-laser-drill-full index: -1 block-liquid-router-full rotate: false - xy: 2900, 387 + xy: 3498, 189 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2974,7 +2995,7 @@ block-liquid-tank-full index: -1 block-magmarock-full rotate: false - xy: 2934, 387 + xy: 3532, 189 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3016,14 +3037,14 @@ block-meltdown-full index: -1 block-metal-floor-damaged-full rotate: false - xy: 2323, 291 + xy: 3566, 189 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-moss-full rotate: false - xy: 2323, 223 + xy: 3650, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3051,42 +3072,42 @@ block-oil-extractor-full index: -1 block-ore-coal-full rotate: false - xy: 2322, 189 + xy: 3684, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-copper-full rotate: false - xy: 2360, 295 + xy: 3718, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-lead-full rotate: false - xy: 2394, 295 + xy: 3650, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-scrap-full rotate: false - xy: 2428, 295 + xy: 3684, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-thorium-full rotate: false - xy: 2462, 295 + xy: 3718, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-ore-titanium-full rotate: false - xy: 2496, 295 + xy: 3639, 1123 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3114,7 +3135,7 @@ payload-router-icon index: -1 block-pebbles-full rotate: false - xy: 2530, 295 + xy: 3673, 1123 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3128,7 +3149,7 @@ block-phase-weaver-full index: -1 block-plated-conduit-full rotate: false - xy: 2357, 261 + xy: 3639, 1089 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3142,21 +3163,21 @@ block-pneumatic-drill-full index: -1 block-pulse-conduit-full rotate: false - xy: 2357, 227 + xy: 3707, 1123 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-pulverizer-full rotate: false - xy: 2391, 261 + xy: 3639, 1055 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-repair-point-full rotate: false - xy: 2425, 261 + xy: 3673, 1089 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3170,21 +3191,21 @@ block-ripple-full index: -1 block-rock-full rotate: false - xy: 3586, 415 + xy: 3636, 423 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-rocks-full rotate: false - xy: 2391, 227 + xy: 3639, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-saltrocks-full rotate: false - xy: 2459, 261 + xy: 3673, 1055 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3198,21 +3219,21 @@ block-salvo-full index: -1 block-sand-boulder-full rotate: false - xy: 2425, 227 + xy: 3707, 1089 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sand-full rotate: false - xy: 2493, 261 + xy: 3673, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-sandrocks-full rotate: false - xy: 2459, 227 + xy: 3707, 1055 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3226,21 +3247,21 @@ block-scatter-full index: -1 block-scorch-full rotate: false - xy: 2527, 261 + xy: 3707, 1021 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-scrap-wall-full rotate: false - xy: 2493, 227 + xy: 3639, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall1 rotate: false - xy: 2493, 227 + xy: 3639, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3275,49 +3296,49 @@ block-segment-full index: -1 block-shale-boulder-full rotate: false - xy: 2564, 295 + xy: 3707, 987 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shale-full rotate: false - xy: 2561, 261 + xy: 2692, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shalerocks-full rotate: false - xy: 2561, 227 + xy: 2726, 383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-shrubs-full rotate: false - xy: 2598, 299 + xy: 2760, 383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snow-full rotate: false - xy: 2632, 299 + xy: 2710, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-snowrock-full rotate: false - xy: 3636, 423 + xy: 2322, 6 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 block-snowrocks-full rotate: false - xy: 2666, 299 + xy: 2744, 349 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3338,7 +3359,7 @@ block-spore-cluster-full index: -1 block-spore-moss-full rotate: false - xy: 2700, 303 + xy: 2710, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3352,14 +3373,14 @@ block-spore-press-full index: -1 block-sporerocks-full rotate: false - xy: 3957, 1005 + xy: 2744, 315 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-stone-full rotate: false - xy: 3991, 1005 + xy: 2778, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3373,7 +3394,7 @@ block-swarmer-full index: -1 block-tendrils-full rotate: false - xy: 4025, 1005 + xy: 2812, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3387,14 +3408,14 @@ block-tetrative-reconstructor-full index: -1 block-titanium-conveyor-full rotate: false - xy: 3957, 971 + xy: 2846, 329 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 3957, 971 + xy: 2846, 329 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3485,56 +3506,56 @@ core-shard-team-sharded index: -1 cracks-1-0 rotate: false - xy: 2938, 285 + xy: 4013, 1005 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-1 rotate: false - xy: 2734, 247 + xy: 3945, 971 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-2 rotate: false - xy: 2768, 247 + xy: 3979, 971 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-3 rotate: false - xy: 2802, 251 + xy: 4013, 971 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-4 rotate: false - xy: 2836, 251 + xy: 4047, 997 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-5 rotate: false - xy: 2870, 251 + xy: 4047, 963 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-6 rotate: false - xy: 2904, 251 + xy: 2323, 291 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cracks-1-7 rotate: false - xy: 2938, 251 + xy: 2323, 257 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3989,21 +4010,21 @@ cracks-9-7 index: -1 crawler-wreck0 rotate: false - xy: 3636, 373 + xy: 2498, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-wreck1 rotate: false - xy: 2298, 409 + xy: 2548, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-wreck2 rotate: false - xy: 2348, 413 + xy: 2598, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4017,32 +4038,53 @@ cyclone index: -1 dagger-wreck0 rotate: false - xy: 2548, 413 + xy: 3686, 381 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-wreck1 rotate: false - xy: 2598, 413 + xy: 3686, 331 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-wreck2 rotate: false - xy: 3112, 379 + xy: 2648, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 duo rotate: false - xy: 2972, 251 + xy: 2462, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +eclipse-wreck0 + rotate: false + xy: 323, 1727 + size: 320, 320 + orig: 320, 320 + offset: 0, 0 + index: -1 +eclipse-wreck1 + rotate: false + xy: 1, 1083 + size: 320, 320 + orig: 320, 320 + offset: 0, 0 + index: -1 +eclipse-wreck2 + rotate: false + xy: 323, 1405 + size: 320, 320 + orig: 320, 320 + offset: 0, 0 + index: -1 eruptor-wreck0 rotate: false xy: 2015, 583 @@ -4064,6 +4106,27 @@ eruptor-wreck2 orig: 88, 64 offset: 0, 0 index: -1 +flare-wreck0 + rotate: false + xy: 2948, 421 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +flare-wreck1 + rotate: false + xy: 2998, 421 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +flare-wreck2 + rotate: false + xy: 3048, 413 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 fortress-wreck0 rotate: false xy: 3667, 1239 @@ -4113,34 +4176,34 @@ gamma-wreck2 orig: 56, 56 offset: 0, 0 index: -1 -ghoul-wreck0 +hail + rotate: false + xy: 2496, 295 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +horizon-wreck0 rotate: false xy: 3379, 1117 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 -ghoul-wreck1 +horizon-wreck1 rotate: false xy: 1886, 427 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 -ghoul-wreck2 +horizon-wreck2 rotate: false xy: 1960, 427 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 -hail - rotate: false - xy: 2734, 213 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 item-blast-compound-large rotate: false xy: 1796, 245 @@ -4150,7 +4213,7 @@ item-blast-compound-large index: -1 item-blast-compound-medium rotate: false - xy: 2938, 217 + xy: 2425, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4171,7 +4234,7 @@ item-blast-compound-tiny index: -1 item-blast-compound-xlarge rotate: false - xy: 3212, 357 + xy: 3248, 407 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4185,7 +4248,7 @@ item-coal-large index: -1 item-coal-medium rotate: false - xy: 2731, 179 + xy: 2459, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4199,14 +4262,14 @@ item-coal-small index: -1 item-coal-tiny rotate: false - xy: 3587, 1184 + xy: 2880, 345 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-coal-xlarge rotate: false - xy: 3262, 349 + xy: 3298, 407 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4220,7 +4283,7 @@ item-copper-large index: -1 item-copper-medium rotate: false - xy: 2697, 167 + xy: 2493, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4234,84 +4297,84 @@ item-copper-small index: -1 item-copper-tiny rotate: false - xy: 19, 1 + xy: 3647, 663 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-copper-xlarge rotate: false - xy: 3312, 357 + xy: 3348, 407 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-graphite-large rotate: false - xy: 3855, 1017 + xy: 3498, 223 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-graphite-medium rotate: false - xy: 2765, 145 + xy: 2527, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite-small rotate: false - xy: 3686, 197 + xy: 3795, 1305 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-graphite-tiny rotate: false - xy: 37, 1 + xy: 19, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-graphite-xlarge rotate: false - xy: 3362, 357 + xy: 3398, 407 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-lead-large rotate: false - xy: 3897, 1017 + xy: 3540, 223 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-lead-medium rotate: false - xy: 3032, 379 + xy: 2564, 295 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead-small rotate: false - xy: 3795, 1305 + xy: 3112, 469 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-lead-tiny rotate: false - xy: 55, 1 + xy: 2880, 327 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-lead-xlarge rotate: false - xy: 3412, 357 + xy: 3148, 379 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4325,28 +4388,28 @@ item-metaglass-large index: -1 item-metaglass-medium rotate: false - xy: 3006, 345 + xy: 2561, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass-small rotate: false - xy: 3573, 993 + xy: 613, 1057 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-metaglass-tiny rotate: false - xy: 73, 1 + xy: 37, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-metaglass-xlarge rotate: false - xy: 3462, 365 + xy: 3198, 379 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4360,28 +4423,28 @@ item-phase-fabric-large index: -1 item-phase-fabric-medium rotate: false - xy: 3006, 277 + xy: 2632, 303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric-small rotate: false - xy: 613, 1057 + xy: 967, 1733 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-phase-fabric-tiny rotate: false - xy: 91, 1 + xy: 55, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-phase-fabric-xlarge rotate: false - xy: 3512, 365 + xy: 3248, 357 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4395,7 +4458,7 @@ item-plastanium-large index: -1 item-plastanium-medium rotate: false - xy: 3040, 345 + xy: 2357, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4409,14 +4472,14 @@ item-plastanium-small index: -1 item-plastanium-tiny rotate: false - xy: 109, 1 + xy: 73, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-plastanium-xlarge rotate: false - xy: 3562, 365 + xy: 3298, 357 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4430,7 +4493,7 @@ item-pyratite-large index: -1 item-pyratite-medium rotate: false - xy: 3040, 277 + xy: 2425, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4444,14 +4507,14 @@ item-pyratite-small index: -1 item-pyratite-tiny rotate: false - xy: 127, 1 + xy: 91, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-pyratite-xlarge rotate: false - xy: 2372, 6 + xy: 3348, 357 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4465,7 +4528,7 @@ item-sand-large index: -1 item-sand-medium rotate: false - xy: 3006, 209 + xy: 2493, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4479,14 +4542,14 @@ item-sand-small index: -1 item-sand-tiny rotate: false - xy: 145, 1 + xy: 109, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-sand-xlarge rotate: false - xy: 3312, 307 + xy: 3398, 357 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4500,7 +4563,7 @@ item-scrap-large index: -1 item-scrap-medium rotate: false - xy: 3074, 353 + xy: 2561, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4514,14 +4577,14 @@ item-scrap-small index: -1 item-scrap-tiny rotate: false - xy: 705, 29 + xy: 127, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-scrap-xlarge rotate: false - xy: 3362, 307 + xy: 2798, 371 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4535,7 +4598,7 @@ item-silicon-large index: -1 item-silicon-medium rotate: false - xy: 3074, 285 + xy: 2632, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4549,14 +4612,14 @@ item-silicon-small index: -1 item-silicon-tiny rotate: false - xy: 3587, 1166 + xy: 145, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-silicon-xlarge rotate: false - xy: 3412, 307 + xy: 2848, 363 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4570,7 +4633,7 @@ item-spore-pod-large index: -1 item-spore-pod-medium rotate: false - xy: 3108, 345 + xy: 2595, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4584,14 +4647,14 @@ item-spore-pod-small index: -1 item-spore-pod-tiny rotate: false - xy: 2230, 417 + xy: 705, 29 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-spore-pod-xlarge rotate: false - xy: 3462, 315 + xy: 2898, 371 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4605,7 +4668,7 @@ item-surge-alloy-large index: -1 item-surge-alloy-medium rotate: false - xy: 3108, 311 + xy: 2700, 243 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4619,14 +4682,14 @@ item-surge-alloy-small index: -1 item-surge-alloy-tiny rotate: false - xy: 3239, 1515 + xy: 2230, 417 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-surge-alloy-xlarge rotate: false - xy: 3512, 315 + xy: 2948, 371 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4640,7 +4703,7 @@ item-thorium-large index: -1 item-thorium-medium rotate: false - xy: 3108, 277 + xy: 2768, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4654,14 +4717,14 @@ item-thorium-small index: -1 item-thorium-tiny rotate: false - xy: 1957, 1043 + xy: 3239, 1515 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-thorium-xlarge rotate: false - xy: 3562, 315 + xy: 2998, 371 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4675,7 +4738,7 @@ item-titanium-large index: -1 item-titanium-medium rotate: false - xy: 3108, 243 + xy: 2734, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4689,14 +4752,14 @@ item-titanium-small index: -1 item-titanium-tiny rotate: false - xy: 1615, 729 + xy: 1957, 1043 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-titanium-xlarge rotate: false - xy: 3612, 323 + xy: 3048, 363 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4708,27 +4771,6 @@ lancer orig: 64, 64 offset: 0, 0 index: -1 -lich-wreck0 - rotate: false - xy: 509, 389 - size: 216, 240 - orig: 216, 240 - offset: 0, 0 - index: -1 -lich-wreck1 - rotate: false - xy: 509, 147 - size: 216, 240 - orig: 216, 240 - offset: 0, 0 - index: -1 -lich-wreck2 - rotate: false - xy: 291, 35 - size: 216, 240 - orig: 216, 240 - offset: 0, 0 - index: -1 liquid-cryofluid-large rotate: false xy: 2650, 371 @@ -4738,28 +4780,28 @@ liquid-cryofluid-large index: -1 liquid-cryofluid-medium rotate: false - xy: 3176, 277 + xy: 2836, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid-small rotate: false - xy: 1005, 1733 + xy: 3519, 1137 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-cryofluid-tiny rotate: false - xy: 1060, 118 + xy: 1615, 729 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-cryofluid-xlarge rotate: false - xy: 3512, 265 + xy: 3148, 329 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4773,28 +4815,28 @@ liquid-oil-large index: -1 liquid-oil-medium rotate: false - xy: 3210, 289 + xy: 2938, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil-small rotate: false - xy: 3519, 1137 + xy: 3741, 1131 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-oil-tiny rotate: false - xy: 1745, 565 + xy: 1060, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-oil-xlarge rotate: false - xy: 3562, 265 + xy: 3198, 329 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4808,28 +4850,28 @@ liquid-slag-large index: -1 liquid-slag-medium rotate: false - xy: 3278, 315 + xy: 3006, 185 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag-small rotate: false - xy: 3825, 983 + xy: 2276, 299 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-slag-tiny rotate: false - xy: 3251, 629 + xy: 1745, 565 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-slag-xlarge rotate: false - xy: 3612, 273 + xy: 3248, 307 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4843,28 +4885,28 @@ liquid-water-large index: -1 liquid-water-medium rotate: false - xy: 3278, 247 + xy: 2629, 201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water-small rotate: false - xy: 2276, 299 + xy: 3016, 295 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-water-tiny rotate: false - xy: 3212, 461 + xy: 3251, 629 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquid-water-xlarge rotate: false - xy: 3662, 273 + xy: 3298, 307 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -4927,21 +4969,21 @@ meltdown index: -1 mono-wreck0 rotate: false - xy: 3686, 381 + xy: 3448, 315 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-wreck1 rotate: false - xy: 3712, 331 + xy: 3548, 365 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-wreck2 rotate: false - xy: 3712, 281 + xy: 3498, 315 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5037,55 +5079,13 @@ quasar-wreck2 orig: 80, 80 offset: 0, 0 index: -1 -reaper-wreck0 - rotate: false - xy: 323, 1727 - size: 320, 320 - orig: 320, 320 - offset: 0, 0 - index: -1 -reaper-wreck1 - rotate: false - xy: 1, 1083 - size: 320, 320 - orig: 320, 320 - offset: 0, 0 - index: -1 -reaper-wreck2 - rotate: false - xy: 323, 1405 - size: 320, 320 - orig: 320, 320 - offset: 0, 0 - index: -1 repair-point rotate: false - xy: 3244, 145 + xy: 2799, 65 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -revenant-wreck0 - rotate: false - xy: 2979, 1159 - size: 112, 112 - orig: 112, 112 - offset: 0, 0 - index: -1 -revenant-wreck1 - rotate: false - xy: 3223, 1289 - size: 112, 112 - orig: 112, 112 - offset: 0, 0 - index: -1 -revenant-wreck2 - rotate: false - xy: 3337, 1289 - size: 112, 112 - orig: 112, 112 - offset: 0, 0 - index: -1 ripple rotate: false xy: 1158, 15 @@ -5109,7 +5109,7 @@ scatter index: -1 scorch rotate: false - xy: 3448, 129 + xy: 3003, 49 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5130,84 +5130,84 @@ spectre index: -1 splash-0 rotate: false - xy: 3584, 121 + xy: 3647, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-1 rotate: false - xy: 3618, 121 + xy: 3613, 885 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-10 rotate: false - xy: 2629, 163 + xy: 3681, 817 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-11 rotate: false - xy: 2663, 163 + xy: 3611, 783 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-2 rotate: false - xy: 3652, 121 + xy: 3647, 885 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-3 rotate: false - xy: 3686, 147 + xy: 3681, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-4 rotate: false - xy: 3720, 147 + xy: 3613, 851 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-5 rotate: false - xy: 3686, 113 + xy: 3647, 851 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-6 rotate: false - xy: 3720, 113 + xy: 3681, 885 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-7 rotate: false - xy: 3754, 147 + xy: 3681, 851 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-8 rotate: false - xy: 3754, 113 + xy: 3613, 817 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 splash-9 rotate: false - xy: 2595, 163 + xy: 3647, 817 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5221,14 +5221,21 @@ swarmer index: -1 unit-alpha-full rotate: false - xy: 3655, 1107 + xy: 3298, 257 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 +unit-antumbra-full + rotate: false + xy: 727, 291 + size: 216, 240 + orig: 216, 240 + offset: 0, 0 + index: -1 unit-beta-full rotate: false - xy: 3705, 1107 + xy: 3348, 257 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5242,18 +5249,25 @@ unit-cix-full index: -1 unit-crawler-full rotate: false - xy: 3655, 1057 + xy: 3398, 257 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-dagger-full rotate: false - xy: 3705, 1057 + xy: 3448, 265 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 +unit-eclipse-full + rotate: false + xy: 645, 1727 + size: 320, 320 + orig: 320, 320 + offset: 0, 0 + index: -1 unit-eruptor-full rotate: false xy: 1796, 451 @@ -5261,6 +5275,13 @@ unit-eruptor-full orig: 88, 64 offset: 0, 0 index: -1 +unit-flare-full + rotate: false + xy: 3498, 265 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 unit-fortress-full rotate: false xy: 1957, 1061 @@ -5275,20 +5296,13 @@ unit-gamma-full orig: 56, 56 offset: 0, 0 index: -1 -unit-ghoul-full +unit-horizon-full rotate: false xy: 1952, 353 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 -unit-lich-full - rotate: false - xy: 727, 291 - size: 216, 240 - orig: 216, 240 - offset: 0, 0 - index: -1 unit-mace-full rotate: false xy: 2191, 229 @@ -5305,7 +5319,7 @@ unit-mega-full index: -1 unit-mono-full rotate: false - xy: 3755, 1059 + xy: 3548, 265 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5338,27 +5352,13 @@ unit-quasar-full orig: 80, 80 offset: 0, 0 index: -1 -unit-reaper-full +unit-zenith-full rotate: false - xy: 645, 1727 - size: 320, 320 - orig: 320, 320 - offset: 0, 0 - index: -1 -unit-revenant-full - rotate: false - xy: 3451, 1289 + xy: 163, 67 size: 112, 112 orig: 112, 112 offset: 0, 0 index: -1 -unit-wraith-full - rotate: false - xy: 3805, 1059 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 wave rotate: false xy: 2206, 31 @@ -5366,163 +5366,163 @@ wave orig: 64, 64 offset: 0, 0 index: -1 -wraith-wreck0 +zenith-wreck0 rotate: false - xy: 3705, 1007 - size: 48, 48 - orig: 48, 48 + xy: 3223, 1289 + size: 112, 112 + orig: 112, 112 offset: 0, 0 index: -1 -wraith-wreck1 +zenith-wreck1 rotate: false - xy: 3755, 1009 - size: 48, 48 - orig: 48, 48 + xy: 3337, 1289 + size: 112, 112 + orig: 112, 112 offset: 0, 0 index: -1 -wraith-wreck2 +zenith-wreck2 rotate: false - xy: 3805, 1009 - size: 48, 48 - orig: 48, 48 + xy: 3451, 1289 + size: 112, 112 + orig: 112, 112 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 2904, 217 + xy: 2391, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 2972, 217 + xy: 2425, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 2765, 179 + xy: 2459, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 2731, 145 + xy: 2493, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 2998, 379 + xy: 2527, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 3066, 387 + xy: 2561, 261 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 3006, 311 + xy: 2598, 299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 3006, 243 + xy: 2666, 303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 3040, 311 + xy: 2391, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 3040, 243 + xy: 2459, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 3040, 209 + xy: 2527, 193 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 3074, 319 + xy: 2598, 265 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod rotate: false - xy: 3074, 217 + xy: 2595, 231 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 3142, 345 + xy: 2700, 277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 3176, 345 + xy: 2734, 247 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 3142, 311 + xy: 2802, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 3142, 243 + xy: 2836, 227 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 3210, 323 + xy: 2904, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 3244, 315 + xy: 3006, 219 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 3244, 247 + xy: 2700, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5562,16 +5562,30 @@ alpha-cell orig: 48, 48 offset: 0, 0 index: -1 +antumbra + rotate: false + xy: 291, 519 + size: 216, 240 + orig: 216, 240 + offset: 0, 0 + index: -1 +antumbra-cell + rotate: false + xy: 291, 277 + size: 216, 240 + orig: 216, 240 + offset: 0, 0 + index: -1 beta rotate: false - xy: 3062, 471 + xy: 2272, 6 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 beta-cell rotate: false - xy: 2272, 6 + xy: 2248, 409 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5655,53 +5669,67 @@ cix-old index: -1 crawler rotate: false - xy: 3062, 421 + xy: 2298, 409 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-base rotate: false - xy: 3112, 429 + xy: 2348, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-cell rotate: false - xy: 3162, 429 + xy: 2398, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-leg rotate: false - xy: 2322, 6 + xy: 2448, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger rotate: false - xy: 2398, 413 + xy: 3636, 373 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 2448, 413 + xy: 3660, 481 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 2498, 413 + xy: 3686, 431 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 +eclipse + rotate: false + xy: 1, 1727 + size: 320, 320 + orig: 320, 320 + offset: 0, 0 + index: -1 +eclipse-cell + rotate: false + xy: 1, 1405 + size: 320, 320 + orig: 320, 320 + offset: 0, 0 + index: -1 eradicator rotate: false xy: 509, 21 @@ -5774,11 +5802,18 @@ eruptor-leg index: -1 eruptor-leg-base rotate: false - xy: 967, 1731 + xy: 3448, 429 size: 36, 26 orig: 36, 26 offset: 0, 0 index: -1 +flare + rotate: false + xy: 2898, 421 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 fortress rotate: false xy: 727, 549 @@ -5821,34 +5856,20 @@ gamma-cell orig: 56, 56 offset: 0, 0 index: -1 -ghoul +horizon rotate: false xy: 4003, 1441 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 -ghoul-cell +horizon-cell rotate: false xy: 3305, 1117 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 -lich - rotate: false - xy: 291, 519 - size: 216, 240 - orig: 216, 240 - offset: 0, 0 - index: -1 -lich-cell - rotate: false - xy: 291, 277 - size: 216, 240 - orig: 216, 240 - offset: 0, 0 - index: -1 mace rotate: false xy: 3283, 1043 @@ -5893,14 +5914,14 @@ mega-cell index: -1 mono rotate: false - xy: 3660, 481 + xy: 3448, 365 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mono-cell rotate: false - xy: 3686, 431 + xy: 3498, 365 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5914,7 +5935,7 @@ nova index: -1 nova-base rotate: false - xy: 3712, 181 + xy: 3598, 323 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5928,7 +5949,7 @@ nova-cell index: -1 nova-leg rotate: false - xy: 2648, 413 + xy: 2372, 6 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -5963,7 +5984,7 @@ pulsar index: -1 pulsar-base rotate: false - xy: 2698, 417 + xy: 2898, 321 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -6010,51 +6031,30 @@ quasar-leg orig: 80, 80 offset: 0, 0 index: -1 -reaper - rotate: false - xy: 1, 1727 - size: 320, 320 - orig: 320, 320 - offset: 0, 0 - index: -1 -reaper-cell - rotate: false - xy: 1, 1405 - size: 320, 320 - orig: 320, 320 - offset: 0, 0 - index: -1 -revenant - rotate: false - xy: 163, 67 - size: 112, 112 - orig: 112, 112 - offset: 0, 0 - index: -1 -revenant-cell - rotate: false - xy: 3109, 1289 - size: 112, 112 - orig: 112, 112 - offset: 0, 0 - index: -1 vanguard rotate: false - xy: 3855, 1059 + xy: 3598, 273 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 vanguard-cell rotate: false - xy: 3905, 1059 + xy: 3648, 281 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +antumbra-missiles + rotate: false + xy: 3012, 471 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 artillery rotate: false - xy: 3012, 463 + xy: 3062, 463 size: 48, 56 orig: 48, 56 offset: 0, 0 @@ -6073,6 +6073,13 @@ chaos orig: 56, 136 offset: 0, 0 index: -1 +eclipse-weapon + rotate: false + xy: 2698, 417 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 eradication rotate: false xy: 2595, 753 @@ -6089,123 +6096,116 @@ eruption index: -1 flakgun rotate: false - xy: 3212, 407 + xy: 2798, 421 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flamethrower rotate: false - xy: 3262, 399 + xy: 2848, 413 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 heal-shotgun-weapon rotate: false - xy: 3312, 407 + xy: 3098, 413 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 heal-weapon rotate: false - xy: 3362, 407 + xy: 3148, 429 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 heal-weapon-mount rotate: false - xy: 3412, 407 + xy: 3198, 429 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 large-weapon rotate: false - xy: 3662, 323 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -lich-missiles - rotate: false - xy: 3462, 265 + xy: 3098, 363 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles rotate: false - xy: 3612, 223 + xy: 3348, 307 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles-mount rotate: false - xy: 3662, 223 + xy: 3398, 307 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mount-weapon rotate: false - xy: 3712, 231 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -reaper-weapon - rotate: false - xy: 2748, 417 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -revenant-missiles - rotate: false - xy: 2798, 421 + xy: 3548, 315 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-basic-weapon rotate: false - xy: 2948, 421 + xy: 3048, 313 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-mount-weapon rotate: false - xy: 2998, 413 + xy: 3098, 313 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 small-weapon rotate: false - xy: 3605, 1152 + xy: 3148, 279 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 weapon rotate: false - xy: 3605, 1002 + xy: 3698, 281 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -wraith +zenith-missiles rotate: false - xy: 3655, 1007 + xy: 3448, 215 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 +zenith + rotate: false + xy: 3109, 1289 + size: 112, 112 + orig: 112, 112 + offset: 0, 0 + index: -1 +zenith-cell + rotate: false + xy: 2979, 1159 + size: 112, 112 + orig: 112, 112 + offset: 0, 0 + index: -1 sprites2.png size: 4096,512 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index e4c26cb2a4..c04dd07219 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 a211f66953..600864f58e 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 024baa7b14..ee1d71fc5f 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1698,7 +1698,7 @@ public class Blocks implements ContentList{ airFactory = new UnitFactory("air-factory"){{ requirements(Category.units, with(Items.copper, 30, Items.lead, 70)); plans = new UnitPlan[]{ - new UnitPlan(UnitTypes.wraith, 200f, with(Items.silicon, 10)), + new UnitPlan(UnitTypes.flare, 200f, with(Items.silicon, 10)), new UnitPlan(UnitTypes.mono, 200f, with(Items.silicon, 10)), //new UnitPlan(UnitTypes.phantom, 200f, with(Items.silicon, 10)), }; @@ -1729,7 +1729,7 @@ public class Blocks implements ContentList{ {UnitTypes.nova, UnitTypes.quasar}, {UnitTypes.dagger, UnitTypes.mace}, {UnitTypes.crawler, UnitTypes.eruptor}, - {UnitTypes.wraith, UnitTypes.ghoul}, + {UnitTypes.flare, UnitTypes.horizon}, {UnitTypes.mono, UnitTypes.poly}, {UnitTypes.risse, UnitTypes.minke}, }; @@ -1745,10 +1745,11 @@ public class Blocks implements ContentList{ constructTime = 60f * 15f; upgrades = new UnitType[][]{ - {UnitTypes.ghoul, UnitTypes.revenant}, + {UnitTypes.horizon, UnitTypes.zenith}, {UnitTypes.mace, UnitTypes.fortress}, {UnitTypes.poly, UnitTypes.mega}, {UnitTypes.minke, UnitTypes.bryde}, + {UnitTypes.quasar, UnitTypes.pulsar}, }; }}; @@ -1763,7 +1764,7 @@ public class Blocks implements ContentList{ constructTime = 60f * 60f; upgrades = new UnitType[][]{ - {UnitTypes.revenant, UnitTypes.lich}, + {UnitTypes.zenith, UnitTypes.antumbra}, }; }}; @@ -1778,7 +1779,7 @@ public class Blocks implements ContentList{ constructTime = 60f * 60f * 3; upgrades = new UnitType[][]{ - {UnitTypes.lich, UnitTypes.reaper}, + {UnitTypes.antumbra, UnitTypes.eclipse}, }; }}; diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index c88a068359..05fe79f429 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -27,7 +27,7 @@ public class UnitTypes implements ContentList{ public static @EntityDef({Unitc.class, Legsc.class}) UnitType cix, eruptor; //air (no special traits) - public static @EntityDef({Unitc.class}) UnitType wraith, reaper, ghoul, revenant, lich; + public static @EntityDef({Unitc.class}) UnitType flare, eclipse, horizon, zenith, antumbra; //air + building public static @EntityDef({Unitc.class, Builderc.class}) UnitType mono; @@ -319,7 +319,7 @@ public class UnitTypes implements ContentList{ //endregion //region air attack - wraith = new UnitType("wraith"){{ + flare = new UnitType("flare"){{ speed = 3f; accel = 0.08f; drag = 0.01f; @@ -338,7 +338,7 @@ public class UnitTypes implements ContentList{ }}); }}; - ghoul = new UnitType("ghoul"){{ + horizon = new UnitType("horizon"){{ health = 220; speed = 2f; accel = 0.08f; @@ -362,7 +362,7 @@ public class UnitTypes implements ContentList{ }}); }}; - revenant = new UnitType("revenant"){{ + zenith = new UnitType("zenith"){{ health = 220; speed = 1.9f; accel = 0.04f; @@ -375,7 +375,7 @@ public class UnitTypes implements ContentList{ engineOffset = 12f; engineSize = 3f; - weapons.add(new Weapon("revenant-missiles"){{ + weapons.add(new Weapon("zenith-missiles"){{ reload = 70f; x = 7f; rotate = true; @@ -402,7 +402,28 @@ public class UnitTypes implements ContentList{ }}); }}; - reaper = new UnitType("reaper"){{ + antumbra = new UnitType("antumbra"){{ + speed = 1.1f; + accel = 0.02f; + drag = 0.05f; + rotateSpeed = 2.5f; + flying = true; + lowAltitude = true; + health = 75000; + engineOffset = 38; + engineSize = 7.3f; + hitsize = 58f; + + weapons.add(new Weapon(){{ + y = 1.5f; + reload = 28f; + ejectEffect = Fx.shellEjectSmall; + bullet = Bullets.standardCopper; + shootSound = Sounds.shoot; + }}); + }}; + + eclipse = new UnitType("eclipse"){{ speed = 1.1f; accel = 0.02f; drag = 0.05f; @@ -424,27 +445,6 @@ public class UnitTypes implements ContentList{ }}); }}; - lich = new UnitType("lich"){{ - speed = 1.1f; - accel = 0.02f; - drag = 0.05f; - rotateSpeed = 2.5f; - flying = true; - lowAltitude = true; - health = 75000; - engineOffset = 38; - engineSize = 7.3f; - hitsize = 58f; - - weapons.add(new Weapon(){{ - y = 1.5f; - reload = 28f; - ejectEffect = Fx.shellEjectSmall; - bullet = Bullets.standardCopper; - shootSound = Sounds.shoot; - }}); - }}; - //endregion //region air support diff --git a/core/src/mindustry/core/Logic.java b/core/src/mindustry/core/Logic.java index abeeab6575..ef09b2046d 100644 --- a/core/src/mindustry/core/Logic.java +++ b/core/src/mindustry/core/Logic.java @@ -257,6 +257,8 @@ public class Logic implements ApplicationListener{ @Remote(called = Loc.both) public static void launchZone(){ + if(!state.isCampaign()) return; + if(!headless){ ui.hudfrag.showLaunch(); } diff --git a/core/src/mindustry/game/DefaultWaves.java b/core/src/mindustry/game/DefaultWaves.java index 426bc75396..b19cfa1e75 100644 --- a/core/src/mindustry/game/DefaultWaves.java +++ b/core/src/mindustry/game/DefaultWaves.java @@ -22,7 +22,7 @@ public class DefaultWaves{ unitScaling = 1.5f; }}, - new SpawnGroup(UnitTypes.wraith){{ + new SpawnGroup(UnitTypes.flare){{ begin = 12; end = 16; unitScaling = 1f; @@ -72,7 +72,7 @@ public class DefaultWaves{ effect = StatusEffects.overdrive; }}, - new SpawnGroup(UnitTypes.wraith){{ + new SpawnGroup(UnitTypes.flare){{ begin = 16; unitScaling = 1; spacing = 2; @@ -120,14 +120,14 @@ public class DefaultWaves{ end = 130; }}, - new SpawnGroup(UnitTypes.ghoul){{ + new SpawnGroup(UnitTypes.horizon){{ begin = 40; unitAmount = 2; spacing = 2; unitScaling = 2; }}, - new SpawnGroup(UnitTypes.wraith){{ + new SpawnGroup(UnitTypes.flare){{ begin = 50; unitAmount = 4; unitScaling = 3; @@ -135,7 +135,7 @@ public class DefaultWaves{ effect = StatusEffects.overdrive; }}, - new SpawnGroup(UnitTypes.revenant){{ + new SpawnGroup(UnitTypes.zenith){{ begin = 50; unitAmount = 2; unitScaling = 3; @@ -143,7 +143,7 @@ public class DefaultWaves{ max = 16; }}, - new SpawnGroup(UnitTypes.ghoul){{ + new SpawnGroup(UnitTypes.horizon){{ begin = 53; unitAmount = 2; unitScaling = 3; @@ -171,14 +171,14 @@ public class DefaultWaves{ spacing = 40; }}, - new SpawnGroup(UnitTypes.lich){{ + new SpawnGroup(UnitTypes.antumbra){{ begin = 131; unitAmount = 1; unitScaling = 1; spacing = 40; }}, - new SpawnGroup(UnitTypes.ghoul){{ + new SpawnGroup(UnitTypes.horizon){{ begin = 90; unitAmount = 2; unitScaling = 3; diff --git a/core/src/mindustry/graphics/MenuRenderer.java b/core/src/mindustry/graphics/MenuRenderer.java index 0ffa0c5d5e..f45e93daf1 100644 --- a/core/src/mindustry/graphics/MenuRenderer.java +++ b/core/src/mindustry/graphics/MenuRenderer.java @@ -30,7 +30,7 @@ public class MenuRenderer implements Disposable{ private float time = 0f; private float flyerRot = 45f; private int flyers = Mathf.chance(0.2) ? Mathf.random(35) : Mathf.random(15); - private UnitType flyerType = Structs.select(UnitTypes.wraith, UnitTypes.wraith, UnitTypes.ghoul, UnitTypes.mono, UnitTypes.poly, UnitTypes.mega, UnitTypes.revenant); + private UnitType flyerType = Structs.select(UnitTypes.flare, UnitTypes.flare, UnitTypes.horizon, UnitTypes.mono, UnitTypes.poly, UnitTypes.mega, UnitTypes.zenith); public MenuRenderer(){ Time.mark(); diff --git a/tools/src/mindustry/tools/ImagePacker.java b/tools/src/mindustry/tools/ImagePacker.java index dbe8413657..b2b1a951da 100644 --- a/tools/src/mindustry/tools/ImagePacker.java +++ b/tools/src/mindustry/tools/ImagePacker.java @@ -21,7 +21,7 @@ import java.io.*; public class ImagePacker{ static ObjectMap regionCache = new ObjectMap<>(); - static ObjectMap imageCache = new ObjectMap<>(); + static ObjectMap imageCache = new ObjectMap<>(); public static void main(String[] args) throws Exception{ Vars.headless = true; @@ -33,10 +33,14 @@ public class ImagePacker{ Log.setLogger(new DefaultLogHandler()); Fi.get("../../../assets-raw/sprites_out").walk(path -> { + if(!path.extEquals("png")) return; + String fname = path.nameWithoutExtension(); try{ BufferedImage image = ImageIO.read(path.file()); + + if(image == null) throw new IOException("image " + path.absolutePath() + " is null for terrible reasons"); GenRegion region = new GenRegion(fname, path){ @Override @@ -61,7 +65,7 @@ public class ImagePacker{ }; regionCache.put(fname, region); - imageCache.put(region, image); + imageCache.put(fname, image); }catch(IOException e){ throw new RuntimeException(e); } @@ -152,7 +156,7 @@ public class ImagePacker{ } static BufferedImage buf(TextureRegion region){ - return imageCache.get(region); + return imageCache.get(((AtlasRegion)region).name); } static Image create(int width, int height){ @@ -170,7 +174,7 @@ public class ImagePacker{ static Image get(TextureRegion region){ GenRegion.validate(region); - return new Image(imageCache.get(region)); + return new Image(imageCache.get(((AtlasRegion)region).name)); } static void err(String message, Object... args){ @@ -178,11 +182,11 @@ public class ImagePacker{ } static class GenRegion extends AtlasRegion{ - String name; boolean invalid; Fi path; GenRegion(String name, Fi path){ + if(name == null) throw new IllegalArgumentException("name is null"); this.name = name; this.path = path; }