diff --git a/core/assets-raw/sprites/ui/icon-arrow.png b/core/assets-raw/sprites/ui/icon-arrow.png index 93e300c108..d8f82bf42e 100644 Binary files a/core/assets-raw/sprites/ui/icon-arrow.png and b/core/assets-raw/sprites/ui/icon-arrow.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 125a856d87..992d6ec0c9 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -34,42 +34,42 @@ blocks/blackrockshadow1 index: -1 blocks/blackstone1 rotate: false - xy: 734, 406 + xy: 734, 418 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstone2 rotate: false - xy: 734, 396 + xy: 734, 408 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstone3 rotate: false - xy: 724, 371 + xy: 734, 398 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstoneblock1 rotate: false - xy: 724, 361 + xy: 724, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstoneblock2 rotate: false - xy: 724, 351 + xy: 724, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/blackstoneblock3 rotate: false - xy: 734, 386 + xy: 724, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -83,7 +83,7 @@ blocks/blackstoneedge index: -1 blocks/block rotate: false - xy: 734, 366 + xy: 165, 76 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -118,112 +118,112 @@ blocks/chainturret-icon index: -1 blocks/coal1 rotate: false - xy: 734, 346 + xy: 514, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coal2 rotate: false - xy: 165, 76 + xy: 224, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coal3 rotate: false - xy: 175, 79 + xy: 234, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coaldrill rotate: false - xy: 185, 79 + xy: 244, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coalgenerator rotate: false - xy: 195, 79 + xy: 254, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coalgenerator-top rotate: false - xy: 205, 79 + xy: 264, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coalpurifier rotate: false - xy: 215, 79 + xy: 274, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/combustiongenerator rotate: false - xy: 225, 83 + xy: 284, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/compositewall rotate: false - xy: 235, 83 + xy: 294, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduit rotate: false - xy: 245, 83 + xy: 304, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduitbottom rotate: false - xy: 255, 83 + xy: 314, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduitliquid rotate: false - xy: 265, 83 + xy: 324, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduittop rotate: false - xy: 275, 83 + xy: 334, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conveyor rotate: false - xy: 285, 83 + xy: 344, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conveyormove rotate: false - xy: 295, 83 + xy: 354, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conveyortunnel rotate: false - xy: 305, 83 + xy: 364, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -237,42 +237,42 @@ blocks/core index: -1 blocks/cross rotate: false - xy: 315, 83 + xy: 374, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/crucible rotate: false - xy: 325, 83 + xy: 384, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/deepwater rotate: false - xy: 335, 83 + xy: 394, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt1 rotate: false - xy: 345, 83 + xy: 115, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt2 rotate: false - xy: 355, 83 + xy: 163, 30 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt3 rotate: false - xy: 365, 83 + xy: 163, 20 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -286,7 +286,7 @@ blocks/dirtedge index: -1 blocks/door rotate: false - xy: 375, 83 + xy: 167, 10 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -300,7 +300,7 @@ blocks/door-large index: -1 blocks/door-large-icon rotate: false - xy: 385, 83 + xy: 406, 99 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -314,7 +314,7 @@ blocks/door-large-open index: -1 blocks/door-open rotate: false - xy: 395, 83 + xy: 416, 99 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -328,7 +328,7 @@ blocks/doubleturret index: -1 blocks/duriumwall rotate: false - xy: 514, 114 + xy: 404, 89 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -342,7 +342,7 @@ blocks/duriumwall-large index: -1 blocks/duriumwall-large-icon rotate: false - xy: 115, 4 + xy: 414, 89 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -356,175 +356,175 @@ blocks/flameturret index: -1 blocks/fluxpump rotate: false - xy: 163, 20 + xy: 414, 79 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass1 rotate: false - xy: 167, 10 + xy: 428, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass2 rotate: false - xy: 406, 99 + xy: 438, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass3 rotate: false - xy: 416, 99 + xy: 448, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassblock1 rotate: false - xy: 428, 103 + xy: 458, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassblock2 rotate: false - xy: 438, 103 + xy: 468, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassedge rotate: false - xy: 157, 40 + xy: 781, 426 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/ice1 rotate: false - xy: 448, 103 + xy: 809, 420 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/ice2 rotate: false - xy: 458, 103 + xy: 175, 76 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/ice3 rotate: false - xy: 468, 103 + xy: 185, 79 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iceedge rotate: false - xy: 781, 426 + xy: 795, 426 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/icerock1 rotate: false - xy: 225, 73 + xy: 195, 79 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/icerock2 rotate: false - xy: 235, 73 + xy: 205, 79 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/icerockshadow1 rotate: false - xy: 245, 73 + xy: 478, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rockshadow1 rotate: false - xy: 245, 73 + xy: 478, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/icerockshadow2 rotate: false - xy: 255, 73 + xy: 488, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rockshadow2 rotate: false - xy: 255, 73 + xy: 488, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron1 rotate: false - xy: 335, 73 + xy: 601, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron2 rotate: false - xy: 345, 73 + xy: 611, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron3 rotate: false - xy: 355, 73 + xy: 621, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/irondrill rotate: false - xy: 365, 73 + xy: 631, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/ironwall rotate: false - xy: 375, 73 + xy: 641, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/junction rotate: false - xy: 385, 73 + xy: 593, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/laserturret rotate: false - xy: 155, 8 + xy: 143, 8 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/lava rotate: false - xy: 395, 73 + xy: 603, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -538,63 +538,63 @@ blocks/lavaedge index: -1 blocks/lavasmelter rotate: false - xy: 478, 103 + xy: 613, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/liquiditemjunction rotate: false - xy: 488, 105 + xy: 623, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/liquidjunction rotate: false - xy: 592, 238 + xy: 633, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/liquidrouter rotate: false - xy: 602, 238 + xy: 643, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/machineturret rotate: false - xy: 709, 279 + xy: 155, 8 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/megarepairturret rotate: false - xy: 721, 281 + xy: 709, 279 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/mortarturret rotate: false - xy: 541, 177 + xy: 721, 281 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/mossblock rotate: false - xy: 622, 238 + xy: 744, 408 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/mossstone rotate: false - xy: 622, 238 + xy: 744, 408 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -615,7 +615,7 @@ blocks/nuclearreactor-center index: -1 blocks/nuclearreactor-icon rotate: false - xy: 642, 238 + xy: 744, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -636,7 +636,7 @@ blocks/nuclearreactor-small index: -1 blocks/oil rotate: false - xy: 591, 228 + xy: 754, 420 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -650,175 +650,175 @@ blocks/oiledge index: -1 blocks/oilrefinery rotate: false - xy: 601, 228 + xy: 754, 410 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/omnidrill rotate: false - xy: 611, 228 + xy: 754, 400 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/plasmaturret rotate: false - xy: 498, 108 + xy: 541, 177 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/powerbooster rotate: false - xy: 621, 228 + xy: 754, 390 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/poweredconveyor rotate: false - xy: 631, 228 + xy: 734, 378 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/poweredconveyormove rotate: false - xy: 641, 228 + xy: 734, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerlaser rotate: false - xy: 593, 218 + xy: 744, 378 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerlasercorner rotate: false - xy: 603, 218 + xy: 754, 380 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerlaserrouter rotate: false - xy: 613, 218 + xy: 734, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pulseconduit rotate: false - xy: 623, 218 + xy: 744, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pulseconduitbottom rotate: false - xy: 633, 218 + xy: 754, 370 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pulseconduittop rotate: false - xy: 643, 218 + xy: 744, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pump rotate: false - xy: 405, 89 + xy: 754, 360 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/repairturret rotate: false - xy: 704, 263 + xy: 498, 108 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/rock1 rotate: false - xy: 415, 89 + xy: 744, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rock2 rotate: false - xy: 415, 79 + xy: 754, 350 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/router rotate: false - xy: 405, 69 + xy: 185, 69 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rtgenerator rotate: false - xy: 415, 69 + xy: 195, 69 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rtgenerator-top rotate: false - xy: 175, 69 + xy: 205, 69 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sand1 rotate: false - xy: 185, 69 + xy: 498, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sand2 rotate: false - xy: 195, 69 + xy: 488, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sand3 rotate: false - xy: 205, 69 + xy: 593, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sandblock1 rotate: false - xy: 215, 69 + xy: 603, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sandblock2 rotate: false - xy: 171, 59 + xy: 613, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sandblock3 rotate: false - xy: 171, 49 + xy: 623, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -832,91 +832,91 @@ blocks/sandedge index: -1 blocks/shadow rotate: false - xy: 704, 251 + xy: 704, 263 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/shieldgenerator rotate: false - xy: 181, 49 + xy: 643, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/shotgunturret rotate: false - xy: 704, 239 + xy: 704, 251 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/shrub rotate: false - xy: 201, 59 + xy: 653, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/shrubshadow rotate: false - xy: 201, 49 + xy: 661, 234 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/smelter rotate: false - xy: 211, 59 + xy: 671, 234 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sniperturret rotate: false - xy: 722, 415 + xy: 704, 239 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/snow1 rotate: false - xy: 211, 49 + xy: 663, 224 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snow2 rotate: false - xy: 225, 63 + xy: 663, 214 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snow3 rotate: false - xy: 235, 63 + xy: 673, 224 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snowblock1 rotate: false - xy: 245, 63 + xy: 673, 214 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snowblock2 rotate: false - xy: 255, 63 + xy: 663, 204 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/snowblock3 rotate: false - xy: 265, 63 + xy: 673, 204 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -930,28 +930,28 @@ blocks/snowedge index: -1 blocks/sorter rotate: false - xy: 275, 63 + xy: 498, 88 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelconveyor rotate: false - xy: 285, 63 + xy: 899, 487 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelconveyormove rotate: false - xy: 295, 63 + xy: 909, 487 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelwall rotate: false - xy: 305, 63 + xy: 919, 487 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -965,56 +965,56 @@ blocks/steelwall-large index: -1 blocks/steelwall-large-icon rotate: false - xy: 315, 63 + xy: 929, 487 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone1 rotate: false - xy: 325, 63 + xy: 939, 487 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone2 rotate: false - xy: 335, 63 + xy: 949, 487 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone3 rotate: false - xy: 345, 63 + xy: 959, 487 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock1 rotate: false - xy: 355, 63 + xy: 969, 487 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock2 rotate: false - xy: 365, 63 + xy: 979, 487 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock3 rotate: false - xy: 375, 63 + xy: 989, 487 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stonedrill rotate: false - xy: 385, 63 + xy: 999, 487 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1028,35 +1028,35 @@ blocks/stoneedge index: -1 blocks/stoneformer rotate: false - xy: 395, 63 + xy: 765, 422 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stonewall rotate: false - xy: 221, 53 + xy: 764, 412 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/teleporter rotate: false - xy: 231, 53 + xy: 764, 402 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/teleporter-top rotate: false - xy: 241, 53 + xy: 764, 392 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/thermalgenerator rotate: false - xy: 251, 53 + xy: 764, 382 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1070,56 +1070,56 @@ blocks/titancannon index: -1 blocks/titancannon-icon rotate: false - xy: 722, 403 + xy: 722, 415 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/titanium1 rotate: false - xy: 261, 53 + xy: 764, 372 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titanium2 rotate: false - xy: 271, 53 + xy: 764, 362 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titanium3 rotate: false - xy: 281, 53 + xy: 764, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumdrill rotate: false - xy: 291, 53 + xy: 521, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumpurifier rotate: false - xy: 301, 53 + xy: 521, 157 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumshieldwall rotate: false - xy: 311, 53 + xy: 531, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumwall rotate: false - xy: 321, 53 + xy: 521, 147 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1133,49 +1133,49 @@ blocks/titaniumwall-large index: -1 blocks/titaniumwall-large-icon rotate: false - xy: 331, 53 + xy: 531, 157 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/turret rotate: false - xy: 722, 391 + xy: 722, 403 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/uranium1 rotate: false - xy: 361, 53 + xy: 531, 147 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uranium2 rotate: false - xy: 371, 53 + xy: 541, 157 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uranium3 rotate: false - xy: 381, 53 + xy: 531, 137 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uraniumdrill rotate: false - xy: 391, 53 + xy: 541, 147 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/water rotate: false - xy: 405, 59 + xy: 541, 137 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1189,14 +1189,14 @@ blocks/wateredge index: -1 blocks/waveturret rotate: false - xy: 734, 416 + xy: 722, 391 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 bullet rotate: false - xy: 734, 356 + xy: 809, 430 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1280,14 +1280,14 @@ enemies/targetenemy-t1 index: -1 enemies/enemy-t2 rotate: false - xy: 797, 442 + xy: 157, 54 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 enemies/enemy-t3 rotate: false - xy: 157, 54 + xy: 157, 40 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -1378,63 +1378,63 @@ enemies/healerenemy-t3 index: -1 enemies/mortarenemy-t1 rotate: false - xy: 640, 248 + xy: 693, 275 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/mortarenemy-t2 rotate: false - xy: 693, 275 + xy: 656, 260 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/mortarenemy-t3 rotate: false - xy: 656, 260 + xy: 672, 260 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t1 rotate: false - xy: 672, 260 + xy: 656, 244 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t2 rotate: false - xy: 656, 244 + xy: 672, 244 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t3 rotate: false - xy: 672, 244 + xy: 688, 259 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/tankenemy-t1 rotate: false - xy: 688, 259 + xy: 688, 243 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/tankenemy-t2 rotate: false - xy: 688, 243 + xy: 781, 440 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/tankenemy-t3 rotate: false - xy: 781, 440 + xy: 797, 440 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1469,49 +1469,49 @@ enemyarrow index: -1 icon-coal rotate: false - xy: 265, 73 + xy: 592, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-dirium rotate: false - xy: 275, 73 + xy: 602, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-iron rotate: false - xy: 285, 73 + xy: 612, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-steel rotate: false - xy: 295, 73 + xy: 622, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-stone rotate: false - xy: 305, 73 + xy: 632, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-titanium rotate: false - xy: 315, 73 + xy: 642, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-uranium rotate: false - xy: 325, 73 + xy: 591, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1546,28 +1546,28 @@ mechs/mech-standard index: -1 shell rotate: false - xy: 181, 59 + xy: 633, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot rotate: false - xy: 191, 59 + xy: 651, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot-long rotate: false - xy: 191, 49 + xy: 653, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanshell rotate: false - xy: 341, 53 + xy: 541, 167 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1680,35 +1680,35 @@ ui/icon-areaDelete index: -1 ui/icon-arrow rotate: false - xy: 200, 89 - size: 10, 10 - orig: 10, 10 + xy: 597, 280 + size: 14, 14 + orig: 14, 14 offset: 0, 0 index: -1 ui/icon-arrow-left rotate: false - xy: 212, 89 + xy: 200, 89 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-arrow-right rotate: false - xy: 224, 93 + xy: 212, 89 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-cancel rotate: false - xy: 597, 280 + xy: 613, 280 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-check rotate: false - xy: 613, 280 + xy: 629, 280 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1736,189 +1736,189 @@ ui/icon-close-over index: -1 ui/icon-crafting rotate: false - xy: 236, 93 + xy: 224, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-cursor rotate: false - xy: 248, 93 + xy: 236, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-defense rotate: false - xy: 260, 93 + xy: 248, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-distribution rotate: false - xy: 272, 93 + xy: 260, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-donate rotate: false - xy: 629, 280 + xy: 645, 280 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-hold rotate: false - xy: 284, 93 + xy: 272, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-holdDelete rotate: false - xy: 296, 93 + xy: 284, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-info rotate: false - xy: 308, 93 + xy: 296, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-load rotate: false - xy: 645, 280 + xy: 661, 276 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-menu rotate: false - xy: 320, 93 + xy: 308, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-pause rotate: false - xy: 332, 93 + xy: 320, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-play rotate: false - xy: 344, 93 + xy: 332, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-play-2 rotate: false - xy: 661, 276 + xy: 677, 276 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-power rotate: false - xy: 356, 93 + xy: 344, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-production rotate: false - xy: 368, 93 + xy: 356, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-quit rotate: false - xy: 677, 276 + xy: 592, 264 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-rotate rotate: false - xy: 592, 264 + xy: 592, 248 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-rotate-arrow rotate: false - xy: 592, 248 + xy: 608, 264 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-rotate-left rotate: false - xy: 608, 264 + xy: 608, 248 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-rotate-right rotate: false - xy: 608, 248 + xy: 624, 264 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-save rotate: false - xy: 624, 264 + xy: 624, 248 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-settings rotate: false - xy: 380, 93 + xy: 368, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-tools rotate: false - xy: 624, 248 + xy: 640, 264 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-touch rotate: false - xy: 392, 93 + xy: 380, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-touchDelete rotate: false - xy: 131, 8 + xy: 392, 93 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-tutorial rotate: false - xy: 640, 264 + xy: 640, 248 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-weapon rotate: false - xy: 143, 8 + xy: 131, 8 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1996,14 +1996,14 @@ ui/selection index: -1 ui/separator rotate: false - xy: 169, 86 + xy: 179, 86 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 ui/slider rotate: false - xy: 547, 207 + xy: 652, 238 size: 1, 8 orig: 1, 8 offset: 0, 0 @@ -2031,7 +2031,7 @@ ui/slider-knob-over index: -1 ui/slider-vertical rotate: false - xy: 724, 348 + xy: 169, 86 size: 8, 1 orig: 8, 1 offset: 0, 0 @@ -2133,42 +2133,42 @@ ui/window-empty index: -1 weapons/blaster rotate: false - xy: 734, 376 + xy: 734, 388 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/flamer rotate: false - xy: 163, 30 + xy: 404, 79 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/mortar rotate: false - xy: 612, 238 + xy: 744, 418 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/multigun rotate: false - xy: 632, 238 + xy: 744, 398 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/railgun rotate: false - xy: 405, 79 + xy: 734, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/triblaster rotate: false - xy: 351, 53 + xy: 521, 137 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 872f1f380b..f5df62b425 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/input/AndroidInput.java b/core/src/io/anuke/mindustry/input/AndroidInput.java index 6bde08dfbc..013ef01f14 100644 --- a/core/src/io/anuke/mindustry/input/AndroidInput.java +++ b/core/src/io/anuke/mindustry/input/AndroidInput.java @@ -37,7 +37,7 @@ public class AndroidInput extends InputHandler{ @Override public boolean touchUp(int screenX, int screenY, int pointer, int button){ - //if(ui.hasMouse()) return false; + if(brokeBlock) return false; brokeBlock = false; if(placing && pointer == 0 && !player.placeMode.pan){ diff --git a/core/src/io/anuke/mindustry/input/GestureHandler.java b/core/src/io/anuke/mindustry/input/GestureHandler.java index 66ddaff00d..160ed8d61b 100644 --- a/core/src/io/anuke/mindustry/input/GestureHandler.java +++ b/core/src/io/anuke/mindustry/input/GestureHandler.java @@ -28,7 +28,7 @@ public class GestureHandler extends GestureAdapter{ @Override public boolean tap (float x, float y, int count, int button) { - if(ui.hasMouse()) return false; + if(ui.hasMouse() || input.brokeBlock) return false; if(!player.placeMode.pan || player.recipe == null){ input.mousex = x; @@ -58,7 +58,7 @@ public class GestureHandler extends GestureAdapter{ @Override public boolean pinch (Vector2 initialPointer1, Vector2 initialPointer2, Vector2 pointer1, Vector2 pointer2) { - if(player.recipe == null) + if(player.recipe == null && !player.breakMode.lockCamera) return false; if(pinch1.x < 0){ diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java index 858d7ac928..94e25d3544 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java @@ -8,11 +8,11 @@ import com.badlogic.gdx.utils.Align; import io.anuke.mindustry.core.GameState; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.input.PlaceMode; +import io.anuke.ucore.scene.builders.button; import io.anuke.ucore.scene.builders.imagebutton; import io.anuke.ucore.scene.builders.table; import io.anuke.ucore.scene.event.Touchable; import io.anuke.ucore.scene.ui.ButtonGroup; -import io.anuke.ucore.scene.ui.Image; import io.anuke.ucore.scene.ui.ImageButton; import io.anuke.ucore.scene.ui.layout.Unit; import io.anuke.ucore.util.Mathf; @@ -26,19 +26,19 @@ public class PlacementFragment implements Fragment{ visible(()->player.recipe != null && !GameState.is(State.menu)); abottom(); aleft(); - + /* Image image = new Image("icon-arrow"); - image.setVisible(() -> player.recipe != null && player.recipe.result.rotate); image.update(() -> { image.setRotation(player.rotation*90); image.setOrigin(Align.center); }); new table("pane"){{ + visible(() -> player.recipe != null && player.recipe.result.rotate); add(image).size(40f).units(Unit.dp); }}.size(54f).units(Unit.dp).end(); - row(); + row();*/ new table(){{ touchable(Touchable.enabled); @@ -65,18 +65,21 @@ public class PlacementFragment implements Fragment{ row(); + Color color = Color.GRAY;//Colors.get("accent"); //Color.valueOf("4d4d4d") + new imagebutton("icon-cancel", Unit.dp.inPixels(14*3), ()->{ player.recipe = null; - }).imageColor(Color.valueOf("4d4d4d")) + }).imageColor(color) .visible(()->player.recipe != null); - new imagebutton("icon-rotate-left", Unit.dp.inPixels(14*3), ()->{ - player.rotation = Mathf.mod(player.rotation + 1, 4); - }).imageColor(Color.valueOf("4d4d4d")).visible(() -> player.recipe != null); + new button("", ()->{}).get().setTouchable(Touchable.disabled);; - new imagebutton("icon-rotate-right", Unit.dp.inPixels(14*3), ()->{ - player.rotation = Mathf.mod(player.rotation - 1, 4); - }).imageColor(Color.valueOf("4d4d4d")).visible(() -> player.recipe != null); + new imagebutton("icon-arrow", Unit.dp.inPixels(14*3), ()->{ + player.rotation = Mathf.mod(player.rotation + 1, 4); + }).imageColor(color).visible(() -> player.recipe != null).update(image ->{ + image.getImage().setRotation(player.rotation*90); + image.getImage().setOrigin(Align.center); + }); }}.left().end(); }}.end();