diff --git a/core/assets-raw/sprites/blocks/extra/rubble-3-1.png b/core/assets-raw/sprites/blocks/extra/rubble-3-1.png new file mode 100644 index 0000000000..0139756e6a Binary files /dev/null and b/core/assets-raw/sprites/blocks/extra/rubble-3-1.png differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 6bc0b272cf..247b88f245 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,98 +13,98 @@ background index: -1 bridgeconduit rotate: false - xy: 904, 411 + xy: 602, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconduit-arrow rotate: false - xy: 914, 411 + xy: 612, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconduit-bridge rotate: false - xy: 924, 411 + xy: 622, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconduit-end rotate: false - xy: 934, 411 + xy: 632, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor rotate: false - xy: 944, 411 + xy: 642, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-arrow rotate: false - xy: 954, 411 + xy: 882, 415 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-bridge rotate: false - xy: 964, 411 + xy: 892, 416 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-end rotate: false - xy: 974, 411 + xy: 882, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 661, 310 + xy: 644, 260 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top rotate: false - xy: 795, 298 + xy: 664, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduittunnel rotate: false - xy: 255, 120 + xy: 674, 297 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 255, 110 + xy: 664, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyormove rotate: false - xy: 265, 123 + xy: 674, 287 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyortunnel rotate: false - xy: 265, 113 + xy: 684, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -118,294 +118,294 @@ core index: -1 junction rotate: false - xy: 376, 96 + xy: 360, 69 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit rotate: false - xy: 382, 86 + xy: 874, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-arrow rotate: false - xy: 386, 96 + xy: 498, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-bridge rotate: false - xy: 392, 86 + xy: 508, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-end rotate: false - xy: 396, 96 + xy: 518, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor rotate: false - xy: 402, 86 + xy: 528, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-arrow rotate: false - xy: 406, 96 + xy: 538, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-bridge rotate: false - xy: 412, 86 + xy: 590, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-end rotate: false - xy: 416, 96 + xy: 600, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 452, 86 + xy: 648, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 462, 86 + xy: 658, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-bottom rotate: false - xy: 771, 286 + xy: 668, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-liquid rotate: false - xy: 781, 286 + xy: 648, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-top rotate: false - xy: 791, 286 + xy: 658, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidtank-bottom rotate: false - xy: 136, 78 + xy: 254, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquidtank-liquid rotate: false - xy: 162, 78 + xy: 280, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquidtank-top rotate: false - xy: 188, 78 + xy: 306, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 multiplexer rotate: false - xy: 780, 396 + xy: 315, 107 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 overflowgate rotate: false - xy: 331, 76 + xy: 724, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyor rotate: false - xy: 321, 56 + xy: 244, 52 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyormove rotate: false - xy: 331, 66 + xy: 254, 57 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-bottom rotate: false - xy: 331, 56 + xy: 294, 57 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-top rotate: false - xy: 341, 66 + xy: 304, 57 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 321, 26 + xy: 284, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 381, 46 + xy: 568, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 391, 56 + xy: 578, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 411, 76 + xy: 568, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyor rotate: false - xy: 371, 26 + xy: 578, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyormove rotate: false - xy: 381, 36 + xy: 588, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 teleporter-top rotate: false - xy: 252, 169 + xy: 345, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 unloader rotate: false - xy: 451, 66 + xy: 374, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vault rotate: false - xy: 330, 169 + xy: 824, 397 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 vault-icon rotate: false - xy: 461, 76 + xy: 141, 26 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 weaponfactory rotate: false - xy: 293, 24 + xy: 170, 68 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blackrock1 rotate: false - xy: 1015, 445 + xy: 1015, 455 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackrockshadow1 rotate: false - xy: 1015, 435 + xy: 421, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 266, 96 + xy: 431, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 276, 96 + xy: 124, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 286, 96 + xy: 488, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock1 rotate: false - xy: 296, 96 + xy: 502, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock2 rotate: false - xy: 844, 411 + xy: 512, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock3 rotate: false - xy: 854, 411 + xy: 522, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -419,574 +419,574 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 713, 309 + xy: 654, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 302, 86 + xy: 644, 290 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 306, 96 + xy: 644, 280 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 275, 113 + xy: 674, 277 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 285, 123 + xy: 694, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 285, 113 + xy: 684, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 295, 123 + xy: 664, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 628, 252 + xy: 1010, 485 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 grass1 rotate: false - xy: 335, 123 + xy: 134, 36 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 335, 113 + xy: 131, 26 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 345, 113 + xy: 131, 16 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock1 rotate: false - xy: 355, 113 + xy: 131, 6 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock2 rotate: false - xy: 365, 113 + xy: 654, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 642, 252 + xy: 670, 307 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice1 rotate: false - xy: 375, 113 + xy: 664, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 385, 113 + xy: 674, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 395, 113 + xy: 684, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 530, 161 + xy: 252, 93 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 405, 113 + xy: 694, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 415, 113 + xy: 704, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 425, 113 + xy: 714, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 425, 113 + xy: 714, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 979, 423 + xy: 724, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 979, 423 + xy: 724, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron1 rotate: false - xy: 999, 427 + xy: 714, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron2 rotate: false - xy: 312, 86 + xy: 724, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron3 rotate: false - xy: 316, 96 + xy: 724, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 422, 86 + xy: 610, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 757, 363 + xy: 252, 79 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 436, 96 + xy: 630, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 432, 86 + xy: 642, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 446, 96 + xy: 888, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 597, 186 + xy: 647, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 653, 242 + xy: 657, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 653, 232 + xy: 657, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 653, 222 + xy: 667, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 653, 212 + xy: 667, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 311, 76 + xy: 684, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalflooredge rotate: false - xy: 757, 349 + xy: 266, 93 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mossblock rotate: false - xy: 321, 76 + xy: 694, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 311, 66 + xy: 704, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oiledge rotate: false - xy: 757, 335 + xy: 266, 79 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock1 rotate: false - xy: 361, 76 + xy: 264, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock2 rotate: false - xy: 311, 26 + xy: 274, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 351, 56 + xy: 314, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 361, 66 + xy: 324, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 371, 76 + xy: 334, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock1 rotate: false - xy: 331, 26 + xy: 344, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock2 rotate: false - xy: 341, 36 + xy: 354, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock3 rotate: false - xy: 351, 46 + xy: 370, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 757, 321 + xy: 280, 93 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrub rotate: false - xy: 371, 56 + xy: 688, 231 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 381, 66 + xy: 698, 231 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 361, 36 + xy: 697, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 371, 46 + xy: 677, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 381, 56 + xy: 687, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock1 rotate: false - xy: 391, 66 + xy: 697, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock2 rotate: false - xy: 401, 76 + xy: 364, 59 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock3 rotate: false - xy: 361, 26 + xy: 364, 49 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 771, 336 + xy: 308, 93 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 space rotate: false - xy: 401, 66 + xy: 558, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 771, 322 + xy: 308, 79 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone1 rotate: false - xy: 381, 26 + xy: 588, 152 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 391, 36 + xy: 598, 152 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 401, 46 + xy: 608, 152 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock1 rotate: false - xy: 411, 56 + xy: 618, 152 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock2 rotate: false - xy: 421, 66 + xy: 628, 152 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock3 rotate: false - xy: 431, 76 + xy: 708, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 785, 350 + xy: 336, 93 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 431, 66 + xy: 728, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 441, 76 + xy: 707, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 401, 26 + xy: 717, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 411, 36 + xy: 727, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 421, 46 + xy: 707, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 431, 56 + xy: 717, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 441, 46 + xy: 144, 36 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 757, 293 + xy: 364, 93 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-middle rotate: false - xy: 894, 411 + xy: 592, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 894, 411 + xy: 592, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 544, 165 + xy: 654, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 275, 123 + xy: 664, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 410, 177 + xy: 295, 125 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1000,91 +1000,98 @@ cross-3 index: -1 cross-4 rotate: false - xy: 763, 453 + xy: 656, 355 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 enemyspawn rotate: false - xy: 315, 113 + xy: 694, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 nuclearreactor-shadow rotate: false - xy: 572, 252 + xy: 718, 386 size: 26, 26 orig: 26, 26 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 311, 56 + xy: 734, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 967, 421 + xy: 520, 179 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 rubble-1-0 rotate: false - xy: 439, 106 + xy: 502, 191 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 457, 96 + xy: 520, 191 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 600, 252 + xy: 746, 344 size: 26, 26 orig: 26, 26 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 583, 224 + xy: 774, 344 size: 26, 26 orig: 26, 26 offset: 0, 0 index: -1 +rubble-3-1 + rotate: false + xy: 1, 6 + size: 34, 34 + orig: 34, 34 + offset: 0, 0 + index: -1 shadow-1 rotate: false - xy: 798, 409 + xy: 532, 179 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-2 rotate: false - xy: 131, 110 + xy: 234, 175 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 shadow-3 rotate: false - xy: 583, 196 + xy: 909, 451 size: 26, 26 orig: 26, 26 offset: 0, 0 index: -1 shadow-4 rotate: false - xy: 1, 6 + xy: 656, 389 size: 34, 34 orig: 34, 34 offset: 0, 0 @@ -1098,231 +1105,231 @@ shadow-5 index: -1 battery rotate: false - xy: 1015, 475 + xy: 124, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 batterylarge rotate: false - xy: 119, 1 + xy: 937, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 combustiongenerator rotate: false - xy: 637, 194 + xy: 654, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustiongenerator-top rotate: false - xy: 647, 194 + xy: 644, 270 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 fusionreactor rotate: false - xy: 806, 479 + xy: 651, 321 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusionreactor-bottom rotate: false - xy: 840, 479 + xy: 763, 453 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusionreactor-light rotate: false - xy: 874, 479 + xy: 806, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusionreactor-plasma-0 rotate: false - xy: 908, 479 + xy: 840, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusionreactor-plasma-1 rotate: false - xy: 942, 479 + xy: 874, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusionreactor-plasma-2 rotate: false - xy: 976, 479 + xy: 908, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusionreactor-plasma-3 rotate: false - xy: 489, 209 + xy: 942, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusionreactor-top rotate: false - xy: 523, 209 + xy: 976, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 largesolarpanel rotate: false - xy: 616, 284 + xy: 93, 17 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquidcombustiongenerator rotate: false - xy: 442, 86 + xy: 884, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 nuclearreactor rotate: false - xy: 171, 52 + xy: 436, 170 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nuclearreactor-center rotate: false - xy: 171, 26 + xy: 785, 423 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nuclearreactor-lights rotate: false - xy: 197, 52 + xy: 811, 423 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 341, 76 + xy: 264, 57 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powernode rotate: false - xy: 311, 46 + xy: 274, 57 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powernode-shadow rotate: false - xy: 919, 421 + xy: 849, 295 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 powernodelarge rotate: false - xy: 439, 124 + xy: 405, 107 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powernodelarge-shadow rotate: false - xy: 566, 290 + xy: 86, 43 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 powervoid rotate: false - xy: 321, 46 + xy: 284, 57 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator rotate: false - xy: 331, 36 + xy: 294, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator-top rotate: false - xy: 341, 46 + xy: 304, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldgenerator rotate: false - xy: 381, 76 + xy: 678, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldprojector rotate: false - xy: 266, 78 + xy: 538, 191 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 solarpanel rotate: false - xy: 371, 36 + xy: 558, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 teleporter rotate: false - xy: 249, 26 + xy: 319, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 teleporter-top rotate: false - xy: 278, 169 + xy: 371, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thermalgenerator rotate: false - xy: 421, 56 + xy: 718, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 alloysmelter rotate: false - xy: 572, 280 + xy: 852, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 biomattercompressor rotate: false - xy: 234, 177 + xy: 106, 43 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1336,994 +1343,994 @@ biomattercompressor-frame0 index: -1 biomattercompressor-frame1 rotate: false - xy: 145, 8 + xy: 566, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame2 rotate: false - xy: 356, 177 + xy: 798, 379 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-liquid rotate: false - xy: 163, 8 + xy: 837, 431 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-top rotate: false - xy: 374, 177 + xy: 584, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 centrifuge rotate: false - xy: 199, 8 + xy: 834, 379 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 centrifuge-liquid rotate: false - xy: 217, 8 + xy: 241, 125 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 428, 178 + xy: 313, 125 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 446, 178 + xy: 331, 125 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 628, 266 + xy: 349, 125 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator rotate: false - xy: 755, 430 + xy: 367, 125 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 773, 435 + xy: 385, 125 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 762, 396 + xy: 403, 125 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 extractor rotate: false - xy: 325, 123 + xy: 704, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 fluxpump rotate: false - xy: 325, 113 + xy: 704, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 989, 427 + xy: 714, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill rotate: false - xy: 635, 184 + xy: 734, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill-rotator rotate: false - xy: 645, 184 + xy: 734, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill-rotator rotate: false - xy: 645, 184 + xy: 734, 278 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill-top rotate: false - xy: 544, 155 + xy: 734, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 366, 96 + xy: 224, 52 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 372, 86 + xy: 234, 52 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserdrill rotate: false - xy: 367, 141 + xy: 963, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laserdrill-rotator rotate: false - xy: 385, 141 + xy: 981, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laserdrill-top rotate: false - xy: 403, 141 + xy: 999, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 426, 96 + xy: 620, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 577, 186 + xy: 668, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 587, 186 + xy: 647, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 nucleardrill rotate: false - xy: 214, 78 + xy: 332, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nucleardrill-rim rotate: false - xy: 240, 78 + xy: 358, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nucleardrill-rotator rotate: false - xy: 145, 52 + xy: 384, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nucleardrill-top rotate: false - xy: 145, 26 + xy: 410, 169 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilextractor rotate: false - xy: 197, 26 + xy: 798, 397 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilextractor-liquid rotate: false - xy: 223, 52 + xy: 241, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilextractor-rotator rotate: false - xy: 223, 26 + xy: 267, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilextractor-top rotate: false - xy: 249, 52 + xy: 293, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 321, 66 + xy: 714, 248 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 plasmadrill rotate: false - xy: 721, 414 + xy: 685, 317 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasmadrill-rim rotate: false - xy: 797, 445 + xy: 489, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasmadrill-rotator rotate: false - xy: 831, 445 + xy: 523, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasmadrill-top rotate: false - xy: 865, 445 + xy: 721, 414 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasticformer rotate: false - xy: 780, 378 + xy: 333, 107 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plasticformer-top rotate: false - xy: 421, 141 + xy: 351, 107 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter rotate: false - xy: 421, 123 + xy: 369, 107 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter-top rotate: false - xy: 439, 142 + xy: 387, 107 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powersmelter rotate: false - xy: 457, 132 + xy: 466, 186 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powersmelter-top rotate: false - xy: 457, 114 + xy: 484, 191 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 siliconsmelter-top rotate: false - xy: 457, 114 + xy: 484, 191 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 351, 76 + xy: 314, 57 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 311, 36 + xy: 324, 57 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump rotate: false - xy: 321, 36 + xy: 334, 57 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill rotate: false - xy: 331, 46 + xy: 344, 57 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill-rotator rotate: false - xy: 341, 56 + xy: 354, 57 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill-top rotate: false - xy: 351, 66 + xy: 254, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 361, 56 + xy: 548, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 371, 66 + xy: 894, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconextractor rotate: false - xy: 391, 76 + xy: 677, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconsmelter rotate: false - xy: 275, 60 + xy: 556, 187 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 smelter rotate: false - xy: 351, 26 + xy: 687, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill rotate: false - xy: 391, 46 + xy: 598, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill-rotator rotate: false - xy: 401, 56 + xy: 608, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill-top rotate: false - xy: 411, 66 + xy: 618, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stonedrill rotate: false - xy: 391, 26 + xy: 718, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 401, 36 + xy: 728, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill rotate: false - xy: 441, 66 + xy: 727, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill-top rotate: false - xy: 451, 76 + xy: 738, 238 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 waterextractor rotate: false - xy: 271, 6 + xy: 574, 187 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-liquid rotate: false - xy: 284, 78 + xy: 152, 86 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-rotator rotate: false - xy: 293, 60 + xy: 152, 68 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-top rotate: false - xy: 293, 42 + xy: 170, 86 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-1 rotate: false - xy: 884, 411 + xy: 477, 147 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-2 rotate: false - xy: 181, 8 + xy: 816, 379 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-2-top rotate: false - xy: 392, 177 + xy: 602, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-3 rotate: false - xy: 611, 226 + xy: 963, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-3-top rotate: false - xy: 611, 200 + xy: 989, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 chainturret rotate: false - xy: 235, 8 + xy: 259, 125 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 doubleturret rotate: false - xy: 305, 113 + xy: 684, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 flakturret rotate: false - xy: 502, 191 + xy: 572, 256 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flakturret-heat rotate: false - xy: 520, 191 + xy: 590, 274 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flakturret-panel-left rotate: false - xy: 538, 191 + xy: 590, 256 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flakturret-panel-right rotate: false - xy: 556, 183 + xy: 608, 274 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flameturret rotate: false - xy: 107, 1 + xy: 572, 244 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 flameturret-shoot rotate: false - xy: 706, 415 + xy: 850, 397 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 fornaxcannon rotate: false - xy: 229, 104 + xy: 67, 17 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 gatlingturret rotate: false - xy: 771, 296 + xy: 364, 81 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 gatlingturret-heat rotate: false - xy: 783, 296 + xy: 378, 95 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 laserturret rotate: false - xy: 895, 421 + xy: 825, 295 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 laserturret-heat rotate: false - xy: 907, 421 + xy: 837, 295 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 liquidturret rotate: false - xy: 349, 123 + xy: 243, 107 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 liquidturret-liquid rotate: false - xy: 367, 123 + xy: 261, 107 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 megarepairturret rotate: false - xy: 385, 123 + xy: 279, 107 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 missileturret rotate: false - xy: 403, 123 + xy: 297, 107 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 railgunturret rotate: false - xy: 931, 421 + xy: 484, 179 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 railgunturret-heat rotate: false - xy: 943, 421 + xy: 496, 179 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 repairturret rotate: false - xy: 955, 421 + xy: 508, 179 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 teslaturret rotate: false - xy: 798, 397 + xy: 544, 179 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 teslaturret-heat rotate: false - xy: 810, 409 + xy: 556, 175 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 titancannon rotate: false - xy: 304, 169 + xy: 397, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 flierfactory rotate: false - xy: 356, 159 + xy: 608, 256 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory rotate: false - xy: 356, 159 + xy: 608, 256 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flierfactory-top rotate: false - xy: 374, 159 + xy: 620, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory-top rotate: false - xy: 374, 159 + xy: 620, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 flierfactory-top-open rotate: false - xy: 392, 159 + xy: 626, 274 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory-top-open rotate: false - xy: 392, 159 + xy: 626, 274 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 compositewall rotate: false - xy: 651, 310 + xy: 654, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 295, 113 + xy: 674, 267 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door-large rotate: false - xy: 762, 378 + xy: 423, 151 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 466, 186 + xy: 441, 152 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 305, 123 + xy: 704, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall rotate: false - xy: 315, 123 + xy: 694, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall-large rotate: false - xy: 484, 191 + xy: 572, 274 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ironwall rotate: false - xy: 989, 417 + xy: 714, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall rotate: false - xy: 421, 76 + xy: 628, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall-large rotate: false - xy: 275, 42 + xy: 462, 168 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 stonewall rotate: false - xy: 411, 46 + xy: 708, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumshieldwall rotate: false - xy: 411, 26 + xy: 738, 228 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall rotate: false - xy: 421, 36 + xy: 737, 218 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall-large rotate: false - xy: 275, 24 + xy: 459, 150 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blank rotate: false - xy: 718, 414 + xy: 131, 107 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 bullet rotate: false - xy: 241, 166 + xy: 568, 176 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 bullet-back rotate: false - xy: 798, 386 + xy: 579, 176 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 casing rotate: false - xy: 582, 284 + xy: 798, 373 size: 2, 4 orig: 2, 4 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 572, 243 + xy: 785, 414 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 laser rotate: false - xy: 574, 187 + xy: 716, 303 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 laser-end rotate: false - xy: 67, 1 + xy: 131, 110 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 laserfull rotate: false - xy: 87, 1 + xy: 66, 43 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 shell rotate: false - xy: 810, 398 + xy: 480, 168 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shell-back rotate: false - xy: 822, 410 + xy: 477, 157 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shot rotate: false - xy: 361, 46 + xy: 678, 231 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 999, 417 + xy: 724, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 1009, 425 + xy: 734, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-densealloy rotate: false - xy: 1009, 415 + xy: 188, 62 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-iron rotate: false - xy: 322, 86 + xy: 198, 62 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 326, 96 + xy: 208, 62 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastic rotate: false - xy: 332, 86 + xy: 218, 62 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 336, 96 + xy: 228, 62 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 342, 86 + xy: 238, 62 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-steel rotate: false - xy: 346, 96 + xy: 184, 52 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 352, 86 + xy: 194, 52 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 356, 96 + xy: 204, 52 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 362, 86 + xy: 214, 52 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 standard-mech rotate: false - xy: 771, 308 + xy: 322, 93 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-ship rotate: false - xy: 785, 364 + xy: 322, 79 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -2372,7 +2379,7 @@ shape-7 index: -1 border rotate: false - xy: 110, 65 + xy: 692, 385 size: 24, 40 split: 5, 5, 5, 10 orig: 24, 40 @@ -2380,7 +2387,7 @@ border index: -1 button rotate: false - xy: 557, 201 + xy: 749, 302 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -2404,7 +2411,7 @@ button-over index: -1 button-map rotate: false - xy: 989, 437 + xy: 746, 372 size: 24, 40 split: 10, 10, 5, 10 orig: 24, 40 @@ -2412,7 +2419,7 @@ button-map index: -1 button-map-down rotate: false - xy: 680, 383 + xy: 720, 344 size: 24, 40 split: 10, 10, 5, 10 orig: 24, 40 @@ -2420,7 +2427,7 @@ button-map-down index: -1 button-map-over rotate: false - xy: 680, 383 + xy: 720, 344 size: 24, 40 split: 10, 10, 5, 10 orig: 24, 40 @@ -2443,35 +2450,35 @@ check-off index: -1 check-on rotate: false - xy: 899, 445 + xy: 690, 351 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-on-over rotate: false - xy: 929, 445 + xy: 719, 310 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-over rotate: false - xy: 959, 445 + xy: 755, 414 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 clear rotate: false - xy: 107, 13 + xy: 229, 118 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 cursor rotate: false - xy: 791, 447 + xy: 903, 436 size: 4, 4 orig: 4, 4 offset: 0, 0 @@ -2492,28 +2499,28 @@ discord-banner-over index: -1 controller-cursor rotate: false - xy: 253, 8 + xy: 277, 125 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 @@ -2527,77 +2534,77 @@ icon-admin-small index: -1 icon-areaDelete rotate: false - xy: 611, 188 + xy: 390, 95 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow rotate: false - xy: 289, 8 + xy: 115, 1 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 623, 188 + xy: 402, 95 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 791, 433 + xy: 414, 95 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 803, 433 + xy: 423, 113 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 815, 433 + xy: 640, 196 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 410, 159 + xy: 626, 256 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 672, 363 + xy: 134, 94 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 688, 367 + xy: 188, 88 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 827, 433 + xy: 134, 46 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 677, 347 + xy: 188, 72 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -2625,504 +2632,504 @@ icon-close-over index: -1 icon-crafting rotate: false - xy: 839, 433 + xy: 719, 298 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 851, 433 + xy: 731, 298 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 863, 433 + xy: 252, 67 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 677, 331 + xy: 204, 88 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 677, 315 + xy: 204, 72 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 875, 433 + xy: 264, 67 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 475, 134 + xy: 220, 88 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 475, 118 + xy: 220, 72 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 475, 102 + xy: 152, 52 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 693, 351 + xy: 168, 52 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 693, 335 + xy: 584, 240 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 693, 319 + xy: 600, 240 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 428, 160 + xy: 134, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 704, 367 + xy: 616, 240 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 720, 368 + xy: 583, 224 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 709, 351 + xy: 599, 224 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-github rotate: false - xy: 709, 335 + xy: 583, 208 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 709, 319 + xy: 615, 224 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 446, 160 + xy: 134, 58 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 887, 433 + xy: 276, 67 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 899, 433 + xy: 288, 67 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 725, 352 + xy: 599, 208 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 725, 336 + xy: 615, 208 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 911, 433 + xy: 300, 67 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 725, 320 + xy: 592, 192 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-line rotate: false - xy: 464, 168 + xy: 802, 361 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 741, 361 + xy: 608, 192 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 923, 433 + xy: 312, 67 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 741, 345 + xy: 632, 240 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 464, 150 + xy: 820, 361 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 241, 148 + xy: 802, 343 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 241, 130 + xy: 820, 343 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 935, 433 + xy: 324, 67 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 947, 433 + xy: 336, 67 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 259, 151 + xy: 801, 325 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-none rotate: false - xy: 959, 433 + xy: 348, 67 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 971, 433 + xy: 119, 29 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 277, 151 + xy: 801, 307 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 741, 329 + xy: 631, 224 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 259, 133 + xy: 819, 325 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 787, 421 + xy: 119, 17 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 741, 313 + xy: 631, 208 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 799, 421 + xy: 862, 381 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 811, 421 + xy: 435, 113 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 823, 421 + xy: 426, 101 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 725, 304 + xy: 624, 192 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 295, 151 + xy: 819, 307 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 741, 297 + xy: 855, 425 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 305, 8 + xy: 871, 425 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 277, 133 + xy: 838, 361 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 475, 86 + xy: 887, 426 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 637, 236 + xy: 850, 409 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 637, 220 + xy: 866, 409 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 637, 204 + xy: 862, 393 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 484, 175 + xy: 423, 135 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 313, 151 + xy: 838, 343 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 295, 133 + xy: 837, 325 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 835, 421 + xy: 438, 101 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 331, 151 + xy: 837, 307 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 500, 175 + xy: 638, 300 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 847, 421 + xy: 426, 89 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 859, 421 + xy: 438, 89 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 516, 175 + xy: 654, 305 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 313, 133 + xy: 909, 433 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 532, 175 + xy: 684, 301 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 482, 159 + xy: 700, 301 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 331, 133 + xy: 927, 433 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 871, 421 + xy: 801, 295 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 883, 421 + xy: 813, 295 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 498, 159 + xy: 236, 88 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 349, 141 + xy: 945, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 514, 159 + xy: 236, 72 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -3136,7 +3143,7 @@ logotext index: -1 pane rotate: false - xy: 119, 27 + xy: 857, 441 size: 24, 36 split: 10, 10, 5, 5 orig: 24, 36 @@ -3144,7 +3151,7 @@ pane index: -1 pane-button rotate: false - xy: 93, 25 + xy: 557, 205 size: 24, 36 split: 10, 10, 5, 5 orig: 24, 36 @@ -3152,7 +3159,7 @@ pane-button index: -1 scroll rotate: false - xy: 736, 377 + xy: 883, 442 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -3177,7 +3184,7 @@ scroll-knob-horizontal index: -1 scroll-knob-vertical rotate: false - xy: 67, 21 + xy: 775, 302 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -3185,7 +3192,7 @@ scroll-knob-vertical index: -1 scroll-knob-vertical-black rotate: false - xy: 651, 320 + xy: 772, 372 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -3193,7 +3200,7 @@ scroll-knob-vertical-black index: -1 selection rotate: false - xy: 763, 487 + xy: 718, 414 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -3214,21 +3221,21 @@ slider-knob index: -1 slider-knob-down rotate: false - xy: 656, 379 + xy: 110, 61 size: 22, 44 orig: 22, 44 offset: 0, 0 index: -1 slider-knob-over rotate: false - xy: 656, 379 + xy: 110, 61 size: 22, 44 orig: 22, 44 offset: 0, 0 index: -1 slider-vertical rotate: false - xy: 131, 107 + xy: 234, 172 size: 8, 1 orig: 8, 1 offset: 0, 0 @@ -3256,7 +3263,7 @@ text-sides-over index: -1 textfield rotate: false - xy: 586, 280 + xy: 827, 449 size: 28, 28 split: 6, 6, 6, 6 orig: 28, 28 @@ -3264,7 +3271,7 @@ textfield index: -1 textfield-over rotate: false - xy: 706, 384 + xy: 797, 449 size: 28, 28 split: 2, 2, 2, 2 orig: 28, 28 @@ -3272,7 +3279,7 @@ textfield-over index: -1 white rotate: false - xy: 1, 1 + xy: 651, 357 size: 3, 3 orig: 3, 3 offset: 0, 0 @@ -3295,154 +3302,154 @@ window-empty index: -1 flier rotate: false - xy: 1010, 485 + xy: 229, 104 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout rotate: false - xy: 757, 307 + xy: 280, 79 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-base rotate: false - xy: 771, 364 + xy: 294, 93 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-mech-base rotate: false - xy: 771, 364 + xy: 294, 93 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-leg rotate: false - xy: 771, 350 + xy: 294, 79 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-mech-leg rotate: false - xy: 771, 350 + xy: 294, 79 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol rotate: false - xy: 785, 336 + xy: 336, 79 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol-booster-1 rotate: false - xy: 785, 322 + xy: 350, 93 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol-booster-2 rotate: false - xy: 785, 308 + xy: 350, 79 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol-flame rotate: false - xy: 833, 410 + xy: 491, 168 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 beam rotate: false - xy: 1015, 465 + xy: 1015, 475 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 beam-equip rotate: false - xy: 1015, 455 + xy: 1015, 465 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster rotate: false - xy: 864, 411 + xy: 532, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 874, 411 + xy: 542, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun rotate: false - xy: 693, 309 + xy: 892, 406 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun-equip rotate: false - xy: 703, 309 + xy: 878, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun rotate: false - xy: 341, 26 + xy: 688, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 351, 36 + xy: 698, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster rotate: false - xy: 431, 46 + xy: 737, 208 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 441, 56 + xy: 374, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan rotate: false - xy: 421, 26 + xy: 141, 16 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan-equip rotate: false - xy: 431, 36 + xy: 141, 6 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 9012af9350..914e947426 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/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index fc8ee5f6d8..dad85b252b 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -520,7 +520,7 @@ public class Renderer extends RendererModule{ } if((!debug || showUI) && Settings.getBool("healthbars")){ - for(TeamData ally : state.teams.getTeams(true)){ + for(TeamData ally : (debug ? state.teams.getTeams() : state.teams.getTeams(true))){ for(Unit e : unitGroups[ally.team.ordinal()].all()){ drawStats(e); } diff --git a/core/src/io/anuke/mindustry/entities/units/BaseUnit.java b/core/src/io/anuke/mindustry/entities/units/BaseUnit.java index bc4ed0b6cd..e0c9164db0 100644 --- a/core/src/io/anuke/mindustry/entities/units/BaseUnit.java +++ b/core/src/io/anuke/mindustry/entities/units/BaseUnit.java @@ -57,6 +57,10 @@ public class BaseUnit extends Unit{ ((TileEntity)target).tile.block().flags.contains(flag); } + public void setState(UnitState state){ + this.state.set(this, state); + } + @Override public boolean acceptsAmmo(Item item) { return type.ammo.containsKey(item) && inventory.canAcceptAmmo(type.ammo.get(item)); diff --git a/core/src/io/anuke/mindustry/entities/units/StateMachine.java b/core/src/io/anuke/mindustry/entities/units/StateMachine.java index e12c44fe0b..1bc2ca4401 100644 --- a/core/src/io/anuke/mindustry/entities/units/StateMachine.java +++ b/core/src/io/anuke/mindustry/entities/units/StateMachine.java @@ -8,6 +8,7 @@ public class StateMachine { } public void set(BaseUnit unit, UnitState next){ + if(next == state) return; if(state != null) state.exited(unit); this.state = next; if(next != null) next.entered(unit); 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 216db280e4..32b149325a 100644 --- a/core/src/io/anuke/mindustry/entities/units/types/Vtol.java +++ b/core/src/io/anuke/mindustry/entities/units/types/Vtol.java @@ -20,6 +20,7 @@ import io.anuke.ucore.util.Mathf; import static io.anuke.mindustry.Vars.world; public class Vtol extends FlyingUnitType { + private float retreatHealth = 10f; public Vtol(){ super("vtol"); @@ -94,6 +95,15 @@ public class Vtol extends FlyingUnitType { } } + @Override + public void behavior(BaseUnit unit) { + if(unit.health <= retreatHealth && + Geometry.findClosest(unit.x, unit.y, world.indexer().getAllied(unit.team, BlockFlag.repair)) != null){ + unit.setState(retreat); + } + } + + @Override public UnitState getStartState(){ return resupply; } @@ -119,7 +129,7 @@ public class Vtol extends FlyingUnitType { if(diff > 100f && vec.len() < circleLength){ vec.setAngle(unit.velocity.angle()); }else{ - vec.setAngle(Mathf.slerpDelta(unit.velocity.angle(), vec.angle(), 0.4f)); + vec.setAngle(Mathf.slerpDelta(unit.velocity.angle(), vec.angle(), 0.44f)); } vec.setLength(speed*Timers.delta()); @@ -153,13 +163,12 @@ public class Vtol extends FlyingUnitType { } public void update(BaseUnit unit) { - if(!unit.inventory.hasAmmo()) { unit.state.set(unit, resupply); }else if (unit.target == null){ if(unit.timer.get(timerTarget, 20)) { Unit closest = Units.getClosestEnemy(unit.team, unit.x, unit.y, - unit.inventory.getAmmo().getRange(), other -> true); + unit.inventory.getAmmo().getRange(), other -> other.distanceTo(unit) < 60f); if(closest != null){ unit.target = closest; }else { @@ -170,7 +179,7 @@ public class Vtol extends FlyingUnitType { }else{ attack(unit, 150f); - if (unit.timer.get(timerReload, 7) && Mathf.angNear(unit.angleTo(unit.target), unit.rotation, 16f) + if (unit.timer.get(timerReload, 7) && Mathf.angNear(unit.angleTo(unit.target), unit.rotation, 13f) && unit.distanceTo(unit.target) < unit.inventory.getAmmo().getRange()) { AmmoType ammo = unit.inventory.getAmmo(); unit.inventory.useAmmo(); @@ -179,6 +188,24 @@ public class Vtol extends FlyingUnitType { } } } + }, + retreat = new UnitState() { + public void entered(BaseUnit unit) { + unit.target = null; + } + + public void update(BaseUnit unit) { + if(unit.health >= health){ + unit.state.set(unit, attack); + }else if(!unit.targetHasFlag(BlockFlag.repair)){ + if(unit.timer.get(timerTarget, 20)) { + Tile target = Geometry.findClosest(unit.x, unit.y, world.indexer().getAllied(unit.team, BlockFlag.repair)); + if (target != null) unit.target = target.entity; + } + }else{ + circle(unit, 20f); + } + } }; } diff --git a/core/src/io/anuke/mindustry/game/TeamInfo.java b/core/src/io/anuke/mindustry/game/TeamInfo.java index dcc3fd1cfe..7b841113be 100644 --- a/core/src/io/anuke/mindustry/game/TeamInfo.java +++ b/core/src/io/anuke/mindustry/game/TeamInfo.java @@ -22,6 +22,10 @@ public class TeamInfo { return ally ? allyData : enemyData; } + public ObjectSet getTeams() { + return allTeamData; + } + /**Register a team. * @param team The team type enum. * @param ally Whether this team is an ally with the player or an enemy with the player. diff --git a/core/src/io/anuke/mindustry/world/flags/BlockFlag.java b/core/src/io/anuke/mindustry/world/flags/BlockFlag.java index eb8712a692..7ead18f4fa 100644 --- a/core/src/io/anuke/mindustry/world/flags/BlockFlag.java +++ b/core/src/io/anuke/mindustry/world/flags/BlockFlag.java @@ -1,5 +1,5 @@ package io.anuke.mindustry.world.flags; public enum BlockFlag { - resupplyPoint, producer + resupplyPoint, producer, repair }