diff --git a/core/assets-raw/sprites/blocks/extra/block-border.png b/core/assets-raw/sprites/blocks/extra/block-border.png index ded2d0a62a..e4f5596ce8 100644 Binary files a/core/assets-raw/sprites/blocks/extra/block-border.png and b/core/assets-raw/sprites/blocks/extra/block-border.png differ diff --git a/core/assets-raw/sprites/ui/icons/icon-arrow-16.png b/core/assets-raw/sprites/ui/icons/icon-arrow-16.png new file mode 100644 index 0000000000..227ea56fdb Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-arrow-16.png differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index f13750c813..8e806f7599 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -151,6 +151,7 @@ text.enemies.single={0} Enemy text.loadimage=Load Image text.saveimage=Save Image text.oregen=Ore Generation +text.editor.teams=Teams text.editor.badsize=[orange]Invalid image dimensions![]\nValid map dimensions: {0} text.editor.errorimageload=Error loading image file:\n[orange]{0} text.editor.errorimagesave=Error saving image file:\n[orange]{0} diff --git a/core/assets/maps/test.mmap b/core/assets/maps/test.mmap index 8d45478ff5..a87649b16a 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 9623424268..4c33cee074 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,98 +13,98 @@ background index: -1 bridgeconduit rotate: false - xy: 424, 43 + xy: 683, 307 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconduit-arrow rotate: false - xy: 782, 330 + xy: 693, 307 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconduit-bridge rotate: false - xy: 792, 335 + xy: 703, 307 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconduit-end rotate: false - xy: 802, 335 + xy: 481, 174 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor rotate: false - xy: 792, 325 + xy: 811, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-arrow rotate: false - xy: 802, 325 + xy: 811, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-bridge rotate: false - xy: 437, 96 + xy: 811, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-end rotate: false - xy: 447, 96 + xy: 811, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 811, 397 + xy: 427, 93 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top rotate: false - xy: 808, 375 + xy: 426, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduittunnel rotate: false - xy: 808, 365 + xy: 426, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 808, 355 + xy: 427, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyormove rotate: false - xy: 808, 345 + xy: 427, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyortunnel rotate: false - xy: 812, 335 + xy: 427, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -118,98 +118,98 @@ core index: -1 junction rotate: false - xy: 487, 94 + xy: 514, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit rotate: false - xy: 487, 84 + xy: 524, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-arrow rotate: false - xy: 477, 80 + xy: 534, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-bridge rotate: false - xy: 476, 70 + xy: 544, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-end rotate: false - xy: 487, 74 + xy: 554, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor rotate: false - xy: 486, 64 + xy: 564, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-arrow rotate: false - xy: 484, 192 + xy: 554, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-bridge rotate: false - xy: 494, 199 + xy: 564, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-end rotate: false - xy: 504, 199 + xy: 815, 457 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 514, 189 + xy: 885, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 524, 189 + xy: 895, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-bottom rotate: false - xy: 534, 189 + xy: 905, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-liquid rotate: false - xy: 544, 189 + xy: 915, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-top rotate: false - xy: 554, 195 + xy: 925, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -237,84 +237,84 @@ liquidtank-top index: -1 multiplexer rotate: false - xy: 210, 32 + xy: 228, 32 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 overflowgate rotate: false - xy: 895, 459 + xy: 825, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyor rotate: false - xy: 915, 459 + xy: 845, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyormove rotate: false - xy: 925, 459 + xy: 855, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-bottom rotate: false - xy: 965, 459 + xy: 895, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-top rotate: false - xy: 975, 459 + xy: 905, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 875, 449 + xy: 821, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 844, 439 + xy: 994, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 854, 439 + xy: 1004, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 874, 439 + xy: 828, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyor rotate: false - xy: 884, 439 + xy: 828, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyormove rotate: false - xy: 894, 439 + xy: 828, 357 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -328,7 +328,7 @@ teleporter-top index: -1 unloader rotate: false - xy: 841, 419 + xy: 871, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -342,7 +342,7 @@ vault index: -1 weaponfactory rotate: false - xy: 437, 106 + xy: 455, 106 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -370,35 +370,35 @@ blackstone1 index: -1 blackstone2 rotate: false - xy: 339, 27 + xy: 417, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 349, 27 + xy: 417, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock1 rotate: false - xy: 359, 27 + xy: 241, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock2 rotate: false - xy: 369, 27 + xy: 719, 314 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock3 rotate: false - xy: 379, 27 + xy: 729, 314 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -412,49 +412,49 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 477, 100 + xy: 808, 365 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 481, 174 + xy: 808, 355 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 409, 29 + xy: 808, 345 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 419, 31 + xy: 416, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 429, 33 + xy: 426, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 609, 190 + xy: 437, 86 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 619, 190 + xy: 447, 86 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -468,35 +468,35 @@ dirtedge index: -1 grass1 rotate: false - xy: 477, 90 + xy: 437, 56 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 426, 93 + xy: 437, 46 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 426, 83 + xy: 447, 56 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock1 rotate: false - xy: 426, 73 + xy: 437, 36 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock2 rotate: false - xy: 426, 63 + xy: 447, 46 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -510,21 +510,21 @@ grassedge index: -1 ice1 rotate: false - xy: 436, 86 + xy: 447, 36 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 446, 86 + xy: 457, 56 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 436, 76 + xy: 457, 46 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -538,70 +538,70 @@ iceedge index: -1 icerock1 rotate: false - xy: 446, 76 + xy: 457, 36 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 436, 66 + xy: 467, 90 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 446, 66 + xy: 477, 90 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 446, 66 + xy: 477, 90 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 456, 79 + xy: 466, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 456, 79 + xy: 466, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron1 rotate: false - xy: 466, 68 + xy: 437, 26 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron2 rotate: false - xy: 432, 53 + xy: 447, 26 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron3 rotate: false - xy: 434, 43 + xy: 457, 26 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 514, 199 + xy: 825, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -615,63 +615,63 @@ lavaedge index: -1 lead1 rotate: false - xy: 534, 199 + xy: 845, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 544, 199 + xy: 855, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 494, 189 + xy: 865, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 564, 185 + xy: 955, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 815, 457 + xy: 965, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 825, 459 + xy: 975, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 835, 459 + xy: 985, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 845, 459 + xy: 995, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 855, 459 + xy: 1005, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -685,308 +685,308 @@ metalflooredge index: -1 mossblock rotate: false - xy: 865, 459 + xy: 1015, 457 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 875, 459 + xy: 815, 447 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oiledge rotate: false - xy: 250, 43 + xy: 266, 47 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock1 rotate: false - xy: 855, 449 + xy: 1005, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock2 rotate: false - xy: 865, 449 + xy: 1015, 447 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 905, 449 + xy: 821, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 915, 449 + xy: 821, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 925, 449 + xy: 818, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock1 rotate: false - xy: 935, 449 + xy: 818, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock2 rotate: false - xy: 945, 449 + xy: 818, 357 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock3 rotate: false - xy: 955, 449 + xy: 818, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 246, 29 + xy: 280, 47 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrub rotate: false - xy: 821, 427 + xy: 884, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 821, 417 + xy: 894, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 821, 387 + xy: 924, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 818, 377 + xy: 934, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 818, 367 + xy: 944, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock1 rotate: false - xy: 818, 357 + xy: 954, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock2 rotate: false - xy: 818, 347 + xy: 964, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock3 rotate: false - xy: 824, 437 + xy: 974, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 653, 238 + xy: 336, 47 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 space rotate: false - xy: 864, 439 + xy: 1014, 437 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 653, 224 + xy: 350, 47 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone1 rotate: false - xy: 944, 439 + xy: 831, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 954, 439 + xy: 831, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 964, 439 + xy: 841, 429 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock1 rotate: false - xy: 974, 439 + xy: 841, 419 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock2 rotate: false - xy: 984, 439 + xy: 851, 429 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock3 rotate: false - xy: 994, 439 + xy: 841, 409 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 718, 346 + xy: 392, 47 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 828, 377 + xy: 861, 419 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 828, 367 + xy: 871, 429 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 828, 357 + xy: 841, 389 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 828, 347 + xy: 851, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 832, 337 + xy: 861, 409 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 832, 327 + xy: 871, 419 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 841, 409 + xy: 901, 429 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 695, 339 + xy: 308, 33 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-border rotate: false - xy: 399, 27 + xy: 406, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-middle rotate: false - xy: 772, 330 + xy: 417, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 772, 330 + xy: 417, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 border rotate: false - xy: 422, 53 + xy: 673, 307 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 811, 387 + xy: 426, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 812, 325 + xy: 251, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1014,7 +1014,7 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 259, 11 + xy: 456, 76 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1028,42 +1028,42 @@ nuclearreactor-shadow index: -1 playerspawn rotate: false - xy: 905, 459 + xy: 835, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 356, 37 + xy: 743, 324 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 rubble-1-0 rotate: false - xy: 790, 345 + xy: 466, 184 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 466, 184 + xy: 463, 166 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 463, 166 + xy: 263, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 263, 109 + xy: 281, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1084,7 +1084,7 @@ rubble-3-1 index: -1 shadow-1 rotate: false - xy: 368, 37 + xy: 755, 336 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1119,7 +1119,7 @@ shadow-5 index: -1 shadow-round-1 rotate: false - xy: 380, 37 + xy: 755, 324 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1140,14 +1140,14 @@ batterylarge index: -1 combustiongenerator rotate: false - xy: 811, 427 + xy: 437, 96 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustiongenerator-top rotate: false - xy: 811, 417 + xy: 447, 96 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1217,7 +1217,7 @@ largesolarpanel index: -1 liquidcombustiongenerator rotate: false - xy: 504, 189 + xy: 875, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1245,21 +1245,21 @@ nuclearreactor-lights index: -1 powerinfinite rotate: false - xy: 935, 459 + xy: 865, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powernode rotate: false - xy: 945, 459 + xy: 875, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powernodelarge rotate: false - xy: 772, 354 + xy: 790, 381 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1273,42 +1273,42 @@ powernodelarge-shadow index: -1 powervoid rotate: false - xy: 955, 459 + xy: 885, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator rotate: false - xy: 885, 449 + xy: 821, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator-top rotate: false - xy: 895, 449 + xy: 821, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldgenerator rotate: false - xy: 985, 449 + xy: 844, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldprojector rotate: false - xy: 281, 109 + xy: 299, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 solarpanel rotate: false - xy: 834, 439 + xy: 984, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1329,7 +1329,7 @@ teleporter-top index: -1 thermalgenerator rotate: false - xy: 822, 327 + xy: 851, 409 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1441,105 +1441,105 @@ cultivator-top index: -1 extractor rotate: false - xy: 259, 1 + xy: 446, 66 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 fluxpump rotate: false - xy: 467, 88 + xy: 456, 66 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 466, 78 + xy: 476, 70 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill rotate: false - xy: 442, 56 + xy: 609, 190 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill-rotator rotate: false - xy: 439, 33 + xy: 619, 190 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill-rotator rotate: false - xy: 439, 33 + xy: 619, 190 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill-top rotate: false - xy: 444, 46 + xy: 322, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 485, 114 + xy: 494, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 487, 104 + xy: 504, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserdrill rotate: false - xy: 131, 2 + xy: 156, 34 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laserdrill-rotator rotate: false - xy: 156, 34 + xy: 174, 34 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laserdrill-top rotate: false - xy: 174, 34 + xy: 192, 34 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 524, 199 + xy: 835, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 564, 195 + xy: 935, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 554, 185 + xy: 945, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1602,7 +1602,7 @@ oilextractor-top index: -1 oilrefinery rotate: false - xy: 885, 459 + xy: 814, 437 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1637,210 +1637,210 @@ plasmadrill-top index: -1 plasticformer rotate: false - xy: 228, 32 + xy: 209, 14 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plasticformer-top rotate: false - xy: 209, 14 + xy: 227, 14 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter rotate: false - xy: 227, 14 + xy: 772, 372 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter-top rotate: false - xy: 772, 372 + xy: 772, 354 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powersmelter rotate: false - xy: 790, 381 + xy: 790, 363 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powersmelter-top rotate: false - xy: 790, 363 + xy: 790, 345 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 siliconsmelter-top rotate: false - xy: 790, 363 + xy: 790, 345 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 985, 459 + xy: 915, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 995, 459 + xy: 925, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump rotate: false - xy: 1005, 459 + xy: 935, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill rotate: false - xy: 1015, 457 + xy: 945, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill-rotator rotate: false - xy: 815, 447 + xy: 955, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill-top rotate: false - xy: 814, 437 + xy: 965, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 965, 449 + xy: 824, 437 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 975, 449 + xy: 834, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconextractor rotate: false - xy: 821, 407 + xy: 904, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconsmelter rotate: false - xy: 299, 109 + xy: 317, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 smelter rotate: false - xy: 821, 397 + xy: 914, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill rotate: false - xy: 904, 439 + xy: 828, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill-rotator rotate: false - xy: 914, 439 + xy: 831, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill-top rotate: false - xy: 924, 439 + xy: 831, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stonedrill rotate: false - xy: 1004, 439 + xy: 851, 419 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 1014, 437 + xy: 861, 429 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill rotate: false - xy: 831, 427 + xy: 881, 429 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill-top rotate: false - xy: 831, 417 + xy: 851, 389 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 waterextractor rotate: false - xy: 353, 109 + xy: 371, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-liquid rotate: false - xy: 371, 109 + xy: 389, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-rotator rotate: false - xy: 389, 109 + xy: 407, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-top rotate: false - xy: 407, 109 + xy: 437, 106 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-1 rotate: false - xy: 414, 41 + xy: 759, 314 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1882,7 +1882,7 @@ chainturret index: -1 doubleturret rotate: false - xy: 707, 309 + xy: 446, 76 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1952,77 +1952,77 @@ gatlingturret-heat index: -1 laserturret rotate: false - xy: 296, 37 + xy: 719, 336 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 laserturret-heat rotate: false - xy: 308, 37 + xy: 719, 324 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 liquidturret rotate: false - xy: 192, 34 + xy: 155, 16 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquidturret-liquid rotate: false - xy: 155, 16 + xy: 173, 16 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 megarepairturret rotate: false - xy: 173, 16 + xy: 191, 16 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 missileturret rotate: false - xy: 191, 16 + xy: 210, 32 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 railgunturret rotate: false - xy: 320, 37 + xy: 731, 336 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 railgunturret-heat rotate: false - xy: 332, 37 + xy: 731, 324 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 repairturret rotate: false - xy: 344, 37 + xy: 743, 336 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 teslaturret rotate: false - xy: 392, 37 + xy: 473, 112 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 teslaturret-heat rotate: false - xy: 272, 25 + xy: 473, 100 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -2078,35 +2078,35 @@ walkerfactory-top-open index: -1 repairpoint rotate: false - xy: 825, 449 + xy: 975, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 repairpoint-turret rotate: false - xy: 835, 449 + xy: 985, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 resupplypoint rotate: false - xy: 845, 449 + xy: 995, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 compositewall rotate: false - xy: 811, 407 + xy: 457, 96 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 707, 329 + xy: 457, 86 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2127,14 +2127,14 @@ door-large-open index: -1 door-open rotate: false - xy: 707, 319 + xy: 436, 76 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall rotate: false - xy: 260, 21 + xy: 436, 66 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2148,49 +2148,49 @@ duriumwall-large index: -1 ironwall rotate: false - xy: 452, 56 + xy: 332, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall rotate: false - xy: 934, 439 + xy: 831, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall-large rotate: false - xy: 317, 109 + xy: 335, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 stonewall rotate: false - xy: 822, 337 + xy: 841, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumshieldwall rotate: false - xy: 831, 407 + xy: 861, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall rotate: false - xy: 831, 397 + xy: 871, 409 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall-large rotate: false - xy: 335, 109 + xy: 353, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2218,14 +2218,14 @@ blank index: -1 bullet rotate: false - xy: 284, 26 + xy: 707, 344 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 bullet-back rotate: false - xy: 295, 26 + xy: 651, 309 size: 9, 9 orig: 9, 9 offset: 0, 0 @@ -2246,7 +2246,7 @@ clear index: -1 enemyarrow rotate: false - xy: 457, 89 + xy: 467, 81 size: 8, 7 orig: 8, 7 offset: 0, 0 @@ -2274,21 +2274,21 @@ laserfull index: -1 shell rotate: false - xy: 306, 26 + xy: 662, 309 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shell-back rotate: false - xy: 317, 26 + xy: 406, 50 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shot rotate: false - xy: 1015, 447 + xy: 874, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2302,7 +2302,7 @@ transfer index: -1 transfer-arrow rotate: false - xy: 831, 387 + xy: 881, 419 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2316,105 +2316,105 @@ transfer-end index: -1 item-biomatter rotate: false - xy: 454, 46 + xy: 342, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 449, 36 + xy: 352, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-densealloy rotate: false - xy: 459, 36 + xy: 362, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-iron rotate: false - xy: 462, 58 + xy: 372, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 464, 48 + xy: 382, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastic rotate: false - xy: 472, 58 + xy: 392, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-rdx rotate: false - xy: 474, 48 + xy: 484, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 469, 38 + xy: 494, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 479, 38 + xy: 504, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-steel rotate: false - xy: 449, 26 + xy: 514, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 459, 26 + xy: 524, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 469, 28 + xy: 534, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 479, 28 + xy: 544, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 standard-mech rotate: false - xy: 653, 210 + xy: 364, 47 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-ship rotate: false - xy: 653, 196 + xy: 378, 47 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -2562,7 +2562,7 @@ clear index: -1 cursor rotate: false - xy: 257, 111 + xy: 627, 310 size: 4, 4 orig: 4, 4 offset: 0, 0 @@ -2630,6 +2630,13 @@ icon-arrow orig: 14, 14 offset: 0, 0 index: -1 +icon-arrow-16 + rotate: false + xy: 817, 469 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 icon-arrow-down rotate: false xy: 205, 2 @@ -2653,14 +2660,14 @@ icon-arrow-right index: -1 icon-arrow-up rotate: false - xy: 760, 348 + xy: 322, 35 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 817, 469 + xy: 835, 469 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2681,525 +2688,525 @@ icon-cancel index: -1 icon-chat rotate: false - xy: 760, 336 + xy: 334, 35 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 455, 108 + xy: 467, 150 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 695, 327 + xy: 346, 35 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 695, 315 + xy: 358, 35 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 651, 308 + xy: 370, 35 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 467, 150 + xy: 467, 134 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 467, 134 + xy: 250, 89 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 663, 308 + xy: 382, 35 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 250, 89 + xy: 250, 73 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 250, 73 + xy: 250, 57 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 250, 57 + xy: 266, 93 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 266, 93 + xy: 266, 77 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 266, 77 + xy: 282, 93 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 282, 93 + xy: 266, 61 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 835, 469 + xy: 853, 469 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 266, 61 + xy: 282, 77 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 282, 77 + xy: 298, 93 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 298, 93 + xy: 282, 61 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-github rotate: false - xy: 282, 61 + xy: 298, 77 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 298, 77 + xy: 314, 93 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 853, 469 + xy: 871, 469 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 675, 305 + xy: 394, 35 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 266, 49 + xy: 653, 240 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 314, 93 + xy: 298, 61 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 298, 61 + xy: 314, 77 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 278, 49 + xy: 653, 228 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 314, 77 + xy: 330, 93 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 456, 69 + xy: 477, 80 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-line rotate: false - xy: 871, 469 + xy: 889, 469 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 330, 93 + xy: 314, 61 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 290, 49 + xy: 653, 216 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 314, 61 + xy: 330, 77 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 889, 469 + xy: 907, 469 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 907, 469 + xy: 925, 469 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 925, 469 + xy: 943, 469 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 302, 49 + xy: 653, 204 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 314, 49 + xy: 653, 192 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 943, 469 + xy: 961, 469 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-none rotate: false - xy: 326, 49 + xy: 718, 348 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 338, 49 + xy: 730, 348 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 961, 469 + xy: 979, 469 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 330, 77 + xy: 346, 93 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 979, 469 + xy: 997, 469 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 350, 49 + xy: 742, 348 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 346, 93 + xy: 330, 61 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 362, 49 + xy: 754, 348 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 374, 49 + xy: 246, 29 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 386, 49 + xy: 245, 17 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 330, 61 + xy: 346, 77 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 997, 469 + xy: 630, 266 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 346, 77 + xy: 362, 93 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 362, 93 + xy: 346, 61 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 630, 266 + xy: 635, 234 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 346, 61 + xy: 362, 77 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 362, 77 + xy: 378, 93 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 378, 93 + xy: 362, 61 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 362, 61 + xy: 378, 77 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 378, 77 + xy: 394, 93 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 635, 234 + xy: 635, 216 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 635, 216 + xy: 635, 198 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 398, 49 + xy: 695, 341 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 635, 198 + xy: 119, 25 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 394, 93 + xy: 378, 61 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 410, 51 + xy: 695, 329 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 260, 31 + xy: 695, 317 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 378, 61 + xy: 394, 77 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 119, 25 + xy: 138, 38 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 394, 77 + xy: 394, 61 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 394, 61 + xy: 410, 79 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 138, 38 + xy: 137, 20 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 272, 37 + xy: 707, 332 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 284, 37 + xy: 707, 320 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 410, 79 + xy: 410, 63 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 137, 20 + xy: 131, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 410, 63 + xy: 250, 41 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -3379,63 +3386,63 @@ drone index: -1 scout rotate: false - xy: 245, 15 + xy: 294, 47 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-base rotate: false - xy: 245, 1 + xy: 308, 47 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-mech-base rotate: false - xy: 245, 1 + xy: 308, 47 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-leg rotate: false - xy: 471, 110 + xy: 322, 47 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-mech-leg rotate: false - xy: 471, 110 + xy: 322, 47 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol rotate: false - xy: 732, 346 + xy: 266, 33 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol-booster-1 rotate: false - xy: 746, 346 + xy: 280, 33 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol-booster-2 rotate: false - xy: 772, 340 + xy: 294, 33 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol-flame rotate: false - xy: 328, 26 + xy: 406, 39 size: 9, 9 orig: 9, 9 offset: 0, 0 @@ -3449,70 +3456,70 @@ beam-equip index: -1 blaster rotate: false - xy: 389, 27 + xy: 739, 314 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 404, 39 + xy: 749, 314 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun rotate: false - xy: 457, 98 + xy: 811, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun-equip rotate: false - xy: 467, 98 + xy: 808, 375 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun rotate: false - xy: 995, 449 + xy: 854, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 1005, 449 + xy: 864, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster rotate: false - xy: 841, 429 + xy: 891, 429 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 851, 429 + xy: 861, 389 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan rotate: false - xy: 861, 429 + xy: 881, 409 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan-equip rotate: false - xy: 851, 419 + xy: 891, 419 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index c4b4733739..efbad9b85d 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/editor/MapEditor.java b/core/src/io/anuke/mindustry/editor/MapEditor.java index 9c0fcc3435..c13fe8c0b1 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditor.java +++ b/core/src/io/anuke/mindustry/editor/MapEditor.java @@ -17,6 +17,7 @@ public class MapEditor{ private MapRenderer renderer = new MapRenderer(this); private int brushSize = 1; + private int rotation; private Block drawBlock = Blocks.stone; private Team drawTeam = Team.none; @@ -35,6 +36,14 @@ public class MapEditor{ renderer.resize(map.width(), map.height()); } + public int getDrawRotation(){ + return rotation; + } + + public void setDrawRotation(int rotation){ + this.rotation = rotation; + } + public void setDrawTeam(Team team){ this.drawTeam = team; } @@ -75,6 +84,10 @@ public class MapEditor{ writer.team = (byte)drawTeam.ordinal(); } + if(drawBlock.rotate){ + writer.rotation = (byte)rotation; + } + if(drawBlock.isMultiblock()){ int offsetx = -(drawBlock.size-1)/2; diff --git a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java index 79a0839f2e..b87ddaa37e 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java @@ -4,6 +4,7 @@ import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Pixmap; import com.badlogic.gdx.graphics.g2d.TextureRegion; +import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.ObjectMap; import io.anuke.mindustry.content.blocks.Blocks; import io.anuke.mindustry.game.Team; @@ -32,6 +33,7 @@ import io.anuke.ucore.scene.ui.layout.Table; import io.anuke.ucore.scene.utils.UIUtils; import io.anuke.ucore.util.Bundles; import io.anuke.ucore.util.Log; +import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Strings; import java.io.DataInputStream; @@ -313,10 +315,12 @@ public class MapEditorDialog extends Dialog{ tools.defaults().size(60f, 64f).padBottom(-5.1f); - tools.addImageButton("icon-back", 16*2, () -> hide()); + //tools.addImageButton("icon-back", 16*2, () -> hide()); tools.addImageButton("icon-menu-large", 16*2f, menu::show); + ImageButton grid = tools.addImageButton("icon-grid", "toggle", 16*2f, () -> view.setGrid(!view.isGrid())).get(); + tools.row(); ImageButton undo = tools.addImageButton("icon-undo", 16*2f, () -> view.undo()).get(); @@ -324,8 +328,6 @@ public class MapEditorDialog extends Dialog{ tools.row(); - ImageButton grid = tools.addImageButton("icon-grid", "toggle", 16*2f, () -> view.setGrid(!view.isGrid())).get(); - undo.setDisabled(() -> !view.getStack().canUndo()); redo.setDisabled(() -> !view.getStack().canRedo()); @@ -343,9 +345,23 @@ public class MapEditorDialog extends Dialog{ button.setChecked(true); tools.add(button).padBottom(-5.1f); - if(i++ % 2 == 1) tools.row(); + if(i++ % 2 == 0) tools.row(); } + ImageButton rotate = tools.addImageButton("icon-arrow-16", 16*2f, () -> editor.setDrawRotation((editor.getDrawRotation() + 1)%4)).get(); + rotate.getImage().update(() ->{ + rotate.getImage().setRotation(editor.getDrawRotation() * 90); + rotate.getImage().setOrigin(Align.center); + }); + + tools.row(); + + tools.table("button", t -> { + t.add("$text.editor.teams"); + }).colspan(2).height(40).width(120f); + + tools.row(); + ButtonGroup teamgroup = new ButtonGroup<>(); for(Team team : Team.values()){ @@ -418,6 +434,14 @@ public class MapEditorDialog extends Dialog{ saveDialog.save(); } + if(Inputs.keyTap(Input.R)){ + editor.setDrawRotation((editor.getDrawRotation() + 1)%4); + } + + if(Inputs.keyTap(Input.E)){ + editor.setDrawRotation(Mathf.mod((editor.getDrawRotation() + 1), 4)); + } + if(Inputs.keyTap(Input.G)){ view.setGrid(!view.isGrid()); } @@ -454,6 +478,7 @@ public class MapEditorDialog extends Dialog{ button.getImageCell().setActor(stack); button.addChild(stack); button.getImage().remove(); + button.update(() -> button.setChecked(editor.getDrawBlock() == block)); group.add(button); content.add(button).pad(4f).size(53f, 58f); diff --git a/core/src/io/anuke/mindustry/editor/MapRenderer.java b/core/src/io/anuke/mindustry/editor/MapRenderer.java index c1d657d382..393bb1fe03 100644 --- a/core/src/io/anuke/mindustry/editor/MapRenderer.java +++ b/core/src/io/anuke/mindustry/editor/MapRenderer.java @@ -106,9 +106,16 @@ public class MapRenderer { TextureRegion wregion = (wall == Blocks.air || wall == Blocks.blockpart) ? Draw.region("clear"): wall.getBlockIcon()[wall.getBlockIcon().length-1]; region = wregion; - mesh.draw((wx % chunksize) + (wy % chunksize)*chunksize + chunksize*chunksize, region, - wx * tilesize + offsetx*tilesize, wy * tilesize + offsety * tilesize, - region.getRegionWidth(), region.getRegionHeight()); + + if(wall.rotate){ + mesh.draw((wx % chunksize) + (wy % chunksize)*chunksize + chunksize*chunksize, region, + wx * tilesize + offsetx*tilesize, wy * tilesize + offsety * tilesize, + region.getRegionWidth(), region.getRegionHeight(), data.rotation*90 - 90); + }else{ + mesh.draw((wx % chunksize) + (wy % chunksize)*chunksize + chunksize*chunksize, region, + wx * tilesize + offsetx*tilesize, wy * tilesize + offsety * tilesize, + region.getRegionWidth(), region.getRegionHeight()); + } if(wall.update || wall.destructible) { mesh.setColor(Team.values()[data.team].color);