diff --git a/core/assets-raw/sprites/blocks/distribution/mass-driver-turret.png b/core/assets-raw/sprites/blocks/distribution/mass-driver-turret.png index 350e7c66f4..dc80819cd5 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/mass-driver-turret.png and b/core/assets-raw/sprites/blocks/distribution/mass-driver-turret.png differ diff --git a/core/assets-raw/sprites/blocks/distribution/mass-driver.png b/core/assets-raw/sprites/blocks/distribution/mass-driver.png index f1d779149d..79f79274b4 100644 Binary files a/core/assets-raw/sprites/blocks/distribution/mass-driver.png and b/core/assets-raw/sprites/blocks/distribution/mass-driver.png differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 6368c91af6..67aa9528da 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -520,3 +520,4 @@ block.rotary-pump.name=Rotary Pump block.nuclear-reactor.name=Nuclear Reactor block.interceptor-factory.name=Interceptor Factory block.command-center.name=Command Center +block.mass-driver.name=Mass Driver \ No newline at end of file diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 2738f38dd5..2beb827812 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,413 +13,427 @@ background index: -1 bridge-conveyor-arrow rotate: false - xy: 785, 302 + xy: 974, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 795, 302 + xy: 984, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 985, 355 + xy: 994, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 915, 301 + xy: 557, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 925, 301 + xy: 567, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 935, 302 + xy: 487, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 945, 302 + xy: 497, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 955, 303 + xy: 507, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 965, 303 + xy: 517, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 975, 297 + xy: 527, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 985, 295 + xy: 537, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 995, 295 + xy: 547, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 1005, 289 + xy: 557, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 1015, 289 + xy: 567, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 736, 241 + xy: 577, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 736, 231 + xy: 577, 179 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 736, 221 + xy: 587, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 736, 211 + xy: 597, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 731, 201 + xy: 587, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 731, 191 + xy: 607, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 741, 201 + xy: 597, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 741, 191 + xy: 617, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 691, 129 + xy: 511, 109 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 691, 119 + xy: 521, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 691, 109 + xy: 531, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 688, 99 + xy: 541, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 688, 89 + xy: 521, 109 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 688, 79 + xy: 531, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 698, 99 + xy: 541, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 698, 89 + xy: 551, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 698, 79 + xy: 531, 109 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 859, 289 + xy: 541, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 869, 289 + xy: 551, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 879, 289 + xy: 561, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 889, 291 + xy: 541, 109 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 899, 291 + xy: 551, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 909, 291 + xy: 561, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 919, 291 + xy: 571, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 889, 281 + xy: 551, 109 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 899, 281 + xy: 561, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 909, 281 + xy: 571, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 +mass-driver + rotate: false + xy: 587, 232 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +mass-driver-turret + rotate: false + xy: 613, 232 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 phase-conveyor-arrow rotate: false - xy: 648, 88 + xy: 641, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 658, 98 + xy: 582, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 658, 88 + xy: 592, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 warp-gate-top rotate: false - xy: 702, 257 + xy: 717, 205 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blast-drill rotate: false - xy: 925, 419 + xy: 953, 419 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blast-drill-rim rotate: false - xy: 951, 419 + xy: 713, 319 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blast-drill-rotator rotate: false - xy: 713, 319 + xy: 739, 328 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blast-drill-top rotate: false - xy: 739, 328 + xy: 765, 330 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 carbide-drill rotate: false - xy: 995, 355 + xy: 1004, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 carbide-drill-rotator rotate: false - xy: 985, 345 + xy: 1014, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 carbide-drill-top rotate: false - xy: 985, 335 + xy: 800, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laser-drill rotate: false - xy: 238, 99 + xy: 761, 202 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 220, 81 + xy: 429, 104 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 256, 99 + xy: 447, 104 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 oil-extractor rotate: false - xy: 639, 232 + xy: 639, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oil-extractor-liquid rotate: false - xy: 587, 206 + xy: 665, 231 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oil-extractor-rotator rotate: false - xy: 613, 206 + xy: 665, 205 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oil-extractor-top rotate: false - xy: 639, 206 + xy: 691, 231 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -454,672 +468,672 @@ plasma-drill-top index: -1 tungsten-drill rotate: false - xy: 959, 283 + xy: 581, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten-drill-rotator rotate: false - xy: 678, 69 + xy: 591, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten-drill-top rotate: false - xy: 688, 69 + xy: 581, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 256, 63 + xy: 360, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 274, 63 + xy: 378, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 292, 63 + xy: 177, 45 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 310, 63 + xy: 195, 45 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blackrock1 rotate: false - xy: 692, 425 + xy: 713, 309 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-blackrock rotate: false - xy: 692, 425 + xy: 713, 309 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackrockshadow1 rotate: false - xy: 171, 107 + xy: 692, 425 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 952, 373 + xy: 723, 309 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-blackstone rotate: false - xy: 952, 373 + xy: 723, 309 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 962, 373 + xy: 181, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 895, 361 + xy: 387, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneedge rotate: false - xy: 977, 431 + xy: 572, 244 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 coal1 rotate: false - xy: 995, 345 + xy: 800, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 985, 325 + xy: 799, 242 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 995, 335 + xy: 799, 232 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 751, 161 + xy: 647, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 507, 181 + xy: 637, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 1011, 359 + xy: 287, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 generic-cliff-edge rotate: false - xy: 504, 161 + xy: 647, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge rotate: false - xy: 504, 161 + xy: 647, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-1 rotate: false - xy: 504, 151 + xy: 657, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-1 rotate: false - xy: 504, 151 + xy: 657, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-2 rotate: false - xy: 515, 171 + xy: 657, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-2 rotate: false - xy: 515, 171 + xy: 657, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-side rotate: false - xy: 514, 161 + xy: 667, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-side rotate: false - xy: 514, 161 + xy: 667, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge rotate: false - xy: 524, 161 + xy: 677, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-1 rotate: false - xy: 524, 151 + xy: 687, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-2 rotate: false - xy: 535, 171 + xy: 687, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-side rotate: false - xy: 534, 161 + xy: 697, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 514, 151 + xy: 667, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 525, 171 + xy: 677, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 209, 1 + xy: 355, 17 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice2 rotate: false - xy: 534, 151 + xy: 697, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 545, 171 + xy: 707, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 237, 1 + xy: 343, 3 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 544, 161 + xy: 707, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 544, 151 + xy: 717, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 544, 151 + xy: 717, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 555, 171 + xy: 717, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 555, 171 + xy: 717, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 279, 1 + xy: 975, 392 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 604, 158 + xy: 797, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 614, 158 + xy: 797, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 624, 158 + xy: 737, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 655, 168 + xy: 857, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 644, 158 + xy: 857, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 644, 148 + xy: 867, 359 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 654, 158 + xy: 877, 359 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 654, 148 + xy: 867, 349 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalflooredge rotate: false - xy: 321, 3 + xy: 385, 3 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 oiledge rotate: false - xy: 335, 3 + xy: 1003, 378 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock2 rotate: false - xy: 668, 78 + xy: 881, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 839, 298 + xy: 842, 282 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 849, 298 + xy: 842, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 349, 3 + xy: 811, 317 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 965, 293 + xy: 839, 202 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 975, 287 + xy: 850, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 985, 285 + xy: 850, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 428, 90 + xy: 825, 302 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 442, 90 + xy: 424, 38 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone-cliff-edge rotate: false - xy: 684, 139 + xy: 501, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 671, 129 + xy: 511, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 671, 119 + xy: 501, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 681, 129 + xy: 511, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 684, 149 + xy: 857, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 674, 139 + xy: 857, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 456, 90 + xy: 438, 38 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 671, 109 + xy: 521, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 681, 119 + xy: 501, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 681, 109 + xy: 511, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 678, 99 + xy: 521, 129 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 678, 89 + xy: 531, 139 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 678, 79 + xy: 501, 109 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten1 rotate: false - xy: 929, 282 + xy: 571, 119 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten2 rotate: false - xy: 939, 282 + xy: 571, 109 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten3 rotate: false - xy: 949, 282 + xy: 581, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge rotate: false - xy: 698, 69 + xy: 591, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-1 rotate: false - xy: 694, 149 + xy: 601, 136 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-2 rotate: false - xy: 694, 139 + xy: 591, 116 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-side rotate: false - xy: 704, 151 + xy: 601, 126 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 484, 90 + xy: 466, 38 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-border rotate: false - xy: 905, 341 + xy: 954, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-elevation rotate: false - xy: 915, 351 + xy: 964, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 915, 351 + xy: 964, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-middle rotate: false - xy: 498, 84 + xy: 914, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 498, 84 + xy: 914, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-slope rotate: false - xy: 701, 161 + xy: 924, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 border rotate: false - xy: 711, 161 + xy: 934, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 1005, 319 + xy: 569, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 737, 181 + xy: 607, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 393, 117 + xy: 285, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cross-3 rotate: false - xy: 385, 135 + xy: 572, 258 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -1133,98 +1147,98 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 505, 171 + xy: 637, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 nuclearreactor-shadow rotate: false - xy: 765, 356 + xy: 845, 417 size: 26, 26 orig: 26, 26 offset: 0, 0 index: -1 place-arrow rotate: false - xy: 568, 78 + xy: 602, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 578, 78 + xy: 612, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 883, 333 + xy: 483, 16 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 rubble-1-0 rotate: false - xy: 292, 81 + xy: 427, 68 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 328, 99 + xy: 445, 68 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 310, 81 + xy: 463, 68 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 346, 99 + xy: 481, 68 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-3-0 rotate: false - xy: 691, 231 + xy: 710, 283 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rubble-3-1 rotate: false - xy: 691, 231 + xy: 710, 283 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shadow-1 rotate: false - xy: 894, 371 + xy: 858, 369 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-2 rotate: false - xy: 447, 176 + xy: 427, 176 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 shadow-3 rotate: false - xy: 845, 417 + xy: 873, 417 size: 26, 26 orig: 26, 26 offset: 0, 0 @@ -1252,273 +1266,273 @@ shadow-6 index: -1 shadow-corner rotate: false - xy: 906, 371 + xy: 870, 369 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-round-1 rotate: false - xy: 918, 371 + xy: 882, 369 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-round-2 rotate: false - xy: 467, 182 + xy: 447, 176 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 shadow-rounded-2 rotate: false - xy: 161, 3 + xy: 467, 182 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 721, 161 + xy: 944, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 731, 161 + xy: 954, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 775, 302 + xy: 964, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 985, 305 + xy: 489, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 995, 305 + xy: 499, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 1005, 349 + xy: 509, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 1015, 349 + xy: 519, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 1005, 339 + xy: 529, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 1015, 339 + xy: 539, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 1005, 329 + xy: 549, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 1015, 329 + xy: 559, 199 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 1015, 319 + xy: 487, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 1005, 309 + xy: 497, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 1015, 309 + xy: 507, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 1005, 299 + xy: 517, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 1015, 299 + xy: 527, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 895, 301 + xy: 537, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 905, 301 + xy: 547, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router rotate: false - xy: 614, 148 + xy: 797, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 624, 148 + xy: 807, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 634, 148 + xy: 807, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 645, 168 + xy: 807, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-tank-bottom rotate: false - xy: 624, 258 + xy: 650, 258 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-tank-liquid rotate: false - xy: 650, 258 + xy: 676, 257 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-tank-top rotate: false - xy: 676, 257 + xy: 793, 362 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 638, 98 + xy: 611, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 638, 88 + xy: 621, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 648, 98 + xy: 631, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 588, 78 + xy: 622, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 598, 78 + xy: 632, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 608, 78 + xy: 642, 156 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 618, 78 + xy: 582, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 628, 78 + xy: 592, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 638, 78 + xy: 602, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 648, 78 + xy: 612, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1539,14 +1553,14 @@ block-icon-battery index: -1 battery-large rotate: false - xy: 899, 419 + xy: 927, 419 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-battery-large rotate: false - xy: 899, 419 + xy: 927, 419 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -1609,42 +1623,42 @@ fusion-reactor-top index: -1 nuclear-reactor-center rotate: false - xy: 587, 232 + xy: 587, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 nuclear-reactor-lights rotate: false - xy: 613, 232 + xy: 613, 206 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rtg-generator-top rotate: false - xy: 829, 298 + xy: 891, 279 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 turbine-generator-top rotate: false - xy: 220, 63 + xy: 324, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 alloy-fuser rotate: false - xy: 873, 419 + xy: 901, 419 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-alloy-fuser rotate: false - xy: 873, 419 + xy: 901, 419 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -1679,189 +1693,189 @@ block-icon-arc-smelter index: -1 arc-smelter-top rotate: false - xy: 507, 191 + xy: 739, 310 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 507, 191 + xy: 739, 310 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor rotate: false - xy: 525, 191 + xy: 736, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame0 rotate: false - xy: 543, 191 + xy: 736, 274 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame1 rotate: false - xy: 561, 191 + xy: 427, 158 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame2 rotate: false - xy: 713, 301 + xy: 445, 158 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-liquid rotate: false - xy: 710, 283 + xy: 420, 140 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-top rotate: false - xy: 739, 310 + xy: 438, 140 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blast-mixer rotate: false - xy: 977, 413 + xy: 757, 310 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-blast-mixer rotate: false - xy: 977, 413 + xy: 757, 310 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 centrifuge-liquid rotate: false - xy: 357, 117 + xy: 249, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 411, 116 + xy: 303, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 429, 122 + xy: 321, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 447, 122 + xy: 339, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator rotate: false - xy: 465, 122 + xy: 357, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 483, 122 + xy: 375, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 831, 398 + xy: 393, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 594, 158 + xy: 787, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 584, 138 + xy: 861, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-weaver rotate: false - xy: 238, 81 + xy: 465, 104 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 274, 99 + xy: 483, 104 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 256, 81 + xy: 427, 86 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 292, 99 + xy: 445, 86 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter-top rotate: false - xy: 274, 81 + xy: 463, 86 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 658, 78 + xy: 622, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 668, 98 + xy: 632, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 945, 292 + xy: 839, 222 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1873,51 +1887,58 @@ core-open orig: 24, 24 offset: 0, 0 index: -1 +core-top + rotate: false + xy: 385, 135 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 sortedunloader rotate: false - xy: 675, 159 + xy: 849, 202 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1 rotate: false - xy: 915, 361 + xy: 934, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1-top rotate: false - xy: 895, 331 + xy: 944, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-2 rotate: false - xy: 995, 419 + xy: 754, 292 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-2-top rotate: false - xy: 995, 401 + xy: 754, 274 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-3 rotate: false - xy: 765, 330 + xy: 586, 284 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-3-top rotate: false - xy: 586, 284 + xy: 612, 284 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -1938,84 +1959,77 @@ block-4-top index: -1 arc rotate: false - xy: 1013, 425 + xy: 197, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 arc-heat rotate: false - xy: 1013, 413 + xy: 209, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 cyclone rotate: false - xy: 572, 258 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -mass-driver-turret - rotate: false - xy: 572, 258 + xy: 598, 258 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 duo rotate: false - xy: 567, 181 + xy: 627, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 fuse rotate: false - xy: 598, 258 + xy: 624, 258 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 spectre rotate: false - xy: 598, 258 + xy: 624, 258 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 hail rotate: false - xy: 363, 19 + xy: 975, 406 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 scatter rotate: false - xy: 363, 19 + xy: 975, 406 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 hail-heat rotate: false - xy: 363, 7 + xy: 805, 331 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 lancer rotate: false - xy: 220, 99 + xy: 761, 238 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 202, 81 + xy: 761, 220 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2029,182 +2043,182 @@ meltdown index: -1 ripple rotate: false - xy: 665, 231 + xy: 691, 205 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ripple-heat rotate: false - xy: 665, 205 + xy: 702, 257 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 salvo rotate: false - xy: 328, 81 + xy: 180, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-heat rotate: false - xy: 364, 99 + xy: 198, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 346, 81 + xy: 216, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 382, 99 + xy: 234, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 scorch rotate: false - xy: 883, 321 + xy: 495, 16 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 883, 309 + xy: 846, 368 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 swarmer rotate: false - xy: 364, 81 + xy: 252, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave rotate: false - xy: 328, 63 + xy: 177, 27 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 346, 63 + xy: 213, 45 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-factory-top rotate: false - xy: 828, 362 + xy: 465, 122 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-factory-top-open rotate: false - xy: 829, 344 + xy: 483, 122 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fabricator-factory-top rotate: false - xy: 429, 104 + xy: 175, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fabricator-factory-top-open rotate: false - xy: 447, 104 + xy: 175, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 interceptor-factory-top rotate: false - xy: 184, 99 + xy: 743, 220 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 interceptor-factory-top-open rotate: false - xy: 202, 99 + xy: 743, 202 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mech-factory rotate: false - xy: 793, 362 + xy: 639, 232 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 dart-ship-factory-open rotate: false - xy: 849, 399 + xy: 411, 116 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 delta-mech-factory-open rotate: false - xy: 831, 380 + xy: 429, 122 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 javelin-ship-factory-open rotate: false - xy: 184, 81 + xy: 762, 256 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 reconstructor-open rotate: false - xy: 310, 99 + xy: 481, 86 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 repair-point-turret rotate: false - xy: 668, 88 + xy: 642, 146 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ship-factory rotate: false - xy: 691, 205 + xy: 717, 231 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 849, 381 + xy: 447, 122 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 557, 181 + xy: 617, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2225,7 +2239,7 @@ beam-end index: -1 blank rotate: false - xy: 571, 138 + xy: 177, 63 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -2239,42 +2253,42 @@ bullet index: -1 bullet-back rotate: false - xy: 400, 106 + xy: 987, 406 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 casing rotate: false - xy: 991, 431 + xy: 827, 410 size: 2, 4 orig: 2, 4 offset: 0, 0 index: -1 clear rotate: false - xy: 568, 108 + xy: 703, 379 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 command-attack rotate: false - xy: 985, 315 + xy: 799, 222 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-idle rotate: false - xy: 995, 325 + xy: 799, 212 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-retreat rotate: false - xy: 995, 315 + xy: 799, 202 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2288,7 +2302,7 @@ enemyarrow index: -1 error rotate: false - xy: 717, 189 + xy: 315, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -2330,21 +2344,21 @@ minelaser-end index: -1 missile rotate: false - xy: 400, 81 + xy: 998, 406 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 missile-back rotate: false - xy: 481, 158 + xy: 397, 46 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 scorch1 rotate: false - xy: 717, 230 + xy: 979, 418 size: 7, 25 orig: 7, 25 offset: 0, 0 @@ -2358,91 +2372,91 @@ scorch2 index: -1 scorch3 rotate: false - xy: 717, 203 + xy: 418, 168 size: 7, 25 orig: 7, 25 offset: 0, 0 index: -1 scorch4 rotate: false - xy: 418, 168 + xy: 411, 134 size: 7, 25 orig: 7, 25 offset: 0, 0 index: -1 scorch5 rotate: false - xy: 411, 134 + xy: 166, 80 size: 7, 25 orig: 7, 25 offset: 0, 0 index: -1 shell rotate: false - xy: 930, 372 + xy: 411, 1 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shell-back rotate: false - xy: 941, 372 + xy: 422, 1 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shot rotate: false - xy: 955, 293 + xy: 839, 212 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 transfer rotate: false - xy: 805, 330 + xy: 486, 208 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 919, 281 + xy: 561, 109 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 transfer-end rotate: false - xy: 487, 189 + xy: 161, 3 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 blackstone-cliff-edge rotate: false - xy: 895, 351 + xy: 894, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-1 rotate: false - xy: 905, 361 + xy: 904, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-2 rotate: false - xy: 895, 341 + xy: 914, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-side rotate: false - xy: 905, 351 + xy: 924, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2456,168 +2470,168 @@ block-icon-arc index: -1 block-icon-biomattercompressor rotate: false - xy: 427, 158 + xy: 775, 312 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-blast-drill rotate: false - xy: 612, 284 + xy: 638, 284 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-bridge-conduit rotate: false - xy: 895, 321 + xy: 847, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 895, 321 + xy: 847, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-bridge-conveyor rotate: false - xy: 905, 331 + xy: 847, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 905, 331 + xy: 847, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-carbide-drill rotate: false - xy: 915, 341 + xy: 974, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-carbide-wall rotate: false - xy: 895, 311 + xy: 984, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 carbide-wall rotate: false - xy: 895, 311 + xy: 984, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-carbide-wall-large rotate: false - xy: 445, 158 + xy: 456, 140 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 carbide-wall-large rotate: false - xy: 445, 158 + xy: 456, 140 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-centrifuge rotate: false - xy: 420, 140 + xy: 463, 158 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 centrifuge rotate: false - xy: 420, 140 + xy: 463, 158 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-combustion-generator rotate: false - xy: 905, 321 + xy: 994, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 905, 321 + xy: 994, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-command-center rotate: false - xy: 438, 140 + xy: 474, 140 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 command-center rotate: false - xy: 438, 140 + xy: 474, 140 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-conduit rotate: false - xy: 915, 331 + xy: 1004, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conveyor rotate: false - xy: 905, 311 + xy: 772, 300 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 905, 311 + xy: 772, 300 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-core rotate: false - xy: 638, 284 + xy: 684, 283 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 core rotate: false - xy: 638, 284 + xy: 684, 283 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-cryofluidmixer rotate: false - xy: 757, 310 + xy: 831, 398 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-cultivator rotate: false - xy: 775, 312 + xy: 849, 399 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2631,189 +2645,189 @@ block-icon-cyclone index: -1 block-icon-dart-ship-factory rotate: false - xy: 487, 171 + xy: 867, 399 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dart-ship-factory rotate: false - xy: 487, 171 + xy: 867, 399 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-deepwater rotate: false - xy: 915, 321 + xy: 772, 290 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 915, 321 + xy: 772, 290 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-deflector-wall rotate: false - xy: 915, 311 + xy: 772, 280 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deflector-wall rotate: false - xy: 915, 311 + xy: 772, 280 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 915, 311 + xy: 772, 280 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-wall rotate: false - xy: 915, 311 + xy: 772, 280 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-deflector-wall-large rotate: false - xy: 579, 188 + xy: 885, 399 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 deflector-wall-large rotate: false - xy: 579, 188 + xy: 885, 399 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-wall-large rotate: false - xy: 579, 188 + xy: 885, 399 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-phase-wall-large rotate: false - xy: 579, 188 + xy: 885, 399 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-delta-mech-factory rotate: false - xy: 597, 188 + xy: 903, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 delta-mech-factory rotate: false - xy: 597, 188 + xy: 903, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-dirt rotate: false - xy: 925, 361 + xy: 782, 302 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 925, 361 + xy: 782, 302 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-distributor rotate: false - xy: 615, 188 + xy: 921, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 distributor rotate: false - xy: 615, 188 + xy: 921, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-door rotate: false - xy: 925, 351 + xy: 782, 292 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 925, 351 + xy: 782, 292 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-door-large rotate: false - xy: 633, 188 + xy: 939, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large rotate: false - xy: 633, 188 + xy: 939, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-drone-factory rotate: false - xy: 665, 187 + xy: 957, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-drop-point rotate: false - xy: 925, 341 + xy: 792, 302 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 drop-point rotate: false - xy: 925, 341 + xy: 792, 302 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-duo rotate: false - xy: 1013, 401 + xy: 221, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 block-icon-fabricator-factory rotate: false - xy: 683, 187 + xy: 831, 380 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2834,126 +2848,126 @@ block-icon-fusion-reactor index: -1 block-icon-grass rotate: false - xy: 925, 331 + xy: 792, 292 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass1 rotate: false - xy: 925, 331 + xy: 792, 292 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-hail rotate: false - xy: 417, 104 + xy: 396, 69 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 block-icon-ice rotate: false - xy: 925, 321 + xy: 782, 282 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice1 rotate: false - xy: 925, 321 + xy: 782, 282 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-icerock rotate: false - xy: 925, 311 + xy: 792, 282 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 925, 311 + xy: 792, 282 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-incinerator rotate: false - xy: 935, 362 + xy: 1014, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 935, 362 + xy: 1014, 368 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-interceptor-factory rotate: false - xy: 456, 140 + xy: 849, 381 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-itemsource rotate: false - xy: 935, 352 + xy: 499, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 935, 352 + xy: 499, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemvoid rotate: false - xy: 935, 342 + xy: 499, 84 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 935, 342 + xy: 499, 84 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-javelin-ship-factory rotate: false - xy: 463, 158 + xy: 867, 381 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 javelin-ship-factory rotate: false - xy: 463, 158 + xy: 867, 381 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-junction rotate: false - xy: 935, 332 + xy: 499, 74 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 junction rotate: false - xy: 935, 332 + xy: 499, 74 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2967,98 +2981,84 @@ block-icon-lancer index: -1 block-icon-laser-drill rotate: false - xy: 474, 140 + xy: 885, 381 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-lava rotate: false - xy: 935, 322 + xy: 851, 322 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 935, 322 + xy: 851, 322 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-junction rotate: false - xy: 935, 312 + xy: 851, 312 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 935, 312 + xy: 851, 312 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-router rotate: false - xy: 945, 362 + xy: 851, 302 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-tank rotate: false - xy: 684, 283 + xy: 177, 135 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-liquidsource rotate: false - xy: 945, 352 + xy: 851, 292 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 945, 352 + xy: 851, 292 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-mass-driver rotate: false - xy: 177, 135 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -mass-driver - rotate: false - xy: 177, 135 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -core-top - rotate: false - xy: 177, 135 - size: 24, 24 - orig: 24, 24 + xy: 737, 354 + size: 26, 26 + orig: 26, 26 offset: 0, 0 index: -1 block-icon-mechanical-pump rotate: false - xy: 945, 342 + xy: 481, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 945, 342 + xy: 481, 4 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3072,28 +3072,28 @@ block-icon-meltdown index: -1 block-icon-melter rotate: false - xy: 945, 332 + xy: 491, 6 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 945, 332 + xy: 491, 6 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-metalfloor rotate: false - xy: 945, 322 + xy: 501, 6 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 945, 322 + xy: 501, 6 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3114,14 +3114,14 @@ nuclear-reactor index: -1 block-icon-oil rotate: false - xy: 945, 312 + xy: 894, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 945, 312 + xy: 894, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3135,49 +3135,49 @@ block-icon-oil-extractor index: -1 block-icon-overflow-gate rotate: false - xy: 955, 363 + xy: 904, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 955, 363 + xy: 904, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conduit rotate: false - xy: 955, 353 + xy: 914, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 955, 353 + xy: 914, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conveyor rotate: false - xy: 955, 343 + xy: 924, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 955, 343 + xy: 924, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-weaver rotate: false - xy: 793, 344 + xy: 903, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3191,210 +3191,210 @@ block-icon-plasma-drill index: -1 block-icon-plastanium-compressor rotate: false - xy: 793, 312 + xy: 921, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 793, 312 + xy: 921, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-power-node rotate: false - xy: 955, 333 + xy: 934, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 power-node rotate: false - xy: 955, 333 + xy: 934, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-power-node-large rotate: false - xy: 811, 343 + xy: 939, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 811, 343 + xy: 939, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-powerinfinite rotate: false - xy: 955, 323 + xy: 944, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 955, 323 + xy: 944, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-powervoid rotate: false - xy: 955, 313 + xy: 954, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 955, 313 + xy: 954, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulse-conduit rotate: false - xy: 965, 363 + xy: 964, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulverizer rotate: false - xy: 965, 353 + xy: 974, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pyratite-mixer rotate: false - xy: 177, 117 + xy: 957, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 177, 117 + xy: 957, 383 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-reconstructor rotate: false - xy: 195, 117 + xy: 828, 362 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 drone-factory rotate: false - xy: 195, 117 + xy: 828, 362 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fabricator-factory rotate: false - xy: 195, 117 + xy: 828, 362 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 interceptor-factory rotate: false - xy: 195, 117 + xy: 828, 362 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 reconstructor rotate: false - xy: 195, 117 + xy: 828, 362 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-repair-point rotate: false - xy: 965, 343 + xy: 984, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 repair-point rotate: false - xy: 965, 343 + xy: 984, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-resupply-point rotate: false - xy: 965, 333 + xy: 994, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 resupply-point rotate: false - xy: 965, 333 + xy: 994, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ripple rotate: false - xy: 737, 354 + xy: 765, 356 size: 26, 26 orig: 26, 26 offset: 0, 0 index: -1 block-icon-rock rotate: false - xy: 965, 323 + xy: 1004, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock1 rotate: false - xy: 965, 323 + xy: 1004, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rotary-pump rotate: false - xy: 213, 117 + xy: 793, 344 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 213, 117 + xy: 793, 344 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-rtg-generator rotate: false - xy: 965, 313 + xy: 1014, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 965, 313 + xy: 1014, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3408,105 +3408,105 @@ block-icon-salvo index: -1 block-icon-sand rotate: false - xy: 975, 367 + xy: 782, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 975, 367 + xy: 782, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-scorch rotate: false - xy: 492, 159 + xy: 396, 57 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 block-icon-separator rotate: false - xy: 975, 357 + xy: 792, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 975, 357 + xy: 792, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shrub rotate: false - xy: 975, 347 + xy: 780, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrub rotate: false - xy: 975, 347 + xy: 780, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-silicon-smelter rotate: false - xy: 231, 117 + xy: 793, 312 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 231, 117 + xy: 793, 312 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-smelter rotate: false - xy: 975, 337 + xy: 790, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 975, 337 + xy: 790, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-snow rotate: false - xy: 975, 327 + xy: 780, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 975, 327 + xy: 780, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-solar-panel rotate: false - xy: 975, 317 + xy: 790, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 975, 317 + xy: 790, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3527,42 +3527,42 @@ solar-panel-large index: -1 block-icon-solidifer rotate: false - xy: 975, 307 + xy: 779, 242 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solidifer rotate: false - xy: 975, 307 + xy: 779, 242 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sorter rotate: false - xy: 728, 291 + xy: 779, 232 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 728, 291 + xy: 779, 232 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-space rotate: false - xy: 728, 281 + xy: 789, 242 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space rotate: false - xy: 728, 281 + xy: 789, 242 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3576,28 +3576,28 @@ block-icon-spectre index: -1 block-icon-splitter rotate: false - xy: 728, 271 + xy: 779, 222 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 728, 271 + xy: 779, 222 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-stone rotate: false - xy: 728, 261 + xy: 789, 232 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone1 rotate: false - xy: 728, 261 + xy: 789, 232 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3611,140 +3611,140 @@ block-icon-swarmer index: -1 block-icon-thermal-generator rotate: false - xy: 249, 117 + xy: 811, 343 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 249, 117 + xy: 811, 343 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermal-pump rotate: false - xy: 267, 117 + xy: 829, 344 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 267, 117 + xy: 829, 344 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thorium-wall rotate: false - xy: 728, 251 + xy: 779, 212 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 728, 251 + xy: 779, 212 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-thorium-wall-large rotate: false - xy: 285, 117 + xy: 177, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 285, 117 + xy: 177, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-titanium-conveyor rotate: false - xy: 726, 241 + xy: 789, 222 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 726, 241 + xy: 789, 222 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor rotate: false - xy: 726, 241 + xy: 789, 222 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-tungsten-drill rotate: false - xy: 726, 231 + xy: 779, 202 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-tungsten-wall rotate: false - xy: 726, 221 + xy: 789, 212 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten-wall rotate: false - xy: 726, 221 + xy: 789, 212 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-tungsten-wall-large rotate: false - xy: 303, 117 + xy: 195, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 tungsten-wall-large rotate: false - xy: 303, 117 + xy: 195, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-turbine-generator rotate: false - xy: 321, 117 + xy: 213, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 turbine-generator rotate: false - xy: 321, 117 + xy: 213, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-unloader rotate: false - xy: 726, 211 + xy: 789, 202 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unloader rotate: false - xy: 726, 211 + xy: 789, 202 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3779,21 +3779,21 @@ warp-gate index: -1 block-icon-water rotate: false - xy: 498, 94 + xy: 904, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 498, 94 + xy: 904, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-water-extractor rotate: false - xy: 339, 117 + xy: 231, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3807,1057 +3807,1057 @@ block-icon-wave index: -1 deepwater-cliff-edge rotate: false - xy: 737, 171 + xy: 627, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-1 rotate: false - xy: 741, 161 + xy: 617, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-2 rotate: false - xy: 747, 181 + xy: 637, 196 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-side rotate: false - xy: 747, 171 + xy: 627, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge rotate: false - xy: 517, 181 + xy: 647, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-1 rotate: false - xy: 527, 181 + xy: 587, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-2 rotate: false - xy: 537, 181 + xy: 597, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-side rotate: false - xy: 547, 181 + xy: 607, 176 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge rotate: false - xy: 625, 168 + xy: 767, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-1 rotate: false - xy: 635, 168 + xy: 777, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-2 rotate: false - xy: 574, 158 + xy: 777, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-side rotate: false - xy: 584, 158 + xy: 787, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-cryofluid rotate: false - xy: 574, 148 + xy: 757, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-lava rotate: false - xy: 584, 148 + xy: 767, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-oil rotate: false - xy: 594, 148 + xy: 777, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-water rotate: false - xy: 604, 148 + xy: 787, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mech-icon-alpha-mech rotate: false - xy: 293, 17 + xy: 975, 378 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-dart-ship rotate: false - xy: 293, 3 + xy: 989, 392 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-delta-mech rotate: false - xy: 307, 17 + xy: 989, 378 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-halberd-ship rotate: false - xy: 307, 3 + xy: 1009, 407 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-trident-ship rotate: false - xy: 307, 3 + xy: 1009, 407 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-omega-mech rotate: false - xy: 321, 17 + xy: 383, 17 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-tau-mech rotate: false - xy: 321, 17 + xy: 383, 17 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 metalfloor-cliff-edge rotate: false - xy: 504, 141 + xy: 877, 349 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-1 rotate: false - xy: 514, 141 + xy: 855, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-2 rotate: false - xy: 524, 141 + xy: 887, 351 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-side rotate: false - xy: 534, 141 + xy: 865, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge rotate: false - xy: 544, 141 + xy: 875, 339 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-1 rotate: false - xy: 554, 141 + xy: 861, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-2 rotate: false - xy: 564, 141 + xy: 861, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-side rotate: false - xy: 574, 138 + xy: 861, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone1 rotate: false - xy: 594, 138 + xy: 861, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone2 rotate: false - xy: 604, 138 + xy: 871, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone3 rotate: false - xy: 614, 138 + xy: 871, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass1 rotate: false - xy: 624, 138 + xy: 871, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass2 rotate: false - xy: 634, 138 + xy: 871, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass3 rotate: false - xy: 644, 138 + xy: 871, 288 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice1 rotate: false - xy: 654, 138 + xy: 881, 329 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice2 rotate: false - xy: 501, 131 + xy: 881, 319 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice3 rotate: false - xy: 501, 121 + xy: 881, 309 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 511, 131 + xy: 881, 299 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 501, 111 + xy: 881, 289 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 511, 121 + xy: 885, 339 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow1 rotate: false - xy: 521, 131 + xy: 891, 329 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow2 rotate: false - xy: 511, 111 + xy: 891, 319 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow3 rotate: false - xy: 521, 121 + xy: 891, 309 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 531, 131 + xy: 891, 299 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 521, 111 + xy: 891, 289 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 531, 121 + xy: 802, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone1 rotate: false - xy: 541, 131 + xy: 802, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone2 rotate: false - xy: 531, 111 + xy: 812, 293 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone3 rotate: false - xy: 541, 121 + xy: 802, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass1 rotate: false - xy: 551, 131 + xy: 812, 283 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass2 rotate: false - xy: 541, 111 + xy: 812, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass3 rotate: false - xy: 551, 121 + xy: 810, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice1 rotate: false - xy: 561, 131 + xy: 810, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice2 rotate: false - xy: 551, 111 + xy: 822, 292 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice3 rotate: false - xy: 561, 121 + xy: 822, 282 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 561, 111 + xy: 822, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 571, 128 + xy: 820, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 571, 118 + xy: 820, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow1 rotate: false - xy: 581, 128 + xy: 832, 284 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow2 rotate: false - xy: 581, 118 + xy: 832, 274 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow3 rotate: false - xy: 591, 128 + xy: 830, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 591, 118 + xy: 830, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 601, 128 + xy: 810, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 601, 118 + xy: 809, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone1 rotate: false - xy: 611, 128 + xy: 809, 223 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone2 rotate: false - xy: 611, 118 + xy: 809, 213 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone3 rotate: false - xy: 621, 128 + xy: 809, 203 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass1 rotate: false - xy: 621, 118 + xy: 820, 242 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass2 rotate: false - xy: 631, 128 + xy: 830, 242 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass3 rotate: false - xy: 631, 118 + xy: 819, 232 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice1 rotate: false - xy: 641, 128 + xy: 819, 222 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice2 rotate: false - xy: 641, 118 + xy: 829, 232 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice3 rotate: false - xy: 651, 128 + xy: 819, 212 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 651, 118 + xy: 829, 222 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 571, 108 + xy: 829, 212 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 581, 108 + xy: 819, 202 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow1 rotate: false - xy: 591, 108 + xy: 829, 202 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow2 rotate: false - xy: 601, 108 + xy: 817, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow3 rotate: false - xy: 611, 108 + xy: 817, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 621, 108 + xy: 827, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 631, 108 + xy: 817, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 641, 108 + xy: 827, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone1 rotate: false - xy: 651, 108 + xy: 827, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone2 rotate: false - xy: 661, 128 + xy: 837, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone3 rotate: false - xy: 661, 118 + xy: 837, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass1 rotate: false - xy: 661, 108 + xy: 837, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass2 rotate: false - xy: 508, 101 + xy: 481, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass3 rotate: false - xy: 508, 91 + xy: 491, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice1 rotate: false - xy: 518, 101 + xy: 501, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice2 rotate: false - xy: 518, 91 + xy: 511, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice3 rotate: false - xy: 528, 101 + xy: 481, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 528, 91 + xy: 521, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 538, 101 + xy: 491, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 538, 91 + xy: 501, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow1 rotate: false - xy: 548, 101 + xy: 511, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow2 rotate: false - xy: 548, 91 + xy: 531, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow3 rotate: false - xy: 558, 101 + xy: 521, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 558, 91 + xy: 541, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 508, 81 + xy: 531, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 518, 81 + xy: 551, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-blackstone1 rotate: false - xy: 528, 81 + xy: 541, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-blackstone2 rotate: false - xy: 538, 81 + xy: 561, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-blackstone3 rotate: false - xy: 548, 81 + xy: 551, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-grass1 rotate: false - xy: 558, 81 + xy: 571, 169 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-grass2 rotate: false - xy: 568, 98 + xy: 561, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-grass3 rotate: false - xy: 568, 88 + xy: 571, 159 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-ice1 rotate: false - xy: 578, 98 + xy: 492, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-ice2 rotate: false - xy: 578, 88 + xy: 502, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-ice3 rotate: false - xy: 588, 98 + xy: 512, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-sand1 rotate: false - xy: 588, 88 + xy: 522, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-sand2 rotate: false - xy: 598, 98 + xy: 532, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-sand3 rotate: false - xy: 598, 88 + xy: 542, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-snow1 rotate: false - xy: 608, 98 + xy: 552, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-snow2 rotate: false - xy: 608, 88 + xy: 562, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-snow3 rotate: false - xy: 618, 98 + xy: 572, 149 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-stone1 rotate: false - xy: 618, 88 + xy: 581, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-stone2 rotate: false - xy: 628, 98 + xy: 591, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-stone3 rotate: false - xy: 628, 88 + xy: 601, 166 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge rotate: false - xy: 859, 299 + xy: 840, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-1 rotate: false - xy: 869, 299 + xy: 840, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-2 rotate: false - xy: 879, 299 + xy: 840, 242 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-side rotate: false - xy: 935, 292 + xy: 839, 232 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge rotate: false - xy: 995, 285 + xy: 850, 242 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-1 rotate: false - xy: 1005, 279 + xy: 849, 232 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-2 rotate: false - xy: 1015, 279 + xy: 849, 222 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-side rotate: false - xy: 665, 159 + xy: 849, 212 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge rotate: false - xy: 685, 159 + xy: 847, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-1 rotate: false - xy: 664, 149 + xy: 847, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-2 rotate: false - xy: 664, 139 + xy: 847, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-side rotate: false - xy: 674, 149 + xy: 857, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unit-icon-scout rotate: false - xy: 470, 90 + xy: 452, 38 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-titan rotate: false - xy: 238, 63 + xy: 342, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 565, 171 + xy: 657, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 564, 161 + xy: 667, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-carbide rotate: false - xy: 564, 151 + xy: 677, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 577, 178 + xy: 687, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 587, 178 + xy: 697, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-phase-matter rotate: false - xy: 597, 178 + xy: 707, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 607, 178 + xy: 717, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 617, 178 + xy: 727, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 627, 178 + xy: 737, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 637, 178 + xy: 737, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 575, 168 + xy: 747, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 585, 168 + xy: 747, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 595, 168 + xy: 757, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 605, 168 + xy: 757, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-tungsten rotate: false - xy: 615, 168 + xy: 767, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon rotate: false - xy: 634, 158 + xy: 747, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -4934,63 +4934,63 @@ scout-leg index: -1 delta-mech rotate: false - xy: 1011, 387 + xy: 259, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-leg rotate: false - xy: 1011, 373 + xy: 273, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 omega-mech rotate: false - xy: 349, 17 + xy: 829, 330 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tau-mech rotate: false - xy: 349, 17 + xy: 829, 330 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dart-ship rotate: false - xy: 791, 330 + xy: 245, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 halberd-ship rotate: false - xy: 223, 1 + xy: 369, 17 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 trident-ship rotate: false - xy: 223, 1 + xy: 369, 17 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 javelin-ship rotate: false - xy: 265, 1 + xy: 371, 3 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-javelin-ship rotate: false - xy: 265, 1 + xy: 371, 3 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -5139,7 +5139,7 @@ check-over index: -1 clear rotate: false - xy: 492, 147 + xy: 233, 1 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5167,273 +5167,273 @@ discord-banner-over index: -1 controller-cursor rotate: false - xy: 375, 117 + xy: 267, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-about rotate: false - xy: 364, 65 + xy: 728, 258 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-add rotate: false - xy: 380, 65 + xy: 195, 29 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin rotate: false - xy: 177, 47 + xy: 231, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin-small rotate: false - xy: 731, 311 + xy: 819, 408 size: 6, 6 orig: 6, 6 offset: 0, 0 index: -1 icon-areaDelete rotate: false - xy: 375, 21 + xy: 817, 331 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow rotate: false - xy: 465, 104 + xy: 193, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-16 rotate: false - xy: 465, 104 + xy: 193, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-down rotate: false - xy: 375, 9 + xy: 480, 40 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-left rotate: false - xy: 387, 21 + xy: 492, 40 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 387, 9 + xy: 843, 332 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 399, 21 + xy: 839, 318 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 483, 104 + xy: 193, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 177, 31 + xy: 211, 29 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-break rotate: false - xy: 867, 399 + xy: 211, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 867, 381 + xy: 211, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 399, 9 + xy: 839, 306 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 885, 401 + xy: 229, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 411, 21 + xy: 839, 294 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 411, 9 + xy: 397, 34 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 846, 368 + xy: 409, 36 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 193, 47 + xy: 247, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 193, 31 + xy: 263, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 858, 369 + xy: 397, 22 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 209, 47 + xy: 279, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 209, 31 + xy: 295, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 225, 47 + xy: 311, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 225, 31 + xy: 327, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-elevation rotate: false - xy: 885, 383 + xy: 229, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 903, 401 + xy: 247, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 241, 47 + xy: 343, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 903, 383 + xy: 247, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 921, 401 + xy: 265, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 241, 31 + xy: 359, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 921, 383 + xy: 265, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 257, 47 + xy: 375, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 939, 401 + xy: 283, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 257, 31 + xy: 181, 11 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 273, 47 + xy: 197, 13 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5447,441 +5447,441 @@ icon-generated index: -1 icon-github rotate: false - xy: 273, 31 + xy: 213, 13 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 289, 47 + xy: 408, 64 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 939, 383 + xy: 283, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 870, 369 + xy: 409, 24 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 847, 356 + xy: 421, 26 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 289, 31 + xy: 408, 48 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 305, 47 + xy: 424, 52 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 847, 344 + xy: 433, 26 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 305, 31 + xy: 440, 52 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-item rotate: false - xy: 847, 332 + xy: 445, 26 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 554, 161 + xy: 727, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-line rotate: false - xy: 957, 401 + xy: 301, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 321, 47 + xy: 456, 52 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 847, 320 + xy: 457, 26 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 321, 31 + xy: 472, 52 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 957, 383 + xy: 301, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 975, 395 + xy: 319, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 975, 377 + xy: 319, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 993, 383 + xy: 337, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 847, 308 + xy: 469, 26 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-map rotate: false - xy: 337, 47 + xy: 488, 52 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 859, 357 + xy: 481, 28 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 993, 365 + xy: 337, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-missing rotate: false - xy: 859, 345 + xy: 493, 28 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 859, 333 + xy: 399, 10 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-nullitem rotate: false - xy: 554, 151 + xy: 727, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 859, 321 + xy: 411, 12 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 665, 169 + xy: 355, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 337, 31 + xy: 227, 29 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 683, 169 + xy: 355, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 859, 309 + xy: 423, 14 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 353, 47 + xy: 229, 13 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 871, 357 + xy: 435, 14 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 871, 345 + xy: 447, 14 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 871, 333 + xy: 459, 14 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 353, 31 + xy: 243, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 701, 171 + xy: 373, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 369, 49 + xy: 259, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 369, 33 + xy: 275, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 719, 171 + xy: 373, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 385, 49 + xy: 291, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 385, 33 + xy: 307, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 396, 65 + xy: 323, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 401, 49 + xy: 339, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 401, 33 + xy: 355, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 811, 325 + xy: 391, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 829, 326 + xy: 391, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 871, 321 + xy: 433, 2 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 811, 307 + xy: 409, 98 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 181, 15 + xy: 371, 31 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 871, 309 + xy: 445, 2 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 882, 369 + xy: 457, 2 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 197, 15 + xy: 245, 15 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 829, 308 + xy: 409, 80 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 213, 15 + xy: 261, 15 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 229, 15 + xy: 277, 15 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 166, 89 + xy: 744, 256 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 883, 357 + xy: 471, 14 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 245, 15 + xy: 293, 15 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 883, 345 + xy: 469, 2 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 261, 15 + xy: 309, 15 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 166, 71 + xy: 743, 238 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 277, 15 + xy: 325, 15 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5967,14 +5967,14 @@ scroll-knob-vertical-black index: -1 selection rotate: false - xy: 703, 379 + xy: 566, 287 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 slider rotate: false - xy: 181, 107 + xy: 424, 70 size: 1, 8 orig: 1, 8 offset: 0, 0 @@ -6069,126 +6069,126 @@ window-empty index: -1 drone rotate: false - xy: 651, 178 + xy: 301, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-drone rotate: false - xy: 651, 178 + xy: 301, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 fabricator rotate: false - xy: 701, 189 + xy: 1008, 421 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 unit-icon-fabricator rotate: false - xy: 701, 189 + xy: 1008, 421 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 interceptor rotate: false - xy: 251, 1 + xy: 357, 3 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-interceptor rotate: false - xy: 251, 1 + xy: 357, 3 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 monsoon rotate: false - xy: 427, 176 + xy: 988, 417 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 unit-icon-monsoon rotate: false - xy: 427, 176 + xy: 988, 417 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 scout rotate: false - xy: 400, 92 + xy: 825, 316 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 titan rotate: false - xy: 382, 81 + xy: 270, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-base rotate: false - xy: 184, 63 + xy: 288, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-leg rotate: false - xy: 202, 63 + xy: 306, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 572, 244 + xy: 791, 330 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 chain-blaster-equip rotate: false - xy: 651, 192 + xy: 166, 66 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flakgun-equip rotate: false - xy: 181, 1 + xy: 329, 1 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flamethrower-equip rotate: false - xy: 195, 1 + xy: 341, 17 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 missiles-equip rotate: false - xy: 335, 17 + xy: 1003, 392 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 414, 90 + xy: 811, 303 size: 12, 12 orig: 12, 12 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index f9eba789fb..8e875b8936 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 b164b17564..78a9905bc9 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -51,6 +51,7 @@ public class Recipes implements ContentList{ new Recipe(distribution, DistributionBlocks.sorter, new ItemStack(Items.carbide, 4), new ItemStack(Items.tungsten, 4)); new Recipe(distribution, DistributionBlocks.overflowGate, new ItemStack(Items.carbide, 4), new ItemStack(Items.tungsten, 8)); new Recipe(distribution, DistributionBlocks.bridgeConveyor, new ItemStack(Items.carbide, 8), new ItemStack(Items.tungsten, 8)); + new Recipe(distribution, DistributionBlocks.massDriver, new ItemStack(Items.carbide, 400), new ItemStack(Items.silicon, 300), new ItemStack(Items.lead, 400), new ItemStack(Items.thorium, 250)); //CRAFTING @@ -172,8 +173,6 @@ public class Recipes implements ContentList{ new Recipe(production, ProductionBlocks.oilextractor, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40));*/ - //new Recipe(distribution, DistributionBlocks.massDriver, new ItemStack(Items.carbide, 1)); - /* diff --git a/core/src/io/anuke/mindustry/content/blocks/DistributionBlocks.java b/core/src/io/anuke/mindustry/content/blocks/DistributionBlocks.java index a0adfe48b5..f55abaccc3 100644 --- a/core/src/io/anuke/mindustry/content/blocks/DistributionBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/DistributionBlocks.java @@ -50,7 +50,7 @@ public class DistributionBlocks extends BlockList implements ContentList{ massDriver = new MassDriver("mass-driver"){{ size = 3; itemCapacity = 80; - range = 300f; + range = 340f; }}; } } diff --git a/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java b/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java index 62b95f81ba..d0090d44a4 100644 --- a/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/TurretBullets.java @@ -179,7 +179,7 @@ public class TurretBullets extends BulletList implements ContentList{ } }; - driverBolt = new BulletType(5f, 20){ + driverBolt = new BulletType(5f, 50){ { collidesTiles = false; lifetime = 200f; @@ -190,11 +190,14 @@ public class TurretBullets extends BulletList implements ContentList{ @Override public void draw(Bullet b){ - Draw.color(Color.LIGHT_GRAY); - Fill.square(b.x, b.y, 3f, b.angle()); + float w = 11f, h = 13f; + + Draw.color(Palette.bulletYellowBack); + Draw.rect("shell-back", b.x, b.y, w, h, b.angle() + 90); + + Draw.color(Palette.bulletYellow); + Draw.rect("shell", b.x, b.y, w, h, b.angle() + 90); - Draw.color(Palette.lighterOrange); - Fill.square(b.x, b.y, 2f, b.angle()); Draw.reset(); } diff --git a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java index 0debb2ebd3..675d3533fb 100644 --- a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java @@ -45,34 +45,22 @@ public interface BuilderTrait extends Entity{ float placeDistance = 150f; float mineDistance = 70f; - /** - * Returns the queue for storing build requests. - */ + /**Returns the queue for storing build requests.*/ Queue getPlaceQueue(); - /** - * Returns the tile this builder is currently mining. - */ + /**Returns the tile this builder is currently mining.*/ Tile getMineTile(); - /** - * Sets the tile this builder is currently mining. - */ + /**Sets the tile this builder is currently mining.*/ void setMineTile(Tile tile); - /** - * Returns the minining speed of this miner. 1 = standard, 0.5 = half speed, 2 = double speed, etc. - */ + /**Returns the minining speed of this miner. 1 = standard, 0.5 = half speed, 2 = double speed, etc.*/ float getMinePower(); - /** - * Build power, can be any float. 1 = builds recipes in normal time, 0 = doesn't build at all. - */ + /**Build power, can be any float. 1 = builds recipes in normal time, 0 = doesn't build at all.*/ float getBuildPower(Tile tile); - /** - * Whether this type of builder can begin creating new blocks. - */ + /**Whether this type of builder can begin creating new blocks.*/ default boolean canCreateBlocks(){ return true; } @@ -120,9 +108,7 @@ public interface BuilderTrait extends Entity{ } } - /** - * Return whether this builder's place queue contains items. - */ + /**Return whether this builder's place queue contains items.*/ default boolean isBuilding(){ return getPlaceQueue().size != 0; } @@ -145,16 +131,12 @@ public interface BuilderTrait extends Entity{ addBuildRequest(new BuildRequest(x, y, rotation, recipe)); } - /** - * Clears the placement queue. - */ + /**Clears the placement queue.*/ default void clearBuilding(){ getPlaceQueue().clear(); } - /** - * Add another build requests to the tail of the queue, if it doesn't exist there yet. - */ + /**Add another build requests to the tail of the queue, if it doesn't exist there yet.*/ default void addBuildRequest(BuildRequest place){ synchronized(getPlaceQueue()){ for(BuildRequest request : getPlaceQueue()){ @@ -233,9 +215,7 @@ public interface BuilderTrait extends Entity{ current.progress = entity.progress(); } - /** - * Do not call directly. - */ + /**Do not call directly.*/ default void updateMining(Unit unit){ Tile tile = getMineTile(); @@ -261,9 +241,7 @@ public interface BuilderTrait extends Entity{ } } - /** - * Draw placement effects for an entity. This includes mining - */ + /**Draw placement effects for an entity. This includes mining*/ default void drawBuilding(Unit unit){ BuildRequest request; @@ -320,9 +298,7 @@ public interface BuilderTrait extends Entity{ Draw.color(); } - /** - * Internal use only. - */ + /**Internal use only.*/ default void drawMining(Unit unit){ Tile tile = getMineTile(); @@ -349,9 +325,7 @@ public interface BuilderTrait extends Entity{ Draw.color(); } - /** - * Class for storing build requests. Can be either a place or remove request. - */ + /**Class for storing build requests. Can be either a place or remove request.*/ class BuildRequest{ public final int x, y, rotation; public final Recipe recipe; @@ -359,9 +333,7 @@ public interface BuilderTrait extends Entity{ public float progress; - /** - * This creates a build request. - */ + /**This creates a build request.*/ public BuildRequest(int x, int y, int rotation, Recipe recipe){ this.x = x; this.y = y; @@ -370,9 +342,7 @@ public interface BuilderTrait extends Entity{ this.remove = false; } - /** - * This creates a remove request. - */ + /**This creates a remove request.*/ public BuildRequest(int x, int y){ this.x = x; this.y = y; diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java index 8cc540fde4..fea75fbcc2 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/core/src/io/anuke/mindustry/world/Block.java @@ -105,6 +105,8 @@ public class Block extends BaseBlock implements Content{ public Color minimapColor = Color.CLEAR; /** View range of this block type. Use a value < 0 to disable. */ public float viewRange = 10; + /**Whether the top icon is outlined, like a turret.*/ + public boolean turretIcon = false; protected Array tempTiles = new Array<>(); protected Color tempColor = new Color(); 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 a2bd405b78..ee3857e25f 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 @@ -85,6 +85,7 @@ public abstract class Turret extends Block{ solid = true; layer = Layer.turret; group = BlockGroup.turrets; + turretIcon = true; } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java index f7dacb63f6..4e23227790 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java @@ -1,5 +1,6 @@ package io.anuke.mindustry.world.blocks.distribution; +import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.utils.ObjectSet; import com.badlogic.gdx.utils.Pool.Poolable; import io.anuke.annotations.Annotations.Loc; @@ -38,11 +39,12 @@ public class MassDriver extends Block{ protected float translation = 7f; protected int minDistribute = 10; protected float knockback = 4f; - protected float reloadTime = 80f; + protected float reloadTime = 100f; protected Effect shootEffect = ShootFx.shootBig2; protected Effect smokeEffect = ShootFx.shootBigSmoke2; - protected Effect recieveEffect = BlockFx.smeltsmoke; + protected Effect recieveEffect = BlockFx.mineBig; protected float shake = 3f; + protected TextureRegion turretRegion; public MassDriver(String name){ super(name); @@ -53,6 +55,7 @@ public class MassDriver extends Block{ itemCapacity = 50; layer = Layer.turret; hasPower = true; + turretIcon = true; } @Remote(targets = Loc.both, called = Loc.server, forward = true) @@ -99,6 +102,28 @@ public class MassDriver extends Block{ Effects.shake(driver.shake, driver.shake, entity); } + @Override + public TextureRegion[] getBlockIcon(){ + if(blockIcon == null){ + blockIcon = new TextureRegion[]{region, turretRegion}; + } + return super.getBlockIcon(); + } + + @Override + public void load(){ + super.load(); + + turretRegion = Draw.region(name + "-turret"); + } + + @Override + public void init(){ + super.init(); + + viewRange = range; + } + @Override public void update(Tile tile){ MassDriverEntity entity = tile.entity(); @@ -148,7 +173,7 @@ public class MassDriver extends Block{ public void drawLayer(Tile tile){ MassDriverEntity entity = tile.entity(); - Draw.rect(name + "-turret", + Draw.rect(turretRegion, tile.drawx() + Angles.trnsx(entity.rotation + 180f, entity.reload * knockback), tile.drawy() + Angles.trnsy(entity.rotation + 180f, entity.reload * knockback), entity.rotation - 90); @@ -156,7 +181,11 @@ public class MassDriver extends Block{ @Override public void drawConfigure(Tile tile){ - super.drawConfigure(tile); + float sin = Mathf.absin(Timers.time(), 6f, 1f); + + Draw.color(Palette.accent); + Lines.stroke(1f); + Lines.circle(tile.drawx(), tile.drawy(), (tile.block().size/2f+1) * tilesize + sin); MassDriverEntity entity = tile.entity(); @@ -164,8 +193,7 @@ public class MassDriver extends Block{ Tile target = world.tile(entity.link); Draw.color(Palette.place); - Lines.square(target.drawx(), target.drawy(), - target.block().size * tilesize / 2f + 1f); + Lines.circle(target.drawx(), target.drawy(), (target.block().size/2f+1) * tilesize + sin); Draw.reset(); } @@ -217,7 +245,6 @@ public class MassDriver extends Block{ public void reset(){ from = null; to = null; - ; } } diff --git a/packer/src/io/anuke/mindustry/Generators.java b/packer/src/io/anuke/mindustry/Generators.java index 062f7bc387..6a081ac65c 100644 --- a/packer/src/io/anuke/mindustry/Generators.java +++ b/packer/src/io/anuke/mindustry/Generators.java @@ -10,7 +10,6 @@ import io.anuke.mindustry.type.Upgrade; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.blocks.Floor; import io.anuke.mindustry.world.blocks.OreBlock; -import io.anuke.mindustry.world.blocks.defense.turrets.Turret; import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Hue; @@ -26,7 +25,7 @@ public class Generators { continue; } - if(block instanceof Turret){ + if(block.turretIcon){ Color color = Color.ROYAL; Image image = context.get(block.name);