diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 05700dfe47..6e42e10a0c 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -60,10 +60,6 @@ - - - diff --git a/core/assets-raw/sprites/blocks/production/lavasmelter.png b/core/assets-raw/sprites/blocks/production/lavasmelter.png deleted file mode 100644 index 34c1e429ec..0000000000 Binary files a/core/assets-raw/sprites/blocks/production/lavasmelter.png and /dev/null differ diff --git a/core/assets-raw/sprites_replacement/blocks/power/powerinfinite.png b/core/assets-raw/sprites_replacement/blocks/power/power-infinite.png similarity index 100% rename from core/assets-raw/sprites_replacement/blocks/power/powerinfinite.png rename to core/assets-raw/sprites_replacement/blocks/power/power-infinite.png diff --git a/core/assets-raw/sprites_replacement/blocks/power/powervoid.png b/core/assets-raw/sprites_replacement/blocks/power/power-void.png similarity index 100% rename from core/assets-raw/sprites_replacement/blocks/power/powervoid.png rename to core/assets-raw/sprites_replacement/blocks/power/power-void.png diff --git a/core/assets-raw/sprites_replacement/blocks/production/incinerator.png b/core/assets-raw/sprites_replacement/blocks/production/incinerator.png new file mode 100644 index 0000000000..9c20fa5308 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/production/incinerator.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/production/pulverizer-rotator.png b/core/assets-raw/sprites_replacement/blocks/production/pulverizer-rotator.png new file mode 100644 index 0000000000..c39062caa2 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/production/pulverizer-rotator.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/production/pulverizer.png b/core/assets-raw/sprites_replacement/blocks/production/pulverizer.png new file mode 100644 index 0000000000..cc51a06fa5 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/production/pulverizer.png differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index b8e85c6ef5..1b2eb68940 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -302,7 +302,7 @@ launch.unable = [scarlet]Unable to LAUNCH.[] {0} Enemies. launch.confirm = This will launch all resources in your core.\nYou will not be able to return to this base. uncover = Uncover configure = Configure Loadout -configure.locked = [LIGHT_GRAY]Unlock configuring loadout:\nWave {0}. +configure.locked = [LIGHT_GRAY]Unlock configuring loadout: Wave {0}. zone.unlocked = [LIGHT_GRAY]{0} unlocked. zone.requirement.complete = Wave {0} reached:\n{1} zone requirements met. zone.config.complete = Wave {0} reached:\nLoadout config unlocked. diff --git a/core/assets/maps/desolateRift.mmap b/core/assets/maps/desolateRift.mmap index b09e8e279c..eebcb97310 100644 Binary files a/core/assets/maps/desolateRift.mmap and b/core/assets/maps/desolateRift.mmap differ diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png index 5f975c6e24..f12fc33b07 100644 Binary files a/core/assets/sprites/block_colors.png and b/core/assets/sprites/block_colors.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 85bac717fb..35d085d079 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -34,14 +34,14 @@ mend-projector-top index: -1 mender rotate: false - xy: 1093, 75 + xy: 1127, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mender-top rotate: false - xy: 1127, 109 + xy: 1093, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -62,7 +62,7 @@ overdrive-projector-top index: -1 shock-mine rotate: false - xy: 1581, 555 + xy: 1581, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -230,140 +230,140 @@ conveyor-4-3 index: -1 titanium-conveyor-0-0 rotate: false - xy: 1625, 749 + xy: 1659, 817 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 1659, 783 + xy: 1693, 851 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 1693, 817 + xy: 1625, 749 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 1659, 749 + xy: 1659, 783 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 1693, 783 + xy: 1693, 817 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 1693, 749 + xy: 1659, 749 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 1625, 715 + xy: 1693, 783 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 1659, 715 + xy: 1693, 749 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 1693, 715 + xy: 1625, 715 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 1617, 681 + xy: 1659, 715 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 1651, 681 + xy: 1693, 715 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 1685, 681 + xy: 1617, 681 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 1617, 647 + xy: 1651, 681 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 1651, 647 + xy: 1685, 681 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 1685, 647 + xy: 1617, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 1615, 613 + xy: 1651, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 1615, 579 + xy: 1685, 647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 1649, 613 + xy: 1615, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 1615, 545 + xy: 1615, 579 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 1649, 579 + xy: 1649, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -391,49 +391,49 @@ mass-driver-base index: -1 overflow-gate rotate: false - xy: 821, 4 + xy: 855, 20 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 1059, 7 + xy: 1025, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 1093, 7 + xy: 1059, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 1127, 7 + xy: 1093, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 1573, 895 + xy: 1127, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 1513, 628 + xy: 1445, 560 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 1316, 457 + xy: 1248, 457 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -692,7 +692,7 @@ rubble-4-1 index: -1 spawn rotate: false - xy: 1999, 1070 + xy: 1282, 457 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -839,28 +839,28 @@ conduit-top-6 index: -1 liquid-junction rotate: false - xy: 1025, 143 + xy: 991, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 1093, 211 + xy: 1059, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 991, 75 + xy: 1127, 245 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 1025, 109 + xy: 991, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -888,84 +888,84 @@ liquid-tank-top index: -1 mechanical-pump rotate: false - xy: 1127, 177 + xy: 1093, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 923, 7 + xy: 889, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 957, 7 + xy: 923, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 991, 7 + xy: 957, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 1025, 7 + xy: 991, 7 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 1899, 1003 + xy: 1831, 1003 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1933, 1003 + xy: 1865, 1003 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1591, 861 + xy: 1899, 1003 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 1591, 827 + xy: 1933, 1003 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 1591, 793 + xy: 1591, 861 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 1591, 759 + xy: 1591, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 1591, 725 + xy: 1591, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1131,6 +1131,13 @@ impact-reactor-top orig: 128, 128 offset: 0, 0 index: -1 +power-infinite + rotate: false + xy: 1557, 725 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 power-node rotate: false xy: 1549, 691 @@ -1159,20 +1166,6 @@ power-void orig: 32, 32 offset: 0, 0 index: -1 -powerinfinite - rotate: false - xy: 1797, 1003 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -powervoid - rotate: false - xy: 1831, 1003 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 rtg-generator rotate: false xy: 1113, 873 @@ -1182,14 +1175,14 @@ rtg-generator index: -1 rtg-generator-top rotate: false - xy: 1479, 560 + xy: 1513, 628 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 1214, 462 + xy: 1581, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1369,23 +1362,16 @@ silicon-smelter-top orig: 64, 64 offset: 0, 0 index: -1 -lavasmelter - rotate: false - xy: 957, 75 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 liquid-source rotate: false - xy: 1093, 177 + xy: 1059, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 1093, 109 + xy: 1059, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1434,14 +1420,14 @@ plastanium-compressor-top index: -1 pulverizer rotate: false - xy: 1583, 691 + xy: 1591, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 1411, 628 + xy: 1583, 691 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1476,7 +1462,7 @@ silicon-smelter index: -1 smelter rotate: false - xy: 1581, 487 + xy: 1581, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1574,14 +1560,14 @@ launch-pad-large index: -1 sortedunloader rotate: false - xy: 1282, 457 + xy: 1214, 462 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader rotate: false - xy: 1683, 545 + xy: 1683, 579 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1679,7 +1665,7 @@ salvo-panel-right index: -1 scorch-heat rotate: false - xy: 1513, 526 + xy: 1479, 526 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1826,7 +1812,7 @@ phantom-factory-top-open index: -1 repair-point-base rotate: false - xy: 1411, 560 + xy: 1411, 594 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1931,7 +1917,7 @@ door-open index: -1 phase-wall rotate: false - xy: 1607, 903 + xy: 1573, 895 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2001,42 +1987,42 @@ scrap-wall-large4 index: -1 scrap-wall1 rotate: false - xy: 1445, 492 + xy: 1513, 526 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall2 rotate: false - xy: 1479, 492 + xy: 1411, 492 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 1513, 492 + xy: 1445, 492 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 1547, 623 + xy: 1479, 492 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 1547, 623 + xy: 1479, 492 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 1675, 919 + xy: 1713, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2050,7 +2036,7 @@ surge-wall-large index: -1 thorium-wall rotate: false - xy: 1659, 851 + xy: 1625, 851 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2071,7 +2057,7 @@ thruster index: -1 titanium-wall rotate: false - xy: 1683, 613 + xy: 1615, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2169,35 +2155,35 @@ scale_marker index: -1 scorch1 rotate: false - xy: 1161, 245 + xy: 1727, 703 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch2 rotate: false - xy: 1161, 143 + xy: 1161, 245 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch3 rotate: false - xy: 1161, 41 + xy: 1161, 143 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch4 rotate: false - xy: 1717, 545 + xy: 1161, 41 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch5 rotate: false - xy: 1717, 443 + xy: 1717, 545 size: 28, 100 orig: 28, 100 offset: 0, 0 @@ -2218,7 +2204,7 @@ shell-back index: -1 shot rotate: false - xy: 1581, 521 + xy: 1547, 521 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2232,7 +2218,7 @@ transfer index: -1 transfer-arrow rotate: false - xy: 1649, 545 + xy: 1683, 613 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2323,7 +2309,7 @@ battery-large-icon-medium index: -1 battery-large-icon-small rotate: false - xy: 2019, 1270 + xy: 1717, 481 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2351,7 +2337,7 @@ blast-drill-icon-medium index: -1 blast-drill-icon-small rotate: false - xy: 1384, 467 + xy: 2019, 1270 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2372,7 +2358,7 @@ blast-mixer-icon-medium index: -1 blast-mixer-icon-small rotate: false - xy: 2014, 1793 + xy: 1384, 467 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2386,7 +2372,7 @@ bridge-conduit-icon-large index: -1 bridge-conduit-icon-small rotate: false - xy: 1410, 466 + xy: 2014, 1793 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2400,7 +2386,7 @@ bridge-conveyor-icon-large index: -1 bridge-conveyor-icon-small rotate: false - xy: 1436, 466 + xy: 1410, 466 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2414,7 +2400,7 @@ char-icon-large index: -1 char-icon-small rotate: false - xy: 1488, 466 + xy: 1462, 466 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2428,7 +2414,7 @@ cliffs-icon-large index: -1 cliffs-icon-small rotate: false - xy: 1514, 466 + xy: 1488, 466 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2449,7 +2435,7 @@ coal-centrifuge-icon-medium index: -1 coal-centrifuge-icon-small rotate: false - xy: 1719, 673 + xy: 1514, 466 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2463,7 +2449,7 @@ combustion-generator-icon-large index: -1 combustion-generator-icon-small rotate: false - xy: 1719, 647 + xy: 1719, 677 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2484,7 +2470,7 @@ conduit-icon-large index: -1 conduit-icon-small rotate: false - xy: 1540, 461 + xy: 1719, 651 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2505,7 +2491,7 @@ container-icon-medium index: -1 container-icon-small rotate: false - xy: 1566, 461 + xy: 1540, 461 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2519,7 +2505,7 @@ conveyor-icon-large index: -1 conveyor-icon-small rotate: false - xy: 290, 1221 + xy: 1566, 461 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2533,7 +2519,7 @@ copper-wall-icon-large index: -1 copper-wall-icon-small rotate: false - xy: 2022, 1907 + xy: 290, 1221 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2554,7 +2540,7 @@ copper-wall-large-icon-medium index: -1 copper-wall-large-icon-small rotate: false - xy: 2022, 1881 + xy: 2022, 1907 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2575,7 +2561,7 @@ core-foundation-icon-medium index: -1 core-foundation-icon-small rotate: false - xy: 2022, 1855 + xy: 2022, 1881 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2596,7 +2582,7 @@ core-nucleus-icon-medium index: -1 core-nucleus-icon-small rotate: false - xy: 1384, 441 + xy: 2022, 1855 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2617,7 +2603,7 @@ core-shard-icon-medium index: -1 core-shard-icon-small rotate: false - xy: 1410, 440 + xy: 1745, 677 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2911,7 +2897,7 @@ craters-icon-large index: -1 craters-icon-small rotate: false - xy: 1436, 440 + xy: 1745, 651 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2939,7 +2925,7 @@ crawler-factory-icon-medium index: -1 crawler-factory-icon-small rotate: false - xy: 1462, 440 + xy: 1747, 625 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2960,7 +2946,7 @@ creeptree-icon-medium index: -1 creeptree-icon-small rotate: false - xy: 1488, 440 + xy: 1747, 599 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2988,7 +2974,7 @@ cryofluidmixer-icon-medium index: -1 cryofluidmixer-icon-small rotate: false - xy: 1514, 440 + xy: 1747, 573 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3016,7 +3002,7 @@ cultivator-icon-medium index: -1 cultivator-icon-small rotate: false - xy: 1540, 435 + xy: 1747, 547 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3051,7 +3037,7 @@ cyclone-icon-medium index: -1 cyclone-icon-small rotate: false - xy: 1566, 435 + xy: 1384, 441 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3079,7 +3065,7 @@ dagger-factory-icon-medium index: -1 dagger-factory-icon-small rotate: false - xy: 1745, 673 + xy: 1410, 440 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3093,7 +3079,7 @@ dark-metal-icon-large index: -1 dark-metal-icon-small rotate: false - xy: 1745, 647 + xy: 1436, 440 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3107,7 +3093,7 @@ dark-panel-1-icon-large index: -1 dark-panel-1-icon-small rotate: false - xy: 1747, 621 + xy: 1462, 440 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3121,7 +3107,7 @@ dark-panel-2-icon-large index: -1 dark-panel-2-icon-small rotate: false - xy: 1747, 595 + xy: 1488, 440 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3135,7 +3121,7 @@ dark-panel-3-icon-large index: -1 dark-panel-3-icon-small rotate: false - xy: 1747, 569 + xy: 1514, 440 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3149,7 +3135,7 @@ dark-panel-4-icon-large index: -1 dark-panel-4-icon-small rotate: false - xy: 1747, 543 + xy: 1540, 435 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3163,7 +3149,7 @@ dark-panel-5-icon-large index: -1 dark-panel-5-icon-small rotate: false - xy: 1747, 517 + xy: 1566, 435 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3177,7 +3163,7 @@ dark-panel-6-icon-large index: -1 dark-panel-6-icon-small rotate: false - xy: 1747, 491 + xy: 1747, 969 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3191,7 +3177,7 @@ darksand-icon-large index: -1 darksand-icon-small rotate: false - xy: 1747, 465 + xy: 1773, 977 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3205,7 +3191,7 @@ darksand-tainted-water-icon-large index: -1 darksand-tainted-water-icon-small rotate: false - xy: 1747, 439 + xy: 1799, 977 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3219,7 +3205,7 @@ darksand-water-icon-large index: -1 darksand-water-icon-small rotate: false - xy: 1747, 969 + xy: 1825, 977 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3240,7 +3226,7 @@ dart-mech-pad-icon-medium index: -1 dart-mech-pad-icon-small rotate: false - xy: 1773, 977 + xy: 1851, 977 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3254,7 +3240,7 @@ deepwater-icon-large index: -1 deepwater-icon-small rotate: false - xy: 1799, 977 + xy: 1877, 977 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3275,7 +3261,7 @@ delta-mech-pad-icon-medium index: -1 delta-mech-pad-icon-small rotate: false - xy: 1825, 977 + xy: 1903, 977 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3296,7 +3282,7 @@ differential-generator-icon-medium index: -1 differential-generator-icon-small rotate: false - xy: 1851, 977 + xy: 1929, 977 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3317,7 +3303,7 @@ distributor-icon-medium index: -1 distributor-icon-small rotate: false - xy: 1877, 977 + xy: 1747, 943 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3331,7 +3317,7 @@ door-icon-large index: -1 door-icon-small rotate: false - xy: 1903, 977 + xy: 1773, 951 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3352,7 +3338,7 @@ door-large-icon-medium index: -1 door-large-icon-small rotate: false - xy: 1929, 977 + xy: 1799, 951 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3366,7 +3352,7 @@ dunerocks-icon-large index: -1 dunerocks-icon-small rotate: false - xy: 1747, 943 + xy: 1825, 951 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3394,7 +3380,7 @@ duo-icon-large index: -1 duo-icon-small rotate: false - xy: 1773, 951 + xy: 1851, 951 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3415,7 +3401,7 @@ force-projector-icon-medium index: -1 force-projector-icon-small rotate: false - xy: 1799, 951 + xy: 1877, 951 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3443,7 +3429,7 @@ fortress-factory-icon-medium index: -1 fortress-factory-icon-small rotate: false - xy: 1825, 951 + xy: 1903, 951 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3478,7 +3464,7 @@ fuse-icon-medium index: -1 fuse-icon-small rotate: false - xy: 1851, 951 + xy: 1929, 951 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3506,7 +3492,7 @@ ghoul-factory-icon-medium index: -1 ghoul-factory-icon-small rotate: false - xy: 1877, 951 + xy: 1743, 917 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3527,7 +3513,7 @@ glaive-ship-pad-icon-medium index: -1 glaive-ship-pad-icon-small rotate: false - xy: 1903, 951 + xy: 1743, 891 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3548,7 +3534,7 @@ graphite-press-icon-medium index: -1 graphite-press-icon-small rotate: false - xy: 1929, 951 + xy: 1955, 977 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3562,7 +3548,7 @@ grass-icon-large index: -1 grass-icon-small rotate: false - xy: 1743, 917 + xy: 1955, 951 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3590,7 +3576,7 @@ hail-icon-large index: -1 hail-icon-small rotate: false - xy: 1743, 891 + xy: 1773, 925 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3604,7 +3590,7 @@ holostone-icon-large index: -1 holostone-icon-small rotate: false - xy: 1955, 977 + xy: 1799, 925 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3618,7 +3604,7 @@ hotrock-icon-large index: -1 hotrock-icon-small rotate: false - xy: 1955, 951 + xy: 1825, 925 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3632,7 +3618,7 @@ ice-icon-large index: -1 ice-icon-small rotate: false - xy: 1773, 925 + xy: 1851, 925 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3646,7 +3632,7 @@ ice-snow-icon-large index: -1 ice-snow-icon-small rotate: false - xy: 1799, 925 + xy: 1877, 925 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3660,7 +3646,7 @@ icerocks-icon-large index: -1 icerocks-icon-small rotate: false - xy: 1825, 925 + xy: 1903, 925 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3674,7 +3660,7 @@ ignarock-icon-large index: -1 ignarock-icon-small rotate: false - xy: 1929, 925 + xy: 1795, 899 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3702,7 +3688,7 @@ impact-reactor-icon-medium index: -1 impact-reactor-icon-small rotate: false - xy: 1955, 925 + xy: 1821, 899 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -3716,21 +3702,21 @@ incinerator-icon-large index: -1 incinerator-icon-small rotate: false - xy: 1769, 899 + xy: 1847, 899 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-blast-compound-medium rotate: false - xy: 1795, 899 + xy: 1873, 899 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-blast-compound-small rotate: false - xy: 1773, 489 + xy: 1592, 433 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3744,14 +3730,14 @@ item-blast-compound-xlarge index: -1 item-coal-medium rotate: false - xy: 1821, 899 + xy: 1899, 899 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-coal-small rotate: false - xy: 1923, 647 + xy: 1966, 793 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3765,14 +3751,14 @@ item-coal-xlarge index: -1 item-copper-medium rotate: false - xy: 1847, 899 + xy: 1925, 899 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-copper-small rotate: false - xy: 1773, 471 + xy: 1965, 775 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3786,14 +3772,14 @@ item-copper-xlarge index: -1 item-graphite-medium rotate: false - xy: 1873, 899 + xy: 1951, 899 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-graphite-small rotate: false - xy: 1941, 647 + xy: 1965, 757 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3807,14 +3793,14 @@ item-graphite-xlarge index: -1 item-lead-medium rotate: false - xy: 1899, 899 + xy: 1967, 1011 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-lead-small rotate: false - xy: 1773, 453 + xy: 1965, 739 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3828,14 +3814,14 @@ item-lead-xlarge index: -1 item-metaglass-medium rotate: false - xy: 1925, 899 + xy: 1769, 873 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-metaglass-small rotate: false - xy: 1959, 647 + xy: 1965, 721 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3849,14 +3835,14 @@ item-metaglass-xlarge index: -1 item-phase-fabric-medium rotate: false - xy: 1951, 899 + xy: 1795, 873 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-phase-fabric-small rotate: false - xy: 855, 2 + xy: 1610, 459 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3870,14 +3856,14 @@ item-phase-fabric-xlarge index: -1 item-plastanium-medium rotate: false - xy: 1967, 1011 + xy: 1821, 873 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-plastanium-small rotate: false - xy: 163, 6 + xy: 1610, 441 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3891,14 +3877,14 @@ item-plastanium-xlarge index: -1 item-pyratite-medium rotate: false - xy: 1769, 873 + xy: 1847, 873 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-pyratite-small rotate: false - xy: 181, 6 + xy: 1628, 459 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3912,14 +3898,14 @@ item-pyratite-xlarge index: -1 item-sand-medium rotate: false - xy: 1795, 873 + xy: 1873, 873 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-sand-small rotate: false - xy: 199, 6 + xy: 1628, 441 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3933,14 +3919,14 @@ item-sand-xlarge index: -1 item-scrap-medium rotate: false - xy: 1821, 873 + xy: 1899, 873 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-scrap-small rotate: false - xy: 217, 6 + xy: 1646, 459 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3954,14 +3940,14 @@ item-scrap-xlarge index: -1 item-silicon-medium rotate: false - xy: 1847, 873 + xy: 1925, 873 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-silicon-small rotate: false - xy: 235, 6 + xy: 1646, 441 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3982,21 +3968,21 @@ item-source-icon-large index: -1 item-source-icon-small rotate: false - xy: 1873, 873 + xy: 1951, 873 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-medium rotate: false - xy: 1899, 873 + xy: 1758, 847 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-small rotate: false - xy: 253, 6 + xy: 1664, 459 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4010,14 +3996,14 @@ item-spore-pod-xlarge index: -1 item-surge-alloy-medium rotate: false - xy: 1925, 873 + xy: 1758, 821 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-small rotate: false - xy: 271, 6 + xy: 1664, 441 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4031,14 +4017,14 @@ item-surge-alloy-xlarge index: -1 item-thorium-medium rotate: false - xy: 1951, 873 + xy: 1784, 847 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-thorium-small rotate: false - xy: 1799, 559 + xy: 1682, 459 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4052,14 +4038,14 @@ item-thorium-xlarge index: -1 item-titanium-medium rotate: false - xy: 1761, 847 + xy: 1784, 821 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-small rotate: false - xy: 1714, 425 + xy: 1682, 441 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4080,7 +4066,7 @@ item-void-icon-large index: -1 item-void-icon-small rotate: false - xy: 1761, 821 + xy: 1810, 847 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4101,7 +4087,7 @@ javelin-ship-pad-icon-medium index: -1 javelin-ship-pad-icon-small rotate: false - xy: 1787, 847 + xy: 1810, 821 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4115,7 +4101,7 @@ junction-icon-large index: -1 junction-icon-small rotate: false - xy: 1787, 821 + xy: 1836, 847 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4136,7 +4122,7 @@ kiln-icon-medium index: -1 kiln-icon-small rotate: false - xy: 1813, 847 + xy: 1836, 821 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4171,7 +4157,7 @@ lancer-icon-medium index: -1 lancer-icon-small rotate: false - xy: 1813, 821 + xy: 1862, 847 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4199,7 +4185,7 @@ laser-drill-icon-medium index: -1 laser-drill-icon-small rotate: false - xy: 1839, 847 + xy: 1862, 821 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4220,7 +4206,7 @@ launch-pad-icon-medium index: -1 launch-pad-icon-small rotate: false - xy: 1839, 821 + xy: 1888, 847 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4241,7 +4227,7 @@ launch-pad-large-icon-medium index: -1 launch-pad-large-icon-small rotate: false - xy: 1865, 847 + xy: 1888, 821 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4255,14 +4241,14 @@ liquid-junction-icon-large index: -1 liquid-junction-icon-small rotate: false - xy: 1865, 821 + xy: 1914, 847 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-router-icon-full rotate: false - xy: 1127, 245 + xy: 1093, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4276,7 +4262,7 @@ liquid-router-icon-large index: -1 liquid-router-icon-small rotate: false - xy: 1891, 847 + xy: 1914, 821 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4290,7 +4276,7 @@ liquid-source-icon-large index: -1 liquid-source-icon-small rotate: false - xy: 1891, 821 + xy: 1940, 847 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4311,14 +4297,14 @@ liquid-tank-icon-large index: -1 liquid-tank-icon-medium rotate: false - xy: 1127, 211 + xy: 1093, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-tank-icon-small rotate: false - xy: 1917, 847 + xy: 1940, 821 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4332,7 +4318,7 @@ magmarock-icon-large index: -1 magmarock-icon-small rotate: false - xy: 1917, 821 + xy: 1758, 795 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4360,14 +4346,14 @@ mass-driver-icon-large index: -1 mass-driver-icon-medium rotate: false - xy: 1059, 109 + xy: 1025, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mass-driver-icon-small rotate: false - xy: 1943, 847 + xy: 1784, 795 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4444,14 +4430,14 @@ mechanical-drill-icon-large index: -1 mechanical-drill-icon-medium rotate: false - xy: 1093, 143 + xy: 1059, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-drill-icon-small rotate: false - xy: 1943, 821 + xy: 1810, 795 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4465,7 +4451,7 @@ mechanical-pump-icon-large index: -1 mechanical-pump-icon-small rotate: false - xy: 1981, 1044 + xy: 1836, 795 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4493,14 +4479,14 @@ meltdown-icon-large index: -1 meltdown-icon-medium rotate: false - xy: 1059, 75 + xy: 1127, 177 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 meltdown-icon-small rotate: false - xy: 2007, 1044 + xy: 1862, 795 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4514,7 +4500,7 @@ melter-icon-large index: -1 melter-icon-small rotate: false - xy: 1993, 1018 + xy: 1888, 795 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4528,14 +4514,14 @@ mend-projector-icon-large index: -1 mend-projector-icon-medium rotate: false - xy: 1127, 143 + xy: 1093, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mend-projector-icon-small rotate: false - xy: 2019, 1018 + xy: 1914, 795 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4549,7 +4535,7 @@ mender-icon-large index: -1 mender-icon-small rotate: false - xy: 1969, 847 + xy: 1940, 795 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4563,7 +4549,7 @@ metal-floor-2-icon-large index: -1 metal-floor-2-icon-small rotate: false - xy: 1969, 821 + xy: 1757, 769 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4577,7 +4563,7 @@ metal-floor-3-icon-large index: -1 metal-floor-3-icon-small rotate: false - xy: 1993, 992 + xy: 1757, 743 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4591,7 +4577,7 @@ metal-floor-5-icon-large index: -1 metal-floor-5-icon-small rotate: false - xy: 2019, 992 + xy: 1783, 769 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4605,7 +4591,7 @@ metal-floor-damaged-icon-large index: -1 metal-floor-damaged-icon-small rotate: false - xy: 1981, 966 + xy: 1757, 717 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4619,7 +4605,7 @@ metal-floor-icon-large index: -1 metal-floor-icon-small rotate: false - xy: 1981, 940 + xy: 1783, 743 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4633,7 +4619,7 @@ moss-icon-large index: -1 moss-icon-small rotate: false - xy: 2007, 966 + xy: 1809, 769 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4647,14 +4633,14 @@ multi-press-icon-large index: -1 multi-press-icon-medium rotate: false - xy: 1127, 75 + xy: 1127, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 multi-press-icon-small rotate: false - xy: 2007, 940 + xy: 1783, 717 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4675,14 +4661,14 @@ oil-extractor-icon-large index: -1 oil-extractor-icon-medium rotate: false - xy: 889, 41 + xy: 1127, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 oil-extractor-icon-small rotate: false - xy: 1981, 914 + xy: 1809, 743 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4696,28 +4682,28 @@ omega-mech-pad-icon-large index: -1 omega-mech-pad-icon-medium rotate: false - xy: 923, 41 + xy: 889, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 omega-mech-pad-icon-small rotate: false - xy: 2007, 914 + xy: 1835, 769 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-icon-full rotate: false - xy: 957, 41 + xy: 923, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-icon-medium rotate: false - xy: 957, 41 + xy: 923, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4731,21 +4717,21 @@ ore-coal-icon-large index: -1 ore-coal-icon-small rotate: false - xy: 1977, 888 + xy: 1809, 717 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-icon-full rotate: false - xy: 991, 41 + xy: 957, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-icon-medium rotate: false - xy: 991, 41 + xy: 957, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4759,21 +4745,21 @@ ore-copper-icon-large index: -1 ore-copper-icon-small rotate: false - xy: 2003, 888 + xy: 1835, 743 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-icon-full rotate: false - xy: 1025, 41 + xy: 991, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-icon-medium rotate: false - xy: 1025, 41 + xy: 991, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4787,21 +4773,21 @@ ore-lead-icon-large index: -1 ore-lead-icon-small rotate: false - xy: 1995, 862 + xy: 1861, 769 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-icon-full rotate: false - xy: 1059, 41 + xy: 1025, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-icon-medium rotate: false - xy: 1059, 41 + xy: 1025, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4815,21 +4801,21 @@ ore-scrap-icon-large index: -1 ore-scrap-icon-small rotate: false - xy: 1995, 836 + xy: 1835, 717 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-icon-full rotate: false - xy: 1093, 41 + xy: 1059, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-icon-medium rotate: false - xy: 1093, 41 + xy: 1059, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4843,21 +4829,21 @@ ore-thorium-icon-large index: -1 ore-thorium-icon-small rotate: false - xy: 1995, 810 + xy: 1861, 743 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-icon-full rotate: false - xy: 1127, 41 + xy: 1093, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-icon-medium rotate: false - xy: 1127, 41 + xy: 1093, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4871,7 +4857,7 @@ ore-titanium-icon-large index: -1 ore-titanium-icon-small rotate: false - xy: 2021, 862 + xy: 1887, 769 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4885,14 +4871,14 @@ overdrive-projector-icon-large index: -1 overdrive-projector-icon-medium rotate: false - xy: 855, 20 + xy: 1127, 41 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-projector-icon-small rotate: false - xy: 2021, 836 + xy: 1861, 717 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4906,7 +4892,7 @@ overflow-gate-icon-large index: -1 overflow-gate-icon-small rotate: false - xy: 2021, 810 + xy: 1887, 743 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4920,7 +4906,7 @@ pebbles-icon-large index: -1 pebbles-icon-small rotate: false - xy: 369, 2 + xy: 1913, 769 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4941,14 +4927,14 @@ phantom-factory-icon-large index: -1 phantom-factory-icon-medium rotate: false - xy: 889, 7 + xy: 821, 4 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phantom-factory-icon-small rotate: false - xy: 395, 2 + xy: 1887, 717 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4962,7 +4948,7 @@ phase-conduit-icon-large index: -1 phase-conduit-icon-small rotate: false - xy: 421, 2 + xy: 1913, 743 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4976,7 +4962,7 @@ phase-conveyor-icon-large index: -1 phase-conveyor-icon-small rotate: false - xy: 447, 2 + xy: 1939, 769 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -4990,7 +4976,7 @@ phase-wall-icon-large index: -1 phase-wall-icon-small rotate: false - xy: 1761, 795 + xy: 1913, 717 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5004,14 +4990,14 @@ phase-wall-large-icon-large index: -1 phase-wall-large-icon-medium rotate: false - xy: 1557, 861 + xy: 1607, 903 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large-icon-small rotate: false - xy: 1787, 795 + xy: 1939, 743 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5032,28 +5018,28 @@ phase-weaver-icon-large index: -1 phase-weaver-icon-medium rotate: false - xy: 1557, 827 + xy: 1557, 861 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-weaver-icon-small rotate: false - xy: 1813, 795 + xy: 1939, 717 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pine-icon-medium rotate: false - xy: 1557, 793 + xy: 1557, 827 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pine-icon-small rotate: false - xy: 1839, 795 + xy: 1771, 691 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5067,14 +5053,14 @@ plastanium-compressor-icon-large index: -1 plastanium-compressor-icon-medium rotate: false - xy: 1557, 759 + xy: 1557, 793 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-compressor-icon-small rotate: false - xy: 1865, 795 + xy: 1771, 665 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5095,14 +5081,14 @@ pneumatic-drill-icon-large index: -1 pneumatic-drill-icon-medium rotate: false - xy: 1557, 725 + xy: 1557, 759 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pneumatic-drill-icon-small rotate: false - xy: 1891, 795 + xy: 1797, 691 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5116,7 +5102,7 @@ power-node-icon-large index: -1 power-node-icon-small rotate: false - xy: 1917, 795 + xy: 1797, 665 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5137,7 +5123,7 @@ power-node-large-icon-medium index: -1 power-node-large-icon-small rotate: false - xy: 1943, 795 + xy: 1823, 691 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5151,7 +5137,7 @@ power-source-icon-large index: -1 power-source-icon-small rotate: false - xy: 1969, 795 + xy: 1823, 665 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5165,14 +5151,14 @@ power-void-icon-large index: -1 power-void-icon-small rotate: false - xy: 1758, 769 + xy: 1849, 691 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pulse-conduit-icon-full rotate: false - xy: 1865, 1003 + xy: 1797, 1003 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5186,14 +5172,14 @@ pulse-conduit-icon-large index: -1 pulse-conduit-icon-small rotate: false - xy: 1758, 743 + xy: 1849, 665 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pulverizer-icon-full rotate: false - xy: 1583, 657 + xy: 1591, 725 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5207,7 +5193,7 @@ pulverizer-icon-large index: -1 pulverizer-icon-small rotate: false - xy: 1784, 769 + xy: 1875, 691 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5221,28 +5207,28 @@ pyratite-mixer-icon-large index: -1 pyratite-mixer-icon-medium rotate: false - xy: 1411, 594 + xy: 1583, 657 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer-icon-small rotate: false - xy: 1784, 743 + xy: 1875, 665 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 repair-point rotate: false - xy: 1445, 628 + xy: 1411, 628 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 repair-point-icon-full rotate: false - xy: 1445, 594 + xy: 1445, 628 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5256,7 +5242,7 @@ repair-point-icon-large index: -1 repair-point-icon-small rotate: false - xy: 1810, 769 + xy: 1901, 691 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5277,14 +5263,14 @@ revenant-factory-icon-large index: -1 revenant-factory-icon-medium rotate: false - xy: 1479, 628 + xy: 1411, 560 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 revenant-factory-icon-small rotate: false - xy: 1810, 743 + xy: 1901, 665 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5312,28 +5298,28 @@ ripple-icon-large index: -1 ripple-icon-medium rotate: false - xy: 1411, 526 + xy: 1445, 594 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ripple-icon-small rotate: false - xy: 1836, 769 + xy: 1927, 691 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rock-icon-medium rotate: false - xy: 1445, 560 + xy: 1479, 628 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rock-icon-small rotate: false - xy: 1836, 743 + xy: 1927, 665 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5347,7 +5333,7 @@ rocks-icon-large index: -1 rocks-icon-small rotate: false - xy: 1862, 769 + xy: 1773, 639 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5361,14 +5347,14 @@ rotary-pump-icon-large index: -1 rotary-pump-icon-medium rotate: false - xy: 1479, 594 + xy: 1411, 526 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-icon-small rotate: false - xy: 1862, 743 + xy: 1773, 613 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5382,7 +5368,7 @@ router-icon-large index: -1 router-icon-small rotate: false - xy: 1888, 769 + xy: 1799, 639 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5396,14 +5382,14 @@ rtg-generator-icon-large index: -1 rtg-generator-icon-medium rotate: false - xy: 1445, 526 + xy: 1479, 594 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator-icon-small rotate: false - xy: 1888, 743 + xy: 1773, 587 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5417,7 +5403,7 @@ salt-icon-large index: -1 salt-icon-small rotate: false - xy: 1914, 769 + xy: 1799, 613 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5431,7 +5417,7 @@ saltrocks-icon-large index: -1 saltrocks-icon-small rotate: false - xy: 1914, 743 + xy: 1825, 639 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5459,14 +5445,14 @@ salvo-icon-large index: -1 salvo-icon-medium rotate: false - xy: 1513, 594 + xy: 1445, 526 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salvo-icon-small rotate: false - xy: 1940, 769 + xy: 1773, 561 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5480,7 +5466,7 @@ sand-icon-large index: -1 sand-icon-small rotate: false - xy: 1940, 743 + xy: 1799, 587 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5494,7 +5480,7 @@ sand-water-icon-large index: -1 sand-water-icon-small rotate: false - xy: 1966, 769 + xy: 1825, 613 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5508,7 +5494,7 @@ sandrocks-icon-large index: -1 sandrocks-icon-small rotate: false - xy: 1966, 743 + xy: 1851, 639 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5536,28 +5522,28 @@ scatter-icon-large index: -1 scatter-icon-medium rotate: false - xy: 1479, 526 + xy: 1479, 560 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scatter-icon-small rotate: false - xy: 1995, 784 + xy: 1799, 561 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scorch rotate: false - xy: 1513, 560 + xy: 1513, 594 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scorch-icon-full rotate: false - xy: 1411, 492 + xy: 1513, 560 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5571,7 +5557,7 @@ scorch-icon-large index: -1 scorch-icon-small rotate: false - xy: 2021, 784 + xy: 1825, 587 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5585,14 +5571,14 @@ scrap-wall-gigantic-icon-large index: -1 scrap-wall-gigantic-icon-medium rotate: false - xy: 1547, 589 + xy: 1513, 492 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-small rotate: false - xy: 1992, 758 + xy: 1851, 613 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5606,14 +5592,14 @@ scrap-wall-huge-icon-large index: -1 scrap-wall-huge-icon-medium rotate: false - xy: 1581, 623 + xy: 1547, 623 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-huge-icon-small rotate: false - xy: 2018, 758 + xy: 1877, 639 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5627,7 +5613,7 @@ scrap-wall-icon-large index: -1 scrap-wall-icon-small rotate: false - xy: 1992, 732 + xy: 1825, 561 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5641,14 +5627,14 @@ scrap-wall-large-icon-large index: -1 scrap-wall-large-icon-medium rotate: false - xy: 1547, 555 + xy: 1547, 589 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-large-icon-small rotate: false - xy: 2018, 732 + xy: 1851, 587 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5662,14 +5648,14 @@ separator-icon-large index: -1 separator-icon-medium rotate: false - xy: 1547, 521 + xy: 1547, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 separator-icon-small rotate: false - xy: 1165, 347 + xy: 1851, 561 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5683,7 +5669,7 @@ shale-boulder-icon-large index: -1 shale-boulder-icon-small rotate: false - xy: 1618, 451 + xy: 1877, 571 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5697,7 +5683,7 @@ shale-icon-large index: -1 shale-icon-small rotate: false - xy: 1644, 451 + xy: 1903, 602 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5711,7 +5697,7 @@ shalerocks-icon-large index: -1 shalerocks-icon-small rotate: false - xy: 1670, 451 + xy: 1903, 576 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5725,7 +5711,7 @@ shock-mine-icon-large index: -1 shock-mine-icon-small rotate: false - xy: 1168, 415 + xy: 1929, 639 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5739,7 +5725,7 @@ shrubs-icon-large index: -1 shrubs-icon-small rotate: false - xy: 1618, 425 + xy: 1929, 613 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5753,14 +5739,14 @@ silicon-smelter-icon-large index: -1 silicon-smelter-icon-medium rotate: false - xy: 1547, 487 + xy: 1581, 555 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 silicon-smelter-icon-small rotate: false - xy: 1644, 425 + xy: 1929, 587 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5774,21 +5760,21 @@ snow-icon-large index: -1 snow-icon-small rotate: false - xy: 1670, 425 + xy: 1773, 535 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 snowrock-icon-medium rotate: false - xy: 1180, 462 + xy: 1547, 487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrock-icon-small rotate: false - xy: 1592, 414 + xy: 1799, 535 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5802,7 +5788,7 @@ snowrocks-icon-large index: -1 snowrocks-icon-small rotate: false - xy: 1618, 399 + xy: 1825, 535 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5816,7 +5802,7 @@ solar-panel-icon-large index: -1 solar-panel-icon-small rotate: false - xy: 1644, 399 + xy: 1851, 535 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5830,14 +5816,14 @@ solar-panel-large-icon-large index: -1 solar-panel-large-icon-medium rotate: false - xy: 1248, 457 + xy: 1180, 462 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-large-icon-small rotate: false - xy: 1670, 399 + xy: 1877, 545 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5851,7 +5837,7 @@ sorter-icon-large index: -1 sorter-icon-small rotate: false - xy: 1758, 717 + xy: 1903, 550 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5865,7 +5851,7 @@ spawn-icon-large index: -1 spawn-icon-small rotate: false - xy: 1784, 717 + xy: 1929, 561 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5893,14 +5879,14 @@ spectre-icon-large index: -1 spectre-icon-medium rotate: false - xy: 1350, 457 + xy: 1316, 457 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spectre-icon-small rotate: false - xy: 1810, 717 + xy: 1747, 521 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5921,14 +5907,14 @@ spirit-factory-icon-large index: -1 spirit-factory-icon-medium rotate: false - xy: 2014, 1819 + xy: 1999, 1070 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spirit-factory-icon-small rotate: false - xy: 1836, 717 + xy: 1773, 509 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5942,14 +5928,14 @@ spore-cluster-icon-large index: -1 spore-cluster-icon-medium rotate: false - xy: 1645, 953 + xy: 1350, 457 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-cluster-icon-small rotate: false - xy: 1862, 717 + xy: 1799, 509 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5963,21 +5949,21 @@ spore-moss-icon-large index: -1 spore-moss-icon-small rotate: false - xy: 1888, 717 + xy: 1825, 509 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spore-pine-icon-medium rotate: false - xy: 1679, 953 + xy: 2014, 1819 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-pine-icon-small rotate: false - xy: 1914, 717 + xy: 1851, 509 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -5998,14 +5984,14 @@ spore-press-icon-large index: -1 spore-press-icon-medium rotate: false - xy: 1713, 953 + xy: 1645, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-press-icon-small rotate: false - xy: 1940, 717 + xy: 1877, 519 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6019,7 +6005,7 @@ sporerocks-icon-large index: -1 sporerocks-icon-small rotate: false - xy: 1966, 717 + xy: 1903, 524 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6033,7 +6019,7 @@ stone-icon-large index: -1 stone-icon-small rotate: false - xy: 1992, 706 + xy: 1929, 535 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6047,14 +6033,14 @@ surge-tower-icon-large index: -1 surge-tower-icon-medium rotate: false - xy: 1641, 919 + xy: 1679, 953 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-tower-icon-small rotate: false - xy: 2018, 706 + xy: 1746, 495 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6068,7 +6054,7 @@ surge-wall-icon-large index: -1 surge-wall-icon-small rotate: false - xy: 1771, 691 + xy: 1772, 483 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6082,14 +6068,14 @@ surge-wall-large-icon-large index: -1 surge-wall-large-icon-medium rotate: false - xy: 1709, 919 + xy: 1641, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large-icon-small rotate: false - xy: 1771, 665 + xy: 1798, 483 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6117,14 +6103,14 @@ swarmer-icon-large index: -1 swarmer-icon-medium rotate: false - xy: 1641, 885 + xy: 1675, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer-icon-small rotate: false - xy: 1797, 691 + xy: 1824, 483 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6138,7 +6124,7 @@ tainted-water-icon-large index: -1 tainted-water-icon-small rotate: false - xy: 1797, 665 + xy: 1850, 483 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6152,7 +6138,7 @@ tar-icon-large index: -1 tar-icon-small rotate: false - xy: 1823, 691 + xy: 1953, 691 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6166,14 +6152,14 @@ tau-mech-pad-icon-large index: -1 tau-mech-pad-icon-medium rotate: false - xy: 1675, 885 + xy: 1709, 919 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tau-mech-pad-icon-small rotate: false - xy: 1823, 665 + xy: 1953, 665 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6187,7 +6173,7 @@ tendrils-icon-large index: -1 tendrils-icon-small rotate: false - xy: 1849, 691 + xy: 1955, 639 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6201,14 +6187,14 @@ thermal-generator-icon-large index: -1 thermal-generator-icon-medium rotate: false - xy: 1709, 885 + xy: 1641, 885 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-generator-icon-small rotate: false - xy: 1849, 665 + xy: 1955, 613 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6222,14 +6208,14 @@ thermal-pump-icon-large index: -1 thermal-pump-icon-medium rotate: false - xy: 1625, 851 + xy: 1675, 885 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-icon-small rotate: false - xy: 1875, 691 + xy: 1955, 587 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6243,14 +6229,14 @@ thorium-reactor-icon-large index: -1 thorium-reactor-icon-medium rotate: false - xy: 1625, 817 + xy: 1709, 885 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-reactor-icon-small rotate: false - xy: 1875, 665 + xy: 1955, 561 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6264,7 +6250,7 @@ thorium-wall-icon-large index: -1 thorium-wall-icon-small rotate: false - xy: 1901, 691 + xy: 1955, 535 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6278,14 +6264,14 @@ thorium-wall-large-icon-large index: -1 thorium-wall-large-icon-medium rotate: false - xy: 1625, 783 + xy: 1625, 817 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large-icon-small rotate: false - xy: 1901, 665 + xy: 1929, 509 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6299,14 +6285,14 @@ thruster-icon-large index: -1 thruster-icon-medium rotate: false - xy: 1659, 817 + xy: 1659, 851 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thruster-icon-small rotate: false - xy: 1927, 691 + xy: 1955, 509 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6327,14 +6313,14 @@ titan-factory-icon-large index: -1 titan-factory-icon-medium rotate: false - xy: 1693, 851 + xy: 1625, 783 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titan-factory-icon-small rotate: false - xy: 1927, 665 + xy: 1903, 498 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6348,7 +6334,7 @@ titanium-conveyor-icon-large index: -1 titanium-conveyor-icon-small rotate: false - xy: 1953, 691 + xy: 1877, 493 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6362,7 +6348,7 @@ titanium-wall-icon-large index: -1 titanium-wall-icon-small rotate: false - xy: 1953, 665 + xy: 1743, 469 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6376,14 +6362,14 @@ titanium-wall-large-icon-large index: -1 titanium-wall-large-icon-medium rotate: false - xy: 1615, 511 + xy: 1649, 579 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large-icon-small rotate: false - xy: 1979, 680 + xy: 1717, 455 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6397,14 +6383,14 @@ trident-ship-pad-icon-large index: -1 trident-ship-pad-icon-medium rotate: false - xy: 1683, 579 + xy: 1615, 511 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 trident-ship-pad-icon-small rotate: false - xy: 2005, 680 + xy: 1743, 443 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6418,14 +6404,14 @@ turbine-generator-icon-large index: -1 turbine-generator-icon-medium rotate: false - xy: 1649, 511 + xy: 1649, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 turbine-generator-icon-small rotate: false - xy: 1979, 654 + xy: 1769, 457 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6488,7 +6474,7 @@ unloader-icon-large index: -1 unloader-icon-small rotate: false - xy: 2005, 654 + xy: 1795, 457 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6502,14 +6488,14 @@ vault-icon-large index: -1 vault-icon-medium rotate: false - xy: 1683, 511 + xy: 1649, 511 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 vault-icon-small rotate: false - xy: 1773, 639 + xy: 1821, 457 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6530,14 +6516,14 @@ water-extractor-icon-large index: -1 water-extractor-icon-medium rotate: false - xy: 1615, 477 + xy: 1683, 545 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-extractor-icon-small rotate: false - xy: 1773, 613 + xy: 1847, 457 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6551,7 +6537,7 @@ water-icon-large index: -1 water-icon-small rotate: false - xy: 1799, 639 + xy: 1769, 431 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6579,14 +6565,14 @@ wave-icon-large index: -1 wave-icon-medium rotate: false - xy: 1649, 477 + xy: 1683, 511 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-icon-small rotate: false - xy: 1773, 587 + xy: 1795, 431 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6600,14 +6586,14 @@ white-tree-dead-icon-large index: -1 white-tree-dead-icon-medium rotate: false - xy: 1683, 477 + xy: 1615, 477 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white-tree-dead-icon-small rotate: false - xy: 1799, 613 + xy: 1821, 431 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6621,14 +6607,14 @@ white-tree-icon-large index: -1 white-tree-icon-medium rotate: false - xy: 1727, 851 + xy: 1649, 477 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white-tree-icon-small rotate: false - xy: 1825, 639 + xy: 1847, 431 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6649,14 +6635,14 @@ wraith-factory-icon-large index: -1 wraith-factory-icon-medium rotate: false - xy: 1727, 817 + xy: 1683, 477 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wraith-factory-icon-small rotate: false - xy: 1773, 561 + xy: 1966, 847 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -6782,28 +6768,28 @@ item-titanium index: -1 liquid-cryofluid rotate: false - xy: 991, 109 + xy: 957, 75 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 1059, 177 + xy: 1025, 143 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 1059, 143 + xy: 1025, 109 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 1025, 75 + xy: 1127, 211 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6950,7 +6936,7 @@ circle index: -1 clear rotate: false - xy: 1758, 814 + xy: 1743, 504 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -6964,7 +6950,7 @@ shape-3 index: -1 bar rotate: false - xy: 1727, 699 + xy: 1161, 3 size: 27, 36 split: 9, 9, 9, 9 orig: 27, 36 @@ -6972,7 +6958,7 @@ bar index: -1 bar-top rotate: false - xy: 1161, 3 + xy: 1717, 507 size: 27, 36 split: 9, 10, 9, 10 orig: 27, 36 @@ -7068,7 +7054,7 @@ button-right-over index: -1 button-select rotate: false - xy: 1462, 466 + xy: 1436, 466 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -7178,70 +7164,70 @@ empty-sector index: -1 icon-crafting rotate: false - xy: 489, 1186 + xy: 849, 1081 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 783, 1119 + xy: 759, 923 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 849, 1081 + xy: 825, 883 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-effect rotate: false - xy: 759, 923 + xy: 587, 653 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 1696, 459 + xy: 1966, 829 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-power rotate: false - xy: 759, 905 + xy: 1263, 875 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-production rotate: false - xy: 605, 653 + xy: 779, 535 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-turret rotate: false - xy: 489, 1150 + xy: 199, 6 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 1887, 647 + xy: 235, 6 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-upgrade rotate: false - xy: 1696, 405 + xy: 271, 6 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -7311,21 +7297,21 @@ icon-arrow-down index: -1 icon-arrow-left rotate: false - xy: 2033, 1044 + xy: 13, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 13, 1 + xy: 25, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 25, 1 + xy: 37, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -7339,7 +7325,7 @@ icon-back index: -1 icon-ban rotate: false - xy: 2033, 1088 + xy: 1261, 641 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -7353,182 +7339,182 @@ icon-break index: -1 icon-cancel rotate: false - xy: 2031, 688 + xy: 1981, 1062 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel-2 rotate: false - xy: 1851, 925 + xy: 1929, 925 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 37, 1 + xy: 49, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 2031, 670 + xy: 489, 1186 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-check-2 rotate: false - xy: 1877, 925 + xy: 1955, 925 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icon-copy rotate: false - xy: 2031, 652 + xy: 783, 1119 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 49, 1 + xy: 61, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-database rotate: false - xy: 473, 12 + xy: 1345, 1079 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-database-small rotate: false - xy: 61, 1 + xy: 73, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 1261, 641 + xy: 2033, 1088 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 1345, 1079 + xy: 605, 21 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 605, 21 + xy: 2031, 1209 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 2031, 1209 + xy: 2033, 1072 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 2033, 1072 + xy: 873, 4 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 2033, 1056 + xy: 1625, 887 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-elevation rotate: false - xy: 825, 883 + xy: 1245, 875 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 587, 653 + xy: 761, 535 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 873, 4 + xy: 605, 5 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 1245, 875 + xy: 1311, 1095 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 761, 535 + xy: 533, 27 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 2033, 976 + xy: 1700, 461 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 1311, 1095 + xy: 369, 12 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 2033, 960 + xy: 1700, 445 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 533, 27 + xy: 727, 709 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 2033, 944 + xy: 2027, 1393 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 2033, 928 + xy: 2027, 1377 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -7542,70 +7528,70 @@ icon-generated index: -1 icon-github rotate: false - xy: 2033, 912 + xy: 2027, 1361 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 1625, 887 + xy: 387, 12 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 727, 709 + xy: 1379, 644 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 73, 1 + xy: 1241, 1093 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 1241, 1093 + xy: 204, 1385 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 605, 5 + xy: 403, 12 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 1714, 409 + xy: 419, 12 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 1773, 437 + xy: 435, 12 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 2027, 1393 + xy: 451, 12 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-item rotate: false - xy: 1981, 999 + xy: 862, 1781 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -7619,91 +7605,91 @@ icon-items-none index: -1 icon-line rotate: false - xy: 1379, 644 + xy: 1592, 469 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 2027, 1377 + xy: 467, 12 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid-small rotate: false - xy: 204, 1385 + xy: 302, 1333 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 2027, 1361 + xy: 1929, 493 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 1799, 595 + xy: 546, 1889 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 1825, 621 + xy: 564, 1889 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 1851, 647 + xy: 1981, 1044 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 1773, 543 + xy: 1999, 1052 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 862, 1781 + xy: 290, 1209 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-map rotate: false - xy: 2029, 896 + xy: 1945, 493 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 302, 1333 + xy: 1757, 705 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 546, 1889 + xy: 489, 1168 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-missing rotate: false - xy: 290, 1209 + xy: 1377, 1481 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -7717,91 +7703,91 @@ icon-mission-background index: -1 icon-mission-battle rotate: false - xy: 1977, 876 + xy: 1397, 650 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-defense rotate: false - xy: 1377, 1481 + xy: 797, 541 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-done rotate: false - xy: 1397, 650 + xy: 489, 1138 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 797, 541 + xy: 501, 1138 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-paste rotate: false - xy: 564, 1889 + xy: 783, 1101 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 489, 1138 + xy: 1347, 1101 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 489, 1168 + xy: 759, 905 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 771, 5 + xy: 1961, 493 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 783, 1101 + xy: 605, 653 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 501, 1138 + xy: 1984, 803 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 787, 5 + xy: 1876, 477 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-play-custom rotate: false - xy: 803, 5 + xy: 1873, 461 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 1732, 431 + xy: 204, 1373 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -7815,154 +7801,154 @@ icon-power-requirement index: -1 icon-power-small rotate: false - xy: 1347, 1101 + xy: 862, 1769 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 1169, 441 + xy: 1873, 445 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 1263, 875 + xy: 1329, 1095 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 1185, 446 + xy: 1873, 429 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 1201, 446 + xy: 1892, 477 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 779, 535 + xy: 533, 9 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 1217, 446 + xy: 1889, 461 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 1194, 430 + xy: 1889, 445 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 1210, 430 + xy: 1889, 429 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 1194, 414 + xy: 1908, 482 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 1210, 414 + xy: 1716, 439 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 1329, 1095 + xy: 1592, 451 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 533, 9 + xy: 1966, 811 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 1233, 450 + xy: 862, 1757 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-spray rotate: false - xy: 1696, 441 + xy: 489, 1150 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 1799, 577 + xy: 855, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 1191, 398 + xy: 1700, 429 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 1191, 338 + xy: 302, 1321 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 1207, 354 + xy: 302, 1209 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 1191, 382 + xy: 1716, 423 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 1869, 647 + xy: 163, 6 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tree rotate: false - xy: 1773, 525 + xy: 181, 6 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -7976,49 +7962,49 @@ icon-tree-locked index: -1 icon-trello rotate: false - xy: 1207, 398 + xy: 771, 5 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 1191, 366 + xy: 787, 5 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 1696, 423 + xy: 217, 6 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocked rotate: false - xy: 1773, 507 + xy: 253, 6 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 1207, 382 + xy: 803, 5 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 1191, 350 + xy: 1984, 831 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zone rotate: false - xy: 1903, 925 + xy: 1769, 899 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8032,14 +8018,14 @@ icon-zone-locked index: -1 icon-zoom rotate: false - xy: 1905, 647 + xy: 2017, 1052 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 1207, 366 + xy: 1984, 815 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -8084,7 +8070,7 @@ pane-2 index: -1 scroll rotate: false - xy: 1592, 440 + xy: 1903, 628 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -8108,7 +8094,7 @@ scroll-knob-horizontal-black index: -1 scroll-knob-vertical-black rotate: false - xy: 1165, 373 + xy: 1877, 597 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -8116,14 +8102,14 @@ scroll-knob-vertical-black index: -1 sector-select rotate: false - xy: 1581, 589 + xy: 1581, 623 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 selection rotate: false - xy: 1992, 792 + xy: 1769, 492 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -8137,28 +8123,28 @@ slider index: -1 slider-knob rotate: false - xy: 1727, 777 + xy: 1727, 845 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-down rotate: false - xy: 1727, 737 + xy: 1727, 805 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-over rotate: false - xy: 1727, 737 + xy: 1727, 805 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-vertical rotate: false - xy: 1977, 873 + xy: 873, 1 size: 8, 1 orig: 8, 1 offset: 0, 0 @@ -8197,7 +8183,7 @@ underline-red index: -1 white rotate: false - xy: 1203, 1071 + xy: 1903, 493 size: 3, 3 orig: 3, 3 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 6078b33501..b28a479d4a 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png index 4347823d19..de3c61a788 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/assets/sprites/sprites_fallback.atlas b/core/assets/sprites/sprites_fallback.atlas index 21aef85f7c..5dff57c56d 100644 --- a/core/assets/sprites/sprites_fallback.atlas +++ b/core/assets/sprites/sprites_fallback.atlas @@ -5485,175 +5485,175 @@ filter: Nearest,Nearest repeat: none mender rotate: false - xy: 341, 787 + xy: 307, 753 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mender-icon-editor rotate: false - xy: 341, 787 + xy: 307, 753 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mender-top rotate: false - xy: 375, 821 + xy: 341, 787 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shock-mine rotate: false - xy: 647, 957 + xy: 545, 855 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 307, 549 + xy: 205, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-icon-editor rotate: false - xy: 307, 549 + xy: 205, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 341, 583 + xy: 239, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 375, 617 + xy: 273, 515 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 409, 651 + xy: 307, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 443, 685 + xy: 341, 583 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 477, 719 + xy: 375, 617 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 511, 753 + xy: 409, 651 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 545, 787 + xy: 443, 685 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 579, 821 + xy: 477, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 613, 855 + xy: 511, 753 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 647, 889 + xy: 545, 787 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 681, 923 + xy: 579, 821 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 715, 957 + xy: 613, 855 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 749, 991 + xy: 647, 889 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 1, 209 + xy: 681, 923 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 35, 243 + xy: 715, 957 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 69, 277 + xy: 749, 991 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 103, 311 + xy: 1, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 137, 345 + xy: 35, 243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 171, 379 + xy: 69, 277 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5674,210 +5674,217 @@ junction-icon-editor index: -1 overflow-gate rotate: false - xy: 171, 583 + xy: 137, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overflow-gate-icon-editor rotate: false - xy: 171, 583 + xy: 137, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 409, 821 + xy: 375, 787 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-icon-editor rotate: false - xy: 409, 821 + xy: 375, 787 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 443, 855 + xy: 409, 821 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 477, 889 + xy: 443, 855 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 511, 923 + xy: 477, 889 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 545, 889 + xy: 443, 787 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router-icon-editor rotate: false - xy: 545, 889 + xy: 443, 787 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 307, 583 + xy: 205, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter-icon-editor rotate: false - xy: 307, 583 + xy: 205, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spawn rotate: false - xy: 341, 617 + xy: 239, 515 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 273, 753 + xy: 239, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction-icon-editor rotate: false - xy: 273, 753 + xy: 239, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 341, 821 + xy: 307, 787 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 443, 923 + xy: 409, 889 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 477, 957 + xy: 443, 923 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 171, 617 + xy: 137, 583 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 273, 685 + xy: 239, 651 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-icon-editor rotate: false - xy: 273, 685 + xy: 239, 651 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 307, 719 + xy: 273, 685 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 341, 753 + xy: 307, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 375, 787 + xy: 341, 753 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 477, 855 + xy: 375, 753 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 511, 889 + xy: 409, 787 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 545, 923 + xy: 443, 821 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 579, 957 + xy: 477, 855 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 613, 991 + xy: 511, 889 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 1, 345 + xy: 545, 923 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 35, 379 + xy: 579, 957 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +power-infinite + rotate: false + xy: 103, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5910,37 +5917,30 @@ power-void orig: 32, 32 offset: 0, 0 index: -1 -powerinfinite +power-void-icon-editor rotate: false - xy: 341, 719 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -powervoid - rotate: false - xy: 375, 753 + xy: 273, 651 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 613, 957 + xy: 511, 855 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 205, 481 + xy: 103, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-icon-editor rotate: false - xy: 205, 481 + xy: 103, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5987,184 +5987,177 @@ item-void-icon-editor orig: 32, 32 offset: 0, 0 index: -1 -lavasmelter - rotate: false - xy: 205, 685 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 liquid-source rotate: false - xy: 1, 447 + xy: 511, 991 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-source-icon-editor rotate: false - xy: 1, 447 + xy: 511, 991 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 273, 719 + xy: 239, 685 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter-icon-editor rotate: false - xy: 273, 719 + xy: 239, 685 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 69, 413 + xy: 613, 991 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 171, 515 + xy: 69, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 smelter rotate: false - xy: 103, 379 + xy: 1, 277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 273, 549 + xy: 171, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader rotate: false - xy: 375, 583 + xy: 273, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader-icon-editor rotate: false - xy: 375, 583 + xy: 273, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scorch-heat rotate: false - xy: 137, 447 + xy: 35, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 repair-point-base rotate: false - xy: 273, 617 + xy: 171, 515 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 545, 957 + xy: 511, 923 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-icon-editor rotate: false - xy: 545, 957 + xy: 511, 923 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall1 rotate: false - xy: 239, 549 + xy: 137, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall2 rotate: false - xy: 273, 583 + xy: 171, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall3 rotate: false - xy: 307, 617 + xy: 205, 515 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall4 rotate: false - xy: 341, 651 + xy: 239, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall5 rotate: false - xy: 341, 651 + xy: 239, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 647, 923 + xy: 545, 821 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-icon-editor rotate: false - xy: 647, 923 + xy: 545, 821 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 171, 413 + xy: 69, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-icon-editor rotate: false - xy: 171, 413 + xy: 69, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall rotate: false - xy: 205, 413 + xy: 103, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-icon-editor rotate: false - xy: 205, 413 + xy: 103, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6927,21 +6920,21 @@ icerocks-icon-editor index: -1 liquid-router-icon-editor rotate: false - xy: 375, 855 + xy: 341, 821 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-pump-icon-editor rotate: false - xy: 205, 651 + xy: 171, 617 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pebbles-icon-editor rotate: false - xy: 205, 617 + xy: 171, 583 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6953,149 +6946,142 @@ power-source-icon-editor orig: 32, 32 offset: 0, 0 index: -1 -power-void-icon-editor +pulse-conduit-icon-editor rotate: false xy: 307, 685 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -pulse-conduit-icon-editor - rotate: false - xy: 409, 787 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 pulverizer-icon-editor rotate: false - xy: 103, 447 + xy: 1, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 repair-point-icon-editor rotate: false - xy: 307, 651 + xy: 205, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rocks-icon-editor rotate: false - xy: 477, 821 + xy: 375, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 saltrocks-icon-editor rotate: false - xy: 647, 991 + xy: 545, 889 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sandrocks-icon-editor rotate: false - xy: 35, 345 + xy: 613, 957 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scorch-icon-editor rotate: false - xy: 171, 481 + xy: 69, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-icon-editor rotate: false - xy: 443, 753 + xy: 341, 651 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-boulder-icon-editor rotate: false - xy: 579, 889 + xy: 477, 787 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shalerocks-icon-editor rotate: false - xy: 613, 923 + xy: 511, 821 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shock-mine-icon-editor rotate: false - xy: 681, 991 + xy: 579, 889 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shrubs-icon-editor rotate: false - xy: 35, 311 + xy: 647, 957 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrocks-icon-editor rotate: false - xy: 171, 447 + xy: 69, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spawn-icon-editor rotate: false - xy: 375, 651 + xy: 273, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sporerocks-icon-editor rotate: false - xy: 579, 855 + xy: 477, 753 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tendrils-icon-editor rotate: false - xy: 35, 277 + xy: 681, 957 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 casing rotate: false - xy: 197, 1 + xy: 50, 173 size: 8, 16 orig: 8, 16 offset: 0, 0 index: -1 laser rotate: false - xy: 1019, 913 + xy: 795, 777 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 minelaser rotate: false - xy: 1017, 975 + xy: 795, 727 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 scale_marker rotate: false - xy: 53, 17 + xy: 1019, 977 size: 4, 4 orig: 4, 4 offset: 0, 0 @@ -7116,161 +7102,161 @@ scorch2 index: -1 scorch3 rotate: false - xy: 647, 787 + xy: 545, 685 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch4 rotate: false - xy: 677, 787 + xy: 575, 685 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch5 rotate: false - xy: 707, 821 + xy: 605, 719 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 shot rotate: false - xy: 1, 277 + xy: 613, 923 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 transfer rotate: false - xy: 233, 225 + xy: 801, 777 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 273, 481 + xy: 171, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 alloy-smelter-icon-small rotate: false - xy: 681, 897 + xy: 579, 795 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 arc-icon-small rotate: false - xy: 783, 999 + xy: 681, 897 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 battery-icon-small rotate: false - xy: 69, 251 + xy: 715, 931 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 battery-large-icon-small rotate: false - xy: 103, 285 + xy: 749, 965 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blast-drill-icon-small rotate: false - xy: 137, 319 + xy: 783, 999 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blast-mixer-icon-small rotate: false - xy: 171, 353 + xy: 69, 251 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 bridge-conduit-icon-small rotate: false - xy: 205, 387 + xy: 103, 285 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 bridge-conveyor-icon-small rotate: false - xy: 239, 421 + xy: 137, 319 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 char-icon-small rotate: false - xy: 307, 489 + xy: 205, 387 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 cliffs-icon-small rotate: false - xy: 341, 523 + xy: 239, 421 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 coal-centrifuge-icon-small rotate: false - xy: 375, 557 + xy: 273, 455 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 combustion-generator-icon-small rotate: false - xy: 409, 591 + xy: 307, 489 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 conduit-icon-small rotate: false - xy: 443, 625 + xy: 341, 523 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 container-icon-small rotate: false - xy: 477, 659 + xy: 375, 557 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 conveyor-icon-small rotate: false - xy: 511, 693 + xy: 409, 591 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 copper-wall-icon-small rotate: false - xy: 545, 727 + xy: 443, 625 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 copper-wall-large-icon-small rotate: false - xy: 579, 761 + xy: 477, 659 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7284,14 +7270,14 @@ core-foundation-icon-small index: -1 core-nucleus-icon-small rotate: false - xy: 613, 789 + xy: 511, 687 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 core-shard-icon-small rotate: false - xy: 707, 795 + xy: 605, 693 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7305,7 +7291,7 @@ craters-icon-small index: -1 crawler-factory-icon-small rotate: false - xy: 715, 931 + xy: 613, 829 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7375,56 +7361,56 @@ dark-panel-3-icon-small index: -1 dark-panel-4-icon-small rotate: false - xy: 737, 902 + xy: 635, 800 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dark-panel-5-icon-small rotate: false - xy: 737, 876 + xy: 635, 774 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dark-panel-6-icon-small rotate: false - xy: 737, 850 + xy: 635, 748 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 darksand-icon-small rotate: false - xy: 737, 824 + xy: 635, 722 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 darksand-tainted-water-icon-small rotate: false - xy: 763, 902 + xy: 661, 800 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 darksand-water-icon-small rotate: false - xy: 763, 876 + xy: 661, 774 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dart-mech-pad-icon-small rotate: false - xy: 763, 850 + xy: 661, 748 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 deepwater-icon-small rotate: false - xy: 763, 824 + xy: 661, 722 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7438,35 +7424,35 @@ delta-mech-pad-icon-small index: -1 differential-generator-icon-small rotate: false - xy: 95, 251 + xy: 707, 897 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 distributor-icon-small rotate: false - xy: 87, 225 + xy: 741, 931 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 door-icon-small rotate: false - xy: 129, 285 + xy: 733, 905 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 door-large-icon-small rotate: false - xy: 121, 259 + xy: 775, 965 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dunerocks-icon-small rotate: false - xy: 163, 319 + xy: 767, 939 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7487,7 +7473,7 @@ duo-icon-full index: -1 duo-icon-small rotate: false - xy: 155, 293 + xy: 801, 973 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7501,7 +7487,7 @@ force-projector-icon-medium index: -1 force-projector-icon-small rotate: false - xy: 197, 353 + xy: 827, 973 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7515,7 +7501,7 @@ fortress-factory-icon-medium index: -1 fortress-factory-icon-small rotate: false - xy: 189, 327 + xy: 853, 973 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7529,7 +7515,7 @@ fuse-icon-medium index: -1 fuse-icon-small rotate: false - xy: 231, 387 + xy: 879, 973 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7543,7 +7529,7 @@ ghoul-factory-icon-medium index: -1 ghoul-factory-icon-small rotate: false - xy: 223, 361 + xy: 905, 973 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7557,7 +7543,7 @@ glaive-ship-pad-icon-medium index: -1 glaive-ship-pad-icon-small rotate: false - xy: 265, 421 + xy: 931, 973 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7571,14 +7557,14 @@ graphite-press-icon-medium index: -1 graphite-press-icon-small rotate: false - xy: 257, 395 + xy: 957, 973 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 grass-icon-small rotate: false - xy: 299, 455 + xy: 983, 973 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7599,49 +7585,49 @@ hail-icon-full index: -1 hail-icon-small rotate: false - xy: 291, 429 + xy: 95, 251 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 holostone-icon-small rotate: false - xy: 333, 489 + xy: 87, 225 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 hotrock-icon-small rotate: false - xy: 325, 463 + xy: 129, 285 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ice-icon-small rotate: false - xy: 367, 523 + xy: 121, 259 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ice-snow-icon-small rotate: false - xy: 359, 497 + xy: 163, 319 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icerocks-icon-small rotate: false - xy: 401, 557 + xy: 155, 293 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ignarock-icon-small rotate: false - xy: 469, 625 + xy: 223, 361 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7655,252 +7641,252 @@ impact-reactor-icon-medium index: -1 impact-reactor-icon-small rotate: false - xy: 461, 599 + xy: 265, 421 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 incinerator-icon-small rotate: false - xy: 503, 659 + xy: 257, 395 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-blast-compound-medium rotate: false - xy: 487, 591 + xy: 702, 871 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-blast-compound-small rotate: false - xy: 879, 857 + xy: 777, 727 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-coal-medium rotate: false - xy: 461, 573 + xy: 702, 845 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-coal-small rotate: false - xy: 897, 875 + xy: 1001, 955 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-copper-medium rotate: false - xy: 487, 565 + xy: 299, 455 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-copper-small rotate: false - xy: 915, 893 + xy: 369, 445 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-graphite-medium rotate: false - xy: 537, 693 + xy: 291, 429 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-graphite-small rotate: false - xy: 933, 911 + xy: 403, 479 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-lead-medium rotate: false - xy: 529, 667 + xy: 333, 489 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-lead-small rotate: false - xy: 879, 839 + xy: 437, 513 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-metaglass-medium rotate: false - xy: 571, 727 + xy: 325, 463 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-metaglass-small rotate: false - xy: 897, 857 + xy: 471, 547 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-phase-fabric-medium rotate: false - xy: 563, 701 + xy: 367, 523 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-phase-fabric-small rotate: false - xy: 915, 875 + xy: 505, 581 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-plastanium-medium rotate: false - xy: 605, 761 + xy: 359, 497 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-plastanium-small rotate: false - xy: 933, 893 + xy: 523, 589 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-pyratite-medium rotate: false - xy: 597, 735 + xy: 401, 557 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-pyratite-small rotate: false - xy: 951, 911 + xy: 541, 589 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-sand-medium rotate: false - xy: 631, 761 + xy: 393, 531 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-sand-small rotate: false - xy: 897, 839 + xy: 559, 589 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-scrap-medium rotate: false - xy: 623, 735 + xy: 435, 591 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-scrap-small rotate: false - xy: 915, 857 + xy: 577, 589 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-silicon-medium rotate: false - xy: 657, 761 + xy: 427, 565 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-silicon-small rotate: false - xy: 933, 875 + xy: 595, 589 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-source-icon-small rotate: false - xy: 649, 735 + xy: 469, 625 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-medium rotate: false - xy: 683, 761 + xy: 461, 599 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-spore-pod-small rotate: false - xy: 951, 893 + xy: 617, 615 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-surge-alloy-medium rotate: false - xy: 675, 735 + xy: 503, 659 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-surge-alloy-small rotate: false - xy: 969, 911 + xy: 139, 59 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-thorium-medium rotate: false - xy: 709, 769 + xy: 495, 633 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-thorium-small rotate: false - xy: 915, 839 + xy: 157, 59 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-titanium-medium rotate: false - xy: 35, 191 + xy: 529, 659 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 item-titanium-small rotate: false - xy: 933, 857 + xy: 175, 59 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-void-icon-small rotate: false - xy: 61, 191 + xy: 521, 633 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7914,14 +7900,14 @@ javelin-ship-pad-icon-medium index: -1 javelin-ship-pad-icon-small rotate: false - xy: 87, 199 + xy: 555, 659 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 junction-icon-small rotate: false - xy: 783, 973 + xy: 547, 633 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7935,7 +7921,7 @@ kiln-icon-medium index: -1 kiln-icon-small rotate: false - xy: 809, 973 + xy: 581, 659 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7949,7 +7935,7 @@ lancer-icon-medium index: -1 lancer-icon-small rotate: false - xy: 835, 973 + xy: 573, 633 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7963,7 +7949,7 @@ laser-drill-icon-medium index: -1 laser-drill-icon-small rotate: false - xy: 861, 973 + xy: 607, 667 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7977,7 +7963,7 @@ launch-pad-icon-medium index: -1 launch-pad-icon-small rotate: false - xy: 887, 973 + xy: 35, 191 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -7991,483 +7977,483 @@ launch-pad-large-icon-medium index: -1 launch-pad-large-icon-small rotate: false - xy: 913, 973 + xy: 61, 191 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-junction-icon-small rotate: false - xy: 939, 973 + xy: 87, 199 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-router-icon-full rotate: false - xy: 409, 889 + xy: 375, 855 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-icon-small rotate: false - xy: 965, 973 + xy: 733, 879 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-source-icon-small rotate: false - xy: 991, 973 + xy: 728, 853 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-tank-icon-medium rotate: false - xy: 35, 481 + xy: 1, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-tank-icon-small rotate: false - xy: 778, 947 + xy: 759, 905 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 magmarock-icon-small rotate: false - xy: 804, 947 + xy: 759, 879 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mass-driver-icon-medium rotate: false - xy: 103, 549 + xy: 69, 515 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mass-driver-icon-small rotate: false - xy: 830, 947 + xy: 754, 853 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mechanical-drill-icon-medium rotate: false - xy: 137, 583 + xy: 103, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-drill-icon-small rotate: false - xy: 856, 947 + xy: 793, 939 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mechanical-pump-icon-small rotate: false - xy: 882, 947 + xy: 785, 913 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 meltdown-icon-medium rotate: false - xy: 239, 685 + xy: 205, 651 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 meltdown-icon-small rotate: false - xy: 908, 947 + xy: 785, 887 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 melter-icon-small rotate: false - xy: 934, 947 + xy: 819, 947 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mend-projector-icon-medium rotate: false - xy: 307, 753 + xy: 273, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mend-projector-icon-small rotate: false - xy: 960, 947 + xy: 845, 947 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mender-icon-small rotate: false - xy: 986, 947 + xy: 871, 947 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 metal-floor-2-icon-small rotate: false - xy: 113, 225 + xy: 897, 947 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 metal-floor-3-icon-small rotate: false - xy: 113, 199 + xy: 923, 947 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 metal-floor-5-icon-small rotate: false - xy: 147, 259 + xy: 949, 947 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 metal-floor-damaged-icon-small rotate: false - xy: 139, 233 + xy: 975, 947 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 metal-floor-icon-small rotate: false - xy: 139, 207 + xy: 113, 225 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 moss-icon-small rotate: false - xy: 181, 293 + xy: 113, 199 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 multi-press-icon-medium rotate: false - xy: 409, 855 + xy: 375, 821 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 multi-press-icon-small rotate: false - xy: 173, 267 + xy: 147, 259 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oil-extractor-icon-medium rotate: false - xy: 443, 889 + xy: 409, 855 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 oil-extractor-icon-small rotate: false - xy: 215, 327 + xy: 139, 233 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 omega-mech-pad-icon-medium rotate: false - xy: 477, 923 + xy: 443, 889 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 omega-mech-pad-icon-small rotate: false - xy: 207, 301 + xy: 139, 207 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-coal-icon-full rotate: false - xy: 511, 957 + xy: 477, 923 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-icon-medium rotate: false - xy: 511, 957 + xy: 477, 923 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-icon-small rotate: false - xy: 249, 361 + xy: 181, 293 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-copper-icon-full rotate: false - xy: 545, 991 + xy: 511, 957 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-icon-medium rotate: false - xy: 545, 991 + xy: 511, 957 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-icon-small rotate: false - xy: 241, 335 + xy: 173, 267 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-lead-icon-full rotate: false - xy: 1, 413 + xy: 545, 991 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-icon-medium rotate: false - xy: 1, 413 + xy: 545, 991 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-icon-small rotate: false - xy: 283, 395 + xy: 215, 327 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-scrap-icon-full rotate: false - xy: 35, 447 + xy: 1, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-icon-medium rotate: false - xy: 35, 447 + xy: 1, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap-icon-small rotate: false - xy: 275, 369 + xy: 207, 301 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-thorium-icon-full rotate: false - xy: 69, 481 + xy: 35, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-icon-medium rotate: false - xy: 69, 481 + xy: 35, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-icon-small rotate: false - xy: 317, 429 + xy: 249, 361 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ore-titanium-icon-full rotate: false - xy: 103, 515 + xy: 69, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-icon-medium rotate: false - xy: 103, 515 + xy: 69, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-icon-small rotate: false - xy: 309, 403 + xy: 241, 335 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 overdrive-projector-icon-medium rotate: false - xy: 137, 549 + xy: 103, 515 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overdrive-projector-icon-small rotate: false - xy: 351, 463 + xy: 283, 395 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 overflow-gate-icon-small rotate: false - xy: 343, 437 + xy: 275, 369 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pebbles-icon-small rotate: false - xy: 385, 497 + xy: 317, 429 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phantom-factory-icon-medium rotate: false - xy: 239, 651 + xy: 205, 617 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phantom-factory-icon-small rotate: false - xy: 377, 471 + xy: 309, 403 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-conduit-icon-small rotate: false - xy: 419, 531 + xy: 351, 463 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-conveyor-icon-small rotate: false - xy: 411, 505 + xy: 343, 437 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-wall-icon-small rotate: false - xy: 521, 633 + xy: 385, 497 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-wall-large-icon-medium rotate: false - xy: 579, 991 + xy: 545, 957 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall-large-icon-small rotate: false - xy: 521, 607 + xy: 377, 471 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-weaver-icon-medium rotate: false - xy: 1, 379 + xy: 579, 991 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-weaver-icon-small rotate: false - xy: 513, 581 + xy: 419, 531 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pine-icon-medium rotate: false - xy: 35, 413 + xy: 1, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pine-icon-small rotate: false - xy: 513, 555 + xy: 411, 505 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 plastanium-compressor-icon-medium rotate: false - xy: 69, 447 + xy: 35, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plastanium-compressor-icon-small rotate: false - xy: 555, 667 + xy: 453, 565 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pneumatic-drill-icon-medium rotate: false - xy: 103, 481 + xy: 69, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pneumatic-drill-icon-small rotate: false - xy: 547, 641 + xy: 445, 539 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 power-node-icon-small rotate: false - xy: 547, 615 + xy: 487, 599 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -8481,847 +8467,847 @@ power-node-large-icon-medium index: -1 power-node-large-icon-small rotate: false - xy: 589, 701 + xy: 479, 573 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 power-source-icon-small rotate: false - xy: 581, 675 + xy: 513, 607 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 power-void-icon-small rotate: false - xy: 615, 709 + xy: 539, 607 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pulse-conduit-icon-full rotate: false - xy: 443, 821 + xy: 341, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-icon-small rotate: false - xy: 641, 709 + xy: 565, 607 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pulverizer-icon-full rotate: false - xy: 137, 481 + xy: 35, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-icon-small rotate: false - xy: 667, 709 + xy: 599, 633 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pyratite-mixer-icon-medium rotate: false - xy: 205, 549 + xy: 103, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pyratite-mixer-icon-small rotate: false - xy: 701, 735 + xy: 591, 607 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 repair-point rotate: false - xy: 239, 583 + xy: 137, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 repair-point-icon-full rotate: false - xy: 341, 685 + xy: 239, 583 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 repair-point-icon-small rotate: false - xy: 693, 709 + xy: 87, 173 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 revenant-factory-icon-medium rotate: false - xy: 375, 719 + xy: 273, 617 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 revenant-factory-icon-small rotate: false - xy: 87, 173 + xy: 113, 173 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ripple-icon-medium rotate: false - xy: 409, 753 + xy: 307, 651 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ripple-icon-small rotate: false - xy: 113, 173 + xy: 139, 181 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rock-icon-medium rotate: false - xy: 443, 787 + xy: 341, 685 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rock-icon-small rotate: false - xy: 139, 181 + xy: 61, 165 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rocks-icon-small rotate: false - xy: 61, 165 + xy: 61, 139 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rotary-pump-icon-medium rotate: false - xy: 511, 855 + xy: 409, 753 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rotary-pump-icon-small rotate: false - xy: 61, 139 + xy: 87, 147 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 router-icon-small rotate: false - xy: 87, 147 + xy: 61, 113 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rtg-generator-icon-medium rotate: false - xy: 579, 923 + xy: 477, 821 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator-icon-small rotate: false - xy: 61, 113 + xy: 87, 121 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 salt-icon-small rotate: false - xy: 87, 121 + xy: 113, 147 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 saltrocks-icon-small rotate: false - xy: 113, 147 + xy: 139, 155 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 salvo-icon-medium rotate: false - xy: 1, 311 + xy: 579, 923 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 salvo-icon-small rotate: false - xy: 139, 155 + xy: 61, 87 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 sand-icon-small rotate: false - xy: 61, 87 + xy: 87, 95 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 sand-water-icon-small rotate: false - xy: 87, 95 + xy: 113, 121 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 sandrocks-icon-small rotate: false - xy: 113, 121 + xy: 139, 129 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scatter-icon-medium rotate: false - xy: 69, 379 + xy: 647, 991 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scatter-icon-small rotate: false - xy: 139, 129 + xy: 113, 95 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scorch rotate: false - xy: 103, 413 + xy: 1, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scorch-icon-full rotate: false - xy: 205, 515 + xy: 103, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scorch-icon-small rotate: false - xy: 113, 95 + xy: 139, 103 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-medium rotate: false - xy: 375, 685 + xy: 273, 583 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-gigantic-icon-small rotate: false - xy: 139, 103 + xy: 61, 61 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scrap-wall-huge-icon-medium rotate: false - xy: 409, 719 + xy: 307, 617 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-huge-icon-small rotate: false - xy: 61, 61 + xy: 87, 69 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scrap-wall-icon-small rotate: false - xy: 87, 69 + xy: 113, 69 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 scrap-wall-large-icon-medium rotate: false - xy: 477, 787 + xy: 375, 685 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap-wall-large-icon-small rotate: false - xy: 113, 69 + xy: 139, 77 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 separator-icon-medium rotate: false - xy: 545, 855 + xy: 443, 753 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 separator-icon-small rotate: false - xy: 165, 233 + xy: 837, 921 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shale-boulder-icon-small rotate: false - xy: 165, 207 + xy: 863, 921 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shale-icon-small rotate: false - xy: 165, 181 + xy: 889, 921 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shalerocks-icon-small rotate: false - xy: 165, 155 + xy: 915, 921 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shock-mine-icon-small rotate: false - xy: 165, 129 + xy: 941, 921 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shrubs-icon-small rotate: false - xy: 165, 103 + xy: 967, 921 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 silicon-smelter-icon-medium rotate: false - xy: 69, 345 + xy: 681, 991 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 silicon-smelter-icon-small rotate: false - xy: 165, 77 + xy: 837, 895 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 snow-icon-small rotate: false - xy: 165, 51 + xy: 863, 895 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 snowrock-icon-medium rotate: false - xy: 137, 413 + xy: 35, 311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrock-icon-small rotate: false - xy: 199, 267 + xy: 889, 895 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 snowrocks-icon-small rotate: false - xy: 191, 241 + xy: 915, 895 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 solar-panel-icon-small rotate: false - xy: 191, 215 + xy: 941, 895 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 solar-panel-large-icon-medium rotate: false - xy: 239, 515 + xy: 137, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel-large-icon-small rotate: false - xy: 191, 189 + xy: 967, 895 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 sorter-icon-small rotate: false - xy: 191, 163 + xy: 811, 876 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spawn-icon-small rotate: false - xy: 191, 137 + xy: 785, 861 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spectre-icon-medium rotate: false - xy: 409, 685 + xy: 307, 583 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spectre-icon-small rotate: false - xy: 191, 111 + xy: 837, 869 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spirit-factory-icon-medium rotate: false - xy: 443, 719 + xy: 341, 617 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spirit-factory-icon-small rotate: false - xy: 191, 85 + xy: 863, 869 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spore-cluster-icon-medium rotate: false - xy: 477, 753 + xy: 375, 651 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-cluster-icon-small rotate: false - xy: 191, 59 + xy: 889, 869 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spore-moss-icon-small rotate: false - xy: 233, 301 + xy: 915, 869 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spore-pine-icon-medium rotate: false - xy: 511, 787 + xy: 409, 685 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-pine-icon-small rotate: false - xy: 225, 275 + xy: 941, 869 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spore-press-icon-medium rotate: false - xy: 545, 821 + xy: 443, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-press-icon-small rotate: false - xy: 267, 335 + xy: 967, 869 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 sporerocks-icon-small rotate: false - xy: 259, 309 + xy: 811, 850 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 stone-icon-small rotate: false - xy: 301, 369 + xy: 837, 843 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 surge-tower-icon-medium rotate: false - xy: 613, 889 + xy: 511, 787 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-tower-icon-small rotate: false - xy: 293, 343 + xy: 863, 843 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 surge-wall-icon-small rotate: false - xy: 335, 403 + xy: 889, 843 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 surge-wall-large-icon-medium rotate: false - xy: 681, 957 + xy: 579, 855 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall-large-icon-small rotate: false - xy: 327, 377 + xy: 915, 843 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 swarmer-icon-medium rotate: false - xy: 715, 991 + xy: 613, 889 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 swarmer-icon-small rotate: false - xy: 369, 437 + xy: 941, 843 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 tainted-water-icon-small rotate: false - xy: 361, 411 + xy: 967, 843 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 tar-icon-small rotate: false - xy: 403, 471 + xy: 165, 233 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 tau-mech-pad-icon-medium rotate: false - xy: 1, 243 + xy: 647, 923 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tau-mech-pad-icon-small rotate: false - xy: 395, 445 + xy: 165, 207 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 tendrils-icon-small rotate: false - xy: 437, 505 + xy: 165, 181 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thermal-generator-icon-medium rotate: false - xy: 69, 311 + xy: 715, 991 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-generator-icon-small rotate: false - xy: 429, 479 + xy: 165, 155 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thermal-pump-icon-medium rotate: false - xy: 103, 345 + xy: 1, 243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thermal-pump-icon-small rotate: false - xy: 539, 581 + xy: 165, 129 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-reactor-icon-medium rotate: false - xy: 137, 379 + xy: 35, 277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-reactor-icon-small rotate: false - xy: 539, 555 + xy: 165, 103 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-wall-icon-small rotate: false - xy: 573, 641 + xy: 165, 77 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-wall-large-icon-medium rotate: false - xy: 205, 447 + xy: 103, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall-large-icon-small rotate: false - xy: 573, 615 + xy: 199, 267 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thruster-icon-medium rotate: false - xy: 239, 481 + xy: 137, 379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thruster-icon-small rotate: false - xy: 565, 589 + xy: 191, 241 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titan-factory-icon-medium rotate: false - xy: 273, 515 + xy: 171, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titan-factory-icon-small rotate: false - xy: 565, 563 + xy: 191, 215 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titanium-conveyor-icon-small rotate: false - xy: 607, 675 + xy: 191, 189 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titanium-wall-icon-small rotate: false - xy: 599, 649 + xy: 191, 163 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 titanium-wall-large-icon-medium rotate: false - xy: 239, 447 + xy: 137, 345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-wall-large-icon-small rotate: false - xy: 599, 623 + xy: 191, 137 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 trident-ship-pad-icon-medium rotate: false - xy: 307, 515 + xy: 205, 413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 trident-ship-pad-icon-small rotate: false - xy: 633, 683 + xy: 191, 111 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 turbine-generator-icon-medium rotate: false - xy: 341, 549 + xy: 239, 447 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 turbine-generator-icon-small rotate: false - xy: 659, 683 + xy: 191, 85 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unloader-icon-small rotate: false - xy: 685, 683 + xy: 233, 301 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 vault-icon-medium rotate: false - xy: 409, 617 + xy: 307, 515 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 vault-icon-small rotate: false - xy: 719, 709 + xy: 225, 275 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 water-extractor-icon-medium rotate: false - xy: 443, 651 + xy: 341, 549 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-extractor-icon-small rotate: false - xy: 711, 683 + xy: 267, 335 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 water-icon-small rotate: false - xy: 87, 43 + xy: 259, 309 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 wave-icon-medium rotate: false - xy: 477, 685 + xy: 375, 583 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wave-icon-small rotate: false - xy: 113, 43 + xy: 301, 369 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 white-tree-dead-icon-medium rotate: false - xy: 511, 719 + xy: 409, 617 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white-tree-dead-icon-small rotate: false - xy: 139, 35 + xy: 293, 343 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 white-tree-icon-medium rotate: false - xy: 545, 753 + xy: 443, 651 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 white-tree-icon-small rotate: false - xy: 85, 17 + xy: 335, 403 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 wraith-factory-icon-medium rotate: false - xy: 579, 787 + xy: 477, 685 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 wraith-factory-icon-small rotate: false - xy: 111, 17 + xy: 327, 377 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -9447,35 +9433,35 @@ item-titanium index: -1 liquid-cryofluid rotate: false - xy: 239, 719 + xy: 205, 685 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 307, 787 + xy: 273, 753 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 511, 991 + xy: 477, 957 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 69, 515 + xy: 35, 481 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blank rotate: false - xy: 644, 852 + xy: 542, 750 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -9512,7 +9498,7 @@ bar-top index: -1 button-select rotate: false - xy: 273, 455 + xy: 171, 353 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -9520,14 +9506,14 @@ button-select index: -1 clear rotate: false - xy: 217, 63 + xy: 437, 501 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 editor-clear rotate: false - xy: 217, 63 + xy: 437, 501 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -9548,623 +9534,623 @@ empty-sector index: -1 icon-crafting rotate: false - xy: 904, 929 + xy: 687, 755 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 922, 929 + xy: 687, 737 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 940, 929 + xy: 687, 719 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-effect rotate: false - xy: 958, 929 + xy: 714, 827 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 789, 857 + xy: 768, 835 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-power rotate: false - xy: 807, 839 + xy: 741, 799 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-production rotate: false - xy: 825, 857 + xy: 759, 817 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-turret rotate: false - xy: 843, 839 + xy: 759, 727 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 879, 875 + xy: 777, 799 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-upgrade rotate: false - xy: 915, 911 + xy: 777, 763 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 controller-cursor rotate: false - xy: 778, 929 + xy: 53, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-about rotate: false - xy: 165, 35 + xy: 1009, 983 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-add rotate: false - xy: 951, 877 + xy: 993, 931 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin rotate: false - xy: 969, 895 + xy: 1009, 939 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin-small rotate: false - xy: 487, 617 + xy: 1001, 947 size: 6, 6 orig: 6, 6 offset: 0, 0 index: -1 icon-areaDelete rotate: false - xy: 251, 289 + xy: 471, 535 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow rotate: false - xy: 796, 929 + xy: 71, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-16 rotate: false - xy: 796, 929 + xy: 71, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 251, 277 + xy: 505, 569 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 285, 323 + xy: 523, 577 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 285, 311 + xy: 535, 577 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 319, 357 + xy: 547, 577 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 814, 929 + xy: 32, 173 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 987, 913 + xy: 1009, 923 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-break rotate: false - xy: 832, 929 + xy: 696, 827 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 850, 929 + xy: 687, 809 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel-2 rotate: false - xy: 393, 531 + xy: 197, 353 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 319, 345 + xy: 559, 577 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 868, 929 + xy: 687, 791 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-check-2 rotate: false - xy: 435, 591 + xy: 189, 327 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icon-copy rotate: false - xy: 886, 929 + xy: 687, 773 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 353, 391 + xy: 571, 577 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-database rotate: false - xy: 933, 841 + xy: 993, 915 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-database-small rotate: false - xy: 353, 379 + xy: 583, 577 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 951, 861 + xy: 1009, 907 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 789, 823 + xy: 993, 899 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 805, 823 + xy: 1009, 891 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 821, 823 + xy: 993, 883 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 837, 823 + xy: 1009, 875 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 853, 823 + xy: 993, 867 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-elevation rotate: false - xy: 976, 929 + xy: 705, 809 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 994, 929 + xy: 705, 791 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 869, 823 + xy: 1009, 859 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 789, 911 + xy: 705, 773 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 789, 893 + xy: 705, 755 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 885, 823 + xy: 993, 851 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 807, 911 + xy: 705, 737 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 901, 823 + xy: 1009, 843 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 789, 875 + xy: 705, 719 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 917, 823 + xy: 993, 835 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 933, 825 + xy: 1009, 827 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-github rotate: false - xy: 53, 1 + xy: 217, 251 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 69, 1 + xy: 217, 235 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 807, 893 + xy: 732, 835 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 387, 425 + xy: 595, 577 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 387, 413 + xy: 617, 603 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 85, 1 + xy: 217, 219 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 101, 1 + xy: 217, 203 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 117, 1 + xy: 217, 187 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 133, 1 + xy: 217, 171 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-item rotate: false - xy: 421, 459 + xy: 87, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 1012, 963 + xy: 1009, 973 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-line rotate: false - xy: 825, 911 + xy: 750, 835 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 137, 19 + xy: 217, 155 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid-small rotate: false - xy: 421, 447 + xy: 99, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 153, 19 + xy: 217, 139 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 807, 875 + xy: 786, 843 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 825, 893 + xy: 723, 809 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 843, 911 + xy: 723, 791 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 789, 839 + xy: 723, 773 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 455, 493 + xy: 111, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-map rotate: false - xy: 149, 3 + xy: 217, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 455, 481 + xy: 123, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 807, 857 + xy: 723, 755 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-missing rotate: false - xy: 591, 603 + xy: 85, 45 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-background rotate: false - xy: 32, 171 + xy: 676, 827 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 icon-mission-battle rotate: false - xy: 591, 591 + xy: 97, 45 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-defense rotate: false - xy: 591, 579 + xy: 85, 33 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-done rotate: false - xy: 591, 567 + xy: 109, 45 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 565, 551 + xy: 97, 33 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-paste rotate: false - xy: 825, 875 + xy: 723, 737 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 577, 551 + xy: 85, 21 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 843, 893 + xy: 723, 719 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 169, 19 + xy: 217, 107 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 861, 911 + xy: 741, 817 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 625, 663 + xy: 121, 45 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 165, 3 + xy: 217, 91 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-play-custom rotate: false - xy: 181, 35 + xy: 251, 285 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 625, 651 + xy: 109, 33 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -10178,154 +10164,154 @@ icon-power-requirement index: -1 icon-power-small rotate: false - xy: 625, 639 + xy: 97, 21 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 185, 19 + xy: 251, 269 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 843, 875 + xy: 741, 781 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 181, 3 + xy: 285, 319 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 1003, 913 + xy: 285, 303 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 861, 893 + xy: 759, 799 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 217, 251 + xy: 319, 353 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 217, 235 + xy: 319, 337 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 217, 219 + xy: 353, 387 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 217, 203 + xy: 353, 371 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 217, 187 + xy: 741, 711 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 879, 911 + xy: 741, 763 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 825, 839 + xy: 759, 781 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 625, 627 + xy: 121, 33 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-spray rotate: false - xy: 843, 857 + xy: 741, 745 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 861, 875 + xy: 759, 763 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 217, 171 + xy: 757, 711 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 737, 697 + xy: 109, 21 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 737, 685 + xy: 121, 21 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 217, 155 + xy: 773, 711 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 879, 893 + xy: 741, 727 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tree rotate: false - xy: 897, 911 + xy: 759, 745 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -10339,70 +10325,70 @@ icon-tree-locked index: -1 icon-trello rotate: false - xy: 217, 139 + xy: 369, 429 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 217, 123 + xy: 387, 455 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 861, 857 + xy: 777, 817 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocked rotate: false - xy: 897, 893 + xy: 777, 781 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 217, 107 + xy: 403, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 217, 91 + xy: 387, 439 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zone rotate: false - xy: 427, 565 + xy: 231, 387 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 861, 839 + xy: 777, 745 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 217, 75 + xy: 403, 447 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 inventory rotate: false - xy: 495, 617 + xy: 676, 847 size: 24, 40 split: 10, 10, 10, 14 orig: 24, 40 @@ -10410,7 +10396,7 @@ inventory index: -1 scroll rotate: false - xy: 59, 24 + xy: 811, 902 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -10418,7 +10404,7 @@ scroll index: -1 scroll-knob-vertical-black rotate: false - xy: 139, 61 + xy: 59, 19 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -10426,14 +10412,14 @@ scroll-knob-vertical-black index: -1 sector-select rotate: false - xy: 511, 821 + xy: 409, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 selection rotate: false - xy: 644, 849 + xy: 542, 747 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -10447,7 +10433,7 @@ slider index: -1 slider-knob rotate: false - xy: 613, 815 + xy: 511, 713 size: 29, 38 orig: 29, 38 offset: 0, 0 @@ -10468,21 +10454,21 @@ slider-knob-over index: -1 slider-vertical rotate: false - xy: 681, 894 + xy: 513, 604 size: 8, 1 orig: 8, 1 offset: 0, 0 index: -1 white rotate: false - xy: 778, 986 + xy: 728, 892 size: 3, 3 orig: 3, 3 offset: 0, 0 index: -1 window-empty rotate: false - xy: 749, 928 + xy: 647, 826 size: 27, 61 split: 8, 8, 44, 11 orig: 27, 61 diff --git a/core/assets/sprites/sprites_fallback4.png b/core/assets/sprites/sprites_fallback4.png index 0959687378..f6c0614b08 100644 Binary files a/core/assets/sprites/sprites_fallback4.png and b/core/assets/sprites/sprites_fallback4.png differ diff --git a/core/assets/sprites/sprites_fallback5.png b/core/assets/sprites/sprites_fallback5.png index 7c4f5b063d..bb87c59efa 100644 Binary files a/core/assets/sprites/sprites_fallback5.png and b/core/assets/sprites/sprites_fallback5.png differ diff --git a/core/src/io/anuke/mindustry/ai/WaveSpawner.java b/core/src/io/anuke/mindustry/ai/WaveSpawner.java index a3bf0b59b1..de00bafe45 100644 --- a/core/src/io/anuke/mindustry/ai/WaveSpawner.java +++ b/core/src/io/anuke/mindustry/ai/WaveSpawner.java @@ -62,7 +62,7 @@ public class WaveSpawner{ spawning = true; for(SpawnGroup group : state.rules.spawns){ - int spawned = group.getUnitsSpawned(state.wave); + int spawned = group.getUnitsSpawned(state.wave - 1); float spawnX, spawnY; float spread; diff --git a/core/src/io/anuke/mindustry/content/Zones.java b/core/src/io/anuke/mindustry/content/Zones.java index fd06f26da3..a85fcd2e07 100644 --- a/core/src/io/anuke/mindustry/content/Zones.java +++ b/core/src/io/anuke/mindustry/content/Zones.java @@ -205,16 +205,16 @@ public class Zones implements ContentList{ desolateRift = new Zone("desolateRift", new MapGenerator("desolateRift").dist(2f)){{ loadout = Loadouts.basicNucleus; baseLaunchCost = ItemStack.with(); - startingItems = ItemStack.list(Items.copper, 1500); - conditionWave = 2; - launchPeriod = 1; + startingItems = ItemStack.list(Items.copper, 2000, Items.lead, 2000, Items.graphite, 500, Items.titanium, 500, Items.silicon, 500); + conditionWave = 3; + launchPeriod = 2; zoneRequirements = ZoneRequirement.with(tarFields, 20); blockRequirements = new Block[]{Blocks.thermalGenerator}; resources = new Item[]{Items.copper, Items.scrap, Items.lead, Items.coal, Items.titanium, Items.sand, Items.thorium}; rules = () -> new Rules(){{ waves = true; waveTimer = true; - waveSpacing = 60 * 60 * 3.5f; + waveSpacing = 60 * 60 * 2.5f; }}; }}; diff --git a/core/src/io/anuke/mindustry/game/GlobalData.java b/core/src/io/anuke/mindustry/game/GlobalData.java index f472325bee..7bb6ae7b20 100644 --- a/core/src/io/anuke/mindustry/game/GlobalData.java +++ b/core/src/io/anuke/mindustry/game/GlobalData.java @@ -72,7 +72,7 @@ public class GlobalData{ /** Returns whether or not this piece of content is unlocked yet. */ public boolean isUnlocked(UnlockableContent content){ - return content.alwaysUnlocked() || unlocked.getOr(content.getContentType(), ObjectSet::new).contains(content.name); + return true;//content.alwaysUnlocked() || unlocked.getOr(content.getContentType(), ObjectSet::new).contains(content.name); } /** diff --git a/core/src/io/anuke/mindustry/input/DesktopInput.java b/core/src/io/anuke/mindustry/input/DesktopInput.java index 51ad097eb5..665eec4d3c 100644 --- a/core/src/io/anuke/mindustry/input/DesktopInput.java +++ b/core/src/io/anuke/mindustry/input/DesktopInput.java @@ -130,7 +130,7 @@ public class DesktopInput extends InputHandler{ player.isShooting = false; } - if(!state.is(State.menu) && Core.input.keyTap(Binding.minimap)){ + if(!state.is(State.menu) && Core.input.keyTap(Binding.minimap) && !ui.chatfrag.chatOpen()){ if(!ui.minimap.isShown()){ ui.minimap.show(); }else{ @@ -145,8 +145,6 @@ public class DesktopInput extends InputHandler{ renderer.scaleCamera(Core.input.axisTap(Binding.zoom)); } - //renderer.minimap.zoomBy(-Core.input.axisTap(Binding.zoom_minimap)); - if(player.isDead()){ cursorType = SystemCursor.arrow; return; diff --git a/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java b/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java index 93bd2e6bdb..d6b0ec8375 100644 --- a/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java +++ b/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java @@ -108,10 +108,10 @@ public class MapGenerator extends Generator{ int newX = Mathf.clamp((int)(simplex.octaveNoise2D(1, 1, 1.0 / scl, x, y) * distortion + x), 0, width - 1); int newY = Mathf.clamp((int)(simplex.octaveNoise2D(1, 1, 1.0 / scl, x + 9999, y + 9999) * distortion + y), 0, height - 1); - if((tile.block() instanceof StaticWall + if(((tile.block() instanceof StaticWall && tiles[newX][newY].block() instanceof StaticWall) || (tile.block() == Blocks.air && !tiles[newX][newY].block().synthetic()) - || (tiles[newX][newY].block() == Blocks.air && tile.block() instanceof StaticWall)){ + || (tiles[newX][newY].block() == Blocks.air && tile.block() instanceof StaticWall)) && tiles[newX][newY].block() != Blocks.spawn){ tile.setBlock(tiles[newX][newY].block()); } diff --git a/core/src/io/anuke/mindustry/type/Zone.java b/core/src/io/anuke/mindustry/type/Zone.java index c8d66819bf..74ec3d9183 100644 --- a/core/src/io/anuke/mindustry/type/Zone.java +++ b/core/src/io/anuke/mindustry/type/Zone.java @@ -36,6 +36,8 @@ public class Zone extends UnlockableContent{ protected Array startingItems = new Array<>(); protected ItemStack[] launchCost = null; + private Array defaultStartingItems = new Array<>(); + public Zone(String name, Generator generator){ super(name); this.generator = generator; @@ -60,6 +62,11 @@ public class Zone extends UnlockableContent{ return startingItems; } + public void resetStartingItems(){ + startingItems.clear(); + defaultStartingItems.each(stack -> startingItems.add(new ItemStack(stack.item, stack.amount))); + } + public void updateWave(int wave){ int value = Core.settings.getInt(name + "-wave", 0); if(value < wave){ @@ -127,6 +134,10 @@ public class Zone extends UnlockableContent{ generator.init(loadout); Arrays.sort(resources); + for(ItemStack stack : startingItems){ + defaultStartingItems.add(new ItemStack(stack.item, stack.amount)); + } + @SuppressWarnings("unchecked") Array arr = Core.settings.getObject(name + "-starting-items", Array.class, () -> null); if(arr != null){ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java index 602e7c31fd..e4565db51b 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java @@ -1,5 +1,6 @@ package io.anuke.mindustry.ui.dialogs; +import io.anuke.arc.Core; import io.anuke.arc.collection.Array; import io.anuke.arc.scene.event.HandCursorListener; import io.anuke.arc.scene.ui.*; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ZoneInfoDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/ZoneInfoDialog.java index fc716b74a7..e36824afc1 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/ZoneInfoDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/ZoneInfoDialog.java @@ -3,7 +3,6 @@ package io.anuke.mindustry.ui.dialogs; import io.anuke.arc.Core; import io.anuke.arc.graphics.Color; import io.anuke.arc.scene.ui.Button; -import io.anuke.arc.scene.ui.TextButton; import io.anuke.arc.scene.ui.layout.Table; import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.type.*; @@ -14,6 +13,7 @@ import io.anuke.mindustry.world.Block.Icon; import static io.anuke.mindustry.Vars.*; public class ZoneInfoDialog extends FloatingDialog{ + private ZoneLoadoutDialog loadout = new ZoneLoadoutDialog(); public ZoneInfoDialog(){ super(""); @@ -103,6 +103,8 @@ public class ZoneInfoDialog extends FloatingDialog{ cont.row(); cont.addImage("white").color(Pal.accent).height(3).pad(6).growX(); cont.row(); + cont.addButton(zone.canConfigure() ? "$configure" : Core.bundle.format("configure.locked", zone.configureWave), () -> loadout.show(zone, rebuildItems)).fillX().pad(3).disabled(b -> !zone.canConfigure()); + cont.row(); cont.table(res -> { res.add("$zone.resources").padRight(6); if(zone.resources.length > 0){ @@ -118,75 +120,8 @@ public class ZoneInfoDialog extends FloatingDialog{ cont.row(); cont.add(Core.bundle.format("bestwave", zone.bestWave())); } - - Table load = new Table(); - //thanks java, absolutely brilliant syntax here - Runnable[] rebuildLoadout = {null}; - rebuildLoadout[0] = () -> { - load.clear(); - float bsize = 40f; - int step = 50; - - load.left(); - for(ItemStack stack : zone.getStartingItems()){ - load.addButton("x", () -> { - zone.getStartingItems().remove(stack); - zone.updateLaunchCost(); - rebuildItems.run(); - rebuildLoadout[0].run(); - }).size(bsize).pad(2); - - load.addButton("-", () -> { - stack.amount = Math.max(stack.amount - step, 0); - zone.updateLaunchCost(); - rebuildItems.run(); - }).size(bsize).pad(2); - load.addButton("+", () -> { - stack.amount = Math.min(stack.amount + step, zone.loadout.core().itemCapacity); - zone.updateLaunchCost(); - rebuildItems.run(); - }).size(bsize).pad(2); - - load.addImage(stack.item.icon(Item.Icon.medium)).size(8 * 3).padRight(4); - load.label(() -> stack.amount + "").left(); - - load.row(); - } - - load.addButton("$add", () -> { - FloatingDialog dialog = new FloatingDialog(""); - dialog.setFillParent(false); - for(Item item : content.items().select(item -> data.getItem(item) > 0 && item.type == ItemType.material && zone.getStartingItems().find(stack -> stack.item == item) == null)){ - TextButton button = dialog.cont.addButton("", () -> { - zone.getStartingItems().add(new ItemStack(item, 0)); - zone.updateLaunchCost(); - rebuildLoadout[0].run(); - dialog.hide(); - }).size(300f, 35f).pad(1).get(); - button.clearChildren(); - button.left(); - button.addImage(item.icon(Item.Icon.medium)).size(8 * 3).pad(4); - button.add(item.localizedName); - dialog.cont.row(); - } - dialog.show(); - }).colspan(4).size(100f, bsize).left().disabled(b -> !content.items().contains(item -> data.getItem(item) > 0 && item.type == ItemType.material && !zone.getStartingItems().contains(stack -> stack.item == item))); - }; - - rebuildLoadout[0].run(); - - cont.row(); - cont.table(zone.canConfigure() ? "button" : "button-disabled", t -> { - t.left(); - t.add(!zone.canConfigure() ? Core.bundle.format("configure.locked", zone.configureWave) : "$configure").growX().wrap(); - if(zone.canConfigure()){ - t.row(); - t.pane(load).pad(2).growX().left(); - } - }).width(300f).pad(4).left(); } }); - cont.row(); Button button = cont.addButton(zone.locked() ? "$uncover" : "$launch", () -> { @@ -200,7 +135,7 @@ public class ZoneInfoDialog extends FloatingDialog{ hide(); world.playZone(zone); } - }).minWidth(150f).margin(13f).padTop(5).disabled(b -> zone.locked() ? !canUnlock(zone) : !data.hasItems(zone.getLaunchCost())).get(); + }).minWidth(150f).margin(13f).padTop(5).disabled(b -> zone.locked() ? !canUnlock(zone) : !data.hasItems(zone.getLaunchCost())).uniformY().get(); button.row(); button.add(iteminfo); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ZoneLoadoutDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/ZoneLoadoutDialog.java new file mode 100644 index 0000000000..f4de558ae8 --- /dev/null +++ b/core/src/io/anuke/mindustry/ui/dialogs/ZoneLoadoutDialog.java @@ -0,0 +1,84 @@ +package io.anuke.mindustry.ui.dialogs; + +import io.anuke.arc.scene.ui.TextButton; +import io.anuke.mindustry.type.*; + +import static io.anuke.mindustry.Vars.content; +import static io.anuke.mindustry.Vars.data; + +public class ZoneLoadoutDialog extends FloatingDialog{ + private Zone zone; + private Runnable hider; + + public ZoneLoadoutDialog(){ + super("$configure"); + setFillParent(false); + addCloseButton(); + shown(this::setup); + hidden(() -> { + if(hider != null){ + hider.run(); + } + }); + buttons.row(); + buttons.addButton("$settings.reset", () -> { + zone.resetStartingItems(); + zone.updateLaunchCost(); + setup(); + }).size(210f, 64f); + } + + public void show(Zone zone, Runnable hider){ + this.hider = hider; + this.zone = zone; + show(); + } + + void setup(){ + cont.clear(); + float bsize = 40f; + int step = 50; + + for(ItemStack stack : zone.getStartingItems()){ + cont.addButton("x", "clear-partial", () -> { + zone.getStartingItems().remove(stack); + zone.updateLaunchCost(); + setup(); + }).size(bsize); + + cont.addButton("-", "clear-partial", () -> { + stack.amount = Math.max(stack.amount - step, 0); + zone.updateLaunchCost(); + }).size(bsize); + cont.addButton("+", "clear-partial", () -> { + stack.amount = Math.min(stack.amount + step, zone.loadout.core().itemCapacity); + zone.updateLaunchCost(); + }).size(bsize); + + cont.addImage(stack.item.icon(Item.Icon.medium)).size(8 * 3).padRight(4); + cont.label(() -> stack.amount + "").left(); + + cont.row(); + } + + cont.addButton("$add", () -> { + FloatingDialog dialog = new FloatingDialog(""); + dialog.setFillParent(false); + for(Item item : content.items().select(item -> data.getItem(item) > 0 && item.type == ItemType.material && zone.getStartingItems().find(stack -> stack.item == item) == null)){ + TextButton button = dialog.cont.addButton("", "clear", () -> { + zone.getStartingItems().add(new ItemStack(item, 0)); + zone.updateLaunchCost(); + setup(); + dialog.hide(); + }).size(300f, 36f).get(); + button.clearChildren(); + button.left(); + button.addImage(item.icon(Item.Icon.medium)).size(8 * 3).pad(4); + button.add(item.localizedName); + dialog.cont.row(); + } + dialog.show(); + }).colspan(4).size(100f, bsize).left().disabled(b -> !content.items().contains(item -> data.getItem(item) > 0 && item.type == ItemType.material && !zone.getStartingItems().contains(stack -> stack.item == item))); + pack(); + } +}