diff --git a/core/assets-raw/sprites/blocks/mechs/alpha-mech-pad.png b/core/assets-raw/sprites/blocks/mechs/alpha-mech-pad.png new file mode 100644 index 0000000000..a092abfeb0 Binary files /dev/null and b/core/assets-raw/sprites/blocks/mechs/alpha-mech-pad.png differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 11e6d4f3f8..a1d0780bd1 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -579,6 +579,7 @@ block.pneumatic-drill.name=Pneumatic Drill block.laser-drill.name=Laser Drill block.water-extractor.name=Water Extractor block.cultivator.name=Cultivator +block.alpha-mech-pad.name=Alpha Mech Pad block.dart-ship-pad.name=Dart Ship Pad block.delta-mech-pad.name=Delta Mech Pad block.javelin-ship-pad.name=Javelin Ship Pad diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 4d70f42e96..3884f448a8 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,294 +13,294 @@ force-projector-top index: -1 mend-projector-top rotate: false - xy: 1006, 376 + xy: 182, 245 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 overdrive-projector-top rotate: false - xy: 182, 245 + xy: 182, 227 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 800, 360 + xy: 482, 350 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 810, 360 + xy: 480, 340 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 932, 366 + xy: 630, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 942, 366 + xy: 640, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 952, 366 + xy: 650, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 482, 350 + xy: 660, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 620, 346 + xy: 670, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 630, 348 + xy: 680, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 640, 348 + xy: 690, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 650, 348 + xy: 700, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 660, 348 + xy: 710, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 670, 348 + xy: 720, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 680, 348 + xy: 730, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 690, 348 + xy: 740, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 700, 350 + xy: 750, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 710, 350 + xy: 760, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 720, 350 + xy: 770, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 730, 350 + xy: 780, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 740, 350 + xy: 790, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 750, 350 + xy: 800, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 760, 350 + xy: 810, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 176, 107 + xy: 690, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 166, 97 + xy: 680, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 156, 87 + xy: 650, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 156, 77 + xy: 660, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 176, 97 + xy: 670, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 166, 87 + xy: 700, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 166, 77 + xy: 690, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 160, 67 + xy: 660, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 176, 87 + xy: 670, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 160, 57 + xy: 680, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 176, 77 + xy: 710, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 170, 67 + xy: 700, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 160, 47 + xy: 670, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 160, 37 + xy: 680, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 170, 57 + xy: 690, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 170, 47 + xy: 720, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 170, 37 + xy: 710, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 161, 27 + xy: 680, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 161, 17 + xy: 690, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -314,21 +314,21 @@ mass-driver-turret index: -1 phase-conveyor-arrow rotate: false - xy: 189, 197 + xy: 870, 332 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 179, 187 + xy: 880, 332 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 159, 167 + xy: 890, 332 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -370,42 +370,42 @@ blast-drill-top index: -1 laser-drill rotate: false - xy: 516, 378 + xy: 534, 378 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 534, 378 + xy: 552, 378 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 552, 378 + xy: 570, 378 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mechanical-drill rotate: false - xy: 570, 378 + xy: 588, 378 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mechanical-drill-rotator rotate: false - xy: 588, 378 + xy: 1006, 394 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mechanical-drill-top rotate: false - xy: 1006, 394 + xy: 1006, 376 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -468,98 +468,98 @@ plasma-drill-top index: -1 pneumatic-drill rotate: false - xy: 236, 226 + xy: 254, 232 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pneumatic-drill-rotator rotate: false - xy: 254, 232 + xy: 200, 212 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pneumatic-drill-top rotate: false - xy: 200, 212 + xy: 218, 208 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 380, 215 + xy: 398, 215 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 398, 215 + xy: 254, 196 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 254, 196 + xy: 272, 185 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 272, 185 + xy: 290, 191 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blackrock1 rotate: false - xy: 476, 313 + xy: 410, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-blackrock rotate: false - xy: 476, 313 + xy: 410, 281 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackrockshadow1 rotate: false - xy: 476, 303 + xy: 173, 217 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 476, 293 + xy: 139, 194 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-blackstone rotate: false - xy: 476, 293 + xy: 139, 194 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 21, 1 + xy: 150, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 31, 1 + xy: 183, 217 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -573,560 +573,560 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 820, 360 + xy: 480, 330 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 830, 362 + xy: 480, 320 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 844, 376 + xy: 480, 310 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper1 rotate: false - xy: 770, 350 + xy: 820, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper2 rotate: false - xy: 780, 350 + xy: 830, 348 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper3 rotate: false - xy: 790, 350 + xy: 840, 350 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 860, 356 + xy: 910, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 870, 356 + xy: 920, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 600, 364 + xy: 694, 368 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 generic-cliff-edge rotate: false - xy: 950, 356 + xy: 1000, 364 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge rotate: false - xy: 950, 356 + xy: 1000, 364 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-1 rotate: false - xy: 840, 346 + xy: 1000, 354 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-1 rotate: false - xy: 840, 346 + xy: 1000, 354 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-2 rotate: false - xy: 850, 346 + xy: 1010, 366 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-2 rotate: false - xy: 850, 346 + xy: 1010, 366 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-side rotate: false - xy: 860, 346 + xy: 1010, 356 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-side rotate: false - xy: 860, 346 + xy: 1010, 356 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge rotate: false - xy: 890, 346 + xy: 200, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-1 rotate: false - xy: 900, 346 + xy: 210, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-2 rotate: false - xy: 910, 346 + xy: 220, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-side rotate: false - xy: 920, 346 + xy: 230, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 870, 346 + xy: 180, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 880, 346 + xy: 190, 197 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 406, 291 + xy: 750, 368 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice2 rotate: false - xy: 940, 346 + xy: 210, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 950, 346 + xy: 220, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 434, 336 + xy: 778, 368 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 830, 342 + xy: 230, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 840, 336 + xy: 240, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 840, 336 + xy: 240, 188 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 850, 336 + xy: 250, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 850, 336 + xy: 250, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 434, 322 + xy: 820, 368 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 660, 338 + xy: 510, 302 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 670, 338 + xy: 520, 312 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 680, 338 + xy: 530, 322 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 770, 340 + xy: 520, 292 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 780, 340 + xy: 530, 302 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 790, 340 + xy: 540, 312 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 800, 340 + xy: 550, 322 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 810, 340 + xy: 560, 332 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalflooredge rotate: false - xy: 420, 294 + xy: 862, 372 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 oiledge rotate: false - xy: 448, 308 + xy: 876, 372 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock2 rotate: false - xy: 144, 147 + xy: 600, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 144, 137 + xy: 600, 322 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 164, 157 + xy: 600, 312 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 434, 294 + xy: 890, 372 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 184, 147 + xy: 640, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 174, 137 + xy: 630, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 164, 127 + xy: 610, 306 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 462, 330 + xy: 918, 372 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 462, 316 + xy: 932, 372 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone-cliff-edge rotate: false - xy: 194, 122 + xy: 670, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 204, 152 + xy: 660, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 204, 142 + xy: 630, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 204, 132 + xy: 640, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 194, 142 + xy: 640, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 194, 132 + xy: 620, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 462, 288 + xy: 960, 372 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 204, 122 + xy: 650, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 194, 112 + xy: 680, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 204, 112 + xy: 670, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 156, 107 + xy: 640, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 166, 107 + xy: 650, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 156, 97 + xy: 660, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge rotate: false - xy: 171, 27 + xy: 730, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-1 rotate: false - xy: 171, 17 + xy: 720, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-2 rotate: false - xy: 171, 7 + xy: 690, 298 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-side rotate: false - xy: 180, 67 + xy: 700, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 684, 368 + xy: 406, 291 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-border rotate: false - xy: 416, 228 + xy: 144, 154 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-elevation rotate: false - xy: 426, 228 + xy: 144, 144 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 426, 228 + xy: 144, 144 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-middle rotate: false - xy: 740, 360 + xy: 422, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 740, 360 + xy: 422, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-slope rotate: false - xy: 750, 360 + xy: 432, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 border rotate: false - xy: 760, 360 + xy: 422, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 852, 366 + xy: 552, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 800, 350 + xy: 850, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 89, 23 + xy: 122, 73 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1147,7 +1147,7 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 940, 356 + xy: 990, 354 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1161,49 +1161,49 @@ nuclearreactor-shadow index: -1 place-arrow rotate: false - xy: 169, 177 + xy: 900, 332 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 189, 187 + xy: 910, 332 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 470, 276 + xy: 442, 278 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 rubble-1-0 rotate: false - xy: 236, 208 + xy: 254, 214 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 254, 214 + xy: 272, 221 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 272, 221 + xy: 290, 227 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 290, 227 + xy: 308, 227 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1224,7 +1224,7 @@ rubble-3-1 index: -1 shadow-1 rotate: false - xy: 470, 264 + xy: 137, 215 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1266,14 +1266,14 @@ shadow-6 index: -1 shadow-corner rotate: false - xy: 458, 252 + xy: 149, 215 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-round-1 rotate: false - xy: 470, 252 + xy: 161, 215 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1308,161 +1308,161 @@ shadow-rounded-2 index: -1 shadow-shock-mine rotate: false - xy: 164, 137 + xy: 610, 316 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 770, 360 + xy: 442, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 770, 360 + xy: 442, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 780, 360 + xy: 432, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 790, 360 + xy: 442, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 894, 376 + xy: 490, 320 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 904, 376 + xy: 490, 310 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 914, 376 + xy: 490, 300 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 924, 376 + xy: 502, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 934, 376 + xy: 512, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 944, 376 + xy: 522, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 954, 376 + xy: 532, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 842, 366 + xy: 542, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 862, 366 + xy: 562, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 872, 366 + xy: 572, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 882, 366 + xy: 582, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 892, 366 + xy: 592, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 902, 366 + xy: 480, 290 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 912, 366 + xy: 490, 290 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 922, 366 + xy: 456, 282 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 740, 340 + xy: 540, 322 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 750, 340 + xy: 550, 332 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 760, 340 + xy: 560, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1490,84 +1490,98 @@ liquid-tank-top index: -1 phase-conduit-arrow rotate: false - xy: 149, 167 + xy: 602, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 169, 187 + xy: 850, 332 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 159, 177 + xy: 860, 332 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 169, 167 + xy: 920, 332 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 179, 177 + xy: 930, 332 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 179, 167 + xy: 940, 332 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 189, 177 + xy: 950, 332 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 189, 167 + xy: 960, 332 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 199, 202 + xy: 970, 332 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 199, 192 + xy: 980, 334 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 +alpha-mech-pad + rotate: false + xy: 1000, 412 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-icon-alpha-mech-pad + rotate: false + xy: 1000, 412 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 battery rotate: false - xy: 476, 323 + xy: 456, 340 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-battery rotate: false - xy: 476, 323 + xy: 456, 340 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1644,7 +1658,7 @@ fusion-reactor-top index: -1 rtg-generator-top rotate: false - xy: 154, 157 + xy: 600, 332 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1665,7 +1679,7 @@ thorium-reactor-lights index: -1 turbine-generator-top rotate: false - xy: 326, 214 + xy: 344, 214 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1700,196 +1714,196 @@ alloy-smelter-top index: -1 arc-smelter rotate: false - xy: 1000, 412 + xy: 146, 245 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-arc-smelter rotate: false - xy: 1000, 412 + xy: 146, 245 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 arc-smelter-top rotate: false - xy: 146, 245 + xy: 164, 245 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 146, 245 + xy: 164, 245 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor rotate: false - xy: 164, 245 + xy: 90, 146 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame0 rotate: false - xy: 90, 146 + xy: 90, 128 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame1 rotate: false - xy: 90, 128 + xy: 90, 110 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame2 rotate: false - xy: 90, 110 + xy: 108, 145 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-liquid rotate: false - xy: 108, 145 + xy: 108, 127 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-top rotate: false - xy: 108, 127 + xy: 108, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blast-mixer rotate: false - xy: 108, 109 + xy: 126, 145 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-blast-mixer rotate: false - xy: 108, 109 + xy: 126, 145 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 centrifuge-liquid rotate: false - xy: 480, 394 + xy: 27, 11 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 122, 73 + xy: 114, 55 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 114, 55 + xy: 114, 37 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 114, 37 + xy: 132, 55 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator rotate: false - xy: 132, 55 + xy: 132, 37 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 132, 37 + xy: 266, 251 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 266, 251 + xy: 107, 19 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 650, 338 + xy: 540, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 900, 326 + xy: 550, 302 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-weaver rotate: false - xy: 200, 230 + xy: 218, 244 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 218, 244 + xy: 236, 244 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 236, 244 + xy: 218, 226 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 218, 226 + xy: 236, 226 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 199, 182 + xy: 990, 334 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 199, 172 + xy: 1000, 334 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 174, 147 + xy: 630, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1910,35 +1924,35 @@ core-top index: -1 sortedunloader rotate: false - xy: 184, 127 + xy: 610, 296 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1 rotate: false - xy: 416, 238 + xy: 610, 356 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1-top rotate: false - xy: 426, 238 + xy: 468, 286 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-2 rotate: false - xy: 126, 145 + xy: 126, 127 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-2-top rotate: false - xy: 126, 127 + xy: 126, 109 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1994,7 +2008,7 @@ cyclone index: -1 duo rotate: false - xy: 930, 356 + xy: 980, 354 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2008,7 +2022,7 @@ fuse index: -1 hail rotate: false - xy: 930, 346 + xy: 240, 198 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2022,14 +2036,14 @@ hail-heat index: -1 lancer rotate: false - xy: 480, 376 + xy: 498, 378 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 498, 378 + xy: 516, 378 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2064,49 +2078,49 @@ ripple-heat index: -1 salvo rotate: false - xy: 308, 227 + xy: 326, 232 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-heat rotate: false - xy: 326, 232 + xy: 344, 232 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 344, 232 + xy: 362, 233 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 362, 233 + xy: 380, 233 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 scatter rotate: false - xy: 154, 137 + xy: 610, 336 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch rotate: false - xy: 144, 117 + xy: 610, 326 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 184, 157 + xy: 620, 336 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2120,35 +2134,35 @@ spectre index: -1 swarmer rotate: false - xy: 272, 203 + xy: 290, 209 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave rotate: false - xy: 290, 191 + xy: 308, 191 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 308, 191 + xy: 326, 196 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dagger-factory-top rotate: false - xy: 107, 19 + xy: 125, 19 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dagger-factory-top-open rotate: false - xy: 125, 19 + xy: 89, 5 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2211,28 +2225,28 @@ ghoul-factory index: -1 phantom-factory-top rotate: false - xy: 182, 227 + xy: 200, 248 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phantom-factory-top-open rotate: false - xy: 200, 248 + xy: 200, 230 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 reconstructor-open rotate: false - xy: 218, 208 + xy: 236, 208 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 repair-point-turret rotate: false - xy: 144, 157 + xy: 1010, 336 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2260,14 +2274,14 @@ revenant-factory-top-open index: -1 spirit-factory-top rotate: false - xy: 380, 233 + xy: 398, 233 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 spirit-factory-top-open rotate: false - xy: 398, 233 + xy: 272, 203 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2281,42 +2295,42 @@ titan-factory index: -1 wraith-factory-top rotate: false - xy: 326, 196 + xy: 344, 196 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wraith-factory-top-open rotate: false - xy: 344, 196 + xy: 362, 197 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 deflector-wall rotate: false - xy: 850, 356 + xy: 900, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deflector-wall-large rotate: false - xy: 89, 5 + xy: 107, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 107, 1 + xy: 125, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 920, 356 + xy: 970, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2365,49 +2379,49 @@ casing index: -1 clear rotate: false - xy: 137, 217 + xy: 90, 107 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 command-attack rotate: false - xy: 854, 376 + xy: 480, 300 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-idle rotate: false - xy: 864, 376 + xy: 492, 350 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-patrol rotate: false - xy: 874, 376 + xy: 490, 340 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-retreat rotate: false - xy: 884, 376 + xy: 490, 330 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 426, 199 + xy: 420, 281 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 error rotate: false - xy: 406, 333 + xy: 708, 368 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -2505,28 +2519,28 @@ shell index: -1 shell-back rotate: false - xy: 476, 333 + xy: 139, 204 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shot rotate: false - xy: 154, 127 + xy: 620, 326 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 transfer rotate: false - xy: 137, 220 + xy: 45, 15 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 161, 7 + xy: 700, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2540,42 +2554,42 @@ transfer-end index: -1 blackstone-cliff-edge rotate: false - xy: 41, 1 + xy: 139, 184 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-1 rotate: false - xy: 422, 248 + xy: 160, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-2 rotate: false - xy: 432, 248 + xy: 139, 174 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-side rotate: false - xy: 442, 248 + xy: 139, 164 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-arc rotate: false - xy: 436, 238 + xy: 144, 134 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-biomattercompressor rotate: false - xy: 126, 109 + xy: 298, 317 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2589,119 +2603,119 @@ block-icon-blast-drill index: -1 block-icon-bridge-conduit rotate: false - xy: 416, 218 + xy: 144, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 416, 218 + xy: 144, 124 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-bridge-conveyor rotate: false - xy: 426, 218 + xy: 144, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 426, 218 + xy: 144, 114 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-centrifuge rotate: false - xy: 298, 317 + xy: 298, 299 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 centrifuge rotate: false - xy: 298, 317 + xy: 298, 299 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-combustion-generator rotate: false - xy: 436, 228 + xy: 620, 356 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 436, 228 + xy: 620, 356 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-command-center rotate: false - xy: 298, 299 + xy: 146, 227 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 command-center rotate: false - xy: 298, 299 + xy: 146, 227 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-conduit rotate: false - xy: 436, 218 + xy: 630, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conveyor rotate: false - xy: 426, 208 + xy: 640, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 426, 208 + xy: 640, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-copper-wall rotate: false - xy: 436, 208 + xy: 650, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper-wall rotate: false - xy: 436, 208 + xy: 650, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-copper-wall-large rotate: false - xy: 146, 227 + xy: 164, 227 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 copper-wall-large rotate: false - xy: 146, 227 + xy: 164, 227 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2722,14 +2736,14 @@ core index: -1 block-icon-cryofluidmixer rotate: false - xy: 164, 227 + xy: 230, 280 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-cultivator rotate: false - xy: 230, 280 + xy: 248, 280 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2743,140 +2757,140 @@ block-icon-cyclone index: -1 block-icon-dagger-factory rotate: false - xy: 248, 280 + xy: 312, 340 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-dart-ship-pad rotate: false - xy: 312, 340 + xy: 316, 322 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dart-ship-pad rotate: false - xy: 312, 340 + xy: 316, 322 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-deepwater rotate: false - xy: 446, 238 + xy: 660, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 446, 238 + xy: 660, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-delta-mech-pad rotate: false - xy: 316, 322 + xy: 316, 304 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 delta-mech-pad rotate: false - xy: 316, 322 + xy: 316, 304 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-dense-alloy-wall rotate: false - xy: 446, 228 + xy: 670, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dense-alloy-wall rotate: false - xy: 446, 228 + xy: 670, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-dense-alloy-wall-large rotate: false - xy: 316, 304 + xy: 330, 340 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dense-alloy-wall-large rotate: false - xy: 316, 304 + xy: 330, 340 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-dirt rotate: false - xy: 446, 218 + xy: 680, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 446, 218 + xy: 680, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-distributor rotate: false - xy: 330, 340 + xy: 334, 322 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 distributor rotate: false - xy: 330, 340 + xy: 334, 322 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-door rotate: false - xy: 446, 208 + xy: 690, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 446, 208 + xy: 690, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-door-large rotate: false - xy: 334, 322 + xy: 334, 304 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large rotate: false - xy: 334, 322 + xy: 334, 304 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-duo rotate: false - xy: 456, 242 + xy: 700, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2939,168 +2953,168 @@ glaive-ship-pad index: -1 block-icon-grass rotate: false - xy: 456, 232 + xy: 710, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass1 rotate: false - xy: 456, 232 + xy: 710, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-hail rotate: false - xy: 466, 242 + xy: 720, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ice rotate: false - xy: 456, 222 + xy: 730, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice1 rotate: false - xy: 456, 222 + xy: 730, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-icerock rotate: false - xy: 466, 232 + xy: 740, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 466, 232 + xy: 740, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-incinerator rotate: false - xy: 456, 212 + xy: 750, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 456, 212 + xy: 750, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemsource rotate: false - xy: 466, 222 + xy: 760, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 466, 222 + xy: 760, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemvoid rotate: false - xy: 466, 212 + xy: 770, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 466, 212 + xy: 770, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-javelin-ship-pad rotate: false - xy: 334, 304 + xy: 347, 377 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 javelin-ship-pad rotate: false - xy: 334, 304 + xy: 347, 377 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-junction rotate: false - xy: 476, 242 + xy: 780, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 junction rotate: false - xy: 476, 242 + xy: 780, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-lancer rotate: false - xy: 347, 377 + xy: 365, 377 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-laser-drill rotate: false - xy: 365, 377 + xy: 383, 377 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-lava rotate: false - xy: 476, 232 + xy: 790, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 476, 232 + xy: 790, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-junction rotate: false - xy: 476, 222 + xy: 800, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 476, 222 + xy: 800, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-router rotate: false - xy: 476, 212 + xy: 810, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3114,14 +3128,14 @@ block-icon-liquid-tank index: -1 block-icon-liquidsource rotate: false - xy: 456, 202 + xy: 820, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 456, 202 + xy: 820, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3142,21 +3156,21 @@ mass-driver index: -1 block-icon-mechanical-drill rotate: false - xy: 383, 377 + xy: 394, 401 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-mechanical-pump rotate: false - xy: 466, 202 + xy: 830, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 466, 202 + xy: 830, 358 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3170,56 +3184,56 @@ block-icon-meltdown index: -1 block-icon-melter rotate: false - xy: 476, 202 + xy: 840, 360 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 476, 202 + xy: 840, 360 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-mend-projector rotate: false - xy: 394, 401 + xy: 348, 359 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mend-projector rotate: false - xy: 394, 401 + xy: 348, 359 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-metalfloor rotate: false - xy: 970, 378 + xy: 850, 362 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 970, 378 + xy: 850, 362 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-oil rotate: false - xy: 980, 378 + xy: 860, 362 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 980, 378 + xy: 860, 362 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3247,98 +3261,98 @@ omega-mech-pad index: -1 block-icon-overdrive-projector rotate: false - xy: 348, 359 + xy: 348, 341 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 overdrive-projector rotate: false - xy: 348, 359 + xy: 348, 341 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-overflow-gate rotate: false - xy: 990, 378 + xy: 870, 362 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 990, 378 + xy: 870, 362 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phantom-factory rotate: false - xy: 348, 341 + xy: 366, 359 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-phase-conduit rotate: false - xy: 150, 67 + xy: 880, 362 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 150, 67 + xy: 880, 362 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conveyor rotate: false - xy: 150, 57 + xy: 890, 362 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 150, 57 + xy: 890, 362 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-wall rotate: false - xy: 150, 47 + xy: 900, 362 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 150, 47 + xy: 900, 362 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-wall-large rotate: false - xy: 366, 359 + xy: 366, 341 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-wall-large rotate: false - xy: 366, 359 + xy: 366, 341 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-phase-weaver rotate: false - xy: 366, 341 + xy: 352, 323 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3352,161 +3366,161 @@ block-icon-plasma-drill index: -1 block-icon-plastanium-compressor rotate: false - xy: 352, 323 + xy: 352, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 352, 323 + xy: 352, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-pneumatic-drill rotate: false - xy: 352, 305 + xy: 384, 359 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-power-node rotate: false - xy: 150, 37 + xy: 910, 362 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 power-node rotate: false - xy: 150, 37 + xy: 910, 362 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-power-node-large rotate: false - xy: 384, 359 + xy: 384, 341 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 384, 359 + xy: 384, 341 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-powerinfinite rotate: false - xy: 498, 352 + xy: 920, 362 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 498, 352 + xy: 920, 362 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-powervoid rotate: false - xy: 508, 352 + xy: 930, 362 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 508, 352 + xy: 930, 362 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulse-conduit rotate: false - xy: 518, 352 + xy: 940, 362 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulverizer rotate: false - xy: 530, 354 + xy: 950, 362 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pyratite-mixer rotate: false - xy: 384, 341 + xy: 370, 323 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 384, 341 + xy: 370, 323 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-reconstructor rotate: false - xy: 370, 323 + xy: 370, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dagger-factory rotate: false - xy: 370, 323 + xy: 370, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phantom-factory rotate: false - xy: 370, 323 + xy: 370, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 reconstructor rotate: false - xy: 370, 323 + xy: 370, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 spirit-factory rotate: false - xy: 370, 323 + xy: 370, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wraith-factory rotate: false - xy: 370, 323 + xy: 370, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-repair-point rotate: false - xy: 540, 354 + xy: 960, 362 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 repair-point rotate: false - xy: 540, 354 + xy: 960, 362 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3527,182 +3541,182 @@ block-icon-ripple index: -1 block-icon-rock rotate: false - xy: 550, 354 + xy: 970, 362 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock1 rotate: false - xy: 550, 354 + xy: 970, 362 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rotary-pump rotate: false - xy: 370, 305 + xy: 388, 323 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 370, 305 + xy: 388, 323 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-router rotate: false - xy: 560, 354 + xy: 980, 364 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 560, 354 + xy: 980, 364 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rtg-generator rotate: false - xy: 388, 323 + xy: 388, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 388, 323 + xy: 388, 305 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-salvo rotate: false - xy: 388, 305 + xy: 53, 19 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-sand rotate: false - xy: 570, 354 + xy: 990, 364 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 570, 354 + xy: 990, 364 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-scorch rotate: false - xy: 580, 354 + xy: 21, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-separator rotate: false - xy: 590, 354 + xy: 31, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 590, 354 + xy: 31, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shock-mine rotate: false - xy: 600, 354 + xy: 41, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shock-mine rotate: false - xy: 600, 354 + xy: 41, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shrub rotate: false - xy: 610, 354 + xy: 170, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrub rotate: false - xy: 610, 354 + xy: 170, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-silicon-smelter rotate: false - xy: 53, 19 + xy: 71, 19 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 53, 19 + xy: 71, 19 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-smelter rotate: false - xy: 620, 356 + xy: 180, 207 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 620, 356 + xy: 180, 207 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-snow rotate: false - xy: 630, 358 + xy: 190, 207 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 630, 358 + xy: 190, 207 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-solar-panel rotate: false - xy: 640, 358 + xy: 200, 202 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 640, 358 + xy: 200, 202 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3723,42 +3737,42 @@ solar-panel-large index: -1 block-icon-solidifer rotate: false - xy: 650, 358 + xy: 150, 67 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solidifer rotate: false - xy: 650, 358 + xy: 150, 67 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sorter rotate: false - xy: 660, 358 + xy: 150, 57 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 660, 358 + xy: 150, 57 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-space rotate: false - xy: 670, 358 + xy: 150, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space rotate: false - xy: 670, 358 + xy: 150, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3772,98 +3786,98 @@ block-icon-spectre index: -1 block-icon-spirit-factory rotate: false - xy: 71, 19 + xy: 93, 77 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-stone rotate: false - xy: 680, 358 + xy: 150, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone1 rotate: false - xy: 680, 358 + xy: 150, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-surge-wall rotate: false - xy: 690, 358 + xy: 390, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 690, 358 + xy: 390, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-surge-wall-large rotate: false - xy: 93, 77 + xy: 122, 91 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 surge-wall-large rotate: false - xy: 93, 77 + xy: 122, 91 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-swarmer rotate: false - xy: 122, 91 + xy: 96, 59 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-tau-mech-pad rotate: false - xy: 96, 59 + xy: 96, 41 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 tau-mech-pad rotate: false - xy: 96, 59 + xy: 96, 41 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermal-generator rotate: false - xy: 96, 41 + xy: 268, 287 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 96, 41 + xy: 268, 287 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermal-pump rotate: false - xy: 268, 287 + xy: 230, 262 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 268, 287 + xy: 230, 262 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3884,28 +3898,28 @@ thorium-reactor index: -1 block-icon-thorium-wall rotate: false - xy: 700, 360 + xy: 400, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 700, 360 + xy: 400, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-thorium-wall-large rotate: false - xy: 230, 262 + xy: 248, 262 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 230, 262 + xy: 248, 262 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3919,56 +3933,56 @@ block-icon-titan-factory index: -1 block-icon-titanium-conveyor rotate: false - xy: 710, 360 + xy: 410, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 710, 360 + xy: 410, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-trident-ship-pad rotate: false - xy: 248, 262 + xy: 266, 269 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 trident-ship-pad rotate: false - xy: 248, 262 + xy: 266, 269 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-turbine-generator rotate: false - xy: 266, 269 + xy: 412, 398 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 turbine-generator rotate: false - xy: 266, 269 + xy: 412, 398 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-unloader rotate: false - xy: 720, 360 + xy: 420, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unloader rotate: false - xy: 720, 360 + xy: 420, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -4003,1113 +4017,1113 @@ warp-gate index: -1 block-icon-water rotate: false - xy: 730, 360 + xy: 430, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 730, 360 + xy: 430, 173 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-water-extractor rotate: false - xy: 412, 398 + xy: 430, 398 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-wave rotate: false - xy: 430, 398 + xy: 448, 398 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-wraith-factory rotate: false - xy: 448, 398 + xy: 480, 394 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 deepwater-cliff-edge rotate: false - xy: 810, 350 + xy: 860, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-1 rotate: false - xy: 820, 350 + xy: 870, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-2 rotate: false - xy: 830, 352 + xy: 880, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-side rotate: false - xy: 840, 356 + xy: 890, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge rotate: false - xy: 880, 356 + xy: 930, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-1 rotate: false - xy: 890, 356 + xy: 940, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-2 rotate: false - xy: 900, 356 + xy: 950, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-side rotate: false - xy: 910, 356 + xy: 960, 352 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge rotate: false - xy: 1002, 366 + xy: 530, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-1 rotate: false - xy: 1012, 366 + xy: 510, 312 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-2 rotate: false - xy: 630, 338 + xy: 520, 322 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-side rotate: false - xy: 640, 338 + xy: 530, 332 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-cryofluid rotate: false - xy: 700, 340 + xy: 550, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-lava rotate: false - xy: 710, 340 + xy: 510, 292 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-oil rotate: false - xy: 720, 340 + xy: 520, 302 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-water rotate: false - xy: 730, 340 + xy: 530, 312 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mech-icon-alpha-mech rotate: false - xy: 420, 308 + xy: 466, 344 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-dart-ship rotate: false - xy: 448, 322 + xy: 834, 370 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-delta-mech rotate: false - xy: 434, 308 + xy: 848, 372 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-omega-mech rotate: false - xy: 418, 366 + xy: 450, 350 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mech-icon-tau-mech rotate: false - xy: 434, 366 + xy: 466, 358 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mech-icon-trident-ship rotate: false - xy: 418, 350 + xy: 482, 360 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 trident-ship rotate: false - xy: 418, 350 + xy: 482, 360 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 metalfloor-cliff-edge rotate: false - xy: 820, 340 + xy: 570, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-1 rotate: false - xy: 830, 332 + xy: 530, 292 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-2 rotate: false - xy: 840, 326 + xy: 540, 302 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-side rotate: false - xy: 850, 326 + xy: 550, 312 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge rotate: false - xy: 860, 326 + xy: 560, 322 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-1 rotate: false - xy: 870, 326 + xy: 570, 332 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-2 rotate: false - xy: 880, 326 + xy: 580, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-side rotate: false - xy: 890, 326 + xy: 540, 292 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone1 rotate: false - xy: 910, 326 + xy: 560, 312 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone2 rotate: false - xy: 920, 326 + xy: 570, 322 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone3 rotate: false - xy: 930, 326 + xy: 580, 332 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass1 rotate: false - xy: 940, 326 + xy: 590, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass2 rotate: false - xy: 950, 326 + xy: 550, 292 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass3 rotate: false - xy: 960, 326 + xy: 560, 302 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice1 rotate: false - xy: 970, 356 + xy: 570, 312 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice2 rotate: false - xy: 970, 346 + xy: 580, 322 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice3 rotate: false - xy: 970, 336 + xy: 590, 332 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 970, 326 + xy: 560, 292 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 980, 358 + xy: 570, 302 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 980, 348 + xy: 580, 312 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow1 rotate: false - xy: 990, 358 + xy: 590, 322 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow2 rotate: false - xy: 980, 338 + xy: 570, 292 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow3 rotate: false - xy: 990, 348 + xy: 580, 302 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 980, 328 + xy: 590, 312 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 990, 338 + xy: 580, 292 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 990, 328 + xy: 590, 302 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone1 rotate: false - xy: 1000, 356 + xy: 590, 292 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone2 rotate: false - xy: 1000, 346 + xy: 840, 340 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone3 rotate: false - xy: 1010, 356 + xy: 850, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass1 rotate: false - xy: 1000, 336 + xy: 860, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass2 rotate: false - xy: 1010, 346 + xy: 870, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass3 rotate: false - xy: 1010, 336 + xy: 880, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice1 rotate: false - xy: 1000, 326 + xy: 890, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice2 rotate: false - xy: 1010, 326 + xy: 900, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice3 rotate: false - xy: 700, 330 + xy: 910, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand1 rotate: false - xy: 710, 330 + xy: 920, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand2 rotate: false - xy: 720, 330 + xy: 930, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand3 rotate: false - xy: 730, 330 + xy: 940, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow1 rotate: false - xy: 740, 330 + xy: 950, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow2 rotate: false - xy: 750, 330 + xy: 960, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow3 rotate: false - xy: 760, 330 + xy: 970, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone1 rotate: false - xy: 770, 330 + xy: 980, 344 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone2 rotate: false - xy: 780, 330 + xy: 990, 344 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone3 rotate: false - xy: 790, 330 + xy: 1000, 344 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone1 rotate: false - xy: 800, 330 + xy: 1010, 346 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone2 rotate: false - xy: 810, 330 + xy: 466, 276 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone3 rotate: false - xy: 820, 330 + xy: 462, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass1 rotate: false - xy: 830, 322 + xy: 462, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass2 rotate: false - xy: 840, 316 + xy: 472, 266 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass3 rotate: false - xy: 850, 316 + xy: 472, 256 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice1 rotate: false - xy: 860, 316 + xy: 482, 270 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice2 rotate: false - xy: 870, 316 + xy: 482, 260 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice3 rotate: false - xy: 880, 316 + xy: 492, 270 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 890, 316 + xy: 492, 260 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 900, 316 + xy: 502, 270 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 910, 316 + xy: 502, 260 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow1 rotate: false - xy: 920, 316 + xy: 508, 280 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow2 rotate: false - xy: 930, 316 + xy: 518, 282 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow3 rotate: false - xy: 940, 316 + xy: 528, 282 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 950, 316 + xy: 538, 282 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 960, 316 + xy: 548, 282 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 970, 316 + xy: 558, 282 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone1 rotate: false - xy: 980, 318 + xy: 568, 282 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone2 rotate: false - xy: 990, 318 + xy: 578, 282 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone3 rotate: false - xy: 1000, 316 + xy: 588, 282 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass1 rotate: false - xy: 1010, 316 + xy: 512, 270 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass2 rotate: false - xy: 980, 308 + xy: 512, 260 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass3 rotate: false - xy: 990, 308 + xy: 522, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice1 rotate: false - xy: 1000, 306 + xy: 522, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice2 rotate: false - xy: 1010, 306 + xy: 532, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice3 rotate: false - xy: 322, 170 + xy: 532, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 332, 170 + xy: 542, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 342, 170 + xy: 542, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 352, 170 + xy: 552, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow1 rotate: false - xy: 362, 170 + xy: 552, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow2 rotate: false - xy: 140, 217 + xy: 562, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow3 rotate: false - xy: 150, 217 + xy: 562, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 160, 217 + xy: 572, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 170, 217 + xy: 572, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 180, 217 + xy: 582, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone1 rotate: false - xy: 190, 217 + xy: 582, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone2 rotate: false - xy: 139, 207 + xy: 592, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone3 rotate: false - xy: 139, 197 + xy: 592, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass1 rotate: false - xy: 149, 207 + xy: 598, 282 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass2 rotate: false - xy: 139, 187 + xy: 602, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass3 rotate: false - xy: 159, 207 + xy: 602, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice1 rotate: false - xy: 149, 197 + xy: 482, 250 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice2 rotate: false - xy: 139, 177 + xy: 492, 250 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice3 rotate: false - xy: 169, 207 + xy: 502, 250 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 159, 197 + xy: 512, 250 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 149, 187 + xy: 522, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 139, 167 + xy: 532, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow1 rotate: false - xy: 179, 207 + xy: 542, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow2 rotate: false - xy: 169, 197 + xy: 552, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow3 rotate: false - xy: 149, 177 + xy: 562, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 159, 187 + xy: 572, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 189, 207 + xy: 582, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 179, 197 + xy: 592, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge rotate: false - xy: 154, 147 + xy: 600, 302 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-1 rotate: false - xy: 144, 127 + xy: 600, 292 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-2 rotate: false - xy: 174, 157 + xy: 610, 346 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-side rotate: false - xy: 164, 147 + xy: 620, 346 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge rotate: false - xy: 154, 117 + xy: 620, 316 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-1 rotate: false - xy: 184, 137 + xy: 650, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-2 rotate: false - xy: 174, 127 + xy: 640, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-side rotate: false - xy: 164, 117 + xy: 630, 318 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge rotate: false - xy: 174, 117 + xy: 620, 306 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-1 rotate: false - xy: 184, 117 + xy: 660, 338 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-2 rotate: false - xy: 199, 162 + xy: 650, 328 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-side rotate: false - xy: 194, 152 + xy: 630, 308 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unit-icon-dagger rotate: false - xy: 656, 368 + xy: 406, 319 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-fortress rotate: false - xy: 344, 214 + xy: 362, 215 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-icon-titan rotate: false - xy: 362, 215 + xy: 380, 215 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-icon-wraith rotate: false - xy: 670, 368 + xy: 406, 305 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 wraith rotate: false - xy: 670, 368 + xy: 406, 305 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 880, 336 + xy: 452, 258 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 890, 336 + xy: 478, 280 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 900, 336 + xy: 488, 280 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-copper rotate: false - xy: 910, 336 + xy: 500, 340 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-dense-alloy rotate: false - xy: 920, 336 + xy: 500, 330 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 930, 336 + xy: 500, 320 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-phase-matter rotate: false - xy: 940, 336 + xy: 500, 310 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 950, 336 + xy: 500, 300 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 962, 366 + xy: 500, 290 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 960, 356 + xy: 498, 280 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 960, 346 + xy: 510, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 960, 336 + xy: 510, 332 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 972, 368 + xy: 520, 342 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 982, 368 + xy: 510, 322 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 992, 368 + xy: 520, 332 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon rotate: false - xy: 690, 338 + xy: 540, 332 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -5137,77 +5151,77 @@ alpha-mech-leg index: -1 delta-mech rotate: false - xy: 572, 364 + xy: 652, 368 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-base rotate: false - xy: 586, 364 + xy: 666, 368 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-leg rotate: false - xy: 466, 344 + xy: 680, 368 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 omega-mech rotate: false - xy: 434, 350 + xy: 498, 362 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 omega-mech-armor rotate: false - xy: 450, 366 + xy: 514, 362 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 omega-mech-base rotate: false - xy: 450, 350 + xy: 530, 362 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 omega-mech-leg rotate: false - xy: 466, 358 + xy: 546, 362 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 tau-mech rotate: false - xy: 514, 362 + xy: 594, 362 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 tau-mech-base rotate: false - xy: 628, 368 + xy: 988, 374 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tau-mech-leg rotate: false - xy: 642, 368 + xy: 406, 333 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dart-ship rotate: false - xy: 558, 364 + xy: 638, 368 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -5228,21 +5242,21 @@ mech-icon-glaive-ship index: -1 javelin-ship rotate: false - xy: 420, 322 + xy: 792, 368 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-javelin-ship rotate: false - xy: 420, 322 + xy: 792, 368 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 javelin-ship-shield rotate: false - xy: 448, 336 + xy: 806, 368 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -5391,7 +5405,7 @@ discord-banner-over index: -1 controller-cursor rotate: false - xy: 27, 11 + xy: 89, 23 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5412,7 +5426,7 @@ icon-add index: -1 icon-admin rotate: false - xy: 362, 199 + xy: 380, 199 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5433,14 +5447,14 @@ icon-areaDelete index: -1 icon-arrow rotate: false - xy: 844, 386 + xy: 862, 386 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-16 rotate: false - xy: 844, 386 + xy: 862, 386 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5461,203 +5475,203 @@ icon-arrow-left index: -1 icon-arrow-right rotate: false - xy: 698, 370 + xy: 420, 338 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 710, 370 + xy: 432, 338 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 862, 386 + xy: 880, 386 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 378, 199 + xy: 396, 199 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-break rotate: false - xy: 880, 386 + xy: 898, 386 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 898, 386 + xy: 916, 386 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 722, 370 + xy: 420, 326 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 916, 386 + xy: 934, 386 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 734, 370 + xy: 444, 338 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 746, 370 + xy: 432, 326 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 758, 370 + xy: 420, 314 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 394, 199 + xy: 290, 175 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 290, 175 + xy: 306, 175 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 770, 370 + xy: 444, 326 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 306, 175 + xy: 326, 180 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 410, 199 + xy: 342, 180 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 326, 180 + xy: 140, 93 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 342, 180 + xy: 140, 77 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-elevation rotate: false - xy: 934, 386 + xy: 952, 386 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 952, 386 + xy: 970, 388 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 140, 93 + xy: 606, 380 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 970, 388 + xy: 988, 388 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 988, 388 + xy: 298, 281 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 140, 77 + xy: 622, 382 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 298, 281 + xy: 316, 286 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 606, 380 + xy: 638, 382 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 316, 286 + xy: 334, 286 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 622, 382 + xy: 654, 382 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 638, 382 + xy: 670, 382 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5671,448 +5685,448 @@ icon-generated index: -1 icon-github rotate: false - xy: 654, 382 + xy: 686, 382 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 670, 382 + xy: 702, 382 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 334, 286 + xy: 352, 287 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 782, 370 + xy: 432, 314 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 794, 370 + xy: 420, 302 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 686, 382 + xy: 718, 382 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 702, 382 + xy: 734, 382 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 806, 370 + xy: 444, 314 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 718, 382 + xy: 750, 382 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-item rotate: false - xy: 818, 370 + xy: 432, 302 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 860, 336 + xy: 260, 186 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-line rotate: false - xy: 352, 287 + xy: 370, 287 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 734, 382 + xy: 766, 382 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 830, 372 + xy: 444, 302 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 750, 382 + xy: 782, 382 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 370, 287 + xy: 388, 287 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 388, 287 + xy: 284, 263 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 284, 263 + xy: 302, 263 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 302, 263 + xy: 320, 268 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 410, 279 + xy: 420, 290 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-map rotate: false - xy: 766, 382 + xy: 798, 382 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 410, 267 + xy: 432, 290 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 320, 268 + xy: 338, 268 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-missing rotate: false - xy: 410, 255 + xy: 444, 290 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 422, 282 + xy: 456, 328 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-nullitem rotate: false - xy: 870, 336 + xy: 452, 268 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 434, 282 + xy: 456, 316 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 338, 268 + xy: 356, 269 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 782, 382 + xy: 814, 382 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 356, 269 + xy: 374, 269 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 422, 270 + xy: 456, 304 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 798, 382 + xy: 412, 199 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 446, 282 + xy: 456, 292 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 434, 270 + xy: 468, 332 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 422, 258 + xy: 468, 320 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 814, 382 + xy: 358, 180 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 374, 269 + xy: 392, 269 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 358, 180 + xy: 374, 181 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 374, 183 + xy: 390, 183 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 392, 269 + xy: 284, 245 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 390, 183 + xy: 406, 183 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 406, 183 + xy: 422, 183 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 422, 183 + xy: 412, 382 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 374, 167 + xy: 428, 382 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 390, 167 + xy: 444, 382 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 284, 245 + xy: 302, 245 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 302, 245 + xy: 320, 250 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 446, 270 + xy: 468, 308 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 320, 250 + xy: 338, 250 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 406, 167 + xy: 402, 363 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 434, 258 + xy: 468, 296 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 446, 258 + xy: 410, 269 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 422, 167 + xy: 402, 347 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 338, 250 + xy: 356, 251 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 412, 382 + xy: 418, 366 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 428, 382 + xy: 434, 366 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 356, 251 + xy: 374, 251 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 458, 276 + xy: 410, 257 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-unlocked rotate: false - xy: 374, 251 + xy: 392, 251 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 444, 382 + xy: 418, 350 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 458, 264 + xy: 430, 278 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 402, 363 + xy: 434, 350 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 392, 251 + xy: 480, 376 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 402, 347 + xy: 450, 366 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -6198,14 +6212,14 @@ scroll-knob-vertical-black index: -1 selection rotate: false - xy: 90, 107 + xy: 93, 74 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 slider rotate: false - xy: 452, 248 + xy: 193, 217 size: 1, 8 orig: 1, 8 offset: 0, 0 @@ -6321,42 +6335,42 @@ dagger index: -1 dagger-base rotate: false - xy: 530, 364 + xy: 610, 366 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 544, 364 + xy: 624, 368 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 fortress rotate: false - xy: 125, 1 + xy: 143, 19 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fortress-base rotate: false - xy: 143, 19 + xy: 143, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-base rotate: false - xy: 143, 19 + xy: 143, 1 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fortress-leg rotate: false - xy: 143, 1 + xy: 844, 386 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -6377,21 +6391,21 @@ unit-icon-ghoul index: -1 phantom rotate: false - xy: 482, 360 + xy: 562, 362 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 unit-icon-phantom rotate: false - xy: 482, 360 + xy: 562, 362 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 power-cell rotate: false - xy: 498, 362 + xy: 578, 362 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -6412,28 +6426,28 @@ unit-icon-revenant index: -1 spirit rotate: false - xy: 462, 302 + xy: 946, 372 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-spirit rotate: false - xy: 462, 302 + xy: 946, 372 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 titan rotate: false - xy: 290, 209 + xy: 308, 209 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-leg rotate: false - xy: 308, 209 + xy: 326, 214 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -6475,35 +6489,35 @@ chain-blaster-equip index: -1 flakgun-equip rotate: false - xy: 406, 319 + xy: 722, 368 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flamethrower-equip rotate: false - xy: 406, 305 + xy: 736, 368 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 heal-blaster-equip rotate: false - xy: 420, 336 + xy: 764, 368 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 448, 294 + xy: 904, 372 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 swarmer-equip rotate: false - xy: 614, 366 + xy: 974, 374 size: 12, 12 orig: 12, 12 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index eb5b79bfbf..1aa203a177 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 5f07f5deec..339fd1398e 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -6,6 +6,7 @@ import io.anuke.mindustry.game.GameMode; import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.type.Recipe; +import io.anuke.mindustry.type.Recipe.RecipeVisibility; import static io.anuke.mindustry.type.Category.*; @@ -151,14 +152,15 @@ public class Recipes implements ContentList{ //UNITS //bodies - new Recipe(units, UpgradeBlocks.dartPad, new ItemStack(Items.lead, 150), new ItemStack(Items.copper, 150), new ItemStack(Items.silicon, 200), new ItemStack(Items.titanium, 240)).setDesktop(); //dart is desktop only, because it's the starter mobile ship + new Recipe(units, UpgradeBlocks.dartPad, new ItemStack(Items.lead, 150), new ItemStack(Items.copper, 150), new ItemStack(Items.silicon, 200), new ItemStack(Items.titanium, 240)).setVisible(RecipeVisibility.desktopOnly); new Recipe(units, UpgradeBlocks.tridentPad, new ItemStack(Items.lead, 250), new ItemStack(Items.copper, 250), new ItemStack(Items.silicon, 250), new ItemStack(Items.titanium, 300), new ItemStack(Items.plastanium, 200)); new Recipe(units, UpgradeBlocks.javelinPad, new ItemStack(Items.lead, 350), new ItemStack(Items.silicon, 450), new ItemStack(Items.titanium, 500), new ItemStack(Items.plastanium, 400), new ItemStack(Items.phasematter, 200)); new Recipe(units, UpgradeBlocks.glaivePad, new ItemStack(Items.lead, 450), new ItemStack(Items.silicon, 650), new ItemStack(Items.titanium, 700), new ItemStack(Items.plastanium, 600), new ItemStack(Items.surgealloy, 200)); - new Recipe(units, UpgradeBlocks.tauPad, new ItemStack(Items.lead, 250), new ItemStack(Items.densealloy, 250), new ItemStack(Items.copper, 250), new ItemStack(Items.silicon, 250)).setDesktop(); - new Recipe(units, UpgradeBlocks.deltaPad, new ItemStack(Items.lead, 350), new ItemStack(Items.densealloy, 350), new ItemStack(Items.copper, 400), new ItemStack(Items.silicon, 450), new ItemStack(Items.thorium, 300)).setDesktop(); - new Recipe(units, UpgradeBlocks.omegaPad, new ItemStack(Items.lead, 450), new ItemStack(Items.densealloy, 550), new ItemStack(Items.silicon, 650), new ItemStack(Items.thorium, 600), new ItemStack(Items.surgealloy, 240)).setDesktop(); + new Recipe(units, UpgradeBlocks.alphaPad, new ItemStack(Items.lead, 200), new ItemStack(Items.densealloy, 100), new ItemStack(Items.copper, 150)).setVisible(RecipeVisibility.mobileOnly); + new Recipe(units, UpgradeBlocks.tauPad, new ItemStack(Items.lead, 250), new ItemStack(Items.densealloy, 250), new ItemStack(Items.copper, 250), new ItemStack(Items.silicon, 250)); + new Recipe(units, UpgradeBlocks.deltaPad, new ItemStack(Items.lead, 350), new ItemStack(Items.densealloy, 350), new ItemStack(Items.copper, 400), new ItemStack(Items.silicon, 450), new ItemStack(Items.thorium, 300)); + new Recipe(units, UpgradeBlocks.omegaPad, new ItemStack(Items.lead, 450), new ItemStack(Items.densealloy, 550), new ItemStack(Items.silicon, 650), new ItemStack(Items.thorium, 600), new ItemStack(Items.surgealloy, 240)); //actual unit related stuff new Recipe(units, UnitBlocks.spiritFactory, new ItemStack(Items.copper, 70), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 130)); diff --git a/core/src/io/anuke/mindustry/content/blocks/UpgradeBlocks.java b/core/src/io/anuke/mindustry/content/blocks/UpgradeBlocks.java index 843b6d2250..5e991fd9e7 100644 --- a/core/src/io/anuke/mindustry/content/blocks/UpgradeBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/UpgradeBlocks.java @@ -5,10 +5,16 @@ import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.blocks.units.MechPad; public class UpgradeBlocks extends BlockList{ - public static Block deltaPad, tauPad, omegaPad, dartPad, javelinPad, tridentPad, glaivePad; + public static Block alphaPad, deltaPad, tauPad, omegaPad, dartPad, javelinPad, tridentPad, glaivePad; @Override public void load(){ + alphaPad = new MechPad("alpha-mech-pad"){{ + mech = Mechs.alpha; + size = 2; + powerCapacity = 50f; + }}; + deltaPad = new MechPad("delta-mech-pad"){{ mech = Mechs.delta; size = 2; diff --git a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java index e3d0a6f960..3d1a4b5771 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java @@ -572,7 +572,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ continue; } - if(Recipe.getByResult(block) != null && Recipe.getByResult(block).desktopOnly && mobile){ + if(Recipe.getByResult(block) != null && !Recipe.getByResult(block).visibility.shown()){ continue; } diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java index f81b6d3428..96fef964d1 100644 --- a/core/src/io/anuke/mindustry/entities/Player.java +++ b/core/src/io/anuke/mindustry/entities/Player.java @@ -29,6 +29,7 @@ import io.anuke.mindustry.world.blocks.Floor; import io.anuke.mindustry.world.blocks.storage.CoreBlock.CoreEntity; import io.anuke.ucore.core.*; import io.anuke.ucore.entities.EntityGroup; +import io.anuke.ucore.entities.EntityQuery; import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Hue; import io.anuke.ucore.graphics.Lines; @@ -47,6 +48,8 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra private static final int timerShootRight = 1; private static final float liftoffBoost = 0.2f; + private static final Rectangle rect = new Rectangle(); + //region instance variables public float baseRotation; @@ -477,6 +480,21 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra shootHeat = Mathf.lerpDelta(shootHeat, isShooting() ? 1f : 0f, 0.06f); mech.updateAlt(this); //updated regardless + if(boostHeat > liftoffBoost + 0.1f){ + achievedFlight = true; + } + + if(boostHeat <= liftoffBoost + 0.05f && achievedFlight){ + if(tile != null){ + if(mech.shake > 1f){ + Effects.shake(mech.shake, mech.shake, this); + } + Effects.effect(UnitFx.unitLand, tile.floor().minimapColor, x, y, tile.floor().isLiquid ? 1f : 0.5f); + } + mech.onLand(this); + achievedFlight = false; + } + if(!isLocal){ interpolate(); updateBuilding(this); //building happens even with non-locals @@ -512,21 +530,6 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra protected void updateMech(){ Tile tile = world.tileWorld(x, y); - if(boostHeat > liftoffBoost + 0.1f){ - achievedFlight = true; - } - - if(boostHeat <= liftoffBoost + 0.05f && achievedFlight){ - if(tile != null){ - if(mech.shake > 1f){ - Effects.shake(mech.shake, mech.shake, this); - } - Effects.effect(UnitFx.unitLand, tile.floor().minimapColor, x, y, tile.floor().isLiquid ? 1f : 0.5f); - } - mech.onLand(this); - achievedFlight = false; - } - isBoosting = Inputs.keyDown("dash") && !mech.flying; //if player is in solid block @@ -534,7 +537,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra isBoosting = true; } - float speed = isBoosting && !mech.flying ? mech.boostSpeed : mech.speed; + float speed = isBoosting ? mech.boostSpeed : mech.speed; //fraction of speed when at max load float carrySlowdown = 0.7f; @@ -587,7 +590,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra } float prex = x, prey = y; updateVelocityStatus(); - moved = distanceTo(prex, prey) > 0.01f; + moved = distanceTo(prex, prey) > 0.001f; }else{ velocity.setZero(); x = Mathf.lerpDelta(x, getCarrier().getX(), 0.1f); @@ -645,26 +648,46 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra moveTarget = null; } - movement.set(targetX - x, targetY - y).limit(mech.speed); + if(getCarrier() != null){ + velocity.setZero(); + x = Mathf.lerpDelta(x, getCarrier().getX(), 0.1f); + y = Mathf.lerpDelta(y, getCarrier().getY(), 0.1f); + } + + movement.set(targetX - x, targetY - y).limit(isBoosting && !mech.flying ? mech.boostSpeed : mech.speed); movement.setAngle(Mathf.slerp(movement.angle(), velocity.angle(), 0.05f)); if(distanceTo(targetX, targetY) < attractDst){ movement.setZero(); } + float expansion = 3f; + + getHitbox(rect); + rect.x -= expansion; + rect.y -= expansion; + rect.width += expansion*2f; + rect.height += expansion*2f; + + isBoosting = EntityQuery.collisions().overlapsTile(rect); + velocity.add(movement.scl(Timers.delta())); - if(velocity.len() <= 0.2f){ + if(velocity.len() <= 0.2f && mech.flying){ rotation += Mathf.sin(Timers.time() + id * 99, 10f, 1f); }else if(target == null){ rotation = Mathf.slerpDelta(rotation, velocity.angle(), velocity.len() / 10f); } + float lx = x, ly = y; updateVelocityStatus(); + moved = distanceTo(lx, ly) > 0.001f && !isCarried(); - //hovering effect - x += Mathf.sin(Timers.time() + id * 999, 25f, 0.08f); - y += Mathf.cos(Timers.time() + id * 999, 25f, 0.08f); + if(mech.flying){ + //hovering effect + x += Mathf.sin(Timers.time() + id * 999, 25f, 0.08f); + y += Mathf.cos(Timers.time() + id * 999, 25f, 0.08f); + } //update shooting if not building, not mining and there's ammo left if(!isBuilding() && getMineTile() == null){ diff --git a/core/src/io/anuke/mindustry/type/Recipe.java b/core/src/io/anuke/mindustry/type/Recipe.java index a7f18d4761..1df4155e18 100644 --- a/core/src/io/anuke/mindustry/type/Recipe.java +++ b/core/src/io/anuke/mindustry/type/Recipe.java @@ -4,6 +4,7 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.ObjectMap; import com.badlogic.gdx.utils.OrderedMap; +import io.anuke.mindustry.Vars; import io.anuke.mindustry.game.GameMode; import io.anuke.mindustry.game.UnlockableContent; import io.anuke.mindustry.ui.ContentDisplay; @@ -28,7 +29,7 @@ public class Recipe extends UnlockableContent{ public final Category category; public final float cost; - public boolean desktopOnly = false; + public RecipeVisibility visibility = RecipeVisibility.all; //the only gamemode in which the recipe shows up public GameMode mode; public boolean isPad; @@ -67,7 +68,7 @@ public class Recipe extends UnlockableContent{ arr.clear(); for(Recipe r : content.recipes()){ if(r.category == category && (control.unlocks().isUnlocked(r)) && - !((r.mode != null && r.mode != state.mode) || (r.desktopOnly && mobile) || (r.isPad && !state.mode.showPads))){ + !((r.mode != null && r.mode != state.mode) || !r.visibility.shown() || (r.isPad && !state.mode.showPads))){ arr.add(r); } } @@ -94,8 +95,8 @@ public class Recipe extends UnlockableContent{ return this; } - public Recipe setDesktop(){ - desktopOnly = true; + public Recipe setVisible(RecipeVisibility visibility){ + this.visibility = visibility; return this; } @@ -122,7 +123,7 @@ public class Recipe extends UnlockableContent{ @Override public boolean isHidden(){ - return (desktopOnly && mobile) || hidden; + return !visibility.shown() || hidden; } @Override @@ -196,4 +197,21 @@ public class Recipe extends UnlockableContent{ this.blockDependencies = dependencies; return this; } + + public enum RecipeVisibility{ + mobileOnly(true, false), + desktopOnly(false, true), + all(true, true); + + public final boolean mobile, desktop; + + RecipeVisibility(boolean mobile, boolean desktop){ + this.mobile = mobile; + this.desktop = desktop; + } + + public boolean shown(){ + return (Vars.mobile && mobile) || (!Vars.mobile && desktop); + } + } } diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java index 2728a52a58..255bb4874d 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java @@ -173,7 +173,7 @@ public class BlocksFragment extends Fragment{ //add actual recipes for(Recipe r : recipes){ - if((r.mode != null && r.mode != state.mode) || (r.desktopOnly && mobile) || (r.isPad && !state.mode.showPads)) continue; + if((r.mode != null && r.mode != state.mode) || !r.visibility.shown() || (r.isPad && !state.mode.showPads)) continue; ImageButton image = new ImageButton(new TextureRegion(), "select"); diff --git a/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java b/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java index b0b6d1309b..ab05631341 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java @@ -123,7 +123,6 @@ public class MechPad extends Block{ @Override public void tapped(Tile tile, Player player){ - if(mobile && !mech.flying) return; if(checkValidTap(tile, player)){ Call.onMechFactoryTap(player, tile);