diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png index 83b560b3de..9677923456 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/fallback/sprites.atlas b/core/assets/sprites/fallback/sprites.atlas index 20384f5ad5..62d5a46e8a 100644 --- a/core/assets/sprites/fallback/sprites.atlas +++ b/core/assets/sprites/fallback/sprites.atlas @@ -453,7 +453,7 @@ data-processor index: -1 data-processor-2 rotate: false - xy: 1167, 521 + xy: 1827, 526 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -488,9 +488,9 @@ launch-pad-light index: -1 launchpod rotate: false - xy: 1975, 1750 - size: 66, 64 - orig: 66, 64 + xy: 479, 467 + size: 64, 64 + orig: 64, 64 offset: 0, 0 index: -1 force-projector @@ -1062,7 +1062,7 @@ cross index: -1 distributor rotate: false - xy: 1233, 521 + xy: 1167, 521 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1216,14 +1216,14 @@ blast-drill-top index: -1 drill-top rotate: false - xy: 1431, 521 + xy: 1365, 521 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-liquid rotate: false - xy: 1431, 521 + xy: 1365, 521 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2000,7 +2000,7 @@ alloy-smelter-top index: -1 blast-mixer rotate: false - xy: 1101, 603 + xy: 1981, 897 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2014,49 +2014,49 @@ block-forge index: -1 coal-centrifuge rotate: false - xy: 811, 531 + xy: 479, 533 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 1, 528 + xy: 729, 529 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 545, 527 + xy: 1, 528 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 1629, 526 + xy: 545, 527 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator rotate: false - xy: 1695, 526 + xy: 1629, 526 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 1761, 526 + xy: 1695, 526 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 1827, 526 + xy: 1761, 526 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2084,7 +2084,7 @@ disassembler-spinner index: -1 graphite-press rotate: false - xy: 1563, 521 + xy: 1497, 521 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2112,21 +2112,21 @@ item-void index: -1 kiln rotate: false - xy: 1893, 487 + xy: 1563, 521 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 kiln-top rotate: false - xy: 1959, 487 + xy: 1893, 487 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 1959, 487 + xy: 1893, 487 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2378,7 +2378,7 @@ spore-cluster3 index: -1 container rotate: false - xy: 1023, 531 + xy: 957, 531 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2441,7 +2441,7 @@ block-1 index: -1 block-2 rotate: false - xy: 83, 595 + xy: 1101, 603 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2469,7 +2469,7 @@ hail-heat index: -1 lancer-heat rotate: false - xy: 479, 467 + xy: 1089, 471 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2546,7 +2546,7 @@ air-factory index: -1 command-center rotate: false - xy: 957, 531 + xy: 811, 531 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2644,7 +2644,7 @@ copper-wall index: -1 copper-wall-large rotate: false - xy: 663, 530 + xy: 1023, 531 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2658,14 +2658,14 @@ door index: -1 door-large rotate: false - xy: 1299, 521 + xy: 1233, 521 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 1365, 521 + xy: 1299, 521 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3085,14 +3085,14 @@ block-craters-full index: -1 block-cryofluidmixer-full rotate: false - xy: 149, 595 + xy: 83, 595 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-cultivator-full rotate: false - xy: 215, 595 + xy: 149, 595 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3211,7 +3211,7 @@ block-impact-reactor-full index: -1 block-lancer-full rotate: false - xy: 281, 595 + xy: 215, 595 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3267,7 +3267,7 @@ block-mass-driver-full index: -1 block-mechanical-drill-full rotate: false - xy: 347, 595 + xy: 281, 595 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3351,7 +3351,7 @@ block-ore-titanium-full index: -1 block-parallax-full rotate: false - xy: 413, 595 + xy: 347, 595 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3379,7 +3379,7 @@ block-pebbles-full index: -1 block-phase-weaver-full rotate: false - xy: 1167, 587 + xy: 413, 595 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3393,7 +3393,7 @@ block-plated-conduit-full index: -1 block-pneumatic-drill-full rotate: false - xy: 1233, 587 + xy: 1167, 587 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3449,7 +3449,7 @@ block-saltrocks-full index: -1 block-salvo-full rotate: false - xy: 1299, 587 + xy: 1233, 587 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3477,7 +3477,7 @@ block-sandrocks-full index: -1 block-scatter-full rotate: false - xy: 1365, 587 + xy: 1299, 587 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3519,14 +3519,14 @@ scrap-wall-huge1 index: -1 block-scrap-wall-large-full rotate: false - xy: 1431, 587 + xy: 1365, 587 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-segment-full rotate: false - xy: 1497, 587 + xy: 1431, 587 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3603,7 +3603,7 @@ block-spore-moss-full index: -1 block-spore-press-full rotate: false - xy: 1563, 587 + xy: 1497, 587 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3624,7 +3624,7 @@ block-stone-full index: -1 block-swarmer-full rotate: false - xy: 1913, 553 + xy: 1563, 587 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3652,21 +3652,21 @@ titanium-conveyor-0-0 index: -1 block-turbine-generator-full rotate: false - xy: 1979, 553 + xy: 1913, 553 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-water-extractor-full rotate: false - xy: 1101, 537 + xy: 1979, 553 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-wave-full rotate: false - xy: 479, 533 + xy: 1101, 537 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3792,56 +3792,56 @@ cracks-1-7 index: -1 cracks-2-0 rotate: false - xy: 877, 530 + xy: 663, 530 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-1 rotate: false - xy: 83, 529 + xy: 877, 530 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-2 rotate: false - xy: 149, 529 + xy: 83, 529 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-3 rotate: false - xy: 215, 529 + xy: 149, 529 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-4 rotate: false - xy: 281, 529 + xy: 215, 529 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-5 rotate: false - xy: 347, 529 + xy: 281, 529 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-6 rotate: false - xy: 413, 529 + xy: 347, 529 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-7 rotate: false - xy: 729, 529 + xy: 413, 529 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4506,7 +4506,7 @@ item-titanium-xlarge index: -1 lancer rotate: false - xy: 1089, 471 + xy: 1959, 487 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -5367,7 +5367,7 @@ atrax index: -1 atrax-base rotate: false - xy: 1981, 897 + xy: 1975, 1750 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -5542,7 +5542,7 @@ fortress index: -1 fortress-base rotate: false - xy: 1497, 521 + xy: 1431, 521 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -6729,147 +6729,147 @@ filter: nearest,nearest repeat: none char1 rotate: false - xy: 1281, 459 + xy: 835, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 char2 rotate: false - xy: 1315, 459 + xy: 1099, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 char3 rotate: false - xy: 1349, 459 + xy: 869, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cliff rotate: false - xy: 1383, 459 + xy: 1133, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cliffs1 rotate: false - xy: 1417, 459 + xy: 903, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal1 rotate: false - xy: 1451, 459 + xy: 1167, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal2 rotate: false - xy: 1485, 459 + xy: 937, 327 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal3 rotate: false - xy: 1519, 459 + xy: 1201, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper1 rotate: false - xy: 1553, 459 + xy: 1235, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper2 rotate: false - xy: 1587, 459 + xy: 1269, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper3 rotate: false - xy: 1621, 459 + xy: 1303, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters1 rotate: false - xy: 1655, 459 + xy: 1337, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters2 rotate: false - xy: 1689, 459 + xy: 1371, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters3 rotate: false - xy: 1723, 459 + xy: 1405, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters4 rotate: false - xy: 1757, 459 + xy: 1439, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters5 rotate: false - xy: 1791, 459 + xy: 1473, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters6 rotate: false - xy: 1825, 459 + xy: 1507, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-metal-large rotate: false - xy: 687, 329 + xy: 785, 427 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dark-metal1 rotate: false - xy: 1859, 459 + xy: 1541, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-metal2 rotate: false - xy: 1893, 459 + xy: 1575, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-1 rotate: false - xy: 1927, 459 + xy: 1609, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6883,7 +6883,7 @@ dark-panel-1-edge index: -1 dark-panel-2 rotate: false - xy: 1961, 459 + xy: 1643, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6897,7 +6897,7 @@ dark-panel-2-edge index: -1 dark-panel-3 rotate: false - xy: 1995, 459 + xy: 1677, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6911,7 +6911,7 @@ dark-panel-3-edge index: -1 dark-panel-4 rotate: false - xy: 753, 361 + xy: 1711, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6925,7 +6925,7 @@ dark-panel-4-edge index: -1 dark-panel-5 rotate: false - xy: 753, 327 + xy: 1745, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6939,7 +6939,7 @@ dark-panel-5-edge index: -1 dark-panel-6 rotate: false - xy: 753, 293 + xy: 1779, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6960,7 +6960,7 @@ darksand-edge index: -1 darksand-tainted-water rotate: false - xy: 525, 1 + xy: 1915, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6974,28 +6974,28 @@ darksand-tainted-water-edge index: -1 darksand-tainted-water1 rotate: false - xy: 655, 131 + xy: 1949, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-tainted-water2 rotate: false - xy: 753, 259 + xy: 1983, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-tainted-water3 rotate: false - xy: 689, 179 + xy: 491, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-water rotate: false - xy: 689, 145 + xy: 557, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7009,49 +7009,49 @@ darksand-water-edge index: -1 darksand-water1 rotate: false - xy: 737, 225 + xy: 655, 165 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-water2 rotate: false - xy: 1181, 409 + xy: 753, 263 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-water3 rotate: false - xy: 1215, 409 + xy: 525, 1 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand1 rotate: false - xy: 491, 1 + xy: 1813, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand2 rotate: false - xy: 557, 67 + xy: 1847, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand3 rotate: false - xy: 655, 165 + xy: 1881, 459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater rotate: false - xy: 1249, 409 + xy: 655, 131 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7065,28 +7065,28 @@ deepwater-edge index: -1 dunerocks-large rotate: false - xy: 785, 427 + xy: 491, 35 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dunerocks1 rotate: false - xy: 1283, 425 + xy: 753, 229 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dunerocks2 rotate: false - xy: 1317, 425 + xy: 787, 277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 edge rotate: false - xy: 1351, 425 + xy: 787, 243 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7100,7 +7100,7 @@ edge-stencil index: -1 edgier rotate: false - xy: 1385, 425 + xy: 983, 343 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7114,21 +7114,21 @@ grass-edge index: -1 grass1 rotate: false - xy: 1419, 425 + xy: 1033, 393 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass2 rotate: false - xy: 1453, 425 + xy: 835, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass3 rotate: false - xy: 1487, 425 + xy: 869, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7142,42 +7142,42 @@ holostone-edge index: -1 holostone1 rotate: false - xy: 1521, 425 + xy: 903, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone2 rotate: false - xy: 1555, 425 + xy: 937, 293 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone3 rotate: false - xy: 1589, 425 + xy: 971, 309 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock1 rotate: false - xy: 1623, 425 + xy: 821, 259 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock2 rotate: false - xy: 1657, 425 + xy: 855, 259 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock3 rotate: false - xy: 1691, 425 + xy: 889, 259 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7198,63 +7198,63 @@ ice-snow-edge index: -1 ice-snow1 rotate: false - xy: 1827, 425 + xy: 1167, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow2 rotate: false - xy: 1861, 425 + xy: 1201, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow3 rotate: false - xy: 1895, 425 + xy: 1235, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice1 rotate: false - xy: 1725, 425 + xy: 923, 259 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice2 rotate: false - xy: 1759, 425 + xy: 1099, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice3 rotate: false - xy: 1793, 425 + xy: 1133, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icerocks-large rotate: false - xy: 491, 35 + xy: 589, 133 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 icerocks1 rotate: false - xy: 1929, 425 + xy: 1269, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icerocks2 rotate: false - xy: 1963, 425 + xy: 1303, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7268,77 +7268,77 @@ ignarock-edge index: -1 ignarock1 rotate: false - xy: 1997, 425 + xy: 1337, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ignarock2 rotate: false - xy: 771, 225 + xy: 1371, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ignarock3 rotate: false - xy: 1283, 391 + xy: 1405, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead1 rotate: false - xy: 1317, 391 + xy: 1439, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead2 rotate: false - xy: 1351, 391 + xy: 1473, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead3 rotate: false - xy: 1385, 391 + xy: 1507, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock1 rotate: false - xy: 1419, 391 + xy: 1541, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock2 rotate: false - xy: 1453, 391 + xy: 1575, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock3 rotate: false - xy: 1487, 391 + xy: 1609, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor rotate: false - xy: 1521, 391 + xy: 1643, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-2 rotate: false - xy: 1555, 391 + xy: 1677, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7352,7 +7352,7 @@ metal-floor-2-edge index: -1 metal-floor-3 rotate: false - xy: 1589, 391 + xy: 1711, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7366,7 +7366,7 @@ metal-floor-3-edge index: -1 metal-floor-5 rotate: false - xy: 1623, 391 + xy: 1745, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7387,21 +7387,21 @@ metal-floor-damaged-edge index: -1 metal-floor-damaged1 rotate: false - xy: 1657, 391 + xy: 1779, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged2 rotate: false - xy: 1691, 391 + xy: 1813, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged3 rotate: false - xy: 1725, 391 + xy: 1847, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7422,294 +7422,301 @@ moss-edge index: -1 moss1 rotate: false - xy: 1759, 391 + xy: 1881, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 moss2 rotate: false - xy: 1793, 391 + xy: 1915, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 moss3 rotate: false - xy: 1827, 391 + xy: 1949, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal1 rotate: false - xy: 1861, 391 + xy: 1983, 425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal2 rotate: false - xy: 1895, 391 + xy: 1017, 343 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal3 rotate: false - xy: 1929, 391 + xy: 1005, 309 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper1 rotate: false - xy: 1963, 391 + xy: 971, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper2 rotate: false - xy: 1997, 391 + xy: 1005, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper3 rotate: false - xy: 723, 179 + xy: 821, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead1 rotate: false - xy: 723, 145 + xy: 855, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead2 rotate: false - xy: 757, 191 + xy: 889, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead3 rotate: false - xy: 757, 157 + xy: 923, 225 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap1 rotate: false - xy: 689, 111 + xy: 787, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap2 rotate: false - xy: 723, 111 + xy: 957, 241 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap3 rotate: false - xy: 757, 123 + xy: 991, 241 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium1 rotate: false - xy: 791, 191 + xy: 821, 191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium2 rotate: false - xy: 791, 157 + xy: 855, 191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium3 rotate: false - xy: 791, 123 + xy: 889, 191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium1 rotate: false - xy: 757, 89 + xy: 923, 191 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium2 rotate: false - xy: 791, 89 + xy: 957, 207 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium3 rotate: false - xy: 591, 99 + xy: 991, 207 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pebbles1 rotate: false - xy: 591, 65 + xy: 957, 173 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pebbles2 rotate: false - xy: 625, 97 + xy: 991, 173 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pebbles3 rotate: false - xy: 625, 63 + xy: 1025, 241 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pine rotate: false - xy: 687, 213 + xy: 785, 311 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -rocks-large - rotate: false - xy: 589, 133 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -rocks1 - rotate: false - xy: 659, 77 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -rocks2 - rotate: false - xy: 693, 77 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -salt - rotate: false - xy: 659, 43 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -salt-edge +ripples rotate: false xy: 393, 199 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 -saltrocks-large +rocks-large rotate: false - xy: 687, 263 + xy: 687, 231 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -saltrocks1 +rocks1 rotate: false - xy: 693, 43 + xy: 1025, 207 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -saltrocks2 +rocks2 rotate: false - xy: 727, 55 + xy: 1025, 173 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -sand-edge +salt + rotate: false + xy: 1039, 309 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +salt-edge rotate: false xy: 491, 297 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 -sand-water +saltrocks-large rotate: false - xy: 761, 21 + xy: 785, 361 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +saltrocks1 + rotate: false + xy: 1039, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -sand-water-edge +saltrocks2 + rotate: false + xy: 1059, 241 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +sand-edge rotate: false xy: 589, 395 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 +sand-water + rotate: false + xy: 591, 65 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +sand-water-edge + rotate: false + xy: 295, 3 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 sand-water1 rotate: false - xy: 795, 21 + xy: 625, 97 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water2 rotate: false - xy: 787, 393 + xy: 625, 63 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-water3 rotate: false - xy: 787, 359 + xy: 659, 97 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand1 rotate: false - xy: 761, 55 + xy: 1059, 207 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand2 rotate: false - xy: 795, 55 + xy: 1059, 173 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand3 rotate: false - xy: 727, 21 + xy: 591, 99 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7723,371 +7730,371 @@ sandrocks-large index: -1 sandrocks1 rotate: false - xy: 821, 393 + xy: 659, 63 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sandrocks2 rotate: false - xy: 787, 325 + xy: 689, 197 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap1 rotate: false - xy: 855, 393 + xy: 689, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap2 rotate: false - xy: 821, 359 + xy: 723, 195 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scrap3 rotate: false - xy: 787, 291 + xy: 723, 161 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale-edge rotate: false - xy: 295, 3 + xy: 393, 101 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 shale1 rotate: false - xy: 889, 393 + xy: 757, 175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale2 rotate: false - xy: 821, 325 + xy: 757, 141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shale3 rotate: false - xy: 855, 359 + xy: 791, 157 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shalerocks-large rotate: false - xy: 917, 427 + xy: 851, 361 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shalerocks1 rotate: false - xy: 923, 393 + xy: 825, 157 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shalerocks2 rotate: false - xy: 821, 291 + xy: 859, 157 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shrubs-large rotate: false - xy: 983, 427 + xy: 917, 427 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 shrubs1 rotate: false - xy: 855, 325 + xy: 893, 157 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shrubs2 rotate: false - xy: 889, 359 + xy: 791, 123 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 slag rotate: false - xy: 957, 393 + xy: 825, 123 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 slag-edge rotate: false - xy: 393, 101 + xy: 491, 199 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 snow-edge rotate: false - xy: 491, 199 + xy: 589, 297 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 snow-pine rotate: false - xy: 1181, 443 + xy: 983, 377 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 snow1 rotate: false - xy: 855, 291 + xy: 859, 123 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow2 rotate: false - xy: 889, 325 + xy: 893, 123 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow3 rotate: false - xy: 923, 359 + xy: 927, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrocks-large rotate: false - xy: 1049, 427 + xy: 917, 361 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 snowrocks1 rotate: false - xy: 991, 393 + xy: 961, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snowrocks2 rotate: false - xy: 889, 291 + xy: 995, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spawn rotate: false - xy: 923, 325 + xy: 1029, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-moss-edge rotate: false - xy: 589, 297 + xy: 687, 395 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 spore-moss1 rotate: false - xy: 957, 359 + xy: 1063, 139 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-moss2 rotate: false - xy: 1025, 393 + xy: 927, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-moss3 rotate: false - xy: 923, 291 + xy: 961, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spore-pine rotate: false - xy: 1231, 443 + xy: 1049, 443 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 sporerocks-large rotate: false - xy: 1115, 427 + xy: 983, 427 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 sporerocks1 rotate: false - xy: 957, 325 + xy: 995, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sporerocks2 rotate: false - xy: 991, 359 + xy: 1029, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-edge rotate: false - xy: 687, 395 + xy: 393, 3 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 stone1 rotate: false - xy: 1059, 393 + xy: 1063, 105 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone2 rotate: false - xy: 957, 291 + xy: 1067, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone3 rotate: false - xy: 991, 325 + xy: 1101, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tainted-water rotate: false - xy: 1025, 359 + xy: 1135, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tainted-water-edge rotate: false - xy: 393, 3 + xy: 491, 101 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 tar rotate: false - xy: 1093, 393 + xy: 1169, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-edge rotate: false - xy: 491, 101 + xy: 589, 199 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 tendrils1 rotate: false - xy: 991, 291 + xy: 1203, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tendrils2 rotate: false - xy: 1025, 325 + xy: 1237, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tendrils3 rotate: false - xy: 1059, 359 + xy: 1271, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 1127, 393 + xy: 1305, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 1025, 291 + xy: 1339, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 1059, 325 + xy: 1373, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 1093, 359 + xy: 1407, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 1059, 291 + xy: 1441, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 1093, 325 + xy: 1475, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water rotate: false - xy: 1127, 359 + xy: 1509, 391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-edge rotate: false - xy: 589, 199 + xy: 687, 297 size: 96, 96 orig: 96, 96 offset: 0, 0 diff --git a/core/assets/sprites/fallback/sprites.png b/core/assets/sprites/fallback/sprites.png index 0ac9ae0e72..6b05408ab2 100644 Binary files a/core/assets/sprites/fallback/sprites.png and b/core/assets/sprites/fallback/sprites.png differ diff --git a/core/assets/sprites/fallback/sprites2.png b/core/assets/sprites/fallback/sprites2.png index 0d87820cf5..6ee45516ec 100644 Binary files a/core/assets/sprites/fallback/sprites2.png and b/core/assets/sprites/fallback/sprites2.png differ diff --git a/core/assets/sprites/fallback/sprites4.png b/core/assets/sprites/fallback/sprites4.png index 340afcfeb1..00dd54576b 100644 Binary files a/core/assets/sprites/fallback/sprites4.png and b/core/assets/sprites/fallback/sprites4.png differ diff --git a/core/assets/sprites/fallback/sprites5.png b/core/assets/sprites/fallback/sprites5.png index 69ee2ace6b..e662f75c4e 100644 Binary files a/core/assets/sprites/fallback/sprites5.png and b/core/assets/sprites/fallback/sprites5.png differ diff --git a/core/assets/sprites/fallback/sprites6.png b/core/assets/sprites/fallback/sprites6.png index 95d69da677..1bb460f317 100644 Binary files a/core/assets/sprites/fallback/sprites6.png and b/core/assets/sprites/fallback/sprites6.png differ diff --git a/core/assets/sprites/fallback/sprites7.png b/core/assets/sprites/fallback/sprites7.png index 449c7250a1..19952fb37c 100644 Binary files a/core/assets/sprites/fallback/sprites7.png and b/core/assets/sprites/fallback/sprites7.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index d79c126414..8deffc814e 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -20,7 +20,7 @@ data-processor index: -1 data-processor-2 rotate: false - xy: 3559, 773 + xy: 3487, 369 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -55,9 +55,9 @@ launch-pad-light index: -1 launchpod rotate: false - xy: 3771, 1337 - size: 66, 64 - orig: 66, 64 + xy: 3691, 649 + size: 64, 64 + orig: 64, 64 offset: 0, 0 index: -1 force-projector @@ -650,7 +650,7 @@ cross index: -1 distributor rotate: false - xy: 3559, 707 + xy: 3559, 773 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -811,14 +811,14 @@ blast-drill-top index: -1 drill-top rotate: false - xy: 3625, 773 + xy: 3559, 575 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 turbine-generator-liquid rotate: false - xy: 3625, 773 + xy: 3559, 575 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1595,7 +1595,7 @@ alloy-smelter-top index: -1 blast-mixer rotate: false - xy: 3289, 464 + xy: 3289, 530 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1609,49 +1609,49 @@ block-forge index: -1 coal-centrifuge rotate: false - xy: 3355, 369 + xy: 3355, 435 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 3493, 699 + xy: 3493, 765 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 3493, 633 + xy: 3493, 699 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 3493, 567 + xy: 3493, 633 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator rotate: false - xy: 3487, 501 + xy: 3493, 567 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 3487, 435 + xy: 3487, 501 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 3487, 369 + xy: 3487, 435 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1679,7 +1679,7 @@ disassembler-spinner index: -1 graphite-press rotate: false - xy: 3625, 641 + xy: 3625, 707 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1707,21 +1707,21 @@ item-void index: -1 kiln rotate: false - xy: 3625, 575 + xy: 3625, 641 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 kiln-top rotate: false - xy: 3691, 781 + xy: 3625, 575 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 3691, 781 + xy: 3625, 575 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -1987,7 +1987,7 @@ white-tree-dead index: -1 container rotate: false - xy: 3427, 765 + xy: 3457, 831 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2071,7 +2071,7 @@ block-1 index: -1 block-2 rotate: false - xy: 3289, 398 + xy: 3289, 464 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2099,7 +2099,7 @@ hail-heat index: -1 lancer-heat rotate: false - xy: 3691, 649 + xy: 3691, 715 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2176,7 +2176,7 @@ air-factory index: -1 command-center rotate: false - xy: 3457, 831 + xy: 3355, 369 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2330,7 +2330,7 @@ copper-wall index: -1 copper-wall-large rotate: false - xy: 3427, 699 + xy: 3427, 765 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2344,14 +2344,14 @@ door index: -1 door-large rotate: false - xy: 3559, 641 + xy: 3559, 707 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 3559, 575 + xy: 3559, 641 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -2876,14 +2876,14 @@ block-craters-full index: -1 block-cryofluidmixer-full rotate: false - xy: 3711, 913 + xy: 3289, 398 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-cultivator-full rotate: false - xy: 3777, 933 + xy: 3711, 913 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3009,7 +3009,7 @@ block-impact-reactor-full index: -1 block-lancer-full rotate: false - xy: 3843, 933 + xy: 3777, 933 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3065,7 +3065,7 @@ block-mass-driver-full index: -1 block-mechanical-drill-full rotate: false - xy: 3777, 867 + xy: 3843, 933 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3156,7 +3156,7 @@ block-ore-titanium-full index: -1 block-parallax-full rotate: false - xy: 3843, 867 + xy: 3777, 867 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3184,7 +3184,7 @@ block-pebbles-full index: -1 block-phase-weaver-full rotate: false - xy: 3711, 847 + xy: 3843, 867 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3198,7 +3198,7 @@ block-plated-conduit-full index: -1 block-pneumatic-drill-full rotate: false - xy: 3777, 801 + xy: 3711, 847 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3254,7 +3254,7 @@ block-saltrocks-full index: -1 block-salvo-full rotate: false - xy: 3843, 801 + xy: 3777, 801 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3282,7 +3282,7 @@ block-sandrocks-full index: -1 block-scatter-full rotate: false - xy: 3325, 831 + xy: 3843, 801 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3324,14 +3324,14 @@ scrap-wall-huge1 index: -1 block-scrap-wall-large-full rotate: false - xy: 3391, 831 + xy: 3325, 831 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-segment-full rotate: false - xy: 3361, 765 + xy: 3391, 831 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3408,7 +3408,7 @@ block-spore-moss-full index: -1 block-spore-press-full rotate: false - xy: 3361, 699 + xy: 3361, 765 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3429,7 +3429,7 @@ block-stone-full index: -1 block-swarmer-full rotate: false - xy: 3361, 633 + xy: 3361, 699 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3464,21 +3464,21 @@ titanium-conveyor-0-0 index: -1 block-turbine-generator-full rotate: false - xy: 3361, 567 + xy: 3361, 633 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-water-extractor-full rotate: false - xy: 3355, 501 + xy: 3361, 567 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 block-wave-full rotate: false - xy: 3355, 435 + xy: 3355, 501 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -3604,56 +3604,56 @@ cracks-1-7 index: -1 cracks-2-0 rotate: false - xy: 3427, 633 + xy: 3427, 699 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-1 rotate: false - xy: 3427, 567 + xy: 3427, 633 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-2 rotate: false - xy: 3421, 501 + xy: 3427, 567 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-3 rotate: false - xy: 3421, 435 + xy: 3421, 501 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-4 rotate: false - xy: 3421, 369 + xy: 3421, 435 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-5 rotate: false - xy: 3523, 839 + xy: 3421, 369 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-6 rotate: false - xy: 3589, 839 + xy: 3523, 839 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 cracks-2-7 rotate: false - xy: 3493, 765 + xy: 3589, 839 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4738,7 +4738,7 @@ item-thorium-small index: -1 item-thorium-tiny rotate: false - xy: 3821, 1319 + xy: 3729, 985 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4773,7 +4773,7 @@ item-titanium-small index: -1 item-titanium-tiny rotate: false - xy: 3729, 985 + xy: 3726, 235 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4787,7 +4787,7 @@ item-titanium-xlarge index: -1 lancer rotate: false - xy: 3691, 715 + xy: 3691, 781 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -4815,7 +4815,7 @@ liquid-cryofluid-small index: -1 liquid-cryofluid-tiny rotate: false - xy: 3726, 235 + xy: 3073, 317 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4850,7 +4850,7 @@ liquid-oil-small index: -1 liquid-oil-tiny rotate: false - xy: 3073, 317 + xy: 3277, 272 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4885,7 +4885,7 @@ liquid-slag-small index: -1 liquid-slag-tiny rotate: false - xy: 3277, 272 + xy: 3651, 209 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4920,7 +4920,7 @@ liquid-water-small index: -1 liquid-water-tiny rotate: false - xy: 3651, 209 + xy: 2185, 68 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5746,7 +5746,7 @@ atrax index: -1 atrax-base rotate: false - xy: 3289, 530 + xy: 3771, 1337 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -5942,7 +5942,7 @@ fortress index: -1 fortress-base rotate: false - xy: 3625, 707 + xy: 3625, 773 size: 64, 64 orig: 64, 64 offset: 0, 0 @@ -6717,147 +6717,147 @@ filter: nearest,nearest repeat: none char1 rotate: false - xy: 2311, 213 + xy: 51, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 char2 rotate: false - xy: 101, 17 + xy: 1717, 81 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 char3 rotate: false - xy: 2345, 213 + xy: 1997, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cliff rotate: false - xy: 135, 17 + xy: 2047, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cliffs1 rotate: false - xy: 2379, 213 + xy: 85, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal1 rotate: false - xy: 169, 17 + xy: 1751, 81 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal2 rotate: false - xy: 2413, 213 + xy: 1997, 129 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal3 rotate: false - xy: 203, 17 + xy: 2081, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper1 rotate: false - xy: 2447, 213 + xy: 119, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper2 rotate: false - xy: 237, 17 + xy: 1785, 81 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper3 rotate: false - xy: 2481, 213 + xy: 2115, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters1 rotate: false - xy: 271, 17 + xy: 153, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters2 rotate: false - xy: 2515, 213 + xy: 1819, 81 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters3 rotate: false - xy: 305, 17 + xy: 2149, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters4 rotate: false - xy: 2549, 213 + xy: 187, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters5 rotate: false - xy: 339, 17 + xy: 1853, 81 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 craters6 rotate: false - xy: 2583, 213 + xy: 2183, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-metal-large rotate: false - xy: 1569, 83 + xy: 1667, 181 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dark-metal1 rotate: false - xy: 373, 17 + xy: 221, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-metal2 rotate: false - xy: 2617, 213 + xy: 1887, 81 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dark-panel-1 rotate: false - xy: 407, 17 + xy: 2217, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6871,7 +6871,7 @@ dark-panel-1-edge index: -1 dark-panel-2 rotate: false - xy: 2651, 213 + xy: 255, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6885,7 +6885,7 @@ dark-panel-2-edge index: -1 dark-panel-3 rotate: false - xy: 441, 17 + xy: 1921, 81 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6899,7 +6899,7 @@ dark-panel-3-edge index: -1 dark-panel-4 rotate: false - xy: 2685, 213 + xy: 2251, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6913,7 +6913,7 @@ dark-panel-4-edge index: -1 dark-panel-5 rotate: false - xy: 475, 17 + xy: 289, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6927,7 +6927,7 @@ dark-panel-5-edge index: -1 dark-panel-6 rotate: false - xy: 2719, 213 + xy: 1955, 81 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6948,7 +6948,7 @@ darksand-edge index: -1 darksand-tainted-water rotate: false - xy: 2787, 213 + xy: 357, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6962,28 +6962,28 @@ darksand-tainted-water-edge index: -1 darksand-tainted-water1 rotate: false - xy: 577, 17 + xy: 2353, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-tainted-water2 rotate: false - xy: 2821, 213 + xy: 391, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-tainted-water3 rotate: false - xy: 611, 17 + xy: 2387, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-water rotate: false - xy: 2855, 213 + xy: 425, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6997,49 +6997,49 @@ darksand-water-edge index: -1 darksand-water1 rotate: false - xy: 645, 17 + xy: 2421, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-water2 rotate: false - xy: 2889, 213 + xy: 459, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand-water3 rotate: false - xy: 679, 17 + xy: 2455, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand1 rotate: false - xy: 509, 17 + xy: 2285, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand2 rotate: false - xy: 2753, 213 + xy: 323, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 darksand3 rotate: false - xy: 543, 17 + xy: 2319, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater rotate: false - xy: 2923, 213 + xy: 493, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7053,28 +7053,28 @@ deepwater-edge index: -1 dunerocks-large rotate: false - xy: 1667, 181 + xy: 1667, 115 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 dunerocks1 rotate: false - xy: 713, 17 + xy: 2489, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dunerocks2 rotate: false - xy: 2957, 213 + xy: 527, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 edge rotate: false - xy: 747, 17 + xy: 2523, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7088,7 +7088,7 @@ edge-stencil index: -1 edgier rotate: false - xy: 2991, 213 + xy: 561, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7102,21 +7102,21 @@ grass-edge index: -1 grass1 rotate: false - xy: 781, 17 + xy: 2557, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass2 rotate: false - xy: 3025, 213 + xy: 595, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass3 rotate: false - xy: 815, 17 + xy: 2591, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7130,42 +7130,42 @@ holostone-edge index: -1 holostone1 rotate: false - xy: 3059, 213 + xy: 629, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone2 rotate: false - xy: 849, 17 + xy: 2625, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 holostone3 rotate: false - xy: 3093, 213 + xy: 663, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock1 rotate: false - xy: 883, 17 + xy: 2659, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock2 rotate: false - xy: 3127, 213 + xy: 697, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 hotrock3 rotate: false - xy: 917, 17 + xy: 2693, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7186,42 +7186,42 @@ ice-snow-edge index: -1 ice-snow1 rotate: false - xy: 985, 17 + xy: 2761, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow2 rotate: false - xy: 3229, 213 + xy: 799, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-snow3 rotate: false - xy: 1019, 17 + xy: 2795, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice1 rotate: false - xy: 3161, 213 + xy: 731, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice2 rotate: false - xy: 951, 17 + xy: 2727, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice3 rotate: false - xy: 3195, 213 + xy: 765, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7235,14 +7235,14 @@ icerocks-large index: -1 icerocks1 rotate: false - xy: 3263, 213 + xy: 833, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icerocks2 rotate: false - xy: 1053, 17 + xy: 2829, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7256,77 +7256,77 @@ ignarock-edge index: -1 ignarock1 rotate: false - xy: 3297, 213 + xy: 867, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ignarock2 rotate: false - xy: 1087, 17 + xy: 2863, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ignarock3 rotate: false - xy: 3331, 213 + xy: 901, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead1 rotate: false - xy: 1121, 17 + xy: 2897, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead2 rotate: false - xy: 3365, 213 + xy: 935, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead3 rotate: false - xy: 1155, 17 + xy: 2931, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock1 rotate: false - xy: 3399, 213 + xy: 969, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock2 rotate: false - xy: 1189, 17 + xy: 2965, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 magmarock3 rotate: false - xy: 3433, 213 + xy: 1003, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor rotate: false - xy: 1223, 17 + xy: 2999, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-2 rotate: false - xy: 3467, 213 + xy: 1037, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7340,7 +7340,7 @@ metal-floor-2-edge index: -1 metal-floor-3 rotate: false - xy: 1257, 17 + xy: 3033, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7354,7 +7354,7 @@ metal-floor-3-edge index: -1 metal-floor-5 rotate: false - xy: 3501, 213 + xy: 1071, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7375,21 +7375,21 @@ metal-floor-damaged-edge index: -1 metal-floor-damaged1 rotate: false - xy: 1291, 17 + xy: 3067, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged2 rotate: false - xy: 3535, 213 + xy: 1105, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metal-floor-damaged3 rotate: false - xy: 1325, 17 + xy: 3101, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7410,168 +7410,168 @@ moss-edge index: -1 moss1 rotate: false - xy: 3569, 213 + xy: 1139, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 moss2 rotate: false - xy: 1359, 17 + xy: 3135, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 moss3 rotate: false - xy: 3603, 213 + xy: 1173, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal1 rotate: false - xy: 1393, 17 + xy: 3169, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal2 rotate: false - xy: 3637, 213 + xy: 1207, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal3 rotate: false - xy: 1427, 17 + xy: 3203, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper1 rotate: false - xy: 3671, 213 + xy: 1241, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper2 rotate: false - xy: 1461, 17 + xy: 3237, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper3 rotate: false - xy: 3705, 213 + xy: 1275, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead1 rotate: false - xy: 1495, 17 + xy: 3271, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead2 rotate: false - xy: 3739, 213 + xy: 1309, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead3 rotate: false - xy: 1529, 17 + xy: 3305, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap1 rotate: false - xy: 3773, 213 + xy: 1343, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap2 rotate: false - xy: 3807, 213 + xy: 3339, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-scrap3 rotate: false - xy: 3841, 213 + xy: 1377, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium1 rotate: false - xy: 3875, 213 + xy: 3373, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium2 rotate: false - xy: 3909, 213 + xy: 1411, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium3 rotate: false - xy: 3943, 213 + xy: 3407, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium1 rotate: false - xy: 3977, 213 + xy: 1445, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium2 rotate: false - xy: 4011, 213 + xy: 3441, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium3 rotate: false - xy: 4045, 213 + xy: 1479, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pebbles1 rotate: false - xy: 1569, 49 + xy: 3475, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pebbles2 rotate: false - xy: 1635, 115 + xy: 1513, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pebbles3 rotate: false - xy: 1603, 49 + xy: 3509, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -7583,499 +7583,506 @@ pine orig: 48, 48 offset: 0, 0 index: -1 -rocks-large - rotate: false - xy: 1799, 181 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -rocks1 - rotate: false - xy: 1563, 15 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -rocks2 - rotate: false - xy: 1597, 15 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -salt - rotate: false - xy: 2261, 163 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -salt-edge +ripples rotate: false xy: 1079, 149 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 -saltrocks-large +rocks-large rotate: false - xy: 1865, 181 + xy: 1733, 115 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -saltrocks1 +rocks1 rotate: false - xy: 2311, 179 + xy: 1547, 17 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -saltrocks2 +rocks2 rotate: false - xy: 2345, 179 + xy: 3543, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -sand-edge +salt + rotate: false + xy: 1581, 17 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +salt-edge rotate: false xy: 1079, 51 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 -sand-water +saltrocks-large rotate: false - xy: 2481, 179 + xy: 1799, 181 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +saltrocks1 + rotate: false + xy: 3577, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -sand-water-edge +saltrocks2 + rotate: false + xy: 1615, 17 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +sand-edge rotate: false xy: 1177, 149 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 -sand-water1 +sand-water rotate: false - xy: 2515, 179 + xy: 3713, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -sand-water2 - rotate: false - xy: 2549, 179 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -sand-water3 - rotate: false - xy: 2583, 179 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -sand1 - rotate: false - xy: 2379, 179 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -sand2 - rotate: false - xy: 2413, 179 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -sand3 - rotate: false - xy: 2447, 179 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -sandrocks-large - rotate: false - xy: 1931, 181 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -sandrocks1 - rotate: false - xy: 2617, 179 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -sandrocks2 - rotate: false - xy: 2651, 179 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -scrap1 - rotate: false - xy: 2685, 179 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -scrap2 - rotate: false - xy: 2719, 179 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -scrap3 - rotate: false - xy: 2753, 179 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -shale-edge +sand-water-edge rotate: false xy: 1177, 51 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 -shale1 +sand-water1 rotate: false - xy: 2787, 179 + xy: 3747, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -shale2 +sand-water2 rotate: false - xy: 2821, 179 + xy: 3781, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -shale3 +sand-water3 rotate: false - xy: 2855, 179 + xy: 3815, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -shalerocks-large +sand1 rotate: false - xy: 1997, 181 + xy: 3611, 213 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +sand2 + rotate: false + xy: 3645, 213 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +sand3 + rotate: false + xy: 3679, 213 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +sandrocks-large + rotate: false + xy: 1799, 115 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -shalerocks1 +sandrocks1 rotate: false - xy: 2889, 179 + xy: 3849, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -shalerocks2 +sandrocks2 rotate: false - xy: 2923, 179 + xy: 3883, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -shrubs-large +scrap1 rotate: false - xy: 2063, 181 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -shrubs1 - rotate: false - xy: 2957, 179 + xy: 3917, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -shrubs2 +scrap2 rotate: false - xy: 2991, 179 + xy: 3951, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -slag +scrap3 rotate: false - xy: 3025, 179 + xy: 3985, 213 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -slag-edge +shale-edge rotate: false xy: 1275, 149 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 -snow-edge +shale1 + rotate: false + xy: 4019, 213 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +shale2 + rotate: false + xy: 4053, 213 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +shale3 + rotate: false + xy: 1649, 17 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +shalerocks-large + rotate: false + xy: 1865, 181 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +shalerocks1 + rotate: false + xy: 1683, 31 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +shalerocks2 + rotate: false + xy: 1717, 47 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +shrubs-large + rotate: false + xy: 1865, 115 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +shrubs1 + rotate: false + xy: 1751, 47 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +shrubs2 + rotate: false + xy: 1785, 47 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +slag + rotate: false + xy: 1819, 47 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +slag-edge rotate: false xy: 1275, 51 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 -snow-pine - rotate: false - xy: 2261, 197 - size: 48, 48 - orig: 48, 48 - offset: 0, 0 - index: -1 -snow1 - rotate: false - xy: 3059, 179 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -snow2 - rotate: false - xy: 3093, 179 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -snow3 - rotate: false - xy: 3127, 179 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -snowrocks-large - rotate: false - xy: 2129, 181 - size: 64, 64 - orig: 64, 64 - offset: 0, 0 - index: -1 -snowrocks1 - rotate: false - xy: 3161, 179 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -snowrocks2 - rotate: false - xy: 3195, 179 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -spawn - rotate: false - xy: 3229, 179 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -spore-moss-edge +snow-edge rotate: false xy: 1373, 149 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 -spore-moss1 +snow-pine rotate: false - xy: 3263, 179 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -spore-moss2 - rotate: false - xy: 3297, 179 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -spore-moss3 - rotate: false - xy: 3331, 179 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -spore-pine - rotate: false - xy: 51, 1 + xy: 1667, 65 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 -sporerocks-large +snow1 rotate: false - xy: 2195, 181 + xy: 1853, 47 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +snow2 + rotate: false + xy: 1887, 47 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +snow3 + rotate: false + xy: 1921, 47 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +snowrocks-large + rotate: false + xy: 1931, 181 size: 64, 64 orig: 64, 64 offset: 0, 0 index: -1 -sporerocks1 +snowrocks1 rotate: false - xy: 3365, 179 + xy: 1955, 47 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -sporerocks2 +snowrocks2 rotate: false - xy: 3399, 179 + xy: 2031, 163 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -stone-edge +spawn + rotate: false + xy: 2031, 129 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +spore-moss-edge rotate: false xy: 1373, 51 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 -stone1 +spore-moss1 rotate: false - xy: 3433, 179 + xy: 2065, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -stone2 +spore-moss2 rotate: false - xy: 3467, 179 + xy: 2065, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -stone3 +spore-moss3 rotate: false - xy: 3501, 179 + xy: 2099, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -tainted-water +spore-pine rotate: false - xy: 3535, 179 + xy: 1997, 197 + size: 48, 48 + orig: 48, 48 + offset: 0, 0 + index: -1 +sporerocks-large + rotate: false + xy: 1931, 115 + size: 64, 64 + orig: 64, 64 + offset: 0, 0 + index: -1 +sporerocks1 + rotate: false + xy: 2099, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -tainted-water-edge +sporerocks2 + rotate: false + xy: 2133, 179 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +stone-edge rotate: false xy: 1471, 149 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 -tar +stone1 rotate: false - xy: 3569, 179 + xy: 2133, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -tar-edge +stone2 + rotate: false + xy: 2167, 179 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +stone3 + rotate: false + xy: 2167, 145 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +tainted-water + rotate: false + xy: 2201, 179 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +tainted-water-edge rotate: false xy: 1471, 51 size: 96, 96 orig: 96, 96 offset: 0, 0 index: -1 +tar + rotate: false + xy: 2201, 145 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +tar-edge + rotate: false + xy: 1569, 149 + size: 96, 96 + orig: 96, 96 + offset: 0, 0 + index: -1 tendrils1 rotate: false - xy: 3603, 179 + xy: 2235, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tendrils2 rotate: false - xy: 3637, 179 + xy: 2235, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tendrils3 rotate: false - xy: 3671, 179 + xy: 2269, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 3705, 179 + xy: 2269, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 3739, 179 + xy: 2303, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 3773, 179 + xy: 2303, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 3807, 179 + xy: 2337, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 3841, 179 + xy: 2337, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 3875, 179 + xy: 2371, 179 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water rotate: false - xy: 3909, 179 + xy: 2371, 145 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-edge rotate: false - xy: 1569, 149 + xy: 1569, 51 size: 96, 96 orig: 96, 96 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 82523b7c54..ca0c55b20e 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 54a7288fc8..92d12e2698 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/assets/sprites/sprites3.png b/core/assets/sprites/sprites3.png index 39ce589d42..0832279113 100644 Binary files a/core/assets/sprites/sprites3.png and b/core/assets/sprites/sprites3.png differ diff --git a/core/assets/sprites/sprites4.png b/core/assets/sprites/sprites4.png index 0b9c292c05..002a279138 100644 Binary files a/core/assets/sprites/sprites4.png and b/core/assets/sprites/sprites4.png differ diff --git a/core/assets/sprites/sprites5.png b/core/assets/sprites/sprites5.png index 7995912815..c2488b7ee3 100644 Binary files a/core/assets/sprites/sprites5.png and b/core/assets/sprites/sprites5.png differ diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index b34a68a008..801f2ee057 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -14,14 +14,12 @@ import arc.scene.ui.layout.*; import arc.struct.*; import arc.util.*; import arc.util.ArcAnnotate.*; -import mindustry.content.*; import mindustry.ctype.*; import mindustry.game.*; import mindustry.gen.*; import mindustry.graphics.*; import mindustry.graphics.g3d.*; import mindustry.type.*; -import mindustry.type.Sector.*; import mindustry.ui.*; import mindustry.world.blocks.storage.*; import mindustry.world.blocks.storage.CoreBlock.*; @@ -184,7 +182,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ planets.drawPlane(hovered, () -> { Draw.color(Color.white, Pal.accent, Mathf.absin(5f, 1f)); - TextureRegion icon = hovered.locked() && !canLaunch(hovered) ? Icon.lock.getRegion() : hovered.is(SectorAttribute.naval) ? Liquids.water.icon(Cicon.large) : null; + TextureRegion icon = hovered.locked() && !canLaunch(hovered) ? Icon.lock.getRegion() : null; if(icon != null){ Draw.rect(icon, 0, 0); @@ -372,12 +370,8 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ stable.row(); - if((sector.hasBase() && mode == look) || canLaunch(sector) || sector.preset.alwaysUnlocked){ + if((sector.hasBase() && mode == look) || canLaunch(sector) || (sector.preset != null && sector.preset.alwaysUnlocked)){ stable.button(sector.hasBase() ? "Resume" : "Launch", Styles.transt, () -> { - if(sector.is(SectorAttribute.naval)){ - ui.showInfo("You need a naval loadout to launch here."); - return; - } boolean shouldHide = true; diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java index ee08bb03ed..e6324c4888 100644 --- a/core/src/mindustry/world/Block.java +++ b/core/src/mindustry/world/Block.java @@ -80,6 +80,8 @@ public class Block extends UnlockableContent{ public boolean rebuildable = true; /** whether this water can only be placed on water */ public boolean requiresWater = false; + /** whether this water can be placed on any liquids, anywhere */ + public boolean placeableLiquid = false; /** whether this floor can be placed on. */ public boolean placeableOn = true; /** whether this block has insulating properties. */ diff --git a/core/src/mindustry/world/Build.java b/core/src/mindustry/world/Build.java index 5ea1ef3aae..f8718fa458 100644 --- a/core/src/mindustry/world/Build.java +++ b/core/src/mindustry/world/Build.java @@ -114,7 +114,7 @@ public class Build{ return type.bounds(x, y, Tmp.r1).grow(0.01f).contains(tile.block.bounds(tile.centerX(), tile.centerY(), Tmp.r2)); } - if(!type.requiresWater && !contactsShallows(tile.x, tile.y, type)){ + if(!type.requiresWater && !contactsShallows(tile.x, tile.y, type) && !type.placeableLiquid){ return false; } @@ -131,7 +131,7 @@ public class Build{ other == null || !other.block().alwaysReplace || !other.floor().placeableOn || - (other.floor().isDeep() && !type.floating && !type.requiresWater) || + (other.floor().isDeep() && !type.floating && !type.requiresWater && !type.placeableLiquid) || (type.requiresWater && tile.floor().liquidDrop != Liquids.water) ){ return false; @@ -141,8 +141,8 @@ public class Build{ return true; }else{ return tile.interactable(team) - && (contactsShallows(tile.x, tile.y, type) || type.requiresWater) - && (!tile.floor().isDeep() || type.floating || type.requiresWater) + && (contactsShallows(tile.x, tile.y, type) || type.requiresWater || type.placeableLiquid) + && (!tile.floor().isDeep() || type.floating || type.requiresWater || type.placeableLiquid) && tile.floor().placeableOn && (!type.requiresWater || tile.floor().liquidDrop == Liquids.water) && (((type.canReplace(tile.block()) || (tile.block instanceof BuildBlock && tile.bc().cblock == type))