diff --git a/core/assets-raw/sprites/blocks/distribution/teleporter-top.png b/core/assets-raw/sprites/blocks/distribution/teleporter-top.png deleted file mode 100644 index 5c65258375..0000000000 Binary files a/core/assets-raw/sprites/blocks/distribution/teleporter-top.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/power/teleporter-top.png b/core/assets-raw/sprites/blocks/distribution/warpgate-top.png similarity index 100% rename from core/assets-raw/sprites/blocks/power/teleporter-top.png rename to core/assets-raw/sprites/blocks/distribution/warpgate-top.png diff --git a/core/assets-raw/sprites/blocks/power/teleporter.png b/core/assets-raw/sprites/blocks/distribution/warpgate.png similarity index 100% rename from core/assets-raw/sprites/blocks/power/teleporter.png rename to core/assets-raw/sprites/blocks/distribution/warpgate.png diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 67da0b1818..d5fdf7c7bc 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,61 +13,68 @@ background index: -1 conveyormove rotate: false - xy: 265, 21 + xy: 911, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-arrow rotate: false - xy: 747, 308 + xy: 341, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-bridge rotate: false - xy: 757, 308 + xy: 351, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-end rotate: false - xy: 767, 320 + xy: 361, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mass-driver-turret rotate: false - xy: 281, 135 + xy: 255, 127 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ripple rotate: false - xy: 281, 135 + xy: 255, 127 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 poweredconveyormove rotate: false - xy: 736, 288 + xy: 335, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyormove rotate: false - xy: 733, 238 + xy: 475, 112 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -teleporter-top +warpgate + rotate: false + xy: 597, 154 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +warpgate-top rotate: false xy: 991, 447 size: 24, 24 @@ -76,105 +83,105 @@ teleporter-top index: -1 irondrill rotate: false - xy: 545, 91 + xy: 375, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill-rotator rotate: false - xy: 555, 91 + xy: 385, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill-rotator rotate: false - xy: 555, 91 + xy: 385, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 irondrill-top rotate: false - xy: 565, 91 + xy: 395, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserdrill rotate: false - xy: 261, 73 + xy: 715, 223 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laserdrill-rotator rotate: false - xy: 279, 79 + xy: 733, 223 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laserdrill-top rotate: false - xy: 297, 81 + xy: 661, 215 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 nucleardrill rotate: false - xy: 307, 135 + xy: 281, 135 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nucleardrill-rim rotate: false - xy: 333, 135 + xy: 307, 135 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nucleardrill-rotator rotate: false - xy: 359, 135 + xy: 333, 135 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nucleardrill-top rotate: false - xy: 385, 135 + xy: 359, 135 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilextractor rotate: false - xy: 587, 232 + xy: 437, 136 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilextractor-liquid rotate: false - xy: 613, 232 + xy: 587, 232 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilextractor-rotator rotate: false - xy: 607, 206 + xy: 613, 232 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oilextractor-top rotate: false - xy: 597, 180 + xy: 607, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -209,105 +216,105 @@ plasmadrill-top index: -1 reinforceddrill rotate: false - xy: 736, 278 + xy: 355, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill-rotator rotate: false - xy: 746, 278 + xy: 365, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 reinforceddrill-top rotate: false - xy: 756, 278 + xy: 365, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill rotate: false - xy: 743, 238 + xy: 485, 122 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill-rotator rotate: false - xy: 753, 238 + xy: 485, 112 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steeldrill-top rotate: false - xy: 707, 229 + xy: 455, 102 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill rotate: false - xy: 725, 169 + xy: 505, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumdrill-top rotate: false - xy: 725, 159 + xy: 515, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 waterextractor rotate: false - xy: 315, 63 + xy: 679, 169 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-liquid rotate: false - xy: 333, 63 + xy: 697, 169 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-rotator rotate: false - xy: 351, 63 + xy: 715, 169 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 waterextractor-top rotate: false - xy: 369, 63 + xy: 733, 169 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blackrock1 rotate: false - xy: 695, 347 + xy: 207, 52 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-blackrock rotate: false - xy: 695, 347 + xy: 207, 52 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackrockshadow1 rotate: false - xy: 207, 52 + xy: 187, 8 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -328,35 +335,35 @@ block-icon-blackstone index: -1 blackstone2 rotate: false - xy: 187, 8 + xy: 633, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 639, 232 + xy: 643, 206 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock1 rotate: false - xy: 955, 443 + xy: 639, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock2 rotate: false - xy: 955, 433 + xy: 639, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneblock3 rotate: false - xy: 981, 440 + xy: 639, 235 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -370,28 +377,28 @@ blackstoneedge index: -1 coal2 rotate: false - xy: 933, 427 + xy: 789, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 943, 427 + xy: 799, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 279, 35 + xy: 931, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 275, 25 + xy: 941, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -405,28 +412,28 @@ dirtedge index: -1 grass2 rotate: false - xy: 285, 5 + xy: 991, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 445, 96 + xy: 1001, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock1 rotate: false - xy: 441, 86 + xy: 1011, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassblock2 rotate: false - xy: 455, 92 + xy: 747, 135 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -440,14 +447,14 @@ grassedge index: -1 ice2 rotate: false - xy: 465, 92 + xy: 757, 145 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 475, 92 + xy: 757, 135 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -461,441 +468,441 @@ iceedge index: -1 icerock2 rotate: false - xy: 485, 92 + xy: 315, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 495, 91 + xy: 325, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 495, 91 + xy: 325, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 505, 91 + xy: 335, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 505, 91 + xy: 335, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron2 rotate: false - xy: 525, 91 + xy: 355, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron3 rotate: false - xy: 535, 91 + xy: 365, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 991, 433 + xy: 745, 155 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead2 rotate: false - xy: 777, 320 + xy: 381, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 777, 310 + xy: 391, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 716, 299 + xy: 431, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 706, 279 + xy: 431, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 716, 289 + xy: 305, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 726, 299 + xy: 305, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 716, 279 + xy: 315, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalflooredge rotate: false - xy: 1005, 433 + xy: 747, 414 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mossblock rotate: false - xy: 726, 289 + xy: 315, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oiledge rotate: false - xy: 773, 340 + xy: 747, 400 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock2 rotate: false - xy: 716, 269 + xy: 375, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 705, 259 + xy: 385, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 715, 259 + xy: 395, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock1 rotate: false - xy: 725, 259 + xy: 395, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock2 rotate: false - xy: 736, 268 + xy: 405, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandblock3 rotate: false - xy: 746, 268 + xy: 405, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 253, 41 + xy: 291, 85 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 713, 249 + xy: 435, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 733, 248 + xy: 455, 122 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 743, 248 + xy: 455, 112 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock1 rotate: false - xy: 753, 248 + xy: 465, 122 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock2 rotate: false - xy: 713, 239 + xy: 465, 112 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowblock3 rotate: false - xy: 723, 239 + xy: 475, 122 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 1005, 419 + xy: 347, 85 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 607, 106 + xy: 361, 85 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone-cliff-edge rotate: false - xy: 719, 219 + xy: 485, 102 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 715, 209 + xy: 495, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 715, 199 + xy: 505, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 715, 189 + xy: 515, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 717, 229 + xy: 465, 102 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 709, 219 + xy: 475, 102 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock1 rotate: false - xy: 715, 179 + xy: 525, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock2 rotate: false - xy: 715, 169 + xy: 535, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneblock3 rotate: false - xy: 715, 159 + xy: 545, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 649, 106 + xy: 403, 85 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 725, 209 + xy: 555, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 725, 199 + xy: 565, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 725, 189 + xy: 575, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 725, 179 + xy: 495, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge rotate: false - xy: 923, 417 + xy: 585, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-1 rotate: false - xy: 933, 417 + xy: 595, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-2 rotate: false - xy: 943, 417 + xy: 585, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-side rotate: false - xy: 953, 413 + xy: 595, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 641, 158 + xy: 303, 71 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-border rotate: false - xy: 446, 126 + xy: 215, 22 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-elevation rotate: false - xy: 446, 116 + xy: 225, 30 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustiongenerator-top rotate: false - xy: 446, 116 + xy: 225, 30 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-middle rotate: false - xy: 715, 339 + xy: 661, 141 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 715, 339 + xy: 661, 141 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-slope rotate: false - xy: 725, 339 + xy: 661, 131 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 border rotate: false - xy: 843, 425 + xy: 661, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 783, 330 + xy: 891, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 703, 245 + xy: 921, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 327, 99 + xy: 291, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cross-3 rotate: false - xy: 229, 143 + xy: 571, 157 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -909,7 +916,7 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 285, 25 + xy: 971, 430 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -923,70 +930,70 @@ nuclearreactor-shadow index: -1 place-arrow rotate: false - xy: 726, 279 + xy: 325, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 736, 298 + xy: 325, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 679, 155 + xy: 761, 408 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 rubble-1-0 rotate: false - xy: 387, 81 + xy: 661, 197 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 405, 81 + xy: 679, 187 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 423, 81 + xy: 697, 187 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 261, 55 + xy: 715, 187 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-3-0 rotate: false - xy: 597, 154 + xy: 597, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rubble-3-1 rotate: false - xy: 597, 154 + xy: 597, 180 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shadow-1 rotate: false - xy: 703, 167 + xy: 761, 360 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1028,7 +1035,7 @@ shadow-6 index: -1 shadow-round-1 rotate: false - xy: 703, 155 + xy: 289, 21 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1042,140 +1049,140 @@ shadow-round-2 index: -1 bridgeconduit-arrow rotate: false - xy: 853, 425 + xy: 667, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconduit-bridge rotate: false - xy: 863, 425 + xy: 733, 359 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconduit-end rotate: false - xy: 873, 425 + xy: 731, 349 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-arrow rotate: false - xy: 883, 425 + xy: 301, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-bridge rotate: false - xy: 893, 427 + xy: 301, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-end rotate: false - xy: 903, 427 + xy: 301, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 773, 330 + xy: 819, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top rotate: false - xy: 265, 31 + xy: 901, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-arrow rotate: false - xy: 757, 328 + xy: 311, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-bridge rotate: false - xy: 757, 318 + xy: 321, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-end rotate: false - xy: 737, 308 + xy: 331, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 787, 320 + xy: 401, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-bottom rotate: false - xy: 787, 310 + xy: 411, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-liquid rotate: false - xy: 706, 299 + xy: 421, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-top rotate: false - xy: 706, 289 + xy: 431, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidtank-bottom rotate: false - xy: 598, 258 + xy: 572, 258 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquidtank-liquid rotate: false - xy: 229, 117 + xy: 598, 258 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquidtank-top rotate: false - xy: 255, 127 + xy: 229, 117 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pulseconduit-bottom rotate: false - xy: 746, 298 + xy: 335, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-top rotate: false - xy: 746, 288 + xy: 345, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1266,39 +1273,32 @@ fusionreactor-top index: -1 nuclearreactor-center rotate: false - xy: 411, 135 + xy: 385, 135 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nuclearreactor-lights rotate: false - xy: 437, 136 + xy: 411, 135 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rtgenerator-top rotate: false - xy: 726, 269 + xy: 385, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldprojector rotate: false - xy: 279, 61 + xy: 733, 187 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -teleporter-top - rotate: false - xy: 679, 357 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 alloy-fuser rotate: false xy: 887, 453 @@ -1329,217 +1329,217 @@ block-icon-phase-weaver index: -1 alloy-smelter rotate: false - xy: 705, 367 + xy: 195, 106 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-alloy-smelter rotate: false - xy: 705, 367 + xy: 195, 106 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 arc-smelter rotate: false - xy: 677, 339 + xy: 679, 365 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-arc-smelter rotate: false - xy: 677, 339 + xy: 679, 365 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor rotate: false - xy: 195, 106 + xy: 677, 347 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame0 rotate: false - xy: 197, 34 + xy: 679, 313 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame1 rotate: false - xy: 197, 16 + xy: 197, 34 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame2 rotate: false - xy: 255, 109 + xy: 197, 16 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-liquid rotate: false - xy: 463, 132 + xy: 255, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-top rotate: false - xy: 481, 132 + xy: 463, 132 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 centrifuge-liquid rotate: false - xy: 291, 99 + xy: 207, 80 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 417, 99 + xy: 381, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 499, 121 + xy: 399, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 517, 121 + xy: 417, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator rotate: false - xy: 535, 121 + xy: 713, 347 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 553, 121 + xy: 715, 313 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 571, 121 + xy: 715, 295 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 extractor rotate: false - xy: 285, 15 + xy: 981, 430 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 767, 310 + xy: 371, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 plasteel-compressor-top rotate: false - xy: 315, 81 + xy: 679, 205 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter-top rotate: false - xy: 333, 81 + xy: 697, 205 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powersmelter-top rotate: false - xy: 351, 81 + xy: 715, 205 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 351, 81 + xy: 715, 205 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 756, 298 + xy: 345, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 756, 288 + xy: 355, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 756, 268 + xy: 415, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 siliconextractor rotate: false - xy: 723, 249 + xy: 435, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 core-open rotate: false - xy: 571, 157 + xy: 545, 157 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-1 rotate: false - xy: 435, 103 + xy: 225, 40 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-2 rotate: false - xy: 499, 139 + xy: 481, 132 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-2-top rotate: false - xy: 517, 139 + xy: 499, 139 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1588,63 +1588,63 @@ arc-heat index: -1 crux rotate: false - xy: 345, 99 + xy: 309, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 crux-heat rotate: false - xy: 363, 99 + xy: 327, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 crux-panel-left rotate: false - xy: 381, 99 + xy: 345, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 crux-panel-right rotate: false - xy: 399, 99 + xy: 363, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 duo rotate: false - xy: 275, 5 + xy: 961, 430 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 fuse rotate: false - xy: 572, 258 + xy: 229, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spectre rotate: false - xy: 572, 258 + xy: 229, 143 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 lancer rotate: false - xy: 691, 167 + xy: 211, 4 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 667, 155 + xy: 761, 420 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1658,119 +1658,119 @@ meltdown index: -1 scatter rotate: false - xy: 691, 155 + xy: 761, 396 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 scatter-heat rotate: false - xy: 703, 203 + xy: 764, 384 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 scorch rotate: false - xy: 703, 191 + xy: 761, 372 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 703, 179 + xy: 749, 361 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 swarmer rotate: false - xy: 297, 63 + xy: 661, 179 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave rotate: false - xy: 387, 63 + xy: 661, 161 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 405, 63 + xy: 679, 151 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dronefactory-top rotate: false - xy: 589, 118 + xy: 733, 295 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory-top rotate: false - xy: 589, 118 + xy: 733, 295 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dronefactory-top-open rotate: false - xy: 607, 120 + xy: 499, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory-top-open rotate: false - xy: 607, 120 + xy: 499, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 reconstructor-open rotate: false - xy: 369, 81 + xy: 733, 205 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 repairpoint-turret rotate: false - xy: 706, 269 + xy: 375, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 compositewall rotate: false - xy: 953, 423 + xy: 809, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 589, 136 + xy: 733, 313 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 275, 15 + xy: 951, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumshieldwall rotate: false - xy: 715, 149 + xy: 525, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1791,21 +1791,21 @@ beam-end index: -1 blank rotate: false - xy: 586, 118 + xy: 566, 287 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 bullet rotate: false - xy: 624, 258 + xy: 731, 385 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 bullet-back rotate: false - xy: 635, 258 + xy: 742, 385 size: 9, 9 orig: 9, 9 offset: 0, 0 @@ -1819,14 +1819,14 @@ casing index: -1 clear rotate: false - xy: 566, 287 + xy: 229, 169 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 649, 232 + xy: 641, 152 size: 8, 7 orig: 8, 7 offset: 0, 0 @@ -1840,7 +1840,7 @@ error index: -1 laser rotate: false - xy: 1021, 499 + xy: 431, 85 size: 1, 12 orig: 1, 12 offset: 0, 0 @@ -1861,7 +1861,7 @@ laserfull index: -1 minelaser rotate: false - xy: 123, 25 + xy: 434, 85 size: 1, 12 orig: 1, 12 offset: 0, 0 @@ -1875,35 +1875,35 @@ minelaser-end index: -1 shell rotate: false - xy: 646, 258 + xy: 650, 290 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shell-back rotate: false - xy: 435, 124 + xy: 650, 279 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shot rotate: false - xy: 755, 258 + xy: 425, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 transfer rotate: false - xy: 126, 25 + xy: 1021, 499 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 725, 149 + xy: 535, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1917,105 +1917,105 @@ transfer-end index: -1 block-icon-arc rotate: false - xy: 535, 139 + xy: 517, 139 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-biomattercompressor rotate: false - xy: 553, 139 + xy: 535, 139 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-bridgeconduit rotate: false - xy: 456, 122 + xy: 225, 20 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconduit rotate: false - xy: 456, 122 + xy: 225, 20 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-bridgeconveyor rotate: false - xy: 466, 122 + xy: 235, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor rotate: false - xy: 466, 122 + xy: 235, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-centrifuge rotate: false - xy: 571, 139 + xy: 553, 139 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 centrifuge rotate: false - xy: 571, 139 + xy: 553, 139 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-coal rotate: false - xy: 476, 122 + xy: 245, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal1 rotate: false - xy: 476, 122 + xy: 245, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-combustiongenerator rotate: false - xy: 486, 122 + xy: 235, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustiongenerator rotate: false - xy: 486, 122 + xy: 235, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conduit rotate: false - xy: 456, 112 + xy: 245, 15 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conveyor rotate: false - xy: 466, 112 + xy: 255, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 466, 112 + xy: 255, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2036,161 +2036,161 @@ core index: -1 block-icon-crux rotate: false - xy: 623, 188 + xy: 571, 139 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-cryofluidmixer rotate: false - xy: 623, 170 + xy: 623, 188 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-cultivator rotate: false - xy: 623, 152 + xy: 623, 170 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-deepwater rotate: false - xy: 476, 112 + xy: 265, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 476, 112 + xy: 265, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-deflector-wall rotate: false - xy: 486, 112 + xy: 275, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deflector-wall rotate: false - xy: 486, 112 + xy: 275, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 duriumwall rotate: false - xy: 486, 112 + xy: 275, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-duriumwall rotate: false - xy: 486, 112 + xy: 275, 19 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-deflector-wall-large rotate: false - xy: 705, 349 + xy: 623, 152 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 deflector-wall-large rotate: false - xy: 705, 349 + xy: 623, 152 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 duriumwall-large rotate: false - xy: 705, 349 + xy: 623, 152 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-duriumwall-large rotate: false - xy: 705, 349 + xy: 623, 152 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-dirt rotate: false - xy: 446, 106 + xy: 223, 10 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 446, 106 + xy: 223, 10 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-door rotate: false - xy: 496, 111 + xy: 255, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 496, 111 + xy: 255, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-door-large rotate: false - xy: 723, 367 + xy: 697, 365 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large rotate: false - xy: 723, 367 + xy: 697, 365 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-dronefactory rotate: false - xy: 723, 349 + xy: 695, 347 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-droppoint rotate: false - xy: 506, 111 + xy: 265, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 droppoint rotate: false - xy: 506, 111 + xy: 265, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-duo rotate: false - xy: 516, 111 + xy: 275, 9 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2218,140 +2218,140 @@ block-icon-fusionreactor index: -1 block-icon-grass rotate: false - xy: 526, 111 + xy: 285, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass1 rotate: false - xy: 526, 111 + xy: 285, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ice rotate: false - xy: 536, 111 + xy: 285, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice1 rotate: false - xy: 536, 111 + xy: 285, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-icerock rotate: false - xy: 546, 111 + xy: 295, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 546, 111 + xy: 295, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-incinerator rotate: false - xy: 556, 111 + xy: 295, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 556, 111 + xy: 295, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-iron rotate: false - xy: 566, 111 + xy: 773, 374 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iron1 rotate: false - xy: 566, 111 + xy: 773, 374 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-irondrill rotate: false - xy: 576, 111 + xy: 773, 364 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ironwall rotate: false - xy: 456, 102 + xy: 773, 354 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ironwall rotate: false - xy: 456, 102 + xy: 773, 354 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemsource rotate: false - xy: 466, 102 + xy: 233, 5 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 466, 102 + xy: 233, 5 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemvoid rotate: false - xy: 476, 102 + xy: 243, 5 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 476, 102 + xy: 243, 5 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-junction rotate: false - xy: 486, 102 + xy: 831, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 junction rotate: false - xy: 486, 102 + xy: 831, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-lancer rotate: false - xy: 679, 321 + xy: 715, 367 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2372,112 +2372,112 @@ largesolarpanel index: -1 block-icon-laserconduit rotate: false - xy: 496, 101 + xy: 841, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit rotate: false - xy: 496, 101 + xy: 841, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-laserconveyor rotate: false - xy: 506, 101 + xy: 851, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor rotate: false - xy: 506, 101 + xy: 851, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-laserdrill rotate: false - xy: 679, 303 + xy: 697, 313 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-lava rotate: false - xy: 516, 101 + xy: 861, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 516, 101 + xy: 861, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-lead rotate: false - xy: 526, 101 + xy: 871, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead1 rotate: false - xy: 526, 101 + xy: 871, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquidcombustiongenerator rotate: false - xy: 536, 101 + xy: 881, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidcombustiongenerator rotate: false - xy: 536, 101 + xy: 881, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquidjunction rotate: false - xy: 546, 101 + xy: 891, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 546, 101 + xy: 891, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquidrouter rotate: false - xy: 556, 101 + xy: 901, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquidsource rotate: false - xy: 566, 101 + xy: 911, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 566, 101 + xy: 911, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2512,14 +2512,14 @@ core-top index: -1 block-icon-mechanical-pump rotate: false - xy: 576, 101 + xy: 921, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 576, 101 + xy: 921, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2533,42 +2533,42 @@ block-icon-meltdown index: -1 block-icon-melter rotate: false - xy: 586, 108 + xy: 931, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 586, 108 + xy: 931, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-metalfloor rotate: false - xy: 596, 108 + xy: 941, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 596, 108 + xy: 941, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-multiplexer rotate: false - xy: 273, 109 + xy: 679, 295 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 multiplexer rotate: false - xy: 273, 109 + xy: 679, 295 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2596,14 +2596,14 @@ nuclearreactor index: -1 block-icon-oil rotate: false - xy: 586, 98 + xy: 951, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 586, 98 + xy: 951, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2617,28 +2617,28 @@ block-icon-oilextractor index: -1 block-icon-oilrefinery rotate: false - xy: 596, 98 + xy: 961, 440 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 596, 98 + xy: 961, 440 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-overflowgate rotate: false - xy: 606, 96 + xy: 971, 440 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 overflowgate rotate: false - xy: 606, 96 + xy: 971, 440 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2652,161 +2652,161 @@ block-icon-plasmadrill index: -1 block-icon-plasteel-compressor rotate: false - xy: 291, 117 + xy: 697, 295 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plasteel-compressor rotate: false - xy: 291, 117 + xy: 697, 295 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-poweredconveyor rotate: false - xy: 616, 96 + xy: 981, 440 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 poweredconveyor rotate: false - xy: 616, 96 + xy: 981, 440 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-powerinfinite rotate: false - xy: 626, 96 + xy: 991, 437 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 626, 96 + xy: 991, 437 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-powernode rotate: false - xy: 636, 96 + xy: 1001, 437 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powernode rotate: false - xy: 636, 96 + xy: 1001, 437 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-powernodelarge rotate: false - xy: 309, 117 + xy: 273, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powernodelarge rotate: false - xy: 309, 117 + xy: 273, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-powervoid rotate: false - xy: 646, 96 + xy: 1011, 437 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 646, 96 + xy: 1011, 437 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulseconduit rotate: false - xy: 656, 96 + xy: 607, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulverizer rotate: false - xy: 297, 53 + xy: 617, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-reconstructor rotate: false - xy: 327, 117 + xy: 291, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dronefactory rotate: false - xy: 327, 117 + xy: 291, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 reconstructor rotate: false - xy: 327, 117 + xy: 291, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 walkerfactory rotate: false - xy: 327, 117 + xy: 291, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-reinforceddrill rotate: false - xy: 307, 53 + xy: 627, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-repairpoint rotate: false - xy: 317, 53 + xy: 637, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 repairpoint rotate: false - xy: 317, 53 + xy: 637, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-resupplypoint rotate: false - xy: 327, 53 + xy: 647, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 resupplypoint rotate: false - xy: 327, 53 + xy: 647, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2820,714 +2820,700 @@ block-icon-ripple index: -1 block-icon-rock rotate: false - xy: 337, 53 + xy: 657, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock1 rotate: false - xy: 337, 53 + xy: 657, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rotary-pump rotate: false - xy: 345, 117 + xy: 309, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 345, 117 + xy: 309, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-router rotate: false - xy: 347, 53 + xy: 697, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 347, 53 + xy: 697, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rtgenerator rotate: false - xy: 357, 53 + xy: 707, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtgenerator rotate: false - xy: 357, 53 + xy: 707, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sand rotate: false - xy: 367, 53 + xy: 717, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 367, 53 + xy: 717, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-scatter rotate: false - xy: 377, 53 + xy: 727, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-scorch rotate: false - xy: 387, 53 + xy: 737, 143 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-separator rotate: false - xy: 397, 53 + xy: 747, 145 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 397, 53 + xy: 747, 145 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shieldgenerator rotate: false - xy: 407, 53 + xy: 315, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shieldgenerator rotate: false - xy: 407, 53 + xy: 315, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shrub rotate: false - xy: 295, 43 + xy: 325, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrub rotate: false - xy: 295, 43 + xy: 325, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-silicon-smelter rotate: false - xy: 363, 117 + xy: 327, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 363, 117 + xy: 327, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-smelter rotate: false - xy: 305, 43 + xy: 335, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 305, 43 + xy: 335, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-snow rotate: false - xy: 315, 43 + xy: 345, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 315, 43 + xy: 345, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-solarpanel rotate: false - xy: 325, 43 + xy: 355, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solarpanel rotate: false - xy: 325, 43 + xy: 355, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sortedunloader rotate: false - xy: 335, 43 + xy: 365, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 335, 43 + xy: 365, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sorter rotate: false - xy: 345, 43 + xy: 375, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 345, 43 + xy: 375, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-space rotate: false - xy: 355, 43 + xy: 385, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space rotate: false - xy: 355, 43 + xy: 385, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-splitter rotate: false - xy: 365, 43 + xy: 395, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 365, 43 + xy: 395, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-steelconveyor rotate: false - xy: 375, 43 + xy: 405, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelconveyor rotate: false - xy: 375, 43 + xy: 405, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-steeldrill rotate: false - xy: 385, 43 + xy: 415, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-steelwall rotate: false - xy: 395, 43 + xy: 425, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 steelwall rotate: false - xy: 395, 43 + xy: 425, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-steelwall-large rotate: false - xy: 381, 117 + xy: 345, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 steelwall-large rotate: false - xy: 381, 117 + xy: 345, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-stone rotate: false - xy: 405, 43 + xy: 435, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone1 rotate: false - xy: 405, 43 + xy: 435, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-stoneformer rotate: false - xy: 417, 53 + xy: 435, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 417, 53 + xy: 435, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-stonewall rotate: false - xy: 415, 43 + xy: 435, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stonewall rotate: false - xy: 415, 43 + xy: 435, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-swarmer rotate: false - xy: 399, 117 + xy: 363, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-icon-teleporter - rotate: false - xy: 493, 157 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -teleporter - rotate: false - xy: 493, 157 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 block-icon-thermal-pump rotate: false - xy: 417, 117 + xy: 381, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 417, 117 + xy: 381, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermalgenerator rotate: false - xy: 427, 55 + xy: 445, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thermalgenerator rotate: false - xy: 427, 55 + xy: 445, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-thorium rotate: false - xy: 439, 71 + xy: 445, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 439, 71 + xy: 445, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-titanium rotate: false - xy: 439, 61 + xy: 445, 106 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 439, 61 + xy: 445, 106 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-titaniumdrill rotate: false - xy: 437, 51 + xy: 651, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-titaniumwall rotate: false - xy: 427, 45 + xy: 651, 150 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titaniumwall rotate: false - xy: 427, 45 + xy: 651, 150 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-titaniumwall-large rotate: false - xy: 213, 98 + xy: 399, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titaniumwall-large rotate: false - xy: 213, 98 + xy: 399, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-unloader rotate: false - xy: 437, 41 + xy: 661, 151 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unloader rotate: false - xy: 437, 41 + xy: 661, 151 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-vault rotate: false - xy: 519, 157 + xy: 493, 157 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 vault rotate: false - xy: 519, 157 + xy: 493, 157 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-water rotate: false - xy: 705, 339 + xy: 651, 140 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 705, 339 + xy: 651, 140 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-waterextractor rotate: false - xy: 231, 99 + xy: 417, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-wave rotate: false - xy: 207, 80 + xy: 213, 98 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-weaponfactory rotate: false - xy: 207, 62 + xy: 231, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 weaponfactory rotate: false - xy: 207, 62 + xy: 231, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-armor-piercing-bullet rotate: false - xy: 575, 91 + xy: 405, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-composite-flak rotate: false - xy: 615, 86 + xy: 311, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-explosive-shell rotate: false - xy: 625, 86 + xy: 321, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-frag-shell rotate: false - xy: 635, 86 + xy: 321, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-homing-bullet rotate: false - xy: 645, 86 + xy: 331, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-incendiary-mortar-shell rotate: false - xy: 655, 86 + xy: 331, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead-bullet rotate: false - xy: 697, 329 + xy: 351, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-scythe-missile rotate: false - xy: 717, 329 + xy: 371, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-surge-mortar-shell rotate: false - xy: 727, 329 + xy: 391, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-swarm-missile rotate: false - xy: 727, 319 + xy: 401, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium-shell rotate: false - xy: 737, 318 + xy: 411, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-tracer-bullet rotate: false - xy: 747, 318 + xy: 421, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 585, 88 + xy: 415, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 595, 88 + xy: 425, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 605, 86 + xy: 311, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-iron rotate: false - xy: 447, 51 + xy: 341, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 447, 41 + xy: 341, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-phase-matter rotate: false - xy: 697, 319 + xy: 351, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plasteel rotate: false - xy: 707, 329 + xy: 361, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 697, 309 + xy: 361, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 707, 319 + xy: 371, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-steel rotate: false - xy: 717, 319 + xy: 381, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 707, 309 + xy: 381, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 717, 309 + xy: 391, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thermite rotate: false - xy: 727, 309 + xy: 401, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 737, 328 + xy: 411, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 747, 328 + xy: 421, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 standard-mech rotate: false - xy: 621, 106 + xy: 375, 85 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-ship rotate: false - xy: 635, 106 + xy: 389, 85 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -3640,7 +3626,7 @@ button-map-over index: -1 button-select rotate: false - xy: 545, 157 + xy: 519, 157 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -3676,7 +3662,7 @@ check-over index: -1 clear rotate: false - xy: 279, 97 + xy: 289, 45 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -3704,7 +3690,7 @@ discord-banner-over index: -1 controller-cursor rotate: false - xy: 309, 99 + xy: 207, 62 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3739,637 +3725,637 @@ icon-admin-small index: -1 icon-areaDelete rotate: false - xy: 267, 43 + xy: 303, 59 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow rotate: false - xy: 625, 120 + xy: 517, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-16 rotate: false - xy: 625, 120 + xy: 517, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 251, 1 + xy: 317, 73 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 263, 1 + xy: 289, 33 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 659, 229 + xy: 329, 73 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 671, 227 + xy: 341, 73 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 643, 120 + xy: 535, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 123, 2 + xy: 677, 331 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-break rotate: false - xy: 633, 214 + xy: 553, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 737, 426 + xy: 571, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 683, 227 + xy: 353, 73 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 755, 430 + xy: 589, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 695, 227 + xy: 365, 73 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 651, 217 + xy: 377, 73 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 655, 205 + xy: 389, 73 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 139, 2 + xy: 693, 331 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 155, 2 + xy: 123, 2 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 655, 193 + xy: 401, 73 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 171, 2 + xy: 139, 2 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 607, 138 + xy: 155, 2 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 423, 65 + xy: 171, 2 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 279, 45 + xy: 709, 331 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-elevation rotate: false - xy: 773, 431 + xy: 589, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 791, 431 + xy: 607, 120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 741, 338 + xy: 725, 331 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 809, 431 + xy: 625, 120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 731, 408 + xy: 643, 120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 757, 338 + xy: 607, 138 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 731, 390 + xy: 661, 287 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 626, 285 + xy: 697, 153 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 225, 80 + xy: 679, 277 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 624, 269 + xy: 713, 153 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 642, 285 + xy: 729, 153 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-github rotate: false - xy: 640, 269 + xy: 737, 428 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 658, 289 + xy: 731, 412 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 225, 62 + xy: 697, 277 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 655, 181 + xy: 413, 73 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 655, 169 + xy: 425, 73 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 674, 287 + xy: 731, 396 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 639, 242 + xy: 753, 432 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 655, 157 + xy: 641, 194 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 690, 287 + xy: 733, 369 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 515, 91 + xy: 345, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-line rotate: false - xy: 217, 44 + xy: 715, 277 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 658, 273 + xy: 225, 82 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 673, 215 + xy: 641, 182 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 674, 271 + xy: 225, 66 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 215, 26 + xy: 733, 277 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 215, 8 + xy: 661, 269 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 235, 44 + xy: 679, 259 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 685, 215 + xy: 641, 170 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 697, 215 + xy: 626, 289 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 233, 26 + xy: 697, 259 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-none rotate: false - xy: 667, 203 + xy: 638, 289 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 667, 191 + xy: 649, 267 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 233, 8 + xy: 715, 259 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 690, 271 + xy: 241, 83 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 749, 408 + xy: 733, 259 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 679, 203 + xy: 649, 255 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 657, 257 + xy: 241, 67 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 667, 179 + xy: 649, 243 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 679, 191 + xy: 649, 231 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 691, 203 + xy: 649, 219 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 655, 241 + xy: 259, 93 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 749, 390 + xy: 661, 251 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 673, 255 + xy: 275, 93 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 689, 255 + xy: 257, 77 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 741, 372 + xy: 679, 241 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 671, 239 + xy: 273, 77 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 687, 239 + xy: 257, 61 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 827, 433 + xy: 273, 61 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 843, 435 + xy: 241, 51 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 859, 435 + xy: 225, 50 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 741, 354 + xy: 697, 241 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 759, 372 + xy: 715, 241 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 667, 167 + xy: 624, 277 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 759, 354 + xy: 733, 241 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 875, 435 + xy: 257, 45 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 679, 179 + xy: 624, 265 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 691, 191 + xy: 636, 277 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 891, 437 + xy: 273, 45 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 243, 81 + xy: 661, 233 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 907, 437 + xy: 241, 35 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 923, 437 + xy: 257, 29 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 243, 63 + xy: 679, 223 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 679, 167 + xy: 636, 265 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 691, 179 + xy: 749, 373 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 939, 437 + xy: 273, 29 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 261, 91 + xy: 697, 223 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 965, 434 + xy: 633, 216 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -4440,14 +4426,14 @@ scroll-knob-vertical-black index: -1 selection rotate: false - xy: 229, 169 + xy: 587, 209 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 slider rotate: false - xy: 496, 122 + xy: 217, 52 size: 1, 8 orig: 1, 8 offset: 0, 0 @@ -4549,63 +4535,63 @@ drone index: -1 scout rotate: false - xy: 251, 27 + xy: 305, 85 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-base rotate: false - xy: 251, 13 + xy: 319, 85 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-mech-base rotate: false - xy: 251, 13 + xy: 319, 85 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-leg rotate: false - xy: 991, 419 + xy: 333, 85 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 standard-mech-leg rotate: false - xy: 991, 419 + xy: 333, 85 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol rotate: false - xy: 641, 200 + xy: 417, 85 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol-booster-1 rotate: false - xy: 641, 186 + xy: 289, 71 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol-booster-2 rotate: false - xy: 641, 172 + xy: 289, 57 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol-flame rotate: false - xy: 435, 113 + xy: 753, 385 size: 9, 9 orig: 9, 9 offset: 0, 0 @@ -4619,70 +4605,70 @@ beam-equip index: -1 blaster rotate: false - xy: 981, 430 + xy: 215, 42 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 663, 217 + xy: 215, 32 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun rotate: false - xy: 913, 427 + xy: 769, 438 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 clustergun-equip rotate: false - xy: 923, 427 + xy: 779, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun rotate: false - xy: 735, 258 + xy: 415, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 745, 258 + xy: 425, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster rotate: false - xy: 827, 423 + xy: 545, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 triblaster-equip rotate: false - xy: 893, 417 + xy: 555, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan rotate: false - xy: 903, 417 + xy: 565, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 vulcan-equip rotate: false - xy: 913, 417 + xy: 575, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 9b40e15e72..5e6cc0881f 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/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index 2694dc6275..3fca71ec5f 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -100,7 +100,7 @@ public class Recipes implements ContentList{ new Recipe(power, PowerBlocks.shieldgenerator, new ItemStack(Items.titanium, 30), new ItemStack(Items.surgealloy, 30)); - new Recipe(distribution, PowerBlocks.teleporter, new ItemStack(Items.steel, 30), new ItemStack(Items.surgealloy, 40)); + new Recipe(distribution, PowerBlocks.warpgate, new ItemStack(Items.steel, 1)); new Recipe(power, PowerBlocks.repairturret, new ItemStack(Items.iron, 30)); new Recipe(power, PowerBlocks.megarepairturret, new ItemStack(Items.iron, 20), new ItemStack(Items.steel, 30)); diff --git a/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java b/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java index 89fcff4119..ec7d8c994d 100644 --- a/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/DebugBlocks.java @@ -100,11 +100,6 @@ public class DebugBlocks extends BlockList implements ContentList{ ButtonGroup group = new ButtonGroup<>(); Table cont = new Table(); - cont.margin(4); - cont.marginBottom(5); - - cont.add().colspan(4).height(50f * (int) (items.size / 4f + 1f)); - cont.row(); for (int i = 0; i < items.size; i++) { if (i == 0) continue; diff --git a/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java b/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java index 6f2cddec31..ac358b9afa 100644 --- a/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java @@ -5,11 +5,12 @@ import io.anuke.mindustry.type.ContentList; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.blocks.defense.RepairTurret; import io.anuke.mindustry.world.blocks.defense.ShieldBlock; -import io.anuke.mindustry.world.blocks.distribution.Teleporter; +import io.anuke.mindustry.world.blocks.distribution.WarpGate; import io.anuke.mindustry.world.blocks.power.*; public class PowerBlocks extends BlockList implements ContentList { - public static Block combustiongenerator, thermalgenerator, liquidcombustiongenerator, rtgenerator, solarpanel, largesolarpanel, nuclearReactor, fusionReactor, repairturret, megarepairturret, shieldgenerator, battery, batteryLarge, powernode, powernodelarge, teleporter; + public static Block combustiongenerator, thermalgenerator, liquidcombustiongenerator, rtgenerator, solarpanel, largesolarpanel, + nuclearReactor, fusionReactor, repairturret, megarepairturret, shieldgenerator, battery, batteryLarge, powernode, powernodelarge, warpgate; @Override public void load() { @@ -98,7 +99,7 @@ public class PowerBlocks extends BlockList implements ContentList { shadow = "shadow-round-2"; }}; - teleporter = new Teleporter("teleporter"); + warpgate = new WarpGate("warpgate"); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Teleporter.java b/core/src/io/anuke/mindustry/world/blocks/distribution/WarpGate.java similarity index 70% rename from core/src/io/anuke/mindustry/world/blocks/distribution/Teleporter.java rename to core/src/io/anuke/mindustry/world/blocks/distribution/WarpGate.java index bc0d1f8d12..f9c1c0bc29 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/Teleporter.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/WarpGate.java @@ -7,6 +7,8 @@ import io.anuke.annotations.Annotations.Loc; import io.anuke.annotations.Annotations.Remote; import io.anuke.mindustry.content.Liquids; import io.anuke.mindustry.content.fx.BlockFx; +import io.anuke.mindustry.content.fx.ExplosionFx; +import io.anuke.mindustry.entities.Damage; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.gen.CallBlocks; @@ -17,6 +19,7 @@ import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.PowerBlock; import io.anuke.ucore.core.Effects; import io.anuke.ucore.core.Effects.Effect; +import io.anuke.ucore.core.Graphics; import io.anuke.ucore.core.Timers; import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Fill; @@ -26,12 +29,15 @@ import io.anuke.ucore.scene.ui.ButtonGroup; import io.anuke.ucore.scene.ui.ImageButton; import io.anuke.ucore.scene.ui.layout.Table; import io.anuke.ucore.util.Mathf; +import io.anuke.ucore.util.Translator; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -public class Teleporter extends PowerBlock{ +import static io.anuke.mindustry.Vars.tilesize; + +public class WarpGate extends PowerBlock{ public static final Color[] colorArray = {Color.ROYAL, Color.ORANGE, Color.SCARLET, Color.LIME, Color.PURPLE, Color.GOLD, Color.PINK, Color.LIGHT_GRAY}; public static final int colors = colorArray.length; @@ -46,8 +52,10 @@ public class Teleporter extends PowerBlock{ private Array returns = new Array<>(); protected float warmupTime = 60f; - protected float teleportMax = 400f; - protected float liquidUse = 0.3f; + //time between teleports + protected float teleportMax = 1000f; + protected float teleportLiquidUse = 0.3f; + protected float liquidUse = 0.1f; protected float powerUse = 0.3f; protected Liquid inputLiquid = Liquids.cryofluid; protected Effect activateEffect = BlockFx.teleportActivate; @@ -60,7 +68,7 @@ public class Teleporter extends PowerBlock{ } } - public Teleporter(String name) { + public WarpGate(String name) { super(name); update = true; solid = true; @@ -91,8 +99,15 @@ public class Teleporter extends PowerBlock{ float time = entity.time; float rad = entity.activeScl; + if(entity.liquidLackScl > 0.01f){ + Graphics.setAdditiveBlending(); + Draw.color(1f, 0.3f, 0.3f, 0.4f * entity.liquidLackScl); + Fill.square(tile.drawx(), tile.drawy(), size * tilesize); + Graphics.setNormalBlending(); + } + Draw.color(getColor(tile, 0)); - Draw.rect("teleporter-top", tile.drawx(), tile.drawy()); + Draw.rect(name+"-top", tile.drawx(), tile.drawy()); Draw.reset(); if(rad <= 0.0001f) return; @@ -142,9 +157,12 @@ public class Teleporter extends PowerBlock{ entity.activeScl = Mathf.lerpDelta(entity.activeScl, 0f, 0.01f); if(entity.power.amount >= powerCapacity){ + Color resultColor = new Color(); + resultColor.set(getColor(tile, 0)); + entity.active = true; entity.power.amount = 0f; - Effects.effect(activateEffect, getColor(tile, 0), tile.drawx(), tile.drawy()); + Effects.effect(activateEffect, resultColor, tile.drawx(), tile.drawy()); } }else { entity.activeScl = Mathf.lerpDelta(entity.activeScl, 1f, 0.015f); @@ -153,20 +171,35 @@ public class Teleporter extends PowerBlock{ if (entity.power.amount >= powerUsed) { entity.power.amount -= powerUsed; - entity.powerLackScl = Mathf.lerpDelta(entity.powerLackScl, 0f, 0.01f); + entity.powerLackScl = Mathf.lerpDelta(entity.powerLackScl, 0f, 0.1f); }else{ - entity.powerLackScl = Mathf.lerpDelta(entity.powerLackScl, 1f, 0.01f); + entity.power.amount = 0f; + entity.powerLackScl = Mathf.lerpDelta(entity.powerLackScl, 1f, 0.1f); } if(entity.powerLackScl >= 0.999f){ catastrophicFailure(tile); } + float liquidUsed = Math.min(liquidCapacity, liquidUse * Timers.delta()); + + if (entity.liquids.amount >= liquidUsed) { + entity.liquids.amount -= liquidUsed; + entity.liquidLackScl = Mathf.lerpDelta(entity.liquidLackScl, 0f, 0.1f); + }else{ + entity.liquids.amount = 0f; + entity.liquidLackScl = Mathf.lerpDelta(entity.liquidLackScl, 1f, 0.1f); + } + + if(entity.liquidLackScl >= 0.999f){ + catastrophicFailure(tile); + } + //TODO draw warning info! if (entity.teleporting) { entity.speedScl = Mathf.lerpDelta(entity.speedScl, 2f, 0.01f); - float liquidUsed = Math.min(liquidCapacity, liquidUse * Timers.delta()); + liquidUsed = Math.min(liquidCapacity, teleportLiquidUse * Timers.delta()); if (entity.liquids.amount >= liquidUsed) { entity.liquids.amount -= liquidUsed; @@ -179,15 +212,18 @@ public class Teleporter extends PowerBlock{ entity.time += Timers.delta() * entity.speedScl; - if (entity.items.totalItems() == itemCapacity && entity.power.amount >= powerCapacity && + if (!entity.teleporting && entity.items.totalItems() >= itemCapacity && entity.power.amount >= powerCapacity - 0.01f && entity.timer.get(timerTeleport, teleportMax)) { Array testLinks = findLinks(tile); if (testLinks.size == 0) return; + Color resultColor = new Color(); + resultColor.set(getColor(tile, 0)); + entity.teleporting = true; - Effects.effect(teleportEffect, getColor(tile, 0), tile.drawx(), tile.drawy()); + Effects.effect(teleportEffect, resultColor, tile.drawx(), tile.drawy()); Timers.run(warmupTime, () -> { Array links = findLinks(tile); @@ -195,12 +231,12 @@ public class Teleporter extends PowerBlock{ int canAccept = itemCapacity - other.entity.items.totalItems(); int total = entity.items.totalItems(); if (total == 0) break; - Effects.effect(teleportOutEffect, getColor(tile, 0), other.drawx(), other.drawy()); + Effects.effect(teleportOutEffect, resultColor, other.drawx(), other.drawy()); for (int i = 0; i < canAccept && i < total; i++) { other.entity.items.addItem(entity.items.takeItem(), 1); } } - Effects.effect(teleportOutEffect, getColor(tile, 0), tile.drawx(), tile.drawy()); + Effects.effect(teleportOutEffect, resultColor, tile.drawx(), tile.drawy()); entity.power.amount = 0f; entity.teleporting = false; }); @@ -216,11 +252,6 @@ public class Teleporter extends PowerBlock{ ButtonGroup group = new ButtonGroup<>(); Table cont = new Table(); - cont.margin(4); - cont.marginBottom(5); - - cont.add().colspan(4).height(145f); - cont.row(); for(int i = 0; i < colors; i ++){ final int f = i; @@ -255,7 +286,46 @@ public class Teleporter extends PowerBlock{ return super.acceptLiquid(tile, source, liquid, amount) && liquid == inputLiquid; } + @Override + public void onDestroyed(Tile tile) { + super.onDestroyed(tile); + + TeleporterEntity entity = tile.entity(); + + if(entity.activeScl < 0.5f) return; + + float explosionRadius = 50f; + float explosionDamage = 20f; + + Translator tr = new Translator(); + + Effects.shake(6f, 16f, tile.worldx(), tile.worldy()); + Effects.effect(ExplosionFx.nuclearShockwave, tile.worldx(), tile.worldy()); + for(int i = 0; i < 6; i ++){ + Timers.run(Mathf.random(40), () -> { + Effects.effect(BlockFx.nuclearcloud, tile.worldx(), tile.worldy()); + }); + } + + Damage.damage(tile.worldx(), tile.worldy(), explosionRadius * tilesize, explosionDamage * 4); + + for(int i = 0; i < 20; i ++){ + Timers.run(Mathf.random(50), ()->{ + tr.rnd(Mathf.random(40f)); + Effects.effect(ExplosionFx.explosion, tr.x + tile.worldx(), tr.y + tile.worldy()); + }); + } + + for(int i = 0; i < 70; i ++){ + Timers.run(Mathf.random(80), ()->{ + tr.rnd(Mathf.random(120f)); + Effects.effect(BlockFx.nuclearsmoke, tr.x + tile.worldx(), tr.y + tile.worldy()); + }); + } + } + private void catastrophicFailure(Tile tile){ + tile.entity.damage(tile.entity.health + 1); //TODO fail gloriously } @@ -277,7 +347,7 @@ public class Teleporter extends PowerBlock{ for(Tile other : teleporters[entity.color]){ if(other != tile){ - if(other.block() instanceof Teleporter){ + if(other.block() instanceof WarpGate){ TeleporterEntity oe = other.entity(); if(!oe.active) continue; if(oe.color != entity.color){ @@ -291,8 +361,9 @@ public class Teleporter extends PowerBlock{ } } - for(Tile remove : removal) + for(Tile remove : removal) { teleporters[entity.color].remove(remove); + } return returns; } @@ -309,17 +380,25 @@ public class Teleporter extends PowerBlock{ public boolean active; public float activeScl = 0f; public float speedScl = 1f; - public float powerLackScl; + public float powerLackScl, liquidLackScl; public float time; @Override public void write(DataOutputStream stream) throws IOException{ stream.writeByte(color); + stream.writeBoolean(active); + stream.writeFloat(activeScl); + stream.writeFloat(speedScl); + stream.writeFloat(powerLackScl); } @Override public void read(DataInputStream stream) throws IOException{ color = stream.readByte(); + active = stream.readBoolean(); + activeScl = stream.readFloat(); + speedScl = stream.readFloat(); + powerLackScl = stream.readFloat(); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/units/Reconstructor.java b/core/src/io/anuke/mindustry/world/blocks/units/Reconstructor.java index be006510a5..782a622100 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/Reconstructor.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/Reconstructor.java @@ -29,8 +29,8 @@ import java.io.IOException; import static io.anuke.mindustry.Vars.*; public class Reconstructor extends Block{ - protected float departTime = 20f; - protected float arriveTime = 30f; + protected float departTime = 30f; + protected float arriveTime = 40f; protected float powerPerTeleport = 5f; protected Effect arriveEffect = Fx.spawn; @@ -158,7 +158,13 @@ public class Reconstructor extends Block{ entity.updateTime -= Timers.delta()/departTime; if(entity.updateTime <= 0f){ - //TODO veryify power per teleport! + //no power? death. + if(other.power.amount < powerPerTeleport){ + entity.current.setDead(true); + entity.current.setRespawning(false); + entity.current = null; + return; + } other.power.amount -= powerPerTeleport; other.current = entity.current; other.departing = false; @@ -239,13 +245,14 @@ public class Reconstructor extends Block{ public static void reconstructPlayer(Player player, Tile tile){ ReconstructorEntity entity = tile.entity(); - if(!checkValidTap(tile, entity, player)) return; + if(!checkValidTap(tile, entity, player) || entity.power.amount < ((Reconstructor)tile.block()).powerPerTeleport) return; entity.departing = true; entity.current = player; entity.solid = false; - entity.set(tile.drawx(), tile.drawy()); + entity.power.amount -= ((Reconstructor)tile.block()).powerPerTeleport; entity.updateTime = 1f; + entity.set(tile.drawx(), tile.drawy()); player.setDead(true); player.setRespawning(true); player.setRespawning();