diff --git a/core/assets-raw/sprites/blocks/environment/blackrockshadow1.png b/core/assets-raw/sprites/blocks/environment/blackrockshadow1.png deleted file mode 100644 index 11730b4576..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/blackrockshadow1.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/grass-cliff-edge-1.png b/core/assets-raw/sprites/blocks/environment/grass-cliff-edge-1.png deleted file mode 100644 index 38f7011a99..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/grass-cliff-edge-1.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/grass-cliff-edge-2.png b/core/assets-raw/sprites/blocks/environment/grass-cliff-edge-2.png deleted file mode 100644 index 4625d77cfb..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/grass-cliff-edge-2.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/grass-cliff-edge.png b/core/assets-raw/sprites/blocks/environment/grass-cliff-edge.png deleted file mode 100644 index 5d93602184..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/grass-cliff-edge.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/grass-cliff-side.png b/core/assets-raw/sprites/blocks/environment/grass-cliff-side.png deleted file mode 100644 index a165417491..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/grass-cliff-side.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/grass1.png b/core/assets-raw/sprites/blocks/environment/grass1.png index d024726eba..1e600d144d 100644 Binary files a/core/assets-raw/sprites/blocks/environment/grass1.png and b/core/assets-raw/sprites/blocks/environment/grass1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/grass2.png b/core/assets-raw/sprites/blocks/environment/grass2.png index 0271e2c0c9..5bdfe6cc8e 100644 Binary files a/core/assets-raw/sprites/blocks/environment/grass2.png and b/core/assets-raw/sprites/blocks/environment/grass2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/grass3.png b/core/assets-raw/sprites/blocks/environment/grass3.png index 37457a6ad2..6ce88c3d74 100644 Binary files a/core/assets-raw/sprites/blocks/environment/grass3.png and b/core/assets-raw/sprites/blocks/environment/grass3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/grassedge.png b/core/assets-raw/sprites/blocks/environment/grassedge.png index fdf155f66f..f4e2a53254 100644 Binary files a/core/assets-raw/sprites/blocks/environment/grassedge.png and b/core/assets-raw/sprites/blocks/environment/grassedge.png differ diff --git a/core/assets-raw/sprites/blocks/environment/icerockshadow1.png b/core/assets-raw/sprites/blocks/environment/icerockshadow1.png deleted file mode 100644 index daa90b6e0d..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/icerockshadow1.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/icerockshadow2.png b/core/assets-raw/sprites/blocks/environment/icerockshadow2.png deleted file mode 100644 index 1bbc0af176..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/icerockshadow2.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/rockshadow1.png b/core/assets-raw/sprites/blocks/environment/rockshadow1.png deleted file mode 100644 index daa90b6e0d..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/rockshadow1.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/rockshadow2.png b/core/assets-raw/sprites/blocks/environment/rockshadow2.png deleted file mode 100644 index 1bbc0af176..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/rockshadow2.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/environment/shrub.png b/core/assets-raw/sprites/blocks/environment/shrub.png index 6a7bad1a80..74335d79cd 100644 Binary files a/core/assets-raw/sprites/blocks/environment/shrub.png and b/core/assets-raw/sprites/blocks/environment/shrub.png differ diff --git a/core/assets-raw/sprites/blocks/environment/shrubshadow.png b/core/assets-raw/sprites/blocks/environment/shrubshadow.png deleted file mode 100644 index 7c22d939de..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/shrubshadow.png and /dev/null differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 5af9d7ff16..0796c49985 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -27,294 +27,294 @@ overdrive-projector-top index: -1 bridge-conveyor rotate: false - xy: 295, 713 + xy: 295, 747 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 329, 747 + xy: 329, 781 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 295, 679 + xy: 295, 713 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 329, 305 + xy: 329, 339 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 295, 237 + xy: 295, 271 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 329, 271 + xy: 329, 305 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 295, 203 + xy: 295, 237 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 329, 237 + xy: 329, 271 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 295, 169 + xy: 295, 203 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 329, 203 + xy: 329, 237 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 295, 135 + xy: 295, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 329, 169 + xy: 329, 203 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 295, 101 + xy: 295, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 329, 135 + xy: 329, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 295, 67 + xy: 295, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 329, 101 + xy: 329, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 329, 67 + xy: 295, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 301, 33 + xy: 329, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 335, 33 + xy: 329, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 401, 913 + xy: 301, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 435, 913 + xy: 335, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 499, 1011 + xy: 401, 913 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 403, 879 + xy: 1917, 1297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 437, 879 + xy: 1951, 1297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 371, 845 + xy: 1985, 1289 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 405, 845 + xy: 369, 879 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 439, 845 + xy: 403, 879 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 397, 811 + xy: 437, 879 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 397, 777 + xy: 371, 845 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 431, 811 + xy: 405, 845 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 397, 743 + xy: 439, 845 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 431, 777 + xy: 397, 811 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 397, 709 + xy: 397, 777 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 431, 743 + xy: 431, 811 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 397, 675 + xy: 397, 743 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 431, 709 + xy: 431, 777 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 397, 641 + xy: 397, 709 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 431, 675 + xy: 431, 743 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 397, 607 + xy: 397, 675 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 431, 641 + xy: 431, 709 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 397, 573 + xy: 397, 641 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 junction rotate: false - xy: 1019, 1243 + xy: 363, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -328,21 +328,21 @@ mass-driver-turret index: -1 phase-conveyor-arrow rotate: false - xy: 1679, 1333 + xy: 1713, 1401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 1713, 1367 + xy: 1747, 1435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 1747, 1401 + xy: 1781, 1469 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -550,37 +550,30 @@ block-icon-blackrock orig: 32, 32 offset: 0, 0 index: -1 -blackrockshadow1 +blackstone1 rotate: false xy: 997, 1413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -blackstone1 - rotate: false - xy: 1031, 1413 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 block-icon-blackstone rotate: false - xy: 1031, 1413 + xy: 997, 1413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 1065, 1413 + xy: 1031, 1413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 1099, 1413 + xy: 1065, 1413 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -594,56 +587,56 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 329, 713 + xy: 329, 747 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal2 rotate: false - xy: 295, 645 + xy: 295, 679 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 coal3 rotate: false - xy: 329, 679 + xy: 329, 713 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper1 rotate: false - xy: 533, 1011 + xy: 435, 913 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper2 rotate: false - xy: 1407, 1403 + xy: 499, 1011 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper3 rotate: false - xy: 1435, 1521 + xy: 533, 1011 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 1475, 1453 + xy: 1469, 1521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 1475, 1419 + xy: 1475, 1487 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -671,14 +664,14 @@ ice-cliff-edge index: -1 generic-cliff-edge-1 rotate: false - xy: 363, 577 + xy: 363, 645 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-cliff-edge-1 rotate: false - xy: 363, 577 + xy: 363, 645 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -699,42 +692,14 @@ ice-cliff-edge-2 index: -1 generic-cliff-side rotate: false - xy: 363, 543 + xy: 363, 611 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-cliff-side rotate: false - xy: 363, 543 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -grass-cliff-edge - rotate: false - xy: 1029, 1277 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -grass-cliff-edge-1 - rotate: false - xy: 363, 475 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -grass-cliff-edge-2 - rotate: false - xy: 1063, 1277 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -grass-cliff-side - rotate: false - xy: 363, 441 + xy: 363, 611 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -748,7 +713,7 @@ grass2 index: -1 grass3 rotate: false - xy: 363, 509 + xy: 363, 577 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -762,7 +727,7 @@ grassedge index: -1 ice2 rotate: false - xy: 363, 407 + xy: 363, 475 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -783,35 +748,7 @@ iceedge index: -1 icerock2 rotate: false - xy: 363, 373 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -icerockshadow1 - rotate: false - xy: 1165, 1277 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -rockshadow1 - rotate: false - xy: 1165, 1277 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -icerockshadow2 - rotate: false - xy: 363, 339 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -rockshadow2 - rotate: false - xy: 363, 339 + xy: 363, 441 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -825,56 +762,56 @@ lavaedge index: -1 lead1 rotate: false - xy: 1121, 1243 + xy: 1053, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead2 rotate: false - xy: 1087, 1209 + xy: 1019, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead3 rotate: false - xy: 1155, 1243 + xy: 1087, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 1257, 1209 + xy: 1189, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 1291, 1209 + xy: 1257, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 993, 1175 + xy: 1223, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 993, 1141 + xy: 1291, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 1027, 1175 + xy: 1257, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -888,21 +825,21 @@ metalflooredge index: -1 rock2 rotate: false - xy: 1849, 1401 + xy: 1815, 1401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand2 rotate: false - xy: 1849, 1367 + xy: 1781, 1333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand3 rotate: false - xy: 1849, 1333 + xy: 1815, 1367 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -914,23 +851,16 @@ sandedge orig: 48, 48 offset: 0, 0 index: -1 -shrubshadow - rotate: false - xy: 1917, 1331 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 snow2 rotate: false - xy: 1927, 1535 + xy: 1917, 1433 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow3 rotate: false - xy: 1951, 1501 + xy: 1917, 1399 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -951,42 +881,42 @@ spaceedge index: -1 stone-cliff-edge rotate: false - xy: 1985, 1391 + xy: 1985, 1527 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 1985, 1357 + xy: 1985, 1493 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 1985, 1323 + xy: 1985, 1459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 1679, 1299 + xy: 1985, 1425 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone2 rotate: false - xy: 1985, 1459 + xy: 1961, 1561 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone3 rotate: false - xy: 1985, 1425 + xy: 1995, 1561 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1007,70 +937,70 @@ taredge index: -1 thorium1 rotate: false - xy: 1849, 1299 + xy: 1713, 1299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 1883, 1297 + xy: 1747, 1299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 1917, 1297 + xy: 1781, 1299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 1951, 1297 + xy: 1815, 1299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 1985, 1289 + xy: 1849, 1299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 369, 879 + xy: 1883, 1297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-cliff-edge rotate: false - xy: 397, 539 + xy: 397, 607 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-cliff-edge-1 rotate: false - xy: 431, 573 + xy: 431, 641 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-cliff-edge-2 rotate: false - xy: 397, 505 + xy: 397, 573 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-cliff-side rotate: false - xy: 431, 539 + xy: 431, 607 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1084,56 +1014,56 @@ wateredge index: -1 block-border rotate: false - xy: 1625, 1571 + xy: 1591, 1567 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-elevation rotate: false - xy: 1659, 1571 + xy: 1625, 1571 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-middle rotate: false - xy: 267, 15 + xy: 199, 8 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 267, 15 + xy: 199, 8 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-slope rotate: false - xy: 303, 815 + xy: 233, 15 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 border rotate: false - xy: 337, 815 + xy: 267, 15 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 329, 441 + xy: 329, 475 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 1441, 1487 + xy: 1407, 1403 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1161,7 +1091,7 @@ cross-4 index: -1 place-arrow rotate: false - xy: 1781, 1435 + xy: 1815, 1503 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1217,154 +1147,154 @@ rubble-3-1 index: -1 bridge-conduit-arrow rotate: false - xy: 295, 781 + xy: 303, 815 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 295, 781 + xy: 303, 815 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 295, 747 + xy: 337, 815 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 329, 781 + xy: 295, 781 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 329, 577 + xy: 329, 611 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 295, 509 + xy: 295, 543 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 329, 543 + xy: 329, 577 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 295, 475 + xy: 295, 509 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 329, 509 + xy: 329, 543 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 295, 441 + xy: 295, 475 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 329, 475 + xy: 329, 509 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 295, 407 + xy: 295, 441 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 295, 373 + xy: 295, 407 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 329, 407 + xy: 329, 441 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 295, 339 + xy: 295, 373 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 329, 373 + xy: 329, 407 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 295, 305 + xy: 295, 339 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 329, 339 + xy: 329, 373 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 295, 271 + xy: 295, 305 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 1257, 1243 + xy: 1189, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 1223, 1209 + xy: 1155, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 1291, 1243 + xy: 1223, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1392,70 +1322,70 @@ liquid-tank-top index: -1 phase-conduit-arrow rotate: false - xy: 1747, 1435 + xy: 1747, 1469 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 1781, 1469 + xy: 1781, 1503 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 1815, 1503 + xy: 1679, 1367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 1747, 1367 + xy: 1781, 1435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1781, 1401 + xy: 1815, 1469 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1815, 1435 + xy: 1849, 1503 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 1849, 1469 + xy: 1713, 1333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 1747, 1333 + xy: 1747, 1367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 1781, 1367 + xy: 1781, 1401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 1815, 1401 + xy: 1815, 1435 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1504,7 +1434,7 @@ block-icon-battery-large index: -1 combustion-generator-top rotate: false - xy: 295, 611 + xy: 295, 645 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1567,7 +1497,7 @@ fusion-reactor-top index: -1 power-node rotate: false - xy: 1815, 1469 + xy: 1679, 1333 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1581,21 +1511,21 @@ power-node-large index: -1 powerinfinite rotate: false - xy: 1849, 1503 + xy: 1713, 1367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 powervoid rotate: false - xy: 1713, 1333 + xy: 1747, 1401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 1815, 1333 + xy: 1849, 1435 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1777,14 +1707,14 @@ cultivator-top index: -1 lavasmelter rotate: false - xy: 1053, 1209 + xy: 985, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 1027, 1107 + xy: 993, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1819,21 +1749,28 @@ plastanium-compressor-top index: -1 pulverizer rotate: false - xy: 1849, 1435 + xy: 1849, 1469 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 1781, 1333 + xy: 1747, 1333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 1917, 1399 + xy: 1883, 1331 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +smelter + rotate: false + xy: 1917, 1467 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1854,21 +1791,21 @@ core-top index: -1 sortedunloader rotate: false - xy: 1951, 1331 + xy: 1951, 1467 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-1 rotate: false - xy: 1269, 1413 + xy: 1235, 1413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-1-top rotate: false - xy: 1591, 1567 + xy: 1269, 1413 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1938,7 +1875,7 @@ cyclone index: -1 duo rotate: false - xy: 363, 645 + xy: 363, 713 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2036,21 +1973,21 @@ salvo-panel-right index: -1 scatter rotate: false - xy: 1883, 1365 + xy: 1883, 1501 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scorch rotate: false - xy: 1883, 1331 + xy: 1883, 1467 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 1917, 1501 + xy: 1883, 1433 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2176,7 +2113,7 @@ reconstructor-open index: -1 repair-point-turret rotate: false - xy: 1815, 1367 + xy: 1781, 1367 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2239,7 +2176,7 @@ wraith-factory-top-open index: -1 deflector-wall rotate: false - xy: 1475, 1487 + xy: 1441, 1385 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2260,14 +2197,14 @@ door-large-open index: -1 door-open rotate: false - xy: 363, 679 + xy: 363, 747 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 beam rotate: false - xy: 2027, 1788 + xy: 465, 795 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -2295,35 +2232,35 @@ bullet-back index: -1 casing rotate: false - xy: 427, 249 + xy: 2027, 1820 size: 8, 16 orig: 8, 16 offset: 0, 0 index: -1 command-attack rotate: false - xy: 329, 645 + xy: 329, 679 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 command-idle rotate: false - xy: 295, 577 + xy: 295, 611 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 command-patrol rotate: false - xy: 329, 611 + xy: 329, 645 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 command-retreat rotate: false - xy: 295, 543 + xy: 295, 577 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2344,7 +2281,7 @@ error index: -1 laser rotate: false - xy: 483, 611 + xy: 2027, 1770 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -2365,7 +2302,7 @@ laserfull index: -1 minelaser rotate: false - xy: 427, 199 + xy: 465, 745 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -2414,21 +2351,21 @@ scorch2 index: -1 scorch3 rotate: false - xy: 397, 283 + xy: 397, 351 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch4 rotate: false - xy: 397, 181 + xy: 397, 249 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch5 rotate: false - xy: 397, 79 + xy: 397, 147 size: 28, 100 orig: 28, 100 offset: 0, 0 @@ -2449,21 +2386,21 @@ shell-back index: -1 shot rotate: false - xy: 1917, 1365 + xy: 1917, 1501 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 transfer rotate: false - xy: 2027, 1738 + xy: 2027, 1720 size: 4, 48 orig: 4, 48 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 431, 607 + xy: 431, 675 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2477,35 +2414,35 @@ transfer-end index: -1 blackstone-cliff-edge rotate: false - xy: 1133, 1413 + xy: 1099, 1413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blackstone-cliff-edge-1 rotate: false - xy: 1167, 1413 + xy: 1133, 1413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blackstone-cliff-edge-2 rotate: false - xy: 1201, 1413 + xy: 1167, 1413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 blackstone-cliff-side rotate: false - xy: 1235, 1413 + xy: 1201, 1413 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-arc rotate: false - xy: 1693, 1571 + xy: 1659, 1571 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2526,21 +2463,21 @@ block-icon-blast-drill index: -1 block-icon-bridge-conduit rotate: false - xy: 1727, 1571 + xy: 1693, 1571 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 1727, 1571 + xy: 1693, 1571 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-bridge-conveyor rotate: false - xy: 1761, 1571 + xy: 1727, 1571 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2561,14 +2498,14 @@ centrifuge index: -1 block-icon-combustion-generator rotate: false - xy: 1795, 1571 + xy: 1761, 1571 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 1795, 1571 + xy: 1761, 1571 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2589,7 +2526,7 @@ command-center index: -1 block-icon-conduit rotate: false - xy: 1829, 1571 + xy: 1795, 1571 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2610,28 +2547,28 @@ container index: -1 block-icon-conveyor rotate: false - xy: 1863, 1571 + xy: 1829, 1571 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 1863, 1571 + xy: 1829, 1571 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-copper-wall rotate: false - xy: 1897, 1569 + xy: 1863, 1571 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper-wall rotate: false - xy: 1897, 1569 + xy: 1863, 1571 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2708,14 +2645,14 @@ dart-ship-pad index: -1 block-icon-deepwater rotate: false - xy: 1373, 1463 + xy: 1897, 1569 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater rotate: false - xy: 1373, 1463 + xy: 1897, 1569 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2736,14 +2673,14 @@ delta-mech-pad index: -1 block-icon-dense-alloy-wall rotate: false - xy: 1373, 1429 + xy: 1373, 1463 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dense-alloy-wall rotate: false - xy: 1373, 1429 + xy: 1373, 1463 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2764,14 +2701,14 @@ dense-alloy-wall-large index: -1 block-icon-dirt rotate: false - xy: 1407, 1471 + xy: 1373, 1429 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 1407, 1471 + xy: 1373, 1429 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2792,14 +2729,14 @@ distributor index: -1 block-icon-door rotate: false - xy: 1407, 1437 + xy: 1407, 1471 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 door rotate: false - xy: 1407, 1437 + xy: 1407, 1471 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2820,7 +2757,7 @@ door-large index: -1 block-icon-duo rotate: false - xy: 839, 1372 + xy: 1407, 1437 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2883,91 +2820,91 @@ glaive-ship-pad index: -1 block-icon-grass rotate: false - xy: 839, 1338 + xy: 839, 1372 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 grass1 rotate: false - xy: 839, 1338 + xy: 839, 1372 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-hail rotate: false - xy: 873, 1372 + xy: 839, 1338 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-ice rotate: false - xy: 873, 1338 + xy: 873, 1372 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice1 rotate: false - xy: 873, 1338 + xy: 873, 1372 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-icerock rotate: false - xy: 907, 1379 + xy: 873, 1338 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 907, 1379 + xy: 873, 1338 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-incinerator rotate: false - xy: 907, 1345 + xy: 907, 1379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 incinerator rotate: false - xy: 907, 1345 + xy: 907, 1379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-itemsource rotate: false - xy: 941, 1379 + xy: 907, 1345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 itemsource rotate: false - xy: 941, 1379 + xy: 907, 1345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-itemvoid rotate: false - xy: 975, 1379 + xy: 941, 1379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 975, 1379 + xy: 941, 1379 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2988,7 +2925,7 @@ javelin-ship-pad index: -1 block-icon-junction rotate: false - xy: 941, 1345 + xy: 975, 1379 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3009,35 +2946,35 @@ block-icon-laser-drill index: -1 block-icon-lava rotate: false - xy: 1009, 1379 + xy: 941, 1345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lava rotate: false - xy: 1009, 1379 + xy: 941, 1345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-liquid-junction rotate: false - xy: 975, 1345 + xy: 1009, 1379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 975, 1345 + xy: 1009, 1379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-liquid-router rotate: false - xy: 1043, 1379 + xy: 975, 1345 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3051,14 +2988,14 @@ block-icon-liquid-tank index: -1 block-icon-liquidsource rotate: false - xy: 1009, 1345 + xy: 1043, 1379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 1009, 1345 + xy: 1043, 1379 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3086,14 +3023,14 @@ block-icon-mechanical-drill index: -1 block-icon-mechanical-pump rotate: false - xy: 1077, 1379 + xy: 1009, 1345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 1077, 1379 + xy: 1009, 1345 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3107,14 +3044,14 @@ block-icon-meltdown index: -1 block-icon-melter rotate: false - xy: 1043, 1345 + xy: 1077, 1379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 melter rotate: false - xy: 1043, 1345 + xy: 1077, 1379 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3135,14 +3072,14 @@ mend-projector index: -1 block-icon-metalfloor rotate: false - xy: 1111, 1379 + xy: 1043, 1345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 1111, 1379 + xy: 1043, 1345 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3184,14 +3121,14 @@ overdrive-projector index: -1 block-icon-overflow-gate rotate: false - xy: 1077, 1345 + xy: 1111, 1379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 1077, 1345 + xy: 1111, 1379 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3205,42 +3142,42 @@ block-icon-phantom-factory index: -1 block-icon-phase-conduit rotate: false - xy: 1145, 1379 + xy: 1077, 1345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 1145, 1379 + xy: 1077, 1345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-phase-conveyor rotate: false - xy: 1111, 1345 + xy: 1145, 1379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 1111, 1345 + xy: 1145, 1379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-phase-wall rotate: false - xy: 1179, 1379 + xy: 1111, 1345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 1179, 1379 + xy: 1111, 1345 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3296,7 +3233,7 @@ block-icon-pneumatic-drill index: -1 block-icon-power-node rotate: false - xy: 1145, 1345 + xy: 1179, 1379 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3310,28 +3247,28 @@ block-icon-power-node-large index: -1 block-icon-powerinfinite rotate: false - xy: 1213, 1379 + xy: 1145, 1345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-powervoid rotate: false - xy: 1179, 1345 + xy: 1213, 1379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-pulse-conduit rotate: false - xy: 1247, 1379 + xy: 1179, 1345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-pulverizer rotate: false - xy: 1213, 1345 + xy: 1247, 1379 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3394,14 +3331,14 @@ wraith-factory index: -1 block-icon-repair-point rotate: false - xy: 1247, 1345 + xy: 1213, 1345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 repair-point rotate: false - xy: 1247, 1345 + xy: 1213, 1345 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3422,14 +3359,14 @@ block-icon-ripple index: -1 block-icon-rock rotate: false - xy: 1281, 1379 + xy: 1247, 1345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rock1 rotate: false - xy: 1281, 1379 + xy: 1247, 1345 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3450,14 +3387,14 @@ rotary-pump index: -1 block-icon-router rotate: false - xy: 1281, 1345 + xy: 1281, 1379 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 router rotate: false - xy: 1281, 1345 + xy: 1281, 1379 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3485,63 +3422,63 @@ block-icon-salvo index: -1 block-icon-sand rotate: false - xy: 893, 1304 + xy: 1281, 1345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand1 rotate: false - xy: 893, 1304 + xy: 1281, 1345 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-scorch rotate: false - xy: 927, 1311 + xy: 893, 1304 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-separator rotate: false - xy: 961, 1311 + xy: 927, 1311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 separator rotate: false - xy: 961, 1311 + xy: 927, 1311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-shock-mine rotate: false - xy: 995, 1311 + xy: 961, 1311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shock-mine rotate: false - xy: 995, 1311 + xy: 961, 1311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-shrub rotate: false - xy: 1029, 1311 + xy: 995, 1311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 shrub rotate: false - xy: 1029, 1311 + xy: 995, 1311 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3560,44 +3497,30 @@ silicon-smelter orig: 64, 64 offset: 0, 0 index: -1 -block-icon-smelter - rotate: false - xy: 1063, 1311 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -smelter - rotate: false - xy: 1063, 1311 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 block-icon-snow rotate: false - xy: 1097, 1311 + xy: 1029, 1311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow1 rotate: false - xy: 1097, 1311 + xy: 1029, 1311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-solar-panel rotate: false - xy: 1131, 1311 + xy: 1063, 1311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 1131, 1311 + xy: 1063, 1311 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3618,56 +3541,56 @@ solar-panel-large index: -1 block-icon-solidifer rotate: false - xy: 1165, 1311 + xy: 1097, 1311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 solidifer rotate: false - xy: 1165, 1311 + xy: 1097, 1311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-sorter rotate: false - xy: 1199, 1311 + xy: 1131, 1311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sorter rotate: false - xy: 1199, 1311 + xy: 1131, 1311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-space rotate: false - xy: 1233, 1311 + xy: 1165, 1311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 space rotate: false - xy: 1233, 1311 + xy: 1165, 1311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-spawn rotate: false - xy: 1267, 1311 + xy: 1199, 1311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 spawn rotate: false - xy: 1267, 1311 + xy: 1199, 1311 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3688,28 +3611,28 @@ block-icon-spirit-factory index: -1 block-icon-stone rotate: false - xy: 1301, 1311 + xy: 1233, 1311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone1 rotate: false - xy: 1301, 1311 + xy: 1233, 1311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-surge-wall rotate: false - xy: 1553, 1538 + xy: 1267, 1311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 1553, 1538 + xy: 1267, 1311 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3737,14 +3660,14 @@ block-icon-swarmer index: -1 block-icon-tar rotate: false - xy: 1587, 1533 + xy: 1301, 1311 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar rotate: false - xy: 1587, 1533 + xy: 1301, 1311 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3807,14 +3730,14 @@ thorium-reactor index: -1 block-icon-thorium-wall rotate: false - xy: 131, 8 + xy: 1553, 1538 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 131, 8 + xy: 1553, 1538 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3842,14 +3765,14 @@ block-icon-titan-factory index: -1 block-icon-titanium-conveyor rotate: false - xy: 165, 8 + xy: 1587, 1533 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 165, 8 + xy: 1587, 1533 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3884,14 +3807,14 @@ turbine-generator index: -1 block-icon-unloader rotate: false - xy: 199, 8 + xy: 131, 8 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 unloader rotate: false - xy: 199, 8 + xy: 131, 8 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3912,14 +3835,14 @@ vault index: -1 block-icon-water rotate: false - xy: 233, 15 + xy: 165, 8 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water rotate: false - xy: 233, 15 + xy: 165, 8 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3947,112 +3870,140 @@ block-icon-wraith-factory index: -1 deepwater-cliff-edge rotate: false - xy: 1441, 1453 + xy: 1435, 1521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater-cliff-edge-1 rotate: false - xy: 1441, 1419 + xy: 1441, 1487 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater-cliff-edge-2 rotate: false - xy: 1441, 1385 + xy: 1441, 1453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater-cliff-side rotate: false - xy: 1469, 1521 + xy: 1441, 1419 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt-cliff-edge rotate: false - xy: 1475, 1385 + xy: 1475, 1453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt-cliff-edge-1 rotate: false - xy: 363, 781 + xy: 1475, 1419 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt-cliff-edge-2 rotate: false - xy: 363, 747 + xy: 1475, 1385 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt-cliff-side rotate: false - xy: 363, 713 + xy: 363, 781 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +grass-cliff-edge + rotate: false + xy: 1029, 1277 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +grass-cliff-edge-1 + rotate: false + xy: 363, 543 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +grass-cliff-edge-2 + rotate: false + xy: 1063, 1277 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +grass-cliff-side + rotate: false + xy: 363, 509 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lava-cliff-edge rotate: false - xy: 985, 1209 + xy: 951, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lava-cliff-edge-1 rotate: false - xy: 1053, 1243 + xy: 951, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lava-cliff-edge-2 rotate: false - xy: 1019, 1209 + xy: 985, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lava-cliff-side rotate: false - xy: 1087, 1243 + xy: 1019, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-icon-cryofluid rotate: false - xy: 1189, 1243 + xy: 1121, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-icon-lava rotate: false - xy: 1155, 1209 + xy: 1087, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-icon-oil rotate: false - xy: 1223, 1243 + xy: 1155, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-icon-water rotate: false - xy: 1189, 1209 + xy: 1121, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4108,770 +4059,770 @@ trident-ship index: -1 metalfloor-cliff-edge rotate: false - xy: 993, 1107 + xy: 1291, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor-cliff-edge-1 rotate: false - xy: 1027, 1141 + xy: 993, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor-cliff-edge-2 rotate: false - xy: 1061, 1175 + xy: 993, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor-cliff-side rotate: false - xy: 993, 1073 + xy: 1027, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-blackstone1 rotate: false - xy: 1061, 1141 + xy: 1027, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-blackstone2 rotate: false - xy: 1095, 1175 + xy: 1061, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-blackstone3 rotate: false - xy: 1027, 1073 + xy: 993, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-grass1 rotate: false - xy: 1061, 1107 + xy: 1027, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-grass2 rotate: false - xy: 1095, 1141 + xy: 1061, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-grass3 rotate: false - xy: 1129, 1175 + xy: 1095, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-ice1 rotate: false - xy: 1061, 1073 + xy: 1027, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-ice2 rotate: false - xy: 1095, 1107 + xy: 1061, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-ice3 rotate: false - xy: 1129, 1141 + xy: 1095, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 1163, 1175 + xy: 1129, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 1095, 1073 + xy: 1061, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 1129, 1107 + xy: 1095, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-snow1 rotate: false - xy: 1163, 1141 + xy: 1129, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-snow2 rotate: false - xy: 1197, 1175 + xy: 1163, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-snow3 rotate: false - xy: 1129, 1073 + xy: 1095, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 1163, 1107 + xy: 1129, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 1197, 1141 + xy: 1163, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 1231, 1175 + xy: 1197, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-blackstone1 rotate: false - xy: 1163, 1073 + xy: 1129, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-blackstone2 rotate: false - xy: 1197, 1107 + xy: 1163, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-blackstone3 rotate: false - xy: 1231, 1141 + xy: 1197, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-grass1 rotate: false - xy: 1265, 1175 + xy: 1231, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-grass2 rotate: false - xy: 1197, 1073 + xy: 1163, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-grass3 rotate: false - xy: 1231, 1107 + xy: 1197, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-ice1 rotate: false - xy: 1265, 1141 + xy: 1231, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-ice2 rotate: false - xy: 1231, 1073 + xy: 1265, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-ice3 rotate: false - xy: 1265, 1107 + xy: 1197, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand1 rotate: false - xy: 1265, 1073 + xy: 1231, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand2 rotate: false - xy: 369, 33 + xy: 1265, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand3 rotate: false - xy: 1299, 1175 + xy: 1231, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-snow1 rotate: false - xy: 1299, 1141 + xy: 1265, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-snow2 rotate: false - xy: 1299, 1107 + xy: 1265, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-snow3 rotate: false - xy: 1299, 1073 + xy: 369, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone1 rotate: false - xy: 1325, 1243 + xy: 1299, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone2 rotate: false - xy: 1325, 1209 + xy: 1299, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone3 rotate: false - xy: 1333, 1175 + xy: 1299, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-blackstone1 rotate: false - xy: 1333, 1141 + xy: 1299, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-blackstone2 rotate: false - xy: 1333, 1107 + xy: 1325, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-blackstone3 rotate: false - xy: 1333, 1073 + xy: 1325, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-grass1 rotate: false - xy: 1503, 1525 + xy: 1333, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-grass2 rotate: false - xy: 1509, 1491 + xy: 1333, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-grass3 rotate: false - xy: 1509, 1457 + xy: 1333, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-ice1 rotate: false - xy: 1509, 1423 + xy: 1333, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-ice2 rotate: false - xy: 1509, 1389 + xy: 1503, 1525 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-ice3 rotate: false - xy: 1543, 1504 + xy: 1509, 1491 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 1543, 1470 + xy: 1509, 1457 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 1543, 1436 + xy: 1509, 1423 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 1543, 1402 + xy: 1509, 1389 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-snow1 rotate: false - xy: 1577, 1499 + xy: 1543, 1504 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-snow2 rotate: false - xy: 1577, 1465 + xy: 1543, 1470 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-snow3 rotate: false - xy: 1577, 1431 + xy: 1543, 1436 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 1577, 1397 + xy: 1543, 1402 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 1543, 1368 + xy: 1577, 1499 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 1577, 1363 + xy: 1577, 1465 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-blackstone1 rotate: false - xy: 1509, 1355 + xy: 1577, 1431 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-blackstone2 rotate: false - xy: 1543, 1334 + xy: 1577, 1397 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-blackstone3 rotate: false - xy: 1577, 1329 + xy: 1543, 1368 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-grass1 rotate: false - xy: 1611, 1499 + xy: 1577, 1363 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-grass2 rotate: false - xy: 1611, 1465 + xy: 1509, 1355 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-grass3 rotate: false - xy: 1611, 1431 + xy: 1543, 1334 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-ice1 rotate: false - xy: 1611, 1397 + xy: 1577, 1329 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-ice2 rotate: false - xy: 1611, 1363 + xy: 1611, 1499 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-ice3 rotate: false - xy: 1611, 1329 + xy: 1611, 1465 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 1621, 1533 + xy: 1611, 1431 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 1655, 1537 + xy: 1611, 1397 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 1689, 1537 + xy: 1611, 1363 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-snow1 rotate: false - xy: 1723, 1537 + xy: 1611, 1329 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-snow2 rotate: false - xy: 1757, 1537 + xy: 1621, 1533 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-snow3 rotate: false - xy: 1791, 1537 + xy: 1655, 1537 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 1825, 1537 + xy: 1689, 1537 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 1859, 1537 + xy: 1723, 1537 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 1893, 1535 + xy: 1757, 1537 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-blackstone1 rotate: false - xy: 1645, 1499 + xy: 1791, 1537 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-blackstone2 rotate: false - xy: 1645, 1465 + xy: 1825, 1537 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-blackstone3 rotate: false - xy: 1645, 1431 + xy: 1859, 1537 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-grass1 rotate: false - xy: 1645, 1397 + xy: 1893, 1535 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-grass2 rotate: false - xy: 1645, 1363 + xy: 1645, 1499 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-grass3 rotate: false - xy: 1645, 1329 + xy: 1645, 1465 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-ice1 rotate: false - xy: 1679, 1503 + xy: 1645, 1431 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-ice2 rotate: false - xy: 1679, 1469 + xy: 1645, 1397 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-ice3 rotate: false - xy: 1713, 1503 + xy: 1645, 1363 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 1679, 1435 + xy: 1645, 1329 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 1713, 1469 + xy: 1679, 1503 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 1747, 1503 + xy: 1679, 1469 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-snow1 rotate: false - xy: 1679, 1401 + xy: 1713, 1503 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-snow2 rotate: false - xy: 1713, 1435 + xy: 1679, 1435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-snow3 rotate: false - xy: 1747, 1469 + xy: 1713, 1469 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 1781, 1503 + xy: 1747, 1503 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 1679, 1367 + xy: 1679, 1401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 1713, 1401 + xy: 1713, 1435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-cliff-edge rotate: false - xy: 1883, 1501 + xy: 1849, 1401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-cliff-edge-1 rotate: false - xy: 1883, 1467 + xy: 1815, 1333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-cliff-edge-2 rotate: false - xy: 1883, 1433 + xy: 1849, 1367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-cliff-side rotate: false - xy: 1883, 1399 + xy: 1849, 1333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow-cliff-edge rotate: false - xy: 1951, 1467 + xy: 1917, 1365 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow-cliff-edge-1 rotate: false - xy: 1951, 1433 + xy: 1917, 1331 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow-cliff-edge-2 rotate: false - xy: 1951, 1399 + xy: 1927, 1535 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow-cliff-side rotate: false - xy: 1951, 1365 + xy: 1951, 1501 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 space-cliff-edge rotate: false - xy: 1961, 1561 + xy: 1951, 1433 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 space-cliff-edge-1 rotate: false - xy: 1995, 1561 + xy: 1951, 1399 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 space-cliff-edge-2 rotate: false - xy: 1985, 1527 + xy: 1951, 1365 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 space-cliff-side rotate: false - xy: 1985, 1493 + xy: 1951, 1331 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-cliff-edge rotate: false - xy: 1713, 1299 + xy: 1985, 1391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-cliff-edge-1 rotate: false - xy: 1747, 1299 + xy: 1985, 1357 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-cliff-edge-2 rotate: false - xy: 1781, 1299 + xy: 1985, 1323 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-cliff-side rotate: false - xy: 1815, 1299 + xy: 1679, 1299 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4913,112 +4864,112 @@ wraith index: -1 item-biomatter rotate: false - xy: 1199, 1277 + xy: 1165, 1277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 363, 305 + xy: 363, 407 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-coal rotate: false - xy: 1233, 1277 + xy: 1199, 1277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-copper rotate: false - xy: 363, 271 + xy: 363, 373 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-dense-alloy rotate: false - xy: 1267, 1277 + xy: 1233, 1277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-lead rotate: false - xy: 363, 237 + xy: 363, 339 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-phase-fabric rotate: false - xy: 1301, 1277 + xy: 1267, 1277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 363, 203 + xy: 363, 305 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 363, 169 + xy: 1301, 1277 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 363, 135 + xy: 363, 271 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 363, 101 + xy: 363, 237 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-stone rotate: false - xy: 363, 67 + xy: 363, 203 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 951, 1243 + xy: 363, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 951, 1209 + xy: 363, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 985, 1243 + xy: 363, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-icon rotate: false - xy: 1121, 1209 + xy: 1053, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5323,77 +5274,77 @@ discord-banner index: -1 empty-sector rotate: false - xy: 363, 611 + xy: 363, 679 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 465, 643 + xy: 543, 1117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 543, 1117 + xy: 2007, 1660 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 2007, 1660 + xy: 319, 15 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-effect rotate: false - xy: 319, 15 + xy: 345, 921 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 465, 607 + xy: 479, 1019 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-power rotate: false - xy: 449, 521 + xy: 427, 324 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-production rotate: false - xy: 449, 503 + xy: 427, 306 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-turret rotate: false - xy: 446, 449 + xy: 427, 180 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 446, 431 + xy: 427, 144 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-upgrade rotate: false - xy: 446, 413 + xy: 426, 108 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5477,7 +5428,7 @@ icon-arrow-right index: -1 icon-arrow-up rotate: false - xy: 397, 67 + xy: 204, 1727 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5491,7 +5442,7 @@ icon-back index: -1 icon-ban rotate: false - xy: 391, 17 + xy: 397, 68 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5512,7 +5463,7 @@ icon-cancel index: -1 icon-chat rotate: false - xy: 204, 1727 + xy: 2036, 1855 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5526,133 +5477,133 @@ icon-check index: -1 icon-copy rotate: false - xy: 431, 521 + xy: 428, 468 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 2036, 1855 + xy: 1335, 1277 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 391, 1 + xy: 413, 68 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 565, 1101 + xy: 403, 52 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 581, 1101 + xy: 403, 36 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 565, 1085 + xy: 391, 17 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 581, 1085 + xy: 391, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 565, 1069 + xy: 565, 1101 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-elevation rotate: false - xy: 345, 921 + xy: 443, 1019 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 443, 1019 + xy: 561, 1117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 581, 1069 + xy: 581, 1101 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 465, 625 + xy: 579, 1117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 561, 1117 + xy: 337, 15 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 565, 1053 + xy: 565, 1085 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 579, 1117 + xy: 363, 921 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 581, 1053 + xy: 581, 1085 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 337, 15 + xy: 461, 1019 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 597, 1061 + xy: 565, 1069 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 613, 1061 + xy: 581, 1069 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5666,168 +5617,168 @@ icon-generated index: -1 icon-github rotate: false - xy: 629, 1061 + xy: 565, 1053 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 645, 1061 + xy: 581, 1053 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 363, 921 + xy: 355, 15 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 1335, 1277 + xy: 1321, 1435 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 1321, 1435 + xy: 547, 967 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 467, 1003 + xy: 597, 1061 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 483, 1003 + xy: 613, 1061 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 465, 541 + xy: 216, 1727 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 467, 987 + xy: 629, 1061 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-item rotate: false - xy: 427, 351 + xy: 2036, 1843 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 403, 33 + xy: 1315, 1345 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-line rotate: false - xy: 461, 1019 + xy: 381, 921 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 467, 971 + xy: 645, 1061 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid-small rotate: false - xy: 443, 367 + xy: 1347, 1277 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 483, 987 + xy: 467, 1003 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 355, 15 + xy: 373, 15 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 381, 921 + xy: 428, 450 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 479, 1019 + xy: 427, 432 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 465, 589 + xy: 427, 414 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 409, 67 + xy: 228, 1727 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-map rotate: false - xy: 499, 995 + xy: 483, 1003 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 403, 55 + xy: 419, 56 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 373, 15 + xy: 427, 396 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-missing rotate: false - xy: 216, 1727 + xy: 419, 44 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5841,287 +5792,287 @@ icon-mission-background index: -1 icon-mission-battle rotate: false - xy: 2036, 1843 + xy: 661, 1061 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-defense rotate: false - xy: 1347, 1277 + xy: 673, 1061 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-done rotate: false - xy: 427, 339 + xy: 685, 1061 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 403, 43 + xy: 697, 1061 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-nullitem rotate: false - xy: 1315, 1345 + xy: 1335, 1289 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-paste rotate: false - xy: 465, 571 + xy: 427, 378 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 228, 1727 + xy: 709, 1061 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 465, 553 + xy: 427, 360 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 467, 955 + xy: 467, 987 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 431, 503 + xy: 427, 342 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 427, 327 + xy: 721, 1061 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 483, 971 + xy: 467, 971 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 427, 315 + xy: 733, 1061 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power-small rotate: false - xy: 427, 303 + xy: 745, 1061 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 499, 979 + xy: 483, 987 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 428, 485 + xy: 427, 288 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 515, 995 + xy: 499, 995 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 483, 955 + xy: 467, 955 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 428, 467 + xy: 427, 270 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 499, 963 + xy: 483, 971 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 515, 979 + xy: 499, 979 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 531, 995 + xy: 515, 995 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 515, 963 + xy: 483, 955 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 531, 979 + xy: 499, 963 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 446, 485 + xy: 427, 252 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 428, 449 + xy: 427, 234 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 427, 291 + xy: 757, 1061 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 446, 467 + xy: 427, 216 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 547, 995 + xy: 515, 979 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 427, 279 + xy: 769, 1061 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 427, 267 + xy: 781, 1061 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 531, 963 + xy: 531, 995 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 428, 431 + xy: 427, 198 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 547, 979 + xy: 515, 963 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 547, 963 + xy: 531, 979 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 428, 413 + xy: 427, 162 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocked rotate: false - xy: 428, 395 + xy: 426, 126 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 428, 379 + xy: 547, 995 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 444, 379 + xy: 531, 963 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 446, 395 + xy: 426, 90 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 427, 363 + xy: 547, 979 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -6135,7 +6086,7 @@ info-banner index: -1 inventory rotate: false - xy: 465, 740 + xy: 431, 565 size: 24, 40 split: 10, 10, 10, 14 orig: 24, 40 @@ -6166,7 +6117,7 @@ pane-2 index: -1 scroll rotate: false - xy: 465, 661 + xy: 428, 486 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -6190,7 +6141,7 @@ scroll-knob-horizontal-black index: -1 scroll-knob-vertical-black rotate: false - xy: 465, 698 + xy: 428, 523 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -6198,21 +6149,21 @@ scroll-knob-vertical-black index: -1 sector-edge rotate: false - xy: 1917, 1467 + xy: 1883, 1399 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sector-select rotate: false - xy: 1917, 1433 + xy: 1883, 1365 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 selection rotate: false - xy: 204, 1724 + xy: 428, 570 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -6226,21 +6177,21 @@ slider index: -1 slider-knob rotate: false - xy: 397, 465 + xy: 397, 533 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-down rotate: false - xy: 397, 425 + xy: 397, 493 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-over rotate: false - xy: 397, 385 + xy: 397, 453 size: 29, 38 orig: 29, 38 offset: 0, 0 @@ -6277,7 +6228,7 @@ white index: -1 window-empty rotate: false - xy: 465, 782 + xy: 397, 84 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 f42c2663f7..8bcee82bbc 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/world/Tile.java b/core/src/io/anuke/mindustry/world/Tile.java index f579d3b683..cbdda80858 100644 --- a/core/src/io/anuke/mindustry/world/Tile.java +++ b/core/src/io/anuke/mindustry/world/Tile.java @@ -365,6 +365,10 @@ public class Tile implements Position, TargetTrait{ cost += 1; } + if(target().synthetic()){ + cost += target().block().health / 10f; + } + if(floor.isLiquid){ cost += 100f; }