diff --git a/core/assets-raw/sprites/blocks/units/mechs/delta-mech-factory-open.png b/core/assets-raw/sprites/blocks/units/mechs/delta-mech-factory-open.png new file mode 100644 index 0000000000..90889dc05c Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/mechs/delta-mech-factory-open.png differ diff --git a/core/assets-raw/sprites/blocks/units/mechs/delta-mech-factory.png b/core/assets-raw/sprites/blocks/units/mechs/delta-mech-factory.png new file mode 100644 index 0000000000..387dd7dc0d Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/mechs/delta-mech-factory.png differ diff --git a/core/assets-raw/sprites/mechs/mechs/alpha-mech.png b/core/assets-raw/sprites/mechs/mechs/alpha-mech.png index c982a0893b..8d895faf1e 100644 Binary files a/core/assets-raw/sprites/mechs/mechs/alpha-mech.png and b/core/assets-raw/sprites/mechs/mechs/alpha-mech.png differ diff --git a/core/assets-raw/sprites/mechs/mechs/delta-mech-leg.png b/core/assets-raw/sprites/mechs/mechs/delta-mech-leg.png index 7204dda0a7..7181a138d6 100644 Binary files a/core/assets-raw/sprites/mechs/mechs/delta-mech-leg.png and b/core/assets-raw/sprites/mechs/mechs/delta-mech-leg.png differ diff --git a/core/assets-raw/sprites/mechs/mechs/delta-mech.png b/core/assets-raw/sprites/mechs/mechs/delta-mech.png index c982a0893b..abf90c7fbf 100644 Binary files a/core/assets-raw/sprites/mechs/mechs/delta-mech.png and b/core/assets-raw/sprites/mechs/mechs/delta-mech.png differ diff --git a/core/assets-raw/sprites/mechs/ships/dart-ship.png b/core/assets-raw/sprites/mechs/ships/dart-ship.png index d0d0dd52ec..6e4993776a 100644 Binary files a/core/assets-raw/sprites/mechs/ships/dart-ship.png and b/core/assets-raw/sprites/mechs/ships/dart-ship.png differ diff --git a/core/assets-raw/sprites/weapons/beam-equip.png b/core/assets-raw/sprites/weapons/beam-equip.png deleted file mode 100644 index 4509ed3ade..0000000000 Binary files a/core/assets-raw/sprites/weapons/beam-equip.png and /dev/null differ diff --git a/core/assets-raw/sprites/weapons/blaster-equip.png b/core/assets-raw/sprites/weapons/blaster-equip.png index ad1be21eb2..b5207231b5 100644 Binary files a/core/assets-raw/sprites/weapons/blaster-equip.png and b/core/assets-raw/sprites/weapons/blaster-equip.png differ diff --git a/core/assets-raw/sprites/weapons/blaster.png b/core/assets-raw/sprites/weapons/blaster.png deleted file mode 100644 index b677a58bcd..0000000000 Binary files a/core/assets-raw/sprites/weapons/blaster.png and /dev/null differ diff --git a/core/assets-raw/sprites/weapons/clustergun-equip.png b/core/assets-raw/sprites/weapons/clustergun-equip.png deleted file mode 100644 index 8f5c6db8a2..0000000000 Binary files a/core/assets-raw/sprites/weapons/clustergun-equip.png and /dev/null differ diff --git a/core/assets-raw/sprites/weapons/clustergun.png b/core/assets-raw/sprites/weapons/clustergun.png deleted file mode 100644 index 1f76fcf8be..0000000000 Binary files a/core/assets-raw/sprites/weapons/clustergun.png and /dev/null differ diff --git a/core/assets-raw/sprites/weapons/generic-weapon.png b/core/assets-raw/sprites/weapons/generic-weapon.png deleted file mode 100644 index a5666eb817..0000000000 Binary files a/core/assets-raw/sprites/weapons/generic-weapon.png and /dev/null differ diff --git a/core/assets-raw/sprites/weapons/shockgun-equip.png b/core/assets-raw/sprites/weapons/shockgun-equip.png index 96a33a55a5..26e4939de8 100644 Binary files a/core/assets-raw/sprites/weapons/shockgun-equip.png and b/core/assets-raw/sprites/weapons/shockgun-equip.png differ diff --git a/core/assets-raw/sprites/weapons/shockgun.png b/core/assets-raw/sprites/weapons/shockgun.png deleted file mode 100644 index 9ed4e1521b..0000000000 Binary files a/core/assets-raw/sprites/weapons/shockgun.png and /dev/null differ diff --git a/core/assets-raw/sprites/weapons/triblaster-equip.png b/core/assets-raw/sprites/weapons/triblaster-equip.png deleted file mode 100644 index 231869b8e4..0000000000 Binary files a/core/assets-raw/sprites/weapons/triblaster-equip.png and /dev/null differ diff --git a/core/assets-raw/sprites/weapons/triblaster.png b/core/assets-raw/sprites/weapons/triblaster.png deleted file mode 100644 index 1b6e1db871..0000000000 Binary files a/core/assets-raw/sprites/weapons/triblaster.png and /dev/null differ diff --git a/core/assets-raw/sprites/weapons/vulcan-equip.png b/core/assets-raw/sprites/weapons/vulcan-equip.png deleted file mode 100644 index 1c9ddf9401..0000000000 Binary files a/core/assets-raw/sprites/weapons/vulcan-equip.png and /dev/null differ diff --git a/core/assets-raw/sprites/weapons/vulcan.png b/core/assets-raw/sprites/weapons/vulcan.png deleted file mode 100644 index a4632649f9..0000000000 Binary files a/core/assets-raw/sprites/weapons/vulcan.png and /dev/null differ diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 90169ba98b..ed2a5622ed 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -13,28 +13,28 @@ background index: -1 conveyor-arrow rotate: false - xy: 730, 143 + xy: 487, 40 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-arrow rotate: false - xy: 767, 370 + xy: 787, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-bridge rotate: false - xy: 767, 360 + xy: 777, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor-end rotate: false - xy: 777, 421 + xy: 837, 415 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -90,42 +90,42 @@ blast-drill-top index: -1 carbide-drill rotate: false - xy: 711, 133 + xy: 355, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 carbide-drill-rotator rotate: false - xy: 717, 173 + xy: 365, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 carbide-drill-top rotate: false - xy: 719, 183 + xy: 375, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laser-drill rotate: false - xy: 297, 63 + xy: 315, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 315, 81 + xy: 333, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 315, 63 + xy: 333, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -188,98 +188,98 @@ plasma-drill-top index: -1 tungsten-drill rotate: false - xy: 967, 398 + xy: 967, 390 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten-drill-rotator rotate: false - xy: 977, 408 + xy: 957, 370 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten-drill-top rotate: false - xy: 957, 378 + xy: 967, 380 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 261, 37 + xy: 297, 45 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 279, 43 + xy: 315, 45 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 297, 45 + xy: 333, 45 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 315, 45 + xy: 351, 45 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blackrock1 rotate: false - xy: 249, 99 + xy: 185, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-blackrock rotate: false - xy: 249, 99 + xy: 185, 128 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackrockshadow1 rotate: false - xy: 639, 232 + xy: 249, 99 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 649, 232 + xy: 639, 232 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-blackstone rotate: false - xy: 649, 232 + xy: 639, 232 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 659, 233 + xy: 649, 232 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 659, 223 + xy: 659, 233 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -293,588 +293,588 @@ blackstoneedge index: -1 coal1 rotate: false - xy: 720, 153 + xy: 385, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 720, 143 + xy: 395, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 721, 133 + xy: 447, 38 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 435, 125 + xy: 437, 29 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 435, 115 + xy: 447, 28 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 669, 241 + xy: 683, 225 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 grass-cliff-edge rotate: false - xy: 307, 35 + xy: 760, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-1 rotate: false - xy: 317, 35 + xy: 770, 264 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-2 rotate: false - xy: 327, 35 + xy: 722, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-side rotate: false - xy: 337, 35 + xy: 714, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 445, 106 + xy: 487, 30 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 297, 35 + xy: 497, 30 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 683, 227 + xy: 686, 211 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice-cliff-edge rotate: false - xy: 295, 25 + xy: 767, 420 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-1 rotate: false - xy: 305, 25 + xy: 767, 410 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-2 rotate: false - xy: 315, 25 + xy: 767, 400 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-side rotate: false - xy: 325, 25 + xy: 767, 390 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice2 rotate: false - xy: 347, 35 + xy: 724, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 357, 35 + xy: 734, 189 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 697, 227 + xy: 672, 197 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 335, 25 + xy: 767, 380 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 345, 25 + xy: 767, 370 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 345, 25 + xy: 767, 370 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 355, 25 + xy: 767, 360 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 355, 25 + xy: 767, 360 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 711, 243 + xy: 686, 197 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 777, 411 + xy: 817, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 797, 421 + xy: 827, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 787, 411 + xy: 807, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 787, 401 + xy: 837, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 777, 391 + xy: 847, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 807, 411 + xy: 817, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 797, 401 + xy: 827, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 787, 391 + xy: 807, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalflooredge rotate: false - xy: 725, 243 + xy: 714, 213 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 oiledge rotate: false - xy: 725, 229 + xy: 714, 199 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock2 rotate: false - xy: 907, 391 + xy: 927, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge rotate: false - xy: 897, 371 + xy: 917, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-1 rotate: false - xy: 907, 381 + xy: 927, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-2 rotate: false - xy: 917, 391 + xy: 937, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-side rotate: false - xy: 927, 401 + xy: 947, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 927, 411 + xy: 947, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 947, 421 + xy: 907, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 739, 244 + xy: 728, 213 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 927, 391 + xy: 937, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge rotate: false - xy: 907, 361 + xy: 937, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-1 rotate: false - xy: 917, 371 + xy: 947, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-2 rotate: false - xy: 927, 381 + xy: 937, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-side rotate: false - xy: 937, 391 + xy: 947, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 937, 401 + xy: 947, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 947, 411 + xy: 927, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 757, 258 + xy: 639, 110 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 753, 244 + xy: 653, 110 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone-cliff-edge rotate: false - xy: 927, 371 + xy: 897, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 937, 381 + xy: 907, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 947, 391 + xy: 917, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 927, 361 + xy: 927, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 947, 401 + xy: 947, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 917, 361 + xy: 887, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 753, 230 + xy: 827, 435 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 937, 371 + xy: 937, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 947, 381 + xy: 947, 353 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 937, 361 + xy: 957, 420 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 947, 371 + xy: 957, 410 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 947, 361 + xy: 967, 420 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 957, 418 + xy: 957, 400 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten1 rotate: false - xy: 967, 408 + xy: 957, 390 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten2 rotate: false - xy: 977, 418 + xy: 967, 400 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten3 rotate: false - xy: 957, 388 + xy: 957, 380 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge rotate: false - xy: 957, 368 + xy: 957, 360 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-1 rotate: false - xy: 967, 378 + xy: 967, 370 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-2 rotate: false - xy: 977, 388 + xy: 967, 360 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-side rotate: false - xy: 967, 368 + xy: 957, 350 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 827, 435 + xy: 437, 49 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-border rotate: false - xy: 767, 228 + xy: 487, 50 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-elevation rotate: false - xy: 765, 218 + xy: 827, 425 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 765, 218 + xy: 827, 425 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-middle rotate: false - xy: 680, 143 + xy: 417, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 680, 143 + xy: 417, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-slope rotate: false - xy: 690, 143 + xy: 427, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 border rotate: false - xy: 700, 143 + xy: 437, 39 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 730, 163 + xy: 467, 38 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 731, 133 + xy: 497, 40 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 399, 99 + xy: 417, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -895,7 +895,7 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 445, 116 + xy: 477, 28 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -909,49 +909,49 @@ nuclearreactor-shadow index: -1 place-arrow rotate: false - xy: 907, 411 + xy: 917, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 927, 421 + xy: 927, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 718, 217 + xy: 451, 48 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 rubble-1-0 rotate: false - xy: 387, 63 + xy: 405, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 405, 81 + xy: 423, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 405, 63 + xy: 423, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 423, 81 + xy: 261, 37 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -972,7 +972,7 @@ rubble-3-1 index: -1 shadow-1 rotate: false - xy: 742, 218 + xy: 489, 72 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1014,7 +1014,7 @@ shadow-6 index: -1 shadow-round-1 rotate: false - xy: 742, 206 + xy: 489, 60 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1028,105 +1028,105 @@ shadow-round-2 index: -1 bridgeconduit-arrow rotate: false - xy: 710, 143 + xy: 295, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconduit-bridge rotate: false - xy: 661, 133 + xy: 305, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconduit-end rotate: false - xy: 671, 133 + xy: 315, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-arrow rotate: false - xy: 681, 133 + xy: 325, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-bridge rotate: false - xy: 691, 133 + xy: 335, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor-end rotate: false - xy: 701, 133 + xy: 345, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 727, 173 + xy: 457, 38 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top rotate: false - xy: 730, 153 + xy: 477, 38 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-arrow rotate: false - xy: 767, 400 + xy: 827, 415 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-bridge rotate: false - xy: 767, 390 + xy: 807, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit-end rotate: false - xy: 767, 380 + xy: 797, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter rotate: false - xy: 777, 401 + xy: 797, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-bottom rotate: false - xy: 807, 421 + xy: 787, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-liquid rotate: false - xy: 817, 421 + xy: 777, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidrouter-top rotate: false - xy: 797, 411 + xy: 857, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1154,14 +1154,14 @@ liquidtank-top index: -1 pulseconduit-bottom rotate: false - xy: 897, 391 + xy: 937, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulseconduit-top rotate: false - xy: 907, 401 + xy: 947, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1266,7 +1266,7 @@ nuclear-reactor-lights index: -1 rtg-generator-top rotate: false - xy: 917, 401 + xy: 937, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1371,126 +1371,126 @@ block-icon-blast-mixer index: -1 centrifuge-liquid rotate: false - xy: 363, 99 + xy: 381, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 553, 121 + xy: 571, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 571, 121 + xy: 589, 136 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 589, 136 + xy: 589, 118 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator rotate: false - xy: 589, 118 + xy: 607, 120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 607, 120 + xy: 625, 124 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 625, 124 + xy: 643, 124 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 787, 421 + xy: 847, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-weaver rotate: false - xy: 333, 81 + xy: 351, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 333, 63 + xy: 351, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 351, 81 + xy: 369, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plasteel-compressor-top rotate: false - xy: 351, 63 + xy: 369, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 poweralloysmelter-top rotate: false - xy: 369, 81 + xy: 387, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 powersmelter-top rotate: false - xy: 369, 63 + xy: 387, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 369, 63 + xy: 387, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 917, 411 + xy: 897, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 937, 421 + xy: 907, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 937, 411 + xy: 917, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1504,7 +1504,7 @@ core-open index: -1 block-1 rotate: false - xy: 767, 238 + xy: 659, 223 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1567,35 +1567,35 @@ arc-heat index: -1 crux rotate: false - xy: 417, 99 + xy: 499, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 crux-heat rotate: false - xy: 499, 121 + xy: 517, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 crux-panel-left rotate: false - xy: 517, 121 + xy: 535, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 crux-panel-right rotate: false - xy: 535, 121 + xy: 553, 121 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 duo rotate: false - xy: 445, 126 + xy: 467, 28 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1630,14 +1630,14 @@ scatter index: -1 lancer rotate: false - xy: 706, 215 + xy: 465, 60 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 706, 203 + xy: 477, 60 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1651,56 +1651,56 @@ meltdown index: -1 scatter-heat rotate: false - xy: 718, 205 + xy: 463, 48 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 scorch rotate: false - xy: 730, 217 + xy: 475, 48 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 730, 205 + xy: 489, 84 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 swarmer rotate: false - xy: 423, 63 + xy: 279, 43 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave rotate: false - xy: 333, 45 + xy: 369, 45 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 351, 45 + xy: 387, 45 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dronefactory-top rotate: false - xy: 755, 430 + xy: 791, 431 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dronefactory-top-open rotate: false - xy: 773, 431 + xy: 809, 431 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1714,21 +1714,28 @@ mech-factory index: -1 dart-ship-factory-open rotate: false - xy: 643, 124 + xy: 737, 426 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +delta-mech-factory-open + rotate: false + xy: 755, 430 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 reconstructor-open rotate: false - xy: 387, 81 + xy: 405, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 repairpoint-turret rotate: false - xy: 897, 381 + xy: 917, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1742,14 +1749,14 @@ ship-factory index: -1 door-large-open rotate: false - xy: 737, 426 + xy: 773, 431 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 435, 105 + xy: 457, 28 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1805,14 +1812,14 @@ clear index: -1 enemyarrow rotate: false - xy: 985, 438 + xy: 750, 263 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 error rotate: false - xy: 697, 241 + xy: 672, 211 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -1896,28 +1903,28 @@ shell index: -1 shell-back rotate: false - xy: 754, 219 + xy: 435, 99 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shot rotate: false - xy: 917, 381 + xy: 927, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 transfer rotate: false - xy: 123, 25 + xy: 435, 121 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 957, 408 + xy: 967, 410 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1952,49 +1959,49 @@ block-icon-blast-drill index: -1 block-icon-bridgeconduit rotate: false - xy: 765, 208 + xy: 883, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconduit rotate: false - xy: 765, 208 + xy: 883, 441 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-bridgeconveyor rotate: false - xy: 827, 425 + xy: 893, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridgeconveyor rotate: false - xy: 827, 425 + xy: 893, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-carbide-drill rotate: false - xy: 670, 193 + xy: 903, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-carbide-wall rotate: false - xy: 680, 193 + xy: 913, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 carbide-wall rotate: false - xy: 680, 193 + xy: 913, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2029,35 +2036,35 @@ centrifuge index: -1 block-icon-combustion-generator rotate: false - xy: 690, 193 + xy: 923, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 690, 193 + xy: 923, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conduit rotate: false - xy: 700, 193 + xy: 933, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conveyor rotate: false - xy: 710, 193 + xy: 943, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor rotate: false - xy: 710, 193 + xy: 943, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2106,42 +2113,42 @@ dart-ship-factory index: -1 block-icon-deepwater rotate: false - xy: 720, 195 + xy: 953, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 720, 195 + xy: 953, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-deflector-wall rotate: false - xy: 730, 195 + xy: 963, 440 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deflector-wall rotate: false - xy: 730, 195 + xy: 963, 440 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 730, 195 + xy: 963, 440 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-wall rotate: false - xy: 730, 195 + xy: 963, 440 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2174,72 +2181,86 @@ block-icon-phase-wall-large orig: 16, 16 offset: 0, 0 index: -1 +block-icon-delta-mech-factory + rotate: false + xy: 273, 109 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +delta-mech-factory + rotate: false + xy: 273, 109 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 block-icon-dirt rotate: false - xy: 669, 183 + xy: 973, 440 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 669, 183 + xy: 973, 440 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-door rotate: false - xy: 679, 183 + xy: 494, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 679, 183 + xy: 494, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-door-large rotate: false - xy: 273, 109 + xy: 291, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large rotate: false - xy: 273, 109 + xy: 291, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-dronefactory rotate: false - xy: 291, 117 + xy: 309, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-droppoint rotate: false - xy: 689, 183 + xy: 494, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 droppoint rotate: false - xy: 689, 183 + xy: 494, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-duo rotate: false - xy: 699, 183 + xy: 504, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2260,112 +2281,112 @@ block-icon-fusion-reactor index: -1 block-icon-grass rotate: false - xy: 709, 183 + xy: 514, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass1 rotate: false - xy: 709, 183 + xy: 514, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-hail rotate: false - xy: 841, 429 + xy: 504, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ice rotate: false - xy: 851, 429 + xy: 524, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice1 rotate: false - xy: 851, 429 + xy: 524, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-icerock rotate: false - xy: 861, 429 + xy: 514, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 861, 429 + xy: 514, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-incinerator rotate: false - xy: 871, 429 + xy: 534, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 871, 429 + xy: 534, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemsource rotate: false - xy: 881, 429 + xy: 524, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 881, 429 + xy: 524, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemvoid rotate: false - xy: 891, 431 + xy: 544, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 891, 431 + xy: 544, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-junction rotate: false - xy: 901, 431 + xy: 534, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 junction rotate: false - xy: 901, 431 + xy: 534, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-lancer rotate: false - xy: 309, 117 + xy: 327, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2386,84 +2407,84 @@ large-solar-panel index: -1 block-icon-laser-drill rotate: false - xy: 327, 117 + xy: 345, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-laserconduit rotate: false - xy: 911, 431 + xy: 554, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconduit rotate: false - xy: 911, 431 + xy: 554, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-laserconveyor rotate: false - xy: 921, 431 + xy: 544, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 laserconveyor rotate: false - xy: 921, 431 + xy: 544, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-lava rotate: false - xy: 931, 431 + xy: 564, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 931, 431 + xy: 564, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquidjunction rotate: false - xy: 941, 431 + xy: 554, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidjunction rotate: false - xy: 941, 431 + xy: 554, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquidrouter rotate: false - xy: 951, 431 + xy: 574, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquidsource rotate: false - xy: 961, 428 + xy: 564, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 961, 428 + xy: 564, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2498,14 +2519,14 @@ core-top index: -1 block-icon-mechanical-pump rotate: false - xy: 971, 428 + xy: 574, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 971, 428 + xy: 574, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2519,42 +2540,42 @@ block-icon-meltdown index: -1 block-icon-melter rotate: false - xy: 981, 428 + xy: 584, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 981, 428 + xy: 584, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-metalfloor rotate: false - xy: 995, 437 + xy: 594, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 995, 437 + xy: 594, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-multiplexer rotate: false - xy: 345, 117 + xy: 363, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 multiplexer rotate: false - xy: 345, 117 + xy: 363, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2575,14 +2596,14 @@ nuclear-reactor index: -1 block-icon-oil rotate: false - xy: 1005, 437 + xy: 584, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 1005, 437 + xy: 584, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2596,35 +2617,35 @@ block-icon-oil-extractor index: -1 block-icon-oilrefinery rotate: false - xy: 1015, 437 + xy: 594, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 1015, 437 + xy: 594, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-overflowgate rotate: false - xy: 991, 427 + xy: 497, 50 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 overflowgate rotate: false - xy: 991, 427 + xy: 497, 50 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-weaver rotate: false - xy: 363, 117 + xy: 381, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2638,133 +2659,133 @@ block-icon-plasma-drill index: -1 block-icon-plasteel-compressor rotate: false - xy: 381, 117 + xy: 399, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plasteel-compressor rotate: false - xy: 381, 117 + xy: 399, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-power-node rotate: false - xy: 1001, 427 + xy: 837, 425 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 power-node rotate: false - xy: 1001, 427 + xy: 837, 425 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-power-node-large rotate: false - xy: 399, 117 + xy: 417, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 399, 117 + xy: 417, 117 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-powerinfinite rotate: false - xy: 1011, 427 + xy: 847, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 1011, 427 + xy: 847, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-powervoid rotate: false - xy: 766, 294 + xy: 857, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 766, 294 + xy: 857, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulseconduit rotate: false - xy: 766, 284 + xy: 867, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulverizer rotate: false - xy: 766, 274 + xy: 877, 427 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-reconstructor rotate: false - xy: 417, 117 + xy: 213, 98 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dronefactory rotate: false - xy: 417, 117 + xy: 213, 98 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 reconstructor rotate: false - xy: 417, 117 + xy: 213, 98 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-repairpoint rotate: false - xy: 657, 177 + xy: 766, 294 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 repairpoint rotate: false - xy: 657, 177 + xy: 766, 294 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-resupplypoint rotate: false - xy: 667, 173 + xy: 766, 284 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 resupplypoint rotate: false - xy: 667, 173 + xy: 766, 284 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2778,399 +2799,399 @@ block-icon-ripple index: -1 block-icon-rock rotate: false - xy: 677, 173 + xy: 766, 274 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock1 rotate: false - xy: 677, 173 + xy: 766, 274 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rotary-pump rotate: false - xy: 213, 98 + xy: 231, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 213, 98 + xy: 231, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-router rotate: false - xy: 687, 173 + xy: 604, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 687, 173 + xy: 604, 108 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rtg-generator rotate: false - xy: 697, 173 + xy: 604, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 697, 173 + xy: 604, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sand rotate: false - xy: 707, 173 + xy: 614, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 707, 173 + xy: 614, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-scorch rotate: false - xy: 771, 264 + xy: 614, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-separator rotate: false - xy: 650, 167 + xy: 624, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 650, 167 + xy: 624, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shrub rotate: false - xy: 650, 157 + xy: 634, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrub rotate: false - xy: 650, 157 + xy: 634, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-silicon-smelter rotate: false - xy: 231, 99 + xy: 207, 80 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 231, 99 + xy: 207, 80 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-smelter rotate: false - xy: 650, 147 + xy: 644, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 650, 147 + xy: 644, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-snow rotate: false - xy: 660, 163 + xy: 654, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 660, 163 + xy: 654, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-solar-panel rotate: false - xy: 670, 163 + xy: 664, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 670, 163 + xy: 664, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sortedunloader rotate: false - xy: 660, 153 + xy: 297, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 660, 153 + xy: 297, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sorter rotate: false - xy: 680, 163 + xy: 307, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 680, 163 + xy: 307, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-space rotate: false - xy: 670, 153 + xy: 317, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space rotate: false - xy: 670, 153 + xy: 317, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-splitter rotate: false - xy: 690, 163 + xy: 327, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 splitter rotate: false - xy: 690, 163 + xy: 327, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-stone rotate: false - xy: 680, 153 + xy: 337, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone1 rotate: false - xy: 680, 153 + xy: 337, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-stoneformer rotate: false - xy: 700, 163 + xy: 347, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneformer rotate: false - xy: 700, 163 + xy: 347, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-swarmer rotate: false - xy: 207, 80 + xy: 207, 62 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermal-generator rotate: false - xy: 207, 62 + xy: 207, 44 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 207, 62 + xy: 207, 44 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermal-pump rotate: false - xy: 207, 44 + xy: 206, 26 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 207, 44 + xy: 206, 26 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermite-mixer rotate: false - xy: 206, 26 + xy: 632, 142 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermite-mixer rotate: false - xy: 206, 26 + xy: 632, 142 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thorium-wall rotate: false - xy: 690, 153 + xy: 357, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 690, 153 + xy: 357, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-thorium-wall-large rotate: false - xy: 632, 142 + xy: 291, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 632, 142 + xy: 291, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-titanium-conveyor rotate: false - xy: 700, 153 + xy: 367, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor rotate: false - xy: 700, 153 + xy: 367, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-tungsten-drill rotate: false - xy: 710, 163 + xy: 377, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-tungsten-wall rotate: false - xy: 710, 153 + xy: 387, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tungsten-wall rotate: false - xy: 710, 153 + xy: 387, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-tungsten-wall-large rotate: false - xy: 291, 99 + xy: 309, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 tungsten-wall-large rotate: false - xy: 291, 99 + xy: 309, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-turbine-generator rotate: false - xy: 309, 99 + xy: 327, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 turbine-generator rotate: false - xy: 309, 99 + xy: 327, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-unloader rotate: false - xy: 660, 143 + xy: 397, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unloader rotate: false - xy: 660, 143 + xy: 397, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3205,714 +3226,714 @@ warpgate index: -1 block-icon-water rotate: false - xy: 670, 143 + xy: 407, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 670, 143 + xy: 407, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-water-extractor rotate: false - xy: 327, 99 + xy: 345, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-wave rotate: false - xy: 345, 99 + xy: 363, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mech-icon-alpha-mech rotate: false - xy: 711, 229 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 -mech-icon-delta-mech - rotate: false - xy: 711, 229 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 -mech-icon-omega-mech - rotate: false - xy: 711, 229 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 -mech-icon-tau-mech - rotate: false - xy: 711, 229 + xy: 657, 181 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-dart-ship rotate: false - xy: 719, 257 + xy: 697, 225 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +mech-icon-delta-mech + rotate: false + xy: 711, 227 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-halberd-ship rotate: false - xy: 719, 257 + xy: 700, 211 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-javelin-ship rotate: false - xy: 719, 257 + xy: 700, 211 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-trident-ship rotate: false - xy: 719, 257 + xy: 700, 211 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +mech-icon-omega-mech + rotate: false + xy: 700, 197 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +mech-icon-tau-mech + rotate: false + xy: 700, 197 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ore-coal-grass1 rotate: false - xy: 777, 381 + xy: 797, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass2 rotate: false - xy: 817, 411 + xy: 787, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass3 rotate: false - xy: 827, 415 + xy: 867, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice1 rotate: false - xy: 807, 401 + xy: 857, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice2 rotate: false - xy: 797, 391 + xy: 837, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice3 rotate: false - xy: 787, 381 + xy: 847, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 777, 371 + xy: 817, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 817, 401 + xy: 827, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 827, 405 + xy: 807, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow1 rotate: false - xy: 807, 391 + xy: 797, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow2 rotate: false - xy: 797, 381 + xy: 877, 417 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow3 rotate: false - xy: 787, 371 + xy: 867, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 777, 361 + xy: 857, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 817, 391 + xy: 837, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 827, 395 + xy: 847, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass1 rotate: false - xy: 807, 381 + xy: 817, 371 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass2 rotate: false - xy: 797, 371 + xy: 827, 375 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass3 rotate: false - xy: 787, 361 + xy: 807, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice1 rotate: false - xy: 817, 381 + xy: 877, 407 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice2 rotate: false - xy: 827, 385 + xy: 867, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice3 rotate: false - xy: 807, 371 + xy: 857, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 797, 361 + xy: 837, 375 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 817, 371 + xy: 847, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 827, 375 + xy: 817, 361 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow1 rotate: false - xy: 807, 361 + xy: 827, 365 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow2 rotate: false - xy: 817, 361 + xy: 877, 397 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow3 rotate: false - xy: 827, 365 + xy: 867, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 837, 419 + xy: 857, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 847, 419 + xy: 837, 365 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 837, 409 + xy: 847, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass1 rotate: false - xy: 857, 419 + xy: 877, 387 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass2 rotate: false - xy: 837, 399 + xy: 867, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass3 rotate: false - xy: 847, 409 + xy: 857, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice1 rotate: false - xy: 867, 419 + xy: 877, 377 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice2 rotate: false - xy: 837, 389 + xy: 867, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice3 rotate: false - xy: 847, 399 + xy: 877, 367 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 857, 409 + xy: 827, 355 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 877, 419 + xy: 837, 355 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 837, 379 + xy: 847, 357 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow1 rotate: false - xy: 847, 389 + xy: 857, 357 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow2 rotate: false - xy: 857, 399 + xy: 867, 357 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow3 rotate: false - xy: 867, 409 + xy: 877, 357 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 837, 369 + xy: 893, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 847, 379 + xy: 903, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 857, 389 + xy: 913, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass1 rotate: false - xy: 867, 399 + xy: 923, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass2 rotate: false - xy: 877, 409 + xy: 933, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass3 rotate: false - xy: 847, 369 + xy: 943, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice1 rotate: false - xy: 857, 379 + xy: 953, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice2 rotate: false - xy: 867, 389 + xy: 963, 430 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice3 rotate: false - xy: 877, 399 + xy: 973, 430 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 857, 369 + xy: 887, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 867, 379 + xy: 887, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 877, 389 + xy: 897, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow1 rotate: false - xy: 867, 369 + xy: 887, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow2 rotate: false - xy: 877, 379 + xy: 897, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow3 rotate: false - xy: 877, 369 + xy: 907, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 827, 355 + xy: 887, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 837, 359 + xy: 897, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 847, 359 + xy: 907, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-grass1 rotate: false - xy: 857, 359 + xy: 917, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-grass2 rotate: false - xy: 867, 359 + xy: 887, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-grass3 rotate: false - xy: 877, 359 + xy: 897, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-ice1 rotate: false - xy: 887, 419 + xy: 907, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-ice2 rotate: false - xy: 887, 409 + xy: 917, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-ice3 rotate: false - xy: 887, 399 + xy: 927, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-sand1 rotate: false - xy: 887, 389 + xy: 887, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-sand2 rotate: false - xy: 887, 379 + xy: 897, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-sand3 rotate: false - xy: 887, 369 + xy: 907, 393 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-snow1 rotate: false - xy: 887, 359 + xy: 917, 403 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-snow2 rotate: false - xy: 897, 421 + xy: 927, 413 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-snow3 rotate: false - xy: 907, 421 + xy: 937, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-stone1 rotate: false - xy: 897, 411 + xy: 887, 363 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-stone2 rotate: false - xy: 917, 421 + xy: 897, 373 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-tungsten-stone3 rotate: false - xy: 897, 401 + xy: 907, 383 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 379, 37 + xy: 787, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 389, 37 + xy: 777, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-carbide rotate: false - xy: 399, 37 + xy: 797, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 409, 37 + xy: 787, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 419, 37 + xy: 777, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-phase-matter rotate: false - xy: 429, 37 + xy: 807, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plasteel rotate: false - xy: 439, 37 + xy: 817, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 607, 110 + xy: 797, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 754, 198 + xy: 787, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 764, 198 + xy: 777, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 775, 218 + xy: 807, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thermite rotate: false - xy: 775, 208 + xy: 797, 401 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 774, 198 + xy: 787, 391 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 767, 420 + xy: 777, 381 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-tungsten rotate: false - xy: 767, 410 + xy: 817, 411 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3924,27 +3945,6 @@ alpha-mech orig: 12, 12 offset: 0, 0 index: -1 -delta-mech - rotate: false - xy: 195, 124 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 -omega-mech - rotate: false - xy: 195, 124 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 -tau-mech - rotate: false - xy: 195, 124 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 alpha-mech-base rotate: false xy: 612, 296 @@ -3987,13 +3987,6 @@ alpha-mech-leg orig: 12, 12 offset: 0, 0 index: -1 -delta-mech-leg - rotate: false - xy: 572, 244 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 omega-mech-leg rotate: false xy: 572, 244 @@ -4015,30 +4008,58 @@ scout-leg orig: 12, 12 offset: 0, 0 index: -1 +delta-mech + rotate: false + xy: 715, 241 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +delta-mech-leg + rotate: false + xy: 669, 225 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +omega-mech + rotate: false + xy: 725, 227 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +tau-mech + rotate: false + xy: 725, 227 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 dart-ship rotate: false - xy: 655, 243 + xy: 701, 241 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 halberd-ship rotate: false - xy: 655, 243 + xy: 658, 195 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 javelin-ship rotate: false - xy: 655, 243 + xy: 658, 195 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 trident-ship rotate: false - xy: 655, 243 + xy: 658, 195 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -4215,7 +4236,7 @@ discord-banner-over index: -1 controller-cursor rotate: false - xy: 381, 99 + xy: 399, 99 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4257,14 +4278,14 @@ icon-areaDelete index: -1 icon-arrow rotate: false - xy: 791, 431 + xy: 731, 408 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-16 rotate: false - xy: 791, 431 + xy: 731, 408 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4292,14 +4313,14 @@ icon-arrow-right index: -1 icon-arrow-up rotate: false - xy: 733, 258 + xy: 438, 124 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 809, 431 + xy: 731, 390 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -4313,49 +4334,49 @@ icon-ban index: -1 icon-break rotate: false - xy: 731, 408 + xy: 731, 372 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 731, 390 + xy: 731, 354 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 745, 258 + xy: 450, 124 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 731, 372 + xy: 733, 324 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 841, 439 + xy: 446, 112 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 853, 439 + xy: 446, 100 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 865, 439 + xy: 462, 120 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -4376,7 +4397,7 @@ icon-discord index: -1 icon-distribution rotate: false - xy: 877, 439 + xy: 474, 120 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -4404,483 +4425,483 @@ icon-editor index: -1 icon-egg rotate: false - xy: 369, 47 + xy: 405, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-elevation rotate: false - xy: 731, 354 + xy: 733, 306 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 733, 324 + xy: 225, 80 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 385, 47 + xy: 421, 47 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 733, 306 + xy: 225, 62 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 225, 80 + xy: 225, 44 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 401, 47 + xy: 279, 27 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 225, 62 + xy: 224, 26 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 417, 47 + xy: 626, 285 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 225, 44 + xy: 749, 408 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 433, 47 + xy: 624, 269 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 279, 27 + xy: 642, 285 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-github rotate: false - xy: 626, 285 + xy: 640, 269 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 624, 269 + xy: 658, 289 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 224, 26 + xy: 749, 390 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 889, 441 + xy: 486, 120 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 901, 441 + xy: 458, 108 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 642, 285 + xy: 674, 287 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 640, 269 + xy: 690, 287 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 913, 441 + xy: 470, 108 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 658, 289 + xy: 706, 287 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 369, 37 + xy: 777, 421 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-line rotate: false - xy: 749, 408 + xy: 749, 372 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 674, 287 + xy: 722, 289 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 925, 441 + xy: 482, 108 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 690, 287 + xy: 750, 288 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 749, 390 + xy: 749, 354 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 749, 372 + xy: 751, 322 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 749, 354 + xy: 751, 304 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 937, 441 + xy: 458, 96 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 949, 441 + xy: 470, 96 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 751, 322 + xy: 243, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-none rotate: false - xy: 658, 211 + xy: 482, 96 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 658, 199 + xy: 441, 87 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 751, 304 + xy: 243, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 706, 287 + xy: 722, 273 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 243, 81 + xy: 243, 45 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 657, 187 + xy: 441, 75 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 722, 289 + xy: 639, 242 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 670, 215 + xy: 441, 63 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 670, 203 + xy: 453, 84 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 682, 215 + xy: 453, 72 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 750, 288 + xy: 642, 216 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 243, 63 + xy: 261, 91 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 722, 273 + xy: 642, 200 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 639, 242 + xy: 641, 184 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 243, 45 + xy: 261, 73 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 642, 216 + xy: 750, 272 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 642, 200 + xy: 658, 273 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 641, 184 + xy: 674, 271 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 750, 272 + xy: 690, 271 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 658, 273 + xy: 706, 271 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 261, 91 + xy: 261, 55 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 261, 73 + xy: 279, 79 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 682, 203 + xy: 465, 84 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 261, 55 + xy: 279, 61 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 674, 271 + xy: 657, 257 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 694, 215 + xy: 465, 72 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 694, 203 + xy: 477, 84 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 690, 271 + xy: 673, 255 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 279, 79 + xy: 297, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 706, 271 + xy: 689, 255 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 657, 257 + xy: 705, 255 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 279, 61 + xy: 297, 63 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 961, 438 + xy: 477, 72 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 973, 438 + xy: 453, 60 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 673, 255 + xy: 669, 239 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 297, 81 + xy: 315, 81 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 689, 255 + xy: 685, 239 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -4958,7 +4979,7 @@ selection index: -1 slider rotate: false - xy: 126, 29 + xy: 623, 142 size: 1, 8 orig: 1, 8 offset: 0, 0 @@ -5053,127 +5074,57 @@ window-empty index: -1 drone rotate: false - xy: 683, 241 + xy: 658, 209 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 scout rotate: false - xy: 739, 230 + xy: 728, 199 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol rotate: false - xy: 625, 110 + xy: 841, 437 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol-booster-1 rotate: false - xy: 639, 110 + xy: 855, 437 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol-booster-2 rotate: false - xy: 653, 110 + xy: 869, 437 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 vtol-flame rotate: false - xy: 754, 208 + xy: 435, 110 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 -beam-equip - rotate: false - xy: 185, 128 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -blaster - rotate: false - xy: 767, 248 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 blaster-equip rotate: false - xy: 705, 257 + xy: 655, 243 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 -clustergun - rotate: false - xy: 729, 185 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -clustergun-equip - rotate: false - xy: 720, 163 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -generic-weapon - rotate: false - xy: 669, 227 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 -shockgun - rotate: false - xy: 897, 361 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 shockgun-equip rotate: false - xy: 907, 371 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -triblaster - rotate: false - xy: 967, 418 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -triblaster-equip - rotate: false - xy: 957, 398 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -vulcan - rotate: false - xy: 967, 388 - size: 8, 8 - orig: 8, 8 - offset: 0, 0 - index: -1 -vulcan-equip - rotate: false - xy: 977, 398 - size: 8, 8 - orig: 8, 8 + xy: 625, 110 + size: 12, 12 + orig: 12, 12 offset: 0, 0 index: -1 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 74a143345d..69f2d542d2 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/AmmoTypes.java b/core/src/io/anuke/mindustry/content/AmmoTypes.java index fb77362177..39ce0cdf62 100644 --- a/core/src/io/anuke/mindustry/content/AmmoTypes.java +++ b/core/src/io/anuke/mindustry/content/AmmoTypes.java @@ -9,6 +9,7 @@ import io.anuke.mindustry.type.ContentList; public class AmmoTypes implements ContentList { public static AmmoType bulletTungsten, bulletLead, bulletCarbide, bulletThorium, bulletSilicon, bulletThermite, + shotgunTungsten, flakLead, flakExplosive, flakPlastic, flakSurge, missileExplosive, missileIncindiary, missileSurge, artilleryCarbide, artilleryThorium, artilleryPlastic, artilleryHoming, artilleryIncindiary, basicFlame, lancerLaser, lightning, spectreLaser, meltdownLaser, fuseShotgun, oil, water, lava, cryofluid; @@ -54,6 +55,14 @@ public class AmmoTypes implements ContentList { inaccuracy = 3f; }}; + //shotgun (delta mech) + + shotgunTungsten = new AmmoType(Items.tungsten, WeaponBullets.tungstenShotgun, 2) {{ + shootEffect = ShootFx.shootBig; + smokeEffect = ShootFx.shootBigSmoke; + recoil = 1f; + }}; + //flak flakLead = new AmmoType(Items.lead, FlakBullets.lead, 5) {{ diff --git a/core/src/io/anuke/mindustry/content/Mechs.java b/core/src/io/anuke/mindustry/content/Mechs.java index fffd446c28..c4ea7a2b28 100644 --- a/core/src/io/anuke/mindustry/content/Mechs.java +++ b/core/src/io/anuke/mindustry/content/Mechs.java @@ -1,7 +1,9 @@ package io.anuke.mindustry.content; +import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.utils.Array; import io.anuke.mindustry.game.Content; +import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.type.ContentList; import io.anuke.mindustry.type.Mech; import io.anuke.mindustry.type.Upgrade; @@ -18,11 +20,21 @@ public class Mechs implements ContentList { alpha = new Mech("alpha-mech", false){{ drillPower = 1; speed = 0.5f; + weapon = Weapons.blaster; + trailColor = Palette.lightTrail; }}; delta = new Mech("delta-mech", false){{ drillPower = -1; - speed = 0.6f; + speed = 0.63f; + boostSpeed = 0.86f; + itemCapacity = 15; + armor = 30f; + weaponOffsetX = -1; + weaponOffsetY = -1; + weapon = Weapons.shockgun; + ammoCapacity = 50; + trailColor = Color.valueOf("d3ddff"); }}; tau = new Mech("tau-mech", false){{ @@ -42,6 +54,7 @@ public class Mechs implements ContentList { drag = 0.1f; weaponOffsetX = -1; weaponOffsetY = -1; + trailColor = Palette.lightTrail; }}; trident = new Mech("trident-ship", true){{ diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index d1974979c5..049c57fc74 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -59,7 +59,7 @@ public class Recipes implements ContentList{ new Recipe(crafting, CraftingBlocks.siliconsmelter, new ItemStack(Items.tungsten, 60), new ItemStack(Items.lead, 50)); //other crafting - new Recipe(crafting, CraftingBlocks.phaseweaver, new ItemStack(Items.silicon, 160), new ItemStack(Items.lead, 160), new ItemStack(Items.thorium, 150)); + new Recipe(crafting, CraftingBlocks.phaseweaver, new ItemStack(Items.silicon, 160), new ItemStack(Items.lead, 240), new ItemStack(Items.thorium, 150)); //TODO implement alloy smelter // new Recipe(crafting, CraftingBlocks.alloySmelter, new ItemStack(Items.silicon, 160), new ItemStack(Items.lead, 160), new ItemStack(Items.thorium, 140)); @@ -69,6 +69,7 @@ public class Recipes implements ContentList{ new Recipe(crafting, CraftingBlocks.pulverizer, new ItemStack(Items.tungsten, 60), new ItemStack(Items.lead, 50)); new Recipe(crafting, CraftingBlocks.thermiteMixer, new ItemStack(Items.tungsten, 100), new ItemStack(Items.lead, 50)); new Recipe(crafting, CraftingBlocks.blastMixer, new ItemStack(Items.tungsten, 60), new ItemStack(Items.lead, 60), new ItemStack(Items.carbide, 40)); + new Recipe(crafting, CraftingBlocks.cryofluidmixer, new ItemStack(Items.lead, 130), new ItemStack(Items.silicon, 80), new ItemStack(Items.titanium, 90)); //processing new Recipe(crafting, CraftingBlocks.biomatterCompressor, new ItemStack(Items.lead, 70), new ItemStack(Items.silicon, 60)); @@ -107,6 +108,8 @@ public class Recipes implements ContentList{ new Recipe(units, UpgradeBlocks.dartFactory, new ItemStack(Items.lead, 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.deltaFactory, new ItemStack(Items.carbide, 160), new ItemStack(Items.silicon, 220), new ItemStack(Items.titanium, 250)).setDesktop(); + //new Recipe(units, UpgradeBlocks.deltaFactory, new ItemStack(Items.tungsten, 30), new ItemStack(Items.lead, 50), new ItemStack(Items.silicon, 30)); //actual unit related stuff diff --git a/core/src/io/anuke/mindustry/content/Weapons.java b/core/src/io/anuke/mindustry/content/Weapons.java index a0ec758210..611d4b28a3 100644 --- a/core/src/io/anuke/mindustry/content/Weapons.java +++ b/core/src/io/anuke/mindustry/content/Weapons.java @@ -8,7 +8,7 @@ import io.anuke.mindustry.type.Upgrade; import io.anuke.mindustry.type.Weapon; public class Weapons implements ContentList { - public static Weapon blaster, blaster2, blaster3, blaster4; + public static Weapon blaster, shockgun, sapper, swarmer; @Override public void load() { @@ -21,15 +21,19 @@ public class Weapons implements ContentList { setAmmo(AmmoTypes.bulletLead); }}; - blaster2 = new Weapon("clustergun") {{ - length = 1.5f; - reload = 13f; + shockgun = new Weapon("shockgun") {{ + length = 1f; + reload = 50f; roundrobin = true; + shots = 6; + inaccuracy = 15f; + recoil = 2f; + velocityRnd = 0.7f; ejectEffect = ShootFx.shellEjectSmall; - setAmmo(AmmoTypes.bulletLead); + setAmmo(AmmoTypes.shotgunTungsten); }}; - blaster3 = new Weapon("shockgun") {{ + sapper = new Weapon("sapper") {{ length = 1.5f; reload = 12f; roundrobin = true; @@ -37,7 +41,7 @@ public class Weapons implements ContentList { setAmmo(AmmoTypes.bulletCarbide); }}; - blaster4 = new Weapon("vulcan") {{ + swarmer = new Weapon("swarmer") {{ length = 1.5f; reload = 10f; roundrobin = true; diff --git a/core/src/io/anuke/mindustry/content/bullets/WeaponBullets.java b/core/src/io/anuke/mindustry/content/bullets/WeaponBullets.java new file mode 100644 index 0000000000..30081173ac --- /dev/null +++ b/core/src/io/anuke/mindustry/content/bullets/WeaponBullets.java @@ -0,0 +1,21 @@ +package io.anuke.mindustry.content.bullets; + +import io.anuke.mindustry.entities.bullet.BasicBulletType; +import io.anuke.mindustry.entities.bullet.BulletType; + +public class WeaponBullets extends BulletList { + public static BulletType tungstenShotgun; + + @Override + public void load() { + tungstenShotgun = new BasicBulletType(5f, 8, "bullet") { + { + bulletWidth = 8f; + bulletHeight = 9f; + bulletShrink = 0.6f; + lifetime = 30f; + drag = 0.04f; + } + }; + } +} diff --git a/core/src/io/anuke/mindustry/core/ContentLoader.java b/core/src/io/anuke/mindustry/core/ContentLoader.java index 27bc0385e9..9549733bcc 100644 --- a/core/src/io/anuke/mindustry/core/ContentLoader.java +++ b/core/src/io/anuke/mindustry/core/ContentLoader.java @@ -58,6 +58,7 @@ public class ContentLoader { new MissileBullets(), new StandardBullets(), new TurretBullets(), + new WeaponBullets(), //ammotypes new AmmoTypes(), diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java index 3123441b17..32477fa02e 100644 --- a/core/src/io/anuke/mindustry/entities/Player.java +++ b/core/src/io/anuke/mindustry/entities/Player.java @@ -317,7 +317,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait { Draw.rect(mech.region, x, y, rotation -90); for (int i : Mathf.signs) { - float tra = rotation - 90, trY = - mech.weapon.getRecoil(this, i > 0)*1.5f + mech.weaponOffsetY; + float tra = rotation - 90, trY = - mech.weapon.getRecoil(this, i > 0) + mech.weaponOffsetY; float w = i > 0 ? -12 : 12; Draw.rect(mech.weapon.equipRegion, x + Angles.trnsx(tra, mech.weaponOffsetX * i, trY), @@ -357,7 +357,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait { float wobblyness = 0.6f; trail.update(x + Angles.trnsx(rotation + 180f, 5f) + Mathf.range(wobblyness), y + Angles.trnsy(rotation + 180f, 5f) + Mathf.range(wobblyness)); - trail.draw(Palette.lighterOrange, Palette.lightishOrange, 5f * (isFlying() ? 1f : boostHeat)); + trail.draw(mech.trailColor, mech.trailColor, 5f * (isFlying() ? 1f : boostHeat)); }else{ trail.clear(); } @@ -676,6 +676,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait { stream.writeBoolean(isLocal); if(isLocal){ + stream.writeByte(mech.id); stream.writeByte(playerIndex); super.writeSave(stream, false); } @@ -686,8 +687,10 @@ public class Player extends Unit implements BuilderTrait, CarryTrait { boolean local = stream.readBoolean(); if(local){ + byte mechid = stream.readByte(); int index = stream.readByte(); players[index].readSaveSuper(stream); + players[index].mech = Upgrade.getByID(mechid); players[index].dead = false; } } diff --git a/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java b/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java index bf20a3ca01..e042f31ef9 100644 --- a/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java +++ b/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java @@ -88,7 +88,7 @@ public abstract class FlyingUnit extends BaseUnit implements CarryTrait{ @Override public void drawOver() { - trail.draw(Palette.lightFlame, Palette.lightOrange, 5f); + trail.draw(Palette.lightTrail, Palette.lightTrail, 5f); } @Override diff --git a/core/src/io/anuke/mindustry/entities/units/types/Drone.java b/core/src/io/anuke/mindustry/entities/units/types/Drone.java index 63bbedd59e..b1e256f60b 100644 --- a/core/src/io/anuke/mindustry/entities/units/types/Drone.java +++ b/core/src/io/anuke/mindustry/entities/units/types/Drone.java @@ -162,7 +162,7 @@ public class Drone extends FlyingUnit implements BuilderTrait { @Override public void drawOver() { - trail.draw(Palette.lighterOrange, Palette.lightishOrange, 3f); + trail.draw(Palette.lightTrail, Palette.lightTrail, 3f); if(target instanceof TileEntity && state.is(repair)){ float len = 5f; diff --git a/core/src/io/anuke/mindustry/graphics/Palette.java b/core/src/io/anuke/mindustry/graphics/Palette.java index 2631f3cf29..5f167a25f2 100644 --- a/core/src/io/anuke/mindustry/graphics/Palette.java +++ b/core/src/io/anuke/mindustry/graphics/Palette.java @@ -51,6 +51,8 @@ public class Palette { public static final Color power = Color.valueOf("fbd367"); public static final Color placing = Color.valueOf("616161"); + public static final Color lightTrail = Color.valueOf("ffe2a9"); + public static final Color redSpark = Color.valueOf("fbb97f"); public static final Color orangeSpark = Color.valueOf("d2b29c"); diff --git a/core/src/io/anuke/mindustry/type/Mech.java b/core/src/io/anuke/mindustry/type/Mech.java index 74a25825c8..cc896f2004 100644 --- a/core/src/io/anuke/mindustry/type/Mech.java +++ b/core/src/io/anuke/mindustry/type/Mech.java @@ -1,5 +1,6 @@ package io.anuke.mindustry.type; +import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.g2d.TextureRegion; import io.anuke.mindustry.content.Weapons; import io.anuke.ucore.graphics.Draw; @@ -19,6 +20,7 @@ public class Mech extends Upgrade { public float carryWeight = 10f; public float buildPower = 1f; public boolean canRepair = false; + public Color trailColor = Color.valueOf("ffd37f"); public float weaponOffsetX, weaponOffsetY; diff --git a/core/src/io/anuke/mindustry/type/Weapon.java b/core/src/io/anuke/mindustry/type/Weapon.java index 1115740e87..2bbe2331d3 100644 --- a/core/src/io/anuke/mindustry/type/Weapon.java +++ b/core/src/io/anuke/mindustry/type/Weapon.java @@ -36,8 +36,12 @@ public class Weapon extends Upgrade { protected float inaccuracy = 0f; /**intensity and duration of each shot's screen shake*/ protected float shake = 0f; + /**visual weapon knockback.*/ + protected float recoil = 1.5f; /**shoot barrel length*/ protected float length = 3f; + /**fraction of velocity that is random*/ + protected float velocityRnd = 0f; /**whether to shoot the weapons in different arms one after another, rather than all at once*/ protected boolean roundrobin = false; /**translator for vector calulations*/ @@ -76,7 +80,7 @@ public class Weapon extends Upgrade { } public float getRecoil(Player player, boolean left){ - return 1f-Mathf.clamp(player.timer.getTime(left ? Player.timerShootLeft : Player.timerShootRight)/reload); + return (1f-Mathf.clamp(player.timer.getTime(left ? Player.timerShootLeft : Player.timerShootRight)/reload))*recoil; } public float getReload(){ @@ -106,7 +110,7 @@ public class Weapon extends Upgrade { void bullet(Unit owner, float x, float y, float angle){ tr.trns(angle, 3f); - Bullet.create(owner.inventory.getAmmo().bullet, owner, x + tr.x, y + tr.y, angle); + Bullet.create(owner.inventory.getAmmo().bullet, owner, owner.getTeam(), x + tr.x, y + tr.y, angle, (1f-velocityRnd) + Mathf.random(velocityRnd)); } @Remote(targets = Loc.server, called = Loc.both, in = In.entities, unreliable = true) diff --git a/core/src/io/anuke/mindustry/world/blocks/units/MechFactory.java b/core/src/io/anuke/mindustry/world/blocks/units/MechFactory.java index d4811ee830..9cdf4b7bd2 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/MechFactory.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/MechFactory.java @@ -163,6 +163,7 @@ public class MechFactory extends Block{ entity.player.heal(); entity.open = true; entity.player.setDead(false); + entity.player.inventory.clear(); entity.player = null; } diff --git a/packer/src/io/anuke/mindustry/Generators.java b/packer/src/io/anuke/mindustry/Generators.java index a00391399d..51605373ee 100644 --- a/packer/src/io/anuke/mindustry/Generators.java +++ b/packer/src/io/anuke/mindustry/Generators.java @@ -55,8 +55,8 @@ public class Generators { image.draw(mech.region); } - image.draw(mech.weapon.equipRegion, false, false); - image.draw(mech.weapon.equipRegion, true, false); + image.draw(mech.weapon.equipRegion, -(int)mech.weaponOffsetX, (int)mech.weaponOffsetY, false, false); + image.draw(mech.weapon.equipRegion, (int)mech.weaponOffsetX, (int)mech.weaponOffsetY, true, false); image.save("mech-icon-" + mech.name);