diff --git a/core/assets-raw/sprites/blocks/units/interceptor-factory-top-open.png b/core/assets-raw/sprites/blocks/units/interceptor-factory-top-open.png new file mode 100644 index 0000000000..430debd381 Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/interceptor-factory-top-open.png differ diff --git a/core/assets-raw/sprites/blocks/units/interceptor-factory-top.png b/core/assets-raw/sprites/blocks/units/interceptor-factory-top.png new file mode 100644 index 0000000000..856d732cdd Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/interceptor-factory-top.png differ diff --git a/core/assets-raw/sprites/blocks/units/interceptor-factory.png b/core/assets-raw/sprites/blocks/units/interceptor-factory.png new file mode 100644 index 0000000000..636a7900b9 Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/interceptor-factory.png differ diff --git a/core/assets-raw/sprites/units/vtol.png b/core/assets-raw/sprites/units/interceptor.png similarity index 100% rename from core/assets-raw/sprites/units/vtol.png rename to core/assets-raw/sprites/units/interceptor.png diff --git a/core/assets-raw/sprites/units/vtol-flame.png b/core/assets-raw/sprites/units/vtol-flame.png deleted file mode 100644 index b4fdd7a0c2..0000000000 Binary files a/core/assets-raw/sprites/units/vtol-flame.png and /dev/null differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 4f08351452..c212a1619d 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,308 +13,308 @@ background index: -1 bridge-conveyor-arrow rotate: false - xy: 353, 15 + xy: 499, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 363, 25 + xy: 510, 64 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 353, 5 + xy: 510, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 987, 355 + xy: 530, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 997, 355 + xy: 515, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 987, 345 + xy: 525, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 997, 345 + xy: 535, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 1007, 349 + xy: 545, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 1007, 339 + xy: 555, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 409, 48 + xy: 565, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 409, 38 + xy: 575, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 961, 336 + xy: 585, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 971, 336 + xy: 595, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 413, 28 + xy: 605, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 413, 18 + xy: 615, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 413, 8 + xy: 625, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 981, 335 + xy: 635, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 991, 335 + xy: 645, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 701, 161 + xy: 655, 168 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 711, 161 + xy: 519, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 721, 161 + xy: 529, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 731, 161 + xy: 829, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 663, 68 + xy: 628, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 673, 68 + xy: 618, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 562, 58 + xy: 638, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 572, 58 + xy: 628, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 582, 58 + xy: 648, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 592, 58 + xy: 638, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 602, 58 + xy: 648, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 612, 58 + xy: 661, 138 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 622, 58 + xy: 661, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 632, 58 + xy: 661, 118 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 642, 58 + xy: 658, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 652, 58 + xy: 658, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 662, 58 + xy: 595, 88 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 672, 58 + xy: 605, 88 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 683, 88 + xy: 615, 88 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 683, 78 + xy: 625, 88 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 683, 68 + xy: 635, 88 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 682, 58 + xy: 645, 88 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 893, 331 + xy: 655, 88 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 523, 81 + xy: 574, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 533, 91 + xy: 574, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 523, 71 + xy: 584, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -356,42 +356,42 @@ blast-drill-top index: -1 carbide-drill rotate: false - xy: 363, 15 + xy: 510, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 carbide-drill-rotator rotate: false - xy: 373, 25 + xy: 509, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 carbide-drill-top rotate: false - xy: 363, 5 + xy: 504, 137 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laser-drill rotate: false - xy: 202, 99 + xy: 202, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 184, 81 + xy: 238, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 220, 99 + xy: 220, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -454,49 +454,49 @@ plasma-drill-top index: -1 tungsten-drill rotate: false - xy: 913, 311 + xy: 600, 68 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten-drill-rotator rotate: false - xy: 903, 301 + xy: 610, 78 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten-drill-top rotate: false - xy: 913, 301 + xy: 600, 58 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 184, 63 + xy: 238, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 202, 63 + xy: 256, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 220, 63 + xy: 274, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 238, 63 + xy: 292, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -524,28 +524,28 @@ blackrockshadow1 index: -1 blackstone1 rotate: false - xy: 411, 106 + xy: 846, 370 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-blackstone rotate: false - xy: 411, 106 + xy: 846, 370 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 957, 359 + xy: 856, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 957, 349 + xy: 866, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -559,35 +559,35 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 373, 15 + xy: 501, 127 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 383, 25 + xy: 501, 117 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 373, 5 + xy: 501, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 517, 181 + xy: 419, 32 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 527, 181 + xy: 429, 32 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -601,98 +601,98 @@ dirtedge index: -1 generic-cliff-edge rotate: false - xy: 567, 181 + xy: 469, 32 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge rotate: false - xy: 567, 181 + xy: 469, 32 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-1 rotate: false - xy: 555, 171 + xy: 479, 32 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-1 rotate: false - xy: 555, 171 + xy: 479, 32 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-2 rotate: false - xy: 565, 171 + xy: 459, 22 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-2 rotate: false - xy: 565, 171 + xy: 459, 22 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-side rotate: false - xy: 522, 161 + xy: 469, 22 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-side rotate: false - xy: 522, 161 + xy: 469, 22 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge rotate: false - xy: 552, 161 + xy: 499, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-1 rotate: false - xy: 562, 161 + xy: 509, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-2 rotate: false - xy: 522, 151 + xy: 421, 12 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-side rotate: false - xy: 520, 141 + xy: 431, 12 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 532, 161 + xy: 479, 22 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 542, 161 + xy: 489, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -706,14 +706,14 @@ grassedge index: -1 ice2 rotate: false - xy: 532, 151 + xy: 441, 12 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 530, 141 + xy: 451, 12 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -727,392 +727,392 @@ iceedge index: -1 icerock2 rotate: false - xy: 527, 131 + xy: 461, 12 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 542, 151 + xy: 471, 12 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 542, 151 + xy: 471, 12 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 540, 141 + xy: 481, 12 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 540, 141 + xy: 481, 12 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 265, 1 + xy: 277, 17 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 607, 178 + xy: 876, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 617, 178 + xy: 886, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 627, 178 + xy: 896, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 582, 158 + xy: 996, 355 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 592, 158 + xy: 986, 345 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 602, 158 + xy: 996, 345 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 612, 158 + xy: 1006, 349 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 622, 158 + xy: 1006, 339 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalflooredge rotate: false - xy: 847, 302 + xy: 293, 3 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 oiledge rotate: false - xy: 892, 369 + xy: 321, 3 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock2 rotate: false - xy: 563, 88 + xy: 654, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 573, 88 + xy: 654, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 573, 78 + xy: 581, 138 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 920, 369 + xy: 400, 92 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 613, 88 + xy: 621, 138 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 613, 78 + xy: 601, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 623, 88 + xy: 611, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 879, 353 + xy: 442, 90 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 879, 339 + xy: 456, 90 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone-cliff-edge rotate: false - xy: 563, 68 + xy: 651, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 573, 68 + xy: 641, 118 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 583, 68 + xy: 651, 118 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 593, 68 + xy: 588, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 673, 88 + xy: 641, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 673, 78 + xy: 631, 118 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 893, 355 + xy: 470, 90 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 603, 68 + xy: 588, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 613, 68 + xy: 598, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 623, 68 + xy: 608, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 633, 68 + xy: 598, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 643, 68 + xy: 618, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 653, 68 + xy: 608, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten1 rotate: false - xy: 899, 321 + xy: 668, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten2 rotate: false - xy: 909, 321 + xy: 665, 88 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten3 rotate: false - xy: 903, 311 + xy: 600, 78 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge rotate: false - xy: 893, 297 + xy: 620, 78 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-1 rotate: false - xy: 919, 325 + xy: 610, 68 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-2 rotate: false - xy: 929, 325 + xy: 600, 48 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-side rotate: false - xy: 939, 325 + xy: 630, 78 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 907, 341 + xy: 492, 157 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-border rotate: false - xy: 728, 271 + xy: 936, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-elevation rotate: false - xy: 728, 261 + xy: 946, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 728, 261 + xy: 946, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-middle rotate: false - xy: 333, 15 + xy: 747, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 333, 15 + xy: 747, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-slope rotate: false - xy: 343, 25 + xy: 751, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 border rotate: false - xy: 333, 5 + xy: 504, 147 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 517, 131 + xy: 525, 77 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 775, 302 + xy: 839, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 357, 117 + xy: 375, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1133,7 +1133,7 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 545, 171 + xy: 449, 22 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1147,49 +1147,49 @@ nuclearreactor-shadow index: -1 place-arrow rotate: false - xy: 522, 61 + xy: 594, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 533, 81 + xy: 584, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 416, 58 + xy: 453, 54 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 rubble-1-0 rotate: false - xy: 256, 81 + xy: 310, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 292, 99 + xy: 292, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 274, 81 + xy: 328, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 310, 99 + xy: 310, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1210,7 +1210,7 @@ rubble-3-1 index: -1 shadow-1 rotate: false - xy: 452, 56 + xy: 465, 42 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1252,14 +1252,14 @@ shadow-6 index: -1 shadow-corner rotate: false - xy: 464, 56 + xy: 477, 54 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-round-1 rotate: false - xy: 476, 56 + xy: 477, 42 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1280,154 +1280,154 @@ shadow-rounded-2 index: -1 bridge-conduit-arrow rotate: false - xy: 343, 15 + xy: 500, 64 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 353, 25 + xy: 500, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 343, 5 + xy: 500, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 383, 15 + xy: 511, 127 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 393, 25 + xy: 511, 117 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 383, 5 + xy: 511, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 393, 15 + xy: 508, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 393, 5 + xy: 508, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 403, 25 + xy: 518, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 403, 15 + xy: 518, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 403, 5 + xy: 515, 77 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 517, 121 + xy: 520, 67 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 517, 111 + xy: 520, 57 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 517, 101 + xy: 520, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 967, 356 + xy: 530, 67 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 977, 356 + xy: 530, 57 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 967, 346 + xy: 530, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 977, 346 + xy: 520, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router rotate: false - xy: 615, 168 + xy: 956, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 625, 168 + xy: 966, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 635, 168 + xy: 976, 347 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 572, 158 + xy: 986, 355 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1455,70 +1455,70 @@ liquid-tank-top index: -1 phase-conduit-arrow rotate: false - xy: 881, 295 + xy: 601, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 893, 307 + xy: 601, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 523, 91 + xy: 601, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 543, 91 + xy: 604, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 533, 71 + xy: 594, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 532, 61 + xy: 614, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 543, 81 + xy: 604, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 553, 91 + xy: 624, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 543, 71 + xy: 614, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 542, 61 + xy: 634, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1623,14 +1623,14 @@ nuclear-reactor-lights index: -1 rtg-generator-top rotate: false - xy: 563, 78 + xy: 644, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 turbine-generator-top rotate: false - xy: 364, 81 + xy: 202, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1749,119 +1749,119 @@ block-icon-blast-mixer index: -1 centrifuge-liquid rotate: false - xy: 321, 117 + xy: 339, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 375, 117 + xy: 393, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 393, 117 + xy: 411, 116 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 411, 116 + xy: 429, 122 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator rotate: false - xy: 429, 122 + xy: 447, 122 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 447, 122 + xy: 465, 122 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 465, 122 + xy: 483, 122 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 597, 178 + xy: 866, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 645, 168 + xy: 524, 151 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-weaver rotate: false - xy: 202, 81 + xy: 256, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 238, 99 + xy: 238, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 220, 81 + xy: 274, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 256, 99 + xy: 256, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter-top rotate: false - xy: 238, 81 + xy: 292, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 553, 81 + xy: 624, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 553, 71 + xy: 644, 158 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 603, 88 + xy: 611, 138 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1875,21 +1875,21 @@ core-open index: -1 sortedunloader rotate: false - xy: 643, 78 + xy: 611, 118 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1 rotate: false - xy: 728, 291 + xy: 916, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1-top rotate: false - xy: 728, 281 + xy: 926, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1966,7 +1966,7 @@ mass-driver-turret index: -1 duo rotate: false - xy: 557, 181 + xy: 459, 32 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1987,35 +1987,35 @@ spectre index: -1 hail rotate: false - xy: 933, 357 + xy: 359, 21 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 scatter rotate: false - xy: 933, 357 + xy: 359, 21 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 hail-heat rotate: false - xy: 933, 345 + xy: 371, 21 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 lancer rotate: false - xy: 166, 71 + xy: 184, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 184, 99 + xy: 220, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2043,91 +2043,105 @@ ripple-heat index: -1 salvo rotate: false - xy: 292, 81 + xy: 346, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-heat rotate: false - xy: 328, 99 + xy: 328, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 310, 81 + xy: 364, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 346, 99 + xy: 346, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 scorch rotate: false - xy: 428, 56 + xy: 453, 42 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 440, 56 + xy: 465, 54 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 swarmer rotate: false - xy: 328, 81 + xy: 382, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave rotate: false - xy: 256, 63 + xy: 310, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 274, 63 + xy: 328, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-factory-top rotate: false - xy: 831, 380 + xy: 849, 381 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-factory-top-open rotate: false - xy: 849, 381 + xy: 828, 362 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fabricator-factory-top rotate: false - xy: 828, 362 + xy: 829, 344 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fabricator-factory-top-open rotate: false - xy: 829, 344 + xy: 429, 104 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +interceptor-factory-top + rotate: false + xy: 166, 71 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +interceptor-factory-top-open + rotate: false + xy: 184, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2141,35 +2155,35 @@ mech-factory index: -1 dart-ship-factory-open rotate: false - xy: 483, 122 + xy: 831, 398 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 delta-mech-factory-open rotate: false - xy: 831, 398 + xy: 849, 399 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 javelin-ship-factory-open rotate: false - xy: 166, 89 + xy: 202, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 reconstructor-open rotate: false - xy: 274, 99 + xy: 274, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 repair-point-turret rotate: false - xy: 552, 61 + xy: 634, 148 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2183,14 +2197,14 @@ ship-factory index: -1 door-large-open rotate: false - xy: 849, 399 + xy: 831, 380 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 535, 171 + xy: 439, 22 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2211,7 +2225,7 @@ beam-end index: -1 blank rotate: false - xy: 572, 168 + xy: 703, 379 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -2239,7 +2253,7 @@ casing index: -1 clear rotate: false - xy: 567, 138 + xy: 566, 287 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -2295,14 +2309,14 @@ minelaser-end index: -1 missile rotate: false - xy: 481, 158 + xy: 400, 81 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 missile-back rotate: false - xy: 488, 57 + xy: 481, 158 size: 9, 9 orig: 9, 9 offset: 0, 0 @@ -2344,21 +2358,21 @@ scorch5 index: -1 shell rotate: false - xy: 974, 366 + xy: 489, 55 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shell-back rotate: false - xy: 512, 82 + xy: 489, 44 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shot rotate: false - xy: 603, 78 + xy: 591, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2372,7 +2386,7 @@ transfer index: -1 transfer-arrow rotate: false - xy: 903, 331 + xy: 668, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2386,28 +2400,28 @@ transfer-end index: -1 blackstone-cliff-edge rotate: false - xy: 921, 335 + xy: 876, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-1 rotate: false - xy: 931, 335 + xy: 886, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-2 rotate: false - xy: 941, 335 + xy: 896, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-side rotate: false - xy: 951, 335 + xy: 906, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2435,49 +2449,49 @@ block-icon-blast-drill index: -1 block-icon-bridge-conduit rotate: false - xy: 728, 251 + xy: 956, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 728, 251 + xy: 956, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-bridge-conveyor rotate: false - xy: 726, 241 + xy: 728, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 726, 241 + xy: 728, 291 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-carbide-drill rotate: false - xy: 726, 231 + xy: 728, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-carbide-wall rotate: false - xy: 726, 221 + xy: 728, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 carbide-wall rotate: false - xy: 726, 221 + xy: 728, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2512,35 +2526,35 @@ centrifuge index: -1 block-icon-combustion-generator rotate: false - xy: 726, 211 + xy: 728, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 726, 211 + xy: 728, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conduit rotate: false - xy: 863, 309 + xy: 728, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conveyor rotate: false - xy: 861, 299 + xy: 726, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 861, 299 + xy: 726, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2596,42 +2610,42 @@ dart-ship-factory index: -1 block-icon-deepwater rotate: false - xy: 289, 53 + xy: 726, 231 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 289, 53 + xy: 726, 231 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-deflector-wall rotate: false - xy: 289, 43 + xy: 726, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deflector-wall rotate: false - xy: 289, 43 + xy: 726, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 289, 43 + xy: 726, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-wall rotate: false - xy: 289, 43 + xy: 726, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2680,14 +2694,14 @@ delta-mech-factory index: -1 block-icon-dirt rotate: false - xy: 289, 33 + xy: 726, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 289, 33 + xy: 726, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2708,14 +2722,14 @@ distributor index: -1 block-icon-door rotate: false - xy: 299, 55 + xy: 498, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 299, 55 + xy: 498, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2743,14 +2757,14 @@ block-icon-drone-factory index: -1 block-icon-drop-point rotate: false - xy: 309, 55 + xy: 498, 84 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 drop-point rotate: false - xy: 309, 55 + xy: 498, 84 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2785,119 +2799,126 @@ block-icon-fusion-reactor index: -1 block-icon-grass rotate: false - xy: 299, 45 + xy: 495, 74 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass1 rotate: false - xy: 299, 45 + xy: 495, 74 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-hail rotate: false - xy: 962, 371 + xy: 417, 104 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 block-icon-ice rotate: false - xy: 319, 55 + xy: 505, 74 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice1 rotate: false - xy: 319, 55 + xy: 505, 74 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-icerock rotate: false - xy: 299, 35 + xy: 701, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 299, 35 + xy: 701, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-incinerator rotate: false - xy: 309, 45 + xy: 711, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 309, 45 + xy: 711, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 +block-icon-interceptor-factory + rotate: false + xy: 683, 187 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 block-icon-itemsource rotate: false - xy: 329, 55 + xy: 721, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 329, 55 + xy: 721, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemvoid rotate: false - xy: 309, 35 + xy: 731, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 309, 35 + xy: 731, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-javelin-ship-factory rotate: false - xy: 683, 187 + xy: 456, 140 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 javelin-ship-factory rotate: false - xy: 683, 187 + xy: 456, 140 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-junction rotate: false - xy: 319, 45 + xy: 775, 302 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 junction rotate: false - xy: 319, 45 + xy: 775, 302 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2911,42 +2932,42 @@ block-icon-lancer index: -1 block-icon-laser-drill rotate: false - xy: 456, 140 + xy: 463, 158 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-lava rotate: false - xy: 339, 55 + xy: 785, 302 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 339, 55 + xy: 785, 302 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-junction rotate: false - xy: 319, 35 + xy: 795, 302 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 319, 35 + xy: 795, 302 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-router rotate: false - xy: 329, 45 + xy: 505, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2960,14 +2981,14 @@ block-icon-liquid-tank index: -1 block-icon-liquidsource rotate: false - xy: 349, 55 + xy: 515, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 349, 55 + xy: 515, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2995,14 +3016,14 @@ core-top index: -1 block-icon-mechanical-pump rotate: false - xy: 329, 35 + xy: 525, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 329, 35 + xy: 525, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3016,28 +3037,28 @@ block-icon-meltdown index: -1 block-icon-melter rotate: false - xy: 339, 45 + xy: 535, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 339, 45 + xy: 535, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-metalfloor rotate: false - xy: 359, 55 + xy: 545, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 359, 55 + xy: 545, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3058,14 +3079,14 @@ nuclear-reactor index: -1 block-icon-oil rotate: false - xy: 339, 35 + xy: 555, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 339, 35 + xy: 555, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3079,49 +3100,49 @@ block-icon-oil-extractor index: -1 block-icon-overflow-gate rotate: false - xy: 349, 45 + xy: 565, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 349, 45 + xy: 565, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conduit rotate: false - xy: 369, 55 + xy: 575, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 369, 55 + xy: 575, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conveyor rotate: false - xy: 349, 35 + xy: 585, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 349, 35 + xy: 585, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-weaver rotate: false - xy: 463, 158 + xy: 474, 140 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3135,154 +3156,161 @@ block-icon-plasma-drill index: -1 block-icon-plastanium-compressor rotate: false - xy: 474, 140 + xy: 793, 344 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 474, 140 + xy: 793, 344 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-power-node rotate: false - xy: 359, 45 + xy: 595, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 power-node rotate: false - xy: 359, 45 + xy: 595, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-power-node-large rotate: false - xy: 793, 344 + xy: 793, 312 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 793, 344 + xy: 793, 312 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-powerinfinite rotate: false - xy: 379, 55 + xy: 605, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 379, 55 + xy: 605, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-powervoid rotate: false - xy: 359, 35 + xy: 615, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 359, 35 + xy: 615, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulse-conduit rotate: false - xy: 369, 45 + xy: 625, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulverizer rotate: false - xy: 389, 55 + xy: 635, 178 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pyratite-mixer rotate: false - xy: 793, 312 + xy: 811, 343 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 793, 312 + xy: 811, 343 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-reconstructor rotate: false - xy: 811, 343 + xy: 177, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-factory rotate: false - xy: 811, 343 + xy: 177, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fabricator-factory rotate: false - xy: 811, 343 + xy: 177, 117 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +interceptor-factory + rotate: false + xy: 177, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 reconstructor rotate: false - xy: 811, 343 + xy: 177, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-repair-point rotate: false - xy: 369, 35 + xy: 489, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 repair-point rotate: false - xy: 369, 35 + xy: 489, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-resupply-point rotate: false - xy: 379, 45 + xy: 886, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 resupply-point rotate: false - xy: 379, 45 + xy: 886, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3296,42 +3324,42 @@ block-icon-ripple index: -1 block-icon-rock rotate: false - xy: 379, 35 + xy: 896, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock1 rotate: false - xy: 379, 35 + xy: 896, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rotary-pump rotate: false - xy: 177, 117 + xy: 195, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 177, 117 + xy: 195, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-rtg-generator rotate: false - xy: 389, 45 + xy: 906, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 389, 45 + xy: 906, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3345,105 +3373,105 @@ block-icon-salvo index: -1 block-icon-sand rotate: false - xy: 389, 35 + xy: 916, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 389, 35 + xy: 916, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-scorch rotate: false - xy: 921, 357 + xy: 492, 145 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 block-icon-separator rotate: false - xy: 399, 55 + xy: 926, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 399, 55 + xy: 926, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shrub rotate: false - xy: 399, 45 + xy: 936, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrub rotate: false - xy: 399, 45 + xy: 936, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-silicon-smelter rotate: false - xy: 195, 117 + xy: 213, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 195, 117 + xy: 213, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-smelter rotate: false - xy: 399, 35 + xy: 946, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 399, 35 + xy: 946, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-snow rotate: false - xy: 293, 23 + xy: 956, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 293, 23 + xy: 956, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-solar-panel rotate: false - xy: 293, 13 + xy: 736, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 293, 13 + xy: 736, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3464,42 +3492,42 @@ solar-panel-large index: -1 block-icon-solidifer rotate: false - xy: 293, 3 + xy: 736, 231 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solidifer rotate: false - xy: 293, 3 + xy: 736, 231 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sorter rotate: false - xy: 303, 25 + xy: 736, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 303, 25 + xy: 736, 221 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-space rotate: false - xy: 303, 15 + xy: 736, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space rotate: false - xy: 303, 15 + xy: 736, 211 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3513,28 +3541,28 @@ block-icon-spectre index: -1 block-icon-splitter rotate: false - xy: 313, 25 + xy: 731, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 313, 25 + xy: 731, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-stone rotate: false - xy: 303, 5 + xy: 731, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone1 rotate: false - xy: 303, 5 + xy: 731, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3548,140 +3576,140 @@ block-icon-swarmer index: -1 block-icon-thermal-generator rotate: false - xy: 213, 117 + xy: 231, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 213, 117 + xy: 231, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermal-pump rotate: false - xy: 231, 117 + xy: 249, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 231, 117 + xy: 249, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thorium-wall rotate: false - xy: 313, 15 + xy: 741, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 313, 15 + xy: 741, 201 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-thorium-wall-large rotate: false - xy: 249, 117 + xy: 267, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 249, 117 + xy: 267, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-titanium-conveyor rotate: false - xy: 323, 25 + xy: 741, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 323, 25 + xy: 741, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor rotate: false - xy: 323, 25 + xy: 741, 191 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-tungsten-drill rotate: false - xy: 313, 5 + xy: 737, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-tungsten-wall rotate: false - xy: 323, 15 + xy: 737, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten-wall rotate: false - xy: 323, 15 + xy: 737, 171 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-tungsten-wall-large rotate: false - xy: 267, 117 + xy: 285, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 tungsten-wall-large rotate: false - xy: 267, 117 + xy: 285, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-turbine-generator rotate: false - xy: 285, 117 + xy: 303, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 turbine-generator rotate: false - xy: 285, 117 + xy: 303, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-unloader rotate: false - xy: 333, 25 + xy: 741, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unloader rotate: false - xy: 333, 25 + xy: 741, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3716,21 +3744,21 @@ warp-gate index: -1 block-icon-water rotate: false - xy: 323, 5 + xy: 747, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 323, 5 + xy: 747, 181 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-water-extractor rotate: false - xy: 303, 117 + xy: 321, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3744,1071 +3772,1057 @@ block-icon-wave index: -1 deepwater-cliff-edge rotate: false - xy: 785, 302 + xy: 966, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-1 rotate: false - xy: 795, 302 + xy: 976, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-2 rotate: false - xy: 507, 181 + xy: 966, 357 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-side rotate: false - xy: 505, 171 + xy: 976, 357 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge rotate: false - xy: 515, 171 + xy: 419, 22 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-1 rotate: false - xy: 537, 181 + xy: 439, 32 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-2 rotate: false - xy: 525, 171 + xy: 429, 22 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-side rotate: false - xy: 547, 181 + xy: 449, 32 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge rotate: false - xy: 557, 111 + xy: 539, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-1 rotate: false - xy: 557, 101 + xy: 541, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-2 rotate: false - xy: 577, 178 + xy: 541, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-side rotate: false - xy: 587, 178 + xy: 856, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-cryofluid rotate: false - xy: 575, 168 + xy: 916, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-lava rotate: false - xy: 585, 168 + xy: 926, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-oil rotate: false - xy: 595, 168 + xy: 936, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-water rotate: false - xy: 605, 168 + xy: 946, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mech-icon-alpha-mech rotate: false - xy: 279, 1 + xy: 291, 17 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-dart-ship rotate: false - xy: 492, 141 + xy: 305, 17 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-delta-mech rotate: false - xy: 506, 141 + xy: 319, 17 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-halberd-ship rotate: false - xy: 508, 155 + xy: 333, 17 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-trident-ship rotate: false - xy: 508, 155 + xy: 333, 17 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-omega-mech rotate: false - xy: 863, 319 + xy: 279, 3 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-tau-mech rotate: false - xy: 863, 319 + xy: 279, 3 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 metalfloor-cliff-edge rotate: false - xy: 632, 158 + xy: 506, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-1 rotate: false - xy: 572, 148 + xy: 516, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-2 rotate: false - xy: 582, 148 + xy: 526, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-side rotate: false - xy: 592, 148 + xy: 536, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge rotate: false - xy: 602, 148 + xy: 546, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-1 rotate: false - xy: 612, 148 + xy: 556, 161 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-2 rotate: false - xy: 622, 148 + xy: 514, 151 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-side rotate: false - xy: 632, 148 + xy: 514, 141 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone1 rotate: false - xy: 655, 168 + xy: 534, 151 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone2 rotate: false - xy: 642, 158 + xy: 524, 141 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone3 rotate: false - xy: 642, 148 + xy: 544, 151 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass1 rotate: false - xy: 652, 158 + xy: 534, 141 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass2 rotate: false - xy: 652, 148 + xy: 554, 151 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass3 rotate: false - xy: 570, 138 + xy: 544, 141 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice1 rotate: false - xy: 580, 138 + xy: 554, 141 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice2 rotate: false - xy: 590, 138 + xy: 521, 131 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice3 rotate: false - xy: 600, 138 + xy: 521, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 610, 138 + xy: 531, 131 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 620, 138 + xy: 521, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 630, 138 + xy: 541, 131 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow1 rotate: false - xy: 640, 138 + xy: 551, 131 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow2 rotate: false - xy: 650, 138 + xy: 531, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow3 rotate: false - xy: 567, 128 + xy: 541, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 567, 118 + xy: 551, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 577, 128 + xy: 531, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 567, 108 + xy: 541, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone1 rotate: false - xy: 577, 118 + xy: 551, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone2 rotate: false - xy: 587, 128 + xy: 528, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone3 rotate: false - xy: 577, 108 + xy: 528, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass1 rotate: false - xy: 587, 118 + xy: 538, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass2 rotate: false - xy: 597, 128 + xy: 548, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass3 rotate: false - xy: 587, 108 + xy: 538, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice1 rotate: false - xy: 597, 118 + xy: 548, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice2 rotate: false - xy: 607, 128 + xy: 535, 81 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice3 rotate: false - xy: 597, 108 + xy: 545, 81 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 607, 118 + xy: 540, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 617, 128 + xy: 540, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 607, 108 + xy: 540, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow1 rotate: false - xy: 617, 118 + xy: 540, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow2 rotate: false - xy: 627, 128 + xy: 550, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow3 rotate: false - xy: 617, 108 + xy: 550, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 627, 118 + xy: 550, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 637, 128 + xy: 550, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 627, 108 + xy: 555, 81 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone1 rotate: false - xy: 637, 118 + xy: 549, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone2 rotate: false - xy: 647, 128 + xy: 560, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone3 rotate: false - xy: 637, 108 + xy: 560, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass1 rotate: false - xy: 647, 118 + xy: 560, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass2 rotate: false - xy: 647, 108 + xy: 560, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass3 rotate: false - xy: 567, 98 + xy: 559, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice1 rotate: false - xy: 577, 98 + xy: 551, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice2 rotate: false - xy: 587, 98 + xy: 551, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice3 rotate: false - xy: 597, 98 + xy: 551, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 607, 98 + xy: 561, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 617, 98 + xy: 561, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 627, 98 + xy: 561, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow1 rotate: false - xy: 637, 98 + xy: 561, 131 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow2 rotate: false - xy: 647, 98 + xy: 561, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow3 rotate: false - xy: 662, 158 + xy: 561, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 662, 148 + xy: 558, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 660, 138 + xy: 558, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 657, 128 + xy: 565, 81 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone1 rotate: false - xy: 657, 118 + xy: 570, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone2 rotate: false - xy: 657, 108 + xy: 570, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone3 rotate: false - xy: 657, 98 + xy: 570, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass1 rotate: false - xy: 672, 159 + xy: 570, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass2 rotate: false - xy: 682, 159 + xy: 569, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass3 rotate: false - xy: 672, 149 + xy: 571, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice1 rotate: false - xy: 682, 149 + xy: 571, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice2 rotate: false - xy: 667, 128 + xy: 571, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice3 rotate: false - xy: 667, 118 + xy: 568, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 667, 108 + xy: 568, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 667, 98 + xy: 575, 81 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 670, 138 + xy: 580, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow1 rotate: false - xy: 680, 139 + xy: 580, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow2 rotate: false - xy: 677, 128 + xy: 580, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow3 rotate: false - xy: 677, 118 + xy: 580, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 677, 108 + xy: 579, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 677, 98 + xy: 581, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 889, 317 + xy: 581, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-blackstone1 rotate: false - xy: 512, 61 + xy: 581, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-blackstone2 rotate: false - xy: 736, 241 + xy: 589, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-blackstone3 rotate: false - xy: 736, 231 + xy: 591, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-grass1 rotate: false - xy: 736, 221 + xy: 591, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-grass2 rotate: false - xy: 736, 211 + xy: 591, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-grass3 rotate: false - xy: 731, 201 + xy: 564, 151 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-ice1 rotate: false - xy: 731, 191 + xy: 564, 141 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-ice2 rotate: false - xy: 741, 201 + xy: 571, 131 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-ice3 rotate: false - xy: 741, 191 + xy: 571, 121 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-sand1 rotate: false - xy: 737, 181 + xy: 571, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-sand2 rotate: false - xy: 737, 171 + xy: 578, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-sand3 rotate: false - xy: 741, 161 + xy: 578, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-snow1 rotate: false - xy: 747, 181 + xy: 585, 81 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-snow2 rotate: false - xy: 747, 171 + xy: 590, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-snow3 rotate: false - xy: 751, 161 + xy: 590, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-stone1 rotate: false - xy: 873, 305 + xy: 590, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-stone2 rotate: false - xy: 883, 305 + xy: 590, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-stone3 rotate: false - xy: 871, 295 + xy: 599, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge rotate: false - xy: 583, 88 + xy: 581, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-1 rotate: false - xy: 583, 78 + xy: 591, 138 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-2 rotate: false - xy: 593, 88 + xy: 581, 118 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-side rotate: false - xy: 593, 78 + xy: 601, 138 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge rotate: false - xy: 623, 78 + xy: 591, 118 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-1 rotate: false - xy: 633, 88 + xy: 631, 138 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-2 rotate: false - xy: 633, 78 + xy: 621, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-side rotate: false - xy: 643, 88 + xy: 601, 118 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge rotate: false - xy: 653, 88 + xy: 641, 138 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-1 rotate: false - xy: 653, 78 + xy: 631, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-2 rotate: false - xy: 663, 88 + xy: 621, 118 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-side rotate: false - xy: 663, 78 + xy: 651, 138 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unit-icon-scout rotate: false - xy: 893, 341 + xy: 484, 90 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-titan rotate: false - xy: 382, 81 + xy: 220, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -unit-icon-vtol - rotate: false - xy: 907, 355 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 -vtol - rotate: false - xy: 907, 355 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 item-biomatter rotate: false - xy: 552, 151 + xy: 511, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 550, 141 + xy: 521, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-carbide rotate: false - xy: 527, 111 + xy: 531, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 537, 121 + xy: 421, 2 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 547, 131 + xy: 431, 2 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-phase-matter rotate: false - xy: 562, 151 + xy: 441, 2 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 560, 141 + xy: 451, 2 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 527, 101 + xy: 461, 2 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 537, 111 + xy: 471, 2 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 547, 121 + xy: 481, 2 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 557, 131 + xy: 491, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 537, 101 + xy: 501, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 547, 111 + xy: 511, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 557, 121 + xy: 521, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-tungsten rotate: false - xy: 547, 101 + xy: 531, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon rotate: false - xy: 637, 178 + xy: 906, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -4899,14 +4913,14 @@ delta-mech-leg index: -1 omega-mech rotate: false - xy: 906, 369 + xy: 335, 3 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tau-mech rotate: false - xy: 906, 369 + xy: 335, 3 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -4934,14 +4948,14 @@ trident-ship index: -1 javelin-ship rotate: false - xy: 251, 1 + xy: 265, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-javelin-ship rotate: false - xy: 251, 1 + xy: 265, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -5090,7 +5104,7 @@ check-over index: -1 clear rotate: false - xy: 921, 345 + xy: 347, 19 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5118,28 +5132,28 @@ discord-banner-over index: -1 controller-cursor rotate: false - xy: 339, 117 + xy: 357, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-about rotate: false - xy: 292, 65 + xy: 346, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-add rotate: false - xy: 308, 65 + xy: 362, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin rotate: false - xy: 324, 65 + xy: 378, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5153,238 +5167,238 @@ icon-admin-small index: -1 icon-areaDelete rotate: false - xy: 945, 357 + xy: 383, 21 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow rotate: false - xy: 429, 104 + xy: 447, 104 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-16 rotate: false - xy: 429, 104 + xy: 447, 104 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 945, 345 + xy: 395, 21 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 879, 327 + xy: 407, 21 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 877, 315 + xy: 349, 7 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 416, 94 + xy: 361, 9 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 447, 104 + xy: 465, 104 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 340, 65 + xy: 177, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-break rotate: false - xy: 465, 104 + xy: 483, 104 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 483, 104 + xy: 867, 399 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 428, 92 + xy: 373, 9 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 867, 399 + xy: 867, 381 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 440, 92 + xy: 385, 9 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 452, 92 + xy: 397, 9 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 464, 92 + xy: 409, 9 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 356, 65 + xy: 177, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 372, 65 + xy: 193, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 476, 92 + xy: 411, 78 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 388, 65 + xy: 193, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 177, 47 + xy: 209, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 177, 31 + xy: 209, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 193, 47 + xy: 225, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-elevation rotate: false - xy: 867, 381 + xy: 885, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 885, 401 + xy: 885, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 193, 31 + xy: 225, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 885, 383 + xy: 903, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 903, 401 + xy: 903, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 209, 47 + xy: 241, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 903, 383 + xy: 921, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 209, 31 + xy: 241, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 921, 401 + xy: 921, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 225, 47 + xy: 257, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 225, 31 + xy: 257, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5398,441 +5412,441 @@ icon-generated index: -1 icon-github rotate: false - xy: 241, 47 + xy: 273, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 241, 31 + xy: 273, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 921, 383 + xy: 939, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 488, 92 + xy: 423, 78 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 416, 82 + xy: 435, 78 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 257, 47 + xy: 289, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 257, 31 + xy: 289, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 404, 78 + xy: 447, 78 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 273, 47 + xy: 305, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-item rotate: false - xy: 404, 66 + xy: 459, 78 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 527, 121 + xy: 491, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-line rotate: false - xy: 939, 401 + xy: 939, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 273, 31 + xy: 305, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 416, 70 + xy: 471, 78 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 181, 15 + xy: 321, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 939, 383 + xy: 957, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 957, 401 + xy: 957, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 957, 383 + xy: 975, 395 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 975, 395 + xy: 975, 377 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 428, 80 + xy: 483, 78 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-map rotate: false - xy: 197, 15 + xy: 321, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 440, 80 + xy: 410, 66 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 975, 377 + xy: 993, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-missing rotate: false - xy: 452, 80 + xy: 422, 66 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 464, 80 + xy: 434, 66 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-nullitem rotate: false - xy: 537, 131 + xy: 501, 14 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 476, 80 + xy: 446, 66 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 993, 383 + xy: 993, 365 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 213, 15 + xy: 337, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 993, 365 + xy: 665, 169 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 488, 80 + xy: 458, 66 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 229, 15 + xy: 337, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 500, 81 + xy: 470, 66 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 428, 68 + xy: 482, 66 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 440, 68 + xy: 417, 54 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 245, 15 + xy: 353, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 665, 169 + xy: 683, 169 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 261, 15 + xy: 353, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 277, 15 + xy: 369, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 683, 169 + xy: 701, 171 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 400, 90 + xy: 369, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 492, 155 + xy: 385, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 501, 125 + xy: 385, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 501, 109 + xy: 394, 65 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 501, 93 + xy: 401, 49 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 701, 171 + xy: 719, 171 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 719, 171 + xy: 811, 325 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 452, 68 + xy: 417, 42 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 811, 325 + xy: 829, 326 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 846, 364 + xy: 401, 33 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 464, 68 + xy: 429, 54 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 476, 68 + xy: 429, 42 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 862, 365 + xy: 181, 15 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 829, 326 + xy: 811, 307 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 847, 348 + xy: 197, 15 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 847, 332 + xy: 213, 15 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 811, 307 + xy: 829, 308 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 488, 68 + xy: 441, 54 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 847, 316 + xy: 229, 15 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 500, 69 + xy: 441, 42 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 863, 349 + xy: 245, 15 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 829, 308 + xy: 166, 89 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 863, 333 + xy: 261, 15 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5918,7 +5932,7 @@ scroll-knob-vertical-black index: -1 selection rotate: false - xy: 703, 379 + xy: 177, 166 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -6046,6 +6060,20 @@ unit-icon-fabricator orig: 14, 14 offset: 0, 0 index: -1 +interceptor + rotate: false + xy: 251, 1 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +unit-icon-interceptor + rotate: false + xy: 251, 1 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 monsoon rotate: false xy: 427, 176 @@ -6062,39 +6090,32 @@ unit-icon-monsoon index: -1 scout rotate: false - xy: 934, 369 + xy: 414, 90 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 titan rotate: false - xy: 364, 99 + xy: 364, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-base rotate: false - xy: 346, 81 + xy: 382, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-leg rotate: false - xy: 382, 99 + xy: 184, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -vtol-flame - rotate: false - xy: 512, 71 - size: 9, 9 - orig: 9, 9 - offset: 0, 0 - index: -1 blaster-equip rotate: false xy: 572, 244 @@ -6125,14 +6146,14 @@ flamethrower-equip index: -1 missiles-equip rotate: false - xy: 878, 367 + xy: 307, 3 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 948, 369 + xy: 428, 90 size: 12, 12 orig: 12, 12 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 5a3103c7a1..b9ad3400be 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 c8faa59ad6..c5daa341bd 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -134,6 +134,7 @@ public class Recipes implements ContentList{ //actual unit related stuff new Recipe(units, UnitBlocks.droneFactory, new ItemStack(Items.tungsten, 50), new ItemStack(Items.lead, 90), new ItemStack(Items.silicon, 130)); new Recipe(units, UnitBlocks.fabricatorFactory, new ItemStack(Items.carbide, 70), new ItemStack(Items.thorium, 100), new ItemStack(Items.lead, 150), new ItemStack(Items.silicon, 300)); + new Recipe(units, UnitBlocks.interceptorFactory, new ItemStack(Items.carbide, 70), new ItemStack(Items.thorium, 100), new ItemStack(Items.lead, 150), new ItemStack(Items.silicon, 300)); new Recipe(units, UnitBlocks.repairPoint, new ItemStack(Items.lead, 30), new ItemStack(Items.tungsten, 30), new ItemStack(Items.silicon, 30)); new Recipe(units, UnitBlocks.resupplyPoint, new ItemStack(Items.lead, 30), new ItemStack(Items.tungsten, 30), new ItemStack(Items.silicon, 30)); diff --git a/core/src/io/anuke/mindustry/content/UnitTypes.java b/core/src/io/anuke/mindustry/content/UnitTypes.java index 1e56aa5df1..4a8fac085b 100644 --- a/core/src/io/anuke/mindustry/content/UnitTypes.java +++ b/core/src/io/anuke/mindustry/content/UnitTypes.java @@ -8,7 +8,7 @@ import io.anuke.mindustry.game.Content; import io.anuke.mindustry.type.ContentList; public class UnitTypes implements ContentList{ - public static UnitType drone, scout, vtol, monsoon, titan, fabricator; + public static UnitType drone, scout, interceptor, monsoon, titan, fabricator; @Override public void load(){ @@ -41,7 +41,7 @@ public class UnitTypes implements ContentList{ health = 260; }}; - vtol = new UnitType("vtol", Vtol.class, Vtol::new){{ + interceptor = new UnitType("interceptor", Interceptor.class, Interceptor::new){{ speed = 0.3f; maxVelocity = 1.9f; drag = 0.01f; diff --git a/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java b/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java index dc98341364..39b7486467 100644 --- a/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java @@ -8,7 +8,8 @@ import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.blocks.units.*; public class UnitBlocks extends BlockList implements ContentList{ - public static Block resupplyPoint, repairPoint, droneFactory, fabricatorFactory, dropPoint, reconstructor, overdriveProjector, shieldProjector; + public static Block resupplyPoint, repairPoint, droneFactory, fabricatorFactory, interceptorFactory, dropPoint, + reconstructor, overdriveProjector, shieldProjector, commandCenter; @Override public void load(){ @@ -28,6 +29,14 @@ public class UnitBlocks extends BlockList implements ContentList{ consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 70), new ItemStack(Items.lead, 80), new ItemStack(Items.titanium, 80)}); }}; + interceptorFactory = new UnitFactory("interceptor-factory"){{ + type = UnitTypes.interceptor; + produceTime = 1300; + size = 2; + consumes.power(0.1f); + consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 30), new ItemStack(Items.titanium, 40)}); + }}; + resupplyPoint = new ResupplyPoint("resupply-point"){{ shadow = "shadow-round-1"; itemCapacity = 30; @@ -51,8 +60,12 @@ public class UnitBlocks extends BlockList implements ContentList{ size = 2; }}; - shieldProjector = new ShieldProjector("shieldprojector"){{ + shieldProjector = new ShieldProjector("shield-projector"){{ size = 2; }}; + + commandCenter = new CommandCenter("command-center"){{ + + }}; } } diff --git a/core/src/io/anuke/mindustry/entities/units/types/Vtol.java b/core/src/io/anuke/mindustry/entities/units/types/Interceptor.java similarity index 70% rename from core/src/io/anuke/mindustry/entities/units/types/Vtol.java rename to core/src/io/anuke/mindustry/entities/units/types/Interceptor.java index cf02014794..e37188a99d 100644 --- a/core/src/io/anuke/mindustry/entities/units/types/Vtol.java +++ b/core/src/io/anuke/mindustry/entities/units/types/Interceptor.java @@ -2,6 +2,6 @@ package io.anuke.mindustry.entities.units.types; import io.anuke.mindustry.entities.units.FlyingUnit; -public class Vtol extends FlyingUnit{ +public class Interceptor extends FlyingUnit{ } diff --git a/core/src/io/anuke/mindustry/game/Waves.java b/core/src/io/anuke/mindustry/game/Waves.java index 1d07b89bd5..5ec33ba7ef 100644 --- a/core/src/io/anuke/mindustry/game/Waves.java +++ b/core/src/io/anuke/mindustry/game/Waves.java @@ -16,7 +16,7 @@ public class Waves{ unitScaling = 2; }}, - new SpawnGroup(UnitTypes.vtol){{ + new SpawnGroup(UnitTypes.interceptor){{ begin = 12; end = 14; }}, @@ -70,7 +70,7 @@ public class Waves{ effect = StatusEffects.overdrive; }}, - new SpawnGroup(UnitTypes.vtol){{ + new SpawnGroup(UnitTypes.interceptor){{ begin = 16; unitScaling = 2; spacing = 2; @@ -128,7 +128,7 @@ public class Waves{ max = 8; }}, - new SpawnGroup(UnitTypes.vtol){{ + new SpawnGroup(UnitTypes.interceptor){{ begin = 50; unitAmount = 4; unitScaling = 3; diff --git a/core/src/io/anuke/mindustry/maps/Sector.java b/core/src/io/anuke/mindustry/maps/Sector.java index 92fd8c9284..add9c43484 100644 --- a/core/src/io/anuke/mindustry/maps/Sector.java +++ b/core/src/io/anuke/mindustry/maps/Sector.java @@ -6,6 +6,7 @@ import io.anuke.mindustry.game.Saves.SaveSlot; import io.anuke.mindustry.game.SpawnGroup; import io.anuke.mindustry.maps.goals.Mission; import io.anuke.mindustry.maps.goals.WaveMission; +import io.anuke.mindustry.type.Item; import io.anuke.ucore.util.Bits; import static io.anuke.mindustry.Vars.control; @@ -25,6 +26,8 @@ public class Sector{ public transient Mission mission = new WaveMission(30); /**Enemies spawned at this sector.*/ public transient Array spawns = new Array<>(); + /**Ores that appear in this sector.*/ + public transient Array ores = new Array<>(); public int getSeed(){ return Bits.packInt(x, y); diff --git a/core/src/io/anuke/mindustry/maps/Sectors.java b/core/src/io/anuke/mindustry/maps/Sectors.java index b568b86806..5fc6942692 100644 --- a/core/src/io/anuke/mindustry/maps/Sectors.java +++ b/core/src/io/anuke/mindustry/maps/Sectors.java @@ -5,6 +5,7 @@ import com.badlogic.gdx.graphics.Pixmap.Format; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.math.GridPoint2; import com.badlogic.gdx.utils.Array; +import io.anuke.mindustry.content.Items; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.maps.generation.WorldGenerator.GenResult; @@ -118,6 +119,8 @@ public class Sectors{ private void initSector(Sector sector){ sector.mission = new BattleMission(); + //add all ores for now since material differences aren't well handled yet + sector.ores.addAll(Items.tungsten, Items.coal, Items.lead, Items.thorium, Items.titanium); } private int round2(int i){ diff --git a/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java b/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java index d9790003db..a76d9cc72e 100644 --- a/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java +++ b/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java @@ -66,10 +66,10 @@ public class WorldGenerator{ } } - prepareTiles(tiles, seed, genOres); + prepareTiles(tiles, seed, genOres, null); } - public void prepareTiles(Tile[][] tiles, long seed, boolean genOres){ + public void prepareTiles(Tile[][] tiles, long seed, boolean genOres, Array usedOres){ //find multiblocks IntArray multiblocks = new IntArray(); @@ -136,7 +136,7 @@ public class WorldGenerator{ oreIndex = 0; if(genOres){ - Array ores = Array.with( + Array baseOres = Array.with( new OreEntry(Items.tungsten, 0.3f, seed), new OreEntry(Items.coal, 0.284f, seed), new OreEntry(Items.lead, 0.28f, seed), @@ -144,6 +144,15 @@ public class WorldGenerator{ new OreEntry(Items.thorium, 0.26f, seed) ); + Array ores = new Array<>(); + if(usedOres == null){ + ores.addAll(baseOres); + }else{ + for(Item item : usedOres){ + ores.add(baseOres.select(entry -> entry.item == item).iterator().next()); + } + } + for(int x = 0; x < tiles.length; x++){ for(int y = 0; y < tiles[0].length; y++){ @@ -205,7 +214,7 @@ public class WorldGenerator{ sector.mission.generate(tiles, sector); - prepareTiles(tiles, sector.getSeed(), true); + prepareTiles(tiles, sector.getSeed(), true, sector.ores); } public GenResult generateTile(int sectorX, int sectorY, int localX, int localY){ diff --git a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java index bdbb6abd93..b3bba5714d 100644 --- a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java @@ -210,7 +210,7 @@ public class BuildBlock extends Block{ } if(progress >= 1f || debug){ - CallBlocks.onConstructFinish(tile, recipe.result, builderID, tile.getRotation(), tile.getTeam()); + CallBlocks.onConstructFinish(tile, recipe.result, builderID, tile.getRotation(), builder.getTeam()); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java b/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java index c4a5ca3859..8cac603e29 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java @@ -1,9 +1,19 @@ package io.anuke.mindustry.world.blocks.units; import io.anuke.mindustry.world.Block; +import io.anuke.mindustry.world.meta.BlockFlag; +import io.anuke.ucore.util.EnumSet; public class CommandCenter extends Block{ + public CommandCenter(String name){ super(name); + + flags = EnumSet.of(BlockFlag.comandCenter); + destructible = true; + solid = true; + configurable = true; } + + } diff --git a/core/src/io/anuke/mindustry/world/meta/BlockFlag.java b/core/src/io/anuke/mindustry/world/meta/BlockFlag.java index 44820e6646..b09645715f 100644 --- a/core/src/io/anuke/mindustry/world/meta/BlockFlag.java +++ b/core/src/io/anuke/mindustry/world/meta/BlockFlag.java @@ -1,30 +1,20 @@ package io.anuke.mindustry.world.meta; public enum BlockFlag{ - /** - * General important target for all types of units. - */ + /**General important target for all types of units.*/ target(0), - /** - * Point to resupply resources. - */ + /**Point to resupply resources.*/ resupplyPoint(Float.MAX_VALUE), - /** - * Point to drop off resources. - */ + /**Point to drop off resources.*/ dropPoint(Float.MAX_VALUE), - /** - * Producer of important goods. - */ + /**Producer of important goods.*/ producer(20), - /** - * Producer or storage unit of volatile materials. - */ + /**Producer or storage unit of volatile materials.*/ explosive(10), - /** - * Repair point. - */ - repair(Float.MAX_VALUE); + /**Repair point.*/ + repair(Float.MAX_VALUE), + /**Special flag for command center blocks.*/ + comandCenter(30); public final float cost;