diff --git a/core/assets-raw/sprites/blocks/turrets/block-2.png b/core/assets-raw/sprites/blocks/turrets/block-2.png index 5cc3dd515e..49bef72447 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/block-2.png and b/core/assets-raw/sprites/blocks/turrets/block-2.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/block-3.png b/core/assets-raw/sprites/blocks/turrets/block-3.png index d261addb29..2a1becda62 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/block-3.png and b/core/assets-raw/sprites/blocks/turrets/block-3.png differ diff --git a/core/assets-raw/sprites/ui/icons/icon-close-down.png b/core/assets-raw/sprites/ui/icons/icon-close-down.png deleted file mode 100644 index 204c2eb911..0000000000 Binary files a/core/assets-raw/sprites/ui/icons/icon-close-down.png and /dev/null differ diff --git a/core/assets-raw/sprites/ui/icons/icon-close-over.png b/core/assets-raw/sprites/ui/icons/icon-close-over.png deleted file mode 100644 index e526739fb6..0000000000 Binary files a/core/assets-raw/sprites/ui/icons/icon-close-over.png and /dev/null differ diff --git a/core/assets-raw/sprites/ui/icons/icon-close.png b/core/assets-raw/sprites/ui/icons/icon-close.png deleted file mode 100644 index 02b26e0a25..0000000000 Binary files a/core/assets-raw/sprites/ui/icons/icon-close.png and /dev/null differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 5aa1190131..7263d2cebf 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,1078 +13,1078 @@ background index: -1 bridgeconduit rotate: false - xy: 507, 145 + xy: 772, 330 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconduit-arrow rotate: false - xy: 517, 145 + xy: 422, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconduit-bridge rotate: false - xy: 507, 135 + xy: 424, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconduit-end rotate: false - xy: 527, 145 + xy: 782, 330 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor rotate: false - xy: 507, 125 + xy: 792, 335 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-arrow rotate: false - xy: 517, 135 + xy: 802, 335 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-bridge rotate: false - xy: 537, 145 + xy: 792, 325 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-end rotate: false - xy: 507, 115 + xy: 802, 325 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 537, 125 + xy: 811, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top rotate: false - xy: 537, 115 + xy: 811, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduittunnel rotate: false - xy: 537, 105 + xy: 811, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 446, 71 + xy: 808, 375 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyormove rotate: false - xy: 456, 72 + xy: 808, 365 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyortunnel rotate: false - xy: 466, 72 + xy: 808, 355 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 core rotate: false - xy: 609, 200 + xy: 895, 487 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 junction rotate: false - xy: 516, 65 + xy: 524, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit rotate: false - xy: 526, 75 + xy: 534, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-arrow rotate: false - xy: 516, 55 + xy: 544, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-bridge rotate: false - xy: 526, 65 + xy: 554, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-end rotate: false - xy: 536, 75 + xy: 564, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor rotate: false - xy: 526, 55 + xy: 554, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-arrow rotate: false - xy: 536, 65 + xy: 564, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-bridge rotate: false - xy: 536, 55 + xy: 815, 457 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-end rotate: false - xy: 506, 45 + xy: 825, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 145, 26 + xy: 895, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 145, 16 + xy: 905, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-bottom rotate: false - xy: 145, 6 + xy: 915, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-liquid rotate: false - xy: 155, 58 + xy: 925, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-top rotate: false - xy: 165, 58 + xy: 935, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidtank-bottom rotate: false - xy: 254, 169 + xy: 999, 487 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquidtank-liquid rotate: false - xy: 280, 169 + xy: 67, 17 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquidtank-top rotate: false - xy: 306, 169 + xy: 93, 17 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 multiplexer rotate: false - xy: 484, 184 + xy: 210, 32 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 overflowgate rotate: false - xy: 175, 38 + xy: 835, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyor rotate: false - xy: 205, 58 + xy: 855, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyormove rotate: false - xy: 155, 8 + xy: 865, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-bottom rotate: false - xy: 195, 48 + xy: 905, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-top rotate: false - xy: 215, 58 + xy: 915, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 195, 18 + xy: 821, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 245, 15 + xy: 1004, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 255, 25 + xy: 1014, 437 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 275, 45 + xy: 822, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyor rotate: false - xy: 245, 5 + xy: 828, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyormove rotate: false - xy: 255, 15 + xy: 828, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 teleporter-top rotate: false - xy: 267, 117 + xy: 188, 78 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unloader rotate: false - xy: 335, 45 + xy: 861, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vault rotate: false - xy: 345, 117 + xy: 219, 104 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 weaponfactory rotate: false - xy: 537, 155 + xy: 437, 106 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blackrock1 rotate: false - xy: 1015, 455 + xy: 126, 55 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackrockshadow1 rotate: false - xy: 1015, 445 + xy: 467, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 1015, 435 + xy: 477, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 942, 435 + xy: 339, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 952, 435 + xy: 349, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock1 rotate: false - xy: 962, 435 + xy: 359, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock2 rotate: false - xy: 972, 435 + xy: 369, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock3 rotate: false - xy: 497, 142 + xy: 379, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneedge rotate: false - xy: 1010, 499 + xy: 630, 252 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 coal1 rotate: false - xy: 507, 105 + xy: 457, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 517, 115 + xy: 467, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 527, 125 + xy: 477, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 486, 74 + xy: 812, 335 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 755, 325 + xy: 812, 325 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 497, 92 + xy: 419, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 507, 95 + xy: 429, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 1010, 485 + xy: 644, 252 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 grass1 rotate: false - xy: 466, 62 + xy: 426, 93 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 476, 62 + xy: 426, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 486, 64 + xy: 426, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock1 rotate: false - xy: 496, 62 + xy: 426, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock2 rotate: false - xy: 486, 54 + xy: 436, 86 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 459, 152 + xy: 163, 2 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice1 rotate: false - xy: 496, 52 + xy: 446, 86 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 787, 423 + xy: 436, 76 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 797, 423 + xy: 446, 76 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 473, 152 + xy: 177, 2 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 807, 423 + xy: 436, 66 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 817, 423 + xy: 446, 66 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 827, 423 + xy: 432, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 827, 423 + xy: 432, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 837, 423 + xy: 434, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 837, 423 + xy: 434, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron1 rotate: false - xy: 867, 423 + xy: 444, 46 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron2 rotate: false - xy: 877, 423 + xy: 452, 56 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron3 rotate: false - xy: 887, 424 + xy: 454, 46 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 516, 45 + xy: 835, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 487, 152 + xy: 191, 2 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 536, 45 + xy: 855, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 145, 56 + xy: 865, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 145, 46 + xy: 875, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 155, 38 + xy: 965, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 165, 48 + xy: 975, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 185, 58 + xy: 985, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 155, 28 + xy: 995, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 165, 38 + xy: 1005, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 175, 48 + xy: 1015, 457 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalflooredge rotate: false - xy: 482, 84 + xy: 410, 95 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mossblock rotate: false - xy: 195, 58 + xy: 815, 447 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 155, 18 + xy: 814, 437 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oiledge rotate: false - xy: 370, 61 + xy: 250, 43 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock1 rotate: false - xy: 215, 48 + xy: 1015, 447 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock2 rotate: false - xy: 185, 8 + xy: 821, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 195, 8 + xy: 821, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 205, 18 + xy: 818, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 215, 28 + xy: 818, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock1 rotate: false - xy: 205, 8 + xy: 818, 357 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock2 rotate: false - xy: 215, 18 + xy: 818, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock3 rotate: false - xy: 215, 8 + xy: 824, 437 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 384, 61 + xy: 246, 29 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrub rotate: false - xy: 235, 45 + xy: 894, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 235, 35 + xy: 904, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 245, 35 + xy: 934, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 255, 45 + xy: 944, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 235, 15 + xy: 954, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock1 rotate: false - xy: 245, 25 + xy: 964, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock2 rotate: false - xy: 255, 35 + xy: 974, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock3 rotate: false - xy: 265, 45 + xy: 984, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 736, 363 + xy: 653, 238 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 space rotate: false - xy: 265, 35 + xy: 822, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 750, 363 + xy: 653, 224 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone1 rotate: false - xy: 265, 15 + xy: 831, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 275, 25 + xy: 831, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 285, 35 + xy: 831, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock1 rotate: false - xy: 295, 45 + xy: 831, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock2 rotate: false - xy: 265, 5 + xy: 831, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock3 rotate: false - xy: 275, 15 + xy: 841, 429 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 731, 349 + xy: 718, 346 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 285, 15 + xy: 841, 409 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 295, 25 + xy: 871, 429 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 305, 35 + xy: 861, 419 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 315, 45 + xy: 851, 409 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 285, 5 + xy: 841, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 295, 15 + xy: 881, 429 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 325, 25 + xy: 891, 419 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 792, 364 + xy: 695, 339 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-middle rotate: false - xy: 497, 102 + xy: 399, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 497, 102 + xy: 399, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 527, 105 + xy: 811, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 476, 72 + xy: 808, 345 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 371, 107 + xy: 700, 409 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cross-3 rotate: false - xy: 151, 104 + xy: 921, 487 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 cross-4 rotate: false - xy: 763, 453 + xy: 233, 135 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 enemyspawn rotate: false - xy: 496, 72 + xy: 260, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 nuclearreactor-shadow rotate: false - xy: 572, 252 + xy: 602, 252 size: 26, 26 orig: 26, 26 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 185, 48 + xy: 845, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 827, 433 + xy: 356, 37 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 rubble-1-0 rotate: false - xy: 574, 182 + xy: 790, 345 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 592, 182 + xy: 466, 184 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 610, 182 + xy: 463, 166 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 502, 173 + xy: 263, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-3-0 rotate: false - xy: 397, 143 + xy: 193, 104 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rubble-3-1 rotate: false - xy: 397, 143 + xy: 193, 104 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shadow-1 rotate: false - xy: 839, 433 + xy: 368, 37 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-2 rotate: false - xy: 234, 175 + xy: 466, 202 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 shadow-3 rotate: false - xy: 600, 252 + xy: 789, 485 size: 26, 26 orig: 26, 26 offset: 0, 0 @@ -1105,1078 +1105,1078 @@ shadow-5 index: -1 shadow-round-1 rotate: false - xy: 851, 433 + xy: 380, 37 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 battery rotate: false - xy: 1015, 475 + xy: 1015, 467 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 batterylarge rotate: false - xy: 119, 1 + xy: 656, 357 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 combustiongenerator rotate: false - xy: 537, 135 + xy: 481, 174 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustiongenerator-top rotate: false - xy: 517, 105 + xy: 409, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 fusionreactor rotate: false - xy: 806, 479 + xy: 271, 161 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusionreactor-bottom rotate: false - xy: 840, 479 + xy: 305, 161 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusionreactor-light rotate: false - xy: 874, 479 + xy: 339, 161 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusionreactor-plasma-0 rotate: false - xy: 908, 479 + xy: 373, 161 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusionreactor-plasma-1 rotate: false - xy: 942, 479 + xy: 267, 127 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusionreactor-plasma-2 rotate: false - xy: 976, 479 + xy: 301, 127 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusionreactor-plasma-3 rotate: false - xy: 489, 209 + xy: 335, 127 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusionreactor-top rotate: false - xy: 523, 209 + xy: 369, 127 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 largesolarpanel rotate: false - xy: 203, 104 + xy: 973, 487 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquidcombustiongenerator rotate: false - xy: 145, 36 + xy: 885, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 nuclearreactor rotate: false - xy: 436, 170 + xy: 773, 451 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nuclearreactor-center rotate: false - xy: 241, 143 + xy: 616, 284 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nuclearreactor-lights rotate: false - xy: 267, 143 + xy: 785, 425 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 165, 18 + xy: 875, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powernode rotate: false - xy: 175, 28 + xy: 885, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powernodelarge rotate: false - xy: 479, 134 + xy: 772, 354 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powernodelarge-shadow rotate: false - xy: 131, 110 + xy: 86, 43 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 powervoid rotate: false - xy: 185, 38 + xy: 895, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator rotate: false - xy: 205, 28 + xy: 821, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator-top rotate: false - xy: 215, 38 + xy: 821, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldgenerator rotate: false - xy: 225, 32 + xy: 854, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldprojector rotate: false - xy: 520, 173 + xy: 281, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 solarpanel rotate: false - xy: 235, 5 + xy: 994, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 teleporter rotate: false - xy: 241, 117 + xy: 162, 78 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 teleporter-top rotate: false - xy: 293, 117 + xy: 162, 52 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thermalgenerator rotate: false - xy: 275, 5 + xy: 851, 419 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 alloysmelter rotate: false - xy: 572, 280 + xy: 1015, 477 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 biomattercompressor rotate: false - xy: 371, 125 + xy: 131, 108 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame0 rotate: false - xy: 389, 125 + xy: 149, 108 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame1 rotate: false - xy: 407, 125 + xy: 214, 86 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame2 rotate: false - xy: 423, 151 + xy: 214, 68 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-liquid rotate: false - xy: 441, 152 + xy: 214, 50 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-top rotate: false - xy: 616, 292 + xy: 245, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 centrifuge rotate: false - xy: 755, 430 + xy: 232, 50 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 centrifuge-liquid rotate: false - xy: 773, 435 + xy: 682, 407 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 389, 107 + xy: 700, 391 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 407, 107 + xy: 700, 373 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 425, 133 + xy: 718, 396 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator rotate: false - xy: 425, 115 + xy: 736, 396 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 443, 134 + xy: 718, 378 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 443, 116 + xy: 754, 396 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 extractor rotate: false - xy: 446, 61 + xy: 259, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 fluxpump rotate: false - xy: 456, 62 + xy: 259, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 857, 423 + xy: 439, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill rotate: false - xy: 897, 424 + xy: 449, 36 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill-rotator rotate: false - xy: 907, 424 + xy: 459, 36 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill-rotator rotate: false - xy: 907, 424 + xy: 459, 36 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill-top rotate: false - xy: 917, 424 + xy: 449, 26 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 516, 75 + xy: 504, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 506, 55 + xy: 514, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserdrill rotate: false - xy: 713, 330 + xy: 131, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laserdrill-rotator rotate: false - xy: 466, 184 + xy: 156, 34 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laserdrill-top rotate: false - xy: 462, 166 + xy: 174, 34 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 526, 45 + xy: 845, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 155, 48 + xy: 945, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 175, 58 + xy: 955, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 nucleardrill rotate: false - xy: 332, 169 + xy: 583, 224 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nucleardrill-rim rotate: false - xy: 358, 169 + xy: 583, 198 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nucleardrill-rotator rotate: false - xy: 384, 169 + xy: 609, 226 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nucleardrill-top rotate: false - xy: 410, 169 + xy: 609, 200 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilextractor rotate: false - xy: 293, 143 + xy: 785, 399 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilextractor-liquid rotate: false - xy: 319, 143 + xy: 136, 82 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilextractor-rotator rotate: false - xy: 345, 143 + xy: 136, 56 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilextractor-top rotate: false - xy: 371, 143 + xy: 167, 104 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 165, 28 + xy: 825, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 plasmadrill rotate: false - xy: 721, 414 + xy: 489, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasmadrill-rim rotate: false - xy: 797, 445 + xy: 523, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasmadrill-rotator rotate: false - xy: 831, 445 + xy: 721, 414 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasmadrill-top rotate: false - xy: 865, 445 + xy: 403, 127 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasticformer rotate: false - xy: 502, 191 + xy: 228, 32 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plasticformer-top rotate: false - xy: 520, 191 + xy: 209, 14 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter rotate: false - xy: 538, 191 + xy: 227, 14 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter-top rotate: false - xy: 556, 183 + xy: 772, 372 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powersmelter rotate: false - xy: 479, 116 + xy: 790, 381 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powersmelter-top rotate: false - xy: 479, 98 + xy: 790, 363 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 siliconsmelter-top rotate: false - xy: 479, 98 + xy: 790, 363 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 165, 8 + xy: 925, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 175, 18 + xy: 935, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump rotate: false - xy: 185, 28 + xy: 945, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill rotate: false - xy: 195, 38 + xy: 955, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill-rotator rotate: false - xy: 205, 48 + xy: 965, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill-top rotate: false - xy: 175, 8 + xy: 975, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 225, 52 + xy: 834, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 225, 42 + xy: 844, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconextractor rotate: false - xy: 245, 45 + xy: 914, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconsmelter rotate: false - xy: 538, 173 + xy: 299, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 smelter rotate: false - xy: 235, 25 + xy: 924, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill rotate: false - xy: 265, 25 + xy: 828, 357 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill-rotator rotate: false - xy: 275, 35 + xy: 828, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill-top rotate: false - xy: 285, 45 + xy: 832, 337 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stonedrill rotate: false - xy: 285, 25 + xy: 851, 429 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 295, 35 + xy: 841, 419 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill rotate: false - xy: 305, 25 + xy: 871, 419 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill-top rotate: false - xy: 315, 35 + xy: 861, 409 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 waterextractor rotate: false - xy: 592, 164 + xy: 353, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-liquid rotate: false - xy: 610, 164 + xy: 371, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-rotator rotate: false - xy: 501, 155 + xy: 389, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-top rotate: false - xy: 519, 155 + xy: 407, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-1 rotate: false - xy: 497, 112 + xy: 414, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-2 rotate: false - xy: 634, 298 + xy: 232, 86 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-2-top rotate: false - xy: 652, 302 + xy: 232, 68 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-3 rotate: false - xy: 583, 226 + xy: 817, 487 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-3-top rotate: false - xy: 583, 200 + xy: 843, 487 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 chainturret rotate: false - xy: 762, 396 + xy: 682, 389 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 doubleturret rotate: false - xy: 537, 95 + xy: 707, 329 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 flakturret rotate: false - xy: 154, 86 + xy: 700, 355 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flakturret-heat rotate: false - xy: 172, 86 + xy: 718, 360 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flakturret-panel-left rotate: false - xy: 190, 86 + xy: 736, 360 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flakturret-panel-right rotate: false - xy: 208, 86 + xy: 754, 360 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flameturret rotate: false - xy: 107, 13 + xy: 245, 105 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 flameturret-shoot rotate: false - xy: 107, 1 + xy: 772, 402 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 fornaxcannon rotate: false - xy: 177, 104 + xy: 947, 487 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 gatlingturret rotate: false - xy: 616, 280 + xy: 772, 390 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 gatlingturret-heat rotate: false - xy: 229, 106 + xy: 425, 115 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 laserturret rotate: false - xy: 664, 290 + xy: 296, 37 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 laserturret-heat rotate: false - xy: 676, 290 + xy: 308, 37 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 liquidturret rotate: false - xy: 461, 134 + xy: 192, 34 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquidturret-liquid rotate: false - xy: 461, 116 + xy: 155, 16 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 megarepairturret rotate: false - xy: 461, 98 + xy: 173, 16 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 missileturret rotate: false - xy: 480, 166 + xy: 191, 16 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 railgunturret rotate: false - xy: 791, 433 + xy: 320, 37 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 railgunturret-heat rotate: false - xy: 803, 433 + xy: 332, 37 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 repairturret rotate: false - xy: 815, 433 + xy: 344, 37 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 teslaturret rotate: false - xy: 863, 433 + xy: 392, 37 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 teslaturret-heat rotate: false - xy: 875, 433 + xy: 272, 25 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 titancannon rotate: false - xy: 319, 117 + xy: 188, 52 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 flierfactory rotate: false - xy: 154, 68 + xy: 677, 335 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory rotate: false - xy: 154, 68 + xy: 677, 335 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flierfactory-top rotate: false - xy: 172, 68 + xy: 677, 317 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory-top rotate: false - xy: 172, 68 + xy: 677, 317 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flierfactory-top-open rotate: false - xy: 190, 68 + xy: 799, 467 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory-top-open rotate: false - xy: 190, 68 + xy: 799, 467 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 repairpoint rotate: false - xy: 185, 18 + xy: 985, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 repairpoint-turret rotate: false - xy: 195, 28 + xy: 995, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 resupplypoint rotate: false - xy: 205, 38 + xy: 1005, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 compositewall rotate: false - xy: 527, 115 + xy: 811, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 517, 95 + xy: 609, 190 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door-large rotate: false - xy: 425, 97 + xy: 736, 378 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 443, 98 + xy: 754, 378 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 527, 95 + xy: 619, 190 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall rotate: false - xy: 496, 82 + xy: 707, 319 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall-large rotate: false - xy: 136, 78 + xy: 682, 353 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ironwall rotate: false - xy: 927, 424 + xy: 459, 26 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall rotate: false - xy: 255, 5 + xy: 832, 327 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall-large rotate: false - xy: 556, 165 + xy: 317, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 stonewall rotate: false - xy: 305, 45 + xy: 861, 429 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumshieldwall rotate: false - xy: 325, 45 + xy: 851, 399 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall rotate: false - xy: 295, 5 + xy: 841, 389 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall-large rotate: false - xy: 574, 164 + xy: 335, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2190,7 +2190,7 @@ beam index: -1 beam-end rotate: false - xy: 67, 1 + xy: 566, 290 size: 18, 18 orig: 18, 18 offset: 0, 0 @@ -2204,196 +2204,196 @@ blank index: -1 bullet rotate: false - xy: 887, 434 + xy: 284, 26 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 bullet-back rotate: false - xy: 898, 434 + xy: 295, 26 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 casing rotate: false - xy: 582, 284 + xy: 267, 163 size: 2, 4 orig: 2, 4 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 572, 243 + xy: 707, 310 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 laser rotate: false - xy: 367, 103 + xy: 811, 437 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 laser-end rotate: false - xy: 87, 1 + xy: 769, 493 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 laserfull rotate: false - xy: 566, 290 + xy: 66, 43 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 shell rotate: false - xy: 909, 434 + xy: 306, 26 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shell-back rotate: false - xy: 920, 434 + xy: 317, 26 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shot rotate: false - xy: 225, 2 + xy: 884, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 transfer rotate: false - xy: 498, 170 + xy: 808, 385 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 305, 15 + xy: 891, 429 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 transfer-end rotate: false - xy: 466, 202 + xy: 106, 43 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 937, 424 + xy: 485, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 947, 425 + xy: 487, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-densealloy rotate: false - xy: 957, 425 + xy: 487, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-iron rotate: false - xy: 967, 425 + xy: 477, 90 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 977, 425 + xy: 487, 84 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastic rotate: false - xy: 987, 427 + xy: 484, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-rdx rotate: false - xy: 997, 427 + xy: 494, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 507, 85 + xy: 504, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 517, 85 + xy: 514, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-steel rotate: false - xy: 527, 85 + xy: 524, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 537, 85 + xy: 534, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 506, 75 + xy: 544, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 506, 65 + xy: 494, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 standard-mech rotate: false - xy: 764, 364 + xy: 653, 210 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-ship rotate: false - xy: 778, 364 + xy: 653, 196 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -2442,7 +2442,7 @@ shape-7 index: -1 border rotate: false - xy: 110, 65 + xy: 656, 383 size: 24, 40 split: 5, 5, 5, 10 orig: 24, 40 @@ -2450,7 +2450,7 @@ border index: -1 button rotate: false - xy: 557, 201 + xy: 207, 130 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -2458,7 +2458,7 @@ button index: -1 button-down rotate: false - xy: 215, 130 + xy: 721, 448 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -2466,7 +2466,7 @@ button-down index: -1 button-over rotate: false - xy: 215, 130 + xy: 721, 448 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -2474,7 +2474,7 @@ button-over index: -1 button-map rotate: false - xy: 989, 437 + xy: 181, 130 size: 24, 40 split: 10, 10, 5, 10 orig: 24, 40 @@ -2482,7 +2482,7 @@ button-map index: -1 button-map-down rotate: false - xy: 680, 383 + xy: 155, 130 size: 24, 40 split: 10, 10, 5, 10 orig: 24, 40 @@ -2490,7 +2490,7 @@ button-map-down index: -1 button-map-over rotate: false - xy: 680, 383 + xy: 155, 130 size: 24, 40 split: 10, 10, 5, 10 orig: 24, 40 @@ -2498,7 +2498,7 @@ button-map-over index: -1 button-select rotate: false - xy: 609, 226 + xy: 869, 487 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -2513,35 +2513,35 @@ check-off index: -1 check-on rotate: false - xy: 899, 445 + xy: 755, 414 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-on-over rotate: false - xy: 929, 445 + xy: 407, 161 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-over rotate: false - xy: 959, 445 + xy: 437, 124 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 clear rotate: false - xy: 229, 118 + xy: 126, 43 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 cursor rotate: false - xy: 627, 310 + xy: 257, 111 size: 4, 4 orig: 4, 4 offset: 0, 0 @@ -2562,644 +2562,623 @@ discord-banner-over index: -1 controller-cursor rotate: false - xy: 762, 378 + xy: 682, 371 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-about rotate: false - xy: 656, 363 + xy: 67, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-add rotate: false - xy: 755, 414 + xy: 83, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin rotate: false - xy: 771, 414 + xy: 99, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin-small rotate: false - xy: 797, 479 + xy: 789, 477 size: 6, 6 orig: 6, 6 offset: 0, 0 index: -1 icon-areaDelete rotate: false - xy: 136, 66 + xy: 425, 103 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow rotate: false - xy: 672, 363 + xy: 773, 477 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 724, 372 + xy: 205, 2 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 706, 415 + xy: 217, 2 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 229, 94 + xy: 229, 2 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 635, 156 + xy: 760, 348 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 208, 68 + xy: 817, 469 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 555, 149 + xy: 115, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 571, 148 + xy: 799, 451 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 635, 144 + xy: 760, 336 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 587, 148 + xy: 455, 108 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -icon-close - rotate: false - xy: 131, 130 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -icon-close-down - rotate: false - xy: 721, 448 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 -icon-close-over - rotate: false - xy: 173, 130 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 icon-crafting rotate: false - xy: 242, 55 + xy: 695, 327 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 254, 55 + xy: 695, 315 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 266, 55 + xy: 651, 308 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 603, 148 + xy: 467, 150 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 619, 148 + xy: 467, 134 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 278, 55 + xy: 663, 308 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 628, 184 + xy: 250, 89 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 628, 168 + xy: 250, 73 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 628, 276 + xy: 250, 57 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 628, 260 + xy: 266, 93 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 226, 78 + xy: 266, 77 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 242, 83 + xy: 282, 93 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 241, 99 + xy: 835, 469 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 258, 83 + xy: 266, 61 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 274, 83 + xy: 282, 77 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 290, 83 + xy: 298, 93 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-github rotate: false - xy: 306, 83 + xy: 282, 61 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 322, 83 + xy: 298, 77 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 259, 99 + xy: 853, 469 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 290, 55 + xy: 675, 305 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 302, 55 + xy: 266, 49 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 338, 83 + xy: 314, 93 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 354, 83 + xy: 298, 61 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 314, 55 + xy: 278, 49 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 226, 62 + xy: 314, 77 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 847, 423 + xy: 442, 56 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-line rotate: false - xy: 277, 99 + xy: 871, 469 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 242, 67 + xy: 330, 93 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 326, 55 + xy: 290, 49 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 258, 67 + xy: 314, 61 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 295, 99 + xy: 889, 469 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 313, 99 + xy: 907, 469 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 331, 99 + xy: 925, 469 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 338, 55 + xy: 302, 49 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 350, 55 + xy: 314, 49 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 349, 99 + xy: 943, 469 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-none rotate: false - xy: 731, 323 + xy: 326, 49 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 743, 323 + xy: 338, 49 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 670, 302 + xy: 961, 469 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 274, 67 + xy: 330, 77 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 780, 396 + xy: 979, 469 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 759, 351 + xy: 350, 49 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 290, 67 + xy: 346, 93 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 759, 339 + xy: 362, 49 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 771, 352 + xy: 374, 49 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 771, 340 + xy: 386, 49 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 306, 67 + xy: 330, 61 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 780, 378 + xy: 997, 469 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 322, 67 + xy: 346, 77 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 338, 67 + xy: 362, 93 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 688, 365 + xy: 630, 266 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 354, 67 + xy: 346, 61 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 370, 91 + xy: 362, 77 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 386, 91 + xy: 378, 93 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 370, 75 + xy: 362, 61 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 402, 91 + xy: 378, 77 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 706, 366 + xy: 635, 234 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 677, 345 + xy: 635, 216 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 783, 352 + xy: 398, 49 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 677, 327 + xy: 635, 198 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 386, 75 + xy: 394, 93 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 783, 340 + xy: 410, 51 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 795, 352 + xy: 260, 31 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 402, 75 + xy: 378, 61 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 695, 347 + xy: 119, 25 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 418, 81 + xy: 394, 77 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 434, 81 + xy: 394, 61 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 695, 329 + xy: 138, 38 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 795, 340 + xy: 272, 37 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 652, 290 + xy: 284, 37 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 450, 82 + xy: 410, 79 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 713, 348 + xy: 137, 20 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 466, 82 + xy: 410, 63 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -3213,7 +3192,7 @@ logotext index: -1 pane rotate: false - xy: 119, 27 + xy: 557, 205 size: 24, 36 split: 10, 10, 5, 5 orig: 24, 36 @@ -3221,7 +3200,7 @@ pane index: -1 pane-button rotate: false - xy: 93, 25 + xy: 437, 158 size: 24, 36 split: 10, 10, 5, 5 orig: 24, 36 @@ -3229,7 +3208,7 @@ pane-button index: -1 scroll rotate: false - xy: 736, 377 + xy: 651, 320 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -3237,7 +3216,7 @@ scroll index: -1 scroll-horizontal rotate: false - xy: 769, 487 + xy: 234, 169 size: 35, 24 split: 6, 5, 10, 10 orig: 35, 24 @@ -3254,7 +3233,7 @@ scroll-knob-horizontal index: -1 scroll-knob-vertical rotate: false - xy: 67, 21 + xy: 110, 65 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -3262,7 +3241,7 @@ scroll-knob-vertical index: -1 scroll-knob-vertical-black rotate: false - xy: 651, 320 + xy: 747, 448 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -3270,7 +3249,7 @@ scroll-knob-vertical-black index: -1 selection rotate: false - xy: 763, 487 + xy: 769, 490 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -3284,28 +3263,28 @@ slider index: -1 slider-knob rotate: false - xy: 627, 316 + xy: 131, 126 size: 22, 44 orig: 22, 44 offset: 0, 0 index: -1 slider-knob-down rotate: false - xy: 656, 379 + xy: 627, 316 size: 22, 44 orig: 22, 44 offset: 0, 0 index: -1 slider-knob-over rotate: false - xy: 656, 379 + xy: 627, 316 size: 22, 44 orig: 22, 44 offset: 0, 0 index: -1 slider-vertical rotate: false - xy: 234, 172 + xy: 773, 448 size: 8, 1 orig: 8, 1 offset: 0, 0 @@ -3333,7 +3312,7 @@ text-sides-over index: -1 textfield rotate: false - xy: 586, 280 + xy: 572, 250 size: 28, 28 split: 6, 6, 6, 6 orig: 28, 28 @@ -3341,7 +3320,7 @@ textfield index: -1 textfield-over rotate: false - xy: 706, 384 + xy: 586, 280 size: 28, 28 split: 2, 2, 2, 2 orig: 28, 28 @@ -3349,7 +3328,7 @@ textfield-over index: -1 white rotate: false - xy: 1, 1 + xy: 651, 357 size: 3, 3 orig: 3, 3 offset: 0, 0 @@ -3372,147 +3351,147 @@ window-empty index: -1 drone rotate: false - xy: 136, 96 + xy: 149, 2 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout rotate: false - xy: 398, 61 + xy: 245, 15 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-base rotate: false - xy: 418, 67 + xy: 245, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-mech-base rotate: false - xy: 418, 67 + xy: 245, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-leg rotate: false - xy: 432, 67 + xy: 471, 110 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-mech-leg rotate: false - xy: 432, 67 + xy: 471, 110 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol rotate: false - xy: 731, 335 + xy: 732, 346 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol-booster-1 rotate: false - xy: 745, 349 + xy: 746, 346 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol-booster-2 rotate: false - xy: 745, 335 + xy: 772, 340 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol-flame rotate: false - xy: 931, 434 + xy: 328, 26 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 beam-equip rotate: false - xy: 1015, 465 + xy: 572, 280 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster rotate: false - xy: 497, 132 + xy: 389, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 497, 122 + xy: 404, 39 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun rotate: false - xy: 517, 125 + xy: 437, 96 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun-equip rotate: false - xy: 527, 135 + xy: 447, 96 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun rotate: false - xy: 225, 22 + xy: 864, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 225, 12 + xy: 874, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster rotate: false - xy: 315, 25 + xy: 881, 419 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 325, 35 + xy: 871, 409 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan rotate: false - xy: 305, 5 + xy: 851, 389 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan-equip rotate: false - xy: 315, 15 + xy: 901, 429 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 6f3d6d71ca..430d838fdc 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 02946c88b5..e29ff08000 100644 --- a/core/assets/ui/uiskin.json +++ b/core/assets/ui/uiskin.json @@ -65,8 +65,7 @@ io.anuke.ucore.scene.ui.ImageButton$ImageButtonStyle: { static-down: {up: button-down }, toggle: {checked: button-down, down: button-down, up: button, imageDisabledColor: lightgray, imageUpColor: white }, togglemap: {down: button-map-down, up: button-map }, - select: {checked: button-select, up: clear }, - close-window: {up: button, imageUp: icon-close, imageOver: icon-close-over, imageDown: icon-close-down, disabled: button } + select: {checked: button-select, up: clear } }, io.anuke.ucore.scene.ui.ScrollPane$ScrollPaneStyle: { default: {background: border, vScroll: scroll, vScrollKnob: scroll-knob-vertical}, diff --git a/core/src/io/anuke/mindustry/core/Logic.java b/core/src/io/anuke/mindustry/core/Logic.java index a4212bea16..510cf8938d 100644 --- a/core/src/io/anuke/mindustry/core/Logic.java +++ b/core/src/io/anuke/mindustry/core/Logic.java @@ -1,8 +1,11 @@ package io.anuke.mindustry.core; +import com.badlogic.gdx.math.Vector2; +import io.anuke.mindustry.content.AmmoTypes; +import io.anuke.mindustry.content.UnitTypes; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.entities.TileEntity; -import io.anuke.mindustry.game.EventType.GameOverEvent; +import io.anuke.mindustry.entities.units.BaseUnit; import io.anuke.mindustry.game.EventType.PlayEvent; import io.anuke.mindustry.game.EventType.ResetEvent; import io.anuke.mindustry.game.EventType.WaveEvent; @@ -10,7 +13,6 @@ import io.anuke.mindustry.game.Team; import io.anuke.mindustry.game.TeamInfo; import io.anuke.mindustry.game.TeamInfo.TeamData; import io.anuke.mindustry.net.Net; -import io.anuke.mindustry.net.NetEvents; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.world.Tile; import io.anuke.ucore.core.Events; @@ -75,6 +77,13 @@ public class Logic extends Module { public void runWave(){ //TODO spawn enemies + for(int i = 0; i < 10; i ++){ + BaseUnit unit = new BaseUnit(UnitTypes.vtol, Team.red); + Vector2 offset = new Vector2().setToRandomDirection().scl(world.width()/2f*tilesize).add(world.width()/2f*tilesize, world.height()/2f*tilesize); + unit.inventory.addAmmo(AmmoTypes.basicIron); + unit.inventory.setInfiniteAmmo(true); + unit.set(offset.x, offset.y).add(); + } state.wave ++; state.wavetime = wavespace * state.difficulty.timeScaling; @@ -104,11 +113,11 @@ public class Logic extends Module { } } - if(gameOver && !state.gameOver){ //TODO better gameover state, victory state? + /* if(gameOver && !state.gameOver){ //TODO better gameover state, victory state? state.gameOver = true; if(Net.server()) NetEvents.handleGameOver(); Events.fire(GameOverEvent.class); - } + }*/ if(!state.is(State.paused) || Net.active()){ diff --git a/core/src/io/anuke/mindustry/editor/MapResizeDialog.java b/core/src/io/anuke/mindustry/editor/MapResizeDialog.java index 70e56ed3ce..3daebbd825 100644 --- a/core/src/io/anuke/mindustry/editor/MapResizeDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapResizeDialog.java @@ -6,6 +6,7 @@ import io.anuke.ucore.function.BiConsumer; import io.anuke.ucore.scene.ui.ButtonGroup; import io.anuke.ucore.scene.ui.TextButton; import io.anuke.ucore.scene.ui.layout.Table; +import io.anuke.ucore.util.Mathf; public class MapResizeDialog extends FloatingDialog{ int[] validMapSizes = {200, 300, 400, 500}; @@ -21,14 +22,14 @@ public class MapResizeDialog extends FloatingDialog{ Table table = new Table(); - for(int d = 0; d < 2; d ++){ - boolean w = d == 0; - int curr = d == 0 ? data.width() : data.height(); + for(boolean w : Mathf.booleans){ + int curr = w ? data.width() : data.height(); int idx = 0; - for(int i = 0; i < validMapSizes.length; i ++) - if(validMapSizes[i] == curr) idx = i; + for(int i = 0; i < validMapSizes.length; i ++) { + if (validMapSizes[i] == curr) idx = i; + } - table.add(d == 0 ? "$text.width": "$text.height").padRight(8f); + table.add(w ? "$text.width": "$text.height").padRight(8f); ButtonGroup group = new ButtonGroup<>(); for(int i = 0; i < validMapSizes.length; i ++){ int size = validMapSizes[i]; diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java index 094a9df869..e5c463a5e0 100644 --- a/core/src/io/anuke/mindustry/entities/Player.java +++ b/core/src/io/anuke/mindustry/entities/Player.java @@ -92,7 +92,6 @@ public class Player extends Unit implements BlockBuilder { @Override public void damage(float amount){ - //if(debug || mech.flying) return; hitTime = hitDuration; if(!debug) { health -= amount; @@ -111,6 +110,7 @@ public class Player extends Unit implements BlockBuilder { @Override public void onDeath(){ dead = true; + placeQueue.clear(); if(Net.active()){ NetEvents.handleUnitDeath(this); } @@ -215,7 +215,7 @@ public class Player extends Unit implements BlockBuilder { @Override public void drawOver(){ - if(!isShooting() && getCurrentRequest() != null) { + if(!isShooting() && getCurrentRequest() != null && !dead) { drawBuilding(this); } } diff --git a/core/src/io/anuke/mindustry/entities/UnitInventory.java b/core/src/io/anuke/mindustry/entities/UnitInventory.java index 807c2fdcac..0c0cc02f04 100644 --- a/core/src/io/anuke/mindustry/entities/UnitInventory.java +++ b/core/src/io/anuke/mindustry/entities/UnitInventory.java @@ -15,12 +15,17 @@ public class UnitInventory { private int totalAmmo; private ItemStack item; private int capacity, ammoCapacity; + private boolean infiniteAmmo; public UnitInventory(int capacity, int ammoCapacity) { this.capacity = capacity; this.ammoCapacity = ammoCapacity; } + public void setInfiniteAmmo(boolean infinite){ + infiniteAmmo = infinite; + } + public void write(DataOutputStream stream) throws IOException { stream.writeInt(item == null ? 0 : item.amount); stream.writeByte(item == null ? 0 : item.item.id); @@ -57,6 +62,7 @@ public class UnitInventory { } public void useAmmo(){ + if(infiniteAmmo) return; AmmoEntry entry = ammos.peek(); entry.amount --; if(entry.amount == 0) ammos.pop(); diff --git a/core/src/io/anuke/mindustry/entities/units/FlyingUnitType.java b/core/src/io/anuke/mindustry/entities/units/FlyingUnitType.java index 87671cb61d..84c276f1a4 100644 --- a/core/src/io/anuke/mindustry/entities/units/FlyingUnitType.java +++ b/core/src/io/anuke/mindustry/entities/units/FlyingUnitType.java @@ -52,6 +52,12 @@ public class FlyingUnitType extends UnitType { } } + + @Override + public UnitState getStartState(){ + return attack; + } + protected void circle(BaseUnit unit, float circleLength){ vec.set(unit.target.x - unit.x, unit.target.y - unit.y); diff --git a/core/src/io/anuke/mindustry/entities/units/types/Vtol.java b/core/src/io/anuke/mindustry/entities/units/types/Vtol.java index 7e057a8a39..f143f12100 100644 --- a/core/src/io/anuke/mindustry/entities/units/types/Vtol.java +++ b/core/src/io/anuke/mindustry/entities/units/types/Vtol.java @@ -5,7 +5,6 @@ import io.anuke.mindustry.content.fx.UnitFx; import io.anuke.mindustry.entities.Unit; import io.anuke.mindustry.entities.units.BaseUnit; import io.anuke.mindustry.entities.units.FlyingUnitType; -import io.anuke.mindustry.entities.units.UnitState; import io.anuke.mindustry.graphics.Palette; import io.anuke.ucore.core.Timers; import io.anuke.ucore.graphics.Draw; @@ -66,9 +65,4 @@ public class Vtol extends FlyingUnitType { } } - @Override - public UnitState getStartState(){ - return resupply; - } - } diff --git a/core/src/io/anuke/mindustry/input/DesktopInput.java b/core/src/io/anuke/mindustry/input/DesktopInput.java index 9f33d4a0a1..73e7d025ee 100644 --- a/core/src/io/anuke/mindustry/input/DesktopInput.java +++ b/core/src/io/anuke/mindustry/input/DesktopInput.java @@ -20,6 +20,7 @@ import static io.anuke.mindustry.Vars.*; public class DesktopInput extends InputHandler{ float mousex, mousey; float endx, endy; + float prmousex, prmousey; private float controlx, controly; private boolean beganBreak; private boolean controlling; @@ -34,8 +35,8 @@ public class DesktopInput extends InputHandler{ @Override public float getCursorEndX(){ return endx; } @Override public float getCursorEndY(){ return endy; } - @Override public float getCursorX(){ return Graphics.screen(mousex, mousey).x; } - @Override public float getCursorY(){ return Gdx.graphics.getHeight() - 1 - Graphics.screen(mousex, mousey).y; } + @Override public float getCursorX(){ return prmousex; } + @Override public float getCursorY(){ return prmousey; } @Override public boolean drawPlace(){ return !beganBreak; } @Override @@ -82,6 +83,9 @@ public class DesktopInput extends InputHandler{ endx = getMouseX(); endy = getMouseY(); + prmousex = Graphics.screen(mousex, mousey).x; + prmousey = Gdx.graphics.getHeight() - 1 - Graphics.screen(mousex, mousey).y; + boolean controller = KeyBinds.getSection(section).device.type == DeviceType.controller; if(Inputs.getAxisActive("zoom") && (Inputs.keyDown(section,"zoom_hold") || controller)