diff --git a/build.gradle b/build.gradle index a6f8aaf833..88718fdea4 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,6 @@ buildscript{ dependencies{ classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.5' classpath "com.badlogicgames.gdx:gdx-tools:1.9.9" - classpath files('tools/filters.jar') } } @@ -37,7 +36,7 @@ allprojects{ if(arcHash == null){ try{ arcHash = 'git ls-remote https://github.com/Anuken/Arc.git'.execute().text.split("\t")[0]//new JsonSlurper().parse(new URL("https://api.github.com/repos/Anuken/Arc/commits/master"))["sha"] - }catch(e){ //github can get angry sometimes + }catch(e){ e.printStackTrace() arcHash = "-SNAPSHOT"; } diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index e0bb744add..5af9d7ff16 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -46,289 +46,275 @@ bridge-conveyor-end orig: 32, 32 offset: 0, 0 index: -1 -conveyor-0-0 +conveyor-0-1 rotate: false xy: 329, 305 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -conveyor-0-1 +conveyor-0-2 rotate: false xy: 295, 237 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -conveyor-0-2 +conveyor-0-3 rotate: false xy: 329, 271 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -conveyor-0-3 +conveyor-1-0 rotate: false xy: 295, 203 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -conveyor-1-0 +conveyor-1-1 rotate: false xy: 329, 237 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -conveyor-1-1 +conveyor-1-2 rotate: false xy: 295, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -conveyor-1-2 +conveyor-1-3 rotate: false xy: 329, 203 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -conveyor-1-3 +conveyor-2-0 rotate: false xy: 295, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -conveyor-2-0 +conveyor-2-1 rotate: false xy: 329, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -conveyor-2-1 +conveyor-2-2 rotate: false xy: 295, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -conveyor-2-2 +conveyor-2-3 rotate: false xy: 329, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -conveyor-2-3 +conveyor-3-0 rotate: false xy: 295, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -conveyor-3-0 +conveyor-3-1 rotate: false xy: 329, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -conveyor-3-1 +conveyor-3-2 rotate: false xy: 329, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -conveyor-3-2 +conveyor-3-3 rotate: false xy: 301, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -conveyor-3-3 +conveyor-4-0 rotate: false xy: 335, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -conveyor-4-0 +conveyor-4-1 rotate: false xy: 401, 913 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -conveyor-4-1 +conveyor-4-2 rotate: false xy: 435, 913 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -conveyor-4-2 +conveyor-4-3 rotate: false xy: 499, 1011 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -conveyor-4-3 - rotate: false - xy: 533, 1011 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -titanium-conveyor-0-0 - rotate: false - xy: 1951, 1297 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 titanium-conveyor-0-1 - rotate: false - xy: 1985, 1289 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -titanium-conveyor-0-2 - rotate: false - xy: 369, 879 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -titanium-conveyor-0-3 rotate: false xy: 403, 879 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-1-0 +titanium-conveyor-0-2 rotate: false xy: 437, 879 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-1-1 +titanium-conveyor-0-3 rotate: false xy: 371, 845 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-1-2 +titanium-conveyor-1-0 rotate: false xy: 405, 845 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-1-3 +titanium-conveyor-1-1 rotate: false xy: 439, 845 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-2-0 +titanium-conveyor-1-2 rotate: false xy: 397, 811 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-2-1 +titanium-conveyor-1-3 rotate: false xy: 397, 777 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-2-2 +titanium-conveyor-2-0 rotate: false xy: 431, 811 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-2-3 +titanium-conveyor-2-1 rotate: false xy: 397, 743 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-3-0 +titanium-conveyor-2-2 rotate: false xy: 431, 777 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-3-1 +titanium-conveyor-2-3 rotate: false xy: 397, 709 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-3-2 +titanium-conveyor-3-0 rotate: false xy: 431, 743 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-3-3 +titanium-conveyor-3-1 rotate: false xy: 397, 675 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-4-0 +titanium-conveyor-3-2 rotate: false xy: 431, 709 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-4-1 +titanium-conveyor-3-3 rotate: false xy: 397, 641 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-4-2 +titanium-conveyor-4-0 rotate: false xy: 431, 675 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -titanium-conveyor-4-3 +titanium-conveyor-4-1 rotate: false xy: 397, 607 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +titanium-conveyor-4-2 + rotate: false + xy: 431, 641 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +titanium-conveyor-4-3 + rotate: false + xy: 397, 573 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 junction rotate: false - xy: 985, 1209 + xy: 1019, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -342,21 +328,21 @@ mass-driver-turret index: -1 phase-conveyor-arrow rotate: false - xy: 1713, 1367 + xy: 1679, 1333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 1747, 1401 + xy: 1713, 1367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 1781, 1435 + xy: 1747, 1401 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -629,35 +615,35 @@ coal3 index: -1 copper1 rotate: false - xy: 1407, 1403 + xy: 533, 1011 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper2 rotate: false - xy: 1435, 1521 + xy: 1407, 1403 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 copper3 rotate: false - xy: 1441, 1487 + xy: 1435, 1521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 1475, 1419 + xy: 1475, 1453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 1475, 1385 + xy: 1475, 1419 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -683,30 +669,16 @@ ice-cliff-edge orig: 32, 32 offset: 0, 0 index: -1 -snow-cliff-edge - rotate: false - xy: 927, 1277 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 generic-cliff-edge-1 rotate: false - xy: 363, 543 + xy: 363, 577 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-cliff-edge-1 rotate: false - xy: 363, 543 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -snow-cliff-edge-1 - rotate: false - xy: 363, 543 + xy: 363, 577 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -725,30 +697,16 @@ ice-cliff-edge-2 orig: 32, 32 offset: 0, 0 index: -1 -snow-cliff-edge-2 - rotate: false - xy: 961, 1277 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 generic-cliff-side rotate: false - xy: 363, 509 + xy: 363, 543 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ice-cliff-side rotate: false - xy: 363, 509 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -snow-cliff-side - rotate: false - xy: 363, 509 + xy: 363, 543 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -762,7 +720,7 @@ grass-cliff-edge index: -1 grass-cliff-edge-1 rotate: false - xy: 363, 441 + xy: 363, 475 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -776,7 +734,7 @@ grass-cliff-edge-2 index: -1 grass-cliff-side rotate: false - xy: 363, 407 + xy: 363, 441 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -790,7 +748,7 @@ grass2 index: -1 grass3 rotate: false - xy: 363, 475 + xy: 363, 509 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -804,7 +762,7 @@ grassedge index: -1 ice2 rotate: false - xy: 363, 373 + xy: 363, 407 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -825,7 +783,7 @@ iceedge index: -1 icerock2 rotate: false - xy: 363, 339 + xy: 363, 373 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -846,14 +804,14 @@ rockshadow1 index: -1 icerockshadow2 rotate: false - xy: 363, 305 + xy: 363, 339 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 363, 305 + xy: 363, 339 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -867,56 +825,56 @@ lavaedge index: -1 lead1 rotate: false - xy: 1087, 1209 + xy: 1121, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead2 rotate: false - xy: 1155, 1243 + xy: 1087, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lead3 rotate: false - xy: 1121, 1209 + xy: 1155, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 1291, 1209 + xy: 1257, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 993, 1175 + xy: 1291, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 993, 1141 + xy: 993, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 1027, 1175 + xy: 993, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 993, 1107 + xy: 1027, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -930,21 +888,21 @@ metalflooredge index: -1 rock2 rotate: false - xy: 1815, 1333 + xy: 1849, 1401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand2 rotate: false - xy: 1849, 1333 + xy: 1849, 1367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand3 rotate: false - xy: 1883, 1501 + xy: 1849, 1333 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -958,21 +916,21 @@ sandedge index: -1 shrubshadow rotate: false - xy: 1927, 1535 + xy: 1917, 1331 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow2 rotate: false - xy: 1951, 1501 + xy: 1927, 1535 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 snow3 rotate: false - xy: 1951, 1467 + xy: 1951, 1501 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -993,42 +951,42 @@ spaceedge index: -1 stone-cliff-edge rotate: false - xy: 1985, 1493 + xy: 1985, 1391 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 1985, 1459 + xy: 1985, 1357 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 1985, 1425 + xy: 1985, 1323 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 1985, 1391 + xy: 1679, 1299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone2 rotate: false - xy: 1995, 1561 + xy: 1985, 1459 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 stone3 rotate: false - xy: 1985, 1527 + xy: 1985, 1425 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1049,70 +1007,70 @@ taredge index: -1 thorium1 rotate: false - xy: 1747, 1299 + xy: 1849, 1299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 1781, 1299 + xy: 1883, 1297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 1815, 1299 + xy: 1917, 1297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 1849, 1299 + xy: 1951, 1297 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 1883, 1297 + xy: 1985, 1289 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 1917, 1297 + xy: 369, 879 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-cliff-edge rotate: false - xy: 397, 573 + xy: 397, 539 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-cliff-edge-1 rotate: false - xy: 431, 607 + xy: 431, 573 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-cliff-edge-2 rotate: false - xy: 397, 539 + xy: 397, 505 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 water-cliff-side rotate: false - xy: 431, 573 + xy: 431, 539 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1175,7 +1133,7 @@ conduit-liquid index: -1 cross-1 rotate: false - xy: 1441, 1453 + xy: 1441, 1487 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1203,7 +1161,7 @@ cross-4 index: -1 place-arrow rotate: false - xy: 1815, 1469 + xy: 1781, 1435 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1392,21 +1350,21 @@ conduit-top-6 index: -1 liquid-router-bottom rotate: false - xy: 1223, 1209 + xy: 1257, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 1291, 1243 + xy: 1223, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 1257, 1209 + xy: 1291, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1434,70 +1392,70 @@ liquid-tank-top index: -1 phase-conduit-arrow rotate: false - xy: 1781, 1469 + xy: 1747, 1435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 1815, 1503 + xy: 1781, 1469 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 1679, 1333 + xy: 1815, 1503 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 1781, 1401 + xy: 1747, 1367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 1815, 1435 + xy: 1781, 1401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 1849, 1469 + xy: 1815, 1435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 1747, 1333 + xy: 1849, 1469 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 1781, 1367 + xy: 1747, 1333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 1815, 1401 + xy: 1781, 1367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 1849, 1435 + xy: 1815, 1401 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1609,7 +1567,7 @@ fusion-reactor-top index: -1 power-node rotate: false - xy: 1849, 1503 + xy: 1815, 1469 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1623,21 +1581,21 @@ power-node-large index: -1 powerinfinite rotate: false - xy: 1713, 1333 + xy: 1849, 1503 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 powervoid rotate: false - xy: 1747, 1367 + xy: 1713, 1333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 1849, 1367 + xy: 1815, 1333 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1819,14 +1777,14 @@ cultivator-top index: -1 lavasmelter rotate: false - xy: 1121, 1243 + xy: 1053, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 1061, 1141 + xy: 1027, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1861,21 +1819,21 @@ plastanium-compressor-top index: -1 pulverizer rotate: false - xy: 1781, 1333 + xy: 1849, 1435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 1815, 1367 + xy: 1781, 1333 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 1917, 1365 + xy: 1917, 1399 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1896,7 +1854,7 @@ core-top index: -1 sortedunloader rotate: false - xy: 1951, 1433 + xy: 1951, 1331 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -1980,7 +1938,7 @@ cyclone index: -1 duo rotate: false - xy: 363, 611 + xy: 363, 645 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2078,21 +2036,21 @@ salvo-panel-right index: -1 scatter rotate: false - xy: 1883, 1331 + xy: 1883, 1365 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scorch rotate: false - xy: 1917, 1501 + xy: 1883, 1331 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 1917, 1467 + xy: 1917, 1501 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2218,7 +2176,7 @@ reconstructor-open index: -1 repair-point-turret rotate: false - xy: 1849, 1401 + xy: 1815, 1367 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2281,7 +2239,7 @@ wraith-factory-top-open index: -1 deflector-wall rotate: false - xy: 1475, 1453 + xy: 1475, 1487 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2302,7 +2260,7 @@ door-large-open index: -1 door-open rotate: false - xy: 363, 645 + xy: 363, 679 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2337,7 +2295,7 @@ bullet-back index: -1 casing rotate: false - xy: 427, 267 + xy: 427, 249 size: 8, 16 orig: 8, 16 offset: 0, 0 @@ -2386,7 +2344,7 @@ error index: -1 laser rotate: false - xy: 483, 653 + xy: 483, 611 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -2407,7 +2365,7 @@ laserfull index: -1 minelaser rotate: false - xy: 427, 217 + xy: 427, 199 size: 4, 48 orig: 4, 48 offset: 0, 0 @@ -2456,21 +2414,21 @@ scorch2 index: -1 scorch3 rotate: false - xy: 397, 317 + xy: 397, 283 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch4 rotate: false - xy: 397, 215 + xy: 397, 181 size: 28, 100 orig: 28, 100 offset: 0, 0 index: -1 scorch5 rotate: false - xy: 397, 113 + xy: 397, 79 size: 28, 100 orig: 28, 100 offset: 0, 0 @@ -2491,7 +2449,7 @@ shell-back index: -1 shot rotate: false - xy: 1917, 1331 + xy: 1917, 1365 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2505,7 +2463,7 @@ transfer index: -1 transfer-arrow rotate: false - xy: 431, 641 + xy: 431, 607 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2657,6 +2615,13 @@ block-icon-conveyor orig: 32, 32 offset: 0, 0 index: -1 +conveyor-0-0 + rotate: false + xy: 1863, 1571 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 block-icon-copper-wall rotate: false xy: 1897, 1569 @@ -3882,6 +3847,13 @@ block-icon-titanium-conveyor orig: 32, 32 offset: 0, 0 index: -1 +titanium-conveyor-0-0 + rotate: false + xy: 165, 8 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 block-icon-trident-ship-pad rotate: false xy: 827, 1271 @@ -3975,112 +3947,112 @@ block-icon-wraith-factory index: -1 deepwater-cliff-edge rotate: false - xy: 1441, 1419 + xy: 1441, 1453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater-cliff-edge-1 rotate: false - xy: 1441, 1385 + xy: 1441, 1419 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater-cliff-edge-2 rotate: false - xy: 1469, 1521 + xy: 1441, 1385 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 deepwater-cliff-side rotate: false - xy: 1475, 1487 + xy: 1469, 1521 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt-cliff-edge rotate: false - xy: 363, 781 + xy: 1475, 1385 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt-cliff-edge-1 rotate: false - xy: 363, 747 + xy: 363, 781 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt-cliff-edge-2 rotate: false - xy: 363, 713 + xy: 363, 747 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 dirt-cliff-side rotate: false - xy: 363, 679 + xy: 363, 713 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lava-cliff-edge rotate: false - xy: 1053, 1243 + xy: 985, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lava-cliff-edge-1 rotate: false - xy: 1019, 1209 + xy: 1053, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lava-cliff-edge-2 rotate: false - xy: 1087, 1243 + xy: 1019, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 lava-cliff-side rotate: false - xy: 1053, 1209 + xy: 1087, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-icon-cryofluid rotate: false - xy: 1155, 1209 + xy: 1189, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-icon-lava rotate: false - xy: 1223, 1243 + xy: 1155, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-icon-oil rotate: false - xy: 1189, 1209 + xy: 1223, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-icon-water rotate: false - xy: 1257, 1243 + xy: 1189, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4136,742 +4108,770 @@ trident-ship index: -1 metalfloor-cliff-edge rotate: false - xy: 1027, 1141 + xy: 993, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor-cliff-edge-1 rotate: false - xy: 1061, 1175 + xy: 1027, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor-cliff-edge-2 rotate: false - xy: 993, 1073 + xy: 1061, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 metalfloor-cliff-side rotate: false - xy: 1027, 1107 + xy: 993, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-blackstone1 rotate: false - xy: 1095, 1175 + xy: 1061, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-blackstone2 rotate: false - xy: 1027, 1073 + xy: 1095, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-blackstone3 rotate: false - xy: 1061, 1107 + xy: 1027, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-grass1 rotate: false - xy: 1095, 1141 + xy: 1061, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-grass2 rotate: false - xy: 1129, 1175 + xy: 1095, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-grass3 rotate: false - xy: 1061, 1073 + xy: 1129, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-ice1 rotate: false - xy: 1095, 1107 + xy: 1061, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-ice2 rotate: false - xy: 1129, 1141 + xy: 1095, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-ice3 rotate: false - xy: 1163, 1175 + xy: 1129, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 1095, 1073 + xy: 1163, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 1129, 1107 + xy: 1095, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 1163, 1141 + xy: 1129, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-snow1 rotate: false - xy: 1197, 1175 + xy: 1163, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-snow2 rotate: false - xy: 1129, 1073 + xy: 1197, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-snow3 rotate: false - xy: 1163, 1107 + xy: 1129, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 1197, 1141 + xy: 1163, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 1231, 1175 + xy: 1197, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 1163, 1073 + xy: 1231, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-blackstone1 rotate: false - xy: 1197, 1107 + xy: 1163, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-blackstone2 rotate: false - xy: 1231, 1141 + xy: 1197, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-blackstone3 rotate: false - xy: 1265, 1175 + xy: 1231, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-grass1 rotate: false - xy: 1197, 1073 + xy: 1265, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-grass2 rotate: false - xy: 1231, 1107 + xy: 1197, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-grass3 rotate: false - xy: 1265, 1141 + xy: 1231, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-ice1 rotate: false - xy: 1231, 1073 + xy: 1265, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-ice2 rotate: false - xy: 1265, 1107 + xy: 1231, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-ice3 rotate: false - xy: 1265, 1073 + xy: 1265, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand1 rotate: false - xy: 369, 33 + xy: 1265, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand2 rotate: false - xy: 1299, 1175 + xy: 369, 33 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-sand3 rotate: false - xy: 1299, 1141 + xy: 1299, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-snow1 rotate: false - xy: 1299, 1107 + xy: 1299, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-snow2 rotate: false - xy: 1299, 1073 + xy: 1299, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-snow3 rotate: false - xy: 1325, 1243 + xy: 1299, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone1 rotate: false - xy: 1325, 1209 + xy: 1325, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone2 rotate: false - xy: 1333, 1175 + xy: 1325, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-copper-stone3 rotate: false - xy: 1333, 1141 + xy: 1333, 1175 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-blackstone1 rotate: false - xy: 1333, 1107 + xy: 1333, 1141 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-blackstone2 rotate: false - xy: 1333, 1073 + xy: 1333, 1107 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-blackstone3 rotate: false - xy: 1503, 1525 + xy: 1333, 1073 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-grass1 rotate: false - xy: 1509, 1491 + xy: 1503, 1525 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-grass2 rotate: false - xy: 1509, 1457 + xy: 1509, 1491 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-grass3 rotate: false - xy: 1509, 1423 + xy: 1509, 1457 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-ice1 rotate: false - xy: 1509, 1389 + xy: 1509, 1423 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-ice2 rotate: false - xy: 1543, 1504 + xy: 1509, 1389 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-ice3 rotate: false - xy: 1543, 1470 + xy: 1543, 1504 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 1543, 1436 + xy: 1543, 1470 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 1543, 1402 + xy: 1543, 1436 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 1577, 1499 + xy: 1543, 1402 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-snow1 rotate: false - xy: 1577, 1465 + xy: 1577, 1499 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-snow2 rotate: false - xy: 1577, 1431 + xy: 1577, 1465 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-snow3 rotate: false - xy: 1577, 1397 + xy: 1577, 1431 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 1543, 1368 + xy: 1577, 1397 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 1577, 1363 + xy: 1543, 1368 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 1509, 1355 + xy: 1577, 1363 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-blackstone1 rotate: false - xy: 1543, 1334 + xy: 1509, 1355 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-blackstone2 rotate: false - xy: 1577, 1329 + xy: 1543, 1334 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-blackstone3 rotate: false - xy: 1611, 1499 + xy: 1577, 1329 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-grass1 rotate: false - xy: 1611, 1465 + xy: 1611, 1499 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-grass2 rotate: false - xy: 1611, 1431 + xy: 1611, 1465 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-grass3 rotate: false - xy: 1611, 1397 + xy: 1611, 1431 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-ice1 rotate: false - xy: 1611, 1363 + xy: 1611, 1397 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-ice2 rotate: false - xy: 1611, 1329 + xy: 1611, 1363 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-ice3 rotate: false - xy: 1621, 1533 + xy: 1611, 1329 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 1655, 1537 + xy: 1621, 1533 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 1689, 1537 + xy: 1655, 1537 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 1723, 1537 + xy: 1689, 1537 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-snow1 rotate: false - xy: 1757, 1537 + xy: 1723, 1537 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-snow2 rotate: false - xy: 1791, 1537 + xy: 1757, 1537 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-snow3 rotate: false - xy: 1825, 1537 + xy: 1791, 1537 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 1859, 1537 + xy: 1825, 1537 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 1893, 1535 + xy: 1859, 1537 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 1645, 1499 + xy: 1893, 1535 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-blackstone1 rotate: false - xy: 1645, 1465 + xy: 1645, 1499 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-blackstone2 rotate: false - xy: 1645, 1431 + xy: 1645, 1465 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-blackstone3 rotate: false - xy: 1645, 1397 + xy: 1645, 1431 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-grass1 rotate: false - xy: 1645, 1363 + xy: 1645, 1397 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-grass2 rotate: false - xy: 1645, 1329 + xy: 1645, 1363 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-grass3 rotate: false - xy: 1679, 1503 + xy: 1645, 1329 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-ice1 rotate: false - xy: 1679, 1469 + xy: 1679, 1503 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-ice2 rotate: false - xy: 1713, 1503 + xy: 1679, 1469 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-ice3 rotate: false - xy: 1679, 1435 + xy: 1713, 1503 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 1713, 1469 + xy: 1679, 1435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 1747, 1503 + xy: 1713, 1469 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 1679, 1401 + xy: 1747, 1503 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-snow1 rotate: false - xy: 1713, 1435 + xy: 1679, 1401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-snow2 rotate: false - xy: 1747, 1469 + xy: 1713, 1435 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-snow3 rotate: false - xy: 1781, 1503 + xy: 1747, 1469 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 1679, 1367 + xy: 1781, 1503 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 1713, 1401 + xy: 1679, 1367 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 1747, 1435 + xy: 1713, 1401 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-cliff-edge rotate: false - xy: 1883, 1467 + xy: 1883, 1501 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-cliff-edge-1 rotate: false - xy: 1883, 1433 + xy: 1883, 1467 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-cliff-edge-2 rotate: false - xy: 1883, 1399 + xy: 1883, 1433 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sand-cliff-side rotate: false - xy: 1883, 1365 + xy: 1883, 1399 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -space-cliff-edge +snow-cliff-edge + rotate: false + xy: 1951, 1467 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +snow-cliff-edge-1 + rotate: false + xy: 1951, 1433 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +snow-cliff-edge-2 rotate: false xy: 1951, 1399 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -space-cliff-edge-1 +snow-cliff-side rotate: false xy: 1951, 1365 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 -space-cliff-edge-2 - rotate: false - xy: 1951, 1331 - size: 32, 32 - orig: 32, 32 - offset: 0, 0 - index: -1 -space-cliff-side +space-cliff-edge rotate: false xy: 1961, 1561 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +space-cliff-edge-1 + rotate: false + xy: 1995, 1561 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +space-cliff-edge-2 + rotate: false + xy: 1985, 1527 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 +space-cliff-side + rotate: false + xy: 1985, 1493 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: -1 tar-cliff-edge rotate: false - xy: 1985, 1357 + xy: 1713, 1299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-cliff-edge-1 rotate: false - xy: 1985, 1323 + xy: 1747, 1299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-cliff-edge-2 rotate: false - xy: 1679, 1299 + xy: 1781, 1299 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tar-cliff-side rotate: false - xy: 1713, 1299 + xy: 1815, 1299 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4920,7 +4920,7 @@ item-biomatter index: -1 item-blast-compound rotate: false - xy: 363, 271 + xy: 363, 305 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4934,7 +4934,7 @@ item-coal index: -1 item-copper rotate: false - xy: 363, 237 + xy: 363, 271 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4948,7 +4948,7 @@ item-dense-alloy index: -1 item-lead rotate: false - xy: 363, 203 + xy: 363, 237 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -4962,63 +4962,63 @@ item-phase-fabric index: -1 item-plastanium rotate: false - xy: 363, 169 + xy: 363, 203 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 363, 135 + xy: 363, 169 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-sand rotate: false - xy: 363, 101 + xy: 363, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 363, 67 + xy: 363, 101 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-stone rotate: false - xy: 951, 1243 + xy: 363, 67 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 951, 1209 + xy: 951, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 985, 1243 + xy: 951, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 1019, 1243 + xy: 985, 1243 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 liquid-icon rotate: false - xy: 1189, 1243 + xy: 1121, 1209 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -5323,14 +5323,14 @@ discord-banner index: -1 empty-sector rotate: false - xy: 363, 577 + xy: 363, 611 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 465, 685 + xy: 465, 643 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5358,42 +5358,42 @@ icon-effect index: -1 icon-liquid rotate: false - xy: 465, 649 + xy: 465, 607 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-power rotate: false - xy: 431, 537 + xy: 449, 521 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-production rotate: false - xy: 449, 555 + xy: 449, 503 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-turret rotate: false - xy: 428, 465 + xy: 446, 449 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 428, 447 + xy: 446, 431 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-upgrade rotate: false - xy: 428, 429 + xy: 446, 413 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5477,7 +5477,7 @@ icon-arrow-right index: -1 icon-arrow-up rotate: false - xy: 204, 1727 + xy: 397, 67 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5491,7 +5491,7 @@ icon-back index: -1 icon-ban rotate: false - xy: 446, 431 + xy: 391, 17 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5512,7 +5512,7 @@ icon-cancel index: -1 icon-chat rotate: false - xy: 2036, 1855 + xy: 204, 1727 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5526,56 +5526,56 @@ icon-check index: -1 icon-copy rotate: false - xy: 431, 555 + xy: 431, 521 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 1335, 1277 + xy: 2036, 1855 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 403, 55 + xy: 391, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 403, 39 + xy: 565, 1101 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 391, 17 + xy: 581, 1101 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 391, 1 + xy: 565, 1085 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 467, 561 + xy: 581, 1085 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 467, 545 + xy: 565, 1069 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5596,14 +5596,14 @@ icon-eraser index: -1 icon-exit rotate: false - xy: 565, 1101 + xy: 581, 1069 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 465, 667 + xy: 465, 625 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5617,7 +5617,7 @@ icon-file-image index: -1 icon-file-text rotate: false - xy: 581, 1101 + xy: 565, 1053 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5631,7 +5631,7 @@ icon-fill index: -1 icon-floppy rotate: false - xy: 565, 1085 + xy: 581, 1053 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5645,14 +5645,14 @@ icon-floppy-16 index: -1 icon-folder rotate: false - xy: 581, 1085 + xy: 597, 1061 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 565, 1069 + xy: 613, 1061 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5666,14 +5666,14 @@ icon-generated index: -1 icon-github rotate: false - xy: 581, 1069 + xy: 629, 1061 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 565, 1053 + xy: 645, 1061 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5687,56 +5687,56 @@ icon-grid index: -1 icon-hold rotate: false - xy: 1321, 1435 + xy: 1335, 1277 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 547, 983 + xy: 1321, 1435 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 581, 1053 + xy: 467, 1003 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 597, 1061 + xy: 483, 1003 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 216, 1727 + xy: 465, 541 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 613, 1061 + xy: 467, 987 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-item rotate: false - xy: 2036, 1843 + xy: 427, 351 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 1315, 1345 + xy: 403, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -5750,21 +5750,21 @@ icon-line index: -1 icon-link rotate: false - xy: 629, 1061 + xy: 467, 971 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid-small rotate: false - xy: 1347, 1277 + xy: 443, 367 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 645, 1061 + xy: 483, 987 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5792,28 +5792,28 @@ icon-loading index: -1 icon-locked rotate: false - xy: 465, 631 + xy: 465, 589 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 547, 971 + xy: 409, 67 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-map rotate: false - xy: 467, 1003 + xy: 499, 995 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 228, 1727 + xy: 403, 55 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5827,7 +5827,7 @@ icon-menu-large index: -1 icon-missing rotate: false - xy: 428, 417 + xy: 216, 1727 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5841,287 +5841,287 @@ icon-mission-background index: -1 icon-mission-battle rotate: false - xy: 427, 405 + xy: 2036, 1843 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-defense rotate: false - xy: 427, 393 + xy: 1347, 1277 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-mission-done rotate: false - xy: 427, 381 + xy: 427, 339 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 427, 369 + xy: 403, 43 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-nullitem rotate: false - xy: 1335, 1289 + xy: 1315, 1345 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-paste rotate: false - xy: 465, 613 + xy: 465, 571 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 427, 357 + xy: 228, 1727 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 465, 595 + xy: 465, 553 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 483, 1003 + xy: 467, 955 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 465, 577 + xy: 431, 503 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 427, 345 + xy: 427, 327 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 467, 987 + xy: 483, 971 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 427, 333 + xy: 427, 315 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power-small rotate: false - xy: 427, 321 + xy: 427, 303 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 467, 971 + xy: 499, 979 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 449, 537 + xy: 428, 485 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 483, 987 + xy: 515, 995 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 499, 995 + xy: 483, 955 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 428, 519 + xy: 428, 467 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 467, 955 + xy: 499, 963 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 483, 971 + xy: 515, 979 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 499, 979 + xy: 531, 995 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 515, 995 + xy: 515, 963 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 483, 955 + xy: 531, 979 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 428, 501 + xy: 446, 485 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 446, 519 + xy: 428, 449 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 427, 309 + xy: 427, 291 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 428, 483 + xy: 446, 467 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 499, 963 + xy: 547, 995 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 427, 297 + xy: 427, 279 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 427, 285 + xy: 427, 267 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 515, 979 + xy: 531, 963 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 446, 501 + xy: 428, 431 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 531, 995 + xy: 547, 979 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 515, 963 + xy: 547, 963 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 446, 483 + xy: 428, 413 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocked rotate: false - xy: 446, 465 + xy: 428, 395 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 531, 979 + xy: 428, 379 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 547, 995 + xy: 444, 379 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 446, 447 + xy: 446, 395 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 531, 963 + xy: 427, 363 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -6135,7 +6135,7 @@ info-banner index: -1 inventory rotate: false - xy: 397, 71 + xy: 465, 740 size: 24, 40 split: 10, 10, 10, 14 orig: 24, 40 @@ -6166,7 +6166,7 @@ pane-2 index: -1 scroll rotate: false - xy: 465, 703 + xy: 465, 661 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -6190,7 +6190,7 @@ scroll-knob-horizontal-black index: -1 scroll-knob-vertical-black rotate: false - xy: 465, 740 + xy: 465, 698 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -6198,14 +6198,14 @@ scroll-knob-vertical-black index: -1 sector-edge rotate: false - xy: 1917, 1433 + xy: 1917, 1467 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 sector-select rotate: false - xy: 1917, 1399 + xy: 1917, 1433 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -6226,21 +6226,21 @@ slider index: -1 slider-knob rotate: false - xy: 397, 499 + xy: 397, 465 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-down rotate: false - xy: 397, 459 + xy: 397, 425 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 slider-knob-over rotate: false - xy: 397, 419 + xy: 397, 385 size: 29, 38 orig: 29, 38 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 0f7056fd41..f42c2663f7 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/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index e955472e1d..4be937ad94 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -66,7 +66,8 @@ public class Control implements ApplicationListener{ content.initialize(Content::load); if(Core.atlas.getTextures().size != 1){ - throw new IllegalStateException("Atlas must be exactly one texture."); + throw new IllegalStateException("Atlas must be exactly one texture. " + + "If more textures are used, the map editor will not display them correctly."); } unlocks.load(); diff --git a/core/src/io/anuke/mindustry/core/Platform.java b/core/src/io/anuke/mindustry/core/Platform.java index 96a48c7cf8..ca4fd9d2f9 100644 --- a/core/src/io/anuke/mindustry/core/Platform.java +++ b/core/src/io/anuke/mindustry/core/Platform.java @@ -1,12 +1,10 @@ package io.anuke.mindustry.core; import io.anuke.arc.Core; +import io.anuke.arc.Input.TextInput; import io.anuke.arc.files.FileHandle; import io.anuke.arc.function.Consumer; -import io.anuke.arc.input.KeyCode; -import io.anuke.arc.scene.ui.Dialog; import io.anuke.arc.scene.ui.TextField; -import io.anuke.arc.util.Time; import io.anuke.arc.util.serialization.Base64Coder; import java.util.Random; @@ -26,6 +24,17 @@ public abstract class Platform { if(!mobile) return; //this is mobile only, desktop doesn't need dialogs field.tapped(() -> { + TextInput input = new TextInput(); + input.text = field.getText(); + input.maxLength = maxLength; + input.accepted = text -> { + field.clearText(); + field.appendText(text); + field.change(); + Core.input.setOnscreenKeyboardVisible(false); + }; + Core.input.getTextInput(input); + /* Dialog dialog = new Dialog("", "dialog"); dialog.setFillParent(true); dialog.content().top(); @@ -59,7 +68,7 @@ public abstract class Platform { to.setCursorPosition(to.getText().length()); Core.scene.setKeyboardFocus(to); Core.input.setOnscreenKeyboardVisible(true); - }); + });*/ }); } /**Update discord RPC.*/ diff --git a/core/src/io/anuke/mindustry/entities/units/types/AlphaDrone.java b/core/src/io/anuke/mindustry/entities/units/types/AlphaDrone.java deleted file mode 100644 index 2937cce3d2..0000000000 --- a/core/src/io/anuke/mindustry/entities/units/types/AlphaDrone.java +++ /dev/null @@ -1,115 +0,0 @@ -package io.anuke.mindustry.entities.units.types; - -import io.anuke.annotations.Annotations.Loc; -import io.anuke.annotations.Annotations.Remote; -import io.anuke.arc.Core; -import io.anuke.arc.entities.Effects; -import io.anuke.arc.math.Angles; -import io.anuke.arc.math.geom.Vector2; -import io.anuke.mindustry.Vars; -import io.anuke.mindustry.content.fx.UnitFx; -import io.anuke.mindustry.entities.Player; -import io.anuke.mindustry.entities.Predict; -import io.anuke.mindustry.entities.traits.TargetTrait; -import io.anuke.mindustry.entities.units.BaseUnit; -import io.anuke.mindustry.entities.units.FlyingUnit; -import io.anuke.mindustry.entities.units.UnitCommand; -import io.anuke.mindustry.entities.units.UnitState; -import io.anuke.mindustry.gen.Call; -import io.anuke.mindustry.net.Net; -import io.anuke.mindustry.type.AmmoType; - -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; - -import static io.anuke.mindustry.Vars.headless; -import static io.anuke.mindustry.Vars.players; - -public class AlphaDrone extends FlyingUnit { - static final float followDistance = 80f; - - public Player leader; - - public final UnitState attack = new UnitState() { - @Override - public void update() { - if(leader == null || leader.isDead() || !leader.isAdded()){ - damage(99999f); - return; - } - TargetTrait last = target; - target = leader; - - if(last == null){ - circle(leader.isShooting ? 60f : 0f); - } - - target = last; - if(dst(leader) < followDistance){ - targetClosest(); - }else{ - target = null; - } - - if(target != null){ - attack(50f); - - if((Angles.near(angleTo(target), rotation, 15f) && dst(target) < getWeapon().getAmmo().getRange())){ - AmmoType ammo = getWeapon().getAmmo(); - - Vector2 to = Predict.intercept(AlphaDrone.this, target, ammo.bullet.speed); - getWeapon().update(AlphaDrone.this, to.x, to.y); - } - } - - if(!leader.isShooting && dst(leader) < 7f){ - Call.onAlphaDroneFade(AlphaDrone.this); - } - } - }; - - @Remote(called = Loc.server) - public static void onAlphaDroneFade(BaseUnit drone){ - if(drone == null) return; - Effects.effect(UnitFx.pickup, drone); - //must run afterwards so the unit's group is not null when sending the removal packet - Core.app.post(drone::remove); - } - - @Override - public void onCommand(UnitCommand command){ - //nuh - } - - @Override - public void behavior(){ - //nope - } - - @Override - public UnitState getStartState() { - return attack; - } - - @Override - public void write(DataOutput stream) throws IOException { - super.write(stream); - stream.writeInt(leader == null ? -1 : leader.id); - } - - @Override - public void read(DataInput stream) throws IOException { - super.read(stream); - leader = Vars.playerGroup.getByID(stream.readInt()); - } - - @Override - public void readSave(DataInput stream) throws IOException{ - super.readSave(stream); - - if(!Net.active() && !headless){ - leader = players[0]; - } - } -} diff --git a/core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java index 2387c95fa4..942a22a7c7 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BackgroundFragment.java @@ -23,7 +23,7 @@ public class BackgroundFragment extends Fragment{ Draw.shader(); boolean portrait = Core.graphics.getWidth() < Core.graphics.getHeight(); - float logoscl = (int) Unit.dp.scl(1) * (portrait ? 5f / 7f : 1f); + float logoscl = (int) Unit.dp.scl(1) * (portrait ? 0.5f : 0.75f); TextureRegion logo = Core.atlas.find("logotext"); float logow = logo.getWidth() * logoscl; float logoh = logo.getHeight() * logoscl;