diff --git a/core/assets-raw/sprites/ui/icons/icon-arrow.png b/core/assets-raw/sprites/ui/icons/icon-arrow.png index d8f82bf42e..227ea56fdb 100644 Binary files a/core/assets-raw/sprites/ui/icons/icon-arrow.png and b/core/assets-raw/sprites/ui/icons/icon-arrow.png differ diff --git a/core/assets-raw/sprites/ui/icons/icon-cancel.png b/core/assets-raw/sprites/ui/icons/icon-cancel.png index bf4c7ed9a0..2e9914525b 100644 Binary files a/core/assets-raw/sprites/ui/icons/icon-cancel.png and b/core/assets-raw/sprites/ui/icons/icon-cancel.png differ diff --git a/core/assets-raw/sprites/ui/icons/icon-check.png b/core/assets-raw/sprites/ui/icons/icon-check.png index 67bd7b09cd..eb282e25ee 100644 Binary files a/core/assets-raw/sprites/ui/icons/icon-check.png and b/core/assets-raw/sprites/ui/icons/icon-check.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 9728156a4d..0f9cc3ca30 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,98 +13,98 @@ background index: -1 bridgeconduit rotate: false - xy: 679, 215 + xy: 246, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconduit-arrow rotate: false - xy: 686, 317 + xy: 256, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconduit-bridge rotate: false - xy: 686, 307 + xy: 266, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconduit-end rotate: false - xy: 686, 297 + xy: 276, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor rotate: false - xy: 554, 185 + xy: 286, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-arrow rotate: false - xy: 554, 175 + xy: 226, 28 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-bridge rotate: false - xy: 554, 165 + xy: 236, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-end rotate: false - xy: 554, 155 + xy: 246, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 564, 137 + xy: 512, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top rotate: false - xy: 574, 180 + xy: 532, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduittunnel rotate: false - xy: 584, 180 + xy: 542, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 574, 170 + xy: 685, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyormove rotate: false - xy: 594, 180 + xy: 685, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyortunnel rotate: false - xy: 574, 160 + xy: 685, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -118,98 +118,98 @@ core index: -1 junction rotate: false - xy: 674, 155 + xy: 624, 150 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit rotate: false - xy: 674, 145 + xy: 634, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-arrow rotate: false - xy: 674, 135 + xy: 644, 170 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-bridge rotate: false - xy: 674, 125 + xy: 614, 130 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-end rotate: false - xy: 686, 269 + xy: 624, 140 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor rotate: false - xy: 222, 2 + xy: 634, 150 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-arrow rotate: false - xy: 308, 43 + xy: 644, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-bridge rotate: false - xy: 430, 122 + xy: 624, 130 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-end rotate: false - xy: 440, 122 + xy: 634, 140 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 451, 108 + xy: 664, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 461, 108 + xy: 654, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-bottom rotate: false - xy: 451, 98 + xy: 664, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-liquid rotate: false - xy: 471, 108 + xy: 654, 145 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-top rotate: false - xy: 461, 98 + xy: 664, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -237,84 +237,84 @@ liquidtank-top index: -1 multiplexer rotate: false - xy: 855, 443 + xy: 891, 443 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 overflowgate rotate: false - xy: 278, 29 + xy: 674, 135 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyor rotate: false - xy: 298, 31 + xy: 686, 269 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyormove rotate: false - xy: 308, 33 + xy: 296, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-bottom rotate: false - xy: 242, 9 + xy: 306, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-top rotate: false - xy: 252, 19 + xy: 316, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 302, 1 + xy: 624, 120 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 654, 105 + xy: 296, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 664, 105 + xy: 306, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 574, 100 + xy: 305, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyor rotate: false - xy: 584, 100 + xy: 316, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyormove rotate: false - xy: 594, 100 + xy: 326, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -328,7 +328,7 @@ teleporter-top index: -1 unloader rotate: false - xy: 353, 91 + xy: 929, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -342,63 +342,63 @@ vault index: -1 weaponfactory rotate: false - xy: 835, 407 + xy: 871, 407 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blackrock1 rotate: false - xy: 493, 113 + xy: 362, 79 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackrockshadow1 rotate: false - xy: 503, 113 + xy: 374, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 513, 113 + xy: 384, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 523, 113 + xy: 395, 109 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 533, 113 + xy: 405, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock1 rotate: false - xy: 543, 113 + xy: 415, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock2 rotate: false - xy: 685, 347 + xy: 395, 99 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock3 rotate: false - xy: 685, 337 + xy: 405, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -412,49 +412,49 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 554, 125 + xy: 276, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 564, 187 + xy: 286, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 564, 177 + xy: 224, 18 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 604, 180 + xy: 666, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 574, 150 + xy: 679, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 584, 160 + xy: 679, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 594, 170 + xy: 679, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -468,35 +468,35 @@ dirtedge index: -1 grass1 rotate: false - xy: 584, 140 + xy: 554, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 594, 150 + xy: 554, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 604, 160 + xy: 554, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock1 rotate: false - xy: 614, 170 + xy: 554, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock2 rotate: false - xy: 634, 180 + xy: 554, 145 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -510,378 +510,378 @@ grassedge index: -1 ice1 rotate: false - xy: 584, 130 + xy: 554, 135 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 594, 140 + xy: 554, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 604, 150 + xy: 564, 187 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 232, 79 + xy: 297, 95 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 614, 160 + xy: 564, 177 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 624, 170 + xy: 564, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 644, 180 + xy: 564, 157 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 644, 180 + xy: 564, 157 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 594, 130 + xy: 564, 147 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 594, 130 + xy: 564, 147 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron1 rotate: false - xy: 624, 160 + xy: 574, 180 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron2 rotate: false - xy: 634, 170 + xy: 584, 180 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron3 rotate: false - xy: 604, 130 + xy: 574, 170 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 431, 112 + xy: 644, 150 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 232, 65 + xy: 232, 79 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 441, 112 + xy: 644, 140 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 441, 102 + xy: 644, 130 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 431, 92 + xy: 654, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 451, 88 + xy: 664, 135 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 461, 88 + xy: 654, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 471, 88 + xy: 664, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 481, 92 + xy: 326, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 481, 82 + xy: 676, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 238, 29 + xy: 674, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalflooredge rotate: false - xy: 246, 79 + xy: 232, 65 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mossblock rotate: false - xy: 248, 29 + xy: 674, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 258, 29 + xy: 674, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oiledge rotate: false - xy: 232, 51 + xy: 246, 79 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock1 rotate: false - xy: 302, 21 + xy: 604, 120 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock2 rotate: false - xy: 302, 11 + xy: 614, 120 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 312, 3 + xy: 564, 117 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 574, 120 + xy: 554, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 584, 120 + xy: 654, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock1 rotate: false - xy: 594, 120 + xy: 664, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock2 rotate: false - xy: 604, 120 + xy: 674, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock3 rotate: false - xy: 614, 120 + xy: 236, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 246, 65 + xy: 232, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrub rotate: false - xy: 664, 115 + xy: 235, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 674, 115 + xy: 245, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 594, 110 + xy: 255, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 604, 110 + xy: 265, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 614, 110 + xy: 265, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock1 rotate: false - xy: 624, 110 + xy: 275, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock2 rotate: false - xy: 634, 110 + xy: 275, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock3 rotate: false - xy: 644, 110 + xy: 285, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 274, 79 + xy: 260, 65 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 space rotate: false - xy: 674, 105 + xy: 295, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 260, 51 + xy: 274, 79 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone1 rotate: false - xy: 644, 100 + xy: 614, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 654, 95 + xy: 624, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 664, 95 + xy: 634, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock1 rotate: false - xy: 674, 95 + xy: 644, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock2 rotate: false - xy: 853, 399 + xy: 564, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock3 rotate: false - xy: 863, 399 + xy: 654, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -895,98 +895,98 @@ stoneedge index: -1 thorium1 rotate: false - xy: 913, 399 + xy: 594, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 923, 399 + xy: 604, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 933, 399 + xy: 614, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 943, 399 + xy: 624, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 953, 399 + xy: 634, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 963, 399 + xy: 644, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 383, 91 + xy: 959, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 302, 65 + xy: 210, 18 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-border rotate: false - xy: 679, 245 + xy: 195, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-middle rotate: false - xy: 679, 235 + xy: 226, 38 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 679, 235 + xy: 226, 38 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 border rotate: false - xy: 679, 225 + xy: 236, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 564, 127 + xy: 522, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 584, 170 + xy: 656, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1014,7 +1014,7 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 604, 170 + xy: 686, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1028,42 +1028,42 @@ nuclearreactor-shadow index: -1 playerspawn rotate: false - xy: 288, 29 + xy: 674, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 262, 39 + xy: 338, 89 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 rubble-1-0 rotate: false - xy: 999, 443 + xy: 817, 425 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 799, 425 + xy: 835, 425 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 817, 425 + xy: 853, 425 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 835, 425 + xy: 871, 425 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1084,7 +1084,7 @@ rubble-3-1 index: -1 shadow-1 rotate: false - xy: 407, 96 + xy: 350, 77 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1119,14 +1119,14 @@ shadow-5 index: -1 shadow-round-1 rotate: false - xy: 419, 96 + xy: 362, 89 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 battery rotate: false - xy: 313, 99 + xy: 1015, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1140,14 +1140,14 @@ batterylarge index: -1 combustiongenerator rotate: false - xy: 564, 167 + xy: 482, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustiongenerator-top rotate: false - xy: 564, 157 + xy: 492, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1217,7 +1217,7 @@ largesolarpanel index: -1 liquidcombustiongenerator rotate: false - xy: 441, 92 + xy: 654, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1245,21 +1245,21 @@ nuclearreactor-lights index: -1 powerinfinite rotate: false - xy: 232, 19 + xy: 306, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powernode rotate: false - xy: 232, 9 + xy: 316, 39 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powernodelarge rotate: false - xy: 945, 443 + xy: 981, 443 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1273,42 +1273,42 @@ powernodelarge-shadow index: -1 powervoid rotate: false - xy: 242, 19 + xy: 296, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator rotate: false - xy: 312, 23 + xy: 634, 120 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator-top rotate: false - xy: 312, 13 + xy: 644, 120 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldgenerator rotate: false - xy: 644, 120 + xy: 266, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldprojector rotate: false - xy: 853, 425 + xy: 889, 425 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 solarpanel rotate: false - xy: 564, 107 + xy: 285, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1329,7 +1329,7 @@ teleporter-top index: -1 thermalgenerator rotate: false - xy: 903, 399 + xy: 584, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1441,105 +1441,105 @@ cultivator-top index: -1 extractor rotate: false - xy: 624, 180 + xy: 686, 307 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 fluxpump rotate: false - xy: 574, 130 + xy: 686, 297 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 614, 150 + xy: 564, 127 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill rotate: false - xy: 614, 140 + xy: 594, 180 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill-rotator rotate: false - xy: 624, 150 + xy: 574, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill-rotator rotate: false - xy: 624, 150 + xy: 574, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill-top rotate: false - xy: 634, 160 + xy: 584, 170 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 674, 175 + xy: 604, 130 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 674, 165 + xy: 614, 140 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserdrill rotate: false - xy: 801, 443 + xy: 837, 443 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laserdrill-rotator rotate: false - xy: 819, 443 + xy: 855, 443 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laserdrill-top rotate: false - xy: 837, 443 + xy: 873, 443 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 431, 102 + xy: 634, 130 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 471, 98 + xy: 654, 135 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 481, 102 + xy: 664, 145 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1602,7 +1602,7 @@ oilextractor-top index: -1 oilrefinery rotate: false - xy: 268, 29 + xy: 674, 145 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1637,210 +1637,210 @@ plasmadrill-top index: -1 plasticformer rotate: false - xy: 873, 443 + xy: 909, 443 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plasticformer-top rotate: false - xy: 891, 443 + xy: 927, 443 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter rotate: false - xy: 909, 443 + xy: 945, 443 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter-top rotate: false - xy: 927, 443 + xy: 963, 443 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powersmelter rotate: false - xy: 963, 443 + xy: 999, 443 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powersmelter-top rotate: false - xy: 981, 443 + xy: 799, 425 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 siliconsmelter-top rotate: false - xy: 981, 443 + xy: 799, 425 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 252, 9 + xy: 326, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 262, 19 + xy: 326, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump rotate: false - xy: 262, 9 + xy: 316, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill rotate: false - xy: 272, 19 + xy: 326, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill-rotator rotate: false - xy: 272, 9 + xy: 430, 122 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill-top rotate: false - xy: 282, 19 + xy: 440, 122 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 624, 120 + xy: 246, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 634, 120 + xy: 256, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconextractor rotate: false - xy: 574, 110 + xy: 245, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconsmelter rotate: false - xy: 871, 425 + xy: 907, 425 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 smelter rotate: false - xy: 584, 110 + xy: 255, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill rotate: false - xy: 604, 100 + xy: 574, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill-rotator rotate: false - xy: 614, 100 + xy: 584, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill-top rotate: false - xy: 624, 100 + xy: 594, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stonedrill rotate: false - xy: 873, 399 + xy: 664, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 883, 399 + xy: 674, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill rotate: false - xy: 973, 399 + xy: 654, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill-top rotate: false - xy: 983, 399 + xy: 664, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 waterextractor rotate: false - xy: 943, 425 + xy: 979, 425 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-liquid rotate: false - xy: 961, 425 + xy: 997, 425 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-rotator rotate: false - xy: 979, 425 + xy: 799, 407 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-top rotate: false - xy: 997, 425 + xy: 817, 407 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-1 rotate: false - xy: 666, 185 + xy: 781, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1889,7 +1889,7 @@ block-4-top index: -1 scatter-heat rotate: false - xy: 286, 39 + xy: 338, 77 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1903,7 +1903,7 @@ arc index: -1 arc-heat rotate: false - xy: 1013, 413 + xy: 138, 44 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1938,7 +1938,7 @@ crux-panel-right index: -1 duo rotate: false - xy: 584, 150 + xy: 215, 8 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1959,14 +1959,14 @@ spectre index: -1 lancer rotate: false - xy: 238, 39 + xy: 326, 89 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 250, 39 + xy: 326, 77 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1987,49 +1987,49 @@ ripple index: -1 scatter rotate: false - xy: 274, 39 + xy: 326, 65 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 scatter-heat rotate: false - xy: 195, 2 + xy: 350, 89 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 scorch rotate: false - xy: 210, 8 + xy: 326, 53 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 395, 95 + xy: 338, 65 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 swarmer rotate: false - xy: 907, 425 + xy: 943, 425 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave rotate: false - xy: 799, 407 + xy: 835, 407 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 817, 407 + xy: 853, 407 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2078,35 +2078,35 @@ walkerfactory-top-open index: -1 repairpoint rotate: false - xy: 282, 9 + xy: 574, 120 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 repairpoint-turret rotate: false - xy: 292, 19 + xy: 584, 120 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 resupplypoint rotate: false - xy: 292, 9 + xy: 594, 120 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 compositewall rotate: false - xy: 564, 147 + xy: 502, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 614, 180 + xy: 679, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2127,14 +2127,14 @@ door-large-open index: -1 door-open rotate: false - xy: 574, 140 + xy: 205, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall rotate: false - xy: 594, 160 + xy: 225, 8 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2148,49 +2148,49 @@ duriumwall-large index: -1 ironwall rotate: false - xy: 644, 170 + xy: 604, 180 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall rotate: false - xy: 634, 100 + xy: 604, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall-large rotate: false - xy: 889, 425 + xy: 925, 425 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 stonewall rotate: false - xy: 893, 399 + xy: 574, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumshieldwall rotate: false - xy: 993, 399 + xy: 674, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall rotate: false - xy: 1003, 399 + xy: 889, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall-large rotate: false - xy: 925, 425 + xy: 961, 425 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2288,7 +2288,7 @@ shell-back index: -1 shot rotate: false - xy: 654, 115 + xy: 235, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2302,7 +2302,7 @@ transfer index: -1 transfer-arrow rotate: false - xy: 323, 91 + xy: 899, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2316,196 +2316,196 @@ transfer-end index: -1 item-armor-piercing-bullet rotate: false - xy: 614, 130 + xy: 574, 150 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-composite-flak rotate: false - xy: 624, 130 + xy: 574, 140 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-explosive-shell rotate: false - xy: 634, 140 + xy: 584, 150 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-frag-shell rotate: false - xy: 644, 150 + xy: 594, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-homing-bullet rotate: false - xy: 634, 130 + xy: 604, 170 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-incendiary-mortar-shell rotate: false - xy: 644, 140 + xy: 624, 180 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead-bullet rotate: false - xy: 654, 165 + xy: 594, 150 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-scythe-missile rotate: false - xy: 664, 165 + xy: 634, 180 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-surge-mortar-shell rotate: false - xy: 664, 135 + xy: 624, 170 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-swarm-missile rotate: false - xy: 654, 125 + xy: 644, 180 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium-shell rotate: false - xy: 222, 12 + xy: 614, 150 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-tracer-bullet rotate: false - xy: 676, 185 + xy: 634, 170 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 624, 140 + xy: 584, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 634, 150 + xy: 594, 170 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 644, 160 + xy: 614, 180 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-iron rotate: false - xy: 644, 130 + xy: 574, 130 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 654, 175 + xy: 584, 140 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastic rotate: false - xy: 664, 175 + xy: 604, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 654, 155 + xy: 614, 170 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 654, 145 + xy: 584, 130 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-steel rotate: false - xy: 664, 155 + xy: 594, 140 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 654, 135 + xy: 604, 150 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 664, 145 + xy: 614, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thermite rotate: false - xy: 664, 125 + xy: 594, 130 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 222, 22 + xy: 604, 140 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 298, 41 + xy: 624, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 standard-mech rotate: false - xy: 274, 65 + xy: 260, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-ship rotate: false - xy: 288, 79 + xy: 274, 65 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -2654,7 +2654,7 @@ check-over index: -1 clear rotate: false - xy: 1013, 401 + xy: 150, 44 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2710,23 +2710,23 @@ icon-admin index: -1 icon-admin-small rotate: false - xy: 1015, 425 + xy: 1017, 453 size: 6, 6 orig: 6, 6 offset: 0, 0 index: -1 icon-areaDelete rotate: false - xy: 138, 44 + xy: 311, 97 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow rotate: false - xy: 115, 1 - size: 14, 14 - orig: 14, 14 + xy: 522, 195 + size: 16, 16 + orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-16 @@ -2738,28 +2738,28 @@ icon-arrow-16 index: -1 icon-arrow-down rotate: false - xy: 150, 44 + xy: 654, 279 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 302, 53 + xy: 666, 279 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 210, 20 + xy: 650, 267 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 654, 279 + xy: 662, 267 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2773,560 +2773,560 @@ icon-back index: -1 icon-ban rotate: false - xy: 131, 1 + xy: 115, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 853, 409 - size: 14, 14 - orig: 14, 14 + xy: 482, 159 + size: 16, 16 + orig: 16, 16 offset: 0, 0 index: -1 icon-chat - rotate: false - xy: 666, 279 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-check - rotate: false - xy: 869, 409 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-crafting - rotate: false - xy: 650, 267 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-cursor - rotate: false - xy: 662, 267 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-defense rotate: false xy: 660, 255 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 -icon-dev-builds - rotate: false - xy: 885, 409 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-discord - rotate: false - xy: 901, 409 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-distribution - rotate: false - xy: 678, 279 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-donate - rotate: false - xy: 917, 409 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-dots - rotate: false - xy: 933, 409 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-editor - rotate: false - xy: 949, 409 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-egg - rotate: false - xy: 965, 409 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-exit - rotate: false - xy: 981, 409 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-file - rotate: false - xy: 482, 159 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -icon-file-image +icon-check rotate: false xy: 500, 177 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -icon-file-text +icon-crafting rotate: false - xy: 997, 409 - size: 14, 14 - orig: 14, 14 + xy: 678, 279 + size: 10, 10 + orig: 10, 10 offset: 0, 0 index: -1 -icon-fill - rotate: false - xy: 482, 141 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -icon-floppy - rotate: false - xy: 576, 190 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-floppy-16 - rotate: false - xy: 500, 159 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -icon-folder - rotate: false - xy: 592, 190 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-folder-parent - rotate: false - xy: 608, 190 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-github - rotate: false - xy: 624, 190 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-google-play - rotate: false - xy: 640, 190 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-grid - rotate: false - xy: 518, 177 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -icon-hold +icon-cursor rotate: false xy: 674, 267 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 -icon-holdDelete +icon-defense rotate: false xy: 672, 255 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 -icon-home +icon-dev-builds rotate: false - xy: 145, 28 + xy: 131, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -icon-host +icon-discord rotate: false - xy: 147, 1 + xy: 889, 409 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -icon-info +icon-distribution rotate: false - xy: 655, 243 + xy: 302, 83 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 -icon-itch.io +icon-donate rotate: false - xy: 162, 36 + xy: 905, 409 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -icon-items-none +icon-dots rotate: false - xy: 604, 140 - size: 8, 8 - orig: 8, 8 + xy: 921, 409 + size: 14, 14 + orig: 14, 14 offset: 0, 0 index: -1 -icon-line +icon-editor + rotate: false + xy: 937, 409 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-egg + rotate: false + xy: 953, 409 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-exit + rotate: false + xy: 969, 409 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-file + rotate: false + xy: 482, 141 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +icon-file-image + rotate: false + xy: 500, 159 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +icon-file-text + rotate: false + xy: 985, 409 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-fill + rotate: false + xy: 518, 177 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +icon-floppy + rotate: false + xy: 1001, 409 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-floppy-16 rotate: false xy: 482, 123 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -icon-link +icon-folder rotate: false - xy: 178, 36 + xy: 576, 190 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -icon-liquid +icon-folder-parent rotate: false - xy: 655, 231 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-load - rotate: false - xy: 194, 36 + xy: 592, 190 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -icon-load-image +icon-github + rotate: false + xy: 608, 190 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-google-play + rotate: false + xy: 624, 190 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-grid rotate: false xy: 500, 141 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -icon-load-map +icon-hold + rotate: false + xy: 302, 71 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-holdDelete + rotate: false + xy: 302, 59 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-home + rotate: false + xy: 640, 190 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-host + rotate: false + xy: 145, 28 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-info + rotate: false + xy: 302, 47 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-itch.io + rotate: false + xy: 147, 1 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-items-none + rotate: false + xy: 564, 137 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +icon-line rotate: false xy: 518, 159 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -icon-loading +icon-link + rotate: false + xy: 162, 36 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-liquid + rotate: false + xy: 655, 243 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-load + rotate: false + xy: 178, 36 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-load-image rotate: false xy: 500, 123 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -icon-logic - rotate: false - xy: 667, 243 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-menu - rotate: false - xy: 655, 219 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-menu-large +icon-load-map rotate: false xy: 518, 141 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -icon-none - rotate: false - xy: 667, 231 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-pause - rotate: false - xy: 655, 207 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-pencil +icon-loading rotate: false xy: 518, 123 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -icon-pencil-small +icon-logic rotate: false - xy: 210, 32 - size: 14, 14 - orig: 14, 14 + xy: 655, 231 + size: 10, 10 + orig: 10, 10 offset: 0, 0 index: -1 -icon-pick +icon-menu + rotate: false + xy: 667, 243 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-menu-large rotate: false xy: 540, 195 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -icon-play +icon-none rotate: false - xy: 667, 219 + xy: 655, 219 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 -icon-play-2 +icon-pause rotate: false - xy: 163, 1 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-players - rotate: false - xy: 667, 207 + xy: 667, 231 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 -icon-power - rotate: false - xy: 656, 195 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-production - rotate: false - xy: 668, 195 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-quit - rotate: false - xy: 167, 20 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-redo +icon-pencil rotate: false xy: 536, 177 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -icon-refresh +icon-pencil-small rotate: false - xy: 183, 20 + xy: 194, 36 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -icon-rename - rotate: false - xy: 179, 4 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-resize +icon-pick rotate: false xy: 536, 159 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -icon-rotate +icon-play rotate: false - xy: 638, 300 + xy: 655, 207 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-play-2 + rotate: false + xy: 210, 32 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -icon-rotate-arrow +icon-players rotate: false - xy: 638, 284 + xy: 667, 219 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-power + rotate: false + xy: 667, 207 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-production + rotate: false + xy: 656, 195 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-quit + rotate: false + xy: 163, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -icon-rotate-left - rotate: false - xy: 654, 307 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-rotate-right - rotate: false - xy: 654, 291 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-save - rotate: false - xy: 670, 307 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-save-image +icon-redo rotate: false xy: 536, 141 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -icon-save-map +icon-refresh + rotate: false + xy: 167, 20 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-rename + rotate: false + xy: 183, 20 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-resize rotate: false xy: 536, 123 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -icon-settings +icon-rotate rotate: false - xy: 395, 107 - size: 10, 10 - orig: 10, 10 + xy: 179, 4 + size: 14, 14 + orig: 14, 14 offset: 0, 0 index: -1 -icon-terrain +icon-rotate-arrow + rotate: false + xy: 638, 300 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-rotate-left + rotate: false + xy: 638, 284 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-rotate-right + rotate: false + xy: 654, 307 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-save + rotate: false + xy: 654, 291 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-save-image rotate: false xy: 558, 197 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -icon-tools - rotate: false - xy: 670, 291 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-touch - rotate: false - xy: 407, 108 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-touchDelete - rotate: false - xy: 419, 108 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-trash - rotate: false - xy: 233, 93 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-trash-16 +icon-save-map rotate: false xy: 783, 449 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -icon-trello +icon-settings rotate: false - xy: 249, 93 - size: 14, 14 - orig: 14, 14 + xy: 668, 195 + size: 10, 10 + orig: 10, 10 offset: 0, 0 index: -1 -icon-tutorial - rotate: false - xy: 265, 93 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-undo +icon-terrain rotate: false xy: 781, 431 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -icon-units +icon-tools rotate: false - xy: 781, 401 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-weapon - rotate: false - xy: 226, 36 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-wiki - rotate: false - xy: 281, 93 + xy: 670, 307 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -icon-zoom +icon-touch + rotate: false + xy: 314, 85 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-touchDelete + rotate: false + xy: 314, 73 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-trash + rotate: false + xy: 670, 291 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-trash-16 rotate: false xy: 781, 413 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +icon-trello + rotate: false + xy: 233, 93 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-tutorial + rotate: false + xy: 249, 93 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-undo + rotate: false + xy: 801, 443 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +icon-units + rotate: false + xy: 314, 61 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-weapon + rotate: false + xy: 314, 49 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-wiki + rotate: false + xy: 265, 93 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-zoom + rotate: false + xy: 819, 443 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 icon-zoom-small rotate: false - xy: 297, 93 + xy: 281, 93 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -3404,7 +3404,7 @@ selection index: -1 slider rotate: false - xy: 207, 4 + xy: 1017, 443 size: 1, 8 orig: 1, 8 offset: 0, 0 @@ -3506,140 +3506,140 @@ drone index: -1 scout rotate: false - xy: 260, 79 + xy: 246, 65 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-base rotate: false - xy: 246, 51 + xy: 260, 79 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-mech-base rotate: false - xy: 246, 51 + xy: 260, 79 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-leg rotate: false - xy: 260, 65 + xy: 246, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-mech-leg rotate: false - xy: 260, 65 + xy: 246, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol rotate: false - xy: 288, 65 + xy: 288, 79 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol-booster-1 rotate: false - xy: 288, 51 + xy: 288, 65 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol-booster-2 rotate: false - xy: 302, 79 + xy: 288, 51 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol-flame rotate: false - xy: 482, 112 + xy: 338, 54 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 beam-equip rotate: false - xy: 1015, 433 + xy: 350, 67 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster rotate: false - xy: 685, 327 + xy: 415, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 656, 185 + xy: 394, 89 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun rotate: false - xy: 554, 145 + xy: 256, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun-equip rotate: false - xy: 554, 135 + xy: 266, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun rotate: false - xy: 564, 117 + xy: 276, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 554, 115 + xy: 286, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster rotate: false - xy: 333, 91 + xy: 909, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 343, 91 + xy: 919, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan rotate: false - xy: 363, 91 + xy: 939, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan-equip rotate: false - xy: 373, 91 + xy: 949, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 4c168b84d7..a3b68dfb17 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/ContentLoader.java b/core/src/io/anuke/mindustry/core/ContentLoader.java index 208fc83b35..1eedbad101 100644 --- a/core/src/io/anuke/mindustry/core/ContentLoader.java +++ b/core/src/io/anuke/mindustry/core/ContentLoader.java @@ -19,12 +19,24 @@ public class ContentLoader { public static void load(){ ContentList[] content = { + //effects + new BlockFx(), + new BulletFx(), + new EnvironmentFx(), + new ExplosionFx(), + new Fx(), + new ShootFx(), + new UnitFx(), + //items new Items(), //liquids new Liquids(), + //status effects + new StatusEffects(), + //bullets new ArtilleryBullets(), new FlakBullets(), @@ -39,24 +51,9 @@ public class ContentLoader { //mechs new Mechs(), - //units - new UnitTypes(), - //weapons new Weapons(), - //status effects - new StatusEffects(), - - //effects - new BlockFx(), - new BulletFx(), - new EnvironmentFx(), - new ExplosionFx(), - new Fx(), - new ShootFx(), - new UnitFx(), - //blocks new Blocks(), new DefenseBlocks(), @@ -72,6 +69,9 @@ public class ContentLoader { //recipes new Recipes(), + + //units + new UnitTypes(), }; for (ContentList list : content){ diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java index b8e0498cfb..5ba5b6a180 100644 --- a/core/src/io/anuke/mindustry/core/UI.java +++ b/core/src/io/anuke/mindustry/core/UI.java @@ -134,6 +134,8 @@ public class UI extends SceneModule{ act(); + Graphics.begin(); + for(int i = 0; i < players.length; i ++){ InputHandler input = control.input(i); @@ -142,11 +144,12 @@ public class UI extends SceneModule{ float scl = Unit.dp.scl(3f); - Graphics.begin(); Draw.rect("controller-cursor", input.getMouseX(), Gdx.graphics.getHeight() - input.getMouseY(), 16*scl, 16*scl); - Graphics.end(); } } + + Graphics.end(); + } @Override @@ -181,7 +184,7 @@ public class UI extends SceneModule{ placefrag.build(group); chatfrag.build(group); listfrag.build(group); - debugfrag.build(group); + //debugfrag.build(group); playermenufrag.build(group); loadfrag.build(group); diff --git a/core/src/io/anuke/mindustry/entities/BlockBuilder.java b/core/src/io/anuke/mindustry/entities/BlockBuilder.java index 8dc043c718..3883925be2 100644 --- a/core/src/io/anuke/mindustry/entities/BlockBuilder.java +++ b/core/src/io/anuke/mindustry/entities/BlockBuilder.java @@ -25,7 +25,7 @@ import static io.anuke.mindustry.Vars.world; public interface BlockBuilder { //temporary static final values Translator[] tmptr = {new Translator(), new Translator(), new Translator(), new Translator()}; - float placeDistance = 80f; + float placeDistance = 200f; /**Returns the queue for storing build requests.*/ Queue getPlaceQueue(); diff --git a/core/src/io/anuke/mindustry/input/AndroidInput.java b/core/src/io/anuke/mindustry/input/AndroidInput.java index 3bd0111b57..0852894a08 100644 --- a/core/src/io/anuke/mindustry/input/AndroidInput.java +++ b/core/src/io/anuke/mindustry/input/AndroidInput.java @@ -7,6 +7,7 @@ import com.badlogic.gdx.input.GestureDetector; import com.badlogic.gdx.input.GestureDetector.GestureListener; import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Vector2; +import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.Array; import io.anuke.mindustry.content.fx.Fx; import io.anuke.mindustry.core.GameState.State; @@ -147,27 +148,38 @@ public class AndroidInput extends InputHandler implements GestureListener{ //Create confirm/cancel table new table(){{ abottom().aleft(); - defaults().size(60f); - //Add a cancel button, which clears the selection. - new imagebutton("icon-cancel", 14*2f, () -> recipe = null); + new table("pane"){{ + margin(5); + defaults().size(60f); - //Add an accept button, which places everything. - new imagebutton("icon-check", 14*2f, () -> { - for(PlaceRequest request : placement){ - Tile tile = request.tile(); + //Add a cancel button, which clears the selection. + new imagebutton("icon-cancel", 16 * 2f, () -> recipe = null); - if(tile != null){ - rotation = request.rotation; - recipe = request.recipe; - tryPlaceBlock(tile.x, tile.y); + //Add an accept button, which places everything. + new imagebutton("icon-check", 16 * 2f, () -> { + for (PlaceRequest request : placement) { + Tile tile = request.tile(); + + if (tile != null) { + rotation = request.rotation; + recipe = request.recipe; + tryPlaceBlock(tile.x, tile.y); + } } - } - removals.addAll(placement); - placement.clear(); - selecting = false; - }); + removals.addAll(placement); + placement.clear(); + selecting = false; + }); + + //Add a rotate button + new imagebutton("icon-arrow", 16 * 2f, () -> rotation = Mathf.mod(rotation + 1, 4)) + .update(i -> { + i.getImage().setRotation(rotation * 90); + i.getImage().setOrigin(Align.center); + }).cell.disabled(i -> recipe == null || !recipe.result.rotate); + }}.end(); }}.visible(() -> isPlacing() && placement.size > 0).end(); } @@ -233,7 +245,7 @@ public class AndroidInput extends InputHandler implements GestureListener{ for(TextureRegion region : regions){ Draw.rect(region, x *tilesize + recipe.result.offset(), y * tilesize + recipe.result.offset(), - region.getRegionWidth() * lineScale, region.getRegionHeight() * lineScale, recipe.result.rotate ? rotation * 90 : 0); + region.getRegionWidth() * lineScale, region.getRegionHeight() * lineScale, recipe.result.rotate ? result.rotation * 90 : 0); } }else{ Draw.color(Palette.breakInvalid); @@ -315,7 +327,7 @@ public class AndroidInput extends InputHandler implements GestureListener{ @Override public boolean longPress(float x, float y) { - if(state.is(State.menu)) return false; + if(state.is(State.menu) || !isPlacing()) return false; //get tile on cursor Tile cursor = tileAt(x, y); diff --git a/core/src/io/anuke/mindustry/input/InputHandler.java b/core/src/io/anuke/mindustry/input/InputHandler.java index 43046a9caf..857dc59d76 100644 --- a/core/src/io/anuke/mindustry/input/InputHandler.java +++ b/core/src/io/anuke/mindustry/input/InputHandler.java @@ -24,7 +24,8 @@ import io.anuke.ucore.util.Translator; import static io.anuke.mindustry.Vars.*; public abstract class InputHandler extends InputAdapter{ - float playerSelectRange = Unit.dp.scl(80f); + /**Used for dropping items.*/ + float playerSelectRange = Unit.dp.scl(40f); Translator stackTrns = new Translator(); public final Player player; diff --git a/core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java b/core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java index 75f0d1fb72..23f6edd3ed 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/DebugFragment.java @@ -44,7 +44,6 @@ public class DebugFragment implements Fragment { public void build(Group parent){ Player player = players[0]; - new table(){{ visible(() -> debug);