diff --git a/core/assets-raw/sprites/blocks/turrets/bases/block-1-top.png b/core/assets-raw/sprites/blocks/turrets/bases/block-1-top.png new file mode 100644 index 0000000000..601189e850 Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/bases/block-1-top.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/cyclone.png b/core/assets-raw/sprites/blocks/turrets/turrets/cyclone.png new file mode 100644 index 0000000000..350e7c66f4 Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/turrets/cyclone.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/crux-heat.png b/core/assets-raw/sprites/blocks/turrets/turrets/salvo-heat.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/turrets/crux-heat.png rename to core/assets-raw/sprites/blocks/turrets/turrets/salvo-heat.png diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/crux.png b/core/assets-raw/sprites/blocks/turrets/turrets/salvo.png similarity index 100% rename from core/assets-raw/sprites/blocks/turrets/turrets/crux.png rename to core/assets-raw/sprites/blocks/turrets/turrets/salvo.png diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 010f21d8a9..c681fc1c89 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,987 +13,973 @@ background index: -1 conveyor-arrow rotate: false - xy: 807, 421 + xy: 319, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-arrow rotate: false - xy: 879, 419 + xy: 963, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-bridge rotate: false - xy: 885, 429 + xy: 954, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-end rotate: false - xy: 895, 431 + xy: 964, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -mass-driver-turret - rotate: false - xy: 385, 135 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -ripple - rotate: false - xy: 385, 135 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 warpgate-top rotate: false - xy: 705, 359 + xy: 694, 326 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blast-drill rotate: false - xy: 939, 453 + xy: 243, 139 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blast-drill-rim rotate: false - xy: 627, 301 + xy: 269, 139 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blast-drill-rotator rotate: false - xy: 653, 305 + xy: 295, 139 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blast-drill-top rotate: false - xy: 586, 284 + xy: 321, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 carbide-drill rotate: false - xy: 777, 421 + xy: 277, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 carbide-drill-rotator rotate: false - xy: 777, 411 + xy: 287, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 carbide-drill-top rotate: false - xy: 787, 421 + xy: 297, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laser-drill rotate: false - xy: 333, 81 + xy: 251, 66 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 333, 63 + xy: 251, 48 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 351, 81 + xy: 269, 85 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 oil-extractor rotate: false - xy: 613, 232 + xy: 583, 232 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oil-extractor-liquid rotate: false - xy: 607, 206 + xy: 583, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oil-extractor-rotator rotate: false - xy: 597, 180 + xy: 609, 232 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oil-extractor-top rotate: false - xy: 597, 154 + xy: 609, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 plasma-drill rotate: false - xy: 839, 479 + xy: 119, 60 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasma-drill-rim rotate: false - xy: 873, 479 + xy: 703, 386 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasma-drill-rotator rotate: false - xy: 907, 479 + xy: 703, 352 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 plasma-drill-top rotate: false - xy: 941, 479 + xy: 757, 445 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 tungsten-drill rotate: false - xy: 501, 81 + xy: 535, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten-drill-rotator rotate: false - xy: 491, 61 + xy: 546, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten-drill-top rotate: false - xy: 501, 71 + xy: 545, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 387, 45 + xy: 912, 311 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 405, 45 + xy: 930, 311 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 423, 45 + xy: 949, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 243, 27 + xy: 949, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blackrock1 rotate: false - xy: 185, 128 + xy: 999, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-blackrock rotate: false - xy: 185, 128 + xy: 999, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackrockshadow1 rotate: false - xy: 249, 99 + xy: 999, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 639, 232 + xy: 999, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-blackstone rotate: false - xy: 639, 232 + xy: 999, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 875, 429 + xy: 1015, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 297, 19 + xy: 1015, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneedge rotate: false - xy: 755, 358 + xy: 699, 219 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 coal1 rotate: false - xy: 777, 401 + xy: 307, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 787, 411 + xy: 317, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 797, 421 + xy: 478, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 777, 381 + xy: 329, 131 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 787, 391 + xy: 329, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 720, 291 + xy: 796, 291 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 grass-cliff-edge rotate: false - xy: 817, 411 + xy: 359, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-1 rotate: false - xy: 827, 415 + xy: 369, 131 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-2 rotate: false - xy: 797, 381 + xy: 369, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-side rotate: false - xy: 807, 391 + xy: 379, 131 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 797, 391 + xy: 349, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 807, 401 + xy: 359, 131 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 748, 276 + xy: 796, 277 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice-cliff-edge rotate: false - xy: 807, 381 + xy: 389, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-1 rotate: false - xy: 817, 391 + xy: 399, 131 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-2 rotate: false - xy: 827, 395 + xy: 399, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-side rotate: false - xy: 817, 381 + xy: 409, 131 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 817, 401 + xy: 379, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 827, 405 + xy: 389, 131 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 762, 276 + xy: 824, 277 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 827, 385 + xy: 409, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 827, 375 + xy: 419, 130 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 827, 375 + xy: 419, 130 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 839, 417 + xy: 429, 130 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 839, 417 + xy: 429, 130 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 672, 223 + xy: 838, 281 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 915, 431 + xy: 968, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 925, 431 + xy: 968, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 935, 431 + xy: 978, 317 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 929, 421 + xy: 983, 287 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 939, 421 + xy: 974, 277 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 949, 421 + xy: 984, 277 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 720, 253 + xy: 978, 267 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 730, 253 + xy: 978, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalflooredge rotate: false - xy: 658, 187 + xy: 922, 281 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 oiledge rotate: false - xy: 672, 181 + xy: 936, 281 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock2 rotate: false - xy: 565, 91 + xy: 509, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge rotate: false - xy: 605, 90 + xy: 488, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-1 rotate: false - xy: 441, 86 + xy: 488, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-2 rotate: false - xy: 441, 76 + xy: 498, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-side rotate: false - xy: 441, 66 + xy: 498, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 585, 88 + xy: 529, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 595, 88 + xy: 539, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 658, 173 + xy: 768, 263 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 441, 36 + xy: 518, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge rotate: false - xy: 451, 72 + xy: 528, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-1 rotate: false - xy: 471, 82 + xy: 538, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-2 rotate: false - xy: 461, 72 + xy: 538, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-side rotate: false - xy: 451, 62 + xy: 488, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 451, 82 + xy: 518, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 461, 82 + xy: 528, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 706, 261 + xy: 810, 263 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 720, 263 + xy: 824, 263 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone-cliff-edge rotate: false - xy: 461, 62 + xy: 518, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 451, 52 + xy: 528, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 481, 72 + xy: 538, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 471, 62 + xy: 486, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 481, 82 + xy: 498, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 471, 72 + xy: 508, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 734, 264 + xy: 838, 267 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 461, 52 + xy: 496, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 451, 42 + xy: 506, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 481, 62 + xy: 516, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 471, 52 + xy: 526, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 461, 42 + xy: 536, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 481, 52 + xy: 485, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten1 rotate: false - xy: 481, 42 + xy: 505, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten2 rotate: false - xy: 491, 81 + xy: 515, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten3 rotate: false - xy: 491, 71 + xy: 525, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge rotate: false - xy: 511, 81 + xy: 328, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-1 rotate: false - xy: 491, 51 + xy: 338, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-2 rotate: false - xy: 501, 61 + xy: 348, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-side rotate: false - xy: 511, 71 + xy: 358, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 705, 247 + xy: 880, 267 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-border rotate: false - xy: 317, 19 + xy: 1015, 343 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-elevation rotate: false - xy: 327, 19 + xy: 690, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 327, 19 + xy: 690, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-middle rotate: false - xy: 671, 103 + xy: 205, 6 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 671, 103 + xy: 205, 6 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-slope rotate: false - xy: 681, 103 + xy: 215, 6 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 border rotate: false - xy: 691, 99 + xy: 225, 6 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 787, 401 + xy: 478, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 817, 421 + xy: 318, 109 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 499, 121 + xy: 991, 423 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cross-3 rotate: false - xy: 255, 127 + xy: 763, 393 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 cross-4 rotate: false - xy: 305, 161 + xy: 769, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 enemyspawn rotate: false - xy: 787, 381 + xy: 349, 131 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 nuclearreactor-shadow rotate: false - xy: 831, 451 + xy: 370, 167 size: 26, 26 orig: 26, 26 offset: 0, 0 index: -1 place-arrow rotate: false - xy: 495, 91 + xy: 739, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 505, 91 + xy: 749, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 935, 441 + xy: 127, 12 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 rubble-1-0 rotate: false - xy: 423, 81 + xy: 305, 49 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 423, 63 + xy: 841, 329 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 261, 37 + xy: 859, 329 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 279, 43 + xy: 877, 329 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-3-0 rotate: false - xy: 991, 447 + xy: 635, 232 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rubble-3-1 rotate: false - xy: 991, 447 + xy: 635, 232 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shadow-1 rotate: false - xy: 851, 427 + xy: 151, 9 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-2 rotate: false - xy: 587, 212 + xy: 661, 219 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 shadow-3 rotate: false - xy: 859, 451 + xy: 398, 167 size: 26, 26 orig: 26, 26 offset: 0, 0 index: -1 shadow-4 rotate: false - xy: 1, 6 + xy: 721, 454 size: 34, 34 orig: 34, 34 offset: 0, 0 @@ -1014,749 +1000,777 @@ shadow-6 index: -1 shadow-round-1 rotate: false - xy: 863, 427 + xy: 163, 9 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-round-2 rotate: false - xy: 1001, 473 + xy: 679, 259 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 bridgeconduit-arrow rotate: false - xy: 607, 110 + xy: 235, 6 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconduit-bridge rotate: false - xy: 767, 420 + xy: 245, 6 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconduit-end rotate: false - xy: 767, 410 + xy: 255, 6 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-arrow rotate: false - xy: 767, 400 + xy: 267, 26 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-bridge rotate: false - xy: 767, 390 + xy: 265, 16 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-end rotate: false - xy: 767, 380 + xy: 265, 6 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 777, 391 + xy: 478, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top rotate: false - xy: 797, 411 + xy: 319, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-arrow rotate: false - xy: 867, 397 + xy: 953, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-bridge rotate: false - xy: 867, 387 + xy: 953, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-end rotate: false - xy: 867, 377 + xy: 963, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 889, 419 + xy: 982, 307 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-bottom rotate: false - xy: 899, 421 + xy: 973, 297 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-liquid rotate: false - xy: 909, 421 + xy: 973, 287 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-top rotate: false - xy: 919, 421 + xy: 983, 297 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidtank-bottom rotate: false - xy: 307, 135 + xy: 789, 367 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquidtank-liquid rotate: false - xy: 333, 135 + xy: 763, 341 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquidtank-top rotate: false - xy: 359, 135 + xy: 789, 341 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 pulseconduit-bottom rotate: false - xy: 515, 91 + xy: 728, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-top rotate: false - xy: 525, 91 + xy: 738, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 battery rotate: false - xy: 175, 128 + xy: 243, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-battery rotate: false - xy: 175, 128 + xy: 243, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 battery-large rotate: false - xy: 913, 453 + xy: 426, 170 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-battery-large rotate: false - xy: 913, 453 + xy: 426, 170 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 fusion-reactor rotate: false - xy: 339, 161 + xy: 803, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusion-reactor-bottom rotate: false - xy: 373, 161 + xy: 837, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusion-reactor-light rotate: false - xy: 489, 209 + xy: 871, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusion-reactor-plasma-0 rotate: false - xy: 523, 209 + xy: 905, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusion-reactor-plasma-1 rotate: false - xy: 131, 94 + xy: 939, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusion-reactor-plasma-2 rotate: false - xy: 129, 18 + xy: 973, 479 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusion-reactor-plasma-3 rotate: false - xy: 163, 18 + xy: 489, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 fusion-reactor-top rotate: false - xy: 771, 479 + xy: 523, 209 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 nuclear-reactor-center rotate: false - xy: 437, 136 + xy: 815, 367 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nuclear-reactor-lights rotate: false - xy: 587, 232 + xy: 815, 341 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 575, 91 + xy: 519, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 alloy-fuser rotate: false - xy: 887, 453 + xy: 737, 352 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-alloy-fuser rotate: false - xy: 887, 453 + xy: 737, 352 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 alloy-smelter rotate: false - xy: 679, 319 + xy: 1007, 495 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-alloy-smelter rotate: false - xy: 679, 319 + xy: 1007, 495 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 arc-smelter rotate: false - xy: 679, 301 + xy: 1007, 477 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-arc-smelter rotate: false - xy: 679, 301 + xy: 1007, 477 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor rotate: false - xy: 195, 106 + xy: 1007, 459 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame0 rotate: false - xy: 255, 109 + xy: 1007, 441 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame1 rotate: false - xy: 463, 132 + xy: 681, 221 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame2 rotate: false - xy: 481, 132 + xy: 661, 201 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-liquid rotate: false - xy: 499, 139 + xy: 175, 120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-top rotate: false - xy: 517, 139 + xy: 193, 120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blast-mixer rotate: false - xy: 535, 139 + xy: 211, 120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-blast-mixer rotate: false - xy: 535, 139 + xy: 211, 120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 centrifuge-liquid rotate: false - xy: 399, 99 + xy: 955, 423 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 589, 136 + xy: 859, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 589, 118 + xy: 841, 365 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 607, 120 + xy: 859, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator rotate: false - xy: 625, 124 + xy: 877, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 643, 124 + xy: 841, 347 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 737, 426 + xy: 859, 365 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 905, 431 + xy: 958, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-weaver rotate: false - xy: 351, 63 + xy: 269, 67 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 369, 81 + xy: 287, 85 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 369, 63 + xy: 269, 49 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plasteel-compressor-top rotate: false - xy: 387, 81 + xy: 287, 67 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter-top rotate: false - xy: 387, 63 + xy: 287, 49 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powersmelter-top rotate: false - xy: 405, 81 + xy: 305, 85 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 405, 81 + xy: 305, 85 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 535, 91 + xy: 748, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 545, 91 + xy: 489, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 441, 56 + xy: 508, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 core-open rotate: false - xy: 229, 117 + xy: 801, 419 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-1 rotate: false - xy: 307, 19 + xy: 1015, 363 + size: 8, 8 + orig: 8, 8 + offset: 0, 0 + index: -1 +block-1-top + rotate: false + xy: 1015, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-2 rotate: false - xy: 553, 139 + xy: 174, 102 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-2-top rotate: false - xy: 571, 139 + xy: 192, 102 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-3 rotate: false - xy: 965, 450 + xy: 347, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-3-top rotate: false - xy: 467, 176 + xy: 373, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-4 rotate: false - xy: 95, 73 + xy: 175, 138 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-4-top rotate: false - xy: 175, 138 + xy: 37, 8 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 arc rotate: false - xy: 195, 94 + xy: 119, 95 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 arc-heat rotate: false - xy: 612, 284 + xy: 894, 269 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 -crux - rotate: false - xy: 517, 121 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -crux-heat - rotate: false - xy: 535, 121 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 crux-panel-left rotate: false - xy: 553, 121 + xy: 841, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 crux-panel-right rotate: false - xy: 571, 121 + xy: 841, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +cyclone + rotate: false + xy: 763, 367 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +mass-driver-turret + rotate: false + xy: 763, 367 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +ripple + rotate: false + xy: 763, 367 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 duo rotate: false - xy: 807, 411 + xy: 339, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 fuse rotate: false - xy: 281, 135 + xy: 789, 393 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spectre rotate: false - xy: 281, 135 + xy: 789, 393 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 hail rotate: false - xy: 743, 360 + xy: 583, 194 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 scatter rotate: false - xy: 743, 360 + xy: 583, 194 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 lancer rotate: false - xy: 911, 441 + xy: 139, 28 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 923, 441 + xy: 115, 12 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 meltdown rotate: false - xy: 805, 479 + xy: 131, 94 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 +salvo + rotate: false + xy: 895, 329 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +salvo-heat + rotate: false + xy: 913, 329 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 scatter-heat rotate: false - xy: 947, 441 + xy: 139, 16 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 scorch rotate: false - xy: 827, 425 + xy: 151, 21 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 839, 427 + xy: 163, 21 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 swarmer rotate: false - xy: 297, 45 + xy: 931, 329 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave rotate: false - xy: 261, 19 + xy: 949, 365 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 279, 25 + xy: 949, 347 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dronefactory-top rotate: false - xy: 809, 431 + xy: 877, 365 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dronefactory-top-open rotate: false - xy: 731, 408 + xy: 895, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mech-factory rotate: false - xy: 411, 135 + xy: 815, 393 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dart-ship-factory-open rotate: false - xy: 755, 430 + xy: 877, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 delta-mech-factory-open rotate: false - xy: 773, 431 + xy: 895, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 reconstructor-open rotate: false - xy: 405, 63 + xy: 305, 67 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 repairpoint-turret rotate: false - xy: 555, 91 + xy: 499, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ship-factory rotate: false - xy: 679, 357 + xy: 635, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 791, 431 + xy: 859, 347 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 797, 401 + xy: 339, 131 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1770,7 +1784,7 @@ beam index: -1 beam-end rotate: false - xy: 209, 152 + xy: 234, 175 size: 18, 18 orig: 18, 18 offset: 0, 0 @@ -1784,2317 +1798,2338 @@ blank index: -1 bullet rotate: false - xy: 624, 258 + xy: 757, 479 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 bullet-back rotate: false - xy: 635, 258 + xy: 572, 247 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 casing rotate: false - xy: 209, 126 + xy: 847, 439 size: 2, 4 orig: 2, 4 offset: 0, 0 index: -1 clear rotate: false - xy: 229, 169 + xy: 234, 172 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 649, 232 + xy: 419, 121 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 error rotate: false - xy: 734, 292 + xy: 824, 291 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 laser rotate: false - xy: 655, 186 + xy: 760, 338 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 laser-end rotate: false - xy: 466, 202 + xy: 720, 332 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 laserfull rotate: false - xy: 1001, 493 + xy: 740, 332 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 minelaser rotate: false - xy: 1021, 499 + xy: 950, 281 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 minelaser-end rotate: false - xy: 566, 290 + xy: 659, 259 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 scorch1 rotate: false - xy: 197, 25 + xy: 650, 258 size: 7, 25 orig: 7, 25 offset: 0, 0 index: -1 scorch2 rotate: false - xy: 623, 179 + xy: 694, 352 size: 7, 25 orig: 7, 25 offset: 0, 0 index: -1 scorch3 rotate: false - xy: 623, 152 + xy: 165, 101 size: 7, 25 orig: 7, 25 offset: 0, 0 index: -1 scorch4 rotate: false - xy: 633, 205 + xy: 97, 18 size: 7, 25 orig: 7, 25 offset: 0, 0 index: -1 scorch5 rotate: false - xy: 632, 178 + xy: 106, 18 size: 7, 25 orig: 7, 25 offset: 0, 0 index: -1 shell rotate: false - xy: 646, 258 + xy: 700, 295 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shell-back rotate: false - xy: 661, 162 + xy: 711, 295 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shot rotate: false - xy: 441, 46 + xy: 508, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 transfer rotate: false - xy: 1017, 459 + xy: 764, 300 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 471, 42 + xy: 495, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 transfer-end rotate: false - xy: 677, 337 + xy: 681, 239 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 block-icon-arc rotate: false - xy: 632, 160 - size: 16, 16 - orig: 16, 16 + xy: 466, 202 + size: 18, 18 + orig: 18, 18 offset: 0, 0 index: -1 block-icon-biomattercompressor rotate: false - xy: 697, 339 + xy: 210, 102 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-blast-drill rotate: false - xy: 493, 183 + xy: 399, 141 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-bridgeconduit rotate: false - xy: 337, 19 + xy: 722, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconduit rotate: false - xy: 337, 19 + xy: 722, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-bridgeconveyor rotate: false - xy: 347, 19 + xy: 143, 50 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor rotate: false - xy: 347, 19 + xy: 143, 50 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-carbide-drill rotate: false - xy: 357, 19 + xy: 143, 40 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-carbide-wall rotate: false - xy: 367, 19 + xy: 124, 2 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 carbide-wall rotate: false - xy: 367, 19 + xy: 124, 2 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-carbide-wall-large rotate: false - xy: 697, 321 + xy: 229, 120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 carbide-wall-large rotate: false - xy: 697, 321 + xy: 229, 120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-centrifuge rotate: false - xy: 697, 303 + xy: 228, 102 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 centrifuge rotate: false - xy: 697, 303 + xy: 228, 102 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-combustion-generator rotate: false - xy: 377, 19 + xy: 134, 2 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 377, 19 + xy: 134, 2 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conduit rotate: false - xy: 387, 19 + xy: 729, 237 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conveyor rotate: false - xy: 397, 19 + xy: 838, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 397, 19 + xy: 838, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-core rotate: false - xy: 519, 183 + xy: 452, 170 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 core rotate: false - xy: 519, 183 + xy: 452, 170 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-cryofluidmixer rotate: false - xy: 715, 341 + xy: 247, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-cultivator rotate: false - xy: 715, 323 + xy: 265, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +block-icon-cyclone + rotate: false + xy: 314, 167 + size: 26, 26 + orig: 26, 26 + offset: 0, 0 + index: -1 +block-icon-ripple + rotate: false + xy: 314, 167 + size: 26, 26 + orig: 26, 26 + offset: 0, 0 + index: -1 block-icon-dart-ship-factory rotate: false - xy: 715, 305 + xy: 283, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dart-ship-factory rotate: false - xy: 715, 305 + xy: 283, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-deepwater rotate: false - xy: 407, 19 + xy: 848, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 407, 19 + xy: 848, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-deflector-wall rotate: false - xy: 417, 19 + xy: 858, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deflector-wall rotate: false - xy: 417, 19 + xy: 858, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 417, 19 + xy: 858, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-wall rotate: false - xy: 417, 19 + xy: 858, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-deflector-wall-large rotate: false - xy: 273, 109 + xy: 301, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 deflector-wall-large rotate: false - xy: 273, 109 + xy: 301, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-wall-large rotate: false - xy: 273, 109 + xy: 301, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-phase-wall-large rotate: false - xy: 273, 109 + xy: 301, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-delta-mech-factory rotate: false - xy: 291, 117 + xy: 179, 84 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 delta-mech-factory rotate: false - xy: 291, 117 + xy: 179, 84 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-dirt rotate: false - xy: 427, 19 + xy: 868, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 427, 19 + xy: 868, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-door rotate: false - xy: 295, 9 + xy: 878, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 295, 9 + xy: 878, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-door-large rotate: false - xy: 309, 117 + xy: 179, 66 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large rotate: false - xy: 309, 117 + xy: 179, 66 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-dronefactory rotate: false - xy: 327, 117 + xy: 197, 84 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-droppoint rotate: false - xy: 305, 9 + xy: 888, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 droppoint rotate: false - xy: 305, 9 + xy: 888, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-duo rotate: false - xy: 315, 9 - size: 8, 8 - orig: 8, 8 + xy: 906, 269 + size: 10, 10 + orig: 10, 10 offset: 0, 0 index: -1 block-icon-fuse rotate: false - xy: 545, 183 - size: 24, 24 - orig: 24, 24 + xy: 342, 167 + size: 26, 26 + orig: 26, 26 offset: 0, 0 index: -1 block-icon-fusion-reactor rotate: false - xy: 37, 8 + xy: 721, 420 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-grass rotate: false - xy: 325, 9 + xy: 898, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass1 rotate: false - xy: 325, 9 + xy: 898, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-hail rotate: false - xy: 335, 9 - size: 8, 8 - orig: 8, 8 + xy: 918, 269 + size: 10, 10 + orig: 10, 10 offset: 0, 0 index: -1 block-icon-ice rotate: false - xy: 345, 9 + xy: 908, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice1 rotate: false - xy: 345, 9 + xy: 908, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-icerock rotate: false - xy: 355, 9 + xy: 918, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 355, 9 + xy: 918, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-incinerator rotate: false - xy: 365, 9 + xy: 928, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 365, 9 + xy: 928, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemsource rotate: false - xy: 375, 9 + xy: 938, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 375, 9 + xy: 938, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemvoid rotate: false - xy: 385, 9 + xy: 948, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 385, 9 + xy: 948, 259 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-junction rotate: false - xy: 395, 9 + xy: 729, 227 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 junction rotate: false - xy: 395, 9 + xy: 729, 227 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-lancer rotate: false - xy: 345, 117 - size: 16, 16 - orig: 16, 16 + xy: 566, 290 + size: 18, 18 + orig: 18, 18 offset: 0, 0 index: -1 block-icon-large-solar-panel rotate: false - xy: 571, 183 + xy: 586, 284 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 large-solar-panel rotate: false - xy: 571, 183 + xy: 586, 284 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-laser-drill rotate: false - xy: 363, 117 + xy: 197, 66 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-laserconduit rotate: false - xy: 405, 9 + xy: 727, 217 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit rotate: false - xy: 405, 9 + xy: 727, 217 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-laserconveyor rotate: false - xy: 415, 9 + xy: 739, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor rotate: false - xy: 415, 9 + xy: 739, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-lava rotate: false - xy: 425, 9 + xy: 739, 231 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 425, 9 + xy: 739, 231 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquidjunction rotate: false - xy: 715, 237 + xy: 739, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 715, 237 + xy: 739, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquidrouter rotate: false - xy: 437, 19 + xy: 426, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquidsource rotate: false - xy: 435, 9 + xy: 436, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 435, 9 + xy: 436, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquidtank rotate: false - xy: 467, 150 + xy: 612, 284 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-mass-driver rotate: false - xy: 493, 157 + xy: 638, 285 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mass-driver rotate: false - xy: 493, 157 + xy: 638, 285 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 core-top rotate: false - xy: 493, 157 + xy: 638, 285 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-mechanical-pump rotate: false - xy: 712, 225 + xy: 446, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 712, 225 + xy: 446, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-meltdown rotate: false - xy: 95, 39 - size: 32, 32 - orig: 32, 32 + xy: 1, 6 + size: 34, 34 + orig: 34, 34 offset: 0, 0 index: -1 block-icon-melter rotate: false - xy: 712, 215 + xy: 456, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 712, 215 + xy: 456, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-metalfloor rotate: false - xy: 712, 205 + xy: 466, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 712, 205 + xy: 466, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-multiplexer rotate: false - xy: 381, 117 + xy: 215, 84 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 multiplexer rotate: false - xy: 381, 117 + xy: 215, 84 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-nuclear-reactor rotate: false - xy: 519, 157 + xy: 664, 279 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nuclear-reactor rotate: false - xy: 519, 157 + xy: 664, 279 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-oil rotate: false - xy: 712, 195 + xy: 425, 150 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 712, 195 + xy: 425, 150 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-oil-extractor rotate: false - xy: 545, 157 + xy: 572, 258 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-oilrefinery rotate: false - xy: 712, 185 + xy: 435, 150 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 712, 185 + xy: 435, 150 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-overflowgate rotate: false - xy: 712, 175 + xy: 445, 150 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 overflowgate rotate: false - xy: 712, 175 + xy: 445, 150 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-weaver rotate: false - xy: 399, 117 + xy: 215, 66 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-plasma-drill rotate: false - xy: 271, 161 + xy: 209, 138 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 block-icon-plasteel-compressor rotate: false - xy: 417, 117 + xy: 233, 84 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plasteel-compressor rotate: false - xy: 417, 117 + xy: 233, 84 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-power-node rotate: false - xy: 712, 165 + xy: 455, 150 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 power-node rotate: false - xy: 712, 165 + xy: 455, 150 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-power-node-large rotate: false - xy: 213, 98 + xy: 233, 66 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 213, 98 + xy: 233, 66 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-powerinfinite rotate: false - xy: 959, 440 + xy: 465, 150 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 959, 440 + xy: 465, 150 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-powervoid rotate: false - xy: 969, 440 + xy: 425, 140 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 969, 440 + xy: 425, 140 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulseconduit rotate: false - xy: 979, 440 + xy: 435, 140 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulverizer rotate: false - xy: 989, 437 + xy: 445, 140 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-reconstructor rotate: false - xy: 231, 99 + xy: 179, 48 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dronefactory rotate: false - xy: 231, 99 + xy: 179, 48 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 reconstructor rotate: false - xy: 231, 99 + xy: 179, 48 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-repairpoint rotate: false - xy: 999, 437 + xy: 455, 140 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 repairpoint rotate: false - xy: 999, 437 + xy: 455, 140 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-resupplypoint rotate: false - xy: 1009, 437 + xy: 465, 140 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 resupplypoint rotate: false - xy: 1009, 437 + xy: 465, 140 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -block-icon-ripple - rotate: false - xy: 571, 157 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 block-icon-rock rotate: false - xy: 435, 125 + xy: 177, 26 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock1 rotate: false - xy: 435, 125 + xy: 177, 26 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rotary-pump rotate: false - xy: 207, 80 + xy: 197, 48 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 207, 80 + xy: 197, 48 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-router rotate: false - xy: 435, 115 + xy: 187, 26 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 435, 115 + xy: 187, 26 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rtg-generator rotate: false - xy: 435, 105 + xy: 197, 26 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 435, 105 + xy: 197, 26 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 +block-icon-salvo + rotate: false + xy: 755, 425 + size: 18, 18 + orig: 18, 18 + offset: 0, 0 + index: -1 block-icon-sand rotate: false - xy: 445, 126 + xy: 207, 26 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 445, 126 + xy: 207, 26 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-scorch rotate: false - xy: 445, 116 - size: 8, 8 - orig: 8, 8 + xy: 930, 269 + size: 10, 10 + orig: 10, 10 offset: 0, 0 index: -1 block-icon-separator rotate: false - xy: 445, 106 + xy: 217, 26 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 445, 106 + xy: 217, 26 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shrub rotate: false - xy: 710, 153 + xy: 227, 26 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrub rotate: false - xy: 710, 153 + xy: 227, 26 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-silicon-smelter rotate: false - xy: 207, 62 + xy: 215, 48 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 207, 62 + xy: 215, 48 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-smelter rotate: false - xy: 710, 143 + xy: 237, 26 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 710, 143 + xy: 237, 26 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-snow rotate: false - xy: 710, 133 + xy: 247, 26 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 710, 133 + xy: 247, 26 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-solar-panel rotate: false - xy: 661, 140 + xy: 257, 26 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 661, 140 + xy: 257, 26 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sortedunloader rotate: false - xy: 661, 130 + xy: 175, 16 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 661, 130 + xy: 175, 16 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sorter rotate: false - xy: 661, 120 + xy: 185, 16 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 661, 120 + xy: 185, 16 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-space rotate: false - xy: 661, 110 + xy: 195, 16 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space rotate: false - xy: 661, 110 + xy: 195, 16 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 +block-icon-spectre + rotate: false + xy: 627, 337 + size: 34, 34 + orig: 34, 34 + offset: 0, 0 + index: -1 block-icon-splitter rotate: false - xy: 671, 133 + xy: 205, 16 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 671, 133 + xy: 205, 16 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-stone rotate: false - xy: 671, 123 + xy: 215, 16 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone1 rotate: false - xy: 671, 123 + xy: 215, 16 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-stoneformer rotate: false - xy: 681, 133 + xy: 225, 16 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 681, 133 + xy: 225, 16 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-swarmer rotate: false - xy: 207, 44 - size: 16, 16 - orig: 16, 16 + xy: 827, 425 + size: 18, 18 + orig: 18, 18 offset: 0, 0 index: -1 block-icon-thermal-generator rotate: false - xy: 206, 26 + xy: 233, 48 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 206, 26 + xy: 233, 48 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermal-pump rotate: false - xy: 632, 142 + xy: 847, 419 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 632, 142 + xy: 847, 419 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermite-mixer rotate: false - xy: 291, 99 + xy: 865, 419 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermite-mixer rotate: false - xy: 291, 99 + xy: 865, 419 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thorium-wall rotate: false - xy: 671, 113 + xy: 235, 16 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 671, 113 + xy: 235, 16 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-thorium-wall-large rotate: false - xy: 309, 99 + xy: 883, 419 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 309, 99 + xy: 883, 419 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-titanium-conveyor rotate: false - xy: 681, 123 + xy: 245, 16 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor rotate: false - xy: 681, 123 + xy: 245, 16 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-tungsten-drill rotate: false - xy: 681, 113 + xy: 255, 16 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-tungsten-wall rotate: false - xy: 691, 129 + xy: 175, 6 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten-wall rotate: false - xy: 691, 129 + xy: 175, 6 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-tungsten-wall-large rotate: false - xy: 327, 99 + xy: 901, 419 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 tungsten-wall-large rotate: false - xy: 327, 99 + xy: 901, 419 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-turbine-generator rotate: false - xy: 345, 99 + xy: 919, 419 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 turbine-generator rotate: false - xy: 345, 99 + xy: 919, 419 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-unloader rotate: false - xy: 691, 119 + xy: 185, 6 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unloader rotate: false - xy: 691, 119 + xy: 185, 6 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-vault rotate: false - xy: 229, 143 + xy: 598, 258 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 vault rotate: false - xy: 229, 143 + xy: 598, 258 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-warpgate rotate: false - xy: 572, 258 + xy: 624, 258 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 warpgate rotate: false - xy: 572, 258 + xy: 624, 258 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-water rotate: false - xy: 691, 109 + xy: 195, 6 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 691, 109 + xy: 195, 6 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-water-extractor rotate: false - xy: 363, 99 + xy: 937, 419 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-wave rotate: false - xy: 381, 99 - size: 16, 16 - orig: 16, 16 + xy: 694, 306 + size: 18, 18 + orig: 18, 18 offset: 0, 0 index: -1 mech-icon-alpha-mech rotate: false - xy: 672, 209 + xy: 852, 281 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-dart-ship rotate: false - xy: 686, 223 + xy: 866, 281 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-delta-mech rotate: false - xy: 686, 209 + xy: 880, 281 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-halberd-ship rotate: false - xy: 672, 195 + xy: 894, 281 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-javelin-ship rotate: false - xy: 672, 195 + xy: 894, 281 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-trident-ship rotate: false - xy: 672, 195 + xy: 894, 281 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-omega-mech rotate: false - xy: 686, 195 + xy: 908, 281 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-tau-mech rotate: false - xy: 686, 195 + xy: 908, 281 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ore-coal-grass1 rotate: false - xy: 725, 243 + xy: 988, 267 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass2 rotate: false - xy: 725, 233 + xy: 988, 257 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass3 rotate: false - xy: 722, 223 + xy: 681, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice1 rotate: false - xy: 722, 213 + xy: 679, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice2 rotate: false - xy: 722, 203 + xy: 737, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice3 rotate: false - xy: 722, 193 + xy: 275, 16 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 722, 183 + xy: 275, 6 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 722, 173 + xy: 285, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 722, 163 + xy: 285, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow1 rotate: false - xy: 720, 153 + xy: 295, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow2 rotate: false - xy: 720, 143 + xy: 295, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow3 rotate: false - xy: 720, 133 + xy: 305, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 735, 243 + xy: 305, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 735, 233 + xy: 315, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 732, 223 + xy: 315, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass1 rotate: false - xy: 732, 213 + xy: 321, 39 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass2 rotate: false - xy: 732, 203 + xy: 658, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass3 rotate: false - xy: 732, 193 + xy: 668, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice1 rotate: false - xy: 732, 183 + xy: 678, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice2 rotate: false - xy: 732, 173 + xy: 476, 160 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice3 rotate: false - xy: 732, 163 + xy: 475, 150 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 730, 153 + xy: 475, 140 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 730, 143 + xy: 479, 130 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 730, 133 + xy: 479, 120 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow1 rotate: false - xy: 742, 223 + xy: 1007, 333 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow2 rotate: false - xy: 742, 213 + xy: 1007, 323 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow3 rotate: false - xy: 742, 203 + xy: 898, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 742, 193 + xy: 908, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 742, 183 + xy: 918, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 742, 173 + xy: 928, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass1 rotate: false - xy: 742, 163 + xy: 938, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass2 rotate: false - xy: 740, 153 + xy: 948, 249 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass3 rotate: false - xy: 740, 143 + xy: 958, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice1 rotate: false - xy: 740, 133 + xy: 968, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice2 rotate: false - xy: 445, 9 + xy: 978, 247 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice3 rotate: false - xy: 455, 122 + xy: 988, 247 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 455, 112 + xy: 689, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 465, 122 + xy: 688, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 465, 112 + xy: 747, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow1 rotate: false - xy: 475, 122 + xy: 325, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow2 rotate: false - xy: 475, 112 + xy: 325, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow3 rotate: false - xy: 485, 122 + xy: 329, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 485, 112 + xy: 339, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 455, 102 + xy: 349, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 465, 102 + xy: 359, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass1 rotate: false - xy: 475, 102 + xy: 369, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass2 rotate: false - xy: 485, 102 + xy: 379, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass3 rotate: false - xy: 495, 111 + xy: 389, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice1 rotate: false - xy: 505, 111 + xy: 399, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice2 rotate: false - xy: 515, 111 + xy: 409, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice3 rotate: false - xy: 525, 111 + xy: 419, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 535, 111 + xy: 429, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 545, 111 + xy: 439, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 555, 111 + xy: 449, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow1 rotate: false - xy: 565, 111 + xy: 459, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow2 rotate: false - xy: 575, 111 + xy: 469, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow3 rotate: false - xy: 495, 101 + xy: 479, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 505, 101 + xy: 958, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 515, 101 + xy: 968, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 525, 101 + xy: 978, 237 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-grass1 rotate: false - xy: 535, 101 + xy: 988, 237 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-grass2 rotate: false - xy: 545, 101 + xy: 699, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-grass3 rotate: false - xy: 555, 101 + xy: 709, 209 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-ice1 rotate: false - xy: 565, 101 + xy: 699, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-ice2 rotate: false - xy: 575, 101 + xy: 709, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-ice3 rotate: false - xy: 585, 108 + xy: 698, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-sand1 rotate: false - xy: 595, 108 + xy: 708, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-sand2 rotate: false - xy: 585, 98 + xy: 327, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-sand3 rotate: false - xy: 595, 98 + xy: 719, 207 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-snow1 rotate: false - xy: 605, 100 + xy: 719, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-snow2 rotate: false - xy: 445, 96 + xy: 718, 187 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-snow3 rotate: false - xy: 455, 92 + xy: 729, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-stone1 rotate: false - xy: 465, 92 + xy: 739, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-stone2 rotate: false - xy: 475, 92 + xy: 749, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-stone3 rotate: false - xy: 485, 92 + xy: 729, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unit-icon-scout rotate: false - xy: 748, 262 + xy: 852, 267 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-titan rotate: false - xy: 369, 45 + xy: 894, 311 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-icon-vtol rotate: false - xy: 762, 262 + xy: 866, 267 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol rotate: false - xy: 762, 262 + xy: 866, 267 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 859, 417 + xy: 449, 130 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 837, 407 + xy: 459, 130 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-carbide rotate: false - xy: 837, 397 + xy: 429, 120 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 847, 407 + xy: 439, 120 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 837, 387 + xy: 449, 120 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-phase-matter rotate: false - xy: 847, 397 + xy: 459, 120 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plasteel rotate: false - xy: 857, 407 + xy: 469, 130 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 837, 377 + xy: 469, 120 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 847, 387 + xy: 997, 333 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 857, 397 + xy: 997, 323 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 847, 377 + xy: 949, 321 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thermite rotate: false - xy: 857, 387 + xy: 948, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 857, 377 + xy: 952, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 869, 417 + xy: 958, 311 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-tungsten rotate: false - xy: 867, 407 + xy: 962, 301 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon rotate: false - xy: 945, 431 + xy: 972, 307 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 alpha-mech rotate: false - xy: 195, 124 + xy: 754, 284 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 alpha-mech-base rotate: false - xy: 612, 296 + xy: 701, 233 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-base rotate: false - xy: 612, 296 + xy: 701, 233 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 omega-mech-base rotate: false - xy: 612, 296 + xy: 701, 233 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tau-mech-base rotate: false - xy: 612, 296 + xy: 701, 233 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-base rotate: false - xy: 612, 296 + xy: 701, 233 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 alpha-mech-leg rotate: false - xy: 572, 244 + xy: 715, 233 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 omega-mech-leg rotate: false - xy: 572, 244 + xy: 715, 233 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tau-mech-leg rotate: false - xy: 572, 244 + xy: 715, 233 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout-leg rotate: false - xy: 572, 244 + xy: 715, 233 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech rotate: false - xy: 706, 289 + xy: 768, 291 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-leg rotate: false - xy: 706, 275 + xy: 782, 291 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 omega-mech rotate: false - xy: 686, 181 + xy: 754, 270 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tau-mech rotate: false - xy: 686, 181 + xy: 754, 270 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dart-ship rotate: false - xy: 658, 201 + xy: 733, 251 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 halberd-ship rotate: false - xy: 762, 290 + xy: 810, 277 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 javelin-ship rotate: false - xy: 762, 290 + xy: 810, 277 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 trident-ship rotate: false - xy: 762, 290 + xy: 810, 277 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -4143,7 +4178,7 @@ shape-7 index: -1 border rotate: false - xy: 651, 331 + xy: 71, 2 size: 24, 40 split: 5, 5, 5, 10 orig: 24, 40 @@ -4151,7 +4186,7 @@ border index: -1 button rotate: false - xy: 129, 52 + xy: 877, 437 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -4159,7 +4194,7 @@ button index: -1 textarea rotate: false - xy: 129, 52 + xy: 877, 437 size: 24, 40 split: 10, 10, 9, 11 orig: 24, 40 @@ -4167,7 +4202,7 @@ textarea index: -1 button-down rotate: false - xy: 745, 448 + xy: 737, 378 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -4175,7 +4210,7 @@ button-down index: -1 button-over rotate: false - xy: 745, 448 + xy: 737, 378 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -4183,7 +4218,7 @@ button-over index: -1 button-map rotate: false - xy: 705, 385 + xy: 851, 437 size: 24, 40 split: 10, 10, 5, 10 orig: 24, 40 @@ -4191,7 +4226,7 @@ button-map index: -1 button-map-down rotate: false - xy: 679, 383 + xy: 557, 201 size: 24, 40 split: 10, 10, 5, 10 orig: 24, 40 @@ -4199,7 +4234,7 @@ button-map-down index: -1 button-map-over rotate: false - xy: 679, 383 + xy: 557, 201 size: 24, 40 split: 10, 10, 5, 10 orig: 24, 40 @@ -4207,7 +4242,7 @@ button-map-over index: -1 button-select rotate: false - xy: 598, 258 + xy: 775, 419 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -4215,42 +4250,42 @@ button-select index: -1 check-off rotate: false - xy: 165, 94 + xy: 663, 339 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-on rotate: false - xy: 407, 161 + xy: 664, 305 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-on-over rotate: false - xy: 437, 162 + xy: 791, 445 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 check-over rotate: false - xy: 557, 209 + xy: 821, 445 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 clear rotate: false - xy: 731, 360 + xy: 942, 269 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 cursor rotate: false - xy: 493, 151 + xy: 466, 196 size: 4, 4 orig: 4, 4 offset: 0, 0 @@ -4271,672 +4306,672 @@ discord-banner-over index: -1 controller-cursor rotate: false - xy: 417, 99 + xy: 973, 423 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-about rotate: false - xy: 255, 153 + xy: 95, 45 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-add rotate: false - xy: 721, 428 + xy: 97, 2 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin rotate: false - xy: 213, 116 + xy: 1009, 425 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin-small rotate: false - xy: 271, 153 + xy: 111, 53 size: 6, 6 orig: 6, 6 offset: 0, 0 index: -1 icon-areaDelete rotate: false - xy: 279, 97 + xy: 595, 194 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow rotate: false - xy: 731, 390 + xy: 913, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-16 rotate: false - xy: 731, 390 + xy: 913, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 659, 229 + xy: 607, 194 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 703, 235 + xy: 619, 194 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 700, 223 + xy: 631, 194 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 700, 211 + xy: 643, 194 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 731, 372 + xy: 877, 347 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 123, 2 + xy: 1009, 409 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-break rotate: false - xy: 733, 342 + xy: 895, 365 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 733, 324 + xy: 913, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 700, 199 + xy: 119, 48 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 733, 306 + xy: 931, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 700, 187 + xy: 131, 48 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 700, 175 + xy: 153, 45 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 700, 163 + xy: 165, 45 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 139, 2 + xy: 949, 331 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 155, 2 + xy: 967, 407 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 650, 150 + xy: 153, 33 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 171, 2 + xy: 983, 407 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 187, 2 + xy: 967, 391 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 607, 138 + xy: 967, 375 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 297, 29 + xy: 983, 391 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-elevation rotate: false - xy: 225, 80 + xy: 895, 347 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 225, 62 + xy: 913, 365 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 313, 29 + xy: 967, 359 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 225, 44 + xy: 931, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 224, 26 + xy: 913, 347 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 329, 29 + xy: 983, 375 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 749, 408 + xy: 931, 365 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 345, 29 + xy: 983, 359 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 749, 390 + xy: 931, 347 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 361, 29 + xy: 967, 343 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 377, 29 + xy: 983, 343 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-github rotate: false - xy: 393, 29 + xy: 965, 327 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 409, 29 + xy: 981, 327 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 749, 372 + xy: 714, 308 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 662, 150 + xy: 165, 33 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 674, 155 + xy: 177, 36 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 425, 29 + xy: 1009, 393 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 279, 9 + xy: 999, 377 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 686, 155 + xy: 189, 36 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 626, 285 + xy: 999, 361 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 849, 417 + xy: 439, 130 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-line rotate: false - xy: 751, 340 + xy: 732, 314 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 624, 269 + xy: 999, 345 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 698, 151 + xy: 201, 36 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 642, 285 + xy: 732, 298 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 751, 322 + xy: 750, 314 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 751, 304 + xy: 768, 323 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 243, 81 + xy: 786, 323 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 674, 143 + xy: 213, 36 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 686, 143 + xy: 225, 36 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 243, 63 + xy: 804, 323 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-none rotate: false - xy: 698, 139 + xy: 237, 36 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 625, 112 + xy: 249, 36 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 243, 45 + xy: 822, 323 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 640, 269 + xy: 748, 298 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 261, 91 + xy: 768, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 637, 112 + xy: 261, 36 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 658, 289 + xy: 840, 295 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 649, 112 + xy: 273, 37 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 827, 437 + xy: 285, 37 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 839, 439 + xy: 297, 37 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 674, 285 + xy: 856, 295 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 261, 73 + xy: 786, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 658, 273 + xy: 872, 295 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 674, 269 + xy: 888, 295 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 261, 55 + xy: 804, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 639, 242 + xy: 904, 295 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 657, 257 + xy: 920, 295 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 655, 241 + xy: 936, 295 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 673, 253 + xy: 690, 279 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 671, 237 + xy: 699, 263 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 279, 79 + xy: 822, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 279, 61 + xy: 246, 102 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 851, 439 + xy: 309, 37 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 297, 81 + xy: 264, 103 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 690, 285 + xy: 706, 279 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 863, 439 + xy: 115, 36 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 875, 439 + xy: 127, 36 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 690, 269 + xy: 701, 247 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 297, 63 + xy: 282, 103 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 689, 253 + xy: 715, 263 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 687, 237 + xy: 717, 247 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 315, 81 + xy: 300, 103 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 887, 441 + xy: 115, 24 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 899, 441 + xy: 127, 24 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 642, 216 + xy: 722, 279 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 315, 63 + xy: 251, 84 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 642, 200 + xy: 738, 282 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -4950,7 +4985,7 @@ logotext index: -1 pane rotate: false - xy: 97, 1 + xy: 981, 441 size: 24, 36 split: 10, 10, 5, 5 orig: 24, 36 @@ -4958,7 +4993,7 @@ pane index: -1 pane-button rotate: false - xy: 71, 1 + xy: 955, 441 size: 24, 36 split: 10, 10, 5, 5 orig: 24, 36 @@ -4966,7 +5001,7 @@ pane-button index: -1 scroll rotate: false - xy: 975, 476 + xy: 153, 57 size: 24, 35 split: 10, 10, 6, 5 orig: 24, 35 @@ -4974,7 +5009,7 @@ scroll index: -1 scroll-horizontal rotate: false - xy: 234, 169 + xy: 627, 311 size: 35, 24 split: 6, 5, 10, 10 orig: 35, 24 @@ -4991,7 +5026,7 @@ scroll-knob-horizontal index: -1 scroll-knob-vertical rotate: false - xy: 181, 52 + xy: 929, 437 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -4999,7 +5034,7 @@ scroll-knob-vertical index: -1 scroll-knob-vertical-black rotate: false - xy: 155, 52 + xy: 903, 437 size: 24, 40 split: 10, 10, 6, 10 orig: 24, 40 @@ -5007,42 +5042,42 @@ scroll-knob-vertical-black index: -1 selection rotate: false - xy: 587, 209 + xy: 732, 295 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 slider rotate: false - xy: 623, 142 + xy: 655, 196 size: 1, 8 orig: 1, 8 offset: 0, 0 index: -1 slider-knob rotate: false - xy: 627, 327 + xy: 95, 61 size: 22, 44 orig: 22, 44 offset: 0, 0 index: -1 slider-knob-down rotate: false - xy: 721, 444 + xy: 679, 379 size: 22, 44 orig: 22, 44 offset: 0, 0 index: -1 slider-knob-over rotate: false - xy: 721, 444 + xy: 679, 379 size: 22, 44 orig: 22, 44 offset: 0, 0 index: -1 slider-vertical rotate: false - xy: 965, 476 + xy: 722, 295 size: 8, 1 orig: 8, 1 offset: 0, 0 @@ -5070,7 +5105,7 @@ text-sides-over index: -1 textfield rotate: false - xy: 801, 449 + xy: 284, 165 size: 28, 28 split: 6, 6, 6, 6 orig: 28, 28 @@ -5078,7 +5113,7 @@ textfield index: -1 textfield-over rotate: false - xy: 771, 449 + xy: 254, 165 size: 28, 28 split: 2, 2, 2, 2 orig: 28, 28 @@ -5109,98 +5144,98 @@ window-empty index: -1 drone rotate: false - xy: 720, 277 + xy: 810, 291 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-drone rotate: false - xy: 720, 277 + xy: 810, 291 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 monsoon rotate: false - xy: 209, 132 + xy: 661, 239 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 unit-icon-monsoon rotate: false - xy: 209, 132 + xy: 661, 239 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 scout rotate: false - xy: 672, 167 + xy: 782, 263 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 titan rotate: false - xy: 315, 45 + xy: 840, 311 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-base rotate: false - xy: 333, 45 + xy: 858, 311 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-leg rotate: false - xy: 351, 45 + xy: 876, 311 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 vtol-flame rotate: false - xy: 650, 162 + xy: 113, 1 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 641, 186 + xy: 713, 219 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 chain-blaster-equip rotate: false - xy: 658, 215 + xy: 731, 265 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flakgun-equip rotate: false - xy: 734, 278 + xy: 768, 277 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flamethrower-equip rotate: false - xy: 748, 290 + xy: 782, 277 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 686, 167 + xy: 796, 263 size: 12, 12 orig: 12, 12 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 5450225198..583c5327b2 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/blocks/TurretBlocks.java b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java index 4632470522..9b730feb8c 100644 --- a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java @@ -157,7 +157,7 @@ public class TurretBlocks extends BlockList implements ContentList { size = 3; }}; - spectre = new ItemTurret("eraser") {{ + spectre = new ItemTurret("spectre") {{ ammoTypes = new AmmoType[]{AmmoTypes.bulletTungsten, AmmoTypes.bulletLead, AmmoTypes.bulletCarbide, AmmoTypes.bulletThermite, AmmoTypes.bulletThorium, AmmoTypes.bulletSilicon}; reload = 25f; restitution = 0.03f; diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java index b02cbd577b..baef0eae86 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java @@ -15,6 +15,7 @@ import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.type.Recipe; import io.anuke.mindustry.ui.dialogs.FloatingDialog; import io.anuke.mindustry.world.Block; +import io.anuke.mindustry.world.blocks.defense.turrets.Turret; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.BlockStats; import io.anuke.mindustry.world.meta.StatCategory; @@ -364,7 +365,13 @@ public class BlocksFragment implements Fragment{ ScrollPane pane = new ScrollPane(table, "clear"); table.table(title -> { - title.addImage(Draw.region("block-icon-" + block.name)).size(8 * 6); + int size = 8*6; + + if(block instanceof Turret){ + size = (8 * block.size + 2) * (7 - block.size*2); + } + + title.addImage(Draw.region("block-icon-" + block.name)).size(size); title.add("[accent]" + block.formalName).padLeft(5); }); diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java index bf56c187bd..1783f26a25 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/core/src/io/anuke/mindustry/world/Block.java @@ -374,10 +374,7 @@ public class Block extends BaseBlock implements UnlockableContent{ /**Returns a list of icon regions that have been cropped to 8x8*/ public TextureRegion[] getCompactIcon(){ if(compactIcon == null) { - compactIcon = new TextureRegion[getIcon().length]; - for (int i = 0; i < compactIcon.length; i++) { - compactIcon[i] = iconRegion(getIcon()[i]); - } + compactIcon = new TextureRegion[]{iconRegion(Draw.region("block-icon-" + name))}; } return compactIcon; } diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java index 2b83867eb7..80f84af7ed 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java @@ -24,7 +24,7 @@ public abstract class LiquidTurret extends Turret { public void setStats() { super.setStats(); - stats.add(BlockStat.inputItems, new LiquidFilterValue(item -> liquidAmmoMap.containsKey(item))); + stats.add(BlockStat.inputLiquid, new LiquidFilterValue(item -> liquidAmmoMap.containsKey(item))); } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java index 56180b9e9c..364210a969 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java @@ -56,15 +56,20 @@ public abstract class Turret extends Block{ protected float rotatespeed = 5f; //in degrees per tick protected float shootCone = 8f; protected float shootShake = 0f; + protected Translator tr = new Translator(); protected Translator tr2 = new Translator(); - protected String base = null; //name of the region to draw under turret, usually null + + protected TextureRegion baseRegion; + protected TextureRegion heatRegion; + protected TextureRegion baseTopRegion; + protected BiConsumer drawer = (tile, entity) -> Draw.rect(name, tile.drawx() + tr2.x, tile.drawy() + tr2.y, entity.rotation - 90); protected BiConsumer heatDrawer = (tile, entity) ->{ Graphics.setAdditiveBlending(); Draw.color(heatColor); Draw.alpha(entity.heat); - Draw.rect(name + "-heat", tile.drawx() + tr2.x, tile.drawy() + tr2.y, entity.rotation - 90); + Draw.rect(heatRegion, tile.drawx() + tr2.x, tile.drawy() + tr2.y, entity.rotation - 90); Graphics.setNormalBlending(); }; @@ -82,6 +87,15 @@ public abstract class Turret extends Block{ viewRange = range; } + @Override + public void load() { + super.load(); + + baseRegion = Draw.region("block-" + size); + baseTopRegion = Draw.region("block-" +size + "-top"); + heatRegion = Draw.region(name + "-heat"); + } + @Override public void setStats(){ super.setStats(); @@ -98,16 +112,10 @@ public abstract class Turret extends Block{ @Override public void draw(Tile tile){ - if(base == null) { - Draw.rect("block-" + size, tile.drawx(), tile.drawy()); - if(Draw.hasRegion("block-" + size + "-top")) { - Draw.color(tile.getTeam().color, Color.WHITE, 0.45f); - Draw.rect("block-" + size + "-top", tile.drawx(), tile.drawy()); - Draw.color(); - } - }else{ - Draw.rect(base, tile.drawx(), tile.drawy()); - } + Draw.rect(baseRegion, tile.drawx(), tile.drawy()); + Draw.color(tile.getTeam().color, Color.WHITE, 0.45f); + Draw.rect(baseTopRegion, tile.drawx(), tile.drawy()); + Draw.color(); } @Override @@ -128,11 +136,11 @@ public abstract class Turret extends Block{ @Override public TextureRegion[] getBlockIcon(){ if(blockIcon == null){ - blockIcon = Draw.hasRegion(name) ? new TextureRegion[]{Draw.region("block-" + size), Draw.region(name)} : new TextureRegion[0]; + blockIcon = new TextureRegion[]{Draw.region("block-icon-" + name)}; } return blockIcon; } - + @Override public void drawSelect(Tile tile){ Draw.color(tile.getTeam().color); diff --git a/packer/src/io/anuke/mindustry/Generators.java b/packer/src/io/anuke/mindustry/Generators.java index d599980919..bdfa46b71d 100644 --- a/packer/src/io/anuke/mindustry/Generators.java +++ b/packer/src/io/anuke/mindustry/Generators.java @@ -8,6 +8,8 @@ import io.anuke.mindustry.type.Mech; import io.anuke.mindustry.type.Upgrade; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.blocks.OreBlock; +import io.anuke.mindustry.world.blocks.defense.turrets.Turret; +import io.anuke.ucore.graphics.Hue; public class Generators { @@ -21,20 +23,56 @@ public class Generators { continue; } - if(regions[0] == null){ - context.err("Error in block \"{0}\": null region!", block.name); - } + if(block instanceof Turret){ + Color color = Color.ROYAL; - Image image = context.get(regions[0]); - - for(TextureRegion region : regions){ - if(region == null){ - context.err("Error in block \"{0}\": null region!", block.name); + Image image = context.get(block.name); + if(image.width() != block.size*8 + 2){ + Image resized = context.create(block.size*8 + 2, block.size*8 + 2); + resized.draw(image, (resized.width() - image.width())/2, (resized.height() - image.height())/2); + image = resized; } - image.draw(region); - } - image.save("block-icon-" + block.name); + Image read = context.create(image.width(), image.height()); + read.draw(image); + + for (int x = 0; x < image.width(); x++) { + for (int y = 0; y < image.height(); y++) { + if(read.isEmpty(x, y) && + (!read.isEmpty(x, y + 1) || !read.isEmpty(x, y - 1) || !read.isEmpty(x + 1, y) || !read.isEmpty(x - 1, y))){ + image.draw(x, y, color); + } + } + } + + Image base = context.get("block-" + block.size); + Image top = context.get("block-" + block.size + "-top"); + + for (int x = 0; x < base.width(); x++) { + for (int y = 0; y < base.height(); y++) { + Color result = top.getColor(x, y); + if(result.a > 0.01f){ + Hue.mix(result, color, 0.45f, result); + base.draw(x, y, result); + } + } + } + + Image padded = context.create(base.width() + 2, base.height() + 2); + padded.draw(base, 1, 1); + padded.draw(image, 0, 0); + + padded.save("block-icon-" + block.name); + }else { + + Image image = context.get(regions[0]); + + for (TextureRegion region : regions) { + image.draw(region); + } + + image.save("block-icon-" + block.name); + } } }); diff --git a/packer/src/io/anuke/mindustry/Image.java b/packer/src/io/anuke/mindustry/Image.java index a088aa19c5..9c2a47110f 100644 --- a/packer/src/io/anuke/mindustry/Image.java +++ b/packer/src/io/anuke/mindustry/Image.java @@ -2,6 +2,7 @@ package io.anuke.mindustry; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.ucore.util.Mathf; import javax.imageio.ImageIO; import java.awt.*; @@ -20,12 +21,16 @@ public class Image { private Color color = new Color(); public Image(BufferedImage atlas, TextureRegion region){ - this.atlas = atlas; - - this.image = new BufferedImage(region.getRegionWidth(), region.getRegionHeight(), BufferedImage.TYPE_INT_ARGB); - this.graphics = image.createGraphics(); + this(atlas, region.getRegionWidth(), region.getRegionHeight()); draw(region); + } + + public Image(BufferedImage atlas, int width, int height){ + this.atlas = atlas; + + this.image = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB); + this.graphics = image.createGraphics(); toDispose.add(this); } @@ -38,6 +43,14 @@ public class Image { return image.getHeight(); } + public boolean isEmpty(int x, int y){ + if(!Mathf.inBounds(x, y, width(), height())){ + return true; + } + Color color = getColor(x, y); + return color.a <= 0.001f; + } + public Color getColor(int x, int y){ int i = image.getRGB(x, y); Color.argb8888ToColor(color, i); @@ -56,7 +69,12 @@ public class Image { /**Draws an image at the top left corner.*/ public void draw(Image image){ - graphics.drawImage(image.image, 0, 0, null); + draw(image, 0, 0); + } + + /**Draws an image at the coordinates specified.*/ + public void draw(Image image, int x, int y){ + graphics.drawImage(image.image, x, y, null); } public void draw(TextureRegion region, boolean flipx, boolean flipy){ diff --git a/packer/src/io/anuke/mindustry/ImageContext.java b/packer/src/io/anuke/mindustry/ImageContext.java index d4583a1b70..9e6be28333 100644 --- a/packer/src/io/anuke/mindustry/ImageContext.java +++ b/packer/src/io/anuke/mindustry/ImageContext.java @@ -93,6 +93,10 @@ public class ImageContext { Log.info("&ly[Generator]&lc Time to generate &lm{0}&lc: &lg{1}&lcms", name, Timers.elapsed()); } + public Image create(int width, int height){ + return new Image(image, width, height); + } + public Image get(String name){ return get(Core.atlas.getRegion(name)); }