diff --git a/core/assets-raw/fonts/latin/equalize.ttf b/core/assets-raw/fonts/latin/equalize.ttf new file mode 100644 index 0000000000..82fc2fc80e Binary files /dev/null and b/core/assets-raw/fonts/latin/equalize.ttf differ diff --git a/core/assets-raw/fonts/pixel_UNEDITED.ttf b/core/assets-raw/fonts/latin/pixel_UNEDITED.ttf similarity index 100% rename from core/assets-raw/fonts/pixel_UNEDITED.ttf rename to core/assets-raw/fonts/latin/pixel_UNEDITED.ttf diff --git a/core/assets-raw/sprites/blocks/units/crawler-factory-top-open.png b/core/assets-raw/sprites/blocks/units/crawler-factory-top-open.png new file mode 100644 index 0000000000..290db9d373 Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/crawler-factory-top-open.png differ diff --git a/core/assets-raw/sprites/blocks/units/crawler-factory-top.png b/core/assets-raw/sprites/blocks/units/crawler-factory-top.png new file mode 100644 index 0000000000..f7cad4dbf6 Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/crawler-factory-top.png differ diff --git a/core/assets-raw/sprites/blocks/units/crawler-factory.png b/core/assets-raw/sprites/blocks/units/crawler-factory.png new file mode 100644 index 0000000000..144156ae68 Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/crawler-factory.png differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 8032ddd07a..083455a850 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -278,14 +278,9 @@ zone.groundZero.name = Ground Zero zone.craters.name = The Craters zone.frozenForest.name = Frozen Forest zone.ruinousShores.name = Ruinous Shores -zone.crags.name = Crags zone.stainedMountains.name = Stained Mountains -zone.impact0079.name = Impact 0079 zone.desolateRift.name = Desolate Rift -zone.arcticDesert.name = Arctic Desert -zone.dryWastes.name = Dry Wastes zone.nuclearComplex.name = Nuclear Production Complex -zone.moltenFault.name = Molten Fault settings.language = Language settings.reset = Reset to Defaults @@ -656,6 +651,7 @@ block.phantom-factory.name = Phantom Drone Factory block.wraith-factory.name = Wraith Fighter Factory block.ghoul-factory.name = Ghoul Bomber Factory block.dagger-factory.name = Dagger Mech Factory +block.crawler-factory.name = Crawler Mech Factory block.titan-factory.name = Titan Mech Factory block.fortress-factory.name = Fortress Mech Factory block.revenant-factory.name = Revenant Fighter Factory @@ -812,6 +808,7 @@ block.wraith-factory.description = Produces fast, hit-and-run interceptor units. block.ghoul-factory.description = Produces heavy carpet bombers. block.dagger-factory.description = Produces basic ground units. block.titan-factory.description = Produces advanced, armored ground units. + block.fortress-factory.description = Produces heavy artillery ground units. block.revenant-factory.description = Produces heavy laser air units. block.repair-point.description = Continuously heals the closest damaged unit in its vicinity. diff --git a/core/assets/cursors/cursor.png b/core/assets/cursors/cursor.png index ece5696be0..d8487b7fa1 100644 Binary files a/core/assets/cursors/cursor.png and b/core/assets/cursors/cursor.png differ diff --git a/core/assets/cursors/drill.png b/core/assets/cursors/drill.png index e524b82762..9672daf2e3 100644 Binary files a/core/assets/cursors/drill.png and b/core/assets/cursors/drill.png differ diff --git a/core/assets/cursors/hand.png b/core/assets/cursors/hand.png index 1613b1eac3..ef489d4554 100644 Binary files a/core/assets/cursors/hand.png and b/core/assets/cursors/hand.png differ diff --git a/core/assets/cursors/ibeam.png b/core/assets/cursors/ibeam.png index 61ddc4b423..7ce778a271 100644 Binary files a/core/assets/cursors/ibeam.png and b/core/assets/cursors/ibeam.png differ diff --git a/core/assets/cursors/unload.png b/core/assets/cursors/unload.png index 2340e6d94e..faa0fe9476 100644 Binary files a/core/assets/cursors/unload.png and b/core/assets/cursors/unload.png differ diff --git a/core/assets/fonts/NanumBarunGothic.ttf b/core/assets/fonts/NanumBarunGothic.ttf new file mode 100644 index 0000000000..cc8ab988ab Binary files /dev/null and b/core/assets/fonts/NanumBarunGothic.ttf differ diff --git a/core/assets/fonts/font.ttf b/core/assets/fonts/font.ttf new file mode 100644 index 0000000000..a6c5d7250d Binary files /dev/null and b/core/assets/fonts/font.ttf differ diff --git a/core/assets/fonts/font_latin (copy).ttf b/core/assets/fonts/font_latin (copy).ttf new file mode 100644 index 0000000000..cebae09c33 Binary files /dev/null and b/core/assets/fonts/font_latin (copy).ttf differ diff --git a/core/assets/fonts/font_latin.ttf b/core/assets/fonts/font_latin.ttf new file mode 100644 index 0000000000..cebae09c33 Binary files /dev/null and b/core/assets/fonts/font_latin.ttf differ diff --git a/core/assets/fonts/pixel.ttf b/core/assets/fonts/pixel.ttf index 177fff5182..658cd3c239 100644 Binary files a/core/assets/fonts/pixel.ttf and b/core/assets/fonts/pixel.ttf differ diff --git a/core/assets/shaders/fog.fragment b/core/assets/shaders/fog.fragment index ea94aa2f5a..7ac266711a 100644 --- a/core/assets/shaders/fog.fragment +++ b/core/assets/shaders/fog.fragment @@ -5,8 +5,6 @@ precision mediump int; uniform sampler2D u_texture; -const float round = 0.01; - varying vec4 v_color; varying vec2 v_texCoord; diff --git a/core/assets/shaders/shield.fragment b/core/assets/shaders/shield.fragment index f771e59dd3..cf8b6a7132 100644 --- a/core/assets/shaders/shield.fragment +++ b/core/assets/shaders/shield.fragment @@ -18,10 +18,6 @@ uniform vec2 u_offset; varying vec4 v_color; varying vec2 v_texCoord; -float round(float f){ - return float(int(f)); -} - void main() { vec2 T = v_texCoord.xy; @@ -41,7 +37,7 @@ void main() { }else{ if(color.a > 0.1){ - if(mod(coords.x / u_dp + coords.y / u_dp + sin(round(coords.x / u_dp) / 5.0) * 3.0 + sin(round(coords.y / u_dp) / 5.0) * 3.0 + u_time / 4.0, 10.0) < 2.0){ + if(mod(coords.x / u_dp + coords.y / u_dp + sin(floor(coords.x / u_dp) / 5.0) * 3.0 + sin(floor(coords.y / u_dp) / 5.0) * 3.0 + u_time / 4.0, 10.0) < 2.0){ color *= 1.65; } diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index eb58551b70..b72e932904 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, 873 + xy: 771, 807 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mend-projector-top rotate: false - xy: 705, 807 + xy: 705, 741 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overdrive-projector rotate: false - xy: 771, 807 + xy: 705, 675 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 overdrive-projector-top rotate: false - xy: 705, 741 + xy: 771, 675 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shock-mine rotate: false - xy: 1369, 318 + xy: 1763, 609 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 1263, 510 + xy: 921, 88 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 1275, 637 + xy: 921, 54 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 1275, 603 + xy: 921, 20 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 1615, 579 + xy: 1807, 813 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 579, 123 + xy: 1841, 813 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 613, 123 + xy: 1875, 813 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 647, 123 + xy: 1909, 813 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 571, 89 + xy: 1943, 813 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 571, 55 + xy: 1977, 813 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 605, 89 + xy: 2011, 813 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 571, 21 + xy: 1503, 716 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 605, 55 + xy: 1503, 682 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 639, 89 + xy: 1519, 779 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 605, 21 + xy: 1553, 779 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 639, 55 + xy: 1587, 779 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 639, 21 + xy: 1621, 779 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 1297, 569 + xy: 1655, 779 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 1331, 569 + xy: 1689, 779 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 1297, 535 + xy: 1723, 779 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 1331, 535 + xy: 1757, 779 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 1297, 501 + xy: 1791, 779 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 1331, 501 + xy: 1825, 779 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 1365, 556 + xy: 1859, 779 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 1913, 281 + xy: 1685, 439 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 1947, 315 + xy: 1719, 473 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 1913, 247 + xy: 1549, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 1947, 281 + xy: 1583, 303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 1981, 315 + xy: 1617, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 2015, 315 + xy: 1651, 371 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 1947, 247 + xy: 1685, 405 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 1981, 281 + xy: 1719, 439 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 2015, 281 + xy: 1753, 473 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 1981, 247 + xy: 1549, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 2015, 247 + xy: 1583, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 1641, 213 + xy: 1617, 303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 1675, 213 + xy: 1651, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 1709, 213 + xy: 1685, 371 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 1743, 213 + xy: 1719, 405 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 1777, 213 + xy: 1753, 439 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 1811, 213 + xy: 1787, 473 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 1845, 213 + xy: 1583, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 1879, 213 + xy: 1617, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1913, 213 + xy: 1651, 303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 distributor rotate: false - xy: 733, 1005 + xy: 713, 939 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 junction rotate: false - xy: 1739, 451 + xy: 1193, 22 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -377,49 +377,49 @@ mass-driver-base index: -1 overflow-gate rotate: false - xy: 1759, 383 + xy: 1481, 198 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 1861, 383 + xy: 1473, 648 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 1895, 417 + xy: 1491, 614 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 1895, 383 + xy: 1491, 580 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 1929, 417 + xy: 1491, 546 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 1199, 340 + xy: 1559, 609 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 1471, 281 + xy: 1865, 609 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -482,21 +482,21 @@ laser-drill-top index: -1 mechanical-drill rotate: false - xy: 639, 873 + xy: 639, 741 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-rotator rotate: false - xy: 705, 873 + xy: 705, 807 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-top rotate: false - xy: 639, 741 + xy: 639, 675 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -531,182 +531,182 @@ oil-extractor-top index: -1 pneumatic-drill rotate: false - xy: 421, 175 + xy: 847, 477 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-rotator rotate: false - xy: 813, 543 + xy: 1213, 1152 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-top rotate: false - xy: 847, 477 + xy: 1205, 1086 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 969, 707 + xy: 879, 575 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 879, 641 + xy: 945, 575 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 879, 575 + xy: 1011, 641 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 945, 641 + xy: 1011, 575 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 char1 rotate: false - xy: 1309, 637 + xy: 1243, 170 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 char2 rotate: false - xy: 1309, 603 + xy: 1277, 408 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 char3 rotate: false - xy: 1332, 671 + xy: 1277, 374 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cliffs1 rotate: false - xy: 1343, 637 + xy: 1277, 340 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal1 rotate: false - xy: 1343, 603 + xy: 1277, 306 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal2 rotate: false - xy: 1366, 692 + xy: 1277, 272 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal3 rotate: false - xy: 1400, 692 + xy: 1277, 238 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper1 rotate: false - xy: 1399, 556 + xy: 1893, 779 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper2 rotate: false - xy: 1365, 522 + xy: 1927, 779 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper3 rotate: false - xy: 1399, 522 + xy: 1961, 779 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters1 rotate: false - xy: 1501, 519 + xy: 1605, 745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters2 rotate: false - xy: 1535, 545 + xy: 1605, 711 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters3 rotate: false - xy: 1569, 545 + xy: 1639, 745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters4 rotate: false - xy: 1603, 545 + xy: 1639, 711 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters5 rotate: false - xy: 1535, 511 + xy: 1673, 745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone1 rotate: false - xy: 1535, 511 + xy: 1673, 745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters6 rotate: false - xy: 1569, 511 + xy: 1673, 711 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone2 rotate: false - xy: 1569, 511 + xy: 1673, 711 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater rotate: false - xy: 1467, 485 + xy: 1775, 711 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -727,21 +727,21 @@ differential-generator-top index: -1 dunerocks-large rotate: false - xy: 713, 939 + xy: 1937, 1407 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dunerocks1 rotate: false - xy: 1637, 477 + xy: 1911, 745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dunerocks2 rotate: false - xy: 1651, 621 + xy: 1911, 711 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -762,63 +762,63 @@ edge-stencil-smooth index: -1 grass1 rotate: false - xy: 1683, 587 + xy: 1707, 677 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass2 rotate: false - xy: 1717, 587 + xy: 1741, 677 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass3 rotate: false - xy: 1751, 587 + xy: 1775, 677 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone1 rotate: false - xy: 1853, 587 + xy: 1877, 677 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone2 rotate: false - xy: 1887, 587 + xy: 1911, 677 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone3 rotate: false - xy: 1921, 587 + xy: 1945, 677 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock1 rotate: false - xy: 1957, 621 + xy: 1979, 677 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock2 rotate: false - xy: 1955, 587 + xy: 2013, 745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock3 rotate: false - xy: 1671, 553 + xy: 2013, 711 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -832,574 +832,574 @@ ice-edge index: -1 ice-snow1 rotate: false - xy: 1705, 519 + xy: 1013, 167 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow2 rotate: false - xy: 1739, 553 + xy: 1013, 133 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow3 rotate: false - xy: 1705, 485 + xy: 1047, 167 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice1 rotate: false - xy: 1671, 519 + xy: 2013, 677 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice2 rotate: false - xy: 1705, 553 + xy: 1013, 201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice3 rotate: false - xy: 1671, 485 + xy: 1047, 201 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icerocks-large rotate: false - xy: 389, 45 + xy: 931, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 icerocks1 rotate: false - xy: 1739, 519 + xy: 1047, 133 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icerocks2 rotate: false - xy: 1773, 553 + xy: 1081, 200 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ignarock1 rotate: false - xy: 1807, 553 + xy: 1115, 166 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ignarock2 rotate: false - xy: 1773, 485 + xy: 1149, 200 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ignarock3 rotate: false - xy: 1807, 519 + xy: 1149, 166 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead1 rotate: false - xy: 1943, 451 + xy: 1261, 102 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead2 rotate: false - xy: 1977, 451 + xy: 1227, 34 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead3 rotate: false - xy: 2011, 451 + xy: 1261, 68 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock1 rotate: false - xy: 1987, 961 + xy: 1337, 700 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock2 rotate: false - xy: 673, 81 + xy: 1269, 666 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock3 rotate: false - xy: 673, 47 + xy: 1303, 666 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor rotate: false - xy: 741, 13 + xy: 1321, 598 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged5 rotate: false - xy: 741, 13 + xy: 1321, 598 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-2 rotate: false - xy: 775, 43 + xy: 1287, 530 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-3 rotate: false - xy: 809, 43 + xy: 1321, 564 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-5 rotate: false - xy: 843, 43 + xy: 1287, 496 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged1 rotate: false - xy: 877, 43 + xy: 1321, 530 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged2 rotate: false - xy: 911, 43 + xy: 1287, 462 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged3 rotate: false - xy: 945, 43 + xy: 1321, 496 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged4 rotate: false - xy: 775, 9 + xy: 1321, 462 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged6 rotate: false - xy: 809, 9 + xy: 1355, 598 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pine rotate: false - xy: 1997, 417 + xy: 1515, 410 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rock1 rotate: false - xy: 1727, 897 + xy: 853, 227 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rock2 rotate: false - xy: 1727, 847 + xy: 853, 177 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rocks-large rotate: false - xy: 1205, 1086 + xy: 1205, 1020 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rocks1 rotate: false - xy: 1165, 340 + xy: 1991, 643 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rocks2 rotate: false - xy: 1233, 374 + xy: 1525, 609 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water rotate: false - xy: 1233, 272 + xy: 1559, 541 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand1 rotate: false - xy: 1131, 272 + xy: 1525, 507 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand2 rotate: false - xy: 1165, 272 + xy: 1627, 609 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand3 rotate: false - xy: 1199, 272 + xy: 1593, 575 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap1 rotate: false - xy: 1267, 365 + xy: 1661, 609 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap2 rotate: false - xy: 1301, 365 + xy: 1627, 575 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap3 rotate: false - xy: 1267, 331 + xy: 1593, 541 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow1 rotate: false - xy: 1403, 349 + xy: 1797, 609 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow2 rotate: false - xy: 1403, 315 + xy: 1763, 575 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow3 rotate: false - xy: 1437, 349 + xy: 1729, 541 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrocks-large rotate: false - xy: 1665, 1363 + xy: 1863, 1363 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 snowrocks1 rotate: false - xy: 1403, 281 + xy: 1695, 507 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrocks2 rotate: false - xy: 1437, 315 + xy: 1831, 609 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-cluster1 rotate: false - xy: 2001, 755 + xy: 1211, 528 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster2 rotate: false - xy: 2001, 713 + xy: 1211, 486 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 spore-cluster3 rotate: false - xy: 1143, 696 + xy: 1211, 444 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 stained-boulder1 rotate: false - xy: 1505, 307 + xy: 1831, 541 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-boulder2 rotate: false - xy: 1573, 341 + xy: 1797, 507 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-rocks-large rotate: false - xy: 1831, 1297 + xy: 445, 309 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 stained-rocks-red-large rotate: false - xy: 453, 441 + xy: 445, 243 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 stained-rocks-red1 rotate: false - xy: 1607, 341 + xy: 1865, 541 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-rocks-red2 rotate: false - xy: 1539, 273 + xy: 1831, 507 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-rocks-yellow-large rotate: false - xy: 445, 375 + xy: 487, 177 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 stained-rocks-yellow1 rotate: false - xy: 1573, 307 + xy: 1967, 609 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-rocks-yellow2 rotate: false - xy: 1573, 273 + xy: 1933, 575 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-rocks1 rotate: false - xy: 1505, 273 + xy: 1933, 609 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-rocks2 rotate: false - xy: 1539, 307 + xy: 1899, 575 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-red1 rotate: false - xy: 1539, 239 + xy: 1933, 541 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-red2 rotate: false - xy: 1573, 239 + xy: 1899, 507 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-red3 rotate: false - xy: 1607, 239 + xy: 1967, 541 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-yellow1 rotate: false - xy: 1641, 315 + xy: 1933, 507 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-yellow2 rotate: false - xy: 1641, 281 + xy: 1967, 507 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone-yellow3 rotate: false - xy: 1675, 315 + xy: 2001, 609 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone1 rotate: false - xy: 1607, 307 + xy: 1899, 541 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone2 rotate: false - xy: 1607, 273 + xy: 1865, 507 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stained-stone3 rotate: false - xy: 1505, 239 + xy: 1967, 575 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stainedrocks-large rotate: false - xy: 445, 309 + xy: 845, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 stainedrocks1 rotate: false - xy: 1641, 247 + xy: 2001, 575 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stainedrocks2 rotate: false - xy: 1675, 281 + xy: 2001, 541 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone3 rotate: false - xy: 1709, 315 + xy: 2001, 507 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar rotate: false - xy: 1743, 281 + xy: 1583, 439 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 1811, 315 + xy: 1617, 439 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 1777, 247 + xy: 1651, 473 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 1811, 281 + xy: 1549, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 1879, 281 + xy: 1583, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 1913, 315 + xy: 1617, 371 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 1879, 247 + xy: 1651, 405 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water rotate: false - xy: 1071, 103 + xy: 1685, 303 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1420,35 +1420,35 @@ white-tree-dead index: -1 block-border rotate: false - xy: 1161, 544 + xy: 1243, 408 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-middle rotate: false - xy: 1195, 544 + xy: 1243, 374 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 1195, 544 + xy: 1243, 374 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-select rotate: false - xy: 1229, 544 + xy: 1243, 340 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 1581, 613 + xy: 1501, 813 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1462,28 +1462,28 @@ place-arrow index: -1 rubble-1-0 rotate: false - xy: 1205, 1020 + xy: 1195, 888 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 1195, 954 + xy: 1303, 1284 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 1129, 914 + xy: 1291, 1218 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 1195, 888 + xy: 1279, 1152 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1518,175 +1518,175 @@ rubble-4-1 index: -1 spawn rotate: false - xy: 1403, 247 + xy: 1831, 575 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 1161, 510 + xy: 1243, 306 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 1195, 510 + xy: 1243, 272 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 1195, 510 + xy: 1243, 272 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 1229, 510 + xy: 1243, 238 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 1263, 544 + xy: 1243, 204 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 1411, 658 + xy: 955, 73 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 1411, 624 + xy: 955, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 1445, 655 + xy: 989, 73 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 1479, 655 + xy: 989, 39 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 1513, 655 + xy: 955, 5 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 1445, 621 + xy: 989, 5 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 1479, 621 + xy: 1401, 708 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 1513, 621 + xy: 1435, 708 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 1615, 613 + xy: 1535, 813 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 1377, 590 + xy: 1569, 813 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 1411, 590 + xy: 1603, 813 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 1445, 587 + xy: 1637, 813 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 1479, 587 + xy: 1671, 813 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 1513, 587 + xy: 1705, 813 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 1547, 579 + xy: 1739, 813 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 1945, 1129 + xy: 1295, 102 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 1979, 1131 + xy: 1295, 34 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 2013, 1147 + xy: 1987, 1063 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 2013, 1113 + xy: 1987, 1029 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1714,91 +1714,91 @@ liquid-tank-top index: -1 mechanical-pump rotate: false - xy: 741, 81 + xy: 1303, 632 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 1793, 383 + xy: 1499, 130 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 1827, 417 + xy: 1499, 96 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 1827, 383 + xy: 1499, 62 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 1861, 417 + xy: 1499, 28 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 1929, 349 + xy: 1533, 70 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1963, 349 + xy: 1533, 36 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1997, 349 + xy: 1533, 2 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 1063, 375 + xy: 1549, 643 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 1063, 341 + xy: 1583, 643 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 1097, 375 + xy: 1617, 643 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 1063, 307 + xy: 1651, 643 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 1139, 1046 + xy: 1195, 954 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1819,7 +1819,7 @@ alpha-dart-mech-pad index: -1 delta-mech-pad rotate: false - xy: 667, 1005 + xy: 647, 939 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1833,7 +1833,7 @@ glaive-ship-pad index: -1 javelin-ship-pad rotate: false - xy: 583, 473 + xy: 997, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1847,21 +1847,21 @@ omega-mech-pad index: -1 tau-mech-pad rotate: false - xy: 977, 905 + xy: 837, 773 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 trident-ship-pad rotate: false - xy: 969, 839 + xy: 969, 773 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 battery rotate: false - xy: 1173, 578 + xy: 1253, 578 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1875,14 +1875,14 @@ battery-large index: -1 combustion-generator rotate: false - xy: 1377, 658 + xy: 1277, 204 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 1377, 624 + xy: 1277, 170 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1945,63 +1945,63 @@ impact-reactor-top index: -1 power-node rotate: false - xy: 1691, 349 + xy: 1515, 308 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 1225, 1218 + xy: 1139, 1046 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 power-source rotate: false - xy: 1759, 349 + xy: 1515, 240 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-void rotate: false - xy: 1793, 349 + xy: 1515, 206 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 1827, 349 + xy: 1523, 172 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 powervoid rotate: false - xy: 1861, 349 + xy: 1533, 138 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 1129, 980 + xy: 1129, 914 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 1233, 340 + xy: 1593, 609 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 1471, 349 + xy: 1797, 575 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2015,14 +2015,14 @@ solar-panel-large index: -1 surge-tower rotate: false - xy: 445, 243 + xy: 911, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 1043, 905 + xy: 903, 839 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2050,14 +2050,14 @@ thorium-reactor-lights index: -1 turbine-generator rotate: false - xy: 903, 773 + xy: 903, 707 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-top rotate: false - xy: 1035, 839 + xy: 1035, 773 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2085,112 +2085,112 @@ blast-mixer index: -1 cryofluidmixer-bottom rotate: false - xy: 1607, 1429 + xy: 1871, 1429 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 1739, 1429 + xy: 1956, 1671 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 1805, 1429 + xy: 1945, 1605 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator rotate: false - xy: 1871, 1429 + xy: 1945, 1539 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 1956, 1671 + xy: 535, 1005 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 1945, 1605 + xy: 601, 1005 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 graphite-press rotate: false - xy: 1063, 1037 + xy: 865, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 incinerator rotate: false - xy: 1807, 485 + xy: 1115, 132 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-source rotate: false - xy: 1977, 485 + xy: 1091, 30 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-void rotate: false - xy: 1671, 451 + xy: 1193, 90 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 kiln rotate: false - xy: 865, 971 + xy: 1063, 971 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 kiln-top rotate: false - xy: 931, 971 + xy: 649, 473 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 931, 971 + xy: 649, 473 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 1909, 451 + xy: 1227, 68 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-source rotate: false - xy: 1987, 1063 + xy: 1987, 961 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 673, 13 + xy: 1287, 598 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2204,126 +2204,126 @@ multi-press index: -1 phase-weaver rotate: false - xy: 681, 543 + xy: 715, 477 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 747, 609 + xy: 781, 477 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 715, 477 + xy: 421, 175 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 781, 477 + xy: 813, 609 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 1335, 1355 + xy: 813, 543 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 1097, 341 + xy: 1685, 643 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 1097, 307 + xy: 1753, 643 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 1213, 1152 + xy: 1129, 980 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator rotate: false - xy: 1467, 1363 + xy: 1665, 1363 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 1533, 1363 + xy: 1731, 1363 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 1599, 1363 + xy: 1797, 1363 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 smelter rotate: false - xy: 1369, 250 + xy: 1661, 507 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-press rotate: false - xy: 1929, 1341 + xy: 1567, 1297 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame0 rotate: false - xy: 1435, 1289 + xy: 1633, 1297 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame1 rotate: false - xy: 1501, 1297 + xy: 1699, 1297 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-frame2 rotate: false - xy: 1567, 1297 + xy: 1765, 1297 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-liquid rotate: false - xy: 1699, 1297 + xy: 453, 441 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-top rotate: false - xy: 1765, 1297 + xy: 445, 375 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2372,14 +2372,14 @@ launch-pad index: -1 sortedunloader rotate: false - xy: 1471, 315 + xy: 1729, 507 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader rotate: false - xy: 1071, 171 + xy: 1617, 235 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2393,14 +2393,14 @@ vault index: -1 arc-heat rotate: false - xy: 1207, 612 + xy: 979, 107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-1 rotate: false - xy: 1241, 578 + xy: 1253, 442 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2435,7 +2435,7 @@ hail-heat index: -1 lancer-heat rotate: false - xy: 1063, 971 + xy: 639, 807 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2456,70 +2456,91 @@ ripple-heat index: -1 salvo-heat rotate: false - xy: 1291, 1218 + xy: 1271, 1020 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 1271, 1086 + xy: 1261, 888 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 1271, 1020 + xy: 1369, 1289 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 1011, 575 + xy: 913, 443 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +crawler-factory + rotate: false + xy: 1607, 1429 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dagger-factory rotate: false - xy: 1945, 1539 + xy: 1607, 1429 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phantom-factory rotate: false - xy: 1945, 1539 + xy: 1607, 1429 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spirit-factory rotate: false - xy: 1945, 1539 + xy: 1607, 1429 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wraith-factory rotate: false - xy: 1945, 1539 + xy: 1607, 1429 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +crawler-factory-top + rotate: false + xy: 1739, 1429 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +crawler-factory-top-open + rotate: false + xy: 1805, 1429 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dagger-factory-top rotate: false - xy: 535, 1005 + xy: 733, 1005 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dagger-factory-top-open rotate: false - xy: 601, 1005 + xy: 581, 939 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2582,21 +2603,21 @@ ghoul-factory index: -1 phantom-factory-top rotate: false - xy: 705, 675 + xy: 681, 543 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phantom-factory-top-open rotate: false - xy: 771, 675 + xy: 747, 609 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 repair-point-base rotate: false - xy: 1165, 374 + xy: 1855, 643 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2624,14 +2645,14 @@ revenant-factory-top-open index: -1 spirit-factory-top rotate: false - xy: 1797, 1363 + xy: 1435, 1289 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spirit-factory-top-open rotate: false - xy: 1863, 1363 + xy: 1501, 1297 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2645,21 +2666,21 @@ titan-factory index: -1 wraith-factory-top rotate: false - xy: 979, 509 + xy: 1045, 509 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wraith-factory-top-open rotate: false - xy: 913, 443 + xy: 1045, 443 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 copper-wall rotate: false - xy: 1433, 553 + xy: 1995, 779 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2673,42 +2694,42 @@ copper-wall-large index: -1 door rotate: false - xy: 1603, 477 + xy: 1843, 711 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large rotate: false - xy: 581, 939 + xy: 799, 1005 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 647, 939 + xy: 779, 939 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-open rotate: false - xy: 1637, 511 + xy: 1877, 711 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 1929, 383 + xy: 1491, 512 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large rotate: false - xy: 681, 609 + xy: 747, 543 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2743,91 +2764,91 @@ scrap-wall-huge3 index: -1 scrap-wall-large1 rotate: false - xy: 1261, 954 + xy: 1401, 1355 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large2 rotate: false - xy: 1261, 888 + xy: 1467, 1363 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large3 rotate: false - xy: 1369, 1289 + xy: 1533, 1363 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall-large4 rotate: false - xy: 1401, 1355 + xy: 1599, 1363 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 scrap-wall1 rotate: false - xy: 1267, 297 + xy: 1559, 507 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall2 rotate: false - xy: 1301, 331 + xy: 1695, 609 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 1301, 297 + xy: 1661, 575 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 1267, 263 + xy: 1627, 541 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 1267, 263 + xy: 1627, 541 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 1709, 281 + xy: 1549, 439 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large rotate: false - xy: 487, 177 + xy: 977, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 1811, 247 + xy: 1617, 405 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 837, 839 + xy: 837, 707 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2841,14 +2862,14 @@ thruster index: -1 titanium-wall rotate: false - xy: 1947, 213 + xy: 1685, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large rotate: false - xy: 837, 707 + xy: 1035, 839 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2876,7 +2897,7 @@ casing index: -1 error rotate: false - xy: 1395, 1134 + xy: 893, 343 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -2897,7 +2918,7 @@ laser-end index: -1 minelaser rotate: false - xy: 2043, 907 + xy: 1939, 1291 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -2911,14 +2932,14 @@ minelaser-end index: -1 missile rotate: false - xy: 1135, 629 + xy: 903, 197 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 missile-back rotate: false - xy: 1135, 591 + xy: 903, 159 size: 36, 36 orig: 36, 36 offset: 0, 0 @@ -2932,70 +2953,70 @@ scale_marker index: -1 scorch1 rotate: false - xy: 1081, 1 + xy: 1716, 201 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch2 rotate: false - xy: 1111, 28 + xy: 1746, 201 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch3 rotate: false - xy: 1230, 136 + xy: 1776, 235 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch4 rotate: false - xy: 1260, 136 + xy: 1806, 269 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch5 rotate: false - xy: 1290, 161 + xy: 1567, 99 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 shell rotate: false - xy: 1907, 1303 + xy: 941, 218 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shell-back rotate: false - xy: 2001, 675 + xy: 941, 180 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 shot rotate: false - xy: 1369, 284 + xy: 1729, 575 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 transfer rotate: false - xy: 2043, 857 + xy: 2043, 627 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 2015, 213 + xy: 1753, 405 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3016,70 +3037,70 @@ alloy-smelter-icon-large index: -1 alloy-smelter-icon-medium rotate: false - xy: 1173, 646 + xy: 979, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 alloy-smelter-icon-small rotate: false - xy: 1451, 850 + xy: 1501, 858 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 alpha-dart-mech-pad-icon-large rotate: false - xy: 511, 341 + xy: 569, 307 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-dart-mech-pad-icon-medium rotate: false - xy: 1173, 612 + xy: 979, 175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 alpha-dart-mech-pad-icon-small rotate: false - xy: 1551, 813 + xy: 1371, 708 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 arc rotate: false - xy: 1207, 646 + xy: 979, 141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 arc-icon-full rotate: false - xy: 1298, 671 + xy: 1485, 750 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 arc-icon-large rotate: false - xy: 561, 315 + xy: 743, 427 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 arc-icon-small rotate: false - xy: 1003, 77 + xy: 1473, 682 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 battery-icon-large rotate: false - xy: 561, 265 + xy: 843, 427 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -3093,21 +3114,21 @@ battery-icon-small index: -1 battery-large-icon-large rotate: false - xy: 611, 257 + xy: 677, 365 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 battery-large-icon-medium rotate: false - xy: 1207, 578 + xy: 1253, 544 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 battery-large-icon-small rotate: false - xy: 1945, 1103 + xy: 1023, 5 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3121,336 +3142,364 @@ blast-drill-icon-full index: -1 blast-drill-icon-large rotate: false - xy: 693, 423 + xy: 1111, 534 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 blast-drill-icon-medium rotate: false - xy: 1241, 646 + xy: 1253, 510 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blast-drill-icon-small rotate: false - xy: 775, 89 + xy: 1889, 481 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blast-mixer-icon-large rotate: false - xy: 743, 427 + xy: 1111, 484 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 blast-mixer-icon-medium rotate: false - xy: 1241, 612 + xy: 1253, 476 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blast-mixer-icon-small rotate: false - xy: 1111, 2 + xy: 1549, 209 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 bridge-conduit-icon-large rotate: false - xy: 553, 215 + xy: 553, 145 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 bridge-conduit-icon-small rotate: false - xy: 1349, 224 + xy: 1749, 311 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 bridge-conveyor-icon-large rotate: false - xy: 553, 165 + xy: 1357, 1234 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 bridge-conveyor-icon-small rotate: false - xy: 1320, 161 + xy: 1776, 209 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 char-icon-large rotate: false - xy: 603, 157 + xy: 1457, 1239 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 char-icon-small rotate: false - xy: 1375, 224 + xy: 1567, 35 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 cliffs-icon-large rotate: false - xy: 677, 365 + xy: 1507, 1247 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 cliffs-icon-small rotate: false - xy: 1349, 198 + xy: 1821, 413 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 combustion-generator-icon-large rotate: false - xy: 661, 315 + xy: 1557, 1247 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 combustion-generator-icon-small rotate: false - xy: 1375, 198 + xy: 1915, 481 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 conduit-icon-full rotate: false - xy: 1547, 613 + xy: 1469, 708 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-icon-large rotate: false - xy: 661, 265 + xy: 1607, 1247 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 conduit-icon-small rotate: false - xy: 1401, 221 + xy: 1575, 209 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 container-icon-large rotate: false - xy: 711, 315 + xy: 1657, 1247 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 container-icon-medium rotate: false - xy: 1581, 579 + xy: 1773, 813 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 container-icon-small rotate: false - xy: 1427, 221 + xy: 1567, 9 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 conveyor-icon-large rotate: false - xy: 711, 265 + xy: 1707, 1247 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 conveyor-icon-small rotate: false - xy: 1453, 221 + xy: 1941, 481 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 copper-wall-icon-large rotate: false - xy: 1357, 1234 + xy: 1757, 1247 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 copper-wall-icon-small rotate: false - xy: 1479, 221 + xy: 1601, 209 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 copper-wall-large-icon-large rotate: false - xy: 1407, 1239 + xy: 1807, 1247 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 copper-wall-large-icon-medium rotate: false - xy: 1467, 553 + xy: 1537, 745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall-large-icon-small rotate: false - xy: 1136, 134 + xy: 1967, 481 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 core-foundation-icon-large rotate: false - xy: 1457, 1239 + xy: 1857, 1247 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 core-foundation-icon-medium rotate: false - xy: 1501, 553 + xy: 1537, 711 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 core-foundation-icon-small rotate: false - xy: 1401, 195 + xy: 1993, 481 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 core-nucleus-icon-large rotate: false - xy: 1507, 1247 + xy: 1357, 1184 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 core-nucleus-icon-medium rotate: false - xy: 1433, 519 + xy: 1571, 745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 core-nucleus-icon-small rotate: false - xy: 1427, 195 + xy: 1682, 237 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 core-shard-icon-large rotate: false - xy: 1557, 1247 + xy: 1407, 1189 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 core-shard-icon-medium rotate: false - xy: 1467, 519 + xy: 1571, 711 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 core-shard-icon-small rotate: false - xy: 1453, 195 + xy: 1597, 183 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 craters-icon-large rotate: false - xy: 1607, 1247 + xy: 1457, 1189 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 craters-icon-small rotate: false - xy: 1479, 195 + xy: 1597, 157 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -cryofluidmixer-icon-full +crawler-factory-icon-full rotate: false xy: 1673, 1429 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -cryofluidmixer-icon-large +crawler-factory-icon-large rotate: false - xy: 1807, 1247 + xy: 1607, 1197 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -cryofluidmixer-icon-medium +crawler-factory-icon-medium rotate: false - xy: 1603, 511 + xy: 1707, 745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -cryofluidmixer-icon-small +crawler-factory-icon-small rotate: false - xy: 1505, 213 + xy: 1597, 131 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -cultivator-icon-full +cryofluidmixer-icon-full rotate: false xy: 1237, 1284 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 +cryofluidmixer-icon-large + rotate: false + xy: 1707, 1197 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +cryofluidmixer-icon-medium + rotate: false + xy: 1707, 711 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +cryofluidmixer-icon-small + rotate: false + xy: 1597, 105 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +cultivator-icon-full + rotate: false + xy: 1945, 1473 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 cultivator-icon-large rotate: false - xy: 1857, 1247 + xy: 1757, 1197 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 cultivator-icon-medium rotate: false - xy: 1365, 488 + xy: 1741, 745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cultivator-icon-small rotate: false - xy: 1531, 213 + xy: 1049, 4 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3471,49 +3520,49 @@ cyclone-icon-full index: -1 cyclone-icon-large rotate: false - xy: 1357, 1184 + xy: 1807, 1197 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 cyclone-icon-medium rotate: false - xy: 1399, 488 + xy: 1741, 711 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cyclone-icon-small rotate: false - xy: 1557, 213 + xy: 1075, 4 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dagger-factory-icon-full rotate: false - xy: 1945, 1473 + xy: 667, 1005 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dagger-factory-icon-large rotate: false - xy: 1507, 1197 + xy: 1337, 1084 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-factory-icon-medium rotate: false - xy: 1433, 485 + xy: 1775, 745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dagger-factory-icon-small rotate: false - xy: 1583, 213 + xy: 1101, 4 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3527,175 +3576,175 @@ deepwater-edge index: -1 deepwater-icon-large rotate: false - xy: 1657, 1197 + xy: 1327, 934 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 deepwater-icon-small rotate: false - xy: 1609, 213 + xy: 1127, 4 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 delta-mech-pad-icon-large rotate: false - xy: 1857, 1197 + xy: 843, 377 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-mech-pad-icon-medium rotate: false - xy: 1501, 485 + xy: 1809, 745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 delta-mech-pad-icon-small rotate: false - xy: 1505, 187 + xy: 2019, 481 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 differential-generator-icon-large rotate: false - xy: 1345, 1134 + xy: 893, 393 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 differential-generator-icon-medium rotate: false - xy: 1535, 477 + xy: 1809, 711 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 differential-generator-icon-small rotate: false - xy: 1531, 187 + xy: 1227, 8 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 distributor-icon-large rotate: false - xy: 1337, 1084 + xy: 943, 393 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 distributor-icon-medium rotate: false - xy: 1569, 477 + xy: 1843, 745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 distributor-icon-small rotate: false - xy: 1557, 187 + xy: 1253, 8 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 door-icon-large rotate: false - xy: 1337, 1034 + xy: 993, 393 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 door-icon-small rotate: false - xy: 1583, 187 + xy: 1279, 8 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 door-large-icon-large rotate: false - xy: 1337, 984 + xy: 1043, 393 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 door-large-icon-medium rotate: false - xy: 1637, 545 + xy: 1877, 745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door-large-icon-small rotate: false - xy: 1609, 187 + xy: 537, 119 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dunerocks-icon-large rotate: false - xy: 1327, 934 + xy: 1093, 384 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dunerocks-icon-small rotate: false - xy: 1635, 187 + xy: 2022, 1777 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 duo rotate: false - xy: 1685, 621 + xy: 1945, 745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 duo-icon-full rotate: false - xy: 1719, 621 + xy: 1945, 711 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 duo-icon-large rotate: false - xy: 1327, 884 + xy: 1143, 384 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 duo-icon-small rotate: false - xy: 1661, 187 + xy: 2022, 1751 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 force-projector-icon-large rotate: false - xy: 777, 377 + xy: 1093, 334 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 force-projector-icon-medium rotate: false - xy: 1787, 621 + xy: 1979, 711 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 force-projector-icon-small rotate: false - xy: 1687, 187 + xy: 2022, 1725 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3709,21 +3758,21 @@ fortress-factory-icon-full index: -1 fortress-factory-icon-large rotate: false - xy: 827, 377 + xy: 1143, 334 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 fortress-factory-icon-medium rotate: false - xy: 1821, 621 + xy: 1537, 677 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fortress-factory-icon-small rotate: false - xy: 1713, 187 + xy: 2022, 1699 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3744,21 +3793,21 @@ fuse-icon-full index: -1 fuse-icon-large rotate: false - xy: 1445, 1139 + xy: 843, 327 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 fuse-icon-medium rotate: false - xy: 1855, 621 + xy: 1571, 677 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fuse-icon-small rotate: false - xy: 1739, 187 + xy: 2022, 1673 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3772,91 +3821,91 @@ ghoul-factory-icon-full index: -1 ghoul-factory-icon-large rotate: false - xy: 1387, 976 + xy: 893, 293 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ghoul-factory-icon-medium rotate: false - xy: 1889, 621 + xy: 1605, 677 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ghoul-factory-icon-small rotate: false - xy: 1765, 187 + xy: 2021, 1073 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 glaive-ship-pad-icon-large rotate: false - xy: 1377, 926 + xy: 943, 285 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 glaive-ship-pad-icon-medium rotate: false - xy: 1923, 621 + xy: 1639, 677 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 glaive-ship-pad-icon-small rotate: false - xy: 1791, 187 + xy: 2021, 1047 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 graphite-press-icon-large rotate: false - xy: 1377, 876 + xy: 993, 293 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 graphite-press-icon-medium rotate: false - xy: 1649, 587 + xy: 1673, 677 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 graphite-press-icon-small rotate: false - xy: 1817, 187 + xy: 2021, 1021 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 hail rotate: false - xy: 1785, 587 + xy: 1809, 677 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hail-icon-full rotate: false - xy: 1819, 587 + xy: 1843, 677 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hail-icon-large rotate: false - xy: 761, 315 + xy: 1043, 285 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 hail-icon-small rotate: false - xy: 1843, 187 + xy: 2021, 995 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3870,42 +3919,42 @@ holostone-edge index: -1 holostone-icon-large rotate: false - xy: 811, 327 + xy: 1143, 284 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 holostone-icon-small rotate: false - xy: 1869, 187 + xy: 2021, 969 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 hotrock-icon-large rotate: false - xy: 811, 277 + xy: 993, 243 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 hotrock-icon-small rotate: false - xy: 1895, 187 + xy: 1431, 2 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ice-icon-large rotate: false - xy: 877, 377 + xy: 1043, 235 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ice-icon-small rotate: false - xy: 1921, 187 + xy: 1457, 2 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3919,42 +3968,42 @@ ice-snow-edge index: -1 ice-snow-icon-large rotate: false - xy: 861, 327 + xy: 1093, 234 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ice-snow-icon-small rotate: false - xy: 1947, 187 + xy: 1483, 2 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icerocks-icon-large rotate: false - xy: 861, 277 + xy: 1143, 234 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icerocks-icon-small rotate: false - xy: 1973, 187 + xy: 1889, 455 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ignarock-icon-large rotate: false - xy: 911, 327 + xy: 1387, 1084 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ignarock-icon-small rotate: false - xy: 1141, 56 + xy: 1993, 455 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3968,49 +4017,49 @@ impact-reactor-icon-full index: -1 impact-reactor-icon-large rotate: false - xy: 911, 277 + xy: 1387, 1034 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 impact-reactor-icon-medium rotate: false - xy: 1841, 553 + xy: 1081, 132 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 impact-reactor-icon-small rotate: false - xy: 1141, 30 + xy: 2019, 455 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 incinerator-icon-large rotate: false - xy: 1495, 1139 + xy: 1387, 984 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 incinerator-icon-small rotate: false - xy: 1319, 109 + xy: 1884, 429 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-blast-compound-medium rotate: false - xy: 1349, 172 + xy: 1884, 403 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-blast-compound-small rotate: false - xy: 509, 1000 + xy: 845, 1507 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4024,434 +4073,434 @@ item-blast-compound-xlarge index: -1 item-coal-medium rotate: false - xy: 1375, 172 + xy: 1936, 429 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-coal-small rotate: false - xy: 681, 121 + xy: 1109, 917 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-coal-xlarge rotate: false - xy: 511, 249 + xy: 477, 1716 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-copper-medium rotate: false - xy: 1401, 169 + xy: 1962, 429 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-copper-small rotate: false - xy: 2025, 657 + xy: 1909, 114 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-copper-xlarge rotate: false - xy: 2007, 1215 + xy: 1101, 713 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-graphite-medium rotate: false - xy: 1427, 169 + xy: 1988, 429 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-graphite-small rotate: false - xy: 527, 1507 + xy: 1909, 96 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-graphite-xlarge rotate: false - xy: 477, 1716 + xy: 1401, 742 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-lead-medium rotate: false - xy: 1453, 169 + xy: 2014, 429 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-lead-small rotate: false - xy: 1193, 116 + xy: 1909, 78 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-lead-xlarge rotate: false - xy: 1101, 713 + xy: 1989, 1099 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-metaglass-medium rotate: false - xy: 1479, 169 + xy: 1936, 403 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-metaglass-small rotate: false - xy: 1193, 98 + xy: 1909, 60 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-metaglass-xlarge rotate: false - xy: 1651, 655 + xy: 1443, 742 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-phase-fabric-medium rotate: false - xy: 1505, 161 + xy: 1962, 403 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-phase-fabric-small rotate: false - xy: 1193, 80 + xy: 1909, 42 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-phase-fabric-xlarge rotate: false - xy: 1951, 1199 + xy: 389, 3 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-plastanium-medium rotate: false - xy: 1531, 161 + xy: 1988, 403 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-plastanium-small rotate: false - xy: 1193, 62 + xy: 1932, 203 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-plastanium-xlarge rotate: false - xy: 1693, 655 + xy: 1143, 696 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-pyratite-medium rotate: false - xy: 1557, 161 + xy: 2014, 403 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-pyratite-small rotate: false - xy: 1193, 44 + xy: 1932, 185 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-pyratite-xlarge rotate: false - xy: 1735, 655 + xy: 1185, 696 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-sand-medium rotate: false - xy: 1583, 161 + xy: 1910, 387 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-sand-small rotate: false - xy: 1206, 134 + xy: 1950, 203 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-sand-xlarge rotate: false - xy: 1777, 655 + xy: 1227, 696 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-scrap-medium rotate: false - xy: 1609, 161 + xy: 1936, 377 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-scrap-small rotate: false - xy: 1211, 116 + xy: 1950, 185 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-scrap-xlarge rotate: false - xy: 1819, 655 + xy: 1142, 654 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-silicon-medium rotate: false - xy: 1635, 161 + xy: 1962, 377 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-silicon-small rotate: false - xy: 1211, 98 + xy: 1968, 203 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-silicon-xlarge rotate: false - xy: 1861, 655 + xy: 1184, 654 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-source-icon-large rotate: false - xy: 1545, 1147 + xy: 1377, 934 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-source-icon-small rotate: false - xy: 1661, 161 + xy: 1988, 377 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-medium rotate: false - xy: 1687, 161 + xy: 2014, 377 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-small rotate: false - xy: 1211, 80 + xy: 1968, 185 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-spore-pod-xlarge rotate: false - xy: 1903, 655 + xy: 1226, 654 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-surge-alloy-medium rotate: false - xy: 1713, 161 + xy: 1776, 183 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-small rotate: false - xy: 1211, 62 + xy: 1986, 203 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-surge-alloy-xlarge rotate: false - xy: 1945, 655 + xy: 1185, 612 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-thorium-medium rotate: false - xy: 1739, 161 + xy: 1806, 217 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-thorium-small rotate: false - xy: 1211, 44 + xy: 1986, 185 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-thorium-xlarge rotate: false - xy: 389, 3 + xy: 1227, 612 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-titanium-medium rotate: false - xy: 1765, 161 + xy: 1802, 191 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-small rotate: false - xy: 1229, 118 + xy: 2004, 203 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-titanium-xlarge rotate: false - xy: 537, 123 + xy: 1211, 570 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 item-void-icon-large rotate: false - xy: 1595, 1147 + xy: 1377, 884 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 item-void-icon-small rotate: false - xy: 1791, 161 + xy: 1821, 387 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 javelin-ship-pad-icon-large rotate: false - xy: 1695, 1147 + xy: 1495, 1139 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 javelin-ship-pad-icon-medium rotate: false - xy: 1705, 451 + xy: 1193, 56 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 javelin-ship-pad-icon-small rotate: false - xy: 1817, 161 + xy: 1847, 384 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 junction-icon-large rotate: false - xy: 1795, 1147 + xy: 1595, 1147 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 junction-icon-small rotate: false - xy: 1843, 161 + xy: 1682, 211 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 kiln-icon-large rotate: false - xy: 1845, 1147 + xy: 1645, 1147 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 kiln-icon-medium rotate: false - xy: 1773, 451 + xy: 1217, 136 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 kiln-icon-small rotate: false - xy: 1869, 161 + xy: 1802, 165 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 lancer rotate: false - xy: 997, 971 + xy: 639, 873 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 lancer-icon-full rotate: false - xy: 649, 473 + xy: 705, 873 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 lancer-icon-large rotate: false - xy: 811, 227 + xy: 1695, 1147 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lancer-icon-medium rotate: false - xy: 1807, 451 + xy: 1251, 136 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lancer-icon-small rotate: false - xy: 1895, 161 + xy: 1873, 377 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4465,91 +4514,91 @@ laser-drill-icon-full index: -1 laser-drill-icon-large rotate: false - xy: 861, 227 + xy: 1745, 1147 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 laser-drill-icon-medium rotate: false - xy: 1841, 451 + xy: 1285, 136 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 laser-drill-icon-small rotate: false - xy: 1921, 161 + xy: 1597, 79 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 launch-pad-icon-large rotate: false - xy: 911, 227 + xy: 1795, 1147 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 launch-pad-icon-medium rotate: false - xy: 1875, 451 + xy: 1227, 102 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 launch-pad-icon-small rotate: false - xy: 1947, 161 + xy: 1596, 53 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-junction-icon-large rotate: false - xy: 1945, 1291 + xy: 1895, 1147 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-junction-icon-small rotate: false - xy: 1973, 161 + xy: 1593, 27 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-router-icon-full rotate: false - xy: 2013, 1181 + xy: 1897, 1307 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-icon-large rotate: false - xy: 1907, 1241 + xy: 1945, 1291 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-router-icon-small rotate: false - xy: 1999, 161 + xy: 1593, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-source-icon-large rotate: false - xy: 1957, 1241 + xy: 1907, 1241 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-source-icon-small rotate: false - xy: 1162, 134 + xy: 1832, 243 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4563,35 +4612,35 @@ liquid-tank-icon-full index: -1 liquid-tank-icon-large rotate: false - xy: 1427, 926 + xy: 1957, 1241 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 liquid-tank-icon-medium rotate: false - xy: 1987, 1029 + xy: 1269, 700 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-tank-icon-small rotate: false - xy: 1167, 108 + xy: 1832, 217 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 magmarock-icon-large rotate: false - xy: 1427, 876 + xy: 1427, 934 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 magmarock-icon-small rotate: false - xy: 1167, 82 + xy: 1828, 191 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4612,70 +4661,70 @@ mass-driver-icon-full index: -1 mass-driver-icon-large rotate: false - xy: 1101, 855 + xy: 1427, 884 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mass-driver-icon-medium rotate: false - xy: 707, 81 + xy: 1337, 666 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mass-driver-icon-small rotate: false - xy: 1167, 56 + xy: 1828, 165 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mech-icon-alpha-mech rotate: false - xy: 1101, 805 + xy: 1101, 855 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mech-icon-dart-ship rotate: false - xy: 1101, 755 + xy: 1101, 805 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mech-icon-delta-mech rotate: false - xy: 1545, 1097 + xy: 1101, 755 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mech-icon-glaive-ship rotate: false - xy: 519, 449 + xy: 1077, 584 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 mech-icon-javelin-ship rotate: false - xy: 1595, 1097 + xy: 619, 307 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mech-icon-omega-mech rotate: false - xy: 1045, 511 + xy: 519, 449 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 mech-icon-tau-mech rotate: false - xy: 1103, 511 + xy: 511, 245 size: 56, 56 orig: 56, 56 offset: 0, 0 @@ -4689,42 +4738,42 @@ mech-icon-trident-ship index: -1 mechanical-drill-icon-full rotate: false - xy: 639, 807 + xy: 771, 873 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 mechanical-drill-icon-large rotate: false - xy: 1645, 1097 + xy: 619, 257 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mechanical-drill-icon-medium rotate: false - xy: 707, 47 + xy: 1269, 632 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-drill-icon-small rotate: false - xy: 1167, 30 + xy: 1623, 183 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mechanical-pump-icon-large rotate: false - xy: 1695, 1097 + xy: 669, 315 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mechanical-pump-icon-small rotate: false - xy: 2021, 1087 + xy: 1623, 157 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4745,112 +4794,112 @@ meltdown-icon-full index: -1 meltdown-icon-large rotate: false - xy: 1745, 1097 + xy: 669, 265 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 meltdown-icon-medium rotate: false - xy: 741, 47 + xy: 1337, 632 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 meltdown-icon-small rotate: false - xy: 2021, 1061 + xy: 1623, 131 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 melter-icon-large rotate: false - xy: 1795, 1097 + xy: 603, 207 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 melter-icon-small rotate: false - xy: 2021, 1035 + xy: 1623, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mend-projector-icon-large rotate: false - xy: 1845, 1097 + xy: 603, 157 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 mend-projector-icon-medium rotate: false - xy: 707, 13 + xy: 1287, 564 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mend-projector-icon-small rotate: false - xy: 2021, 1009 + xy: 1623, 79 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 metal-floor-2-icon-large rotate: false - xy: 1895, 1097 + xy: 653, 207 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 metal-floor-2-icon-small rotate: false - xy: 2021, 983 + xy: 1622, 53 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 metal-floor-3-icon-large rotate: false - xy: 653, 207 + xy: 653, 157 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 metal-floor-3-icon-small rotate: false - xy: 2021, 957 + xy: 1619, 27 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 metal-floor-5-icon-large rotate: false - xy: 653, 157 + xy: 603, 107 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 metal-floor-5-icon-small rotate: false - xy: 2022, 1777 + xy: 1619, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 metal-floor-damaged-icon-large rotate: false - xy: 703, 215 + xy: 653, 107 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 metal-floor-damaged-icon-small rotate: false - xy: 2022, 1751 + xy: 1854, 191 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4864,35 +4913,35 @@ metal-floor-edge index: -1 metal-floor-icon-large rotate: false - xy: 703, 165 + xy: 571, 57 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 metal-floor-icon-small rotate: false - xy: 2022, 1725 + xy: 1854, 165 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 multi-press-icon-large rotate: false - xy: 753, 215 + xy: 571, 7 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 multi-press-icon-medium rotate: false - xy: 843, 9 + xy: 1355, 564 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 multi-press-icon-small rotate: false - xy: 2022, 1699 + xy: 1649, 203 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4906,1932 +4955,1932 @@ oil-extractor-icon-full index: -1 oil-extractor-icon-large rotate: false - xy: 753, 165 + xy: 621, 57 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 oil-extractor-icon-medium rotate: false - xy: 877, 9 + xy: 1355, 530 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 oil-extractor-icon-small rotate: false - xy: 2022, 1673 + xy: 1649, 177 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 omega-mech-pad-icon-large rotate: false - xy: 803, 177 + xy: 621, 7 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 omega-mech-pad-icon-medium rotate: false - xy: 911, 9 + xy: 1355, 496 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 omega-mech-pad-icon-small rotate: false - xy: 1346, 146 + xy: 1649, 151 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-holostone-icon-large rotate: false - xy: 853, 177 + xy: 671, 57 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-coal-holostone-icon-small rotate: false - xy: 1372, 146 + xy: 1649, 125 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-holostone1 rotate: false - xy: 945, 9 + xy: 1355, 462 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-holostone2 rotate: false - xy: 979, 43 + xy: 1311, 428 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-holostone3 rotate: false - xy: 979, 9 + xy: 1311, 394 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-holostone-icon-full rotate: false - xy: 979, 9 + xy: 1311, 394 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-holostone-icon-medium rotate: false - xy: 979, 9 + xy: 1311, 394 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand-icon-large rotate: false - xy: 903, 177 + xy: 671, 7 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-coal-sand-icon-small rotate: false - xy: 1345, 120 + xy: 1649, 99 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 1991, 641 + xy: 1345, 428 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 977, 409 + xy: 1311, 360 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 1011, 410 + xy: 1345, 394 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand-icon-full rotate: false - xy: 1011, 410 + xy: 1345, 394 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand-icon-medium rotate: false - xy: 1011, 410 + xy: 1345, 394 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-icon-large rotate: false - xy: 803, 127 + xy: 1545, 1097 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-coal-stained-stone-icon-small rotate: false - xy: 1371, 120 + xy: 1649, 73 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-stained-stone-red-icon-large rotate: false - xy: 853, 127 + xy: 1595, 1097 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-coal-stained-stone-red-icon-small rotate: false - xy: 1398, 143 + xy: 1675, 185 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-stained-stone-red1 rotate: false - xy: 961, 307 + xy: 1345, 326 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-red2 rotate: false - xy: 961, 273 + xy: 1311, 258 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-red3 rotate: false - xy: 961, 239 + xy: 1345, 292 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-red-icon-full rotate: false - xy: 961, 239 + xy: 1345, 292 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-red-icon-medium rotate: false - xy: 961, 239 + xy: 1345, 292 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone1 rotate: false - xy: 977, 375 + xy: 1311, 326 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone2 rotate: false - xy: 1011, 376 + xy: 1345, 360 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone3 rotate: false - xy: 961, 341 + xy: 1311, 292 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-icon-full rotate: false - xy: 961, 341 + xy: 1311, 292 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stained-stone-icon-medium rotate: false - xy: 961, 341 + xy: 1311, 292 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone-icon-large rotate: false - xy: 903, 127 + xy: 1645, 1097 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-coal-stone-icon-small rotate: false - xy: 1424, 143 + xy: 1675, 159 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 995, 341 + xy: 1311, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 995, 307 + xy: 1345, 258 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 995, 273 + xy: 1311, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone-icon-full rotate: false - xy: 995, 273 + xy: 1311, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone-icon-medium rotate: false - xy: 995, 273 + xy: 1311, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-holostone-icon-large rotate: false - xy: 1437, 1084 + xy: 1695, 1097 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-copper-holostone-icon-small rotate: false - xy: 1450, 143 + xy: 1675, 133 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-holostone1 rotate: false - xy: 995, 239 + xy: 1345, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-holostone2 rotate: false - xy: 1029, 342 + xy: 1345, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-holostone3 rotate: false - xy: 1029, 308 + xy: 1319, 156 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-holostone-icon-full rotate: false - xy: 1029, 308 + xy: 1319, 156 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-holostone-icon-medium rotate: false - xy: 1029, 308 + xy: 1319, 156 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand-icon-large rotate: false - xy: 1437, 1034 + xy: 1745, 1097 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-copper-sand-icon-small rotate: false - xy: 1476, 143 + xy: 1675, 107 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-sand1 rotate: false - xy: 1029, 274 + xy: 1353, 156 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand2 rotate: false - xy: 1029, 240 + xy: 1329, 122 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand3 rotate: false - xy: 1003, 205 + xy: 1329, 88 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand-icon-full rotate: false - xy: 1003, 205 + xy: 1329, 88 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand-icon-medium rotate: false - xy: 1003, 205 + xy: 1329, 88 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-icon-large rotate: false - xy: 1437, 984 + xy: 1795, 1097 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-copper-stained-stone-icon-small rotate: false - xy: 1397, 117 + xy: 1675, 81 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-stained-stone-red-icon-large rotate: false - xy: 1487, 1089 + xy: 1845, 1097 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-copper-stained-stone-red-icon-small rotate: false - xy: 1423, 117 + xy: 1648, 47 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-stained-stone-red1 rotate: false - xy: 1037, 206 + xy: 1363, 54 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-red2 rotate: false - xy: 1037, 172 + xy: 1329, 20 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-red3 rotate: false - xy: 1037, 138 + xy: 1363, 20 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-red-icon-full rotate: false - xy: 1037, 138 + xy: 1363, 20 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-red-icon-medium rotate: false - xy: 1037, 138 + xy: 1363, 20 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone1 rotate: false - xy: 1003, 171 + xy: 1329, 54 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone2 rotate: false - xy: 1003, 137 + xy: 1363, 122 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone3 rotate: false - xy: 1003, 103 + xy: 1363, 88 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-icon-full rotate: false - xy: 1003, 103 + xy: 1363, 88 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stained-stone-icon-medium rotate: false - xy: 1003, 103 + xy: 1363, 88 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone-icon-large rotate: false - xy: 1487, 1039 + xy: 1895, 1097 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-copper-stone-icon-small rotate: false - xy: 1449, 117 + xy: 1645, 21 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-stone1 rotate: false - xy: 1037, 104 + xy: 1379, 428 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone2 rotate: false - xy: 1045, 477 + xy: 1379, 394 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone3 rotate: false - xy: 1079, 477 + xy: 1379, 360 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone-icon-full rotate: false - xy: 1079, 477 + xy: 1379, 360 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone-icon-medium rotate: false - xy: 1079, 477 + xy: 1379, 360 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-holostone-icon-large rotate: false - xy: 1487, 989 + xy: 719, 315 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-lead-holostone-icon-small rotate: false - xy: 1475, 117 + xy: 1701, 175 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-holostone1 rotate: false - xy: 1113, 477 + xy: 1379, 326 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-holostone2 rotate: false - xy: 1147, 476 + xy: 1379, 292 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-holostone3 rotate: false - xy: 1181, 476 + xy: 1379, 258 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-holostone-icon-full rotate: false - xy: 1181, 476 + xy: 1379, 258 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-holostone-icon-medium rotate: false - xy: 1181, 476 + xy: 1379, 258 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand-icon-large rotate: false - xy: 1537, 1047 + xy: 719, 265 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-lead-sand-icon-small rotate: false - xy: 1502, 135 + xy: 1727, 175 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 1215, 476 + xy: 1379, 224 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 1249, 476 + xy: 1379, 190 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 1283, 467 + xy: 1387, 156 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand-icon-full rotate: false - xy: 1283, 467 + xy: 1387, 156 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand-icon-medium rotate: false - xy: 1283, 467 + xy: 1387, 156 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-icon-large rotate: false - xy: 1537, 997 + xy: 703, 215 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-lead-stained-stone-icon-small rotate: false - xy: 1528, 135 + xy: 1701, 149 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-stained-stone-red-icon-large rotate: false - xy: 1587, 1047 + xy: 703, 165 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-lead-stained-stone-red-icon-small rotate: false - xy: 1554, 135 + xy: 1701, 123 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-stained-stone-red1 rotate: false - xy: 1419, 451 + xy: 1397, 20 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-red2 rotate: false - xy: 1453, 451 + xy: 1371, 674 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-red3 rotate: false - xy: 1487, 451 + xy: 1371, 640 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-red-icon-full rotate: false - xy: 1487, 451 + xy: 1371, 640 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-red-icon-medium rotate: false - xy: 1487, 451 + xy: 1371, 640 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone1 rotate: false - xy: 1317, 467 + xy: 1397, 122 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone2 rotate: false - xy: 1351, 454 + xy: 1397, 88 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone3 rotate: false - xy: 1385, 454 + xy: 1397, 54 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-icon-full rotate: false - xy: 1385, 454 + xy: 1397, 54 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stained-stone-icon-medium rotate: false - xy: 1385, 454 + xy: 1397, 54 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone-icon-large rotate: false - xy: 1587, 997 + xy: 703, 115 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-lead-stone-icon-small rotate: false - xy: 1580, 135 + xy: 1727, 149 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 1521, 443 + xy: 1405, 674 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 1555, 443 + xy: 1439, 674 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 1589, 443 + xy: 1405, 640 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone-icon-full rotate: false - xy: 1589, 443 + xy: 1405, 640 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone-icon-medium rotate: false - xy: 1589, 443 + xy: 1405, 640 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-holostone-icon-large rotate: false - xy: 1637, 1047 + xy: 721, 65 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-scrap-holostone-icon-small rotate: false - xy: 1606, 135 + xy: 1701, 97 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-holostone1 rotate: false - xy: 1623, 443 + xy: 1439, 640 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-holostone2 rotate: false - xy: 1037, 70 + xy: 1389, 606 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-holostone3 rotate: false - xy: 1013, 36 + xy: 1389, 572 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-holostone-icon-full rotate: false - xy: 1013, 36 + xy: 1389, 572 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-holostone-icon-medium rotate: false - xy: 1013, 36 + xy: 1389, 572 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand-icon-large rotate: false - xy: 1637, 997 + xy: 721, 15 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-scrap-sand-icon-small rotate: false - xy: 1632, 135 + xy: 1727, 123 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-sand1 rotate: false - xy: 1013, 2 + xy: 1423, 606 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand2 rotate: false - xy: 1047, 36 + xy: 1389, 538 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand3 rotate: false - xy: 1047, 2 + xy: 1423, 572 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand-icon-full rotate: false - xy: 1047, 2 + xy: 1423, 572 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-sand-icon-medium rotate: false - xy: 1047, 2 + xy: 1423, 572 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow-icon-large rotate: false - xy: 1687, 1047 + xy: 769, 319 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-scrap-snow-icon-small rotate: false - xy: 1658, 135 + xy: 1727, 97 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-snow1 rotate: false - xy: 1045, 443 + xy: 1389, 504 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow2 rotate: false - xy: 1045, 409 + xy: 1423, 538 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow3 rotate: false - xy: 1079, 443 + xy: 1389, 470 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow-icon-full rotate: false - xy: 1079, 443 + xy: 1389, 470 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-snow-icon-medium rotate: false - xy: 1079, 443 + xy: 1389, 470 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-icon-large rotate: false - xy: 1687, 997 + xy: 769, 269 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-scrap-stained-stone-icon-small rotate: false - xy: 1684, 135 + xy: 1701, 71 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-stained-stone-red-icon-large rotate: false - xy: 1737, 1047 + xy: 819, 277 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-scrap-stained-stone-red-icon-small rotate: false - xy: 1710, 135 + xy: 1727, 71 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-stained-stone-red1 rotate: false - xy: 1147, 442 + xy: 1413, 402 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-red2 rotate: false - xy: 1181, 442 + xy: 1413, 368 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-red3 rotate: false - xy: 1215, 442 + xy: 1413, 334 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-red-icon-full rotate: false - xy: 1215, 442 + xy: 1413, 334 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-red-icon-medium rotate: false - xy: 1215, 442 + xy: 1413, 334 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone1 rotate: false - xy: 1113, 443 + xy: 1423, 504 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone2 rotate: false - xy: 1079, 409 + xy: 1423, 470 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone3 rotate: false - xy: 1113, 409 + xy: 1413, 436 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-icon-full rotate: false - xy: 1113, 409 + xy: 1413, 436 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stained-stone-icon-medium rotate: false - xy: 1113, 409 + xy: 1413, 436 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone-icon-large rotate: false - xy: 1737, 997 + xy: 753, 215 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-scrap-stone-icon-small rotate: false - xy: 1736, 135 + xy: 1675, 55 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-stone1 rotate: false - xy: 1249, 442 + xy: 1413, 300 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone2 rotate: false - xy: 1147, 408 + xy: 1413, 266 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone3 rotate: false - xy: 1181, 408 + xy: 1413, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone-icon-full rotate: false - xy: 1181, 408 + xy: 1413, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-stone-icon-medium rotate: false - xy: 1181, 408 + xy: 1413, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-holostone-icon-large rotate: false - xy: 1787, 1047 + xy: 753, 165 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-thorium-holostone-icon-small rotate: false - xy: 1762, 135 + xy: 1701, 45 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-holostone1 rotate: false - xy: 1215, 408 + xy: 1413, 198 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-holostone2 rotate: false - xy: 1249, 408 + xy: 1421, 164 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-holostone3 rotate: false - xy: 1283, 433 + xy: 1457, 606 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-holostone-icon-full rotate: false - xy: 1283, 433 + xy: 1457, 606 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-holostone-icon-medium rotate: false - xy: 1283, 433 + xy: 1457, 606 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand-icon-large rotate: false - xy: 1787, 997 + xy: 753, 115 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-thorium-sand-icon-small rotate: false - xy: 1788, 135 + xy: 1727, 45 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 1317, 433 + xy: 1457, 572 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 1283, 399 + xy: 1457, 538 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 1317, 399 + xy: 1457, 504 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand-icon-full rotate: false - xy: 1317, 399 + xy: 1457, 504 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand-icon-medium rotate: false - xy: 1317, 399 + xy: 1457, 504 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-icon-large rotate: false - xy: 1837, 1047 + xy: 771, 65 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-thorium-stained-stone-icon-small rotate: false - xy: 1814, 135 + xy: 1674, 29 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-stained-stone-red-icon-large rotate: false - xy: 1837, 997 + xy: 771, 15 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-thorium-stained-stone-red-icon-small rotate: false - xy: 1840, 135 + xy: 1700, 19 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-stained-stone-red1 rotate: false - xy: 1453, 417 + xy: 1447, 368 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-red2 rotate: false - xy: 1487, 417 + xy: 1447, 334 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-red3 rotate: false - xy: 1521, 409 + xy: 1447, 300 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-red-icon-full rotate: false - xy: 1521, 409 + xy: 1447, 300 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-red-icon-medium rotate: false - xy: 1521, 409 + xy: 1447, 300 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone1 rotate: false - xy: 1351, 420 + xy: 1457, 470 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone2 rotate: false - xy: 1385, 420 + xy: 1447, 436 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone3 rotate: false - xy: 1419, 417 + xy: 1447, 402 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-icon-full rotate: false - xy: 1419, 417 + xy: 1447, 402 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stained-stone-icon-medium rotate: false - xy: 1419, 417 + xy: 1447, 402 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone-icon-large rotate: false - xy: 1887, 1047 + xy: 803, 219 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-thorium-stone-icon-small rotate: false - xy: 1866, 135 + xy: 1726, 19 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 1555, 409 + xy: 1447, 266 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 1589, 409 + xy: 1447, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 1623, 409 + xy: 1447, 198 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone-icon-full rotate: false - xy: 1623, 409 + xy: 1447, 198 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone-icon-medium rotate: false - xy: 1623, 409 + xy: 1447, 198 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-holostone-icon-large rotate: false - xy: 1887, 997 + xy: 803, 169 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-titanium-holostone-icon-small rotate: false - xy: 1892, 135 + xy: 1671, 3 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-holostone1 rotate: false - xy: 1351, 386 + xy: 1455, 164 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-holostone2 rotate: false - xy: 1385, 386 + xy: 1431, 130 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-holostone3 rotate: false - xy: 1419, 383 + xy: 1431, 96 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-holostone-icon-full rotate: false - xy: 1419, 383 + xy: 1431, 96 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-holostone-icon-medium rotate: false - xy: 1419, 383 + xy: 1431, 96 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand-icon-large rotate: false - xy: 953, 177 + xy: 803, 119 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-titanium-sand-icon-small rotate: false - xy: 1918, 135 + xy: 1753, 157 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 1453, 383 + xy: 1431, 62 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 1487, 383 + xy: 1431, 28 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 1521, 375 + xy: 1465, 130 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand-icon-full rotate: false - xy: 1521, 375 + xy: 1465, 130 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand-icon-medium rotate: false - xy: 1521, 375 + xy: 1465, 130 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-icon-large rotate: false - xy: 953, 127 + xy: 821, 69 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-titanium-stained-stone-icon-small rotate: false - xy: 1944, 135 + xy: 1753, 131 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-stained-stone-red-icon-large rotate: false - xy: 703, 115 + xy: 821, 19 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-titanium-stained-stone-red-icon-small rotate: false - xy: 1970, 135 + xy: 1753, 105 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-stained-stone-red1 rotate: false - xy: 1657, 417 + xy: 1481, 436 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-red2 rotate: false - xy: 1657, 383 + xy: 1481, 402 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-red3 rotate: false - xy: 1691, 417 + xy: 1481, 368 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-red-icon-full rotate: false - xy: 1691, 417 + xy: 1481, 368 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-red-icon-medium rotate: false - xy: 1691, 417 + xy: 1481, 368 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone1 rotate: false - xy: 1555, 375 + xy: 1465, 96 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone2 rotate: false - xy: 1589, 375 + xy: 1465, 62 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone3 rotate: false - xy: 1623, 375 + xy: 1465, 28 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-icon-full rotate: false - xy: 1623, 375 + xy: 1465, 28 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stained-stone-icon-medium rotate: false - xy: 1623, 375 + xy: 1465, 28 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone-icon-large rotate: false - xy: 753, 115 + xy: 1437, 1084 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ore-titanium-stone-icon-small rotate: false - xy: 1996, 135 + xy: 1753, 79 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 1691, 383 + xy: 1481, 334 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 1725, 417 + xy: 1481, 300 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 1725, 383 + xy: 1481, 266 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone-icon-full rotate: false - xy: 1725, 383 + xy: 1481, 266 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone-icon-medium rotate: false - xy: 1725, 383 + xy: 1481, 266 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-projector-icon-large rotate: false - xy: 803, 77 + xy: 1437, 1034 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 overdrive-projector-icon-medium rotate: false - xy: 1759, 417 + xy: 1481, 232 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-projector-icon-small rotate: false - xy: 1501, 109 + xy: 1753, 53 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 overflow-gate-icon-large rotate: false - xy: 853, 77 + xy: 1437, 984 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 overflow-gate-icon-small rotate: false - xy: 1527, 109 + xy: 1753, 27 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phantom-factory-icon-full rotate: false - xy: 771, 741 + xy: 681, 609 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phantom-factory-icon-large rotate: false - xy: 903, 77 + xy: 1487, 1089 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phantom-factory-icon-medium rotate: false - xy: 1793, 417 + xy: 1489, 164 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phantom-factory-icon-small rotate: false - xy: 1553, 109 + xy: 1752, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-conduit-icon-large rotate: false - xy: 953, 77 + xy: 1487, 1039 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phase-conduit-icon-small rotate: false - xy: 1579, 109 + xy: 1778, 1 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-conveyor-icon-large rotate: false - xy: 1537, 947 + xy: 1487, 989 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phase-conveyor-icon-small rotate: false - xy: 1605, 109 + xy: 1779, 139 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-wall-icon-large rotate: false - xy: 1587, 947 + xy: 1537, 1047 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phase-wall-icon-small rotate: false - xy: 1631, 109 + xy: 1779, 113 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-wall-large-icon-large rotate: false - xy: 1637, 947 + xy: 1537, 997 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phase-wall-large-icon-medium rotate: false - xy: 1963, 417 + xy: 1491, 478 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large-icon-small rotate: false - xy: 1657, 109 + xy: 1805, 139 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-weaver-icon-full rotate: false - xy: 747, 543 + xy: 1335, 1355 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 phase-weaver-icon-large rotate: false - xy: 1687, 947 + xy: 1587, 1047 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 phase-weaver-icon-medium rotate: false - xy: 1963, 383 + xy: 1515, 444 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-weaver-icon-small rotate: false - xy: 1683, 109 + xy: 1779, 87 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pine-icon-large rotate: false - xy: 1737, 947 + xy: 1587, 997 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pine-icon-small rotate: false - xy: 1709, 109 + xy: 1805, 113 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 plastanium-compressor-icon-large rotate: false - xy: 1787, 947 + xy: 1637, 1047 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 plastanium-compressor-icon-medium rotate: false - xy: 1997, 383 + xy: 1515, 376 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-compressor-icon-small rotate: false - xy: 1735, 109 + xy: 1831, 139 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pneumatic-drill-icon-full rotate: false - xy: 813, 609 + xy: 1225, 1218 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 pneumatic-drill-icon-large rotate: false - xy: 1837, 947 + xy: 1637, 997 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pneumatic-drill-icon-medium rotate: false - xy: 1657, 349 + xy: 1515, 342 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pneumatic-drill-icon-small rotate: false - xy: 1761, 109 + xy: 1779, 61 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 power-node-icon-large rotate: false - xy: 1887, 947 + xy: 1687, 1047 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 power-node-icon-small rotate: false - xy: 1787, 109 + xy: 1805, 87 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 power-node-large-icon-large rotate: false - xy: 1487, 939 + xy: 1687, 997 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 power-node-large-icon-medium rotate: false - xy: 1725, 349 + xy: 1515, 274 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 power-node-large-icon-small rotate: false - xy: 1813, 109 + xy: 1831, 113 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 power-source-icon-large rotate: false - xy: 1477, 889 + xy: 1737, 1047 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 power-source-icon-small rotate: false - xy: 1839, 109 + xy: 1779, 35 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 power-void-icon-large rotate: false - xy: 1477, 839 + xy: 1737, 997 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 power-void-icon-small rotate: false - xy: 1865, 109 + xy: 1805, 61 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pulse-conduit-icon-full rotate: false - xy: 1895, 349 + xy: 1533, 104 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-icon-large rotate: false - xy: 1527, 889 + xy: 1787, 1047 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pulse-conduit-icon-small rotate: false - xy: 1891, 109 + xy: 1831, 87 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pulverizer-icon-full rotate: false - xy: 1063, 273 + xy: 1719, 643 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-icon-large rotate: false - xy: 1527, 839 + xy: 1787, 997 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pulverizer-icon-small rotate: false - xy: 1917, 109 + xy: 1805, 35 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pyratite-mixer-icon-large rotate: false - xy: 1577, 897 + xy: 1837, 1047 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 pyratite-mixer-icon-medium rotate: false - xy: 1097, 273 + xy: 1787, 643 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer-icon-small rotate: false - xy: 1943, 109 + xy: 1831, 61 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 repair-point rotate: false - xy: 1131, 374 + xy: 1821, 643 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 repair-point-icon-full rotate: false - xy: 1131, 340 + xy: 1889, 643 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 repair-point-icon-large rotate: false - xy: 1627, 897 + xy: 1887, 1047 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 repair-point-icon-small rotate: false - xy: 1969, 109 + xy: 1831, 35 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6845,21 +6894,21 @@ revenant-factory-icon-full index: -1 revenant-factory-icon-large rotate: false - xy: 1627, 847 + xy: 1887, 997 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 revenant-factory-icon-medium rotate: false - xy: 1199, 374 + xy: 1923, 643 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 revenant-factory-icon-small rotate: false - xy: 1995, 109 + xy: 1857, 139 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6880,126 +6929,126 @@ ripple-icon-full index: -1 ripple-icon-large rotate: false - xy: 1677, 847 + xy: 1477, 884 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ripple-icon-medium rotate: false - xy: 1131, 306 + xy: 1957, 643 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ripple-icon-small rotate: false - xy: 1345, 94 + xy: 1857, 113 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rocks-icon-large rotate: false - xy: 1777, 897 + xy: 853, 127 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rocks-icon-small rotate: false - xy: 1371, 94 + xy: 1857, 87 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rotary-pump-icon-large rotate: false - xy: 1777, 847 + xy: 871, 77 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rotary-pump-icon-medium rotate: false - xy: 1165, 306 + xy: 1525, 575 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-icon-small rotate: false - xy: 1397, 91 + xy: 1857, 61 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 router-icon-large rotate: false - xy: 1827, 897 + xy: 871, 27 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 router-icon-small rotate: false - xy: 1423, 91 + xy: 1857, 35 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rtg-generator-icon-large rotate: false - xy: 1827, 847 + xy: 1537, 947 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 rtg-generator-icon-medium rotate: false - xy: 1199, 306 + xy: 1525, 541 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator-icon-small rotate: false - xy: 1449, 91 + xy: 1804, 9 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 salvo rotate: false - xy: 1303, 1284 + xy: 1271, 1086 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-icon-full rotate: false - xy: 1279, 1152 + xy: 1261, 954 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 salvo-icon-large rotate: false - xy: 1877, 897 + xy: 1587, 947 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 salvo-icon-medium rotate: false - xy: 1233, 306 + xy: 1559, 575 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salvo-icon-small rotate: false - xy: 1475, 91 + xy: 1830, 9 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7013,14 +7062,14 @@ sand-edge index: -1 sand-icon-large rotate: false - xy: 1877, 847 + xy: 1637, 947 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-icon-small rotate: false - xy: 1501, 83 + xy: 1856, 9 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7034,147 +7083,147 @@ sand-water-edge index: -1 sand-water-icon-large rotate: false - xy: 1927, 897 + xy: 1687, 947 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sand-water-icon-small rotate: false - xy: 1527, 83 + xy: 1836, 358 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-large rotate: false - xy: 1927, 847 + xy: 1737, 947 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-medium rotate: false - xy: 1301, 263 + xy: 1593, 507 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-small rotate: false - xy: 1553, 83 + xy: 1836, 332 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scrap-wall-huge-icon-large rotate: false - xy: 1577, 797 + xy: 1787, 947 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scrap-wall-huge-icon-medium rotate: false - xy: 1335, 352 + xy: 1729, 609 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-huge-icon-small rotate: false - xy: 1579, 83 + xy: 1836, 306 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scrap-wall-icon-large rotate: false - xy: 1627, 797 + xy: 1837, 947 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scrap-wall-icon-small rotate: false - xy: 1605, 83 + xy: 1836, 280 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scrap-wall-large-icon-large rotate: false - xy: 1677, 797 + xy: 1887, 947 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 scrap-wall-large-icon-medium rotate: false - xy: 1369, 352 + xy: 1695, 575 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-large-icon-small rotate: false - xy: 1631, 83 + xy: 1862, 351 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 separator-icon-large rotate: false - xy: 1727, 797 + xy: 1527, 897 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 separator-icon-medium rotate: false - xy: 1335, 284 + xy: 1627, 507 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 separator-icon-small rotate: false - xy: 1709, 83 + xy: 1858, 246 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shock-mine-icon-large rotate: false - xy: 1777, 797 + xy: 1577, 897 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shock-mine-icon-small rotate: false - xy: 1735, 83 + xy: 1858, 220 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 silicon-smelter-icon-large rotate: false - xy: 1877, 797 + xy: 1677, 897 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 silicon-smelter-icon-medium rotate: false - xy: 1335, 250 + xy: 1695, 541 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 silicon-smelter-icon-small rotate: false - xy: 1761, 83 + xy: 1888, 351 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7188,91 +7237,91 @@ snow-edge index: -1 snow-icon-large rotate: false - xy: 1927, 797 + xy: 1727, 897 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snow-icon-small rotate: false - xy: 1787, 83 + xy: 1888, 325 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 snowrocks-icon-large rotate: false - xy: 1937, 1047 + xy: 1777, 897 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snowrocks-icon-small rotate: false - xy: 1813, 83 + xy: 1888, 299 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 solar-panel-icon-large rotate: false - xy: 1937, 997 + xy: 1827, 897 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 solar-panel-icon-small rotate: false - xy: 1839, 83 + xy: 1888, 273 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 solar-panel-large-icon-large rotate: false - xy: 1937, 947 + xy: 1877, 897 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 solar-panel-large-icon-medium rotate: false - xy: 1437, 281 + xy: 1763, 541 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-large-icon-small rotate: false - xy: 1865, 83 + xy: 1884, 246 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 sorter-icon-large rotate: false - xy: 1977, 897 + xy: 1527, 847 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sorter-icon-small rotate: false - xy: 1891, 83 + xy: 1884, 220 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spawn-icon-large rotate: false - xy: 1977, 847 + xy: 1577, 847 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spawn-icon-small rotate: false - xy: 1917, 83 + xy: 1880, 194 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7293,154 +7342,154 @@ spectre-icon-full index: -1 spectre-icon-large rotate: false - xy: 1977, 797 + xy: 1627, 847 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spectre-icon-medium rotate: false - xy: 1437, 247 + xy: 1797, 541 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spectre-icon-small rotate: false - xy: 1943, 83 + xy: 1880, 168 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spirit-factory-icon-full rotate: false - xy: 1731, 1363 + xy: 1929, 1341 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spirit-factory-icon-large rotate: false - xy: 1201, 838 + xy: 1727, 847 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spirit-factory-icon-medium rotate: false - xy: 1471, 247 + xy: 1763, 507 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spirit-factory-icon-small rotate: false - xy: 1969, 83 + xy: 1883, 142 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spore-cluster-icon-large rotate: false - xy: 1151, 788 + xy: 1777, 847 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-cluster-icon-medium rotate: false - xy: 1505, 341 + xy: 1899, 609 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-cluster-icon-small rotate: false - xy: 1995, 83 + xy: 1883, 116 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spore-press-icon-full rotate: false - xy: 1633, 1297 + xy: 1831, 1297 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 spore-press-icon-large rotate: false - xy: 1251, 838 + xy: 1827, 847 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 spore-press-icon-medium rotate: false - xy: 1539, 341 + xy: 1865, 575 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-press-icon-small rotate: false - xy: 1709, 57 + xy: 1883, 90 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 stained-boulder-icon-large rotate: false - xy: 1201, 788 + xy: 1877, 847 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stained-boulder-icon-small rotate: false - xy: 1735, 57 + xy: 1883, 64 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 stained-rocks-icon-large rotate: false - xy: 1251, 788 + xy: 1927, 897 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stained-rocks-icon-small rotate: false - xy: 1761, 57 + xy: 1883, 38 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 stained-rocks-red-icon-large rotate: false - xy: 1151, 738 + xy: 1927, 847 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stained-rocks-red-icon-small rotate: false - xy: 1787, 57 + xy: 1914, 351 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 stained-rocks-yellow-icon-large rotate: false - xy: 1201, 738 + xy: 1937, 1047 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stained-rocks-yellow-icon-small rotate: false - xy: 1813, 57 + xy: 1914, 325 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7454,14 +7503,14 @@ stained-stone-edge index: -1 stained-stone-icon-large rotate: false - xy: 1251, 738 + xy: 1937, 997 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stained-stone-icon-small rotate: false - xy: 1839, 57 + xy: 1940, 351 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7475,14 +7524,14 @@ stained-stone-red-edge index: -1 stained-stone-red-icon-large rotate: false - xy: 1301, 834 + xy: 1937, 947 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stained-stone-red-icon-small rotate: false - xy: 1865, 57 + xy: 1914, 299 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7496,14 +7545,14 @@ stained-stone-yellow-edge index: -1 stained-stone-yellow-icon-large rotate: false - xy: 1301, 784 + xy: 1977, 897 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stained-stone-yellow-icon-small rotate: false - xy: 1891, 57 + xy: 1940, 325 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7517,105 +7566,105 @@ stone-edge index: -1 stone-icon-large rotate: false - xy: 1301, 734 + xy: 1977, 847 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 stone-icon-small rotate: false - xy: 1917, 57 + xy: 1966, 351 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 surge-tower-icon-large rotate: false - xy: 1351, 826 + xy: 1135, 592 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 surge-tower-icon-medium rotate: false - xy: 1675, 247 + xy: 1549, 473 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-tower-icon-small rotate: false - xy: 1943, 57 + xy: 1914, 273 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 surge-wall-icon-large rotate: false - xy: 1401, 826 + xy: 1161, 542 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 surge-wall-icon-small rotate: false - xy: 1969, 57 + xy: 1940, 299 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 surge-wall-large-icon-large rotate: false - xy: 1351, 776 + xy: 1161, 492 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 surge-wall-large-icon-medium rotate: false - xy: 1743, 315 + xy: 1583, 473 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large-icon-small rotate: false - xy: 1995, 57 + xy: 1966, 325 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 swarmer rotate: false - xy: 845, 905 + xy: 1043, 905 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 swarmer-icon-full rotate: false - xy: 911, 905 + xy: 837, 839 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 swarmer-icon-large rotate: false - xy: 1351, 726 + xy: 1193, 392 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 swarmer-icon-medium rotate: false - xy: 1709, 247 + xy: 1549, 405 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer-icon-small rotate: false - xy: 1683, 46 + xy: 1992, 351 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7629,154 +7678,154 @@ tar-edge index: -1 tar-icon-large rotate: false - xy: 1401, 726 + xy: 1193, 342 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tar-icon-small rotate: false - xy: 1709, 31 + xy: 1940, 273 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 tau-mech-pad-icon-large rotate: false - xy: 1451, 739 + xy: 1193, 192 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau-mech-pad-icon-medium rotate: false - xy: 1777, 315 + xy: 1617, 473 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tau-mech-pad-icon-small rotate: false - xy: 1735, 31 + xy: 1966, 299 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thermal-generator-icon-large rotate: false - xy: 1501, 739 + xy: 1945, 1191 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thermal-generator-icon-medium rotate: false - xy: 1743, 247 + xy: 1549, 371 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-generator-icon-small rotate: false - xy: 1761, 31 + xy: 1992, 325 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thermal-pump-icon-large rotate: false - xy: 1551, 747 + xy: 1945, 1141 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thermal-pump-icon-medium rotate: false - xy: 1777, 281 + xy: 1583, 405 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-icon-small rotate: false - xy: 1787, 31 + xy: 1966, 273 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-reactor-icon-large rotate: false - xy: 1601, 747 + xy: 1995, 1191 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thorium-reactor-icon-medium rotate: false - xy: 1845, 315 + xy: 1583, 371 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-reactor-icon-small rotate: false - xy: 1813, 31 + xy: 1992, 299 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-wall-icon-large rotate: false - xy: 1651, 747 + xy: 1995, 1141 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thorium-wall-icon-small rotate: false - xy: 1839, 31 + xy: 1992, 273 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-wall-large-icon-large rotate: false - xy: 1701, 747 + xy: 1151, 838 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thorium-wall-large-icon-medium rotate: false - xy: 1845, 281 + xy: 1651, 439 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large-icon-small rotate: false - xy: 1865, 31 + xy: 1910, 247 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thruster-icon-large rotate: false - xy: 1751, 747 + xy: 1151, 788 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 thruster-icon-medium rotate: false - xy: 1879, 315 + xy: 1685, 473 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thruster-icon-small rotate: false - xy: 1891, 31 + xy: 1910, 221 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7790,112 +7839,112 @@ titan-factory-icon-full index: -1 titan-factory-icon-large rotate: false - xy: 1801, 747 + xy: 1201, 838 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titan-factory-icon-medium rotate: false - xy: 1845, 247 + xy: 1549, 303 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titan-factory-icon-small rotate: false - xy: 1917, 31 + xy: 1936, 247 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titanium-conveyor-icon-large rotate: false - xy: 1851, 747 + xy: 1251, 838 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titanium-conveyor-icon-small rotate: false - xy: 1943, 31 + xy: 1936, 221 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titanium-wall-icon-large rotate: false - xy: 1901, 747 + xy: 1201, 788 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titanium-wall-icon-small rotate: false - xy: 1969, 31 + xy: 1962, 247 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titanium-wall-large-icon-large rotate: false - xy: 1951, 747 + xy: 1251, 788 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titanium-wall-large-icon-medium rotate: false - xy: 1981, 213 + xy: 1719, 371 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large-icon-small rotate: false - xy: 1995, 31 + xy: 1962, 221 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 trident-ship-pad-icon-large rotate: false - xy: 1451, 689 + xy: 1151, 738 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 trident-ship-pad-icon-medium rotate: false - xy: 1071, 239 + xy: 1787, 439 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 trident-ship-pad-icon-small rotate: false - xy: 1170, 178 + xy: 1988, 247 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 turbine-generator-icon-large rotate: false - xy: 1501, 689 + xy: 1201, 738 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 turbine-generator-icon-medium rotate: false - xy: 1071, 205 + xy: 1821, 473 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 turbine-generator-icon-small rotate: false - xy: 1196, 178 + xy: 1988, 221 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7909,14 +7958,14 @@ unit-icon-chaos-array index: -1 unit-icon-crawler rotate: false - xy: 1551, 697 + xy: 1251, 738 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unit-icon-dagger rotate: false - xy: 1601, 697 + xy: 1301, 834 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -7930,56 +7979,56 @@ unit-icon-eradicator index: -1 unit-icon-eruptor rotate: false - xy: 969, 773 + xy: 969, 707 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-icon-fortress rotate: false - xy: 903, 707 + xy: 1035, 707 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unit-icon-titan rotate: false - xy: 1035, 773 + xy: 879, 641 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 unloader-icon-large rotate: false - xy: 1651, 697 + xy: 1301, 784 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 unloader-icon-small rotate: false - xy: 1188, 152 + xy: 2018, 351 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 vault-icon-large rotate: false - xy: 1701, 697 + xy: 1351, 834 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 vault-icon-medium rotate: false - xy: 1071, 137 + xy: 1651, 269 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 vault-icon-small rotate: false - xy: 1137, 2 + xy: 2018, 325 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7993,336 +8042,336 @@ water-edge index: -1 water-extractor-icon-full rotate: false - xy: 1035, 707 + xy: 945, 641 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 water-extractor-icon-large rotate: false - xy: 1751, 697 + xy: 1351, 784 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 water-extractor-icon-medium rotate: false - xy: 1105, 238 + xy: 1719, 337 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-extractor-icon-small rotate: false - xy: 1163, 4 + xy: 2018, 299 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 water-icon-large rotate: false - xy: 1801, 697 + xy: 1401, 834 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 water-icon-small rotate: false - xy: 1189, 4 + xy: 2018, 273 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 wave rotate: false - xy: 945, 575 + xy: 913, 509 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wave-icon-full rotate: false - xy: 1011, 641 + xy: 979, 509 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wave-icon-large rotate: false - xy: 1851, 697 + xy: 1401, 784 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wave-icon-medium rotate: false - xy: 1139, 238 + xy: 1753, 371 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-icon-small rotate: false - xy: 2022, 135 + xy: 2014, 247 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 white-tree-dead-icon-large rotate: false - xy: 1901, 697 + xy: 1451, 834 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 white-tree-dead-icon-medium rotate: false - xy: 1105, 204 + xy: 1787, 405 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white-tree-dead-icon-small rotate: false - xy: 2021, 109 + xy: 2014, 221 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 white-tree-icon-large rotate: false - xy: 1951, 697 + xy: 1451, 784 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 white-tree-icon-medium rotate: false - xy: 1173, 238 + xy: 1821, 439 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white-tree-icon-small rotate: false - xy: 2021, 83 + xy: 1906, 194 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 wraith-factory-icon-full rotate: false - xy: 913, 509 + xy: 979, 443 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wraith-factory-icon-large rotate: false - xy: 1601, 647 + xy: 1351, 734 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 wraith-factory-icon-medium rotate: false - xy: 1105, 170 + xy: 1855, 473 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wraith-factory-icon-small rotate: false - xy: 2021, 57 + xy: 1906, 168 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 1841, 519 + xy: 1149, 132 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 1875, 553 + xy: 1183, 158 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 1841, 485 + xy: 1183, 124 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 1875, 519 + xy: 1023, 99 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-graphite rotate: false - xy: 1909, 553 + xy: 1023, 65 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 1875, 485 + xy: 1023, 31 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-metaglass rotate: false - xy: 1909, 519 + xy: 1057, 98 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 1943, 553 + xy: 1057, 64 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 1909, 485 + xy: 1091, 98 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 1943, 519 + xy: 1091, 64 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 1943, 485 + xy: 1125, 98 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-scrap rotate: false - xy: 1977, 553 + xy: 1125, 64 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 1977, 519 + xy: 1057, 30 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-spore-pod rotate: false - xy: 1989, 587 + xy: 1125, 30 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 2011, 553 + xy: 1159, 90 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 2011, 519 + xy: 1159, 56 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 2011, 485 + xy: 1159, 22 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-cryofluid rotate: false - xy: 1945, 1163 + xy: 1261, 34 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 1979, 1165 + xy: 1295, 68 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 1979, 1097 + xy: 1987, 995 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 1987, 995 + xy: 1303, 700 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 alpha-mech rotate: false - xy: 511, 291 + xy: 627, 365 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-mech-base rotate: false - xy: 577, 365 + xy: 569, 257 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 alpha-mech-leg rotate: false - xy: 627, 365 + xy: 693, 423 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-mech rotate: false - xy: 1707, 1197 + xy: 1327, 884 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-mech-base rotate: false - xy: 1757, 1197 + xy: 743, 377 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 delta-mech-leg rotate: false - xy: 1807, 1197 + xy: 793, 369 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -8336,7 +8385,7 @@ omega-mech index: -1 omega-mech-armor rotate: false - xy: 639, 675 + xy: 771, 741 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -8364,21 +8413,21 @@ tau-mech index: -1 tau-mech-base rotate: false - xy: 1451, 789 + xy: 1193, 292 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 tau-mech-leg rotate: false - xy: 1501, 789 + xy: 1193, 242 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dart-ship rotate: false - xy: 1607, 1197 + xy: 1337, 984 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -8392,28 +8441,28 @@ glaive-ship index: -1 javelin-ship rotate: false - xy: 1645, 1147 + xy: 1445, 1139 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 javelin-ship-shield rotate: false - xy: 1745, 1147 + xy: 1545, 1147 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 trident-ship rotate: false - xy: 519, 391 + xy: 569, 357 size: 56, 56 orig: 56, 56 offset: 0, 0 index: -1 blank rotate: false - xy: 1398, 169 + xy: 1880, 165 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -8434,14 +8483,14 @@ clear index: -1 shape-3 rotate: false - xy: 979, 444 + xy: 1077, 642 size: 63, 63 orig: 63, 63 offset: 0, 0 index: -1 bar rotate: false - xy: 1290, 123 + xy: 1567, 61 size: 27, 36 split: 9, 9, 9, 9 orig: 27, 36 @@ -8449,7 +8498,7 @@ bar index: -1 bar-top rotate: false - xy: 1139, 160 + xy: 571, 107 size: 27, 36 split: 9, 10, 9, 10 orig: 27, 36 @@ -8457,7 +8506,7 @@ bar-top index: -1 button rotate: false - xy: 1223, 709 + xy: 2003, 1439 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8465,7 +8514,7 @@ button index: -1 button-disabled rotate: false - xy: 2011, 1642 + xy: 1907, 1212 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8473,7 +8522,7 @@ button-disabled index: -1 button-down rotate: false - xy: 2011, 1613 + xy: 2011, 1642 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8481,7 +8530,7 @@ button-down index: -1 button-edge-1 rotate: false - xy: 2011, 1584 + xy: 2011, 1613 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8489,7 +8538,7 @@ button-edge-1 index: -1 button-edge-2 rotate: false - xy: 2011, 1555 + xy: 2011, 1584 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8497,7 +8546,7 @@ button-edge-2 index: -1 button-edge-3 rotate: false - xy: 2011, 1526 + xy: 2011, 1555 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8505,7 +8554,7 @@ button-edge-3 index: -1 button-edge-4 rotate: false - xy: 2011, 1497 + xy: 2011, 1526 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8513,7 +8562,7 @@ button-edge-4 index: -1 button-over rotate: false - xy: 2011, 1468 + xy: 2011, 1497 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8521,7 +8570,7 @@ button-over index: -1 button-right rotate: false - xy: 1185, 709 + xy: 837, 678 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8529,7 +8578,7 @@ button-right index: -1 button-right-down rotate: false - xy: 639, 646 + xy: 2011, 1468 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8537,7 +8586,7 @@ button-right-down index: -1 button-right-over rotate: false - xy: 837, 678 + xy: 639, 646 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8545,7 +8594,7 @@ button-right-over index: -1 button-select rotate: false - xy: 1319, 135 + xy: 1806, 243 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -8553,28 +8602,28 @@ button-select index: -1 check-off rotate: false - xy: 1207, 238 + xy: 1507, 648 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-on rotate: false - xy: 1237, 238 + xy: 1719, 303 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-on-over rotate: false - xy: 1170, 204 + xy: 1753, 337 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-over rotate: false - xy: 1200, 204 + xy: 1787, 371 size: 28, 32 orig: 28, 32 offset: 0, 0 @@ -8588,7 +8637,7 @@ clear index: -1 content-background rotate: false - xy: 1135, 667 + xy: 903, 235 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8596,7 +8645,7 @@ content-background index: -1 content-background-locked rotate: false - xy: 1261, 709 + xy: 2003, 1410 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8604,7 +8653,7 @@ content-background-locked index: -1 content-background-over rotate: false - xy: 1299, 705 + xy: 903, 264 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -8612,7 +8661,7 @@ content-background-over index: -1 cursor rotate: false - xy: 1045, 569 + xy: 1645, 229 size: 4, 4 orig: 4, 4 offset: 0, 0 @@ -8626,77 +8675,77 @@ discord-banner index: -1 empty-sector rotate: false - xy: 1753, 621 + xy: 1979, 745 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 2031, 397 + xy: 489, 637 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 2031, 379 + xy: 2031, 1123 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 2031, 361 + xy: 2031, 1105 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-effect rotate: false - xy: 1188, 134 + xy: 1697, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 1135, 573 + xy: 1109, 953 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-power rotate: false - xy: 527, 1525 + xy: 2025, 659 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-production rotate: false - xy: 893, 441 + xy: 1525, 489 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-turret rotate: false - xy: 625, 3 + xy: 1109, 935 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 437, 1000 + xy: 869, 291 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-upgrade rotate: false - xy: 473, 1000 + xy: 431, 9 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -8717,21 +8766,21 @@ icon-about index: -1 icon-add rotate: false - xy: 561, 375 + xy: 623, 923 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin rotate: false - xy: 623, 923 + xy: 2007, 1241 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin-small rotate: false - xy: 603, 257 + xy: 1413, 190 size: 6, 6 orig: 6, 6 offset: 0, 0 @@ -8745,14 +8794,14 @@ icon-areaDelete index: -1 icon-arrow rotate: false - xy: 1045, 391 + xy: 1501, 795 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-16 rotate: false - xy: 1045, 391 + xy: 1501, 795 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -8773,392 +8822,392 @@ icon-arrow-left index: -1 icon-arrow-right rotate: false - xy: 777, 365 + xy: 569, 245 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 1173, 684 + xy: 1142, 642 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 471, 637 + xy: 1519, 761 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 927, 377 + xy: 845, 971 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-break rotate: false - xy: 489, 637 + xy: 1269, 614 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 1168, 160 + xy: 1753, 183 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel-2 rotate: false - xy: 1999, 187 + xy: 1915, 455 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 1365, 591 + xy: 1537, 665 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 2031, 433 + xy: 1779, 165 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-check-2 rotate: false - xy: 1141, 108 + xy: 1941, 455 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icon-copy rotate: false - xy: 2031, 415 + xy: 471, 637 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 961, 227 + xy: 845, 1071 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-database rotate: false - xy: 1641, 359 + xy: 893, 443 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-database-small rotate: false - xy: 775, 77 + xy: 845, 1495 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 1551, 797 + xy: 1783, 337 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 845, 971 + xy: 535, 1084 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 911, 427 + xy: 623, 907 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 2025, 161 + xy: 2023, 1241 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 2025, 641 + xy: 537, 161 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 535, 1084 + xy: 537, 145 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-elevation rotate: false - xy: 845, 1543 + xy: 1715, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 845, 987 + xy: 1733, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 623, 907 + xy: 1817, 371 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 527, 1543 + xy: 821, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 893, 459 + xy: 839, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 943, 377 + xy: 887, 277 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 1109, 953 + xy: 845, 1543 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 1214, 162 + xy: 2025, 643 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 477, 1698 + xy: 845, 987 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 1993, 1199 + xy: 727, 407 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 959, 377 + xy: 727, 391 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-generated rotate: false - xy: 927, 393 + xy: 1395, 1134 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 icon-github rotate: false - xy: 1434, 710 + xy: 727, 375 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 2032, 2033 + xy: 1907, 1291 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 431, 27 + xy: 527, 1543 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 2023, 587 + xy: 1109, 905 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 845, 1071 + xy: 1213, 1228 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 1229, 102 + xy: 1923, 1291 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 1247, 120 + xy: 437, 1002 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 1434, 694 + xy: 2029, 797 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 2032, 2017 + xy: 2032, 2033 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-item rotate: false - xy: 2031, 349 + xy: 1323, 1373 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 526, 1951 + xy: 1897, 1297 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-line rotate: false - xy: 1897, 1345 + xy: 893, 459 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 1229, 86 + xy: 1932, 169 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid-small rotate: false - xy: 845, 1495 + xy: 1345, 1194 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 1263, 120 + xy: 2004, 187 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 1275, 585 + xy: 819, 351 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 681, 139 + xy: 869, 309 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 571, 3 + xy: 477, 1698 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 1267, 245 + xy: 431, 27 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 1109, 905 + xy: 581, 245 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-map rotate: false - xy: 2032, 2001 + xy: 2022, 205 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 1213, 1228 + xy: 1154, 642 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 1991, 623 + xy: 1185, 594 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-missing rotate: false - xy: 1323, 1373 + xy: 1537, 653 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -9172,329 +9221,329 @@ icon-mission-background index: -1 icon-mission-battle rotate: false - xy: 1345, 1194 + xy: 1323, 1361 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-defense rotate: false - xy: 789, 365 + xy: 1166, 642 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-done rotate: false - xy: 973, 227 + xy: 743, 365 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 787, 77 + xy: 755, 365 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-paste rotate: false - xy: 2025, 195 + xy: 1217, 174 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 1323, 1361 + xy: 1, 3 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 2021, 39 + xy: 1897, 1345 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 1229, 70 + xy: 453, 1002 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 845, 1525 + xy: 1287, 444 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 985, 227 + xy: 1907, 1200 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 2032, 1985 + xy: 2029, 781 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-play-custom rotate: false - xy: 1229, 54 + xy: 2032, 2017 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 537, 165 + xy: 979, 273 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power-requirement rotate: false - xy: 1739, 485 + xy: 1081, 166 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-power-small rotate: false - xy: 2035, 587 + xy: 908, 15 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 2032, 1969 + xy: 1948, 169 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 1109, 935 + xy: 1783, 353 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 2032, 1953 + xy: 469, 1002 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 1229, 38 + xy: 2032, 2001 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 495, 1698 + xy: 1305, 16 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 2021, 23 + xy: 1964, 169 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 2027, 941 + xy: 485, 1002 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 2027, 925 + xy: 2032, 1985 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 2027, 909 + xy: 1980, 169 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 2027, 893 + xy: 501, 1002 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 431, 9 + xy: 1509, 10 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 589, 3 + xy: 1627, 217 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 1275, 671 + xy: 955, 110 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-spray rotate: false - xy: 2025, 177 + xy: 1645, 3 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 845, 1507 + xy: 1909, 150 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 2027, 877 + xy: 2032, 1969 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 661, 9 + xy: 967, 110 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 1907, 1291 + xy: 1987, 949 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 2027, 861 + xy: 517, 1002 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 1109, 917 + xy: 845, 1525 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tree rotate: false - xy: 607, 3 + xy: 527, 1525 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tree-locked rotate: false - xy: 1773, 519 + xy: 1115, 200 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 2027, 845 + xy: 2032, 1953 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 2027, 829 + xy: 527, 1509 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 643, 3 + xy: 819, 333 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocked rotate: false - xy: 455, 1000 + xy: 495, 1698 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 2027, 813 + xy: 1153, 6 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 2027, 797 + xy: 1169, 6 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zone rotate: false - xy: 1141, 82 + xy: 1967, 455 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icon-zone-locked rotate: false - xy: 1907, 1197 + xy: 1945, 1097 size: 42, 42 orig: 42, 42 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 491, 1000 + xy: 1909, 132 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 1337, 710 + xy: 1185, 6 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -9508,7 +9557,7 @@ info-banner index: -1 inventory rotate: false - xy: 2023, 599 + xy: 1910, 413 size: 24, 40 split: 10, 10, 10, 14 orig: 24, 40 @@ -9523,7 +9572,7 @@ logotext index: -1 pane rotate: false - xy: 2003, 1410 + xy: 941, 256 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -9531,7 +9580,7 @@ pane index: -1 pane-2 rotate: false - xy: 2003, 1439 + xy: 903, 130 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -9539,7 +9588,7 @@ pane-2 index: -1 scroll rotate: false - xy: 1683, 72 + xy: 1862, 272 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -9547,7 +9596,7 @@ scroll index: -1 scroll-horizontal rotate: false - xy: 1261, 683 + xy: 871, 1 size: 35, 24 split: 6, 5, 10, 10 orig: 35, 24 @@ -9563,7 +9612,7 @@ scroll-knob-horizontal-black index: -1 scroll-knob-vertical-black rotate: false - xy: 1657, 67 + xy: 1862, 309 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -9571,42 +9620,42 @@ scroll-knob-vertical-black index: -1 sector-select rotate: false - xy: 1335, 318 + xy: 1661, 541 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 selection rotate: false - xy: 1433, 587 + xy: 903, 127 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 slider rotate: false - xy: 1136, 160 + xy: 1697, 19 size: 1, 8 orig: 1, 8 offset: 0, 0 index: -1 slider-knob rotate: false - xy: 1139, 198 + xy: 1651, 229 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-down rotate: false - xy: 1105, 130 + xy: 1685, 263 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-over rotate: false - xy: 1105, 130 + xy: 1685, 263 size: 29, 38 orig: 29, 38 offset: 0, 0 @@ -9620,7 +9669,7 @@ slider-vertical index: -1 underline rotate: false - xy: 1223, 680 + xy: 941, 122 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -9628,7 +9677,7 @@ underline index: -1 underline-2 rotate: false - xy: 1185, 680 + xy: 941, 151 size: 36, 27 split: 12, 12, 12, 12 orig: 36, 27 @@ -9643,7 +9692,7 @@ white index: -1 window-empty rotate: false - xy: 1320, 187 + xy: 1855, 410 size: 27, 61 split: 8, 8, 44, 11 orig: 27, 61 @@ -9672,42 +9721,42 @@ chaos-array-leg index: -1 crawler rotate: false - xy: 1657, 1247 + xy: 1507, 1197 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-base rotate: false - xy: 1707, 1247 + xy: 1557, 1197 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 crawler-leg rotate: false - xy: 1757, 1247 + xy: 1657, 1197 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger rotate: false - xy: 1407, 1189 + xy: 1857, 1197 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 1457, 1189 + xy: 1345, 1134 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 1557, 1197 + xy: 1337, 1034 size: 48, 48 orig: 48, 48 offset: 0, 0 @@ -9735,49 +9784,49 @@ eradicator-leg index: -1 eruptor rotate: false - xy: 799, 1005 + xy: 865, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 eruptor-base rotate: false - xy: 779, 939 + xy: 931, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 eruptor-leg rotate: false - xy: 1937, 1407 + xy: 997, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress rotate: false - xy: 865, 1037 + xy: 1063, 1037 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress-base rotate: false - xy: 931, 1037 + xy: 389, 45 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-base rotate: false - xy: 931, 1037 + xy: 389, 45 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 fortress-leg rotate: false - xy: 997, 1037 + xy: 583, 473 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -9826,70 +9875,70 @@ revenant index: -1 spirit rotate: false - xy: 1151, 838 + xy: 1677, 847 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 titan rotate: false - xy: 837, 773 + xy: 969, 839 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 titan-leg rotate: false - xy: 903, 839 + xy: 903, 773 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 wraith rotate: false - xy: 1551, 647 + xy: 1301, 734 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 artillery-equip rotate: false - xy: 611, 307 + xy: 793, 419 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 793, 427 + xy: 1111, 434 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 bomber-equip rotate: false - xy: 843, 427 + xy: 553, 195 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 missiles-equip rotate: false - xy: 843, 427 + xy: 553, 195 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 chain-blaster-equip rotate: false - xy: 603, 207 + xy: 1407, 1239 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 chaos-equip rotate: false - xy: 1077, 569 + xy: 511, 303 size: 56, 136 orig: 56, 136 offset: 0, 0 @@ -9903,63 +9952,63 @@ eradication-equip index: -1 eruption-equip rotate: false - xy: 1387, 1076 + xy: 943, 335 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 flakgun-equip rotate: false - xy: 1387, 1026 + xy: 993, 343 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 flamethrower-equip rotate: false - xy: 727, 365 + xy: 1043, 335 size: 48, 56 orig: 48, 56 offset: 0, 0 index: -1 heal-blaster-equip rotate: false - xy: 761, 265 + xy: 1093, 284 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 lich-missiles-equip rotate: false - xy: 1895, 1147 + xy: 1845, 1147 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 reaper-gun-equip rotate: false - xy: 1577, 847 + xy: 1837, 997 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 revenant-missiles-equip rotate: false - xy: 1677, 897 + xy: 1477, 934 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 1827, 797 + xy: 1627, 897 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 swarmer-equip rotate: false - xy: 1401, 776 + xy: 1161, 442 size: 48, 48 orig: 48, 48 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index bdbb2fe918..86174c1897 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/Mindustry.java b/core/src/io/anuke/mindustry/Mindustry.java index c4a571ef1e..44840a9aa4 100644 --- a/core/src/io/anuke/mindustry/Mindustry.java +++ b/core/src/io/anuke/mindustry/Mindustry.java @@ -17,7 +17,7 @@ public class Mindustry extends ApplicationCore{ public void setup(){ Time.setDeltaProvider(() -> { float result = Core.graphics.getDeltaTime() * 60f; - return Float.isNaN(result) || Float.isInfinite(result) ? 1f : Math.min(result, 60f / 10f); + return (Float.isNaN(result) || Float.isInfinite(result)) ? 1f : Math.min(result, 60f / 10f); }); Time.mark(); diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java index 51e9bae7b5..cb30e98d51 100644 --- a/core/src/io/anuke/mindustry/Vars.java +++ b/core/src/io/anuke/mindustry/Vars.java @@ -2,21 +2,21 @@ package io.anuke.mindustry; import io.anuke.arc.Application.ApplicationType; import io.anuke.arc.Core; -import io.anuke.mindustry.entities.Entities; -import io.anuke.mindustry.entities.EntityGroup; -import io.anuke.mindustry.entities.impl.EffectEntity; -import io.anuke.mindustry.entities.traits.DrawTrait; import io.anuke.arc.files.FileHandle; import io.anuke.arc.graphics.Color; import io.anuke.arc.util.Structs; import io.anuke.mindustry.core.*; -import io.anuke.mindustry.entities.type.Player; -import io.anuke.mindustry.entities.type.TileEntity; +import io.anuke.mindustry.entities.Entities; +import io.anuke.mindustry.entities.EntityGroup; import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.entities.effect.Fire; import io.anuke.mindustry.entities.effect.Puddle; +import io.anuke.mindustry.entities.impl.EffectEntity; +import io.anuke.mindustry.entities.traits.DrawTrait; import io.anuke.mindustry.entities.traits.SyncTrait; import io.anuke.mindustry.entities.type.BaseUnit; +import io.anuke.mindustry.entities.type.Player; +import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.game.GlobalData; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.game.Version; @@ -24,11 +24,14 @@ import io.anuke.mindustry.gen.Serialization; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.world.blocks.defense.ForceProjector.ShieldEntity; +import java.nio.charset.Charset; import java.util.Arrays; import java.util.Locale; @SuppressWarnings("unchecked") public class Vars{ + /**global charset*/ + public static final Charset charset = Charset.forName("UTF-8"); /**main application name, capitalized*/ public static final String appName = "Mindustry"; /**URL for discord invite.*/ diff --git a/core/src/io/anuke/mindustry/ai/BlockIndexer.java b/core/src/io/anuke/mindustry/ai/BlockIndexer.java index d82c6a8fe6..604b63e294 100644 --- a/core/src/io/anuke/mindustry/ai/BlockIndexer.java +++ b/core/src/io/anuke/mindustry/ai/BlockIndexer.java @@ -280,7 +280,7 @@ public class BlockIndexer{ outer: for(int x = quadrantX * structQuadrantSize; x < world.width() && x < (quadrantX + 1) * structQuadrantSize; x++){ for(int y = quadrantY * structQuadrantSize; y < world.height() && y < (quadrantY + 1) * structQuadrantSize; y++){ - Tile result = world.tile(x, y); + Tile result = world.tile(x, y).target(); //when a targetable block is found, mark this quadrant as occupied and stop searching if(result.entity != null && result.getTeam() == data.team){ structQuadrants[data.team.ordinal()].set(index); diff --git a/core/src/io/anuke/mindustry/ai/Pathfinder.java b/core/src/io/anuke/mindustry/ai/Pathfinder.java index 9b5f4846b7..bd162140e5 100644 --- a/core/src/io/anuke/mindustry/ai/Pathfinder.java +++ b/core/src/io/anuke/mindustry/ai/Pathfinder.java @@ -146,6 +146,7 @@ public class Pathfinder{ while(path.frontier.size > 0 && (nsToRun < 0 || Time.timeSinceNanos(start) <= nsToRun)){ Tile tile = world.tile(path.frontier.removeLast()); + if(tile == null || path.weights == null) return; //something went horribly wrong, bail float cost = path.weights[tile.x][tile.y]; //pathfinding overflowed for some reason, time to bail. the next block update will handle this, hopefully diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index 7b23fc2898..d9e7f3442d 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -71,7 +71,7 @@ public class Blocks implements ContentList{ duo, hail, arc, wave, lancer, swarmer, salvo, fuse, ripple, cyclone, spectre, meltdown, //units - spiritFactory, phantomFactory, wraithFactory, ghoulFactory, revenantFactory, daggerFactory, titanFactory, + spiritFactory, phantomFactory, wraithFactory, ghoulFactory, revenantFactory, daggerFactory, crawlerFactory, titanFactory, fortressFactory, repairPoint, //upgrades @@ -732,7 +732,7 @@ public class Blocks implements ContentList{ rotaryPump = new Pump("rotary-pump"){{ requirements(Category.liquid, ItemStack.with(Items.copper, 140, Items.lead, 100, Items.silicon, 40, Items.titanium, 70)); pumpAmount = 0.8f; - consumes.power(1.50f); + consumes.power(0.15f); liquidCapacity = 30f; hasPower = true; size = 2; @@ -1322,6 +1322,15 @@ public class Blocks implements ContentList{ consumes.items(new ItemStack(Items.silicon, 10)); }}; + crawlerFactory = new UnitFactory("crawler-factory"){{ + requirements(Category.units, ItemStack.with(Items.lead, 100, Items.silicon, 80)); + type = UnitTypes.crawler; + produceTime = 1200; + size = 2; + consumes.power(0.4f); + consumes.items(new ItemStack(Items.blastCompound, 10)); + }}; + titanFactory = new UnitFactory("titan-factory"){{ requirements(Category.units, ItemStack.with(Items.thorium, 90, Items.lead, 140, Items.silicon, 90)); type = UnitTypes.titan; diff --git a/core/src/io/anuke/mindustry/content/Bullets.java b/core/src/io/anuke/mindustry/content/Bullets.java index e0f4ed0a96..f7b8dafd70 100644 --- a/core/src/io/anuke/mindustry/content/Bullets.java +++ b/core/src/io/anuke/mindustry/content/Bullets.java @@ -684,29 +684,17 @@ public class Bullets implements ContentList{ hitEffect = Fx.pulverize; lifetime = 23f; speed = 1f; - splashDamageRadius = 60f; + splashDamageRadius = 50f; splashDamage = 30f; } @Override public void init(Bullet b){ if(b.getOwner() instanceof Unit){ - Unit unit = (Unit)b.getOwner(); - - unit.damage(unit.maxHealth() + 1); + ((Unit)b.getOwner()).kill(); } b.time(b.lifetime()); } - - @Override - public void hit(Bullet b, float x, float y){ - super.hit(b, x, y); - - for(int i = 0; i < 3; i++){ - Tile tile = world.tileWorld(x + Mathf.range(8f), y + Mathf.range(8f)); - Puddle.deposit(tile, Liquids.oil, 5f); - } - } }; } } diff --git a/core/src/io/anuke/mindustry/content/Zones.java b/core/src/io/anuke/mindustry/content/Zones.java index d2bd4d6b73..58a310f836 100644 --- a/core/src/io/anuke/mindustry/content/Zones.java +++ b/core/src/io/anuke/mindustry/content/Zones.java @@ -12,8 +12,8 @@ import io.anuke.mindustry.type.Zone; import io.anuke.mindustry.world.Block; public class Zones implements ContentList{ - public static Zone groundZero, craters, frozenForest, ruinousShores, crags, stainedMountains, - impact, desolateRift, arcticDesert, dryWastes, nuclearComplex, moltenFault; + public static Zone groundZero, craters, frozenForest, ruinousShores, stainedMountains, + desolateRift, nuclearComplex; @Override public void load(){ @@ -78,7 +78,7 @@ public class Zones implements ContentList{ waveSpacing = 60 * 60 * 1f; spawns = Array.with( new SpawnGroup(UnitTypes.crawler){{ - unitScaling = 1.5f; + unitScaling = 2f; }}, new SpawnGroup(UnitTypes.crawler){{ @@ -90,7 +90,7 @@ public class Zones implements ContentList{ new SpawnGroup(UnitTypes.dagger){{ begin = 3; - unitScaling = 1.5f; + unitScaling = 2f; }}, new SpawnGroup(UnitTypes.crawler){{ @@ -353,91 +353,6 @@ public class Zones implements ContentList{ }}; }}; - impact = new Zone("impact0079", new MapGenerator("impact0079", 2) - .dist(2.2f, true) - .decor( - new Decoration(Blocks.snow, Blocks.sporeCluster, 0.01), - new Decoration(Blocks.metalFloor, Blocks.metalFloorDamaged, 0.02) - ).drops(ItemStack.with(Items.copper, 2000, Items.lead, 1500, Items.silicon, 1000, Items.graphite, 2000, Items.pyratite, 2000, Items.titanium, 2000, Items.metaglass, 1000, Items.coal, 2000))){{ - loadout = Loadouts.basicFoundation; - baseLaunchCost = ItemStack.with(Items.copper, 500, Items.lead, 500, Items.silicon, 100); - startingItems = ItemStack.list(Items.copper, 2000, Items.lead, 500, Items.silicon, 200, Items.titanium, 400, Items.graphite, 200); - itemRequirements = ItemStack.with(Items.silicon, 8000, Items.titanium, 6000, Items.graphite, 4000); - conditionWave = 20; - zoneRequirements = new Zone[]{stainedMountains}; - blockRequirements = new Block[]{Blocks.launchPad, Blocks.unloader, Blocks.melter, Blocks.separator}; - resources = new Item[]{Items.scrap}; - rules = () -> new Rules(){{ - waves = true; - waveTimer = true; - waveSpacing = 60 * 60; - - spawns = Array.with( - new SpawnGroup(UnitTypes.titan){{ - unitScaling = 2; - spacing = 2; - end = 10; - }}, - - new SpawnGroup(UnitTypes.dagger){{ - begin = 1; - unitScaling = 1; - spacing = 2; - }}, - - new SpawnGroup(UnitTypes.dagger){{ - begin = 2; - unitScaling = 1; - spacing = 2; - }}, - - new SpawnGroup(UnitTypes.dagger){{ - begin = 10; - spacing = 2; - unitScaling = 2; - unitAmount = 2; - }}, - - new SpawnGroup(UnitTypes.ghoul){{ - begin = 5; - unitScaling = 0.5f; - unitAmount = 1; - spacing = 5; - }}, - - new SpawnGroup(UnitTypes.wraith){{ - begin = 10; - unitScaling = 1f; - unitAmount = 1; - spacing = 5; - }}, - - new SpawnGroup(UnitTypes.dagger){{ - begin = 2; - unitScaling = 1; - spacing = 2; - }}, - - new SpawnGroup(UnitTypes.wraith){{ - begin = 23; - unitScaling = 1f; - unitAmount = 1; - spacing = 2; - }}, - - new SpawnGroup(UnitTypes.crawler){{ - begin = 20; - unitScaling = 1; - spacing = 10; - unitScaling = 0.5f; - unitAmount = 10; - }}, - - bossGroup(UnitTypes.lich) - ); - }}; - }}; - desolateRift = new Zone("desolateRift", new MapGenerator("desolateRift").dist(2f)){{ loadout = Loadouts.basicNucleus; baseLaunchCost = ItemStack.with(Items.copper, 500); @@ -511,34 +426,6 @@ public class Zones implements ContentList{ }}; }}; - /* - arcticDesert = new Zone("arcticDesert", new MapGenerator("groundZero", 1)){{ //TODO implement - baseLaunchCost = ItemStack.with(Items.copper, 300); - startingItems = ItemStack.with(Items.copper, 200); - conditionWave = 15; - zoneRequirements = new Zone[]{frozenForest}; - blockRequirements = new Block[]{Blocks.copperWall}; - rules = () -> new Rules(){{ - waves = true; - waveTimer = true; - waveSpacing = 60 * 80; - }}; - }}; - - dryWastes = new Zone("dryWastes", new MapGenerator("groundZero", 1)){{ //TODO implement - baseLaunchCost = ItemStack.with(Items.copper, 300); - startingItems = ItemStack.with(Items.copper, 200); - conditionWave = 15; - zoneRequirements = new Zone[]{frozenForest}; - blockRequirements = new Block[]{Blocks.copperWall}; - rules = () -> new Rules(){{ - waves = true; - waveTimer = true; - waveSpacing = 60 * 80; - }}; - }}; - - */ nuclearComplex = new Zone("nuclearComplex", new MapGenerator("nuclearProductionComplex", 1) .drops(ItemStack.with(Items.copper, 2000, Items.lead, 1500, Items.silicon, 1000, Items.graphite, 1000, Items.thorium, 200, Items.titanium, 2000, Items.metaglass, 1000)) .decor(new Decoration(Blocks.snow, Blocks.sporeCluster, 0.01))){{ @@ -548,7 +435,7 @@ public class Zones implements ContentList{ itemRequirements = ItemStack.with(Items.copper, 10000, Items.titanium, 8000, Items.metaglass, 6000, Items.plastanium, 2000); conditionWave = 30; launchPeriod = 15; - zoneRequirements = new Zone[]{impact}; + zoneRequirements = new Zone[]{desolateRift}; blockRequirements = new Block[]{Blocks.blastDrill, Blocks.thermalGenerator}; resources = new Item[]{Items.copper, Items.scrap, Items.lead, Items.coal, Items.titanium, Items.thorium, Items.sand}; rules = () -> new Rules(){{ @@ -628,19 +515,5 @@ public class Zones implements ContentList{ ); }}; }}; - - /* - moltenFault = new Zone("moltenFault", new MapGenerator("groundZero", 1)){{ //TODO implement - baseLaunchCost = ItemStack.with(Items.copper, 300); - startingItems = ItemStack.with(Items.copper, 200); - conditionWave = 15; - zoneRequirements = new Zone[]{frozenForest}; - blockRequirements = new Block[]{Blocks.copperWall}; - rules = () -> new Rules(){{ - waves = true; - waveTimer = true; - waveSpacing = 60 * 80; - }}; - }};*/ } } diff --git a/core/src/io/anuke/mindustry/core/Logic.java b/core/src/io/anuke/mindustry/core/Logic.java index 83b3d52f31..5b3bb71f47 100644 --- a/core/src/io/anuke/mindustry/core/Logic.java +++ b/core/src/io/anuke/mindustry/core/Logic.java @@ -87,10 +87,10 @@ public class Logic implements ApplicationListener{ } private void checkGameOver(){ - if(!state.rules.pvp && state.teams.get(defaultTeam).cores.size == 0 && !state.gameOver){ + if(state.rules.waves && state.teams.get(defaultTeam).cores.size == 0 && !state.gameOver){ state.gameOver = true; Events.fire(new GameOverEvent(waveTeam)); - }else if(state.rules.pvp){ + }else if(!state.rules.waves){ Team alive = null; for(Team team : Team.all){ diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index 5bc7a270ce..354d721392 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -230,7 +230,7 @@ public class Renderer implements ApplicationListener{ private void drawFlyerShadows(){ float trnsX = -12, trnsY = -13; - Draw.color(0, 0, 0, 0.15f); + Draw.color(0, 0, 0, 0.22f); for(EntityGroup group : unitGroups){ if(!group.isEmpty()){ @@ -287,7 +287,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 * 5)); + targetscale = Mathf.clamp(targetscale, s * 1.5f, Math.round(s * 5)); } } diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java index 5bbccaf79a..b0f09f1763 100644 --- a/core/src/io/anuke/mindustry/core/UI.java +++ b/core/src/io/anuke/mindustry/core/UI.java @@ -114,22 +114,23 @@ public class UI implements ApplicationListener{ } void loadCursors(){ - int cursorScaling = 3; + int cursorScaling = 1, outlineThickness = 3; Color outlineColor = Color.valueOf("444444"); - drillCursor = Core.graphics.newCursor("drill", cursorScaling, outlineColor); - unloadCursor = Core.graphics.newCursor("unload", cursorScaling, outlineColor); - SystemCursor.arrow.set(Core.graphics.newCursor("cursor", cursorScaling, outlineColor)); - SystemCursor.hand.set(Core.graphics.newCursor("hand", cursorScaling, outlineColor)); - SystemCursor.ibeam.set(Core.graphics.newCursor("ibeam", cursorScaling, outlineColor)); + drillCursor = Core.graphics.newCursor("drill", cursorScaling, outlineColor, outlineThickness); + unloadCursor = Core.graphics.newCursor("unload", cursorScaling, outlineColor, outlineThickness); + SystemCursor.arrow.set(Core.graphics.newCursor("cursor", cursorScaling, outlineColor, outlineThickness)); + SystemCursor.hand.set(Core.graphics.newCursor("hand", cursorScaling, outlineColor, outlineThickness)); + SystemCursor.ibeam.set(Core.graphics.newCursor("ibeam", cursorScaling, outlineColor, outlineThickness)); Core.graphics.restoreCursor(); } void generateFonts(Skin skin){ - generator = new FreeTypeFontGenerator(Core.files.internal("fonts/pixel.ttf")); + generator = new FreeTypeFontGenerator(Core.files.internal("fonts/font.ttf")); FreeTypeFontParameter param = new FreeTypeFontParameter(); - param.size = (int)(14*2 * Math.max(Unit.dp.scl(1f), 0.5f)); + param.size = (int)(8*2 * Math.max(Unit.dp.scl(1f), 0.5f)); + //param.size = (int)(14*2 * Math.max(Unit.dp.scl(1f), 0.5f)); param.shadowColor = Color.DARK_GRAY; param.shadowOffsetY = 2; param.incremental = true; diff --git a/core/src/io/anuke/mindustry/entities/type/Player.java b/core/src/io/anuke/mindustry/entities/type/Player.java index dfd5e02029..a592a0ce85 100644 --- a/core/src/io/anuke/mindustry/entities/type/Player.java +++ b/core/src/io/anuke/mindustry/entities/type/Player.java @@ -797,6 +797,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{ if(isLocal){ stream.writeByte(mech.id); stream.writeByte(playerIndex); + stream.writeInt(lastSpawner == null ? noSpawner : lastSpawner.getTile().pos()); super.writeSave(stream, false); } } @@ -808,12 +809,17 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{ if(local && !headless){ byte mechid = stream.readByte(); int index = stream.readByte(); + int spawner = stream.readInt(); + if(world.tile(spawner) != null && world.tile(spawner).entity != null && world.tile(spawner).entity instanceof SpawnerTrait){ + lastSpawner = (SpawnerTrait)(world.tile(spawner).entity); + } players[index].readSaveSuper(stream); players[index].mech = content.getByID(ContentType.mech, mechid); players[index].dead = false; }else if(local){ byte mechid = stream.readByte(); stream.readByte(); + stream.readInt(); readSaveSuper(stream); mech = content.getByID(ContentType.mech, mechid); dead = false; @@ -833,7 +839,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{ buffer.writeByte(Pack.byteValue(isAdmin) | (Pack.byteValue(dead) << 1) | (Pack.byteValue(isBoosting) << 2)); buffer.writeInt(Color.rgba8888(color)); buffer.writeByte(mech.id); - buffer.writeInt(mining == null ? -1 : mining.pos()); + buffer.writeInt(mining == null ? noSpawner : mining.pos()); buffer.writeInt(spawner == null ? noSpawner : spawner.getTile().pos()); buffer.writeShort((short) (baseRotation * 2)); diff --git a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java index 8ab693b898..a12ccd624d 100644 --- a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java @@ -165,6 +165,7 @@ public class BlockRenderer{ for(int y = miny; y <= maxy; y++){ boolean expanded = (Math.abs(x - avgx) > rangex || Math.abs(y - avgy) > rangey); Tile tile = world.rawTile(x, y); + if(tile == null) continue; //how is this possible? Block block = tile.block(); if(block != Blocks.air && block.cacheLayer == CacheLayer.normal){ diff --git a/core/src/io/anuke/mindustry/io/TypeIO.java b/core/src/io/anuke/mindustry/io/TypeIO.java index 937440a425..c88bce34eb 100644 --- a/core/src/io/anuke/mindustry/io/TypeIO.java +++ b/core/src/io/anuke/mindustry/io/TypeIO.java @@ -2,21 +2,24 @@ package io.anuke.mindustry.io; import io.anuke.annotations.Annotations.ReadClass; import io.anuke.annotations.Annotations.WriteClass; +import io.anuke.arc.graphics.Color; import io.anuke.mindustry.entities.Effects; import io.anuke.mindustry.entities.Effects.Effect; import io.anuke.mindustry.entities.Entities; -import io.anuke.arc.graphics.Color; -import io.anuke.mindustry.entities.type.Player; -import io.anuke.mindustry.entities.type.Unit; import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.entities.bullet.BulletType; import io.anuke.mindustry.entities.traits.BuilderTrait.BuildRequest; import io.anuke.mindustry.entities.traits.ShooterTrait; import io.anuke.mindustry.entities.type.BaseUnit; +import io.anuke.mindustry.entities.type.Player; +import io.anuke.mindustry.entities.type.Unit; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.net.Packets.AdminAction; import io.anuke.mindustry.net.Packets.KickReason; -import io.anuke.mindustry.type.*; +import io.anuke.mindustry.type.ContentType; +import io.anuke.mindustry.type.Item; +import io.anuke.mindustry.type.Liquid; +import io.anuke.mindustry.type.Mech; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Pos; import io.anuke.mindustry.world.Tile; @@ -25,7 +28,6 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.nio.ByteBuffer; -import java.nio.charset.StandardCharsets; import static io.anuke.mindustry.Vars.*; @@ -253,7 +255,7 @@ public class TypeIO{ @WriteClass(String.class) public static void writeString(ByteBuffer buffer, String string){ if(string != null){ - byte[] bytes = string.getBytes(StandardCharsets.UTF_8); + byte[] bytes = string.getBytes(charset); buffer.putShort((short) bytes.length); buffer.put(bytes); }else{ @@ -267,7 +269,7 @@ public class TypeIO{ if(slength != -1){ byte[] bytes = new byte[slength]; buffer.get(bytes); - return new String(bytes, StandardCharsets.UTF_8); + return new String(bytes, charset); }else{ return null; } @@ -289,7 +291,7 @@ public class TypeIO{ public static void writeStringData(DataOutput buffer, String string) throws IOException{ if(string != null){ - byte[] bytes = string.getBytes(StandardCharsets.UTF_8); + byte[] bytes = string.getBytes(charset); buffer.writeShort((short) bytes.length); buffer.write(bytes); }else{ @@ -302,7 +304,7 @@ public class TypeIO{ if(slength != -1){ byte[] bytes = new byte[slength]; buffer.readFully(bytes); - return new String(bytes, StandardCharsets.UTF_8); + return new String(bytes, charset); }else{ return null; } diff --git a/core/src/io/anuke/mindustry/net/NetworkIO.java b/core/src/io/anuke/mindustry/net/NetworkIO.java index e9bc9308f1..8e26a4a701 100644 --- a/core/src/io/anuke/mindustry/net/NetworkIO.java +++ b/core/src/io/anuke/mindustry/net/NetworkIO.java @@ -3,8 +3,8 @@ package io.anuke.mindustry.net; import io.anuke.arc.Core; import io.anuke.arc.collection.ObjectMap; import io.anuke.arc.collection.ObjectMap.Entry; -import io.anuke.mindustry.entities.Entities; import io.anuke.arc.util.Time; +import io.anuke.mindustry.entities.Entities; import io.anuke.mindustry.entities.type.Player; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.game.Teams; @@ -17,7 +17,6 @@ import io.anuke.mindustry.world.Tile; import java.io.*; import java.nio.ByteBuffer; -import java.nio.charset.StandardCharsets; import static io.anuke.mindustry.Vars.*; @@ -149,17 +148,17 @@ public class NetworkIO{ ByteBuffer buffer = ByteBuffer.allocate(128); - buffer.put((byte) host.getBytes(StandardCharsets.UTF_8).length); - buffer.put(host.getBytes(StandardCharsets.UTF_8)); + buffer.put((byte) host.getBytes(charset).length); + buffer.put(host.getBytes(charset)); - buffer.put((byte) map.getBytes(StandardCharsets.UTF_8).length); - buffer.put(map.getBytes(StandardCharsets.UTF_8)); + buffer.put((byte) map.getBytes(charset).length); + buffer.put(map.getBytes(charset)); buffer.putInt(playerGroup.size()); buffer.putInt(state.wave); buffer.putInt(Version.build); - buffer.put((byte)Version.type.getBytes(StandardCharsets.UTF_8).length); - buffer.put(Version.type.getBytes(StandardCharsets.UTF_8)); + buffer.put((byte)Version.type.getBytes(charset).length); + buffer.put(Version.type.getBytes(charset)); return buffer; } @@ -172,8 +171,8 @@ public class NetworkIO{ byte[] mb = new byte[mlength]; buffer.get(mb); - String host = new String(hb, StandardCharsets.UTF_8); - String map = new String(mb, StandardCharsets.UTF_8); + String host = new String(hb, charset); + String map = new String(mb, charset); int players = buffer.getInt(); int wave = buffer.getInt(); @@ -181,7 +180,7 @@ public class NetworkIO{ byte tlength = buffer.get(); byte[] tb = new byte[tlength]; buffer.get(tb); - String vertype = new String(tb, StandardCharsets.UTF_8); + String vertype = new String(tb, charset); return new Host(host, hostAddress, map, wave, players, version, vertype); } diff --git a/core/src/io/anuke/mindustry/ui/Bar.java b/core/src/io/anuke/mindustry/ui/Bar.java index a29ce6d4cb..cbd2b7b0f9 100644 --- a/core/src/io/anuke/mindustry/ui/Bar.java +++ b/core/src/io/anuke/mindustry/ui/Bar.java @@ -78,6 +78,7 @@ public class Bar extends Element{ GlyphLayout lay = Pools.obtain(GlyphLayout.class, GlyphLayout::new); lay.setText(font, name); + font.setColor(Color.WHITE); font.draw(name, x + width/2f - lay.width/2f, y + height/2f + lay.height/2f + 1); Pools.free(lay); diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java index 6617701231..4dc0efa263 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlockConfigFragment.java @@ -29,6 +29,7 @@ public class BlockConfigFragment extends Fragment{ @Override public void build(Group parent){ + table.visible(false); parent.addChild(table); } diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java index 8eb9f75a35..fff489d66c 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java @@ -54,8 +54,6 @@ public class HudFragment extends Fragment{ cont.top().left().visible(() -> !state.is(State.menu)); if(mobile){ - cont.table(t -> {}); - cont.row(); cont.table(select -> { select.left(); select.defaults().size(dsize).left(); diff --git a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java index 5e721f9d45..319bdc8ed4 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java @@ -43,7 +43,7 @@ public class MenuFragment extends Fragment{ } //version info - parent.fill(c -> c.bottom().left().add(Strings.formatArgs("Mindustry v{0} {1}-{2} {3}{4}", Version.number, Version.modifier, Version.type, + parent.fill(c -> c.bottom().left().add(Strings.format("Mindustry v{0} {1}-{2} {3}{4}", Version.number, Version.modifier, Version.type, (Version.build == -1 ? "custom build" : "build " + Version.build), Version.revision == 0 ? "" : "." + Version.revision)) .visible(() -> state.is(State.menu))); } diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java index 749e26f756..9666005734 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/core/src/io/anuke/mindustry/world/Block.java @@ -13,8 +13,6 @@ import io.anuke.arc.graphics.g2d.Lines; import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.arc.math.Mathf; import io.anuke.arc.scene.ui.layout.Table; -import io.anuke.arc.util.Log; -import io.anuke.arc.util.Strings; import io.anuke.arc.util.Time; import io.anuke.mindustry.entities.Damage; import io.anuke.mindustry.entities.bullet.Bullet; @@ -157,6 +155,8 @@ public class Block extends BlockStorage{ public Array getPowerConnections(Tile tile, Array out){ out.clear(); + if(tile == null || tile.entity == null || tile.entity.power == null) return out; + for(Tile other : tile.entity.proximity()){ if(other.entity.power != null && !(consumesPower && other.block().consumesPower && !outputsPower && !other.block().outputsPower) && !tile.entity.power.links.contains(other.pos())){ @@ -284,10 +284,6 @@ public class Block extends BlockStorage{ setBars(); consumes.checkRequired(this); - - if(buildRequirements.length > 0 && !Core.bundle.has("block." + name + ".name")){ - Log.warn("No name for block '{0}' found. Add the following to bundle.properties:\nblock.{0}.name = {1}", name, Strings.capitalize(name)); - } } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java index ff8f0b0662..3858b02e48 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java @@ -182,7 +182,7 @@ public class Conveyor extends Block{ entity.minitem = 1f; Tile next = tile.getNearby(tile.getRotation()); - float nextMax = next.block() instanceof Conveyor ? 1f - Math.max(itemSpace - next.entity().minitem, 0) : 1f; + float nextMax = next != null && next.block() instanceof Conveyor ? 1f - Math.max(itemSpace - next.entity().minitem, 0) : 1f; int minremove = Integer.MAX_VALUE; for(int i = entity.convey.size - 1; i >= 0; i--){ diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java index b3b7ffc1d7..20be93efda 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java @@ -91,7 +91,7 @@ public class ItemBridge extends Block{ } public Tile findLink(int x, int y){ - if(linkValid(world.tile(x, y), world.tile(lastPlaced)) && lastPlaced != Pos.get(x, y)){ + if(world.tile(x, y) != null && linkValid(world.tile(x, y), world.tile(lastPlaced)) && lastPlaced != Pos.get(x, y)){ return world.tile(lastPlaced); } @@ -312,7 +312,7 @@ public class ItemBridge extends Block{ } public boolean linkValid(Tile tile, Tile other, boolean checkDouble){ - if(other == null) return false; + if(other == null || tile == null) return false; if(tile.x == other.x){ if(Math.abs(tile.y - other.y) > range) return false; }else if(tile.y == other.y){ diff --git a/core/src/io/anuke/mindustry/world/blocks/power/ImpactReactor.java b/core/src/io/anuke/mindustry/world/blocks/power/ImpactReactor.java index f98e8219d2..9a18a8fe4f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/ImpactReactor.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/ImpactReactor.java @@ -52,7 +52,7 @@ public class ImpactReactor extends PowerGenerator{ bars.add("poweroutput", entity -> new Bar(() -> Core.bundle.format("blocks.poweroutput", - Strings.toFixed(Math.max(entity.tile.block().getPowerProduction(entity.tile) - consumes.get(ConsumePower.class).powerPerTick, 0)*60, 1)), + Strings.toFixed(Math.max(entity.tile.block().getPowerProduction(entity.tile) - consumes.get(ConsumePower.class).powerPerTick, 0)*60 * entity.delta(), 1)), () -> Pal.powerBar, () -> ((GeneratorEntity)entity).productionEfficiency)); } diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java index 0d7d8c8e5a..572eb8d48f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java @@ -167,9 +167,6 @@ public class Drill extends Block{ public void update(Tile tile){ DrillEntity entity = tile.entity(); - if(Float.isNaN(entity.drillTime)) entity.drillTime = 0f; - if(Float.isNaN(entity.warmup)) entity.warmup = 0f; - if(entity.dominantItem == null){ oreCount.clear(); itemArray.clear(); diff --git a/core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java b/core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java index 641a768148..86d189c639 100644 --- a/core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java +++ b/core/src/io/anuke/mindustry/world/blocks/sandbox/LiquidSource.java @@ -21,6 +21,7 @@ import java.io.DataOutput; import java.io.IOException; import static io.anuke.mindustry.Vars.content; +import static io.anuke.mindustry.Vars.control; public class LiquidSource extends Block{ @@ -71,8 +72,10 @@ public class LiquidSource extends Block{ for(int i = 0; i < items.size; i++){ final int f = i; - ImageButton button = cont.addImageButton("clear", "clear-toggle", 24, - () -> Call.setLiquidSourceLiquid(null, tile, items.get(f))).size(38).group(group).get(); + ImageButton button = cont.addImageButton("clear", "clear-toggle", 24, () -> { + Call.setLiquidSourceLiquid(null, tile, items.get(f)); + control.input(0).frag.config.hideConfig(); + }).size(38).group(group).get(); button.getStyle().imageUp = new TextureRegionDrawable(items.get(i).iconRegion); button.setChecked(entity.source.id == f); diff --git a/core/src/io/anuke/mindustry/world/meta/values/StringValue.java b/core/src/io/anuke/mindustry/world/meta/values/StringValue.java index f51884621a..830d897ab6 100644 --- a/core/src/io/anuke/mindustry/world/meta/values/StringValue.java +++ b/core/src/io/anuke/mindustry/world/meta/values/StringValue.java @@ -8,7 +8,7 @@ public class StringValue implements StatValue{ private final String value; public StringValue(String value, Object... args){ - this.value = Strings.formatArgs(value, args); + this.value = Strings.format(value, args); } @Override diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java index 180430a1ee..fd97296a70 100644 --- a/server/src/io/anuke/mindustry/server/ServerControl.java +++ b/server/src/io/anuke/mindustry/server/ServerControl.java @@ -306,7 +306,7 @@ public class ServerControl implements ApplicationListener{ } }); - handler.register("fillitems", "[team]", "Fill the core with 2000 items.", arg -> { + handler.register("fillitems", "[team]", "Fill the core with items.", arg -> { if(!state.is(State.playing)){ err("Not playing. Host first."); return; @@ -322,7 +322,7 @@ public class ServerControl implements ApplicationListener{ for(Item item : content.items()){ if(item.type == ItemType.material){ - state.teams.get(team).cores.first().entity.items.add(item, 2000); + state.teams.get(team).cores.first().entity.items.set(item, state.teams.get(team).cores.first().block().itemCapacity); } } diff --git a/tools/src/io/anuke/mindustry/ImagePacker.java b/tools/src/io/anuke/mindustry/ImagePacker.java index ee1a00b811..2d0e683a7f 100644 --- a/tools/src/io/anuke/mindustry/ImagePacker.java +++ b/tools/src/io/anuke/mindustry/ImagePacker.java @@ -131,7 +131,7 @@ public class ImagePacker{ } static void err(String message, Object... args){ - throw new IllegalArgumentException(Strings.formatArgs(message, args)); + throw new IllegalArgumentException(Strings.format(message, args)); } static class GenRegion extends AtlasRegion{