diff --git a/core/assets-raw/sprites/ui/icons/icon-menu-large.png b/core/assets-raw/sprites/ui/icons/icon-menu-large.png new file mode 100644 index 0000000000..e21d31376c Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-menu-large.png differ diff --git a/core/assets/maps/test.mmap b/core/assets/maps/test.mmap index 025804833b..5cd40a37b6 100644 Binary files a/core/assets/maps/test.mmap and b/core/assets/maps/test.mmap differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 9493efbb13..c750f10087 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,56 +13,56 @@ background index: -1 blackrock1 rotate: false - xy: 620, 260 + xy: 579, 234 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackrockshadow1 rotate: false - xy: 579, 234 + xy: 627, 306 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 690, 367 + xy: 637, 306 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 700, 369 + xy: 690, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 419, 159 + xy: 700, 369 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock1 rotate: false - xy: 429, 160 + xy: 136, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock2 rotate: false - xy: 439, 160 + xy: 690, 357 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock3 rotate: false - xy: 449, 160 + xy: 700, 359 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -76,483 +76,483 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 305, 105 + xy: 622, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 132, 37 + xy: 632, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 127, 13 + xy: 685, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 925, 469 + xy: 127, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 925, 459 + xy: 137, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 885, 449 + xy: 147, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 895, 449 + xy: 157, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 409, 137 + xy: 901, 465 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 grass1 rotate: false - xy: 630, 260 + xy: 198, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 588, 250 + xy: 208, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 598, 250 + xy: 156, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock1 rotate: false - xy: 608, 250 + xy: 166, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock2 rotate: false - xy: 618, 250 + xy: 176, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 476, 164 + xy: 915, 465 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice1 rotate: false - xy: 628, 250 + xy: 186, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 589, 240 + xy: 196, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 599, 240 + xy: 206, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 118, 33 + xy: 929, 465 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 609, 240 + xy: 162, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 619, 240 + xy: 172, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 629, 240 + xy: 182, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 629, 240 + xy: 182, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 589, 230 + xy: 192, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 589, 230 + xy: 192, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron1 rotate: false - xy: 599, 230 + xy: 202, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron2 rotate: false - xy: 609, 230 + xy: 167, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron3 rotate: false - xy: 619, 230 + xy: 167, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 709, 309 + xy: 227, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 113, 19 + xy: 885, 449 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mossblock rotate: false - xy: 544, 185 + xy: 642, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 554, 185 + xy: 620, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oiledge rotate: false - xy: 321, 121 + xy: 871, 439 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock1 rotate: false - xy: 560, 165 + xy: 660, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock2 rotate: false - xy: 570, 175 + xy: 121, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 520, 155 + xy: 161, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 530, 155 + xy: 171, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 540, 155 + xy: 181, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock1 rotate: false - xy: 550, 155 + xy: 191, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock2 rotate: false - xy: 560, 155 + xy: 201, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock3 rotate: false - xy: 570, 155 + xy: 211, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 335, 121 + xy: 885, 435 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrub rotate: false - xy: 590, 155 + xy: 901, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 315, 105 + xy: 911, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 355, 111 + xy: 899, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 365, 111 + xy: 909, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 375, 111 + xy: 909, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock1 rotate: false - xy: 385, 111 + xy: 919, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock2 rotate: false - xy: 395, 111 + xy: 919, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock3 rotate: false - xy: 325, 101 + xy: 929, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 391, 121 + xy: 985, 461 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone1 rotate: false - xy: 405, 105 + xy: 949, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 415, 107 + xy: 959, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 405, 95 + xy: 969, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock1 rotate: false - xy: 415, 97 + xy: 979, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock2 rotate: false - xy: 198, 42 + xy: 939, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock3 rotate: false - xy: 208, 42 + xy: 949, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 168, 62 + xy: 118, 33 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 715, 329 + xy: 989, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 715, 319 + xy: 999, 438 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 719, 309 + xy: 999, 428 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium1 rotate: false - xy: 224, 81 + xy: 321, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium2 rotate: false - xy: 244, 101 + xy: 331, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uranium3 rotate: false - xy: 244, 91 + xy: 331, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 264, 91 + xy: 361, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 182, 62 + xy: 113, 19 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-middle rotate: false - xy: 405, 125 + xy: 429, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 405, 125 + xy: 429, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 885, 459 + xy: 652, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 915, 459 + xy: 875, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -573,21 +573,21 @@ cross-3 index: -1 enemyspawn rotate: false - xy: 632, 282 + xy: 178, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 500, 175 + xy: 630, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shadow rotate: false - xy: 675, 301 + xy: 245, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -601,35 +601,35 @@ alloysmelter index: -1 coaldrill rotate: false - xy: 490, 158 + xy: 137, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalextractor rotate: false - xy: 405, 115 + xy: 142, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalgenerator rotate: false - xy: 415, 117 + xy: 146, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coalgenerator-top rotate: false - xy: 222, 46 + xy: 642, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustiongenerator rotate: false - xy: 121, 3 + xy: 695, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -664,14 +664,14 @@ cultivator index: -1 fluxpump rotate: false - xy: 630, 270 + xy: 188, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill rotate: false - xy: 629, 230 + xy: 177, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -685,14 +685,14 @@ largesolarpanel index: -1 laserdrill rotate: false - xy: 188, 94 + xy: 188, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 709, 299 + xy: 227, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -734,147 +734,147 @@ oilextractor-liquid index: -1 oilrefinery rotate: false - xy: 564, 185 + xy: 620, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 omnidrill rotate: false - xy: 574, 185 + xy: 630, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerbooster rotate: false - xy: 500, 165 + xy: 640, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 550, 165 + xy: 660, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump rotate: false - xy: 560, 175 + xy: 650, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 quartzextractor rotate: false - xy: 564, 207 + xy: 763, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rtgenerator rotate: false - xy: 500, 155 + xy: 141, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator-top rotate: false - xy: 510, 155 + xy: 151, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconextractor rotate: false - xy: 325, 111 + xy: 921, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 335, 111 + xy: 931, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter-middle rotate: false - xy: 345, 111 + xy: 899, 445 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solarpanel rotate: false - xy: 335, 101 + xy: 929, 435 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stonedrill rotate: false - xy: 710, 369 + xy: 959, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 710, 359 + xy: 969, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thermalgenerator rotate: false - xy: 715, 339 + xy: 989, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill rotate: false - xy: 719, 299 + xy: 1009, 430 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumextractor rotate: false - xy: 415, 87 + xy: 281, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uraniumdrill rotate: false - xy: 234, 81 + xy: 341, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 uraniumextractor rotate: false - xy: 254, 101 + xy: 341, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 waterextractor rotate: false - xy: 817, 427 + xy: 835, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-liquid rotate: false - xy: 835, 427 + xy: 853, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -902,42 +902,42 @@ batterylarge-base index: -1 conduit-bottom rotate: false - xy: 885, 469 + xy: 152, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top rotate: false - xy: 895, 469 + xy: 157, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduittunnel rotate: false - xy: 895, 459 + xy: 652, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 905, 469 + xy: 662, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyormove rotate: false - xy: 905, 459 + xy: 662, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyortunnel rotate: false - xy: 915, 469 + xy: 305, 117 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -951,49 +951,49 @@ core index: -1 junction rotate: false - xy: 699, 309 + xy: 222, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laser-base rotate: false - xy: 699, 299 + xy: 226, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 494, 185 + xy: 232, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 504, 185 + xy: 237, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-bottom rotate: false - xy: 514, 185 + xy: 237, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-liquid rotate: false - xy: 524, 185 + xy: 622, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-top rotate: false - xy: 534, 185 + xy: 632, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1021,126 +1021,126 @@ liquidtank-top index: -1 multiplexer rotate: false - xy: 561, 225 + xy: 564, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweredconveyor rotate: false - xy: 510, 175 + xy: 640, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyormove rotate: false - xy: 510, 165 + xy: 620, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 520, 175 + xy: 630, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlaser rotate: false - xy: 520, 165 + xy: 640, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlasercorner rotate: false - xy: 530, 175 + xy: 652, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerlaserrouter rotate: false - xy: 530, 165 + xy: 662, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 540, 175 + xy: 650, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-bottom rotate: false - xy: 540, 165 + xy: 650, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-top rotate: false - xy: 550, 175 + xy: 660, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 570, 165 + xy: 131, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldgenerator rotate: false - xy: 580, 165 + xy: 231, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldprojector rotate: false - xy: 763, 427 + xy: 781, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 345, 101 + xy: 941, 451 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 355, 101 + xy: 951, 451 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 365, 101 + xy: 961, 451 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyor rotate: false - xy: 375, 101 + xy: 971, 451 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyormove rotate: false - xy: 385, 101 + xy: 981, 451 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1161,7 +1161,7 @@ teleporter-top index: -1 unloader rotate: false - xy: 234, 91 + xy: 321, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1175,21 +1175,21 @@ vault index: -1 vault-icon rotate: false - xy: 254, 91 + xy: 351, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weaponfactory rotate: false - xy: 853, 427 + xy: 651, 343 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-1 rotate: false - xy: 490, 168 + xy: 419, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1252,63 +1252,56 @@ gatlingturret index: -1 laserturret rotate: false - xy: 627, 304 + xy: 574, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 magmaturret rotate: false - xy: 188, 76 + xy: 206, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 megarepairturret rotate: false - xy: 206, 94 + xy: 206, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 missileturret rotate: false - xy: 206, 76 + xy: 561, 225 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -plasmaturret - rotate: false - xy: 639, 304 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 railgunturret rotate: false - xy: 651, 301 + xy: 417, 123 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 repairturret rotate: false - xy: 663, 301 + xy: 233, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shotgunturret rotate: false - xy: 687, 301 + xy: 257, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 teslaturret rotate: false - xy: 622, 292 + xy: 269, 111 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1320,23 +1313,16 @@ titancannon orig: 24, 24 offset: 0, 0 index: -1 -turret - rotate: false - xy: 620, 280 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 compositewall rotate: false - xy: 131, 3 + xy: 147, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 905, 449 + xy: 148, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1357,14 +1343,14 @@ door-large-open index: -1 door-open rotate: false - xy: 915, 449 + xy: 158, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall rotate: false - xy: 925, 449 + xy: 168, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1378,49 +1364,49 @@ duriumwall-large index: -1 ironwall rotate: false - xy: 638, 250 + xy: 177, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall rotate: false - xy: 395, 101 + xy: 939, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall-large rotate: false - xy: 781, 427 + xy: 799, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 stonewall rotate: false - xy: 715, 349 + xy: 979, 431 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumshieldwall rotate: false - xy: 996, 466 + xy: 291, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall rotate: false - xy: 1006, 466 + xy: 301, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall-large rotate: false - xy: 799, 427 + xy: 817, 427 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1434,7 +1420,7 @@ blank index: -1 bullet rotate: false - xy: 415, 127 + xy: 439, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1476,154 +1462,154 @@ laserfull index: -1 shell rotate: false - xy: 580, 175 + xy: 221, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot rotate: false - xy: 590, 175 + xy: 492, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shot-long rotate: false - xy: 590, 165 + xy: 492, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanshell rotate: false - xy: 224, 101 + xy: 301, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scout rotate: false - xy: 349, 121 + xy: 943, 461 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-base rotate: false - xy: 363, 121 + xy: 957, 461 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-mech-base rotate: false - xy: 363, 121 + xy: 957, 461 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-leg rotate: false - xy: 377, 121 + xy: 971, 461 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-mech-leg rotate: false - xy: 377, 121 + xy: 971, 461 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 639, 240 + xy: 187, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 639, 230 + xy: 187, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-dirium rotate: false - xy: 700, 359 + xy: 197, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-glass rotate: false - xy: 695, 349 + xy: 197, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-iron rotate: false - xy: 695, 339 + xy: 218, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-quartz rotate: false - xy: 695, 329 + xy: 216, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 695, 319 + xy: 212, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-steel rotate: false - xy: 705, 349 + xy: 207, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 705, 339 + xy: 207, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 705, 329 + xy: 217, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-uranium rotate: false - xy: 705, 319 + xy: 217, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 standard-mech rotate: false - xy: 136, 51 + xy: 999, 462 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-ship rotate: false - xy: 154, 62 + xy: 999, 448 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -1834,35 +1820,35 @@ icon-areaDelete index: -1 icon-arrow rotate: false - xy: 680, 409 + xy: 651, 327 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 196, 64 + xy: 871, 427 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 208, 64 + xy: 1013, 464 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 502, 195 + xy: 1013, 452 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 514, 195 + xy: 1013, 440 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1876,28 +1862,28 @@ icon-back index: -1 icon-ban rotate: false - xy: 680, 393 + xy: 680, 409 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 696, 411 + xy: 680, 393 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 526, 195 + xy: 502, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 696, 395 + xy: 696, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -1925,77 +1911,77 @@ icon-close-over index: -1 icon-crafting rotate: false - xy: 538, 195 + xy: 514, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 550, 195 + xy: 526, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 562, 195 + xy: 538, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 680, 377 + xy: 696, 395 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 696, 379 + xy: 680, 377 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 574, 195 + xy: 550, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 651, 345 + xy: 696, 379 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 651, 329 + xy: 572, 274 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 651, 313 + xy: 572, 258 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 572, 274 + xy: 588, 276 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 572, 258 + xy: 588, 260 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2009,35 +1995,35 @@ icon-fill index: -1 icon-floppy rotate: false - xy: 588, 276 + xy: 604, 276 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 588, 260 + xy: 604, 260 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 604, 276 + xy: 763, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-github rotate: false - xy: 604, 260 + xy: 779, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 763, 411 + xy: 795, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2051,42 +2037,42 @@ icon-grid index: -1 icon-hold rotate: false - xy: 683, 349 + xy: 562, 195 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 683, 337 + xy: 321, 123 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 779, 411 + xy: 811, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 795, 411 + xy: 827, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 683, 325 + xy: 333, 123 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 811, 411 + xy: 843, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2100,21 +2086,21 @@ icon-line index: -1 icon-link rotate: false - xy: 827, 411 + xy: 859, 411 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 683, 313 + xy: 345, 123 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 843, 411 + xy: 651, 311 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2142,273 +2128,280 @@ icon-loading index: -1 icon-logic rotate: false - xy: 150, 50 + xy: 357, 123 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 162, 50 + xy: 369, 123 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 -icon-none - rotate: false - xy: 174, 50 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-pause - rotate: false - xy: 186, 50 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-pencil +icon-menu-large rotate: false xy: 510, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -icon-pencil-small +icon-none rotate: false - xy: 859, 411 - size: 14, 14 - orig: 14, 14 + xy: 381, 123 + size: 10, 10 + orig: 10, 10 offset: 0, 0 index: -1 -icon-pick +icon-pause + rotate: false + xy: 393, 123 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-pencil rotate: false xy: 528, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -icon-play - rotate: false - xy: 198, 52 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-play-2 +icon-pencil-small rotate: false xy: 674, 361 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -icon-players - rotate: false - xy: 210, 52 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-power - rotate: false - xy: 233, 111 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-production - rotate: false - xy: 245, 111 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-quit - rotate: false - xy: 667, 345 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-redo +icon-pick rotate: false xy: 546, 207 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -icon-refresh +icon-play rotate: false - xy: 667, 329 + xy: 405, 123 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-play-2 + rotate: false + xy: 669, 345 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -icon-rename +icon-players rotate: false - xy: 667, 313 - size: 14, 14 - orig: 14, 14 + xy: 875, 415 + size: 10, 10 + orig: 10, 10 offset: 0, 0 index: -1 -icon-resize +icon-power rotate: false - xy: 867, 453 - size: 16, 16 - orig: 16, 16 + xy: 136, 53 + size: 10, 10 + orig: 10, 10 offset: 0, 0 index: -1 -icon-rotate +icon-production + rotate: false + xy: 154, 64 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-quit rotate: false xy: 225, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -icon-rotate-arrow +icon-redo + rotate: false + xy: 867, 453 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +icon-refresh rotate: false xy: 241, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -icon-rotate-left +icon-rename rotate: false xy: 257, 123 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -icon-rotate-right - rotate: false - xy: 273, 123 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-save - rotate: false - xy: 289, 123 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -icon-save-image +icon-resize rotate: false xy: 134, 92 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -icon-save-map +icon-rotate rotate: false - xy: 134, 74 - size: 16, 16 - orig: 16, 16 + xy: 273, 123 + size: 14, 14 + orig: 14, 14 offset: 0, 0 index: -1 -icon-settings +icon-rotate-arrow rotate: false - xy: 257, 111 - size: 10, 10 - orig: 10, 10 + xy: 289, 123 + size: 14, 14 + orig: 14, 14 offset: 0, 0 index: -1 -icon-terrain - rotate: false - xy: 152, 94 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -icon-tools +icon-rotate-left rotate: false xy: 305, 127 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -icon-touch - rotate: false - xy: 269, 111 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-touchDelete - rotate: false - xy: 281, 111 - size: 10, 10 - orig: 10, 10 - offset: 0, 0 - index: -1 -icon-trash +icon-rotate-right rotate: false xy: 329, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -icon-trash-16 - rotate: false - xy: 152, 76 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -icon-trello +icon-save rotate: false xy: 345, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -icon-tutorial +icon-save-image + rotate: false + xy: 134, 74 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +icon-save-map + rotate: false + xy: 152, 94 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +icon-settings + rotate: false + xy: 166, 64 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-terrain + rotate: false + xy: 152, 76 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +icon-tools rotate: false xy: 361, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -icon-undo +icon-touch rotate: false - xy: 170, 94 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -icon-units - rotate: false - xy: 293, 111 + xy: 178, 64 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 -icon-weapon +icon-touchDelete rotate: false - xy: 305, 115 + xy: 190, 64 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 -icon-wiki +icon-trash rotate: false xy: 377, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -icon-zoom +icon-trash-16 + rotate: false + xy: 170, 94 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +icon-trello + rotate: false + xy: 393, 135 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-tutorial + rotate: false + xy: 409, 135 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-undo rotate: false xy: 170, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +icon-units + rotate: false + xy: 202, 64 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-weapon + rotate: false + xy: 214, 64 + size: 10, 10 + orig: 10, 10 + offset: 0, 0 + index: -1 +icon-wiki + rotate: false + xy: 476, 162 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +icon-zoom + rotate: false + xy: 188, 94 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 icon-zoom-small rotate: false - xy: 393, 135 + xy: 885, 463 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2514,7 +2507,7 @@ slider-knob-over index: -1 slider-vertical rotate: false - xy: 867, 450 + xy: 171, 1 size: 8, 1 orig: 8, 1 offset: 0, 0 @@ -2558,7 +2551,7 @@ textfield-over index: -1 white rotate: false - xy: 113, 34 + xy: 647, 306 size: 3, 3 orig: 3, 3 offset: 0, 0 @@ -2581,21 +2574,21 @@ window-empty index: -1 beam rotate: false - xy: 634, 294 + xy: 281, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 beam-equip rotate: false - xy: 620, 270 + xy: 291, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster rotate: false - xy: 459, 160 + xy: 132, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2609,56 +2602,56 @@ blaster-equip index: -1 clustergun rotate: false - xy: 220, 66 + xy: 449, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun-equip rotate: false - xy: 222, 56 + xy: 459, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun rotate: false - xy: 580, 155 + xy: 241, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 584, 185 + xy: 705, 349 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster rotate: false - xy: 224, 91 + xy: 311, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 234, 101 + xy: 311, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan rotate: false - xy: 244, 81 + xy: 351, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan-equip rotate: false - xy: 264, 101 + xy: 361, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index e988ea0c25..30b4a0d124 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/version.properties b/core/assets/version.properties index b1da1f9110..8bafaeccce 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Wed Mar 21 00:30:33 EDT 2018 +#Wed Mar 21 16:44:11 EDT 2018 version=release -androidBuildCode=582 +androidBuildCode=587 name=Mindustry code=3.4 build=custom build diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index 681fa17f6f..7f8a12e1fa 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -23,6 +23,7 @@ import io.anuke.mindustry.input.InputHandler; import io.anuke.mindustry.input.PlaceMode; import io.anuke.mindustry.ui.fragments.ToolFragment; import io.anuke.mindustry.world.BlockBar; +import io.anuke.mindustry.world.Layer; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.Blocks; import io.anuke.ucore.core.*; @@ -183,12 +184,13 @@ public class Renderer extends RendererModule{ blocks.drawFloor(); blocks.processBlocks(); - blocks.drawBlocks(false); + blocks.drawBlocks(Layer.overlay); drawAllTeams(false); Entities.draw(Entities.defaultGroup()); - blocks.drawBlocks(true); + blocks.skipLayer(Layer.turret); + blocks.drawBlocks(Layer.laser); drawAllTeams(true); @@ -221,6 +223,9 @@ public class Renderer extends RendererModule{ Graphics.beginShaders(Shaders.outline); Graphics.shader(Shaders.hit, false); drawTeam(team, flying); + Draw.alpha(0f); + blocks.drawTeamBlocks(Layer.turret, team); + Draw.alpha(1f); Graphics.shader(); Graphics.endShaders(); } diff --git a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java index 6e4799a176..1f56b427fe 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java @@ -29,6 +29,8 @@ import io.anuke.ucore.util.Bundles; import io.anuke.ucore.util.Log; import io.anuke.ucore.util.Strings; +import java.io.DataInputStream; + import static io.anuke.mindustry.Vars.*; public class MapEditorDialog extends Dialog{ @@ -70,39 +72,14 @@ public class MapEditorDialog extends Dialog{ }); }); - menu = new FloatingDialog("$text.menu"); - menu.addCloseButton(); - - menu.content().defaults().size(240f, 60f).padBottom(5); - - float isize = 16*2f; - - menu.content().addImageButton("icon-back", isize, () -> { - if(!saved){ - ui.showConfirm("$text.confirm", "$text.editor.unsaved", this::hide); - }else{ - hide(); - } - }); - - menu.content().row(); - - menu.content().addImageButton("icon-save", isize, () -> { - saveFile.show(); - }); - - /* - openFile = new FileChooser("$text.loadimage", FileChooser.pngFilter, true, file -> { + openFile = new FileChooser("$text.loadimage", FileChooser.mapFilter, true, file -> { ui.loadfrag.show(); Timers.run(3f, () -> { try{ - Pixmap pixmap = new Pixmap(file); - if(verifySize(pixmap)){ - editor.setPixmap(pixmap); - view.clearStack(); - }else{ - ui.showError(Bundles.format("text.editor.badsize", Arrays.toString(MapEditor.validMapSizes))); - } + MapTileData data = MapIO.readTileData(new DataInputStream(file.read())); + + editor.beginEdit(data); + view.clearStack(); }catch (Exception e){ ui.showError(Bundles.format("text.editor.errorimageload", Strings.parseException(e, false))); Log.err(e); @@ -110,8 +87,39 @@ public class MapEditorDialog extends Dialog{ ui.loadfrag.hide(); }); }); + + menu = new FloatingDialog("$text.menu"); + menu.addCloseButton(); + + menu.content().defaults().size(280f, 60f).padBottom(5); + + float isize = 16*2f; + + menu.content().addImageTextButton("$text.quit", "icon-back", isize, () -> { + if(!saved){ + ui.showConfirm("$text.confirm", "$text.editor.unsaved", this::hide); + }else{ + hide(); + } + menu.hide(); + }); + + menu.content().row(); + + menu.content().addImageTextButton("$text.editor.savemap", "icon-save-map", isize, () -> { + saveFile.show(); + menu.hide(); + }); + + menu.content().row(); + + menu.content().addImageTextButton("$text.editor.loadmap", "icon-load-map", isize, () -> { + openFile.show(); + menu.hide(); + }); + - */ + /* loadDialog = new MapLoadDialog(map -> { saveDialog.setFieldText(map.name); @@ -205,7 +213,7 @@ public class MapEditorDialog extends Dialog{ @Override public Dialog show(){ - return super.show(Core.scene, Actions.sequence(Actions.scaleTo(1f, 1f), Actions.alpha(0f), Actions.fadeIn(0.3f))); + return super.show(Core.scene, Actions.sequence(Actions.alpha(0f), Actions.scaleTo(1f, 1f), Actions.fadeIn(0.3f))); } public MapView getView() { @@ -247,9 +255,9 @@ public class MapEditorDialog extends Dialog{ tools.defaults().size(60f, 64f).padBottom(-5.1f); - tools.addImageButton("icon-arrow-left", 14*3f, () -> hide()); + tools.addImageButton("icon-back", 16*2, () -> hide()); - tools.addImageButton("icon-menu", 14*3f, menu::show); + tools.addImageButton("icon-menu-large", 16*2f, menu::show); tools.row(); diff --git a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java index 5253c3e664..2a1d3cbb80 100644 --- a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java @@ -5,6 +5,7 @@ import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.graphics.OrthographicCamera; import com.badlogic.gdx.utils.Array; +import io.anuke.mindustry.game.Team; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Layer; import io.anuke.mindustry.world.Tile; @@ -120,8 +121,7 @@ public class BlockRenderer{ return requestidx; } - public void drawBlocks(boolean top){ - Layer stopAt = top ? Layer.laser : Layer.overlay; + public void drawBlocks(Layer stopAt){ for(; iterateidx < requestidx; iterateidx ++){ @@ -141,6 +141,36 @@ public class BlockRenderer{ } } } + + public void drawTeamBlocks(Layer layer, Team team){ + int iterateidx = this.iterateidx; + + for(; iterateidx < requestidx; iterateidx ++){ + + if(iterateidx < requests.size - 1 && requests.get(iterateidx).layer.ordinal() > layer.ordinal()){ + break; + } + + BlockRequest req = requests.get(iterateidx); + if(req.tile.getTeam() != team) continue; + Block block = req.tile.block(); + + if(req.layer == block.layer){ + block.drawLayer(req.tile); + }else if(req.layer == block.layer2){ + block.drawLayer2(req.tile); + } + } + } + + public void skipLayer(Layer stopAt){ + + for(; iterateidx < requestidx; iterateidx ++){ + if(iterateidx < requests.size - 1 && requests.get(iterateidx).layer.ordinal() > stopAt.ordinal()){ + break; + } + } + } private void addRequest(Tile tile, Layer layer){ if(requestidx >= requests.size){ diff --git a/core/src/io/anuke/mindustry/resource/Recipes.java b/core/src/io/anuke/mindustry/resource/Recipes.java index 4ed45ba214..963a197eb9 100644 --- a/core/src/io/anuke/mindustry/resource/Recipes.java +++ b/core/src/io/anuke/mindustry/resource/Recipes.java @@ -25,7 +25,7 @@ public class Recipes { new Recipe(distribution, DistributionBlocks.conveyor, stack(Item.iron, 1)), new Recipe(distribution, DistributionBlocks.steelconveyor, stack(Item.steel, 1)), new Recipe(distribution, DistributionBlocks.pulseconveyor, stack(Item.dirium, 1)), - new Recipe(distribution, DistributionBlocks.router, stack(Item.stone, 2)), + new Recipe(distribution, DistributionBlocks.router, stack(Item.iron, 2)), new Recipe(distribution, DistributionBlocks.multiplexer, stack(Item.iron, 8)), new Recipe(distribution, DistributionBlocks.junction, stack(Item.iron, 2)), new Recipe(distribution, DistributionBlocks.tunnel, stack(Item.iron, 2)), @@ -35,8 +35,8 @@ public class Recipes { new Recipe(distribution, DistributionBlocks.unloader, stack(Item.steel, 5)), new Recipe(distribution, DistributionBlocks.sortedunloader, stack(Item.steel, 5)), - new Recipe(weapon, WeaponBlocks.doubleturret, stack(Item.stone, 7)), - new Recipe(weapon, WeaponBlocks.gatlingturret, stack(Item.iron, 8), stack(Item.stone, 10)), + new Recipe(weapon, WeaponBlocks.doubleturret, stack(Item.iron, 7)), + new Recipe(weapon, WeaponBlocks.gatlingturret, stack(Item.iron, 8)), new Recipe(weapon, WeaponBlocks.flameturret, stack(Item.iron, 12), stack(Item.steel, 9)), new Recipe(weapon, WeaponBlocks.railgunturret, stack(Item.iron, 15), stack(Item.steel, 10)), new Recipe(weapon, WeaponBlocks.laserturret, stack(Item.steel, 12), stack(Item.titanium, 12)), @@ -48,7 +48,7 @@ public class Recipes { new Recipe(weapon, WeaponBlocks.missileturret, stack(Item.steel, 70), stack(Item.titanium, 50), stack(Item.dirium, 55)), new Recipe(weapon, WeaponBlocks.fornaxcannon, stack(Item.steel, 70), stack(Item.titanium, 50), stack(Item.dirium, 55)), - new Recipe(crafting, ProductionBlocks.smelter, stack(Item.stone, 40), stack(Item.iron, 40)), + new Recipe(crafting, ProductionBlocks.smelter, stack(Item.iron, 40)), new Recipe(crafting, ProductionBlocks.alloysmelter, stack(Item.titanium, 50), stack(Item.steel, 50)), new Recipe(crafting, ProductionBlocks.coalextractor, stack(Item.steel, 10), stack(Item.iron, 10)), new Recipe(crafting, ProductionBlocks.titaniumextractor, stack(Item.steel, 30), stack(Item.iron, 30)), @@ -61,8 +61,8 @@ public class Recipes { //new Recipe(crafting, ProductionBlocks.centrifuge, stack(Item.steel, 30), stack(Item.iron, 30)), //new Recipe(production, ProductionBlocks.stonedrill, stack(Item.stone, 12)), - new Recipe(production, ProductionBlocks.irondrill, stack(Item.stone, 25)), - new Recipe(production, ProductionBlocks.coaldrill, stack(Item.stone, 25), stack(Item.iron, 40)), + new Recipe(production, ProductionBlocks.irondrill, stack(Item.iron, 25)), + new Recipe(production, ProductionBlocks.coaldrill, stack(Item.iron, 25), stack(Item.iron, 40)), new Recipe(production, ProductionBlocks.titaniumdrill, stack(Item.iron, 50), stack(Item.steel, 50)), new Recipe(production, ProductionBlocks.uraniumdrill, stack(Item.iron, 40), stack(Item.steel, 40)), new Recipe(production, ProductionBlocks.quartzextractor, stack(Item.titanium, 40), stack(Item.dirium, 40)), @@ -71,9 +71,9 @@ public class Recipes { new Recipe(production, ProductionBlocks.waterextractor, stack(Item.titanium, 40), stack(Item.dirium, 40)), new Recipe(production, ProductionBlocks.oilextractor, stack(Item.titanium, 40), stack(Item.dirium, 40)), - new Recipe(power, ProductionBlocks.coalgenerator, stack(Item.iron, 30), stack(Item.stone, 20)), - new Recipe(power, ProductionBlocks.thermalgenerator, stack(Item.steel, 30), stack(Item.iron, 30)), - new Recipe(power, ProductionBlocks.combustiongenerator, stack(Item.iron, 30), stack(Item.stone, 20)), + new Recipe(power, ProductionBlocks.coalgenerator, stack(Item.iron, 30)), + new Recipe(power, ProductionBlocks.thermalgenerator, stack(Item.steel, 30)), + new Recipe(power, ProductionBlocks.combustiongenerator, stack(Item.iron, 30)), new Recipe(power, ProductionBlocks.solarpanel, stack(Item.iron, 30), stack(Item.silicon, 20)), new Recipe(power, ProductionBlocks.largesolarpanel, stack(Item.iron, 30), stack(Item.silicon, 20)), new Recipe(power, ProductionBlocks.rtgenerator, stack(Item.titanium, 20), stack(Item.steel, 20)), diff --git a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java b/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java index eda9d315ad..de20ce240e 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java @@ -6,6 +6,7 @@ import com.badlogic.gdx.graphics.g2d.GlyphLayout; import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Pools; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.io.Platform; import io.anuke.ucore.core.Core; import io.anuke.ucore.core.Timers; @@ -321,6 +322,7 @@ public class FileChooser extends FloatingDialog { } public static Predicate pngFilter = file -> file.extension().equalsIgnoreCase("png"); + public static Predicate mapFilter = file -> file.extension().equalsIgnoreCase(Vars.mapExtension); public static Predicate jpegFilter = file -> file.extension().equalsIgnoreCase("png") || file.extension().equalsIgnoreCase("jpg") || file.extension().equalsIgnoreCase("jpeg"); public static Predicate defaultFilter = file -> true; }