diff --git a/core/assets-raw/sprites/effects/beam-end.png b/core/assets-raw/sprites/effects/beam-end.png deleted file mode 100644 index d0674d380d..0000000000 Binary files a/core/assets-raw/sprites/effects/beam-end.png and /dev/null differ diff --git a/core/assets-raw/sprites/effects/beam.png b/core/assets-raw/sprites/effects/beam.png deleted file mode 100644 index 327fd4b7f6..0000000000 Binary files a/core/assets-raw/sprites/effects/beam.png and /dev/null differ diff --git a/core/assets-raw/sprites/effects/laser-end.png b/core/assets-raw/sprites/effects/laser-end.png deleted file mode 100644 index 7c109d16dd..0000000000 Binary files a/core/assets-raw/sprites/effects/laser-end.png and /dev/null differ diff --git a/core/assets-raw/sprites/effects/laser.png b/core/assets-raw/sprites/effects/laser.png deleted file mode 100644 index eba798c01e..0000000000 Binary files a/core/assets-raw/sprites/effects/laser.png and /dev/null differ diff --git a/core/assets-raw/sprites/effects/laserfull.png b/core/assets-raw/sprites/effects/laserfull.png deleted file mode 100644 index fab831c1c4..0000000000 Binary files a/core/assets-raw/sprites/effects/laserfull.png and /dev/null differ diff --git a/core/assets-raw/sprites/effects/minelaser-end.png b/core/assets-raw/sprites/effects/minelaser-end.png deleted file mode 100644 index 8a04ee1a6d..0000000000 Binary files a/core/assets-raw/sprites/effects/minelaser-end.png and /dev/null differ diff --git a/core/assets-raw/sprites/effects/minelaser.png b/core/assets-raw/sprites/effects/minelaser.png deleted file mode 100644 index 956e4d2311..0000000000 Binary files a/core/assets-raw/sprites/effects/minelaser.png and /dev/null differ diff --git a/core/assets-raw/sprites/ui/icons/icon-database-small.png b/core/assets-raw/sprites/ui/icons/icon-database-small.png new file mode 100644 index 0000000000..dc105e3f67 Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-database-small.png differ diff --git a/core/assets-raw/sprites_replacement/effects/laser-end.png b/core/assets-raw/sprites_replacement/effects/laser-end.png new file mode 100644 index 0000000000..dc90d3620b Binary files /dev/null and b/core/assets-raw/sprites_replacement/effects/laser-end.png differ diff --git a/core/assets-raw/sprites_replacement/effects/laser.png b/core/assets-raw/sprites_replacement/effects/laser.png new file mode 100644 index 0000000000..0072419acc Binary files /dev/null and b/core/assets-raw/sprites_replacement/effects/laser.png differ diff --git a/core/assets-raw/sprites_replacement/effects/minelaser-end.png b/core/assets-raw/sprites_replacement/effects/minelaser-end.png new file mode 100644 index 0000000000..46ab615894 Binary files /dev/null and b/core/assets-raw/sprites_replacement/effects/minelaser-end.png differ diff --git a/core/assets-raw/sprites_replacement/effects/minelaser.png b/core/assets-raw/sprites_replacement/effects/minelaser.png new file mode 100644 index 0000000000..21acfa15d4 Binary files /dev/null and b/core/assets-raw/sprites_replacement/effects/minelaser.png differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index f7e10f1a67..5e87727d25 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -263,6 +263,7 @@ zone.complete = Wave {0} reached:\nNew zone requirements met. zone.config.complete = Wave {0} reached:\nLoadout config unlocked. zone.resources = Resources Detected: add = Add... +boss.health = Boss Health connectfail = [crimson]Failed to connect to server:\n\n[accent]{0} error.unreachable = Server unreachable.\nIs the address spelled correctly? @@ -564,7 +565,7 @@ block.stained-rocks-red.name = Stained Rocks Red block.stained-stone-red.name = Stained Stone Red block.stained-rocks-yellow.name = Stained Rocks Yellow block.stained-stone-yellow.name = Stained Stone Yellow -block.stained-boulder.name = Stained Boulde +block.stained-boulder.name = Stained Boulder block.metal-floor.name = Metal Floor block.metal-floor-2.name = Metal Floor 2 block.metal-floor-3.name = Metal Floor 3 diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index d79f35e02e..b6165c2fb8 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -20,350 +20,350 @@ force-projector-top index: -1 mend-projector rotate: false - xy: 771, 807 + xy: 681, 543 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mend-projector-top rotate: false - xy: 705, 741 + xy: 747, 609 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overdrive-projector rotate: false - xy: 771, 741 + xy: 747, 543 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overdrive-projector-top rotate: false - xy: 705, 675 + xy: 715, 477 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shock-mine rotate: false - xy: 1577, 275 + xy: 1729, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 555, 60 + xy: 1275, 154 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 555, 26 + xy: 1309, 154 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 1829, 507 + xy: 1343, 154 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 1519, 445 + xy: 1513, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 1553, 445 + xy: 1547, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 1587, 445 + xy: 1275, 52 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 1621, 445 + xy: 1309, 52 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 1655, 445 + xy: 1343, 52 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 1689, 445 + xy: 1377, 52 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 745, 143 + xy: 1411, 52 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 779, 143 + xy: 1445, 52 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 813, 143 + xy: 1241, 34 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 847, 143 + xy: 1207, 24 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 881, 143 + xy: 1479, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 979, 157 + xy: 1513, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 1029, 308 + xy: 1547, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 987, 266 + xy: 1275, 18 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 983, 232 + xy: 1309, 18 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 983, 198 + xy: 1343, 18 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 1025, 274 + xy: 1377, 18 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 1017, 232 + xy: 1411, 18 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 1017, 198 + xy: 1445, 18 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 1013, 164 + xy: 1479, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 725, 109 + xy: 1695, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 759, 109 + xy: 1729, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 725, 75 + xy: 1763, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 793, 109 + xy: 1797, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 725, 41 + xy: 1593, 259 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 759, 75 + xy: 1627, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 827, 109 + xy: 1661, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 725, 7 + xy: 1695, 361 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 759, 41 + xy: 1729, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 793, 75 + xy: 1763, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 861, 109 + xy: 1797, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 759, 7 + xy: 1831, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 793, 41 + xy: 1593, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 827, 75 + xy: 1627, 259 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 793, 7 + xy: 1661, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 827, 41 + xy: 1695, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 861, 75 + xy: 1729, 361 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 827, 7 + xy: 1763, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 861, 41 + xy: 1797, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 861, 7 + xy: 1831, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 distributor rotate: false - xy: 389, 45 + xy: 865, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 junction rotate: false - xy: 1801, 1021 + xy: 1527, 1109 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -377,49 +377,49 @@ mass-driver-base index: -1 overflow-gate rotate: false - xy: 1339, 307 + xy: 1551, 735 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 1357, 171 + xy: 1755, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 1391, 239 + xy: 1721, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 1391, 205 + xy: 1687, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 1391, 171 + xy: 1653, 769 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 1475, 359 + xy: 1593, 633 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 1815, 371 + xy: 1865, 633 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -482,21 +482,21 @@ laser-drill-top index: -1 mechanical-drill rotate: false - xy: 639, 741 + xy: 771, 741 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-rotator rotate: false - xy: 705, 807 + xy: 771, 675 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-top rotate: false - xy: 639, 675 + xy: 681, 609 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -531,182 +531,182 @@ oil-extractor-top index: -1 pneumatic-drill rotate: false - xy: 1509, 1297 + xy: 1129, 1022 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-rotator rotate: false - xy: 1641, 1297 + xy: 1205, 1186 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-top rotate: false - xy: 1707, 1297 + xy: 1173, 1120 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 1459, 1091 + xy: 1011, 626 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 1459, 959 + xy: 945, 560 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 1393, 893 + xy: 1011, 560 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 1459, 893 + xy: 1077, 560 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 char1 rotate: false - xy: 1829, 473 + xy: 1377, 154 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 char2 rotate: false - xy: 1821, 439 + xy: 1411, 154 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 char3 rotate: false - xy: 1213, 480 + xy: 1445, 154 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cliffs1 rotate: false - xy: 1247, 477 + xy: 1207, 92 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal1 rotate: false - xy: 1281, 477 + xy: 1241, 102 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal2 rotate: false - xy: 1315, 477 + xy: 1275, 120 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal3 rotate: false - xy: 1349, 477 + xy: 1309, 120 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper1 rotate: false - xy: 1013, 130 + xy: 1513, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper2 rotate: false - xy: 1059, 274 + xy: 1547, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper3 rotate: false - xy: 1051, 240 + xy: 1581, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters1 rotate: false - xy: 1119, 231 + xy: 1403, 1203 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters2 rotate: false - xy: 1119, 197 + xy: 1437, 1245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters3 rotate: false - xy: 1161, 260 + xy: 1437, 1211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters4 rotate: false - xy: 1195, 260 + xy: 1471, 1245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters5 rotate: false - xy: 1229, 260 + xy: 1505, 1245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone1 rotate: false - xy: 1229, 260 + xy: 1505, 1245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters6 rotate: false - xy: 1263, 260 + xy: 1471, 1211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone2 rotate: false - xy: 1263, 260 + xy: 1471, 1211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater rotate: false - xy: 1153, 192 + xy: 1607, 1245 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -727,21 +727,21 @@ differential-generator-top index: -1 dunerocks-large rotate: false - xy: 931, 971 + xy: 583, 473 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dunerocks1 rotate: false - xy: 1047, 138 + xy: 1675, 1211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dunerocks2 rotate: false - xy: 1153, 158 + xy: 1743, 1245 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -762,63 +762,63 @@ edge-stencil-smooth index: -1 grass1 rotate: false - xy: 1047, 104 + xy: 1879, 1211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass2 rotate: false - xy: 1081, 100 + xy: 1437, 1177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass3 rotate: false - xy: 1115, 95 + xy: 1437, 1143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone1 rotate: false - xy: 1217, 90 + xy: 1471, 1143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone2 rotate: false - xy: 1251, 90 + xy: 1539, 1177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone3 rotate: false - xy: 1297, 260 + xy: 1505, 1143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock1 rotate: false - xy: 1289, 226 + xy: 1573, 1177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock2 rotate: false - xy: 1289, 192 + xy: 1539, 1143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock3 rotate: false - xy: 1289, 158 + xy: 1607, 1177 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -832,574 +832,574 @@ ice-edge index: -1 ice-snow1 rotate: false - xy: 1323, 192 + xy: 1675, 1177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow2 rotate: false - xy: 1323, 158 + xy: 1641, 1143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow3 rotate: false - xy: 1319, 124 + xy: 1709, 1177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice1 rotate: false - xy: 1285, 124 + xy: 1573, 1143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice2 rotate: false - xy: 1285, 90 + xy: 1641, 1177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice3 rotate: false - xy: 1323, 226 + xy: 1607, 1143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icerocks-large rotate: false - xy: 1641, 1363 + xy: 705, 873 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 icerocks1 rotate: false - xy: 1319, 90 + xy: 1675, 1143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icerocks2 rotate: false - xy: 1353, 124 + xy: 1743, 1177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ignarock1 rotate: false - xy: 1699, 1097 + xy: 1743, 1143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ignarock2 rotate: false - xy: 1699, 1063 + xy: 1811, 1177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ignarock3 rotate: false - xy: 1699, 1029 + xy: 1777, 1143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead1 rotate: false - xy: 1903, 1033 + xy: 1459, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead2 rotate: false - xy: 1971, 1067 + xy: 1595, 1109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead3 rotate: false - xy: 1937, 1033 + xy: 1561, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock1 rotate: false - xy: 1809, 987 + xy: 1561, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock2 rotate: false - xy: 1775, 953 + xy: 1527, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock3 rotate: false - xy: 1843, 987 + xy: 1493, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor rotate: false - xy: 1911, 965 + xy: 1731, 1109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged5 rotate: false - xy: 1911, 965 + xy: 1731, 1109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-2 rotate: false - xy: 1877, 931 + xy: 1697, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-3 rotate: false - xy: 1945, 965 + xy: 1663, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-5 rotate: false - xy: 1911, 931 + xy: 1629, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged1 rotate: false - xy: 1979, 965 + xy: 1595, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged2 rotate: false - xy: 1945, 931 + xy: 1561, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged3 rotate: false - xy: 1979, 931 + xy: 1765, 1109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged4 rotate: false - xy: 2013, 965 + xy: 1731, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged6 rotate: false - xy: 2013, 931 + xy: 1697, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pine rotate: false - xy: 1373, 341 + xy: 1721, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rock1 rotate: false - xy: 1737, 591 + xy: 1509, 677 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rock2 rotate: false - xy: 1775, 791 + xy: 1509, 627 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rocks-large rotate: false - xy: 1311, 1265 + xy: 1195, 988 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rocks1 rotate: false - xy: 1720, 373 + xy: 1593, 667 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rocks2 rotate: false - xy: 1441, 357 + xy: 1627, 701 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water rotate: false - xy: 1679, 343 + xy: 1695, 701 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand1 rotate: false - xy: 1577, 343 + xy: 1593, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand2 rotate: false - xy: 1611, 343 + xy: 1627, 633 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand3 rotate: false - xy: 1645, 343 + xy: 1661, 667 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap1 rotate: false - xy: 1713, 339 + xy: 1627, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap2 rotate: false - xy: 1433, 289 + xy: 1661, 633 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap3 rotate: false - xy: 1509, 309 + xy: 1695, 667 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow1 rotate: false - xy: 1713, 271 + xy: 1763, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow2 rotate: false - xy: 1747, 339 + xy: 1797, 633 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow3 rotate: false - xy: 1747, 305 + xy: 1831, 667 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrocks-large rotate: false - xy: 997, 956 + xy: 445, 243 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 snowrocks1 rotate: false - xy: 1747, 271 + xy: 1797, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrocks2 rotate: false - xy: 1754, 373 + xy: 1831, 633 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-cluster1 rotate: false - xy: 945, 296 + xy: 1013, 68 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster2 rotate: false - xy: 987, 338 + xy: 1055, 68 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster3 rotate: false - xy: 1029, 380 + xy: 1097, 68 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 stained-boulder1 rotate: false - xy: 1849, 303 + xy: 1626, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-boulder2 rotate: false - xy: 1815, 269 + xy: 1660, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-rocks-large rotate: false - xy: 1129, 1022 + xy: 837, 839 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 stained-rocks-red-large rotate: false - xy: 1129, 956 + xy: 837, 773 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 stained-rocks-red1 rotate: false - xy: 1883, 319 + xy: 1694, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-rocks-red2 rotate: false - xy: 1917, 353 + xy: 1728, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-rocks-yellow-large rotate: false - xy: 1205, 1186 + xy: 903, 839 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 stained-rocks-yellow1 rotate: false - xy: 1883, 285 + xy: 1728, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-rocks-yellow2 rotate: false - xy: 1917, 319 + xy: 1762, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-rocks1 rotate: false - xy: 1849, 269 + xy: 1660, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-rocks2 rotate: false - xy: 1883, 353 + xy: 1694, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-red1 rotate: false - xy: 1951, 285 + xy: 1830, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-red2 rotate: false - xy: 1985, 353 + xy: 1830, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-red3 rotate: false - xy: 1985, 319 + xy: 1864, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-yellow1 rotate: false - xy: 1985, 285 + xy: 1864, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-yellow2 rotate: false - xy: 1883, 251 + xy: 1593, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-yellow3 rotate: false - xy: 1917, 251 + xy: 1593, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone1 rotate: false - xy: 1951, 353 + xy: 1762, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone2 rotate: false - xy: 1917, 285 + xy: 1796, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone3 rotate: false - xy: 1951, 319 + xy: 1796, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stainedrocks-large rotate: false - xy: 1173, 1120 + xy: 837, 707 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 stainedrocks1 rotate: false - xy: 1951, 251 + xy: 1627, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stainedrocks2 rotate: false - xy: 1985, 251 + xy: 1593, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone3 rotate: false - xy: 579, 139 + xy: 1627, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar rotate: false - xy: 589, 71 + xy: 1695, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 657, 105 + xy: 1695, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 623, 37 + xy: 1729, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 657, 71 + xy: 1593, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 623, 3 + xy: 1593, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 657, 3 + xy: 1627, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 691, 3 + xy: 1661, 361 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water rotate: false - xy: 929, 55 + xy: 1831, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1420,35 +1420,35 @@ white-tree-dead index: -1 block-border rotate: false - xy: 1169, 328 + xy: 1309, 188 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-middle rotate: false - xy: 945, 157 + xy: 1343, 188 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 945, 157 + xy: 1343, 188 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-select rotate: false - xy: 1067, 312 + xy: 1377, 188 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 1210, 362 + xy: 1309, 86 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1462,28 +1462,28 @@ place-arrow index: -1 rubble-1-0 rotate: false - xy: 1905, 1267 + xy: 1195, 922 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 1971, 1267 + xy: 1261, 922 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 813, 609 + xy: 1271, 1191 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 813, 543 + xy: 1303, 1257 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1518,175 +1518,175 @@ rubble-4-1 index: -1 spawn rotate: false - xy: 1815, 337 + xy: 1865, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 1101, 304 + xy: 1411, 188 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 1135, 299 + xy: 1445, 188 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 1135, 299 + xy: 1445, 188 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 1169, 294 + xy: 1241, 170 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 555, 94 + xy: 1231, 136 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 1383, 459 + xy: 1411, 120 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 1417, 459 + xy: 1445, 120 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 1779, 415 + xy: 1479, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 1813, 405 + xy: 1513, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 1855, 439 + xy: 1547, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 1847, 405 + xy: 1479, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 1881, 405 + xy: 1513, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 1203, 328 + xy: 1547, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 1215, 396 + xy: 1343, 86 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 1237, 328 + xy: 1377, 86 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 1237, 294 + xy: 1411, 86 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 1244, 362 + xy: 1445, 86 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 1271, 328 + xy: 1241, 68 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 1271, 294 + xy: 1207, 58 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 1451, 461 + xy: 1173, 50 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 1903, 999 + xy: 1493, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 1971, 999 + xy: 1629, 1109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 2005, 1033 + xy: 1561, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 2005, 999 + xy: 1527, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1714,112 +1714,112 @@ liquid-tank-top index: -1 mechanical-pump rotate: false - xy: 1843, 953 + xy: 1629, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 1331, 273 + xy: 1687, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 1365, 273 + xy: 1653, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 1357, 239 + xy: 1619, 769 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 1357, 205 + xy: 1585, 735 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 1455, 103 + xy: 1789, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1455, 69 + xy: 1755, 769 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1351, 425 + xy: 1721, 735 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 1385, 425 + xy: 1857, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 1380, 391 + xy: 1823, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 1414, 391 + xy: 1789, 769 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 1448, 393 + xy: 1755, 735 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 1905, 1333 + xy: 1261, 1054 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 1261, 922 + xy: 1109, 890 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 alpha-dart-mech-pad rotate: false - xy: 1483, 1429 + xy: 1409, 1429 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 delta-mech-pad rotate: false - xy: 931, 1037 + xy: 1937, 1407 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1833,7 +1833,7 @@ glaive-ship-pad index: -1 javelin-ship-pad rotate: false - xy: 1707, 1363 + xy: 639, 741 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1847,21 +1847,21 @@ omega-mech-pad index: -1 tau-mech-pad rotate: false - xy: 1261, 988 + xy: 977, 890 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 trident-ship-pad rotate: false - xy: 1327, 927 + xy: 1101, 824 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 battery rotate: false - xy: 1142, 367 + xy: 1207, 194 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1875,14 +1875,14 @@ battery-large index: -1 combustion-generator rotate: false - xy: 1383, 493 + xy: 1343, 120 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 1417, 493 + xy: 1377, 120 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1945,63 +1945,63 @@ impact-reactor-top index: -1 power-node rotate: false - xy: 1425, 239 + xy: 1823, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 1773, 1297 + xy: 1239, 1120 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 power-source rotate: false - xy: 1425, 171 + xy: 1755, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 1421, 137 + xy: 1721, 769 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 1421, 103 + xy: 1687, 735 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 powervoid rotate: false - xy: 1421, 69 + xy: 1857, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 1971, 1333 + xy: 1261, 988 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 1509, 343 + xy: 1661, 701 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 1781, 339 + xy: 1831, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2015,14 +2015,14 @@ solar-panel-large index: -1 surge-tower rotate: false - xy: 1239, 1120 + xy: 903, 773 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 1195, 922 + xy: 1043, 890 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2050,14 +2050,14 @@ thorium-reactor-lights index: -1 turbine-generator rotate: false - xy: 1371, 1157 + xy: 1101, 758 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-top rotate: false - xy: 1437, 1157 + xy: 969, 692 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2078,161 +2078,161 @@ alloy-smelter-top index: -1 biomattercompressor rotate: false - xy: 1549, 1429 + xy: 1956, 1737 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 biomattercompressor-frame0 rotate: false - xy: 1615, 1429 + xy: 1475, 1429 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 biomattercompressor-frame1 rotate: false - xy: 1681, 1429 + xy: 1541, 1429 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 biomattercompressor-frame2 rotate: false - xy: 1747, 1429 + xy: 1607, 1429 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 biomattercompressor-liquid rotate: false - xy: 1879, 1429 + xy: 1739, 1429 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 biomattercompressor-top rotate: false - xy: 1041, 1088 + xy: 1805, 1429 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 blast-mixer rotate: false - xy: 1139, 1186 + xy: 1871, 1429 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 1945, 1465 + xy: 1945, 1605 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 601, 1005 + xy: 1945, 1473 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 667, 1005 + xy: 535, 1005 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator rotate: false - xy: 733, 1005 + xy: 601, 1005 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 647, 939 + xy: 733, 1005 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 713, 939 + xy: 581, 939 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 graphite-press rotate: false - xy: 1575, 1363 + xy: 639, 807 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 incinerator rotate: false - xy: 1451, 427 + xy: 1811, 1143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 1733, 1021 + xy: 1981, 1155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 1869, 1089 + xy: 1493, 1109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 kiln rotate: false - xy: 1773, 1363 + xy: 771, 873 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 kiln-top rotate: false - xy: 1839, 1363 + xy: 705, 807 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 1839, 1363 + xy: 705, 807 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 1937, 1067 + xy: 1493, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-source rotate: false - xy: 1741, 953 + xy: 1663, 1109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 1843, 919 + xy: 1561, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2246,98 +2246,98 @@ multi-press index: -1 oilrefinery rotate: false - xy: 1945, 897 + xy: 1595, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-weaver rotate: false - xy: 747, 543 + xy: 847, 477 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 715, 477 + xy: 997, 1022 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 421, 175 + xy: 1063, 1022 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 1377, 1289 + xy: 1063, 956 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 1443, 1289 + xy: 1107, 1088 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 1482, 393 + xy: 1857, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 1407, 323 + xy: 1789, 735 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 1839, 1297 + xy: 1195, 1054 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator rotate: false - xy: 1905, 1201 + xy: 453, 441 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 1971, 1201 + xy: 445, 375 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 997, 1022 + xy: 445, 309 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 smelter rotate: false - xy: 1679, 275 + xy: 1831, 701 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 container rotate: false - xy: 1945, 1597 + xy: 1139, 1186 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2379,14 +2379,14 @@ launch-pad index: -1 sortedunloader rotate: false - xy: 1781, 271 + xy: 1865, 667 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader rotate: false - xy: 963, 123 + xy: 1763, 361 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2400,21 +2400,21 @@ vault index: -1 arc-heat rotate: false - xy: 1337, 1197 + xy: 1173, 84 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-1 rotate: false - xy: 1176, 362 + xy: 1275, 188 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-2 rotate: false - xy: 1956, 1663 + xy: 1041, 1088 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2442,7 +2442,7 @@ hail-heat index: -1 lancer-heat rotate: false - xy: 639, 807 + xy: 771, 807 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2463,70 +2463,70 @@ ripple-heat index: -1 salvo-heat rotate: false - xy: 1377, 1223 + xy: 1305, 1125 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 1509, 1231 + xy: 1327, 993 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 1575, 1231 + xy: 1327, 927 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 1459, 827 + xy: 913, 494 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dagger-factory rotate: false - xy: 799, 1005 + xy: 647, 939 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phantom-factory rotate: false - xy: 799, 1005 + xy: 647, 939 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spirit-factory rotate: false - xy: 799, 1005 + xy: 647, 939 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wraith-factory rotate: false - xy: 799, 1005 + xy: 647, 939 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dagger-factory-top rotate: false - xy: 1945, 1399 + xy: 799, 1005 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dagger-factory-top-open rotate: false - xy: 865, 1037 + xy: 779, 939 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2589,21 +2589,21 @@ ghoul-factory index: -1 phantom-factory-top rotate: false - xy: 681, 609 + xy: 421, 175 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phantom-factory-top-open rotate: false - xy: 681, 543 + xy: 813, 609 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 repair-point-base rotate: false - xy: 1584, 377 + xy: 1857, 735 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2631,14 +2631,14 @@ revenant-factory-top-open index: -1 spirit-factory-top rotate: false - xy: 1063, 956 + xy: 845, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spirit-factory-top-open rotate: false - xy: 1107, 1088 + xy: 911, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2652,70 +2652,70 @@ titan-factory index: -1 wraith-factory-top rotate: false - xy: 1569, 1165 + xy: 1045, 494 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wraith-factory-top-open rotate: false - xy: 1635, 1165 + xy: 1111, 494 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 copper-wall rotate: false - xy: 1051, 206 + xy: 1581, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-large rotate: false - xy: 1945, 1531 + xy: 1956, 1671 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door rotate: false - xy: 1051, 172 + xy: 1675, 1245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large rotate: false - xy: 583, 473 + xy: 931, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 865, 971 + xy: 389, 45 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-open rotate: false - xy: 1119, 163 + xy: 1709, 1245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 1387, 137 + xy: 1619, 735 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large rotate: false - xy: 747, 609 + xy: 813, 543 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2750,91 +2750,91 @@ scrap-wall-huge3 index: -1 scrap-wall-large1 rotate: false - xy: 1641, 1231 + xy: 1371, 1125 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large2 rotate: false - xy: 1707, 1231 + xy: 1393, 1059 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large3 rotate: false - xy: 1773, 1231 + xy: 1393, 993 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large4 rotate: false - xy: 1839, 1231 + xy: 1393, 927 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall1 rotate: false - xy: 1543, 309 + xy: 1729, 701 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall2 rotate: false - xy: 1577, 309 + xy: 1661, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 1611, 309 + xy: 1695, 633 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 1645, 309 + xy: 1729, 667 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 1645, 309 + xy: 1729, 667 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 647, 139 + xy: 1593, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large rotate: false - xy: 1195, 1054 + xy: 903, 707 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 691, 105 + xy: 1661, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 1271, 1191 + xy: 969, 824 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2848,32 +2848,18 @@ thruster index: -1 titanium-wall rotate: false - xy: 895, 109 + xy: 1593, 191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large rotate: false - xy: 1327, 993 + xy: 1035, 758 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -beam - rotate: false - xy: 1303, 1273 - size: 4, 48 - orig: 4, 48 - offset: 0, 0 - index: -1 -beam-end - rotate: false - xy: 1956, 1877 - size: 72, 72 - orig: 72, 72 - offset: 0, 0 - index: -1 bullet rotate: false xy: 477, 1507 @@ -2883,287 +2869,280 @@ bullet index: -1 bullet-back rotate: false - xy: 1583, 879 + xy: 569, 245 size: 52, 52 orig: 52, 52 offset: 0, 0 index: -1 casing rotate: false - xy: 1369, 459 + xy: 1927, 1411 size: 8, 16 orig: 8, 16 offset: 0, 0 index: -1 error rotate: false - xy: 1245, 872 + xy: 1292, 522 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 laser rotate: false - xy: 2032, 1999 + xy: 935, 327 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 laser-end rotate: false - xy: 1335, 1421 - size: 72, 72 - orig: 72, 72 - offset: 0, 0 - index: -1 -laserfull - rotate: false - xy: 1956, 1803 + xy: 1237, 1323 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 minelaser rotate: false - xy: 2035, 19 + xy: 1419, 1271 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 minelaser-end rotate: false - xy: 1409, 1421 + xy: 1335, 1421 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 missile rotate: false - xy: 987, 300 + xy: 971, 1 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 missile-back rotate: false - xy: 1029, 342 + xy: 1009, 1 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 scale_marker rotate: false - xy: 1387, 855 + xy: 577, 501 size: 4, 4 orig: 4, 4 offset: 0, 0 index: -1 scorch1 rotate: false - xy: 2019, 353 + xy: 1615, 89 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch2 rotate: false - xy: 2019, 251 + xy: 1645, 89 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch3 rotate: false - xy: 1459, 173 + xy: 1675, 89 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch4 rotate: false - xy: 1489, 173 + xy: 1891, 781 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch5 rotate: false - xy: 1519, 173 + xy: 1921, 781 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 shell rotate: false - xy: 945, 229 + xy: 1203, 257 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shell-back rotate: false - xy: 945, 191 + xy: 2003, 1430 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shot rotate: false - xy: 1611, 275 + xy: 1763, 633 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 transfer rotate: false - xy: 2037, 1244 + xy: 2037, 951 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 895, 41 + xy: 1661, 259 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 transfer-end rotate: false - xy: 1956, 1729 + xy: 1956, 1803 size: 72, 72 orig: 72, 72 offset: 0, 0 index: -1 alloy-smelter-icon-large rotate: false - xy: 1641, 941 + xy: 627, 307 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alloy-smelter-icon-medium rotate: false - xy: 1067, 346 + xy: 1241, 238 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 alloy-smelter-icon-small rotate: false - xy: 879, 545 + xy: 900, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 alpha-dart-mech-pad-icon-large rotate: false - xy: 1583, 829 + xy: 553, 195 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-dart-mech-pad-icon-medium rotate: false - xy: 1147, 401 + xy: 1139, 76 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 alpha-dart-mech-pad-icon-small rotate: false - xy: 1451, 501 + xy: 926, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 arc rotate: false - xy: 1337, 1231 + xy: 1123, 34 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 arc-icon-full rotate: false - xy: 1108, 372 + xy: 1241, 204 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 arc-icon-large rotate: false - xy: 453, 457 + xy: 603, 195 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 arc-icon-small rotate: false - xy: 1741, 893 + xy: 879, 549 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 battery-icon-large rotate: false - xy: 503, 457 + xy: 587, 145 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 battery-icon-small rotate: false - xy: 2021, 871 + xy: 1475, 879 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 battery-large-icon-large rotate: false - xy: 445, 349 + xy: 587, 95 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 battery-large-icon-medium rotate: false - xy: 1101, 338 + xy: 1197, 160 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 battery-large-icon-small rotate: false - xy: 1419, 433 + xy: 1729, 267 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 biomattercompressor-icon-full rotate: false - xy: 1813, 1429 + xy: 1673, 1429 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 biomattercompressor-icon-large rotate: false - xy: 495, 407 + xy: 571, 45 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 biomattercompressor-icon-medium rotate: false - xy: 1135, 333 + xy: 1197, 126 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 biomattercompressor-icon-small rotate: false - xy: 715, 147 + xy: 1763, 301 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3177,336 +3156,336 @@ blast-drill-icon-full index: -1 blast-drill-icon-large rotate: false - xy: 445, 299 + xy: 893, 427 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 blast-drill-icon-medium rotate: false - xy: 1185, 430 + xy: 1275, 222 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blast-drill-icon-small rotate: false - xy: 1607, 249 + xy: 1797, 329 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blast-mixer-icon-large rotate: false - xy: 495, 357 + xy: 943, 444 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 blast-mixer-icon-medium rotate: false - xy: 1181, 396 + xy: 1309, 222 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blast-mixer-icon-small rotate: false - xy: 1578, 211 + xy: 1695, 233 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 bridge-conduit-icon-large rotate: false - xy: 495, 257 + xy: 1093, 444 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 bridge-conduit-icon-small rotate: false - xy: 1633, 249 + xy: 1891, 755 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 bridge-conveyor-icon-large rotate: false - xy: 845, 921 + xy: 1143, 444 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 bridge-conveyor-icon-small rotate: false - xy: 1578, 185 + xy: 1951, 857 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 char-icon-large rotate: false - xy: 945, 921 + xy: 943, 394 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 char-icon-small rotate: false - xy: 1685, 249 + xy: 1917, 755 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 cliffs-icon-large rotate: false - xy: 837, 871 + xy: 993, 394 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 cliffs-icon-small rotate: false - xy: 1489, 147 + xy: 1951, 831 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 combustion-generator-icon-large rotate: false - xy: 837, 821 + xy: 1043, 394 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 combustion-generator-icon-small rotate: false - xy: 1489, 121 + xy: 1977, 857 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 conduit-icon-full rotate: false - xy: 1203, 294 + xy: 1275, 86 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-icon-large rotate: false - xy: 887, 871 + xy: 1093, 394 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 conduit-icon-small rotate: false - xy: 1515, 147 + xy: 1644, 37 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 container-icon-large rotate: false - xy: 837, 771 + xy: 1143, 394 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 container-icon-medium rotate: false - xy: 1485, 461 + xy: 1479, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 container-icon-small rotate: false - xy: 1489, 95 + xy: 1670, 63 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 conveyor-icon-large rotate: false - xy: 937, 871 + xy: 1193, 395 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 conveyor-icon-small rotate: false - xy: 1515, 121 + xy: 1951, 805 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 copper-wall-icon-large rotate: false - xy: 887, 821 + xy: 637, 145 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 copper-wall-icon-small rotate: false - xy: 1489, 69 + xy: 1977, 831 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 copper-wall-large-icon-large rotate: false - xy: 837, 721 + xy: 637, 95 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 copper-wall-large-icon-medium rotate: false - xy: 1093, 270 + xy: 1581, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-large-icon-small rotate: false - xy: 1515, 95 + xy: 2003, 857 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 core-foundation-icon-large rotate: false - xy: 887, 771 + xy: 621, 45 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 core-foundation-icon-medium rotate: false - xy: 1085, 236 + xy: 1581, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 core-foundation-icon-small rotate: false - xy: 1515, 69 + xy: 1670, 37 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 core-nucleus-icon-large rotate: false - xy: 937, 821 + xy: 671, 45 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 core-nucleus-icon-medium rotate: false - xy: 1085, 202 + xy: 1581, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 core-nucleus-icon-small rotate: false - xy: 2016, 1175 + xy: 1977, 805 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 core-shard-icon-large rotate: false - xy: 887, 721 + xy: 1175, 872 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 core-shard-icon-medium rotate: false - xy: 1127, 265 + xy: 1403, 1237 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 core-shard-icon-small rotate: false - xy: 2016, 1149 + xy: 2003, 831 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 craters-icon-large rotate: false - xy: 937, 771 + xy: 1225, 872 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 craters-icon-small rotate: false - xy: 2016, 1123 + xy: 2003, 805 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 cryofluidmixer-icon-full rotate: false - xy: 535, 1005 + xy: 1945, 1539 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-icon-large rotate: false - xy: 1095, 906 + xy: 1217, 822 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 cryofluidmixer-icon-medium rotate: false - xy: 1153, 226 + xy: 1539, 1245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cryofluidmixer-icon-small rotate: false - xy: 1711, 245 + xy: 1123, 8 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 cultivator-icon-full rotate: false - xy: 581, 939 + xy: 667, 1005 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-icon-large rotate: false - xy: 1145, 906 + xy: 1167, 722 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 cultivator-icon-medium rotate: false - xy: 1187, 226 + xy: 1505, 1211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cultivator-icon-small rotate: false - xy: 1737, 245 + xy: 1865, 427 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3527,49 +3506,49 @@ cyclone-icon-full index: -1 cyclone-icon-large rotate: false - xy: 987, 856 + xy: 1267, 822 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 cyclone-icon-medium rotate: false - xy: 1221, 226 + xy: 1573, 1245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cyclone-icon-small rotate: false - xy: 1763, 245 + xy: 1951, 779 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dagger-factory-icon-full rotate: false - xy: 779, 939 + xy: 713, 939 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dagger-factory-icon-large rotate: false - xy: 987, 756 + xy: 1217, 722 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-factory-icon-medium rotate: false - xy: 1255, 226 + xy: 1539, 1211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dagger-factory-icon-small rotate: false - xy: 1789, 245 + xy: 1977, 779 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3583,175 +3562,175 @@ deepwater-edge index: -1 deepwater-icon-large rotate: false - xy: 1037, 756 + xy: 1209, 622 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 deepwater-icon-small rotate: false - xy: 1815, 243 + xy: 2003, 779 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 delta-mech-pad-icon-large rotate: false - xy: 1137, 806 + xy: 1259, 572 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-mech-pad-icon-medium rotate: false - xy: 1187, 192 + xy: 1573, 1211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 delta-mech-pad-icon-small rotate: false - xy: 1841, 243 + xy: 1861, 401 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 differential-generator-icon-large rotate: false - xy: 1137, 756 + xy: 1242, 522 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 differential-generator-icon-medium rotate: false - xy: 1221, 192 + xy: 1641, 1245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 differential-generator-icon-small rotate: false - xy: 487, 181 + xy: 1943, 753 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 distributor-icon-large rotate: false - xy: 987, 706 + xy: 1243, 472 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 distributor-icon-medium rotate: false - xy: 1255, 192 + xy: 1607, 1211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 distributor-icon-small rotate: false - xy: 1127, 1160 + xy: 1969, 753 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 door-icon-large rotate: false - xy: 1037, 706 + xy: 1243, 422 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 door-icon-small rotate: false - xy: 1607, 223 + xy: 1995, 753 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 door-large-icon-large rotate: false - xy: 1087, 706 + xy: 1243, 372 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 door-large-icon-medium rotate: false - xy: 1085, 168 + xy: 1641, 1211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large-icon-small rotate: false - xy: 1633, 223 + xy: 1644, 11 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dunerocks-icon-large rotate: false - xy: 1137, 706 + xy: 1193, 345 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dunerocks-icon-small rotate: false - xy: 1659, 223 + xy: 1670, 11 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 duo rotate: false - xy: 1187, 158 + xy: 1709, 1211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 duo-icon-full rotate: false - xy: 1221, 158 + xy: 1777, 1245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 duo-icon-large rotate: false - xy: 1195, 872 + xy: 1243, 322 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 duo-icon-small rotate: false - xy: 1685, 223 + xy: 1241, 8 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 force-projector-icon-large rotate: false - xy: 1187, 714 + xy: 1293, 306 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 force-projector-icon-medium rotate: false - xy: 1081, 134 + xy: 1811, 1245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 force-projector-icon-small rotate: false - xy: 1604, 197 + xy: 1696, 63 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3765,21 +3744,21 @@ fortress-factory-icon-full index: -1 fortress-factory-icon-large rotate: false - xy: 1237, 764 + xy: 1377, 1371 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 fortress-factory-icon-medium rotate: false - xy: 1115, 129 + xy: 1777, 1211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fortress-factory-icon-small rotate: false - xy: 1630, 197 + xy: 1696, 37 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3800,21 +3779,21 @@ fuse-icon-full index: -1 fuse-icon-large rotate: false - xy: 1237, 714 + xy: 1427, 1379 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 fuse-icon-medium rotate: false - xy: 1149, 124 + xy: 1845, 1245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fuse-icon-small rotate: false - xy: 1656, 197 + xy: 1696, 11 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3828,91 +3807,91 @@ ghoul-factory-icon-full index: -1 ghoul-factory-icon-large rotate: false - xy: 1287, 811 + xy: 1477, 1379 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ghoul-factory-icon-medium rotate: false - xy: 1183, 124 + xy: 1811, 1211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ghoul-factory-icon-small rotate: false - xy: 1682, 197 + xy: 2022, 1777 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 glaive-ship-pad-icon-large rotate: false - xy: 1337, 811 + xy: 1527, 1379 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 glaive-ship-pad-icon-medium rotate: false - xy: 1217, 124 + xy: 1879, 1245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 glaive-ship-pad-icon-small rotate: false - xy: 1711, 219 + xy: 2022, 1751 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 graphite-press-icon-large rotate: false - xy: 1287, 761 + xy: 1577, 1379 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 graphite-press-icon-medium rotate: false - xy: 1251, 124 + xy: 1845, 1211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 graphite-press-icon-small rotate: false - xy: 1737, 219 + xy: 2022, 1725 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 hail rotate: false - xy: 1149, 90 + xy: 1471, 1177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hail-icon-full rotate: false - xy: 1183, 90 + xy: 1505, 1177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hail-icon-large rotate: false - xy: 1337, 761 + xy: 1627, 1379 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 hail-icon-small rotate: false - xy: 1763, 219 + xy: 2022, 1699 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3926,42 +3905,42 @@ holostone-edge index: -1 holostone-icon-large rotate: false - xy: 1337, 711 + xy: 1727, 1379 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 holostone-icon-small rotate: false - xy: 1789, 219 + xy: 2022, 1673 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 hotrock-icon-large rotate: false - xy: 1387, 777 + xy: 1777, 1379 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 hotrock-icon-small rotate: false - xy: 1815, 217 + xy: 1729, 241 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ice-icon-large rotate: false - xy: 1437, 777 + xy: 1827, 1379 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ice-icon-small rotate: false - xy: 1841, 217 + xy: 1755, 267 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3975,42 +3954,42 @@ ice-snow-edge index: -1 ice-snow-icon-large rotate: false - xy: 1387, 727 + xy: 1877, 1379 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ice-snow-icon-small rotate: false - xy: 1708, 193 + xy: 1755, 241 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icerocks-icon-large rotate: false - xy: 1437, 727 + xy: 1377, 1321 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icerocks-icon-small rotate: false - xy: 1734, 193 + xy: 1789, 301 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ignarock-icon-large rotate: false - xy: 1437, 677 + xy: 1477, 1329 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ignarock-icon-small rotate: false - xy: 1838, 191 + xy: 1721, 215 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4024,490 +4003,490 @@ impact-reactor-icon-full index: -1 impact-reactor-icon-large rotate: false - xy: 1487, 745 + xy: 1527, 1329 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 impact-reactor-icon-medium rotate: false - xy: 1699, 995 + xy: 1845, 1177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 impact-reactor-icon-small rotate: false - xy: 1604, 171 + xy: 1747, 215 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 incinerator-icon-large rotate: false - xy: 1487, 695 + xy: 1577, 1329 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 incinerator-icon-small rotate: false - xy: 1630, 171 + xy: 1149, 8 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-biomatter-medium rotate: false - xy: 1682, 171 + xy: 2021, 753 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-biomatter-small rotate: false - xy: 491, 1000 + xy: 2029, 811 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-biomatter-xlarge rotate: false - xy: 837, 679 + xy: 477, 1716 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-blast-compound-medium rotate: false - xy: 1578, 159 + xy: 1807, 275 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-blast-compound-small rotate: false - xy: 509, 1000 + xy: 1905, 227 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-blast-compound-xlarge rotate: false - xy: 477, 1716 + xy: 1153, 202 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-coal-medium rotate: false - xy: 1708, 167 + xy: 1807, 249 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-coal-small rotate: false - xy: 929, 3 + xy: 2029, 681 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-coal-xlarge rotate: false - xy: 913, 479 + xy: 615, 3 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-copper-medium rotate: false - xy: 1734, 167 + xy: 1781, 223 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-copper-small rotate: false - xy: 947, 3 + xy: 2029, 793 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-copper-xlarge rotate: false - xy: 1779, 449 + xy: 657, 3 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-graphite-medium rotate: false - xy: 1760, 167 + xy: 1807, 223 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-graphite-small rotate: false - xy: 965, 3 + xy: 1923, 227 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-graphite-xlarge rotate: false - xy: 955, 464 + xy: 389, 3 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-lead-medium rotate: false - xy: 1786, 167 + xy: 1721, 189 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-lead-small rotate: false - xy: 983, 3 + xy: 2029, 663 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-lead-xlarge rotate: false - xy: 997, 464 + xy: 987, 152 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-metaglass-medium rotate: false - xy: 1812, 165 + xy: 1747, 189 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-metaglass-small rotate: false - xy: 1001, 4 + xy: 1941, 227 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-metaglass-xlarge rotate: false - xy: 1039, 464 + xy: 1029, 152 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-phase-fabric-medium rotate: false - xy: 1838, 165 + xy: 1773, 197 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-phase-fabric-small rotate: false - xy: 1788, 397 + xy: 2029, 645 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-phase-fabric-xlarge rotate: false - xy: 1081, 464 + xy: 1071, 152 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-plastanium-medium rotate: false - xy: 1682, 145 + xy: 1799, 197 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-plastanium-small rotate: false - xy: 1788, 379 + xy: 2029, 627 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-plastanium-xlarge rotate: false - xy: 1123, 464 + xy: 1113, 152 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-pyratite-medium rotate: false - xy: 1708, 141 + xy: 1705, 163 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-pyratite-small rotate: false - xy: 1295, 864 + xy: 2029, 609 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-pyratite-xlarge rotate: false - xy: 1165, 464 + xy: 1155, 160 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-sand-medium rotate: false - xy: 1734, 141 + xy: 1705, 137 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-sand-small rotate: false - xy: 2029, 853 + xy: 1844, 75 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-sand-xlarge rotate: false - xy: 945, 422 + xy: 987, 110 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-scrap-medium rotate: false - xy: 1760, 141 + xy: 1731, 163 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-scrap-small rotate: false - xy: 2029, 835 + xy: 1844, 57 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-scrap-xlarge rotate: false - xy: 945, 380 + xy: 1029, 110 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-silicon-medium rotate: false - xy: 1786, 141 + xy: 1705, 111 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-silicon-small rotate: false - xy: 2029, 817 + xy: 437, 1000 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-silicon-xlarge rotate: false - xy: 987, 422 + xy: 1071, 110 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-source-icon-large rotate: false - xy: 1487, 645 + xy: 1627, 1329 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-source-icon-small rotate: false - xy: 1812, 139 + xy: 1731, 137 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-medium rotate: false - xy: 1838, 139 + xy: 1731, 111 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-small rotate: false - xy: 2029, 799 + xy: 455, 1000 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-surge-alloy-xlarge rotate: false - xy: 945, 338 + xy: 1113, 110 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-thorium-medium rotate: false - xy: 1604, 145 + xy: 1757, 163 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-thorium-small rotate: false - xy: 505, 7 + xy: 473, 1000 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-thorium-xlarge rotate: false - xy: 987, 380 + xy: 1155, 118 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-titanium-medium rotate: false - xy: 1630, 145 + xy: 1757, 137 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-small rotate: false - xy: 523, 7 + xy: 491, 1000 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-titanium-xlarge rotate: false - xy: 1029, 422 + xy: 971, 68 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-void-icon-large rotate: false - xy: 1537, 729 + xy: 1677, 1329 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-void-icon-small rotate: false - xy: 1656, 129 + xy: 1757, 111 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 javelin-ship-pad-icon-large rotate: false - xy: 1587, 729 + xy: 1777, 1329 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 javelin-ship-pad-icon-medium rotate: false - xy: 1835, 1055 + xy: 1459, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 javelin-ship-pad-icon-small rotate: false - xy: 1682, 119 + xy: 1783, 171 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 junction-icon-large rotate: false - xy: 1537, 629 + xy: 1877, 1329 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 junction-icon-small rotate: false - xy: 1708, 115 + xy: 1783, 145 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 kiln-icon-large rotate: false - xy: 1587, 629 + xy: 1369, 1271 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 kiln-icon-medium rotate: false - xy: 1869, 1055 + xy: 1493, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 kiln-icon-small rotate: false - xy: 1734, 115 + xy: 1783, 119 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 lancer rotate: false - xy: 639, 873 + xy: 639, 675 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 lancer-icon-full rotate: false - xy: 705, 873 + xy: 705, 741 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 lancer-icon-large rotate: false - xy: 1625, 779 + xy: 1927, 1357 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lancer-icon-medium rotate: false - xy: 1835, 1021 + xy: 1459, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lancer-icon-small rotate: false - xy: 1760, 115 + xy: 1809, 171 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4521,91 +4500,91 @@ laser-drill-icon-full index: -1 laser-drill-icon-large rotate: false - xy: 1633, 829 + xy: 1927, 1307 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 laser-drill-icon-medium rotate: false - xy: 1869, 1021 + xy: 1561, 1109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 laser-drill-icon-small rotate: false - xy: 1786, 115 + xy: 1809, 145 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 launch-pad-icon-large rotate: false - xy: 1637, 729 + xy: 1977, 1357 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 launch-pad-icon-medium rotate: false - xy: 1903, 1067 + xy: 1527, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 launch-pad-icon-small rotate: false - xy: 1812, 113 + xy: 1809, 119 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-junction-icon-large rotate: false - xy: 1637, 629 + xy: 685, 365 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-junction-icon-small rotate: false - xy: 1838, 113 + xy: 1825, 197 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-router-icon-full rotate: false - xy: 2005, 1067 + xy: 1595, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-icon-large rotate: false - xy: 1675, 779 + xy: 677, 307 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-router-icon-small rotate: false - xy: 1867, 225 + xy: 1835, 171 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-source-icon-large rotate: false - xy: 1687, 729 + xy: 1317, 822 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-source-icon-small rotate: false - xy: 1893, 225 + xy: 1835, 145 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4619,35 +4598,35 @@ liquid-tank-icon-full index: -1 liquid-tank-icon-large rotate: false - xy: 1687, 679 + xy: 1317, 772 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-tank-icon-medium rotate: false - xy: 1775, 987 + xy: 1629, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-tank-icon-small rotate: false - xy: 1919, 225 + xy: 1835, 119 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 magmarock-icon-large rotate: false - xy: 1687, 629 + xy: 1317, 722 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 magmarock-icon-small rotate: false - xy: 1945, 225 + xy: 1783, 93 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4668,119 +4647,119 @@ mass-driver-icon-full index: -1 mass-driver-icon-large rotate: false - xy: 479, 125 + xy: 1309, 672 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mass-driver-icon-medium rotate: false - xy: 1809, 953 + xy: 1697, 1109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mass-driver-icon-small rotate: false - xy: 1971, 225 + xy: 1809, 93 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mech-icon-alpha-mech rotate: false - xy: 505, 75 + xy: 1309, 622 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mech-icon-dart-ship rotate: false - xy: 505, 25 + xy: 1309, 572 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mech-icon-delta-mech rotate: false - xy: 1187, 664 + xy: 1325, 872 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mech-icon-glaive-ship rotate: false - xy: 1766, 1173 + xy: 519, 449 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 mech-icon-javelin-ship rotate: false - xy: 1237, 664 + xy: 1375, 877 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mech-icon-omega-mech rotate: false - xy: 1525, 961 + xy: 511, 245 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 mech-icon-tau-mech rotate: false - xy: 1824, 1173 + xy: 455, 59 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 mech-icon-trident-ship rotate: false - xy: 1525, 903 + xy: 455, 1 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 mechanical-drill-icon-full rotate: false - xy: 771, 873 + xy: 705, 675 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-icon-large rotate: false - xy: 1287, 661 + xy: 1425, 877 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mechanical-drill-icon-medium rotate: false - xy: 1775, 919 + xy: 1663, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-drill-icon-small rotate: false - xy: 1997, 225 + xy: 1835, 93 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mechanical-pump-icon-large rotate: false - xy: 1337, 661 + xy: 1342, 522 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mechanical-pump-icon-small rotate: false - xy: 2023, 225 + xy: 1861, 375 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4801,112 +4780,112 @@ meltdown-icon-full index: -1 meltdown-icon-large rotate: false - xy: 1387, 627 + xy: 1343, 472 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 meltdown-icon-medium rotate: false - xy: 1809, 919 + xy: 1595, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 meltdown-icon-small rotate: false - xy: 2022, 1703 + xy: 1857, 349 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 melter-icon-large rotate: false - xy: 1437, 627 + xy: 1343, 422 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 melter-icon-small rotate: false - xy: 2022, 1677 + xy: 1899, 729 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mend-projector-icon-large rotate: false - xy: 1487, 595 + xy: 1343, 372 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mend-projector-icon-medium rotate: false - xy: 1877, 965 + xy: 1527, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mend-projector-icon-small rotate: false - xy: 1541, 147 + xy: 1899, 703 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 metal-floor-2-icon-large rotate: false - xy: 1537, 579 + xy: 1343, 322 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 metal-floor-2-icon-small rotate: false - xy: 1541, 121 + xy: 1899, 677 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 metal-floor-3-icon-large rotate: false - xy: 1587, 579 + xy: 1343, 272 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 metal-floor-3-icon-small rotate: false - xy: 1541, 95 + xy: 1899, 651 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 metal-floor-5-icon-large rotate: false - xy: 1637, 579 + xy: 627, 257 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 metal-floor-5-icon-small rotate: false - xy: 1541, 69 + xy: 1899, 625 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 metal-floor-damaged-icon-large rotate: false - xy: 1687, 579 + xy: 677, 257 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 metal-floor-damaged-icon-small rotate: false - xy: 1567, 133 + xy: 1899, 599 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4920,35 +4899,35 @@ metal-floor-edge index: -1 metal-floor-icon-large rotate: false - xy: 1641, 891 + xy: 653, 207 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 metal-floor-icon-small rotate: false - xy: 1567, 107 + xy: 1898, 573 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 multi-press-icon-large rotate: false - xy: 1691, 941 + xy: 703, 207 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 multi-press-icon-medium rotate: false - xy: 1877, 897 + xy: 1663, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 multi-press-icon-small rotate: false - xy: 1567, 81 + xy: 1898, 547 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4962,1932 +4941,1932 @@ oil-extractor-icon-full index: -1 oil-extractor-icon-large rotate: false - xy: 1691, 891 + xy: 687, 157 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 oil-extractor-icon-medium rotate: false - xy: 1911, 897 + xy: 1629, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 oil-extractor-icon-small rotate: false - xy: 1593, 119 + xy: 1898, 521 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 omega-mech-pad-icon-large rotate: false - xy: 1683, 841 + xy: 687, 107 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 omega-mech-pad-icon-medium rotate: false - xy: 1979, 897 + xy: 1799, 1109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 omega-mech-pad-icon-small rotate: false - xy: 1593, 93 + xy: 1896, 495 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-holostone-icon-large rotate: false - xy: 495, 207 + xy: 737, 157 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-coal-holostone-icon-small rotate: false - xy: 1619, 119 + xy: 1925, 727 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-holostone1 rotate: false - xy: 2013, 897 + xy: 1765, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-holostone2 rotate: false - xy: 1783, 885 + xy: 1731, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-holostone3 rotate: false - xy: 1783, 851 + xy: 1697, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-holostone-icon-full rotate: false - xy: 1783, 851 + xy: 1697, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-holostone-icon-medium rotate: false - xy: 1783, 851 + xy: 1697, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand-icon-large rotate: false - xy: 545, 407 + xy: 737, 107 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-coal-sand-icon-small rotate: false - xy: 1619, 93 + xy: 1925, 701 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 1817, 885 + xy: 1663, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 1817, 851 + xy: 1629, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 1825, 817 + xy: 1833, 1109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand-icon-full rotate: false - xy: 1825, 817 + xy: 1833, 1109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand-icon-medium rotate: false - xy: 1825, 817 + xy: 1833, 1109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-icon-large rotate: false - xy: 545, 357 + xy: 721, 57 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-coal-stained-stone-icon-small rotate: false - xy: 1645, 103 + xy: 1951, 727 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-stained-stone-red-icon-large rotate: false - xy: 545, 307 + xy: 771, 57 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-coal-stained-stone-red-icon-small rotate: false - xy: 1567, 55 + xy: 1925, 675 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-stained-stone-red1 rotate: false - xy: 1953, 863 + xy: 1697, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-red2 rotate: false - xy: 1987, 863 + xy: 1663, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-red3 rotate: false - xy: 1859, 829 + xy: 1867, 1109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-red-icon-full rotate: false - xy: 1859, 829 + xy: 1867, 1109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-red-icon-medium rotate: false - xy: 1859, 829 + xy: 1867, 1109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone1 rotate: false - xy: 1851, 863 + xy: 1799, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone2 rotate: false - xy: 1885, 863 + xy: 1765, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone3 rotate: false - xy: 1919, 863 + xy: 1731, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-icon-full rotate: false - xy: 1919, 863 + xy: 1731, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-icon-medium rotate: false - xy: 1919, 863 + xy: 1731, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone-icon-large rotate: false - xy: 545, 257 + xy: 721, 7 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-coal-stone-icon-small rotate: false - xy: 1593, 67 + xy: 1951, 701 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 1893, 829 + xy: 1833, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 1927, 829 + xy: 1799, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 1961, 829 + xy: 1765, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone-icon-full rotate: false - xy: 1961, 829 + xy: 1765, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone-icon-medium rotate: false - xy: 1961, 829 + xy: 1765, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-holostone-icon-large rotate: false - xy: 545, 207 + xy: 771, 7 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-copper-holostone-icon-small rotate: false - xy: 1619, 67 + xy: 1977, 727 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-holostone1 rotate: false - xy: 1995, 829 + xy: 1731, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-holostone2 rotate: false - xy: 1859, 795 + xy: 1697, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-holostone3 rotate: false - xy: 1893, 795 + xy: 1867, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-holostone-icon-full rotate: false - xy: 1893, 795 + xy: 1867, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-holostone-icon-medium rotate: false - xy: 1893, 795 + xy: 1867, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand-icon-large rotate: false - xy: 595, 423 + xy: 1427, 1279 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-copper-sand-icon-small rotate: false - xy: 1645, 77 + xy: 1925, 649 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-sand1 rotate: false - xy: 1927, 795 + xy: 1833, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand2 rotate: false - xy: 1961, 795 + xy: 1799, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand3 rotate: false - xy: 1995, 795 + xy: 1765, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand-icon-full rotate: false - xy: 1995, 795 + xy: 1765, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand-icon-medium rotate: false - xy: 1995, 795 + xy: 1765, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-icon-large rotate: false - xy: 595, 373 + xy: 1477, 1279 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-copper-stained-stone-icon-small rotate: false - xy: 1671, 93 + xy: 1951, 675 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-stained-stone-red-icon-large rotate: false - xy: 645, 423 + xy: 1527, 1279 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-copper-stained-stone-red-icon-small rotate: false - xy: 1671, 67 + xy: 1977, 701 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-stained-stone-red1 rotate: false - xy: 1837, 693 + xy: 1799, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-red2 rotate: false - xy: 1905, 761 + xy: 1765, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-red3 rotate: false - xy: 1871, 727 + xy: 1867, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-red-icon-full rotate: false - xy: 1871, 727 + xy: 1867, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-red-icon-medium rotate: false - xy: 1871, 727 + xy: 1867, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone1 rotate: false - xy: 1837, 761 + xy: 1731, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone2 rotate: false - xy: 1837, 727 + xy: 1867, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone3 rotate: false - xy: 1871, 761 + xy: 1833, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-icon-full rotate: false - xy: 1871, 761 + xy: 1833, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-icon-medium rotate: false - xy: 1871, 761 + xy: 1833, 1007 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone-icon-large rotate: false - xy: 595, 323 + xy: 1577, 1279 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-copper-stone-icon-small rotate: false - xy: 1645, 51 + xy: 2003, 727 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-stone1 rotate: false - xy: 1837, 659 + xy: 1833, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone2 rotate: false - xy: 1939, 761 + xy: 1799, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone3 rotate: false - xy: 1905, 727 + xy: 1867, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone-icon-full rotate: false - xy: 1905, 727 + xy: 1867, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone-icon-medium rotate: false - xy: 1905, 727 + xy: 1867, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-holostone-icon-large rotate: false - xy: 645, 373 + xy: 1627, 1279 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-lead-holostone-icon-small rotate: false - xy: 1671, 41 + xy: 1925, 623 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-holostone1 rotate: false - xy: 1871, 693 + xy: 1833, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-holostone2 rotate: false - xy: 1837, 625 + xy: 1867, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-holostone3 rotate: false - xy: 1973, 761 + xy: 1475, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-holostone-icon-full rotate: false - xy: 1973, 761 + xy: 1475, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-holostone-icon-medium rotate: false - xy: 1973, 761 + xy: 1475, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand-icon-large rotate: false - xy: 595, 273 + xy: 1677, 1279 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-lead-sand-icon-small rotate: false - xy: 1697, 89 + xy: 1951, 649 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 1939, 727 + xy: 1509, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 1905, 693 + xy: 1543, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 1871, 659 + xy: 1577, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand-icon-full rotate: false - xy: 1871, 659 + xy: 1577, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand-icon-medium rotate: false - xy: 1871, 659 + xy: 1577, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-icon-large rotate: false - xy: 645, 323 + xy: 1727, 1279 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-lead-stained-stone-icon-small rotate: false - xy: 1697, 63 + xy: 1977, 675 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-stained-stone-red-icon-large rotate: false - xy: 595, 223 + xy: 1777, 1279 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-lead-stained-stone-red-icon-small rotate: false - xy: 1723, 89 + xy: 2003, 701 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-stained-stone-red1 rotate: false - xy: 1905, 659 + xy: 1713, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-red2 rotate: false - xy: 1871, 625 + xy: 1747, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-red3 rotate: false - xy: 1837, 557 + xy: 1781, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-red-icon-full rotate: false - xy: 1837, 557 + xy: 1781, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-red-icon-medium rotate: false - xy: 1837, 557 + xy: 1781, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone1 rotate: false - xy: 1837, 591 + xy: 1611, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone2 rotate: false - xy: 1973, 727 + xy: 1645, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone3 rotate: false - xy: 1939, 693 + xy: 1679, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-icon-full rotate: false - xy: 1939, 693 + xy: 1679, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-icon-medium rotate: false - xy: 1939, 693 + xy: 1679, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone-icon-large rotate: false - xy: 645, 273 + xy: 1827, 1279 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-lead-stone-icon-small rotate: false - xy: 1723, 63 + xy: 1951, 623 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 1973, 693 + xy: 1815, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 1939, 659 + xy: 1849, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 1905, 625 + xy: 1883, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone-icon-full rotate: false - xy: 1905, 625 + xy: 1883, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone-icon-medium rotate: false - xy: 1905, 625 + xy: 1883, 905 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-holostone-icon-large rotate: false - xy: 645, 223 + xy: 1877, 1279 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-scrap-holostone-icon-small rotate: false - xy: 1749, 89 + xy: 1977, 649 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-holostone1 rotate: false - xy: 1871, 591 + xy: 1913, 1121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-holostone2 rotate: false - xy: 1973, 659 + xy: 1947, 1121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-holostone3 rotate: false - xy: 1939, 625 + xy: 1981, 1121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-holostone-icon-full rotate: false - xy: 1939, 625 + xy: 1981, 1121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-holostone-icon-medium rotate: false - xy: 1939, 625 + xy: 1981, 1121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand-icon-large rotate: false - xy: 695, 423 + xy: 1927, 1257 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-scrap-sand-icon-small rotate: false - xy: 1749, 63 + xy: 2003, 675 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-sand1 rotate: false - xy: 1905, 591 + xy: 2015, 1121 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand2 rotate: false - xy: 1871, 557 + xy: 1901, 1087 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand3 rotate: false - xy: 1973, 625 + xy: 1935, 1087 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand-icon-full rotate: false - xy: 1973, 625 + xy: 1935, 1087 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand-icon-medium rotate: false - xy: 1973, 625 + xy: 1935, 1087 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow-icon-large rotate: false - xy: 695, 373 + xy: 1977, 1257 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-scrap-snow-icon-small rotate: false - xy: 1775, 89 + xy: 1977, 623 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-snow1 rotate: false - xy: 1939, 591 + xy: 1901, 1053 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow2 rotate: false - xy: 1905, 557 + xy: 1969, 1087 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow3 rotate: false - xy: 1973, 591 + xy: 1935, 1053 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow-icon-full rotate: false - xy: 1973, 591 + xy: 1935, 1053 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow-icon-medium rotate: false - xy: 1973, 591 + xy: 1935, 1053 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-icon-large rotate: false - xy: 695, 323 + xy: 1359, 672 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-scrap-stained-stone-icon-small rotate: false - xy: 1775, 63 + xy: 2003, 649 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-stained-stone-red-icon-large rotate: false - xy: 695, 273 + xy: 1359, 622 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-scrap-stained-stone-red-icon-small rotate: false - xy: 1697, 37 + xy: 2003, 623 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-stained-stone-red1 rotate: false - xy: 2007, 727 + xy: 1935, 1019 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-red2 rotate: false - xy: 2007, 693 + xy: 1901, 985 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-red3 rotate: false - xy: 2007, 659 + xy: 2003, 1053 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-red-icon-full rotate: false - xy: 2007, 659 + xy: 2003, 1053 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-red-icon-medium rotate: false - xy: 2007, 659 + xy: 2003, 1053 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone1 rotate: false - xy: 1939, 557 + xy: 1901, 1019 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone2 rotate: false - xy: 1973, 557 + xy: 2003, 1087 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone3 rotate: false - xy: 2007, 761 + xy: 1969, 1053 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-icon-full rotate: false - xy: 2007, 761 + xy: 1969, 1053 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-icon-medium rotate: false - xy: 2007, 761 + xy: 1969, 1053 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone-icon-large rotate: false - xy: 695, 223 + xy: 1359, 572 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-scrap-stone-icon-small rotate: false - xy: 1723, 37 + xy: 1925, 597 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-stone1 rotate: false - xy: 2007, 625 + xy: 1969, 1019 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone2 rotate: false - xy: 2007, 591 + xy: 1935, 985 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone3 rotate: false - xy: 2007, 557 + xy: 1901, 951 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone-icon-full rotate: false - xy: 2007, 557 + xy: 1901, 951 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone-icon-medium rotate: false - xy: 2007, 557 + xy: 1901, 951 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-holostone-icon-large rotate: false - xy: 745, 427 + xy: 1392, 522 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-thorium-holostone-icon-small rotate: false - xy: 1749, 37 + xy: 1951, 597 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-holostone1 rotate: false - xy: 1863, 523 + xy: 2003, 1019 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-holostone2 rotate: false - xy: 1863, 489 + xy: 1969, 985 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-holostone3 rotate: false - xy: 1897, 523 + xy: 1935, 951 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-holostone-icon-full rotate: false - xy: 1897, 523 + xy: 1935, 951 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-holostone-icon-medium rotate: false - xy: 1897, 523 + xy: 1935, 951 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand-icon-large rotate: false - xy: 745, 377 + xy: 1393, 472 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-thorium-sand-icon-small rotate: false - xy: 1775, 37 + xy: 1977, 597 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 1931, 523 + xy: 2003, 985 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 1897, 489 + xy: 1969, 951 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 1965, 523 + xy: 2003, 951 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand-icon-full rotate: false - xy: 1965, 523 + xy: 2003, 951 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand-icon-medium rotate: false - xy: 1965, 523 + xy: 2003, 951 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-icon-large rotate: false - xy: 795, 427 + xy: 1393, 422 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-thorium-stained-stone-icon-small rotate: false - xy: 1801, 87 + xy: 2003, 597 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-stained-stone-red-icon-large rotate: false - xy: 745, 327 + xy: 1393, 372 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-thorium-stained-stone-red-icon-small rotate: false - xy: 1801, 61 + xy: 1924, 571 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-stained-stone-red1 rotate: false - xy: 1999, 489 + xy: 1917, 883 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-red2 rotate: false - xy: 1889, 455 + xy: 1951, 883 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-red3 rotate: false - xy: 1923, 455 + xy: 1985, 883 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-red-icon-full rotate: false - xy: 1923, 455 + xy: 1985, 883 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-red-icon-medium rotate: false - xy: 1923, 455 + xy: 1985, 883 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone1 rotate: false - xy: 1931, 489 + xy: 1917, 917 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone2 rotate: false - xy: 1999, 523 + xy: 1951, 917 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone3 rotate: false - xy: 1965, 489 + xy: 1985, 917 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-icon-full rotate: false - xy: 1965, 489 + xy: 1985, 917 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-icon-medium rotate: false - xy: 1965, 489 + xy: 1985, 917 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone-icon-large rotate: false - xy: 795, 377 + xy: 1393, 322 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-thorium-stone-icon-small rotate: false - xy: 1827, 87 + xy: 1924, 545 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 1957, 455 + xy: 1517, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 1991, 455 + xy: 1517, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 1915, 421 + xy: 1551, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone-icon-full rotate: false - xy: 1915, 421 + xy: 1551, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone-icon-medium rotate: false - xy: 1915, 421 + xy: 1551, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-holostone-icon-large rotate: false - xy: 845, 427 + xy: 1393, 272 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-titanium-holostone-icon-small rotate: false - xy: 1827, 61 + xy: 1950, 571 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-holostone1 rotate: false - xy: 1949, 421 + xy: 1517, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-holostone2 rotate: false - xy: 1983, 421 + xy: 1585, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-holostone3 rotate: false - xy: 1915, 387 + xy: 1551, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-holostone-icon-full rotate: false - xy: 1915, 387 + xy: 1551, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-holostone-icon-medium rotate: false - xy: 1915, 387 + xy: 1551, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand-icon-large rotate: false - xy: 745, 277 + xy: 1367, 822 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-titanium-sand-icon-small rotate: false - xy: 1801, 35 + xy: 1950, 545 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 1949, 387 + xy: 1517, 769 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 1983, 387 + xy: 1619, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 1249, 443 + xy: 1585, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand-icon-full rotate: false - xy: 1249, 443 + xy: 1585, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand-icon-medium rotate: false - xy: 1249, 443 + xy: 1585, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-icon-large rotate: false - xy: 795, 327 + xy: 1367, 772 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-titanium-stained-stone-icon-small rotate: false - xy: 1827, 35 + xy: 1976, 571 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-stained-stone-red-icon-large rotate: false - xy: 845, 377 + xy: 1367, 722 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-titanium-stained-stone-red-icon-small rotate: false - xy: 1593, 41 + xy: 1976, 545 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-stained-stone-red1 rotate: false - xy: 1283, 409 + xy: 1619, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-red2 rotate: false - xy: 1317, 409 + xy: 1585, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-red3 rotate: false - xy: 1278, 375 + xy: 1551, 769 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-red-icon-full rotate: false - xy: 1278, 375 + xy: 1551, 769 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-red-icon-medium rotate: false - xy: 1278, 375 + xy: 1551, 769 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone1 rotate: false - xy: 1283, 443 + xy: 1551, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone2 rotate: false - xy: 1317, 443 + xy: 1517, 735 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone3 rotate: false - xy: 1249, 409 + xy: 1653, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-icon-full rotate: false - xy: 1249, 409 + xy: 1653, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-icon-medium rotate: false - xy: 1249, 409 + xy: 1653, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone-icon-large rotate: false - xy: 745, 227 + xy: 1417, 827 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-titanium-stone-icon-small rotate: false - xy: 1619, 41 + xy: 2002, 571 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 1312, 375 + xy: 1687, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 1305, 341 + xy: 1653, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 1305, 307 + xy: 1619, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone-icon-full rotate: false - xy: 1305, 307 + xy: 1619, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone-icon-medium rotate: false - xy: 1305, 307 + xy: 1619, 803 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-projector-icon-large rotate: false - xy: 795, 277 + xy: 1417, 777 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 overdrive-projector-icon-medium rotate: false - xy: 1339, 341 + xy: 1585, 769 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-projector-icon-small rotate: false - xy: 1645, 25 + xy: 2002, 545 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 overflow-gate-icon-large rotate: false - xy: 845, 327 + xy: 1417, 727 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 overflow-gate-icon-small rotate: false - xy: 1671, 15 + xy: 1924, 519 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phantom-factory-icon-full rotate: false - xy: 771, 675 + xy: 781, 477 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phantom-factory-icon-large rotate: false - xy: 795, 227 + xy: 1409, 672 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phantom-factory-icon-medium rotate: false - xy: 1346, 375 + xy: 1721, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phantom-factory-icon-small rotate: false - xy: 1697, 11 + xy: 1950, 519 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-conduit-icon-large rotate: false - xy: 845, 277 + xy: 1409, 622 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phase-conduit-icon-small rotate: false - xy: 1723, 11 + xy: 1976, 519 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-conveyor-icon-large rotate: false - xy: 845, 227 + xy: 1409, 572 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phase-conveyor-icon-small rotate: false - xy: 1749, 11 + xy: 2002, 519 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-wall-icon-large rotate: false - xy: 529, 157 + xy: 1442, 522 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phase-wall-icon-small rotate: false - xy: 1775, 11 + xy: 1922, 493 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-wall-large-icon-large rotate: false - xy: 895, 427 + xy: 1443, 472 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phase-wall-large-icon-medium rotate: false - xy: 1387, 103 + xy: 1789, 871 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large-icon-small rotate: false - xy: 1801, 9 + xy: 1948, 493 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-weaver-icon-full rotate: false - xy: 781, 477 + xy: 997, 956 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-icon-large rotate: false - xy: 895, 377 + xy: 1443, 422 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phase-weaver-icon-medium rotate: false - xy: 1387, 69 + xy: 1755, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-weaver-icon-small rotate: false - xy: 1827, 9 + xy: 1974, 493 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pine-icon-large rotate: false - xy: 895, 327 + xy: 1443, 372 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pine-icon-small rotate: false - xy: 1853, 87 + xy: 2000, 493 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 plastanium-compressor-icon-large rotate: false - xy: 895, 277 + xy: 1443, 322 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 plastanium-compressor-icon-medium rotate: false - xy: 1373, 307 + xy: 1687, 769 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-compressor-icon-small rotate: false - xy: 1853, 61 + xy: 1815, 303 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pneumatic-drill-icon-full rotate: false - xy: 1575, 1297 + xy: 1129, 956 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-icon-large rotate: false - xy: 895, 227 + xy: 1443, 272 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pneumatic-drill-icon-medium rotate: false - xy: 1399, 273 + xy: 1653, 735 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pneumatic-drill-icon-small rotate: false - xy: 1853, 35 + xy: 1823, 329 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 power-node-icon-large rotate: false - xy: 595, 173 + xy: 1467, 827 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 power-node-icon-small rotate: false - xy: 1853, 9 + xy: 1849, 323 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 power-node-large-icon-large rotate: false - xy: 645, 173 + xy: 1467, 777 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 power-node-large-icon-medium rotate: false - xy: 1425, 205 + xy: 1789, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large-icon-small rotate: false - xy: 1867, 199 + xy: 1841, 297 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 power-source-icon-large rotate: false - xy: 695, 173 + xy: 1467, 727 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 power-source-icon-small rotate: false - xy: 1893, 199 + xy: 1833, 271 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 power-void-icon-large rotate: false - xy: 745, 177 + xy: 1459, 677 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 power-void-icon-small rotate: false - xy: 1919, 199 + xy: 1833, 245 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pulse-conduit-icon-full rotate: false - xy: 1455, 137 + xy: 1823, 837 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-icon-large rotate: false - xy: 795, 177 + xy: 1459, 627 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pulse-conduit-icon-small rotate: false - xy: 1945, 199 + xy: 1875, 323 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pulverizer-icon-full rotate: false - xy: 1407, 357 + xy: 1823, 769 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-icon-large rotate: false - xy: 845, 177 + xy: 1459, 577 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pulverizer-icon-small rotate: false - xy: 1971, 199 + xy: 1867, 297 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pyratite-mixer-icon-large rotate: false - xy: 895, 177 + xy: 1492, 527 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pyratite-mixer-icon-medium rotate: false - xy: 1516, 377 + xy: 1857, 769 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer-icon-small rotate: false - xy: 1997, 199 + xy: 1859, 271 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 repair-point rotate: false - xy: 1550, 377 + xy: 1823, 735 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 repair-point-icon-full rotate: false - xy: 1618, 377 + xy: 1559, 701 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 repair-point-icon-large rotate: false - xy: 1725, 791 + xy: 1493, 427 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 repair-point-icon-small rotate: false - xy: 2023, 199 + xy: 1859, 245 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6901,21 +6880,21 @@ revenant-factory-icon-full index: -1 revenant-factory-icon-large rotate: false - xy: 1737, 741 + xy: 1493, 377 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 revenant-factory-icon-medium rotate: false - xy: 1652, 377 + xy: 1593, 701 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 revenant-factory-icon-small rotate: false - xy: 1864, 173 + xy: 1883, 349 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6936,126 +6915,126 @@ ripple-icon-full index: -1 ripple-icon-large rotate: false - xy: 1737, 641 + xy: 1493, 277 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ripple-icon-medium rotate: false - xy: 1686, 377 + xy: 1559, 667 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ripple-icon-small rotate: false - xy: 1864, 147 + xy: 1893, 297 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rocks-icon-large rotate: false - xy: 1787, 741 + xy: 1509, 577 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rocks-icon-small rotate: false - xy: 1890, 173 + xy: 1885, 271 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rotary-pump-icon-large rotate: false - xy: 1787, 691 + xy: 1542, 527 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rotary-pump-icon-medium rotate: false - xy: 1441, 323 + xy: 1559, 633 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-icon-small rotate: false - xy: 1864, 121 + xy: 1901, 323 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 router-icon-large rotate: false - xy: 1787, 641 + xy: 1543, 477 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 router-icon-small rotate: false - xy: 1890, 147 + xy: 1885, 245 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rtg-generator-icon-large rotate: false - xy: 1787, 591 + xy: 1543, 427 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rtg-generator-icon-medium rotate: false - xy: 1475, 325 + xy: 1627, 667 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator-icon-small rotate: false - xy: 1916, 173 + xy: 1911, 271 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 salvo rotate: false - xy: 847, 477 + xy: 1337, 1191 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-icon-full rotate: false - xy: 1443, 1223 + xy: 1327, 1059 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-icon-large rotate: false - xy: 1737, 541 + xy: 1543, 377 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 salvo-icon-medium rotate: false - xy: 1543, 343 + xy: 1559, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salvo-icon-small rotate: false - xy: 1890, 121 + xy: 1911, 245 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7069,14 +7048,14 @@ sand-edge index: -1 sand-icon-large rotate: false - xy: 1787, 541 + xy: 1543, 327 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-icon-small rotate: false - xy: 1916, 147 + xy: 1919, 297 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7090,147 +7069,147 @@ sand-water-edge index: -1 sand-water-icon-large rotate: false - xy: 1766, 1123 + xy: 1543, 277 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-water-icon-small rotate: false - xy: 1942, 173 + xy: 1937, 271 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-large rotate: false - xy: 1816, 1123 + xy: 1493, 227 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-medium rotate: false - xy: 1679, 309 + xy: 1763, 701 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-small rotate: false - xy: 1916, 121 + xy: 1937, 245 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scrap-wall-huge-icon-large rotate: false - xy: 1866, 1123 + xy: 1543, 227 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scrap-wall-huge-icon-medium rotate: false - xy: 1713, 305 + xy: 1695, 599 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-huge-icon-small rotate: false - xy: 1942, 147 + xy: 1896, 469 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scrap-wall-icon-large rotate: false - xy: 1916, 1151 + xy: 743, 377 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scrap-wall-icon-small rotate: false - xy: 1968, 173 + xy: 1922, 467 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scrap-wall-large-icon-large rotate: false - xy: 1966, 1151 + xy: 793, 377 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scrap-wall-large-icon-medium rotate: false - xy: 1475, 291 + xy: 1729, 633 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-large-icon-small rotate: false - xy: 1942, 121 + xy: 1948, 467 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 separator-icon-large rotate: false - xy: 1916, 1101 + xy: 843, 377 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 separator-icon-medium rotate: false - xy: 1543, 275 + xy: 1797, 701 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 separator-icon-small rotate: false - xy: 1994, 136 + xy: 1894, 443 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shock-mine-icon-large rotate: false - xy: 1966, 1101 + xy: 893, 377 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shock-mine-icon-small rotate: false - xy: 2020, 173 + xy: 1920, 441 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 silicon-smelter-icon-large rotate: false - xy: 879, 621 + xy: 993, 344 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 silicon-smelter-icon-medium rotate: false - xy: 1645, 275 + xy: 1797, 667 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 silicon-smelter-icon-small rotate: false - xy: 2020, 147 + xy: 1946, 441 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7244,91 +7223,91 @@ snow-edge index: -1 snow-icon-large rotate: false - xy: 929, 671 + xy: 1043, 344 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snow-icon-small rotate: false - xy: 1879, 95 + xy: 1891, 417 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 snowrocks-icon-large rotate: false - xy: 879, 571 + xy: 1093, 344 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snowrocks-icon-small rotate: false - xy: 1879, 69 + xy: 1887, 391 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 solar-panel-icon-large rotate: false - xy: 929, 621 + xy: 1143, 344 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 solar-panel-icon-small rotate: false - xy: 1905, 95 + xy: 1917, 415 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 solar-panel-large-icon-large rotate: false - xy: 929, 571 + xy: 1193, 295 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 solar-panel-large-icon-medium rotate: false - xy: 1781, 305 + xy: 1865, 701 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-large-icon-small rotate: false - xy: 1879, 43 + xy: 1943, 415 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 sorter-icon-large rotate: false - xy: 979, 656 + xy: 1243, 272 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sorter-icon-small rotate: false - xy: 1905, 69 + xy: 1913, 389 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spawn-icon-large rotate: false - xy: 1029, 656 + xy: 1293, 256 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spawn-icon-small rotate: false - xy: 1931, 95 + xy: 1939, 389 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7349,126 +7328,126 @@ spectre-icon-full index: -1 spectre-icon-large rotate: false - xy: 979, 606 + xy: 1343, 222 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spectre-icon-medium rotate: false - xy: 1849, 371 + xy: 1592, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spectre-icon-small rotate: false - xy: 1879, 17 + xy: 1972, 425 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spirit-factory-icon-full rotate: false - xy: 1063, 1022 + xy: 487, 177 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spirit-factory-icon-large rotate: false - xy: 1029, 606 + xy: 1443, 222 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spirit-factory-icon-medium rotate: false - xy: 1815, 303 + xy: 1592, 531 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spirit-factory-icon-small rotate: false - xy: 1905, 43 + xy: 1909, 363 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spore-cluster-icon-large rotate: false - xy: 1129, 656 + xy: 1493, 177 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-cluster-icon-medium rotate: false - xy: 1849, 337 + xy: 1626, 565 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-cluster-icon-small rotate: false - xy: 1931, 69 + xy: 1935, 363 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 stained-boulder-icon-large rotate: false - xy: 1079, 606 + xy: 1543, 177 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stained-boulder-icon-small rotate: false - xy: 1905, 17 + xy: 1927, 337 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 stained-rocks-icon-large rotate: false - xy: 1129, 606 + xy: 735, 327 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stained-rocks-icon-small rotate: false - xy: 1931, 43 + xy: 1953, 337 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 stained-rocks-red-icon-large rotate: false - xy: 1179, 614 + xy: 785, 327 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stained-rocks-red-icon-small rotate: false - xy: 1931, 17 + xy: 1961, 363 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 stained-rocks-yellow-icon-large rotate: false - xy: 1229, 614 + xy: 835, 327 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stained-rocks-yellow-icon-small rotate: false - xy: 2020, 121 + xy: 1965, 389 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7482,14 +7461,14 @@ stained-stone-edge index: -1 stained-stone-icon-large rotate: false - xy: 1279, 611 + xy: 885, 327 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stained-stone-icon-small rotate: false - xy: 1994, 110 + xy: 1945, 311 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7503,14 +7482,14 @@ stained-stone-red-edge index: -1 stained-stone-red-icon-large rotate: false - xy: 1329, 611 + xy: 727, 277 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stained-stone-red-icon-small rotate: false - xy: 1968, 105 + xy: 1979, 337 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7524,14 +7503,14 @@ stained-stone-yellow-edge index: -1 stained-stone-yellow-icon-large rotate: false - xy: 979, 556 + xy: 777, 277 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stained-stone-yellow-icon-small rotate: false - xy: 1957, 79 + xy: 1971, 311 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7545,105 +7524,105 @@ stone-edge index: -1 stone-icon-large rotate: false - xy: 1029, 556 + xy: 827, 277 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stone-icon-small rotate: false - xy: 1957, 53 + xy: 1987, 363 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 surge-tower-icon-large rotate: false - xy: 1079, 556 + xy: 877, 277 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 surge-tower-icon-medium rotate: false - xy: 613, 139 + xy: 1661, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-tower-icon-small rotate: false - xy: 1957, 27 + xy: 1963, 285 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 surge-wall-icon-large rotate: false - xy: 1129, 556 + xy: 753, 227 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 surge-wall-icon-small rotate: false - xy: 1957, 1 + xy: 1963, 259 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 surge-wall-large-icon-large rotate: false - xy: 1179, 564 + xy: 803, 227 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 surge-wall-large-icon-medium rotate: false - xy: 681, 139 + xy: 1627, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large-icon-small rotate: false - xy: 2020, 95 + xy: 1963, 233 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 swarmer rotate: false - xy: 1195, 988 + xy: 879, 641 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 swarmer-icon-full rotate: false - xy: 1261, 1054 + xy: 879, 575 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 swarmer-icon-large rotate: false - xy: 1279, 561 + xy: 787, 177 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 swarmer-icon-medium rotate: false - xy: 589, 105 + xy: 1661, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer-icon-small rotate: false - xy: 1994, 84 + xy: 1997, 311 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7657,154 +7636,154 @@ tar-edge index: -1 tar-icon-large rotate: false - xy: 1329, 561 + xy: 787, 127 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tar-icon-small rotate: false - xy: 1983, 58 + xy: 1989, 285 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 tau-mech-pad-icon-large rotate: false - xy: 913, 521 + xy: 821, 77 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau-mech-pad-icon-medium rotate: false - xy: 623, 105 + xy: 1593, 361 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tau-mech-pad-icon-small rotate: false - xy: 1983, 32 + xy: 2005, 337 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thermal-generator-icon-large rotate: false - xy: 963, 506 + xy: 821, 27 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thermal-generator-icon-medium rotate: false - xy: 589, 37 + xy: 1627, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-generator-icon-small rotate: false - xy: 1983, 6 + xy: 2023, 311 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thermal-pump-icon-large rotate: false - xy: 1013, 506 + xy: 903, 227 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thermal-pump-icon-medium rotate: false - xy: 623, 71 + xy: 1661, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-icon-small rotate: false - xy: 2020, 69 + xy: 1989, 259 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-reactor-icon-large rotate: false - xy: 1063, 506 + xy: 887, 177 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thorium-reactor-icon-medium rotate: false - xy: 657, 37 + xy: 1627, 361 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-reactor-icon-small rotate: false - xy: 2009, 43 + xy: 2015, 285 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-wall-icon-large rotate: false - xy: 1113, 506 + xy: 887, 127 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thorium-wall-icon-small rotate: false - xy: 2009, 17 + xy: 1989, 233 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-wall-large-icon-large rotate: false - xy: 1379, 527 + xy: 871, 77 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thorium-wall-large-icon-medium rotate: false - xy: 691, 71 + xy: 1695, 429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large-icon-small rotate: false - xy: 1882, 1175 + xy: 2015, 259 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thruster-icon-large rotate: false - xy: 1429, 527 + xy: 871, 27 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thruster-icon-medium rotate: false - xy: 691, 37 + xy: 1729, 463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thruster-icon-small rotate: false - xy: 1028, 70 + xy: 2015, 233 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7818,112 +7797,112 @@ titan-factory-icon-full index: -1 titan-factory-icon-large rotate: false - xy: 1479, 545 + xy: 927, 277 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titan-factory-icon-medium rotate: false - xy: 589, 3 + xy: 1763, 497 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titan-factory-icon-small rotate: false - xy: 1054, 78 + xy: 2000, 430 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titanium-conveyor-icon-large rotate: false - xy: 1529, 529 + xy: 977, 294 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titanium-conveyor-icon-small rotate: false - xy: 1080, 74 + xy: 1722, 85 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titanium-wall-icon-large rotate: false - xy: 1579, 529 + xy: 1027, 294 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titanium-wall-icon-small rotate: false - xy: 1028, 44 + xy: 1722, 59 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titanium-wall-large-icon-large rotate: false - xy: 1629, 529 + xy: 1077, 294 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titanium-wall-large-icon-medium rotate: false - xy: 895, 75 + xy: 1627, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large-icon-small rotate: false - xy: 1054, 52 + xy: 1748, 85 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 trident-ship-pad-icon-large rotate: false - xy: 1679, 529 + xy: 1127, 294 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 trident-ship-pad-icon-medium rotate: false - xy: 895, 7 + xy: 1695, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 trident-ship-pad-icon-small rotate: false - xy: 1080, 48 + xy: 1722, 33 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 turbine-generator-icon-large rotate: false - xy: 1479, 495 + xy: 953, 227 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 turbine-generator-icon-medium rotate: false - xy: 929, 123 + xy: 1729, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 turbine-generator-icon-small rotate: false - xy: 1027, 18 + xy: 1748, 59 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7937,14 +7916,14 @@ unit-icon-chaos-array index: -1 unit-icon-crawler rotate: false - xy: 1529, 479 + xy: 937, 177 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-icon-dagger rotate: false - xy: 1579, 479 + xy: 937, 127 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -7958,56 +7937,56 @@ unit-icon-eradicator index: -1 unit-icon-eruptor rotate: false - xy: 1393, 1091 + xy: 1035, 692 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-icon-fortress rotate: false - xy: 1393, 1025 + xy: 1101, 692 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-icon-titan rotate: false - xy: 1393, 959 + xy: 945, 626 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unloader-icon-large rotate: false - xy: 1629, 479 + xy: 921, 77 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unloader-icon-small rotate: false - xy: 1106, 69 + xy: 1748, 33 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 vault-icon-large rotate: false - xy: 1679, 479 + xy: 921, 27 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 vault-icon-medium rotate: false - xy: 929, 89 + xy: 1797, 395 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 vault-icon-small rotate: false - xy: 1106, 43 + xy: 1722, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8021,308 +8000,308 @@ water-edge index: -1 water-extractor-icon-full rotate: false - xy: 1459, 1025 + xy: 1077, 626 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-icon-large rotate: false - xy: 1729, 491 + xy: 1003, 244 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 water-extractor-icon-medium rotate: false - xy: 963, 89 + xy: 1627, 191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-extractor-icon-small rotate: false - xy: 1054, 26 + xy: 1748, 7 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 water-icon-large rotate: false - xy: 1779, 491 + xy: 1053, 244 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 water-icon-small rotate: false - xy: 1080, 22 + xy: 1774, 67 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 wave rotate: false - xy: 1327, 861 + xy: 1143, 626 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wave-icon-full rotate: false - xy: 1393, 827 + xy: 1143, 560 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wave-icon-large rotate: false - xy: 1163, 506 + xy: 1103, 244 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wave-icon-medium rotate: false - xy: 929, 21 + xy: 1661, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-icon-small rotate: false - xy: 1106, 17 + xy: 1774, 41 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 white-tree-dead-icon-large rotate: false - xy: 1213, 514 + xy: 1153, 244 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 white-tree-dead-icon-medium rotate: false - xy: 963, 55 + xy: 1695, 259 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white-tree-dead-icon-small rotate: false - xy: 1132, 64 + xy: 1800, 67 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 white-tree-icon-large rotate: false - xy: 1263, 511 + xy: 1003, 194 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 white-tree-icon-medium rotate: false - xy: 963, 21 + xy: 1729, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white-tree-icon-small rotate: false - xy: 1158, 64 + xy: 1774, 15 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 wraith-factory-icon-full rotate: false - xy: 1503, 1157 + xy: 979, 494 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wraith-factory-icon-large rotate: false - xy: 1729, 441 + xy: 1103, 194 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wraith-factory-icon-medium rotate: false - xy: 997, 96 + xy: 1763, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wraith-factory-icon-small rotate: false - xy: 1132, 38 + xy: 1800, 41 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 1485, 427 + xy: 1879, 1177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 1519, 411 + xy: 1845, 1143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 1553, 411 + xy: 1879, 1143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 1587, 411 + xy: 1913, 1223 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 1621, 411 + xy: 1913, 1189 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 1655, 411 + xy: 1947, 1223 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 1689, 411 + xy: 1913, 1155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 1723, 407 + xy: 1947, 1189 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 1733, 1089 + xy: 1981, 1223 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 1767, 1089 + xy: 2015, 1223 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 1733, 1055 + xy: 1947, 1155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 1801, 1089 + xy: 1981, 1189 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 1767, 1055 + xy: 2015, 1189 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 1835, 1089 + xy: 2015, 1155 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 1801, 1055 + xy: 1459, 1109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 1767, 1021 + xy: 1459, 1075 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 1971, 1033 + xy: 1527, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 1937, 999 + xy: 1459, 939 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 1741, 987 + xy: 1493, 973 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 1741, 919 + xy: 1595, 1041 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 alpha-mech rotate: false - xy: 455, 17 + xy: 743, 427 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-mech-base rotate: false - xy: 1525, 795 + xy: 793, 427 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-mech-leg rotate: false - xy: 1575, 779 + xy: 843, 427 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -8350,21 +8329,21 @@ chaos-array-leg index: -1 delta-mech rotate: false - xy: 1087, 806 + xy: 1259, 672 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-mech-base rotate: false - xy: 1137, 856 + xy: 1209, 572 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-mech-leg rotate: false - xy: 1087, 756 + xy: 1259, 622 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -8392,56 +8371,56 @@ eradicator-leg index: -1 omega-mech rotate: false - xy: 1525, 845 + xy: 479, 117 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 omega-mech-armor rotate: false - xy: 1583, 1107 + xy: 513, 59 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 omega-mech-base rotate: false - xy: 1583, 1049 + xy: 513, 1 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 omega-mech-leg rotate: false - xy: 1641, 1107 + xy: 577, 415 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 tau-mech rotate: false - xy: 1583, 933 + xy: 569, 299 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 tau-mech-base rotate: false - xy: 1379, 577 + xy: 837, 177 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau-mech-leg rotate: false - xy: 1429, 577 + xy: 837, 127 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dart-ship rotate: false - xy: 1087, 856 + xy: 1209, 672 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -8455,28 +8434,28 @@ glaive-ship index: -1 javelin-ship rotate: false - xy: 1537, 679 + xy: 1727, 1329 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 javelin-ship-shield rotate: false - xy: 1587, 679 + xy: 1827, 1329 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 trident-ship rotate: false - xy: 1641, 991 + xy: 627, 357 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 blank rotate: false - xy: 1279, 661 + xy: 1127, 1154 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -8490,21 +8469,21 @@ circle index: -1 clear rotate: false - xy: 1487, 795 + xy: 1891, 450 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 shape-3 rotate: false - xy: 1701, 1166 + xy: 1177, 495 size: 63, 63 orig: 63, 63 offset: 0, 0 index: -1 bar rotate: false - xy: 1578, 237 + xy: 1828, 357 size: 27, 36 split: 9, 9, 9, 9 orig: 27, 36 @@ -8512,7 +8491,7 @@ bar index: -1 bar-top rotate: false - xy: 1549, 237 + xy: 1865, 453 size: 27, 36 split: 9, 10, 9, 10 orig: 27, 36 @@ -8520,7 +8499,7 @@ bar-top index: -1 button rotate: false - xy: 1905, 1400 + xy: 971, 39 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8528,7 +8507,7 @@ button index: -1 button-disabled rotate: false - xy: 1487, 798 + xy: 2011, 1642 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8536,7 +8515,7 @@ button-disabled index: -1 button-down rotate: false - xy: 2011, 1634 + xy: 2011, 1613 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8544,7 +8523,7 @@ button-down index: -1 button-edge-1 rotate: false - xy: 2011, 1605 + xy: 2011, 1584 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8552,7 +8531,7 @@ button-edge-1 index: -1 button-edge-2 rotate: false - xy: 2011, 1576 + xy: 2011, 1555 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8560,7 +8539,7 @@ button-edge-2 index: -1 button-edge-3 rotate: false - xy: 2011, 1547 + xy: 2011, 1526 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8568,7 +8547,7 @@ button-edge-3 index: -1 button-edge-4 rotate: false - xy: 2011, 1518 + xy: 2011, 1497 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8576,7 +8555,7 @@ button-edge-4 index: -1 button-over rotate: false - xy: 2011, 1489 + xy: 2011, 1468 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8584,7 +8563,7 @@ button-over index: -1 button-right rotate: false - xy: 2011, 1402 + xy: 1167, 693 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8592,7 +8571,7 @@ button-right index: -1 button-right-down rotate: false - xy: 2011, 1460 + xy: 639, 646 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8600,7 +8579,7 @@ button-right-down index: -1 button-right-over rotate: false - xy: 2011, 1431 + xy: 837, 678 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8608,7 +8587,7 @@ button-right-over index: -1 button-select rotate: false - xy: 1659, 249 + xy: 1644, 63 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -8616,42 +8595,42 @@ button-select index: -1 check-off rotate: false - xy: 553, 473 + xy: 2019, 917 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-on rotate: false - xy: 997, 22 + xy: 2019, 883 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-on-over rotate: false - xy: 1733, 1132 + xy: 1831, 395 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-over rotate: false - xy: 1219, 443 + xy: 1661, 191 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 clear rotate: false - xy: 1725, 779 + xy: 1225, 1287 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 content-background rotate: false - xy: 945, 267 + xy: 1085, 39 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8659,7 +8638,7 @@ content-background index: -1 content-background-locked rotate: false - xy: 529, 128 + xy: 1009, 39 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8667,7 +8646,7 @@ content-background-locked index: -1 content-background-over rotate: false - xy: 1071, 435 + xy: 1047, 39 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8689,77 +8668,77 @@ discord-banner index: -1 empty-sector rotate: false - xy: 1255, 158 + xy: 1743, 1211 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 1173, 1102 + xy: 845, 987 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 1371, 1139 + xy: 531, 1543 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 531, 1543 + xy: 1175, 938 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-effect rotate: false - xy: 845, 987 + xy: 1335, 1403 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 1153, 1168 + xy: 1891, 887 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-power rotate: false - xy: 495, 1698 + xy: 845, 1525 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-production rotate: false - xy: 1202, 72 + xy: 531, 1525 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-turret rotate: false - xy: 1328, 72 + xy: 1826, 57 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 1364, 72 + xy: 531, 1507 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-upgrade rotate: false - xy: 455, 1000 + xy: 1887, 227 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -8780,84 +8759,84 @@ icon-about index: -1 icon-add rotate: false - xy: 1537, 779 + xy: 1177, 328 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin rotate: false - xy: 553, 457 + xy: 623, 923 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin-small rotate: false - xy: 2021, 863 + xy: 1849, 349 size: 6, 6 orig: 6, 6 offset: 0, 0 index: -1 icon-areaDelete rotate: false - xy: 1225, 1287 + xy: 1209, 560 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow rotate: false - xy: 1351, 459 + xy: 553, 177 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-16 rotate: false - xy: 1351, 459 + xy: 553, 177 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 1683, 829 + xy: 653, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 639, 637 + xy: 687, 95 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 567, 145 + xy: 1127, 1189 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 1127, 1189 + xy: 1403, 1191 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 1883, 387 + xy: 1437, 1125 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 623, 923 + xy: 987, 211 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -8878,14 +8857,14 @@ icon-cancel index: -1 icon-cancel-2 rotate: false - xy: 1760, 193 + xy: 1781, 275 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 845, 1071 + xy: 1459, 927 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -8899,322 +8878,329 @@ icon-check index: -1 icon-check-2 rotate: false - xy: 1786, 193 + xy: 1781, 249 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icon-copy rotate: false - xy: 1335, 1403 + xy: 1173, 1102 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 933, 165 + xy: 1901, 1131 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-database rotate: false - xy: 1363, 545 + xy: 971, 111 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 +icon-database-small + rotate: false + xy: 1901, 939 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 icon-dev-builds rotate: false - xy: 1837, 541 + xy: 1275, 256 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 1863, 473 + xy: 1501, 889 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 1889, 439 + xy: 1887, 375 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 1351, 409 + xy: 571, 179 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 1380, 375 + xy: 845, 971 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 1407, 307 + xy: 1175, 922 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-elevation rotate: false - xy: 433, 27 + xy: 727, 259 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 477, 1698 + xy: 753, 209 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 579, 191 + xy: 771, 211 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 1877, 1003 + xy: 787, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 1851, 901 + xy: 477, 1698 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 997, 141 + xy: 805, 111 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 1825, 799 + xy: 699, 27 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 1433, 273 + xy: 535, 1084 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 1757, 423 + xy: 431, 27 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 1767, 903 + xy: 1177, 312 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 513, 191 + xy: 623, 907 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-generated rotate: false - xy: 1387, 677 + xy: 1427, 1329 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-github rotate: false - xy: 513, 175 + xy: 987, 195 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 1867, 253 + xy: 1177, 296 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 915, 159 + xy: 2003, 1412 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 1882, 1201 + xy: 2037, 1109 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 845, 1495 + xy: 845, 1071 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 1031, 114 + xy: 571, 103 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 845, 971 + xy: 1691, 191 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 1843, 801 + xy: 1157, 60 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 1757, 407 + xy: 1157, 44 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-item rotate: false - xy: 1225, 1275 + xy: 845, 1495 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 526, 1951 + xy: 1231, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-line rotate: false - xy: 2016, 1105 + xy: 1559, 581 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 535, 1084 + xy: 913, 478 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid-small rotate: false - xy: 1695, 829 + xy: 1225, 1275 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 1553, 779 + xy: 977, 278 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 1882, 1213 + xy: 952, 9 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 1184, 72 + xy: 1615, 8 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 1132, 20 + xy: 2029, 865 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 1158, 46 + xy: 1833, 227 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 651, 637 + xy: 1221, 560 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-map rotate: false - xy: 569, 457 + xy: 2032, 2033 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 1225, 1263 + xy: 665, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 845, 1525 + xy: 1851, 227 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-missing rotate: false - xy: 1707, 829 + xy: 699, 95 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -9228,329 +9214,329 @@ icon-mission-background index: -1 icon-mission-battle rotate: false - xy: 663, 637 + xy: 1415, 1191 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-defense rotate: false - xy: 1767, 891 + xy: 2037, 1097 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-done rotate: false - xy: 2037, 1390 + xy: 1225, 1263 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 2037, 1378 + xy: 2037, 1085 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-paste rotate: false - xy: 1353, 1403 + xy: 2029, 735 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 2037, 1366 + xy: 2037, 1073 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 531, 1525 + xy: 1826, 75 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 623, 907 + xy: 1705, 95 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 433, 9 + xy: 1800, 23 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 2037, 1354 + xy: 2037, 1061 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 1363, 529 + xy: 1826, 41 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-play-custom rotate: false - xy: 579, 175 + xy: 1818, 25 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 2037, 1342 + xy: 2037, 1049 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power-requirement rotate: false - xy: 1353, 90 + xy: 1709, 1143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-power-small rotate: false - xy: 2037, 1330 + xy: 2037, 1037 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 2009, 1 + xy: 509, 1002 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 845, 1507 + xy: 1353, 1403 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 1031, 98 + xy: 2032, 2017 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 2025, 1 + xy: 1842, 41 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 531, 1507 + xy: 495, 1698 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 2033, 541 + xy: 1834, 25 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 2033, 525 + xy: 2032, 2001 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 2033, 509 + xy: 2032, 1985 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 2033, 493 + xy: 2032, 1969 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 1879, 1 + xy: 2032, 1953 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 1220, 72 + xy: 699, 9 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 1238, 72 + xy: 431, 9 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 2037, 1318 + xy: 2037, 1025 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-spray rotate: false - xy: 1256, 72 + xy: 2021, 1412 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 1274, 72 + xy: 2029, 847 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 1895, 1 + xy: 1851, 211 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 2037, 1306 + xy: 2037, 1013 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 2037, 1294 + xy: 2037, 1001 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 1911, 1 + xy: 1867, 211 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 1292, 72 + xy: 1869, 227 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tree rotate: false - xy: 1310, 72 + xy: 2029, 717 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tree-locked rotate: false - xy: 1699, 1131 + xy: 1777, 1177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 1927, 1 + xy: 1883, 211 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 451, 1 + xy: 1899, 211 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 1346, 72 + xy: 845, 1507 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocked rotate: false - xy: 437, 1000 + xy: 2029, 829 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 467, 1 + xy: 1915, 211 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 483, 1 + xy: 1931, 211 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zone rotate: false - xy: 1812, 191 + xy: 1695, 207 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icon-zone-locked rotate: false - xy: 389, 1 + xy: 571, 1 size: 42, 42 orig: 42, 42 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 473, 1000 + xy: 2029, 699 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 2033, 477 + xy: 2029, 593 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -9564,7 +9550,7 @@ info-banner index: -1 inventory rotate: false - xy: 1656, 155 + xy: 1175, 8 size: 24, 40 split: 10, 10, 10, 14 orig: 24, 40 @@ -9579,7 +9565,7 @@ logotext index: -1 pane rotate: false - xy: 1109, 435 + xy: 1085, 10 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -9587,7 +9573,7 @@ pane index: -1 pane-2 rotate: false - xy: 1071, 406 + xy: 1047, 10 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -9595,7 +9581,7 @@ pane-2 index: -1 scroll rotate: false - xy: 1994, 162 + xy: 2000, 456 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -9603,7 +9589,7 @@ scroll index: -1 scroll-horizontal rotate: false - xy: 1071, 380 + xy: 863, 1 size: 35, 24 split: 6, 5, 10, 10 orig: 35, 24 @@ -9611,7 +9597,7 @@ scroll-horizontal index: -1 scroll-knob-horizontal-black rotate: false - xy: 639, 649 + xy: 821, 1 size: 40, 24 split: 11, 10, 10, 10 orig: 40, 24 @@ -9619,7 +9605,7 @@ scroll-knob-horizontal-black index: -1 scroll-knob-vertical-black rotate: false - xy: 1968, 131 + xy: 1974, 451 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -9627,56 +9613,56 @@ scroll-knob-vertical-black index: -1 sector-select rotate: false - xy: 1509, 275 + xy: 1763, 667 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 selection rotate: false - xy: 529, 125 + xy: 1969, 438 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 slider rotate: false - xy: 1516, 417 + xy: 1969, 428 size: 1, 8 orig: 1, 8 offset: 0, 0 index: -1 slider-knob rotate: false - xy: 1295, 882 + xy: 1865, 491 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-down rotate: false - xy: 997, 56 + xy: 1797, 355 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-over rotate: false - xy: 997, 56 + xy: 1797, 355 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-vertical rotate: false - xy: 1263, 561 + xy: 837, 675 size: 8, 1 orig: 8, 1 offset: 0, 0 index: -1 underline rotate: false - xy: 1147, 435 + xy: 1203, 228 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -9684,7 +9670,7 @@ underline index: -1 underline-2 rotate: false - xy: 1109, 406 + xy: 1127, 1157 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -9692,14 +9678,14 @@ underline-2 index: -1 white rotate: false - xy: 1142, 401 + xy: 1271, 1186 size: 3, 3 orig: 3, 3 offset: 0, 0 index: -1 window-empty rotate: false - xy: 1549, 174 + xy: 1615, 26 size: 27, 61 split: 8, 8, 44, 11 orig: 27, 61 @@ -9707,105 +9693,105 @@ window-empty index: -1 alpha-drone rotate: false - xy: 455, 67 + xy: 693, 423 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler rotate: false - xy: 937, 721 + xy: 1275, 872 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-base rotate: false - xy: 995, 906 + xy: 1167, 822 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-leg rotate: false - xy: 1045, 906 + xy: 1167, 772 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger rotate: false - xy: 987, 806 + xy: 1217, 772 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 1037, 856 + xy: 1267, 772 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 1037, 806 + xy: 1267, 722 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 eruptor rotate: false - xy: 649, 473 + xy: 865, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 eruptor-base rotate: false - xy: 1237, 1257 + xy: 931, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 eruptor-leg rotate: false - xy: 1311, 1331 + xy: 649, 473 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress rotate: false - xy: 1377, 1355 + xy: 1237, 1257 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress-base rotate: false - xy: 1443, 1355 + xy: 1311, 1331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-base rotate: false - xy: 1443, 1355 + xy: 1311, 1331 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress-leg rotate: false - xy: 1509, 1363 + xy: 639, 873 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 ghoul rotate: false - xy: 1237, 1323 + xy: 1956, 1877 size: 72, 72 orig: 72, 72 offset: 0, 0 @@ -9819,14 +9805,14 @@ lich index: -1 phantom rotate: false - xy: 1583, 991 + xy: 635, 415 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 power-cell rotate: false - xy: 1641, 1049 + xy: 569, 357 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -9847,70 +9833,70 @@ revenant index: -1 spirit rotate: false - xy: 1079, 656 + xy: 1393, 222 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titan rotate: false - xy: 1305, 1125 + xy: 969, 758 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-leg rotate: false - xy: 1327, 1059 + xy: 1035, 824 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wraith rotate: false - xy: 1313, 511 + xy: 1053, 194 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 artillery-equip rotate: false - xy: 445, 399 + xy: 537, 119 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 445, 249 + xy: 993, 444 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 bomber-equip rotate: false - xy: 495, 307 + xy: 1043, 444 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles-equip rotate: false - xy: 495, 307 + xy: 1043, 444 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 chain-blaster-equip rotate: false - xy: 895, 921 + xy: 1193, 445 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 chaos-equip rotate: false - xy: 1525, 1019 + xy: 511, 303 size: 56, 136 orig: 56, 136 offset: 0, 0 @@ -9924,63 +9910,63 @@ eradication-equip index: -1 eruption-equip rotate: false - xy: 1187, 814 + xy: 1293, 464 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 flakgun-equip rotate: false - xy: 1187, 764 + xy: 1293, 414 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flamethrower-equip rotate: false - xy: 1237, 814 + xy: 1293, 356 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 heal-blaster-equip rotate: false - xy: 1287, 711 + xy: 1677, 1379 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lich-missiles-equip rotate: false - xy: 1637, 679 + xy: 1977, 1307 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 reaper-gun-equip rotate: false - xy: 1733, 841 + xy: 1493, 477 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 revenant-missiles-equip rotate: false - xy: 1737, 691 + xy: 1493, 327 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 879, 671 + xy: 943, 344 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 swarmer-equip rotate: false - xy: 1229, 564 + xy: 853, 227 size: 48, 48 orig: 48, 48 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index cc76ebfda7..f34ff4d451 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/src/io/anuke/mindustry/content/Fx.java b/core/src/io/anuke/mindustry/content/Fx.java index 6e41397b33..dece137ea4 100644 --- a/core/src/io/anuke/mindustry/content/Fx.java +++ b/core/src/io/anuke/mindustry/content/Fx.java @@ -1,7 +1,6 @@ package io.anuke.mindustry.content; import io.anuke.arc.Core; -import io.anuke.mindustry.entities.Effects.Effect; import io.anuke.arc.graphics.Color; import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.graphics.g2d.Fill; @@ -9,6 +8,7 @@ import io.anuke.arc.graphics.g2d.Lines; import io.anuke.arc.math.Angles; import io.anuke.arc.math.Mathf; import io.anuke.arc.util.Tmp; +import io.anuke.mindustry.entities.Effects.Effect; import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect; import io.anuke.mindustry.entities.type.BaseUnit; import io.anuke.mindustry.game.ContentList; @@ -34,7 +34,7 @@ public class Fx implements ContentList{ bigShockwave, nuclearShockwave, explosion, blockExplosion, blockExplosionSmoke, shootSmall, shootHeal, shootSmallSmoke, shootBig, shootBig2, shootBigSmoke, shootBigSmoke2, shootSmallFlame, shootLiquid, shellEjectSmall, shellEjectMedium, shellEjectBig, lancerLaserShoot, lancerLaserShootSmoke, lancerLaserCharge, lancerLaserChargeBegin, lightningCharge, lightningShoot, - unitSpawn, spawnShockwave, magmasmoke, impactShockwave, impactcloud, impactsmoke; + unitSpawn, spawnShockwave, magmasmoke, impactShockwave, impactcloud, impactsmoke, dynamicExplosion; @Override public void load(){ @@ -604,6 +604,31 @@ public class Fx implements ContentList{ Draw.reset(); }); + dynamicExplosion = new Effect(30, e -> { + float intensity = e.rotation; + + e.scaled(5 + intensity*2, i -> { + Lines.stroke(3.1f * i.fout()); + Lines.poly(e.x, e.y, (int)(20 * intensity), (3f + i.fin() * 14f) * intensity); + }); + + Draw.color(Color.GRAY); + + Angles.randLenVectors(e.id, e.finpow(), (int)(6 * intensity), 21f*intensity, (x, y, in, out) -> { + Fill.circle(e.x + x, e.y + y, out * (2f+intensity) * 3 + 0.5f); + Fill.circle(e.x + x / 2f, e.y + y / 2f, out * (intensity) * 3); + }); + + Draw.color(Pal.lighterOrange, Pal.lightOrange, Color.GRAY, e.fin()); + Lines.stroke((1.7f * e.fout()) * (1f + (intensity - 1f) / 2f)); + + Angles.randLenVectors(e.id + 1, e.finpow(), (int)(9*intensity), 40f*intensity, (x, y, in, out) -> { + Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), 1f + out * 4 * (3f+intensity)); + }); + + Draw.reset(); + }); + blockExplosion = new Effect(30, e -> { e.scaled(7, i -> { Lines.stroke(3.1f * i.fout()); diff --git a/core/src/io/anuke/mindustry/content/StatusEffects.java b/core/src/io/anuke/mindustry/content/StatusEffects.java index 328a617c1f..e9c87b39b6 100644 --- a/core/src/io/anuke/mindustry/content/StatusEffects.java +++ b/core/src/io/anuke/mindustry/content/StatusEffects.java @@ -6,7 +6,7 @@ import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.type.StatusEffect; public class StatusEffects implements ContentList{ - public static StatusEffect none, burning, freezing, wet, melting, tarred, overdrive, shielded, shocked, corroded; + public static StatusEffect none, burning, freezing, wet, melting, tarred, overdrive, shielded, shocked, corroded, boss; @Override public void load(){ @@ -71,6 +71,14 @@ public class StatusEffects implements ContentList{ armorMultiplier = 3f; }}; + boss = new StatusEffect(){{ + armorMultiplier = 3f; + damageMultiplier = 3f; + speedMultiplier = 1.1f; + //TODO custom effect + //effect = Fx.overdriven; + }}; + shocked = new StatusEffect(); //no effects, just small amounts of damage. diff --git a/core/src/io/anuke/mindustry/content/Zones.java b/core/src/io/anuke/mindustry/content/Zones.java index 4197268190..1518474b06 100644 --- a/core/src/io/anuke/mindustry/content/Zones.java +++ b/core/src/io/anuke/mindustry/content/Zones.java @@ -57,7 +57,10 @@ public class Zones implements ContentList{ new SpawnGroup(UnitTypes.dagger){{ begin = 30; unitScaling = 2; - }} + }}, + + + bossGroup(UnitTypes.fortress) ); }}; }}; @@ -105,7 +108,9 @@ public class Zones implements ContentList{ begin = 25; unitScaling = 1; unitAmount = 2; - }} + }}, + + bossGroup(UnitTypes.revenant) ); }}; }}; @@ -167,7 +172,16 @@ public class Zones implements ContentList{ begin = 35; spacing = 10; unitAmount = 6; - }} + }}, + + //boss + new SpawnGroup(UnitTypes.revenant){{ + begin = configureWave; + effect = StatusEffects.boss; + unitScaling = never; + }}, + + bossGroup(UnitTypes.eruptor) ); }}; }}; @@ -241,7 +255,10 @@ public class Zones implements ContentList{ spacing = 3; unitScaling = 3; unitAmount = 2; - }} + }}, + + bossGroup(UnitTypes.revenant), + bossGroup(UnitTypes.revenant) ); }}; }}; @@ -329,7 +346,9 @@ public class Zones implements ContentList{ spacing = 10; unitScaling = 0.5f; unitAmount = 10; - }} + }}, + + bossGroup(UnitTypes.chaosArray) ); }}; }}; @@ -411,7 +430,9 @@ public class Zones implements ContentList{ spacing = 10; unitScaling = 0.5f; unitAmount = 10; - }} + }}, + + bossGroup(UnitTypes.lich) ); }}; }}; @@ -482,7 +503,9 @@ public class Zones implements ContentList{ spacing = 2; unitAmount = 4; begin = 13; - }} + }}, + + bossGroup(UnitTypes.chaosArray) ); }}; }}; @@ -598,7 +621,9 @@ public class Zones implements ContentList{ spacing = 10; unitScaling = 0.5f; unitAmount = 10; - }} + }}, + + bossGroup(UnitTypes.reaper) ); }}; }}; diff --git a/core/src/io/anuke/mindustry/core/GameState.java b/core/src/io/anuke/mindustry/core/GameState.java index fd521bf2c0..e0738bfa4c 100644 --- a/core/src/io/anuke/mindustry/core/GameState.java +++ b/core/src/io/anuke/mindustry/core/GameState.java @@ -1,6 +1,7 @@ package io.anuke.mindustry.core; import io.anuke.arc.Events; +import io.anuke.mindustry.entities.type.BaseUnit; import io.anuke.mindustry.game.EventType.StateChangeEvent; import io.anuke.mindustry.game.Rules; import io.anuke.mindustry.game.Stats; @@ -32,6 +33,10 @@ public class GameState{ return Net.client() ? enemies : unitGroups[waveTeam.ordinal()].size(); } + public BaseUnit boss(){ + return unitGroups[waveTeam.ordinal()].find(BaseUnit::isBoss); + } + public void set(State astate){ Events.fire(new StateChangeEvent(state, astate)); state = astate; diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java index 7e0cdbef72..bb3c7f72ca 100644 --- a/core/src/io/anuke/mindustry/core/NetServer.java +++ b/core/src/io/anuke/mindustry/core/NetServer.java @@ -7,10 +7,6 @@ import io.anuke.arc.Events; import io.anuke.arc.collection.Array; import io.anuke.arc.collection.IntMap; import io.anuke.arc.collection.ObjectSet; -import io.anuke.mindustry.entities.Entities; -import io.anuke.mindustry.entities.EntityGroup; -import io.anuke.mindustry.entities.EntityQuery; -import io.anuke.mindustry.entities.traits.Entity; import io.anuke.arc.graphics.Color; import io.anuke.arc.graphics.Colors; import io.anuke.arc.math.Mathf; @@ -19,14 +15,19 @@ import io.anuke.arc.math.geom.Vector2; import io.anuke.arc.util.Log; import io.anuke.arc.util.Structs; import io.anuke.arc.util.Time; +import io.anuke.arc.util.Tmp; import io.anuke.arc.util.io.ByteBufferOutput; import io.anuke.arc.util.io.CountableByteArrayOutputStream; -import io.anuke.mindustry.content.Mechs; import io.anuke.mindustry.content.Blocks; +import io.anuke.mindustry.content.Mechs; import io.anuke.mindustry.core.GameState.State; -import io.anuke.mindustry.entities.type.Player; +import io.anuke.mindustry.entities.Entities; +import io.anuke.mindustry.entities.EntityGroup; +import io.anuke.mindustry.entities.EntityQuery; import io.anuke.mindustry.entities.traits.BuilderTrait.BuildRequest; +import io.anuke.mindustry.entities.traits.Entity; import io.anuke.mindustry.entities.traits.SyncTrait; +import io.anuke.mindustry.entities.type.Player; import io.anuke.mindustry.game.EventType.WorldLoadEvent; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.game.Version; @@ -51,13 +52,7 @@ import static io.anuke.mindustry.Vars.*; public class NetServer implements ApplicationListener{ public final static int maxSnapshotSize = 430; - - public final static boolean debugSnapshots = false; - public final static float maxSnapshotDelay = 200; - public final static float snapshotDropchance = 0.01f; - - private final static byte[] reusableSnapArray = new byte[maxSnapshotSize]; - private final static float serverSyncTime = 4, kickDuration = 30 * 1000; + private final static float serverSyncTime = 40, kickDuration = 30 * 1000; private final static Vector2 vector = new Vector2(); private final static Rectangle viewport = new Rectangle(); private final static Array returnArray = new Array<>(); @@ -475,7 +470,7 @@ public class NetServer implements ApplicationListener{ returnArray.clear(); if(represent.isClipped()){ EntityQuery.getNearby(group, viewport, entity -> { - if(((SyncTrait) entity).isSyncing() && viewport.contains(entity.getX(), entity.getY())){ + if(((SyncTrait) entity).isSyncing() && viewport.overlaps(Tmp.r3.setSize(((SyncTrait)entity).clipSize(), ((SyncTrait)entity).clipSize()).setCenter(entity.getX(), entity.getY()))){ returnArray.add(entity); } }); diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index cb33334a45..30e1faff4d 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -304,7 +304,7 @@ public class Renderer implements ApplicationListener{ public void clampScale(){ float s = io.anuke.arc.scene.ui.layout.Unit.dp.scl(1f); - targetscale = Mathf.clamp(targetscale, s * 2.5f, Math.round(s * 7)); + targetscale = Mathf.clamp(targetscale, s * 2.5f, Math.round(s * 5)); } public void takeMapScreenshot(){ diff --git a/core/src/io/anuke/mindustry/entities/Damage.java b/core/src/io/anuke/mindustry/entities/Damage.java index 79194260c7..093c3f7b14 100644 --- a/core/src/io/anuke/mindustry/entities/Damage.java +++ b/core/src/io/anuke/mindustry/entities/Damage.java @@ -60,7 +60,7 @@ public class Damage{ float shake = Math.min(explosiveness / 4f + 3f, 9f); Effects.shake(shake, shake, x, y); - Effects.effect(Fx.blockExplosion, x, y); + Effects.effect(Fx.dynamicExplosion, x, y, radius/8f); } public static void createIncend(float x, float y, float range, int amount){ diff --git a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java index c9cc53e521..047a9d0dd5 100644 --- a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java @@ -347,7 +347,7 @@ public interface BuilderTrait extends Entity, TeamTrait{ Draw.color(Color.LIGHT_GRAY, Color.WHITE, 1f - flashScl + Mathf.absin(Time.time(), 0.5f, flashScl)); - Shapes.laser("minelaser", "minelaser-end", px, py, ex, ey); + Shapes.laser("minelaser", "minelaser-end", px, py, ex, ey, 0.75f); if(unit instanceof Player && ((Player) unit).isLocal){ Lines.stroke(1f, Pal.accent); diff --git a/core/src/io/anuke/mindustry/entities/traits/SyncTrait.java b/core/src/io/anuke/mindustry/entities/traits/SyncTrait.java index cbcc0317ee..81e5419014 100644 --- a/core/src/io/anuke/mindustry/entities/traits/SyncTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/SyncTrait.java @@ -62,6 +62,10 @@ public interface SyncTrait extends Entity, TypeTrait{ return true; } + default float clipSize(){ + return (this instanceof DrawTrait ? ((DrawTrait)this).drawSize() : 8f); + } + //Read and write sync data, usually position void write(DataOutput data) throws IOException; diff --git a/core/src/io/anuke/mindustry/entities/type/BaseUnit.java b/core/src/io/anuke/mindustry/entities/type/BaseUnit.java index fe2e74e53c..7d62c05d16 100644 --- a/core/src/io/anuke/mindustry/entities/type/BaseUnit.java +++ b/core/src/io/anuke/mindustry/entities/type/BaseUnit.java @@ -12,6 +12,7 @@ import io.anuke.arc.math.geom.Rectangle; import io.anuke.arc.util.Interval; import io.anuke.arc.util.Time; import io.anuke.mindustry.Vars; +import io.anuke.mindustry.content.StatusEffects; import io.anuke.mindustry.entities.EntityGroup; import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.entities.traits.ShooterTrait; @@ -163,6 +164,10 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{ } } + public boolean isBoss(){ + return hasEffect(StatusEffects.boss); + } + @Override public boolean isImmune(StatusEffect effect){ return type.immunities.contains(effect); @@ -212,11 +217,6 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{ return type.health; } - @Override - public float getSize(){ - return 8; - } - @Override public float mass(){ return type.mass; @@ -284,6 +284,11 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{ return type.hitsize * 10; } + @Override + public float clipSize(){ + return isBoss() ? 10000000000f : super.clipSize(); + } + @Override public void onDeath(){ Call.onUnitDeath(this); diff --git a/core/src/io/anuke/mindustry/entities/type/Player.java b/core/src/io/anuke/mindustry/entities/type/Player.java index febd19032f..a8c8b1307c 100644 --- a/core/src/io/anuke/mindustry/entities/type/Player.java +++ b/core/src/io/anuke/mindustry/entities/type/Player.java @@ -213,11 +213,6 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{ return mech.flying || boostHeat > liftoffBoost; } - @Override - public float getSize(){ - return 8; - } - @Override public void damage(float amount){ hitTime = hitDuration; diff --git a/core/src/io/anuke/mindustry/entities/type/Unit.java b/core/src/io/anuke/mindustry/entities/type/Unit.java index 8de61db1df..e2ab5f97db 100644 --- a/core/src/io/anuke/mindustry/entities/type/Unit.java +++ b/core/src/io/anuke/mindustry/entities/type/Unit.java @@ -10,6 +10,7 @@ import io.anuke.arc.math.geom.Geometry; import io.anuke.arc.math.geom.Rectangle; import io.anuke.arc.math.geom.Vector2; import io.anuke.arc.util.Time; +import io.anuke.arc.util.Tmp; import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.Damage; @@ -382,6 +383,11 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ Draw.rect(getIconRegion(), x + offsetX, y + offsetY, rotation - 90); } + public float getSize(){ + hitbox(Tmp.r1); + return Math.max(Tmp.r1.width, Tmp.r1.height) * 2f; + } + public abstract TextureRegion getIconRegion(); public abstract Weapon getWeapon(); @@ -391,6 +397,4 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ public abstract float mass(); public abstract boolean isFlying(); - - public abstract float getSize(); } diff --git a/core/src/io/anuke/mindustry/entities/units/Statuses.java b/core/src/io/anuke/mindustry/entities/units/Statuses.java index 90fc24b270..ffc4fe8278 100644 --- a/core/src/io/anuke/mindustry/entities/units/Statuses.java +++ b/core/src/io/anuke/mindustry/entities/units/Statuses.java @@ -1,6 +1,7 @@ package io.anuke.mindustry.entities.units; import io.anuke.arc.collection.Array; +import io.anuke.arc.collection.Bits; import io.anuke.arc.graphics.Color; import io.anuke.arc.util.Time; import io.anuke.arc.util.Tmp; @@ -22,6 +23,7 @@ public class Statuses implements Saveable{ private static final Array removals = new Array<>(); private Array statuses = new Array<>(); + private Bits applied = new Bits(content.getBy(ContentType.status).size); private float speedMultiplier; private float damageMultiplier; @@ -76,6 +78,7 @@ public class Statuses implements Saveable{ } public void update(Unit unit){ + applied.clear(); speedMultiplier = damageMultiplier = armorMultiplier = 1f; if(statuses.size == 0) return; @@ -84,6 +87,7 @@ public class Statuses implements Saveable{ for(StatusEntry entry : statuses){ entry.time = Math.max(entry.time - Time.delta(), 0); + applied.set(entry.effect.id); if(entry.time <= 0){ Pools.free(entry); @@ -114,10 +118,7 @@ public class Statuses implements Saveable{ } public boolean hasEffect(StatusEffect effect){ - for(StatusEntry entry : statuses){ - if(entry.effect == effect) return true; - } - return false; + return applied.get(effect.id); } @Override @@ -125,7 +126,7 @@ public class Statuses implements Saveable{ stream.writeByte(statuses.size); for(StatusEntry entry : statuses){ stream.writeByte(entry.effect.id); - stream.writeShort((short) (entry.time * 2)); + stream.writeFloat(entry.time); } } @@ -140,7 +141,7 @@ public class Statuses implements Saveable{ byte amount = stream.readByte(); for(int i = 0; i < amount; i++){ byte id = stream.readByte(); - float time = stream.readShort() / 2f; + float time = stream.readFloat(); StatusEntry entry = Pools.obtain(StatusEntry.class, StatusEntry::new); entry.set(content.getByID(ContentType.status, id), time); statuses.add(entry); diff --git a/core/src/io/anuke/mindustry/game/Loadout.java b/core/src/io/anuke/mindustry/game/Loadout.java index 257b52424a..82a1d2425a 100644 --- a/core/src/io/anuke/mindustry/game/Loadout.java +++ b/core/src/io/anuke/mindustry/game/Loadout.java @@ -1,7 +1,22 @@ package io.anuke.mindustry.game; +import io.anuke.mindustry.content.Blocks; +import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; -public abstract class Loadout{ +public enum Loadout{ + test(Blocks.coreShard){ + @Override + public void setup(Tile tile){ + + } + }; + + public final Block core; + + Loadout(Block core){ + this.core = core; + } + public abstract void setup(Tile tile); } diff --git a/core/src/io/anuke/mindustry/game/SpawnGroup.java b/core/src/io/anuke/mindustry/game/SpawnGroup.java index a7cc2a0eca..64e399b3db 100644 --- a/core/src/io/anuke/mindustry/game/SpawnGroup.java +++ b/core/src/io/anuke/mindustry/game/SpawnGroup.java @@ -11,10 +11,12 @@ import io.anuke.mindustry.type.UnitType; * Each spawn group can have multiple sub-groups spawned in different areas of the map. */ public class SpawnGroup{ + protected static final int never = Integer.MAX_VALUE; + /**The unit type spawned*/ public final UnitType type; /**When this spawn should end*/ - protected int end = Integer.MAX_VALUE; + protected int end = never; /**When this spawn should start*/ protected int begin; /**The spacing, in waves, of spawns. For example, 2 = spawns every other wave*/ @@ -34,9 +36,7 @@ public class SpawnGroup{ this.type = type; } - /** - * Returns the amount of units spawned on a specific wave. - */ + /**Returns the amount of units spawned on a specific wave.*/ public int getUnitsSpawned(int wave){ if(wave < begin || wave > end || (wave - begin) % spacing != 0){ return 0; diff --git a/core/src/io/anuke/mindustry/game/Teams.java b/core/src/io/anuke/mindustry/game/Teams.java index a0a0922f8e..4c32cbeceb 100644 --- a/core/src/io/anuke/mindustry/game/Teams.java +++ b/core/src/io/anuke/mindustry/game/Teams.java @@ -6,6 +6,9 @@ import io.anuke.arc.collection.ObjectSet; import io.anuke.mindustry.Vars; import io.anuke.mindustry.world.Tile; +import static io.anuke.mindustry.Vars.waveTeam; +import static io.anuke.mindustry.Vars.world; + /**Class for various team-based utilities.*/ public class Teams{ private TeamData[] map = new TeamData[Team.all.length]; @@ -23,7 +26,8 @@ public class Teams{ /**Returns team data by type.*/ public TeamData get(Team team){ if(map[team.ordinal()] == null){ - add(team, Array.with(Team.all).select(t -> t != team && t != Team.none && team != Team.none).toArray(Team.class)); + Array enemies = Array.with(Team.all).select(t -> t != team && ((t != Team.none && team != Team.none) || (world.isZone() && team == waveTeam))); + add(team, enemies.toArray(Team.class)); } return map[team.ordinal()]; } diff --git a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java index 35b0d9952e..b13a42a145 100644 --- a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java @@ -37,6 +37,7 @@ public class BlockRenderer{ private int iterateidx = 0; private FrameBuffer shadows = new FrameBuffer(2, 2); private FrameBuffer fog = new FrameBuffer(2, 2); + private Array outArray = new Array<>(); public BlockRenderer(){ @@ -181,6 +182,14 @@ public class BlockRenderer{ if(block.layer2 != null && block.isLayer2(tile)){ addRequest(tile, block.layer2); } + + if(tile.entity != null && tile.entity.power != null && tile.entity.power.links.size > 0){ + for(Tile other : block.getPowerConnections(tile, outArray)){ + if(other.block().layer == Layer.power){ + addRequest(other, Layer.power); + } + } + } } } } diff --git a/core/src/io/anuke/mindustry/graphics/Shapes.java b/core/src/io/anuke/mindustry/graphics/Shapes.java index 5d87feaefd..899ed2ae8d 100644 --- a/core/src/io/anuke/mindustry/graphics/Shapes.java +++ b/core/src/io/anuke/mindustry/graphics/Shapes.java @@ -6,6 +6,7 @@ import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.graphics.g2d.Lines; import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.arc.math.Mathf; +import io.anuke.arc.util.Tmp; //TODO remove public class Shapes{ @@ -19,16 +20,16 @@ public class Shapes{ } public static void laser(String line, String edge, float x, float y, float x2, float y2, float rotation, float scale){ - - Lines.stroke(12f * scale); - Lines.line(Core.atlas.find(line), x, y, x2, y2, CapStyle.none, 0f); - Lines.stroke(1f); - TextureRegion region = Core.atlas.find(edge); - Draw.rect(Core.atlas.find(edge), x, y, region.getWidth() * Draw.scl, region.getHeight() * scale * Draw.scl, rotation + 180); + Tmp.v1.trns(rotation, 8f * scale * Draw.scl); - Draw.rect(Core.atlas.find(edge), x2, y2, region.getWidth() * Draw.scl, region.getHeight() * scale * Draw.scl, rotation); + Draw.rect(Core.atlas.find(edge), x, y, region.getWidth() * scale * Draw.scl, region.getHeight() * scale * Draw.scl, rotation + 180); + Draw.rect(Core.atlas.find(edge), x2, y2, region.getWidth() * scale * Draw.scl, region.getHeight() * scale * Draw.scl, rotation); + + Lines.stroke(12f * scale); + Lines.line(Core.atlas.find(line), x + Tmp.v1.x, y + Tmp.v1.y, x2 - Tmp.v1.x, y2 - Tmp.v1.y, CapStyle.none, 0f); + Lines.stroke(1f); } public static void tri(float x, float y, float width, float length, float rotation){ diff --git a/core/src/io/anuke/mindustry/net/Interpolator.java b/core/src/io/anuke/mindustry/net/Interpolator.java index d4590ecec3..b7b32b321a 100644 --- a/core/src/io/anuke/mindustry/net/Interpolator.java +++ b/core/src/io/anuke/mindustry/net/Interpolator.java @@ -37,13 +37,6 @@ public class Interpolator{ public void update(){ - /* - if(pos.dst(target) > 128){ - pos.set(target); - lastUpdated = 0; - updateSpacing = 16; - }*/ - if(lastUpdated != 0 && updateSpacing != 0){ float timeSinceUpdate = Time.timeSinceMillis(lastUpdated); float alpha = Math.min(timeSinceUpdate / updateSpacing, 2f); diff --git a/core/src/io/anuke/mindustry/type/Zone.java b/core/src/io/anuke/mindustry/type/Zone.java index a1228e2bba..ea00b12905 100644 --- a/core/src/io/anuke/mindustry/type/Zone.java +++ b/core/src/io/anuke/mindustry/type/Zone.java @@ -6,10 +6,12 @@ import io.anuke.arc.collection.Array; import io.anuke.arc.function.Supplier; import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.mindustry.content.StatusEffects; import io.anuke.mindustry.game.EventType.ZoneCompleteEvent; import io.anuke.mindustry.game.EventType.ZoneConfigureCompleteEvent; import io.anuke.mindustry.game.Loadout; import io.anuke.mindustry.game.Rules; +import io.anuke.mindustry.game.SpawnGroup; import io.anuke.mindustry.game.UnlockableContent; import io.anuke.mindustry.maps.generators.MapGenerator; import io.anuke.mindustry.world.Block; @@ -39,6 +41,19 @@ public class Zone extends UnlockableContent{ this.generator = generator; } + protected SpawnGroup bossGroup(UnitType type){ + return new SpawnGroup(type){{ + begin = configureWave-1; + effect = StatusEffects.boss; + unitScaling = 1; + spacing = configureWave; + }}; + } + + public boolean isBossWave(int wave){ + return wave % configureWave == 0 && wave > 0; + } + public ItemStack[] getLaunchCost(){ if(launchCost == null){ updateLaunchCost(); diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java index f3dac5a8c3..d6be91ed7e 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java @@ -30,6 +30,7 @@ import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.input.Binding; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.net.Packets.AdminAction; +import io.anuke.mindustry.ui.Bar; import io.anuke.mindustry.ui.IntFormat; import static io.anuke.mindustry.Vars.*; @@ -93,7 +94,7 @@ public class HudFragment extends Fragment{ if(Net.active() && mobile){ i.getStyle().imageUp = Core.scene.skin.getDrawable("icon-chat"); }else{ - i.getStyle().imageUp = Core.scene.skin.getDrawable("icon-database"); + i.getStyle().imageUp = Core.scene.skin.getDrawable("icon-database-small"); } }).get(); @@ -126,6 +127,12 @@ public class HudFragment extends Fragment{ cont.row(); + Table healthTable = cont.table("button", t -> + t.margin(10f).add(new Bar("boss.health", Pal.health, () -> state.boss() == null ? 0f : state.boss().healthf()).blink(Color.WHITE)).grow() + ).fillX().visible(() -> world.isZone() && state.boss() != null).height(60f).update(t -> t.getTranslation().set(wavetable.getTranslation())).get(); + + cont.row(); + //fps display infolabel = cont.table(t -> { IntFormat fps = new IntFormat("fps"); @@ -135,7 +142,8 @@ public class HudFragment extends Fragment{ if(Net.hasClient()){ t.label(() -> ping.get(Net.getPing())).visible(Net::client).colspan(2); } - }).size(-1).visible(() -> Core.settings.getBool("fps")).update(t -> t.setTranslation(0, (!waves.isVisible() ? wavetable.getHeight() : Math.min(wavetable.getTranslation().y, wavetable.getHeight())))).get(); + }).size(-1).visible(() -> Core.settings.getBool("fps")).update(t -> t.setTranslation(0, + (!waves.isVisible() ? wavetable.getHeight() + healthTable.getHeight() : Math.min(wavetable.getTranslation().y + healthTable.getHeight(), wavetable.getHeight() + healthTable.getHeight())))).get(); //make wave box appear below rest of menu if(mobile){ diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java index 67de830e95..46e169f940 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java @@ -3,11 +3,12 @@ package io.anuke.mindustry.world.blocks.power; import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Remote; import io.anuke.arc.Core; +import io.anuke.arc.graphics.Color; import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.graphics.g2d.Lines; +import io.anuke.arc.math.Angles; import io.anuke.arc.math.Mathf; import io.anuke.arc.math.geom.Vector2; -import io.anuke.arc.math.Angles; import io.anuke.arc.util.Strings; import io.anuke.arc.util.Time; import io.anuke.mindustry.entities.type.Player; @@ -15,6 +16,7 @@ import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.graphics.Layer; import io.anuke.mindustry.graphics.Pal; +import io.anuke.mindustry.graphics.Shapes; import io.anuke.mindustry.ui.Bar; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.PowerBlock; @@ -240,6 +242,7 @@ public class PowerNode extends PowerBlock{ } protected void drawLaser(Tile tile, Tile target){ + float x1 = tile.drawx(), y1 = tile.drawy(), x2 = target.drawx(), y2 = target.drawy(); @@ -254,9 +257,11 @@ public class PowerNode extends PowerBlock{ x2 += t2.x; y2 += t2.y; - Draw.color(Pal.powerLight, Pal.power, Mathf.absin(Time.time(), 8f, 1f)); - Lines.stroke(2f); - Lines.line(x1, y1, x2, y2); + Draw.color(Pal.powerLight, Color.WHITE, Mathf.absin(Time.time(), 8f, 0.3f) + 0.2f); + //Lines.stroke(2f); + //Lines.line(x1, y1, x2, y2); + + Shapes.laser("laser", "laser-end", x1, y1, x2, y2, 0.5f); } } diff --git a/tools/build.gradle b/tools/build.gradle index e7b97903bb..e032aa15cd 100644 --- a/tools/build.gradle +++ b/tools/build.gradle @@ -55,7 +55,7 @@ def antialias = {File file -> [p1, p2, p3, p4, p5, p6, p7, p8, p9].each{ val -> Color.argb8888ToColor(color, val) - if(color.a > 0.1){ + if(color.a > 0.05){ sum.r += color.r sum.g += color.g sum.b += color.b