diff --git a/core/assets-raw/sprites/blocks/storage/launch-pad.png b/core/assets-raw/sprites/blocks/storage/launch-pad.png index a3e1c38e67..b74d9f00e2 100644 Binary files a/core/assets-raw/sprites/blocks/storage/launch-pad.png and b/core/assets-raw/sprites/blocks/storage/launch-pad.png differ diff --git a/core/assets-raw/sprites/items/item-bioglass.png b/core/assets-raw/sprites/items/item-bioglass.png new file mode 100644 index 0000000000..bc8eeda9a5 Binary files /dev/null and b/core/assets-raw/sprites/items/item-bioglass.png differ diff --git a/core/assets-raw/sprites/items/item-graphite.png b/core/assets-raw/sprites/items/item-graphite.png new file mode 100644 index 0000000000..36857e49a2 Binary files /dev/null and b/core/assets-raw/sprites/items/item-graphite.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index d6a6a0de63..0ad7e33c6b 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -181,140 +181,140 @@ conveyor-4-3 index: -1 titanium-conveyor-0-1 rotate: false - xy: 1075, 1493 + xy: 1109, 1493 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 1082, 1527 + xy: 1075, 1459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 1109, 1493 + xy: 1109, 1459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 1075, 1459 + xy: 1077, 1425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 1109, 1459 + xy: 1111, 1425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 1077, 1425 + xy: 1087, 1391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 1111, 1425 + xy: 1087, 1357 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 1087, 1391 + xy: 1121, 1391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 1087, 1357 + xy: 1121, 1357 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 1121, 1391 + xy: 687, 373 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 1121, 1357 + xy: 687, 339 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 687, 373 + xy: 721, 381 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 687, 339 + xy: 721, 347 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 721, 381 + xy: 755, 381 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 721, 347 + xy: 789, 382 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 755, 381 + xy: 823, 383 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 789, 382 + xy: 755, 347 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 823, 383 + xy: 789, 348 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 755, 347 + xy: 823, 349 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction rotate: false - xy: 263, 254 + xy: 263, 186 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -328,21 +328,21 @@ mass-driver-turret index: -1 phase-conveyor-arrow rotate: false - xy: 1725, 1665 + xy: 1793, 1665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 1759, 1665 + xy: 1827, 1665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 1793, 1665 + xy: 1861, 1665 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -755,7 +755,7 @@ icerock2 index: -1 lava rotate: false - xy: 263, 220 + xy: 263, 152 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -769,56 +769,56 @@ lavaedge index: -1 lead1 rotate: false - xy: 263, 152 + xy: 263, 84 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead2 rotate: false - xy: 263, 118 + xy: 297, 323 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead3 rotate: false - xy: 263, 84 + xy: 331, 323 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 297, 221 + xy: 365, 289 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 331, 255 + xy: 433, 323 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 365, 289 + xy: 297, 187 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 433, 323 + xy: 331, 221 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 297, 187 + xy: 365, 255 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -832,21 +832,21 @@ metalflooredge index: -1 rock2 rotate: false - xy: 801, 719 + xy: 655, 407 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand2 rotate: false - xy: 655, 407 + xy: 619, 339 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand3 rotate: false - xy: 619, 373 + xy: 653, 373 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -860,14 +860,14 @@ sandedge index: -1 snow2 rotate: false - xy: 671, 305 + xy: 671, 237 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow3 rotate: false - xy: 671, 271 + xy: 671, 203 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -888,42 +888,42 @@ spaceedge index: -1 stone-cliff-edge rotate: false - xy: 1623, 1631 + xy: 1691, 1631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 1657, 1631 + xy: 1725, 1631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 1691, 1631 + xy: 1759, 1631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 1725, 1631 + xy: 1793, 1631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone2 rotate: false - xy: 1555, 1631 + xy: 1623, 1631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone3 rotate: false - xy: 1589, 1631 + xy: 1657, 1631 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -944,70 +944,70 @@ taredge index: -1 thorium1 rotate: false - xy: 1895, 1631 + xy: 1963, 1613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 1929, 1613 + xy: 1997, 1613 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 1963, 1613 + xy: 789, 416 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 1997, 1613 + xy: 823, 417 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 789, 416 + xy: 1075, 1493 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 823, 417 + xy: 1082, 1527 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-cliff-edge rotate: false - xy: 823, 349 + xy: 705, 271 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-cliff-edge-1 rotate: false - xy: 705, 305 + xy: 705, 237 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-cliff-edge-2 rotate: false - xy: 705, 271 + xy: 705, 203 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-cliff-side rotate: false - xy: 705, 237 + xy: 705, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1098,7 +1098,7 @@ cross-4 index: -1 place-arrow rotate: false - xy: 1827, 1665 + xy: 1895, 1665 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1287,21 +1287,21 @@ conduit-top-6 index: -1 liquid-router-bottom rotate: false - xy: 297, 289 + xy: 297, 255 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 365, 323 + xy: 331, 289 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 297, 255 + xy: 399, 323 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1329,70 +1329,70 @@ liquid-tank-top index: -1 phase-conduit-arrow rotate: false - xy: 1623, 1665 + xy: 1691, 1665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 1657, 1665 + xy: 1725, 1665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 1691, 1665 + xy: 1759, 1665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 1963, 1681 + xy: 1929, 1647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1997, 1681 + xy: 1963, 1647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1929, 1647 + xy: 1997, 1647 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 1963, 1647 + xy: 801, 889 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 1997, 1647 + xy: 801, 855 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 801, 889 + xy: 801, 821 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 801, 855 + xy: 801, 787 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1504,7 +1504,7 @@ fusion-reactor-top index: -1 power-node rotate: false - xy: 1861, 1665 + xy: 1929, 1681 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1518,21 +1518,21 @@ power-node-large index: -1 powerinfinite rotate: false - xy: 1895, 1665 + xy: 1963, 1681 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 powervoid rotate: false - xy: 1929, 1681 + xy: 1997, 1681 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 621, 407 + xy: 619, 373 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1714,14 +1714,14 @@ cultivator-top index: -1 lavasmelter rotate: false - xy: 263, 186 + xy: 263, 118 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 297, 153 + xy: 365, 221 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1756,35 +1756,35 @@ plastanium-compressor-top index: -1 pulverizer rotate: false - xy: 801, 821 + xy: 801, 753 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 801, 787 + xy: 801, 719 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 637, 101 + xy: 637, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 smelter rotate: false - xy: 637, 33 + xy: 671, 271 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solidifer rotate: false - xy: 671, 101 + xy: 671, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1805,7 +1805,7 @@ core-top index: -1 sortedunloader rotate: false - xy: 671, 67 + xy: 1453, 1631 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1987,21 +1987,21 @@ salvo-panel-right index: -1 scatter rotate: false - xy: 637, 271 + xy: 637, 203 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scorch rotate: false - xy: 637, 237 + xy: 637, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 637, 203 + xy: 637, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2134,7 +2134,7 @@ reconstructor-open index: -1 repair-point-turret rotate: false - xy: 801, 753 + xy: 621, 407 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2316,7 +2316,7 @@ error index: -1 laser rotate: false - xy: 777, 1207 + xy: 909, 1339 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -2337,7 +2337,7 @@ laserfull index: -1 minelaser rotate: false - xy: 827, 639 + xy: 777, 1207 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -2372,35 +2372,35 @@ scale_marker index: -1 scorch1 rotate: false - xy: 739, 211 + xy: 769, 245 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch2 rotate: false - xy: 769, 245 + xy: 799, 246 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch3 rotate: false - xy: 799, 246 + xy: 829, 247 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch4 rotate: false - xy: 829, 247 + xy: 739, 143 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch5 rotate: false - xy: 736, 109 + xy: 769, 143 size: 28, 100 orig: 28, 100 offset: 0, 0 @@ -2421,21 +2421,21 @@ shell-back index: -1 shot rotate: false - xy: 637, 67 + xy: 671, 305 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 transfer rotate: false - xy: 827, 589 + xy: 827, 639 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 789, 348 + xy: 705, 305 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3982,770 +3982,770 @@ trident-ship index: -1 metalfloor-cliff-edge rotate: false - xy: 331, 221 + xy: 399, 289 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor-cliff-edge-1 rotate: false - xy: 365, 255 + xy: 467, 323 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor-cliff-edge-2 rotate: false - xy: 399, 289 + xy: 297, 153 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor-cliff-side rotate: false - xy: 467, 323 + xy: 331, 187 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-blackstone1 rotate: false - xy: 331, 187 + xy: 399, 255 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-blackstone2 rotate: false - xy: 365, 221 + xy: 433, 289 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-blackstone3 rotate: false - xy: 399, 255 + xy: 501, 323 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-grass1 rotate: false - xy: 433, 289 + xy: 297, 119 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-grass2 rotate: false - xy: 501, 323 + xy: 331, 153 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-grass3 rotate: false - xy: 297, 119 + xy: 365, 187 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-ice1 rotate: false - xy: 331, 153 + xy: 399, 221 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-ice2 rotate: false - xy: 365, 187 + xy: 433, 255 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-ice3 rotate: false - xy: 399, 221 + xy: 467, 289 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 433, 255 + xy: 297, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 467, 289 + xy: 331, 119 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 297, 85 + xy: 365, 153 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-snow1 rotate: false - xy: 331, 119 + xy: 399, 187 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-snow2 rotate: false - xy: 365, 153 + xy: 433, 221 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-snow3 rotate: false - xy: 399, 187 + xy: 467, 255 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 433, 221 + xy: 501, 289 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 467, 255 + xy: 331, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 501, 289 + xy: 365, 119 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-blackstone1 rotate: false - xy: 331, 85 + xy: 399, 153 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-blackstone2 rotate: false - xy: 365, 119 + xy: 433, 187 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-blackstone3 rotate: false - xy: 399, 153 + xy: 467, 221 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-grass1 rotate: false - xy: 433, 187 + xy: 501, 255 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-grass2 rotate: false - xy: 467, 221 + xy: 365, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-grass3 rotate: false - xy: 501, 255 + xy: 399, 119 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-ice1 rotate: false - xy: 365, 85 + xy: 433, 153 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-ice2 rotate: false - xy: 399, 119 + xy: 467, 187 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-ice3 rotate: false - xy: 433, 153 + xy: 501, 221 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand1 rotate: false - xy: 467, 187 + xy: 399, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand2 rotate: false - xy: 501, 221 + xy: 433, 119 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand3 rotate: false - xy: 399, 85 + xy: 467, 153 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-snow1 rotate: false - xy: 433, 119 + xy: 501, 187 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-snow2 rotate: false - xy: 467, 153 + xy: 433, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-snow3 rotate: false - xy: 501, 187 + xy: 467, 119 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone1 rotate: false - xy: 433, 85 + xy: 501, 153 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone2 rotate: false - xy: 467, 119 + xy: 467, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone3 rotate: false - xy: 501, 153 + xy: 501, 119 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-blackstone1 rotate: false - xy: 467, 85 + xy: 501, 85 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-blackstone2 rotate: false - xy: 501, 119 + xy: 535, 301 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-blackstone3 rotate: false - xy: 501, 85 + xy: 535, 267 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-grass1 rotate: false - xy: 535, 301 + xy: 569, 301 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-grass2 rotate: false - xy: 535, 267 + xy: 535, 233 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-grass3 rotate: false - xy: 569, 301 + xy: 569, 267 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-ice1 rotate: false - xy: 535, 233 + xy: 535, 199 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-ice2 rotate: false - xy: 569, 267 + xy: 569, 233 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-ice3 rotate: false - xy: 535, 199 + xy: 535, 165 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 569, 233 + xy: 569, 199 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 535, 165 + xy: 535, 131 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 569, 199 + xy: 569, 165 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-snow1 rotate: false - xy: 535, 131 + xy: 535, 97 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-snow2 rotate: false - xy: 569, 165 + xy: 569, 131 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-snow3 rotate: false - xy: 535, 97 + xy: 569, 97 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 569, 131 + xy: 603, 301 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 569, 97 + xy: 603, 267 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 603, 301 + xy: 603, 233 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-blackstone1 rotate: false - xy: 603, 267 + xy: 603, 199 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-blackstone2 rotate: false - xy: 603, 233 + xy: 603, 165 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-blackstone3 rotate: false - xy: 603, 199 + xy: 603, 131 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-grass1 rotate: false - xy: 603, 165 + xy: 603, 97 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-grass2 rotate: false - xy: 603, 131 + xy: 263, 50 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-grass3 rotate: false - xy: 603, 97 + xy: 297, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-ice1 rotate: false - xy: 263, 50 + xy: 331, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-ice2 rotate: false - xy: 297, 51 + xy: 365, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-ice3 rotate: false - xy: 331, 51 + xy: 399, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 365, 51 + xy: 433, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 399, 51 + xy: 467, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 433, 51 + xy: 501, 51 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-snow1 rotate: false - xy: 467, 51 + xy: 535, 63 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-snow2 rotate: false - xy: 501, 51 + xy: 569, 63 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-snow3 rotate: false - xy: 535, 63 + xy: 603, 63 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 569, 63 + xy: 535, 29 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 603, 63 + xy: 569, 29 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 535, 29 + xy: 603, 29 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-blackstone1 rotate: false - xy: 569, 29 + xy: 242, 16 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-blackstone2 rotate: false - xy: 603, 29 + xy: 276, 16 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-blackstone3 rotate: false - xy: 242, 16 + xy: 310, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-grass1 rotate: false - xy: 276, 16 + xy: 344, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-grass2 rotate: false - xy: 310, 17 + xy: 378, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-grass3 rotate: false - xy: 344, 17 + xy: 412, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-ice1 rotate: false - xy: 378, 17 + xy: 446, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-ice2 rotate: false - xy: 412, 17 + xy: 480, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-ice3 rotate: false - xy: 446, 17 + xy: 755, 415 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 480, 17 + xy: 1385, 1661 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 755, 415 + xy: 1419, 1661 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 1385, 1661 + xy: 1453, 1665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-snow1 rotate: false - xy: 1419, 1661 + xy: 1487, 1665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-snow2 rotate: false - xy: 1453, 1665 + xy: 1521, 1665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-snow3 rotate: false - xy: 1487, 1665 + xy: 1555, 1665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 1521, 1665 + xy: 1589, 1665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 1555, 1665 + xy: 1623, 1665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 1589, 1665 + xy: 1657, 1665 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-cliff-edge rotate: false - xy: 619, 339 + xy: 653, 339 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-cliff-edge-1 rotate: false - xy: 653, 373 + xy: 637, 305 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-cliff-edge-2 rotate: false - xy: 653, 339 + xy: 637, 271 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-cliff-side rotate: false - xy: 637, 305 + xy: 637, 237 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow-cliff-edge rotate: false - xy: 671, 237 + xy: 671, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow-cliff-edge-1 rotate: false - xy: 671, 203 + xy: 671, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow-cliff-edge-2 rotate: false - xy: 671, 169 + xy: 671, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow-cliff-side rotate: false - xy: 671, 135 + xy: 671, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 space-cliff-edge rotate: false - xy: 671, 33 + xy: 1487, 1631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 space-cliff-edge-1 rotate: false - xy: 1453, 1631 + xy: 1521, 1631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 space-cliff-edge-2 rotate: false - xy: 1487, 1631 + xy: 1555, 1631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 space-cliff-side rotate: false - xy: 1521, 1631 + xy: 1589, 1631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-cliff-edge rotate: false - xy: 1759, 1631 + xy: 1827, 1631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-cliff-edge-1 rotate: false - xy: 1793, 1631 + xy: 1861, 1631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-cliff-edge-2 rotate: false - xy: 1827, 1631 + xy: 1895, 1631 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-cliff-side rotate: false - xy: 1861, 1631 + xy: 1929, 1613 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4785,135 +4785,149 @@ wraith orig: 48, 48 offset: 0, 0 index: -1 -item-biomatter +item-bioglass rotate: false xy: 1759, 1699 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -item-blast-compound +item-biomatter rotate: false xy: 1793, 1699 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -item-coal +item-blast-compound rotate: false xy: 1827, 1699 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -item-copper +item-coal rotate: false xy: 1861, 1699 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -item-dense-alloy +item-copper rotate: false xy: 1895, 1699 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -item-lead +item-dense-alloy rotate: false xy: 1041, 1488 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -item-phase-fabric +item-graphite rotate: false xy: 793, 655 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -item-plastanium +item-lead rotate: false xy: 793, 621 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -item-pyratite +item-phase-fabric rotate: false xy: 793, 587 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -item-sand +item-plastanium rotate: false xy: 793, 553 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -item-silicon +item-pyratite rotate: false xy: 793, 519 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -item-stone +item-sand rotate: false xy: 793, 485 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -item-surge-alloy +item-silicon rotate: false xy: 793, 451 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -item-thorium +item-stone rotate: false xy: 263, 322 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -item-titanium +item-surge-alloy rotate: false xy: 263, 288 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +item-thorium + rotate: false + xy: 263, 254 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +item-titanium + rotate: false + xy: 263, 220 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 liquid-cryofluid rotate: false - xy: 297, 323 + xy: 297, 289 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-oil rotate: false - xy: 331, 323 + xy: 365, 323 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-slag rotate: false - xy: 331, 289 + xy: 297, 221 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-water rotate: false - xy: 399, 323 + xy: 331, 255 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5176,21 +5190,21 @@ check-off index: -1 check-on rotate: false - xy: 705, 83 + xy: 739, 313 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-on-over rotate: false - xy: 705, 49 + xy: 739, 279 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-over rotate: false - xy: 739, 313 + xy: 739, 245 size: 28, 32 orig: 28, 32 offset: 0, 0 @@ -5253,42 +5267,42 @@ icon-effect index: -1 icon-liquid rotate: false - xy: 514, 15 + xy: 762, 89 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-power rotate: false - xy: 93, 8 + xy: 705, 31 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-production rotate: false - xy: 111, 8 + xy: 771, 1147 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-turret rotate: false - xy: 568, 11 + xy: 75, 3 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 604, 11 + xy: 111, 8 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-upgrade rotate: false - xy: 640, 15 + xy: 147, 3 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5407,7 +5421,7 @@ icon-cancel index: -1 icon-chat rotate: false - xy: 723, 37 + xy: 502, 5 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5428,7 +5442,7 @@ icon-copy index: -1 icon-cursor rotate: false - xy: 502, 5 + xy: 825, 689 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5484,7 +5498,7 @@ icon-elevation index: -1 icon-eraser rotate: false - xy: 21, 3 + xy: 762, 125 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5498,14 +5512,14 @@ icon-exit index: -1 icon-file rotate: false - xy: 222, 1759 + xy: 21, 3 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 39, 3 + xy: 222, 1759 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5519,7 +5533,7 @@ icon-file-text index: -1 icon-fill rotate: false - xy: 240, 1759 + xy: 762, 107 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5533,7 +5547,7 @@ icon-floppy index: -1 icon-floppy-16 rotate: false - xy: 57, 3 + xy: 780, 125 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5575,21 +5589,21 @@ icon-google-play index: -1 icon-grid rotate: false - xy: 705, 31 + xy: 39, 3 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 825, 689 + xy: 594, 1832 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 594, 1832 + xy: 1953, 1789 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5603,28 +5617,28 @@ icon-home index: -1 icon-host rotate: false - xy: 676, 17 + xy: 183, 5 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 1953, 1789 + xy: 723, 37 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 676, 1 + xy: 1059, 1456 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-item rotate: false - xy: 692, 21 + xy: 2035, 1843 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5638,70 +5652,70 @@ icon-items-none index: -1 icon-line rotate: false - xy: 771, 1147 + xy: 240, 1759 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 1059, 1456 + xy: 532, 13 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid-small rotate: false - xy: 2035, 1843 + xy: 676, 5 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 2021, 1771 + xy: 548, 13 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 819, 701 + xy: 780, 107 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 819, 1229 + xy: 57, 3 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 766, 106 + xy: 762, 71 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 764, 88 + xy: 780, 89 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 927, 1239 + xy: 692, 21 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-map rotate: false - xy: 2021, 1755 + xy: 564, 13 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5715,14 +5729,14 @@ icon-menu index: -1 icon-menu-large rotate: false - xy: 764, 70 + xy: 780, 71 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-missing rotate: false - xy: 692, 9 + xy: 2035, 1831 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5736,28 +5750,28 @@ icon-mission-background index: -1 icon-mission-battle rotate: false - xy: 2035, 1831 + xy: 618, 1832 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-defense rotate: false - xy: 618, 1832 + xy: 2035, 1819 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-done rotate: false - xy: 2035, 1819 + xy: 2035, 1807 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 2035, 1807 + xy: 2035, 1795 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5771,252 +5785,252 @@ icon-nullitem index: -1 icon-paste rotate: false - xy: 764, 52 + xy: 798, 123 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 2035, 1795 + xy: 2037, 1783 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 837, 1237 + xy: 798, 105 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 2021, 1739 + xy: 580, 13 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 75, 3 + xy: 798, 87 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 2037, 1783 + xy: 2037, 1771 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 2021, 1723 + xy: 596, 13 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 2037, 1771 + xy: 2037, 1759 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power-small rotate: false - xy: 2037, 1759 + xy: 2037, 1747 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 909, 1347 + xy: 612, 13 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 129, 3 + xy: 514, 15 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 909, 1331 + xy: 2021, 1771 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 925, 1347 + xy: 2021, 1755 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 147, 3 + xy: 819, 701 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 925, 1331 + xy: 2021, 1739 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 911, 1315 + xy: 2021, 1723 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 911, 1299 + xy: 816, 125 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 911, 1283 + xy: 816, 109 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 911, 1267 + xy: 816, 93 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 165, 3 + xy: 819, 1229 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 183, 3 + xy: 798, 69 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 2037, 1747 + xy: 2037, 1735 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 532, 11 + xy: 736, 46 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 911, 1251 + xy: 816, 77 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 2037, 1735 + xy: 2037, 1723 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 2037, 1723 + xy: 514, 3 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 911, 1235 + xy: 628, 13 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 550, 11 + xy: 837, 1237 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 927, 1315 + xy: 644, 17 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 927, 1299 + xy: 644, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 586, 11 + xy: 93, 8 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocked rotate: false - xy: 622, 11 + xy: 129, 3 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 927, 1283 + xy: 660, 17 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 927, 1267 + xy: 660, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 658, 15 + xy: 165, 3 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 927, 1251 + xy: 676, 17 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -6030,7 +6044,7 @@ info-banner index: -1 inventory rotate: false - xy: 769, 203 + xy: 799, 141 size: 24, 40 split: 10, 10, 10, 14 orig: 24, 40 @@ -6061,7 +6075,7 @@ pane-2 index: -1 scroll rotate: false - xy: 766, 124 + xy: 736, 64 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -6085,7 +6099,7 @@ scroll-knob-horizontal-black index: -1 scroll-knob-vertical-black rotate: false - xy: 766, 161 + xy: 736, 101 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -6093,14 +6107,14 @@ scroll-knob-vertical-black index: -1 sector-edge rotate: false - xy: 637, 169 + xy: 637, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sector-select rotate: false - xy: 637, 135 + xy: 637, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6114,28 +6128,28 @@ selection index: -1 slider rotate: false - xy: 736, 227 + xy: 736, 159 size: 1, 8 orig: 1, 8 offset: 0, 0 index: -1 slider-knob rotate: false - xy: 705, 197 + xy: 705, 129 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-down rotate: false - xy: 705, 157 + xy: 705, 89 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-over rotate: false - xy: 705, 117 + xy: 705, 49 size: 29, 38 orig: 29, 38 offset: 0, 0 @@ -6172,7 +6186,7 @@ white index: -1 window-empty rotate: false - xy: 735, 46 + xy: 799, 183 size: 27, 61 split: 8, 8, 44, 11 orig: 27, 61 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index d6ddde2df2..978154a2bd 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java index 2612598b4d..4dfa63d4f8 100644 --- a/core/src/io/anuke/mindustry/Vars.java +++ b/core/src/io/anuke/mindustry/Vars.java @@ -8,6 +8,7 @@ import io.anuke.arc.entities.impl.EffectEntity; import io.anuke.arc.entities.trait.DrawTrait; import io.anuke.arc.files.FileHandle; import io.anuke.arc.graphics.Color; +import io.anuke.arc.util.Structs; import io.anuke.mindustry.core.*; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.TileEntity; @@ -149,7 +150,7 @@ public class Vars{ } } - Arrays.sort(locales, (l1, l2) -> l1.getDisplayName(l1).compareTo(l2.getDisplayName(l2))); + Arrays.sort(locales, Structs.comparing(l -> l.getDisplayName(l), String.CASE_INSENSITIVE_ORDER)); Version.init(); content = new ContentLoader(); diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index b7e3a78945..605263946a 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -30,7 +30,7 @@ public class Blocks implements ContentList{ public static Block //environment - air, blockpart, spawn, space, metalfloor, deepwater, water, lava, tar, stone, blackstone, dirt, sand, ice, snow, + air, blockpart, spawn, space, metalfloor, deepwater, water, tar, stone, blackstone, dirt, sand, ice, snow, grass, shrub, rock, icerock, blackrock, //crafting diff --git a/core/src/io/anuke/mindustry/game/GlobalData.java b/core/src/io/anuke/mindustry/game/GlobalData.java index d2f3180dd6..aac258b22d 100644 --- a/core/src/io/anuke/mindustry/game/GlobalData.java +++ b/core/src/io/anuke/mindustry/game/GlobalData.java @@ -18,7 +18,6 @@ public class GlobalData{ public GlobalData(){ Core.settings.setSerializer(ContentType.class, (stream, t) -> stream.writeInt(t.ordinal()), stream -> ContentType.values()[stream.readInt()]); - Core.settings.setSerializer(Item.class, (stream, t) -> stream.writeUTF(t.name), stream -> Vars.content.getByName(ContentType.item, stream.readUTF())); } public void addItem(Item item, int amount){ @@ -32,7 +31,8 @@ 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.getContentName()); + return true; + //return content.alwaysUnlocked() || unlocked.getOr(content.getContentType(), ObjectSet::new).contains(content.getContentName()); } /** @@ -73,12 +73,16 @@ public class GlobalData{ @SuppressWarnings("unchecked") public void load(){ unlocked = Core.settings.getObject("unlocks", ObjectMap.class, ObjectMap::new); - items = Core.settings.getObject("items", ObjectIntMap.class, ObjectIntMap::new); + for(Item item : Vars.content.items()){ + items.put(item, Core.settings.getInt("item-" + item.name, 0)); + } } public void save(){ Core.settings.putObject("unlocks", unlocked); - Core.settings.putObject("items", items); + for(Item item : Vars.content.items()){ + Core.settings.put("item-" + item.name, items.get(item, 0)); + } Core.settings.save(); } diff --git a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java index 7d9bd1edd9..06418e991d 100644 --- a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java @@ -21,7 +21,8 @@ import static io.anuke.mindustry.Vars.*; public class BlockRenderer{ private final static int initialRequests = 32 * 32; private final static int expandr = 6; - private final static boolean disableShadows = true; + private final static boolean disableShadows = false; + private final static Color shadowColor = new Color(0, 0, 0, 0.15f); public final FloorRenderer floor = new FloorRenderer(); @@ -29,7 +30,7 @@ public class BlockRenderer{ private int lastCamX, lastCamY, lastRangeX, lastRangeY; private int requestidx = 0; private int iterateidx = 0; - private FrameBuffer shadows = new FrameBuffer(1, 1); + private FrameBuffer shadows = new FrameBuffer(2, 2); public BlockRenderer(){ @@ -61,14 +62,14 @@ public class BlockRenderer{ } Tmp.tr1.set(shadows.getTexture()); - Shaders.outline.color.set(0, 0, 0, 0.15f); + Shaders.outline.color.set(shadowColor); Shaders.outline.scl = renderer.cameraScale()/3f; Shaders.outline.region = Tmp.tr1; Draw.flush(); shadows.begin(); Core.graphics.clear(Color.CLEAR); - Draw.color(Color.BLACK); + Draw.color(shadowColor); drawBlocks(Layer.shadow); Draw.color(); Draw.flush(); @@ -89,8 +90,8 @@ public class BlockRenderer{ int avgx = (int)(camera.position.x / tilesize); int avgy = (int)(camera.position.y / tilesize); - int rangex = (int) (camera.width / tilesize / 2) + 2; - int rangey = (int) (camera.height / tilesize / 2) + 2; + int rangex = (int) (camera.width / tilesize / 2) + 3; + int rangey = (int) (camera.height / tilesize / 2) + 3; if(avgx == lastCamX && avgy == lastCamY && lastRangeX == rangex && lastRangeY == rangey){ return; @@ -192,7 +193,6 @@ public class BlockRenderer{ } public void skipLayer(Layer stopAt){ - for(; iterateidx < requestidx; iterateidx++){ if(iterateidx < requests.size && requests.get(iterateidx).layer.ordinal() > stopAt.ordinal()){ break; diff --git a/core/src/io/anuke/mindustry/maps/WorldGenerator.java b/core/src/io/anuke/mindustry/maps/WorldGenerator.java index 0f4cbc74e2..cd94666975 100644 --- a/core/src/io/anuke/mindustry/maps/WorldGenerator.java +++ b/core/src/io/anuke/mindustry/maps/WorldGenerator.java @@ -185,6 +185,7 @@ public class WorldGenerator{ } world.setBlock(tiles[spawns.get(0).x][spawns.get(0).y], Blocks.core, Team.blue); + world.setBlock(tiles[spawns.get(0).x][spawns.get(0).y - 3], Blocks.launchPad, Team.blue); if(state.mode.isPvp){ world.setBlock(tiles[spawns.get(1).x][spawns.get(1).y], Blocks.core, Team.red); @@ -310,8 +311,6 @@ public class WorldGenerator{ if(iceridge > 0.25 && minDst > lerpDst/1.5f){ elevation ++; } - }else if(minDst > lerpDst/1.5f){ - floor = Blocks.lava; }else{ floor = Blocks.blackstone; } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java index a1fc3a373b..bc37f330fc 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java @@ -4,6 +4,7 @@ import io.anuke.arc.collection.ObjectIntMap; import io.anuke.arc.scene.ui.layout.Table; import io.anuke.mindustry.Vars; import io.anuke.mindustry.type.Item; +import io.anuke.mindustry.type.ItemType; public class DeployDialog extends FloatingDialog{ @@ -24,18 +25,18 @@ public class DeployDialog extends FloatingDialog{ ObjectIntMap items = Vars.data.items(); for(Item item : Vars.content.items()){ - if(Vars.data.isUnlocked(item)){ - add(items.get(item, 0) + ""); - addImage(item.region).size(8*3).pad(3); - add(item.localizedName()); + if(item.type == ItemType.material && Vars.data.isUnlocked(item)){ + add(items.get(item, 0) + "").left(); + addImage(item.region).size(8*4).pad(4); + add("[LIGHT_GRAY]" + item.localizedName()).left(); row(); } } }}, new Table(){{ - addButton("$text.play", () -> { + addButton("Wasteland", () -> { hide(); Vars.world.generator.playRandomMap(); - }).margin(15); + }).size(190f, 60f); }}).grow(); } } diff --git a/core/src/io/anuke/mindustry/world/LegacyColorMapper.java b/core/src/io/anuke/mindustry/world/LegacyColorMapper.java index 794133e047..51950441fa 100644 --- a/core/src/io/anuke/mindustry/world/LegacyColorMapper.java +++ b/core/src/io/anuke/mindustry/world/LegacyColorMapper.java @@ -36,7 +36,7 @@ public class LegacyColorMapper implements ContentList{ map("c4e3e7", Blocks.ice, 0); map("f7feff", Blocks.snow, 1); map("6e501e", Blocks.dirt, 0); - map("ed5334", Blocks.lava, 0); + map("ed5334", Blocks.blackstone, 0); map("292929", Blocks.tar, 0); map("c3a490", OreBlock.get(Blocks.stone, Items.copper), 0); map("161616", OreBlock.get(Blocks.stone, Items.coal), 0); diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java index 5b710db20c..939a3bbe8e 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java @@ -28,7 +28,7 @@ import java.io.IOException; import static io.anuke.mindustry.Vars.*; public class Conveyor extends Block{ - private static final float itemSpace = 0.135f * 4f; + private static final float itemSpace = 0.135f * 3f; private static final float offsetScl = 128f * 3f; private static final float minmove = 1f / (Short.MAX_VALUE - 2); private static ItemPos drawpos = new ItemPos(); diff --git a/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java b/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java index dfb1aee3a7..51a39117ec 100644 --- a/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java +++ b/core/src/io/anuke/mindustry/world/blocks/sandbox/ItemSource.java @@ -1,15 +1,16 @@ package io.anuke.mindustry.world.blocks.sandbox; import io.anuke.mindustry.type.Item; -import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; -import io.anuke.mindustry.world.blocks.distribution.Sorter.SorterEntity; +import io.anuke.mindustry.world.blocks.distribution.Sorter; -public class ItemSource extends Block{ +public class ItemSource extends Sorter{ public ItemSource(String name){ super(name); hasItems = true; + update = true; + solid = true; } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/LaunchPad.java b/core/src/io/anuke/mindustry/world/blocks/storage/LaunchPad.java index a477725f1e..65e67d7b94 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/LaunchPad.java +++ b/core/src/io/anuke/mindustry/world/blocks/storage/LaunchPad.java @@ -5,6 +5,7 @@ import io.anuke.mindustry.Vars; import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.type.Item; +import io.anuke.mindustry.type.ItemType; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; @@ -12,7 +13,6 @@ import static io.anuke.mindustry.Vars.data; public class LaunchPad extends Block{ protected final int timerLaunch = timers++; - /**Time inbetween launches.*/ protected float launchTime; @@ -24,6 +24,11 @@ public class LaunchPad extends Block{ solid = true; } + @Override + public boolean acceptItem(Item item, Tile tile, Tile source){ + return item.type == ItemType.material && tile.entity.items.get(item) < getMaximumAccepted(tile, item); + } + @Override public void update(Tile tile){ TileEntity entity = tile.entity; diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java index 815e9d1792..28179d163b 100644 --- a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java +++ b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java @@ -21,7 +21,6 @@ public class DesktopLauncher extends Lwjgl3Application{ config.setTitle("Mindustry"); config.setMaximized(true); config.setWindowedMode(960, 540); - //config.setBackBufferConfig(0, 0, 0, 0, 0, 0, 16); config.setWindowIcon("sprites/icon.png"); Platform.instance = new DesktopPlatform(arg);