diff --git a/core/assets-raw/sprites/ui/icon-info.png b/core/assets-raw/sprites/ui/icon-info.png new file mode 100644 index 0000000000..759a89dbdb Binary files /dev/null and b/core/assets-raw/sprites/ui/icon-info.png differ diff --git a/core/assets-raw/sprites/ui/icon-load.png b/core/assets-raw/sprites/ui/icon-load.png new file mode 100644 index 0000000000..00e35485aa Binary files /dev/null and b/core/assets-raw/sprites/ui/icon-load.png differ diff --git a/core/assets-raw/sprites/ui/icon-play-2.png b/core/assets-raw/sprites/ui/icon-play-2.png new file mode 100644 index 0000000000..8a4295d1f9 Binary files /dev/null and b/core/assets-raw/sprites/ui/icon-play-2.png differ diff --git a/core/assets-raw/sprites/ui/icon-tools.png b/core/assets-raw/sprites/ui/icon-tools.png new file mode 100644 index 0000000000..55f8b11575 Binary files /dev/null and b/core/assets-raw/sprites/ui/icon-tools.png differ diff --git a/core/assets-raw/sprites/ui/icon-tutorial.png b/core/assets-raw/sprites/ui/icon-tutorial.png new file mode 100644 index 0000000000..77f494c3e6 Binary files /dev/null and b/core/assets-raw/sprites/ui/icon-tutorial.png differ diff --git a/core/assets-raw/sprites/ui/pane-button.9.png b/core/assets-raw/sprites/ui/pane-button.9.png new file mode 100644 index 0000000000..c870b0de34 Binary files /dev/null and b/core/assets-raw/sprites/ui/pane-button.9.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index b44a0ca12b..4dda579780 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,833 +13,833 @@ backgrounds/background index: -1 blank rotate: false - xy: 383, 424 + xy: 101, 1 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 blocks/block rotate: false - xy: 349, 195 + xy: 462, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/block-2x2 rotate: false - xy: 359, 202 + xy: 414, 430 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/block-3x3 rotate: false - xy: 233, 173 + xy: 263, 173 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blocks/chainturret rotate: false - xy: 228, 155 + xy: 359, 202 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/chainturret-icon rotate: false - xy: 383, 381 + xy: 468, 454 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 blocks/coal1 rotate: false - xy: 236, 9 + xy: 472, 444 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coal2 rotate: false - xy: 415, 414 + xy: 472, 434 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coal3 rotate: false - xy: 415, 404 + xy: 462, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coaldrill rotate: false - xy: 415, 394 + xy: 472, 424 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coalgenerator rotate: false - xy: 418, 384 + xy: 432, 424 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/coalpurifier rotate: false - xy: 278, 127 + xy: 486, 489 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/combustiongenerator rotate: false - xy: 278, 117 + xy: 496, 489 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/compositewall rotate: false - xy: 278, 107 + xy: 480, 479 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduit rotate: false - xy: 278, 97 + xy: 480, 469 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduitbottom rotate: false - xy: 278, 87 + xy: 490, 479 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduitliquid rotate: false - xy: 278, 77 + xy: 490, 469 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conduittop rotate: false - xy: 278, 67 + xy: 500, 479 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conveyor rotate: false - xy: 278, 57 + xy: 500, 469 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/conveyormove rotate: false - xy: 274, 47 + xy: 480, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/core rotate: false - xy: 285, 173 + xy: 315, 173 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blocks/cross rotate: false - xy: 288, 129 + xy: 490, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/crucible rotate: false - xy: 288, 119 + xy: 500, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/deepwater rotate: false - xy: 288, 109 + xy: 482, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt1 rotate: false - xy: 288, 99 + xy: 482, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt2 rotate: false - xy: 288, 89 + xy: 492, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirt3 rotate: false - xy: 288, 79 + xy: 482, 429 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirtblock rotate: false - xy: 288, 69 + xy: 492, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/dirtedge rotate: false - xy: 1, 1 + xy: 37, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/doubleturret rotate: false - xy: 212, 20 + xy: 357, 174 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/drill rotate: false - xy: 288, 59 + xy: 492, 429 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/duriumwall rotate: false - xy: 500, 479 + xy: 502, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/duriumwall-large rotate: false - xy: 228, 137 + xy: 432, 434 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/duriumwall-large-icon rotate: false - xy: 500, 469 + xy: 502, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/flameturret rotate: false - xy: 212, 8 + xy: 500, 501 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/grass1 rotate: false - xy: 252, 33 + xy: 482, 419 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass2 rotate: false - xy: 262, 33 + xy: 492, 419 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grass3 rotate: false - xy: 420, 430 + xy: 502, 419 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassblock rotate: false - xy: 430, 434 + xy: 472, 414 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassblock2 rotate: false - xy: 440, 434 + xy: 482, 409 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/grassedge rotate: false - xy: 43, 1 + xy: 450, 491 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/iron1 rotate: false - xy: 246, 21 + xy: 316, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron2 rotate: false - xy: 246, 11 + xy: 326, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/iron3 rotate: false - xy: 246, 1 + xy: 336, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/irondrill rotate: false - xy: 256, 23 + xy: 375, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/ironwall rotate: false - xy: 256, 13 + xy: 382, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/junction rotate: false - xy: 256, 3 + xy: 385, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/laserturret rotate: false - xy: 224, 5 + xy: 450, 440 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/lava rotate: false - xy: 266, 23 + xy: 385, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/lavaedge rotate: false - xy: 57, 1 + xy: 344, 127 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/liquidjunction rotate: false - xy: 266, 13 + xy: 395, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/liquidrouter rotate: false - xy: 266, 3 + xy: 385, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/machineturret rotate: false - xy: 454, 444 + xy: 379, 247 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/megarepairturret rotate: false - xy: 466, 445 + xy: 379, 235 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/mortarturret rotate: false - xy: 480, 489 + xy: 378, 223 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/mossblock rotate: false - xy: 276, 17 + xy: 405, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/mossstone rotate: false - xy: 276, 17 + xy: 405, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/nuclearreactor rotate: false - xy: 311, 173 + xy: 388, 422 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blocks/nuclearreactor-icon rotate: false - xy: 286, 27 + xy: 395, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/nuclearreactor-small rotate: false - xy: 246, 155 + xy: 228, 151 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/oil rotate: false - xy: 286, 17 + xy: 405, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/oiledge rotate: false - xy: 71, 1 + xy: 486, 499 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/oilrefinery rotate: false - xy: 286, 7 + xy: 385, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/omnidrill rotate: false - xy: 430, 424 + xy: 395, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/plasmaturret rotate: false - xy: 476, 477 + xy: 450, 428 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/powerbooster rotate: false - xy: 450, 424 + xy: 385, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/poweredconveyor rotate: false - xy: 460, 424 + xy: 395, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/poweredconveyormove rotate: false - xy: 470, 425 + xy: 405, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerlaser rotate: false - xy: 425, 414 + xy: 385, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/powerlaserrouter rotate: false - xy: 425, 404 + xy: 395, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/pump rotate: false - xy: 425, 394 + xy: 405, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/repairturret rotate: false - xy: 492, 489 + xy: 224, 4 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/rock rotate: false - xy: 435, 404 + xy: 395, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rock2 rotate: false - xy: 445, 414 + xy: 405, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rock2shadow rotate: false - xy: 435, 394 + xy: 385, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/rockshadow rotate: false - xy: 428, 384 + xy: 395, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/router rotate: false - xy: 445, 404 + xy: 405, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/shadow rotate: false - xy: 476, 465 + xy: 456, 477 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/shieldgenerator rotate: false - xy: 455, 414 + xy: 385, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/shotgunturret rotate: false - xy: 488, 477 + xy: 456, 465 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/shrub rotate: false - xy: 445, 394 + xy: 395, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/shrubshadow rotate: false - xy: 438, 384 + xy: 405, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/smelter rotate: false - xy: 455, 404 + xy: 385, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/sniperturret rotate: false - xy: 488, 465 + xy: 468, 477 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/sorter rotate: false - xy: 455, 394 + xy: 395, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelconveyor rotate: false - xy: 448, 384 + xy: 405, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelconveyormove rotate: false - xy: 428, 374 + xy: 395, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/steelwall rotate: false - xy: 438, 374 + xy: 405, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone rotate: false - xy: 450, 491 + xy: 264, 111 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/stone1 rotate: false - xy: 448, 374 + xy: 405, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone2 rotate: false - xy: 458, 384 + xy: 415, 420 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stone3 rotate: false - xy: 458, 374 + xy: 415, 410 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock rotate: false - xy: 465, 414 + xy: 415, 400 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock2 rotate: false - xy: 465, 404 + xy: 415, 390 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneblock3 rotate: false - xy: 465, 394 + xy: 417, 380 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stonedrill rotate: false - xy: 468, 384 + xy: 425, 414 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/stoneedge rotate: false - xy: 246, 43 + xy: 278, 111 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/stonewall rotate: false - xy: 468, 374 + xy: 425, 404 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/teleporter rotate: false - xy: 475, 415 + xy: 425, 394 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/teleporter-top rotate: false - xy: 475, 405 + xy: 435, 414 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/thermalgenerator rotate: false - xy: 475, 395 + xy: 435, 404 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titanium1 rotate: false - xy: 478, 385 + xy: 435, 394 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titanium2 rotate: false - xy: 478, 375 + xy: 427, 384 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titanium3 rotate: false - xy: 361, 192 + xy: 437, 384 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumdrill rotate: false - xy: 361, 182 + xy: 427, 374 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumpurifier rotate: false - xy: 361, 172 + xy: 437, 374 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumshieldwall rotate: false - xy: 361, 162 + xy: 417, 370 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumwall rotate: false - xy: 371, 192 + xy: 415, 360 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/titaniumwall-large rotate: false - xy: 282, 155 + xy: 230, 115 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blocks/titaniumwall-large-icon rotate: false - xy: 371, 182 + xy: 415, 350 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/turret rotate: false - xy: 337, 163 + xy: 456, 453 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 blocks/uranium1 rotate: false - xy: 371, 162 + xy: 415, 330 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uranium2 rotate: false - xy: 388, 370 + xy: 415, 320 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uranium3 rotate: false - xy: 398, 370 + xy: 415, 310 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/uraniumdrill rotate: false - xy: 408, 370 + xy: 415, 300 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/water rotate: false - xy: 385, 360 + xy: 415, 290 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blocks/wateredge rotate: false - xy: 260, 43 + xy: 292, 111 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blocks/waveturret rotate: false - xy: 349, 159 + xy: 468, 465 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 bullet rotate: false - xy: 236, 19 + xy: 462, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -860,280 +860,280 @@ circle2 index: -1 enemies/blastenemy-t1 rotate: false - xy: 282, 139 + xy: 230, 99 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/blastenemy-t2 rotate: false - xy: 300, 157 + xy: 248, 117 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/blastenemy-t3 rotate: false - xy: 316, 157 + xy: 230, 83 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/empenemy-t1 rotate: false - xy: 388, 424 + xy: 230, 67 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/empenemy-t2 rotate: false - xy: 404, 424 + xy: 230, 51 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/empenemy-t3 rotate: false - xy: 464, 489 + xy: 264, 157 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/enemy-t1 rotate: false - xy: 460, 473 + xy: 264, 141 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/targetenemy-t1 rotate: false - xy: 460, 473 + xy: 264, 141 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/enemy-t2 rotate: false - xy: 15, 1 + xy: 51, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 enemies/enemy-t3 rotate: false - xy: 29, 1 + xy: 65, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 enemies/fastenemy-t1 rotate: false - xy: 460, 457 + xy: 280, 157 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/fastenemy-t2 rotate: false - xy: 230, 121 + xy: 264, 125 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/fastenemy-t3 rotate: false - xy: 230, 105 + xy: 280, 141 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/flamerenemy-t1 rotate: false - xy: 246, 121 + xy: 296, 157 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/flamerenemy-t2 rotate: false - xy: 230, 89 + xy: 280, 125 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/flamerenemy-t3 rotate: false - xy: 246, 105 + xy: 296, 141 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/healerenemy-t1 rotate: false - xy: 262, 121 + xy: 312, 157 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/healerenemy-t2 rotate: false - xy: 230, 73 + xy: 296, 125 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/healerenemy-t3 rotate: false - xy: 246, 89 + xy: 312, 141 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/mortarenemy-t1 rotate: false - xy: 246, 57 + xy: 399, 390 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/mortarenemy-t2 rotate: false - xy: 262, 73 + xy: 214, 32 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/mortarenemy-t3 rotate: false - xy: 262, 57 + xy: 230, 35 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t1 rotate: false - xy: 383, 408 + xy: 212, 16 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t2 rotate: false - xy: 383, 392 + xy: 343, 189 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/rapidenemy-t3 rotate: false - xy: 399, 408 + xy: 341, 173 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/tankenemy-t1 rotate: false - xy: 399, 392 + xy: 359, 186 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/tankenemy-t2 rotate: false - xy: 214, 32 + xy: 344, 157 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/tankenemy-t3 rotate: false - xy: 230, 41 + xy: 344, 141 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 enemies/titanenemy-t1 rotate: false - xy: 246, 137 + xy: 228, 133 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 enemies/titanenemy-t2 rotate: false - xy: 264, 155 + xy: 246, 151 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 enemies/titanenemy-t3 rotate: false - xy: 264, 137 + xy: 246, 133 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 418, 375 + xy: 383, 381 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 icon-coal rotate: false - xy: 450, 434 + xy: 492, 409 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-dirium rotate: false - xy: 460, 434 + xy: 502, 409 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-iron rotate: false - xy: 470, 435 + xy: 378, 213 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-steel rotate: false - xy: 274, 37 + xy: 377, 203 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-stone rotate: false - xy: 284, 47 + xy: 230, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-titanium rotate: false - xy: 284, 37 + xy: 240, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-uranium rotate: false - xy: 500, 459 + xy: 306, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laser rotate: false - xy: 510, 499 + xy: 480, 491 size: 1, 12 orig: 1, 12 offset: 0, 0 @@ -1147,7 +1147,7 @@ laserend index: -1 player rotate: false - xy: 440, 424 + xy: 405, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1210,7 +1210,7 @@ ui/button-map-over index: -1 ui/button-select rotate: false - xy: 259, 173 + xy: 289, 173 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -1218,63 +1218,63 @@ ui/button-select index: -1 ui/check-off rotate: false - xy: 430, 456 + xy: 92, 4 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 ui/check-on rotate: false - xy: 92, 4 + xy: 122, 4 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 ui/check-over rotate: false - xy: 122, 4 + xy: 152, 4 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 ui/clear rotate: false - xy: 394, 380 + xy: 79, 3 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/cursor rotate: false - xy: 343, 199 + xy: 1, 1 size: 4, 4 orig: 4, 4 offset: 0, 0 index: -1 ui/icon-arrow-left rotate: false - xy: 230, 29 + xy: 306, 113 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-arrow-right rotate: false - xy: 406, 380 + xy: 318, 113 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-cancel rotate: false - xy: 262, 105 + xy: 312, 125 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-check rotate: false - xy: 230, 57 + xy: 328, 157 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1302,98 +1302,133 @@ ui/icon-close-over index: -1 ui/icon-crafting rotate: false - xy: 430, 444 + xy: 330, 113 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-cursor rotate: false - xy: 442, 444 + xy: 393, 378 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-defense rotate: false - xy: 486, 501 + xy: 405, 378 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-distribution rotate: false - xy: 498, 501 + xy: 212, 4 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 +ui/icon-info + rotate: false + xy: 360, 162 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +ui/icon-load + rotate: false + xy: 328, 141 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 ui/icon-menu rotate: false - xy: 337, 187 + xy: 360, 150 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-pause rotate: false - xy: 337, 175 + xy: 369, 174 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-play rotate: false - xy: 349, 183 + xy: 360, 138 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 +ui/icon-play-2 + rotate: false + xy: 328, 125 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 ui/icon-power rotate: false - xy: 349, 171 + xy: 372, 162 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-production rotate: false - xy: 379, 247 + xy: 372, 150 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 ui/icon-rotate rotate: false - xy: 246, 73 + xy: 464, 489 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-rotate-arrow rotate: false - xy: 262, 89 + xy: 383, 406 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 ui/icon-settings rotate: false - xy: 379, 235 + xy: 372, 138 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 +ui/icon-tools + rotate: false + xy: 383, 390 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 ui/icon-touch rotate: false - xy: 378, 223 + xy: 358, 126 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 +ui/icon-tutorial + rotate: false + xy: 399, 406 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 ui/icon-weapon rotate: false - xy: 224, 17 + xy: 370, 126 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1413,6 +1448,14 @@ ui/logotext-gray offset: 0, 0 index: -1 ui/pane + rotate: false + xy: 430, 452 + size: 24, 36 + split: 10, 10, 5, 5 + orig: 24, 36 + offset: 0, 0 + index: -1 +ui/pane-button rotate: false xy: 359, 259 size: 24, 36 @@ -1422,7 +1465,7 @@ ui/pane index: -1 ui/scroll rotate: false - xy: 450, 505 + xy: 1, 7 size: 34, 6 split: 4, 4, 2, 2 orig: 34, 6 @@ -1448,7 +1491,7 @@ ui/scroll-knob-horizontal index: -1 ui/scroll-knob-vertical rotate: false - xy: 388, 440 + xy: 450, 505 size: 34, 6 split: 12, 12, 2, 2 orig: 34, 6 @@ -1456,21 +1499,21 @@ ui/scroll-knob-vertical index: -1 ui/selection rotate: false - xy: 224, 29 + xy: 483, 492 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 ui/separator rotate: false - xy: 227, 29 + xy: 483, 489 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 ui/slider rotate: false - xy: 385, 371 + xy: 483, 495 size: 1, 8 orig: 1, 8 offset: 0, 0 @@ -1498,14 +1541,14 @@ ui/slider-knob-over index: -1 ui/slider-vertical rotate: false - xy: 85, 1 + xy: 91, 1 size: 8, 1 orig: 8, 1 offset: 0, 0 index: -1 ui/textfield rotate: false - xy: 182, 8 + xy: 233, 169 size: 28, 28 split: 6, 6, 6, 6 orig: 28, 28 @@ -1513,7 +1556,7 @@ ui/textfield index: -1 ui/textfield-over rotate: false - xy: 152, 8 + xy: 182, 8 size: 28, 28 split: 2, 2, 2, 2 orig: 28, 28 @@ -1521,7 +1564,7 @@ ui/textfield-over index: -1 ui/white rotate: false - xy: 228, 173 + xy: 383, 422 size: 3, 3 orig: 3, 3 offset: 0, 0 @@ -1551,35 +1594,35 @@ weapons/blaster index: -1 weapons/flamer rotate: false - xy: 242, 31 + xy: 502, 429 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/mortar rotate: false - xy: 276, 27 + xy: 395, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/multigun rotate: false - xy: 276, 7 + xy: 385, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/railgun rotate: false - xy: 435, 414 + xy: 385, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weapons/triblaster rotate: false - xy: 371, 172 + xy: 415, 340 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index b46da28b1a..efbc802821 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/ui/uiskin.json b/core/assets/ui/uiskin.json index a90bd8d4a2..ca9ed15552 100644 --- a/core/assets/ui/uiskin.json +++ b/core/assets/ui/uiskin.json @@ -21,7 +21,7 @@ com.badlogic.gdx.graphics.Color: { }, io.anuke.ucore.scene.Skin$TintedDrawable: { dialogDim: {name: white, color: {r: 0, g: 0, b: 0, a: 0.9} } - loadDim: {name: white, color: {r: 0, g: 0, b: 0, a: 0.7} } + loadDim: {name: white, color: {r: 0, g: 0, b: 0, a: 0.8} } }, io.anuke.ucore.scene.ui.Button$ButtonStyle: { default: {down: button-down, up: button }, diff --git a/core/src/io/anuke/mindustry/UI.java b/core/src/io/anuke/mindustry/UI.java index 527e2953e9..b2146f64e8 100644 --- a/core/src/io/anuke/mindustry/UI.java +++ b/core/src/io/anuke/mindustry/UI.java @@ -393,8 +393,7 @@ public class UI extends SceneModule{ atop(); aright(); - new table(){{ - get().background("button"); + new table("button"){{ new label(()->"[orange]Wave " + control.getWave()).scale(fontscale*2f).left(); @@ -410,66 +409,90 @@ public class UI extends SceneModule{ get().setVisible(play); }}.end(); - - //menu table - new table(){{ - - new table("pane"){{ - defaults().size(220, 48).pad(3); + + if(!android){ + //menu table + new table(){{ - new button("Play", () -> { - levels.show(); - }); - - row(); - - new button("Tutorial", ()->{ - //TODO show loading, etc - control.playMap(Map.tutorial); - }); - - if(Gdx.app.getType() != ApplicationType.WebGL){ - row(); - - new button("Load Game", () -> { - load.show(); - }); - } - - row(); - - new button("Settings", () -> { - prefs.show(scene); - }); - - row(); - - if(!android){ - new button("Controls", () -> { - keys.show(scene); + new table("pane"){{ + defaults().size(220, 48).pad(3); + + new button("Play", () -> { + levels.show(); }); row(); - } - - if(Gdx.app.getType() != ApplicationType.WebGL && !android){ - new button("Exit", () -> { - Gdx.app.exit(); + + new button("Tutorial", ()->{ + control.playMap(Map.tutorial); }); - } + + if(Gdx.app.getType() != ApplicationType.WebGL){ + row(); + + new button("Load Game", () -> { + load.show(); + }); + } + + row(); + + new button("Settings", () -> { + prefs.show(scene); + }); + + row(); + + if(!android){ + new button("Controls", () -> { + keys.show(scene); + }); + + row(); + } + + if(Gdx.app.getType() != ApplicationType.WebGL && !android){ + new button("Exit", () -> { + Gdx.app.exit(); + }); + } + + get().pad(Unit.dp.inPixels(16)); + }}; + + visible(nplay); + }}.end(); + }else{ + new table(){{ + defaults().size(120f).pad(5).units(Unit.dp); + float isize = Unit.dp.inPixels(14f*4); - get().pad(Unit.dp.inPixels(16)); - }}; + new imagebutton("icon-play-2", isize, () -> { + levels.show(); + }).text("Play").padTop(4f); + + new imagebutton("icon-tutorial", isize, ()->{ + control.playMap(Map.tutorial); + }).text("Tutorial").padTop(4f); + + new imagebutton("icon-load", isize, () -> { + load.show(); + }).text("Load").padTop(4f); - visible(nplay); - }}.end(); + new imagebutton("icon-tools", isize, () -> { + prefs.show(scene); + }).text("Settings").padTop(4f); + + visible(nplay); + }}.end(); + } //settings icon new table(){{ atop().aright(); - new imagebutton("icon-settings", Unit.dp.inPixels(40f), ()->{ + new imagebutton("icon-info", Unit.dp.inPixels(30f), ()->{ about.show(); - }).get().pad(14).padTop(8); + }).get().pad(14); }}.end().visible(nplay); if(debug){ @@ -547,11 +570,17 @@ public class UI extends SceneModule{ loadingtable = new table("loadDim"){{ get().setTouchable(Touchable.enabled); - new table("button"){{ - new label("[orange]Loading..."){{ - get().setName("namelabel"); - }}.scale(2f*Vars.fontscale).pad(Unit.dp.inPixels(10)); - }}.end(); + //new table(){{ + get().addImage("white").growX() + .height(3f).pad(4f).growX().units(Unit.dp).get().setColor(Color.ORANGE); + row(); + new label("[orange]Loading..."){{ + get().setName("namelabel"); + }}.pad(10).units(Unit.dp); + row(); + get().addImage("white").growX() + .height(3f).pad(4f).growX().units(Unit.dp).get().setColor(Color.ORANGE); + //}}.end(); }}.end().get(); loadingtable.setVisible(false); diff --git a/core/src/io/anuke/mindustry/ui/FloatingDialog.java b/core/src/io/anuke/mindustry/ui/FloatingDialog.java index 033fe19652..559cfa63fe 100644 --- a/core/src/io/anuke/mindustry/ui/FloatingDialog.java +++ b/core/src/io/anuke/mindustry/ui/FloatingDialog.java @@ -5,7 +5,6 @@ import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.utils.Align; import io.anuke.ucore.scene.ui.Dialog; -import io.anuke.ucore.scene.ui.Image; import io.anuke.ucore.scene.ui.layout.Unit; public class FloatingDialog extends Dialog{ @@ -15,8 +14,8 @@ public class FloatingDialog extends Dialog{ setFillParent(true); title().setAlignment(Align.center); getTitleTable().row(); - getTitleTable().add(new Image("white")) - .growX().height(3f).pad(4f).units(Unit.dp).get().setColor(Color.ORANGE); + getTitleTable().addImage("white", Color.ORANGE) + .growX().height(3f).pad(4f).units(Unit.dp); } @Override diff --git a/core/src/io/anuke/mindustry/ui/LevelDialog.java b/core/src/io/anuke/mindustry/ui/LevelDialog.java index 71ecfd3357..5d9c0b8725 100644 --- a/core/src/io/anuke/mindustry/ui/LevelDialog.java +++ b/core/src/io/anuke/mindustry/ui/LevelDialog.java @@ -14,7 +14,7 @@ import io.anuke.ucore.scene.ui.ScrollPane; import io.anuke.ucore.scene.ui.layout.Table; import io.anuke.ucore.scene.ui.layout.Unit; -public class LevelDialog extends FloatingDialog{ +public class LevelDialog extends FloatingDialog{ private Map selectedMap = Map.delta; private TextureRegion region = new TextureRegion(); @@ -41,10 +41,10 @@ public class LevelDialog extends FloatingDialog{ maps.row(); } - Table inset = new Table("pane"); + Table inset = new Table("pane-button"); inset.add("[orange]"+map.name()).pad(3f).units(Unit.dp); inset.row(); - inset.add((StringSupplier)(()->"High Score: [lime]" + Settings.getInt("hiscore" + map.name()))) + inset.add((StringSupplier)(()->"High Score: [orange]" + Settings.getInt("hiscore" + map.name()))) .pad(3f).units(Unit.dp); inset.pack(); diff --git a/core/src/io/anuke/mindustry/ui/LoadDialog.java b/core/src/io/anuke/mindustry/ui/LoadDialog.java index c9c74a0c4d..e7268bd152 100644 --- a/core/src/io/anuke/mindustry/ui/LoadDialog.java +++ b/core/src/io/anuke/mindustry/ui/LoadDialog.java @@ -1,5 +1,6 @@ package io.anuke.mindustry.ui; +import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.Timer; import com.badlogic.gdx.utils.Timer.Task; @@ -41,19 +42,23 @@ public class LoadDialog extends FloatingDialog{ final int slot = i; TextButton button = new TextButton("[orange]Slot " + (i + 1)); - button.getLabelCell().top().left().growX(); - button.row(); button.pad(Unit.dp.inPixels(10)); + button.getLabelCell().top().left().growX(); + + button.row(); Label info = new Label("[gray]" + (!SaveIO.isSaveValid(i) ? "" : "Wave " + SaveIO.getWave(slot)+"\nLast Saved: " + SaveIO.getTimeString(i))); info.setAlignment(Align.center, Align.center); button.add(info).padBottom(2).padTop(6); - button.getLabel().setFontScale(Unit.dp.inPixels(0.75f)); + button.row(); + button.addImage("white", Color.GRAY) + .growX().height(3f).pad(4f).units(Unit.dp); + button.row(); modifyButton(button, slot); - content().add(button).size(400, 80).units(Unit.dp).pad(2); + content().add(button).size(400, 86).units(Unit.dp).pad(2); content().row(); } diff --git a/core/src/io/anuke/mindustry/ui/UpgradeDialog.java b/core/src/io/anuke/mindustry/ui/UpgradeDialog.java index d6ef26b125..63e649a2d2 100644 --- a/core/src/io/anuke/mindustry/ui/UpgradeDialog.java +++ b/core/src/io/anuke/mindustry/ui/UpgradeDialog.java @@ -37,10 +37,6 @@ public class UpgradeDialog extends FloatingDialog{ GameState.set(State.paused); }); - getButtonTable().addButton("Ok", ()->{ - hide(); - }).size(96, 50).pad(5); - Table weptab = new Table(); weptab.pad(20); @@ -75,7 +71,7 @@ public class UpgradeDialog extends FloatingDialog{ i++; - weptab.add(button).width(250); + weptab.add(button).width(220); Table tiptable = new Table();