diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-tank-bottom.png b/core/assets-raw/sprites/blocks/liquid/liquid-tank-bottom.png index 171a96e368..1cdef7f381 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-tank-bottom.png and b/core/assets-raw/sprites/blocks/liquid/liquid-tank-bottom.png differ diff --git a/core/assets-raw/sprites/units/dagger-base.png b/core/assets-raw/sprites/units/dagger-base.png index 277d848d8f..3dd806403d 100644 Binary files a/core/assets-raw/sprites/units/dagger-base.png and b/core/assets-raw/sprites/units/dagger-base.png differ diff --git a/core/assets-raw/sprites/units/dagger-leg.png b/core/assets-raw/sprites/units/dagger-leg.png index d25325c6bc..3eabd86858 100644 Binary files a/core/assets-raw/sprites/units/dagger-leg.png and b/core/assets-raw/sprites/units/dagger-leg.png differ diff --git a/core/assets-raw/sprites/units/fortress-base.png b/core/assets-raw/sprites/units/fortress-base.png index 2930249fa3..45a4eaf997 100644 Binary files a/core/assets-raw/sprites/units/fortress-base.png and b/core/assets-raw/sprites/units/fortress-base.png differ diff --git a/core/assets-raw/sprites/units/fortress-leg.png b/core/assets-raw/sprites/units/fortress-leg.png index 3f461f27f2..a257fde52d 100644 Binary files a/core/assets-raw/sprites/units/fortress-leg.png and b/core/assets-raw/sprites/units/fortress-leg.png differ diff --git a/core/assets-raw/sprites/units/fortress.png b/core/assets-raw/sprites/units/fortress.png index 6959fffef2..3614452f50 100644 Binary files a/core/assets-raw/sprites/units/fortress.png and b/core/assets-raw/sprites/units/fortress.png differ diff --git a/core/assets-raw/sprites/units/titan-base.png b/core/assets-raw/sprites/units/titan-base.png index 2930249fa3..a5c60d294c 100644 Binary files a/core/assets-raw/sprites/units/titan-base.png and b/core/assets-raw/sprites/units/titan-base.png differ diff --git a/core/assets-raw/sprites/units/titan-leg.png b/core/assets-raw/sprites/units/titan-leg.png index 3f461f27f2..9f0347d206 100644 Binary files a/core/assets-raw/sprites/units/titan-leg.png and b/core/assets-raw/sprites/units/titan-leg.png differ diff --git a/core/assets-raw/sprites/weapons/artillery-equip.png b/core/assets-raw/sprites/weapons/artillery-equip.png index a761a92a9d..9c13378d12 100644 Binary files a/core/assets-raw/sprites/weapons/artillery-equip.png and b/core/assets-raw/sprites/weapons/artillery-equip.png differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 63e6e12c6b..e8313ff276 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -607,6 +607,7 @@ block.wraith-factory.name=Wraith Fighter Factory block.ghoul-factory.name=Ghoul Bomber Factory block.dagger-factory.name=Dagger Mech Factory block.titan-factory.name=Titan Mech Factory +block.fortress-factory.name=Fortress Mech Factory block.revenant-factory.name=Revenant Fighter Factory block.repair-point.name=Repair Point block.pulse-conduit.name=Pulse Conduit diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index 58263d9147..a775b3822a 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -27,287 +27,287 @@ overdrive-projector-top index: -1 bridge-conveyor-arrow rotate: false - xy: 165, 42 + xy: 195, 57 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 175, 52 + xy: 205, 67 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 165, 32 + xy: 195, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 593, 385 + xy: 245, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 603, 395 + xy: 225, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 613, 395 + xy: 235, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 603, 385 + xy: 245, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 613, 385 + xy: 225, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 623, 395 + xy: 235, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 623, 385 + xy: 245, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 633, 395 + xy: 235, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 633, 385 + xy: 245, 33 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 645, 405 + xy: 245, 23 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 643, 395 + xy: 225, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 643, 385 + xy: 235, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 367, 250 + xy: 245, 13 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 377, 250 + xy: 255, 68 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 387, 252 + xy: 255, 58 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 397, 254 + xy: 265, 68 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 186, 84 + xy: 255, 48 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 185, 74 + xy: 265, 58 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 185, 64 + xy: 255, 38 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 653, 335 + xy: 829, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 653, 325 + xy: 839, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 653, 315 + xy: 839, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 653, 305 + xy: 849, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 614, 295 + xy: 849, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 614, 285 + xy: 859, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 624, 295 + xy: 859, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 624, 285 + xy: 869, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 634, 295 + xy: 869, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 634, 285 + xy: 879, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 644, 295 + xy: 879, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 644, 285 + xy: 889, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 654, 295 + xy: 889, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 654, 285 + xy: 899, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 1011, 439 + xy: 899, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 1009, 429 + xy: 909, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 1009, 419 + xy: 909, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 397, 234 + xy: 919, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 226, 75 + xy: 919, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -321,21 +321,21 @@ mass-driver-turret index: -1 phase-conveyor-arrow rotate: false - xy: 919, 433 + xy: 851, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 919, 423 + xy: 861, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 929, 433 + xy: 871, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -496,28 +496,28 @@ pneumatic-drill-top index: -1 water-extractor rotate: false - xy: 265, 120 + xy: 301, 105 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 283, 114 + xy: 485, 363 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 301, 105 + xy: 483, 345 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 485, 363 + xy: 503, 359 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -545,588 +545,588 @@ blackrockshadow1 index: -1 blackstone1 rotate: false - xy: 367, 260 + xy: 355, 260 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-blackstone rotate: false - xy: 367, 260 + xy: 355, 260 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 331, 212 + xy: 331, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 343, 225 + xy: 365, 260 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneedge rotate: false - xy: 530, 281 + xy: 543, 265 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 coal1 rotate: false - xy: 175, 42 + xy: 205, 57 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 165, 22 + xy: 195, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 175, 32 + xy: 205, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper1 rotate: false - xy: 185, 54 + xy: 265, 48 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper2 rotate: false - xy: 185, 44 + xy: 255, 28 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper3 rotate: false - xy: 185, 34 + xy: 265, 38 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 195, 51 + xy: 275, 38 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 205, 61 + xy: 275, 28 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 144, 104 + xy: 158, 148 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 generic-cliff-edge rotate: false - xy: 195, 11 + xy: 625, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge rotate: false - xy: 195, 11 + xy: 625, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-1 rotate: false - xy: 205, 11 + xy: 635, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-1 rotate: false - xy: 205, 11 + xy: 635, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-2 rotate: false - xy: 163, 1 + xy: 593, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-2 rotate: false - xy: 163, 1 + xy: 593, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-side rotate: false - xy: 173, 1 + xy: 593, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-side rotate: false - xy: 173, 1 + xy: 593, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge rotate: false - xy: 203, 1 + xy: 603, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-1 rotate: false - xy: 213, 1 + xy: 613, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-2 rotate: false - xy: 226, 125 + xy: 593, 365 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-side rotate: false - xy: 236, 127 + xy: 603, 375 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 183, 1 + xy: 603, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 193, 1 + xy: 593, 375 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 158, 134 + xy: 158, 120 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice2 rotate: false - xy: 230, 115 + xy: 623, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 240, 117 + xy: 603, 365 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 158, 120 + xy: 172, 134 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 250, 117 + xy: 613, 375 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 366, 240 + xy: 623, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 366, 240 + xy: 623, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 376, 240 + xy: 633, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 376, 240 + xy: 633, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 172, 120 + xy: 144, 90 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 635, 375 + xy: 607, 325 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 635, 365 + xy: 617, 335 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 645, 375 + xy: 627, 345 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 623, 335 + xy: 617, 315 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 633, 345 + xy: 627, 325 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 643, 355 + xy: 637, 335 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 613, 315 + xy: 597, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 623, 325 + xy: 607, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalflooredge rotate: false - xy: 172, 92 + xy: 141, 62 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 oiledge rotate: false - xy: 141, 76 + xy: 141, 48 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock2 rotate: false - xy: 989, 423 + xy: 1001, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 999, 423 + xy: 659, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 387, 242 + xy: 649, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 141, 62 + xy: 141, 34 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 215, 31 + xy: 709, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 215, 21 + xy: 719, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 215, 11 + xy: 719, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 141, 34 + xy: 137, 6 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 141, 20 + xy: 186, 146 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone-cliff-edge rotate: false - xy: 290, 104 + xy: 779, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 280, 94 + xy: 789, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 290, 94 + xy: 789, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 300, 95 + xy: 799, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 270, 100 + xy: 769, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 280, 104 + xy: 779, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 186, 146 + xy: 200, 135 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 653, 395 + xy: 799, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 653, 385 + xy: 809, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 655, 375 + xy: 809, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 655, 365 + xy: 819, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 653, 355 + xy: 819, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 653, 345 + xy: 829, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge rotate: false - xy: 225, 55 + xy: 929, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-1 rotate: false - xy: 225, 45 + xy: 939, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-2 rotate: false - xy: 225, 35 + xy: 939, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-side rotate: false - xy: 225, 25 + xy: 949, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 200, 121 + xy: 214, 121 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-border rotate: false - xy: 331, 142 + xy: 331, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-elevation rotate: false - xy: 331, 132 + xy: 331, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 331, 132 + xy: 331, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-middle rotate: false - xy: 165, 72 + xy: 185, 22 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 165, 72 + xy: 185, 22 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-slope rotate: false - xy: 175, 82 + xy: 198, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 border rotate: false - xy: 165, 62 + xy: 208, 87 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 341, 105 + xy: 225, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 185, 24 + xy: 255, 18 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1154,7 +1154,7 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 205, 21 + xy: 615, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1168,21 +1168,21 @@ nuclearreactor-shadow index: -1 place-arrow rotate: false - xy: 929, 423 + xy: 881, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 939, 433 + xy: 891, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 331, 234 + xy: 374, 270 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1231,7 +1231,7 @@ rubble-3-1 index: -1 shadow-1 rotate: false - xy: 343, 246 + xy: 331, 258 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1273,14 +1273,14 @@ shadow-6 index: -1 shadow-corner rotate: false - xy: 355, 258 + xy: 331, 246 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-round-1 rotate: false - xy: 331, 222 + xy: 343, 258 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -1308,154 +1308,154 @@ shadow-rounded-2 index: -1 shadow-shock-mine rotate: false - xy: 215, 51 + xy: 699, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 175, 72 + xy: 195, 77 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 165, 52 + xy: 195, 67 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 175, 62 + xy: 205, 77 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 341, 185 + xy: 205, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 341, 175 + xy: 215, 77 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 341, 165 + xy: 215, 67 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 341, 155 + xy: 215, 57 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 341, 145 + xy: 215, 47 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 341, 135 + xy: 215, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 341, 125 + xy: 215, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 341, 115 + xy: 215, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 341, 95 + xy: 235, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 595, 405 + xy: 225, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 605, 405 + xy: 245, 73 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 615, 405 + xy: 225, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 625, 405 + xy: 235, 63 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 635, 405 + xy: 225, 43 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 593, 395 + xy: 235, 53 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 623, 345 + xy: 637, 345 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 633, 355 + xy: 597, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 613, 325 + xy: 607, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1483,70 +1483,70 @@ liquid-tank-top index: -1 phase-conduit-arrow rotate: false - xy: 899, 423 + xy: 821, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 909, 433 + xy: 831, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 909, 423 + xy: 841, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 939, 423 + xy: 901, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 949, 433 + xy: 911, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 949, 423 + xy: 921, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 959, 433 + xy: 931, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 959, 423 + xy: 941, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 969, 433 + xy: 951, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 969, 423 + xy: 961, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1637,7 +1637,7 @@ fusion-reactor-top index: -1 rtg-generator-top rotate: false - xy: 999, 433 + xy: 649, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1658,7 +1658,7 @@ thorium-reactor-lights index: -1 turbine-generator-top rotate: false - xy: 575, 377 + xy: 247, 137 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1826,14 +1826,14 @@ cultivator-top index: -1 lavasmelter rotate: false - xy: 625, 365 + xy: 597, 315 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 643, 325 + xy: 627, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1868,21 +1868,21 @@ plastanium-compressor-top index: -1 pulverizer rotate: false - xy: 979, 433 + xy: 971, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 979, 423 + xy: 981, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 215, 61 + xy: 699, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1903,21 +1903,21 @@ core-top index: -1 sortedunloader rotate: false - xy: 228, 95 + xy: 749, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1 rotate: false - xy: 331, 162 + xy: 331, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1-top rotate: false - xy: 331, 152 + xy: 331, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1987,7 +1987,7 @@ cyclone index: -1 duo rotate: false - xy: 195, 21 + xy: 605, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2001,7 +2001,7 @@ fuse index: -1 hail rotate: false - xy: 246, 127 + xy: 613, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2085,21 +2085,21 @@ salvo-panel-right index: -1 scatter rotate: false - xy: 218, 91 + xy: 679, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch rotate: false - xy: 216, 81 + xy: 689, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 215, 71 + xy: 689, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2120,14 +2120,14 @@ swarmer index: -1 wave rotate: false - xy: 483, 345 + xy: 521, 359 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 503, 359 + xy: 539, 359 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2239,7 +2239,7 @@ reconstructor-open index: -1 repair-point-turret rotate: false - xy: 989, 433 + xy: 991, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2274,21 +2274,21 @@ spirit-factory-top-open index: -1 wraith-factory-top rotate: false - xy: 521, 359 + xy: 557, 359 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wraith-factory-top-open rotate: false - xy: 539, 359 + xy: 575, 359 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 deflector-wall rotate: false - xy: 205, 71 + xy: 275, 48 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2309,7 +2309,7 @@ door-large-open index: -1 door-open rotate: false - xy: 205, 31 + xy: 595, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2344,7 +2344,7 @@ bullet index: -1 bullet-back rotate: false - xy: 501, 280 + xy: 514, 264 size: 13, 13 orig: 13, 13 offset: 0, 0 @@ -2365,49 +2365,49 @@ clear index: -1 command-attack rotate: false - xy: 175, 22 + xy: 195, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-idle rotate: false - xy: 343, 215 + xy: 205, 37 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-patrol rotate: false - xy: 341, 205 + xy: 205, 27 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-retreat rotate: false - xy: 341, 195 + xy: 195, 17 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 185, 15 + xy: 355, 251 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 error rotate: false - xy: 158, 162 + xy: 172, 162 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 laser rotate: false - xy: 498, 275 + xy: 138, 26 size: 1, 12 orig: 1, 12 offset: 0, 0 @@ -2428,7 +2428,7 @@ laserfull index: -1 minelaser rotate: false - xy: 138, 26 + xy: 233, 289 size: 1, 12 orig: 1, 12 offset: 0, 0 @@ -2491,35 +2491,35 @@ scorch5 index: -1 shell rotate: false - xy: 343, 235 + xy: 331, 235 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shell-back rotate: false - xy: 355, 247 + xy: 343, 247 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shot rotate: false - xy: 215, 41 + xy: 709, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 transfer rotate: false - xy: 498, 261 + xy: 236, 283 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 225, 65 + xy: 929, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2533,35 +2533,35 @@ transfer-end index: -1 blackstone-cliff-edge rotate: false - xy: 331, 202 + xy: 331, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-1 rotate: false - xy: 331, 192 + xy: 375, 260 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-2 rotate: false - xy: 331, 182 + xy: 331, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-side rotate: false - xy: 331, 172 + xy: 331, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-arc rotate: false - xy: 331, 122 + xy: 331, 145 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2582,28 +2582,28 @@ block-icon-blast-drill index: -1 block-icon-bridge-conduit rotate: false - xy: 331, 112 + xy: 331, 135 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 331, 112 + xy: 331, 135 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-bridge-conveyor rotate: false - xy: 377, 260 + xy: 331, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 377, 260 + xy: 331, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2624,14 +2624,14 @@ centrifuge index: -1 block-icon-combustion-generator rotate: false - xy: 331, 102 + xy: 331, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 331, 102 + xy: 331, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2652,35 +2652,35 @@ command-center index: -1 block-icon-conduit rotate: false - xy: 386, 272 + xy: 331, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conveyor rotate: false - xy: 396, 274 + xy: 386, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 396, 274 + xy: 386, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-copper-wall rotate: false - xy: 406, 274 + xy: 396, 274 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper-wall rotate: false - xy: 406, 274 + xy: 396, 274 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2757,14 +2757,14 @@ dart-ship-pad index: -1 block-icon-deepwater rotate: false - xy: 387, 262 + xy: 406, 274 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 387, 262 + xy: 406, 274 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2785,14 +2785,14 @@ delta-mech-pad index: -1 block-icon-dense-alloy-wall rotate: false - xy: 397, 264 + xy: 434, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dense-alloy-wall rotate: false - xy: 397, 264 + xy: 434, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2813,14 +2813,14 @@ dense-alloy-wall-large index: -1 block-icon-dirt rotate: false - xy: 434, 265 + xy: 444, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 434, 265 + xy: 444, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2841,14 +2841,14 @@ distributor index: -1 block-icon-door rotate: false - xy: 444, 265 + xy: 454, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 444, 265 + xy: 454, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2869,7 +2869,7 @@ door-large index: -1 block-icon-duo rotate: false - xy: 454, 265 + xy: 200, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2925,91 +2925,91 @@ glaive-ship-pad index: -1 block-icon-grass rotate: false - xy: 200, 111 + xy: 210, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass1 rotate: false - xy: 200, 111 + xy: 210, 97 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-hail rotate: false - xy: 198, 101 + xy: 220, 99 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ice rotate: false - xy: 198, 91 + xy: 230, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice1 rotate: false - xy: 198, 91 + xy: 230, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-icerock rotate: false - xy: 210, 111 + xy: 240, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 210, 111 + xy: 240, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-incinerator rotate: false - xy: 208, 101 + xy: 250, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 208, 101 + xy: 250, 103 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemsource rotate: false - xy: 208, 91 + xy: 230, 93 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 208, 91 + xy: 230, 93 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemvoid rotate: false - xy: 220, 113 + xy: 240, 93 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 220, 113 + xy: 240, 93 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3030,14 +3030,14 @@ javelin-ship-pad index: -1 block-icon-junction rotate: false - xy: 513, 270 + xy: 250, 93 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 junction rotate: false - xy: 513, 270 + xy: 250, 93 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3058,35 +3058,35 @@ block-icon-laser-drill index: -1 block-icon-lava rotate: false - xy: 513, 260 + xy: 220, 89 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 513, 260 + xy: 220, 89 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-junction rotate: false - xy: 523, 271 + xy: 260, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 523, 271 + xy: 260, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-router rotate: false - xy: 523, 261 + xy: 270, 98 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3100,14 +3100,14 @@ block-icon-liquid-tank index: -1 block-icon-liquidsource rotate: false - xy: 533, 271 + xy: 260, 88 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 533, 271 + xy: 260, 88 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3135,14 +3135,14 @@ block-icon-mechanical-drill index: -1 block-icon-mechanical-pump rotate: false - xy: 533, 261 + xy: 270, 88 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 533, 261 + xy: 270, 88 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3156,14 +3156,14 @@ block-icon-meltdown index: -1 block-icon-melter rotate: false - xy: 543, 271 + xy: 230, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 543, 271 + xy: 230, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3184,28 +3184,28 @@ mend-projector index: -1 block-icon-metalfloor rotate: false - xy: 543, 261 + xy: 240, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 543, 261 + xy: 240, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-oil rotate: false - xy: 553, 271 + xy: 250, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 553, 271 + xy: 250, 83 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3247,14 +3247,14 @@ overdrive-projector index: -1 block-icon-overflow-gate rotate: false - xy: 553, 261 + xy: 260, 78 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 553, 261 + xy: 260, 78 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3268,42 +3268,42 @@ block-icon-phantom-factory index: -1 block-icon-phase-conduit rotate: false - xy: 563, 271 + xy: 270, 78 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 563, 271 + xy: 270, 78 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conveyor rotate: false - xy: 563, 261 + xy: 155, 80 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 563, 261 + xy: 155, 80 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-wall rotate: false - xy: 573, 273 + xy: 155, 70 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 573, 273 + xy: 155, 70 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3359,14 +3359,14 @@ block-icon-pneumatic-drill index: -1 block-icon-power-node rotate: false - xy: 573, 263 + xy: 155, 60 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 power-node rotate: false - xy: 573, 263 + xy: 155, 60 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3387,42 +3387,42 @@ power-node-large index: -1 block-icon-powerinfinite rotate: false - xy: 583, 273 + xy: 155, 50 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 583, 273 + xy: 155, 50 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-powervoid rotate: false - xy: 583, 263 + xy: 155, 40 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 583, 263 + xy: 155, 40 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulse-conduit rotate: false - xy: 593, 273 + xy: 155, 30 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulverizer rotate: false - xy: 593, 263 + xy: 155, 20 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3485,14 +3485,14 @@ wraith-factory index: -1 block-icon-repair-point rotate: false - xy: 603, 273 + xy: 165, 82 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 repair-point rotate: false - xy: 603, 273 + xy: 165, 82 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3520,14 +3520,14 @@ block-icon-ripple index: -1 block-icon-rock rotate: false - xy: 603, 263 + xy: 175, 82 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock1 rotate: false - xy: 603, 263 + xy: 175, 82 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3548,14 +3548,14 @@ rotary-pump index: -1 block-icon-router rotate: false - xy: 513, 250 + xy: 165, 72 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 513, 250 + xy: 165, 72 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3583,63 +3583,63 @@ block-icon-salvo index: -1 block-icon-sand rotate: false - xy: 523, 251 + xy: 185, 82 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 523, 251 + xy: 185, 82 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-scorch rotate: false - xy: 533, 251 + xy: 165, 62 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-separator rotate: false - xy: 543, 251 + xy: 175, 72 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 543, 251 + xy: 175, 72 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shock-mine rotate: false - xy: 553, 251 + xy: 165, 52 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shock-mine rotate: false - xy: 553, 251 + xy: 165, 52 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shrub rotate: false - xy: 563, 251 + xy: 175, 62 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrub rotate: false - xy: 563, 251 + xy: 175, 62 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3660,42 +3660,42 @@ silicon-smelter index: -1 block-icon-smelter rotate: false - xy: 573, 253 + xy: 185, 72 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 573, 253 + xy: 185, 72 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-snow rotate: false - xy: 583, 253 + xy: 165, 42 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 583, 253 + xy: 165, 42 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-solar-panel rotate: false - xy: 593, 253 + xy: 175, 52 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 593, 253 + xy: 175, 52 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3716,42 +3716,42 @@ solar-panel-large index: -1 block-icon-solidifer rotate: false - xy: 603, 253 + xy: 185, 62 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solidifer rotate: false - xy: 603, 253 + xy: 185, 62 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sorter rotate: false - xy: 155, 80 + xy: 165, 32 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 155, 80 + xy: 165, 32 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-space rotate: false - xy: 155, 70 + xy: 175, 42 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space rotate: false - xy: 155, 70 + xy: 175, 42 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3772,28 +3772,28 @@ block-icon-spirit-factory index: -1 block-icon-stone rotate: false - xy: 155, 60 + xy: 185, 52 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone1 rotate: false - xy: 155, 60 + xy: 185, 52 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-surge-wall rotate: false - xy: 155, 50 + xy: 165, 22 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 155, 50 + xy: 165, 22 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3877,14 +3877,14 @@ thorium-reactor index: -1 block-icon-thorium-wall rotate: false - xy: 155, 40 + xy: 175, 32 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 155, 40 + xy: 175, 32 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3905,14 +3905,14 @@ thorium-wall-large index: -1 block-icon-titanium-conveyor rotate: false - xy: 155, 30 + xy: 185, 42 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 155, 30 + xy: 185, 42 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3947,14 +3947,14 @@ turbine-generator index: -1 block-icon-unloader rotate: false - xy: 155, 20 + xy: 175, 22 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unloader rotate: false - xy: 155, 20 + xy: 175, 22 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3989,14 +3989,14 @@ warp-gate index: -1 block-icon-water rotate: false - xy: 165, 82 + xy: 185, 32 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 165, 82 + xy: 185, 32 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -4024,1078 +4024,1078 @@ block-icon-wraith-factory index: -1 deepwater-cliff-edge rotate: false - xy: 196, 81 + xy: 265, 28 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-1 rotate: false - xy: 206, 81 + xy: 265, 18 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-2 rotate: false - xy: 195, 71 + xy: 275, 68 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-side rotate: false - xy: 195, 61 + xy: 275, 58 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge rotate: false - xy: 195, 41 + xy: 275, 18 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-1 rotate: false - xy: 205, 51 + xy: 255, 8 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-2 rotate: false - xy: 195, 31 + xy: 265, 8 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-side rotate: false - xy: 205, 41 + xy: 275, 8 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge rotate: false - xy: 605, 365 + xy: 597, 325 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-1 rotate: false - xy: 615, 375 + xy: 607, 335 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-2 rotate: false - xy: 615, 365 + xy: 617, 345 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-side rotate: false - xy: 625, 375 + xy: 627, 355 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-cryofluid rotate: false - xy: 613, 355 + xy: 597, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-lava rotate: false - xy: 613, 345 + xy: 607, 315 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-oil rotate: false - xy: 623, 355 + xy: 617, 325 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-water rotate: false - xy: 613, 335 + xy: 627, 335 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mech-icon-alpha-mech rotate: false - xy: 172, 106 + xy: 158, 92 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-dart-ship rotate: false - xy: 144, 90 + xy: 172, 92 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-delta-mech rotate: false - xy: 158, 92 + xy: 141, 76 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-omega-mech rotate: false - xy: 501, 295 + xy: 482, 271 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mech-icon-tau-mech rotate: false - xy: 517, 295 + xy: 466, 263 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mech-icon-trident-ship rotate: false - xy: 533, 295 + xy: 482, 255 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 trident-ship rotate: false - xy: 533, 295 + xy: 482, 255 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 metalfloor-cliff-edge rotate: false - xy: 633, 335 + xy: 617, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-1 rotate: false - xy: 643, 345 + xy: 627, 315 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-2 rotate: false - xy: 613, 305 + xy: 637, 325 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-side rotate: false - xy: 623, 315 + xy: 607, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge rotate: false - xy: 633, 325 + xy: 617, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-1 rotate: false - xy: 643, 335 + xy: 627, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-2 rotate: false - xy: 623, 305 + xy: 637, 315 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-side rotate: false - xy: 633, 315 + xy: 617, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone1 rotate: false - xy: 633, 305 + xy: 637, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone2 rotate: false - xy: 643, 315 + xy: 627, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone3 rotate: false - xy: 643, 305 + xy: 637, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass1 rotate: false - xy: 651, 443 + xy: 637, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass2 rotate: false - xy: 661, 443 + xy: 647, 355 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass3 rotate: false - xy: 671, 443 + xy: 647, 345 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice1 rotate: false - xy: 681, 443 + xy: 647, 335 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice2 rotate: false - xy: 691, 443 + xy: 647, 325 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice3 rotate: false - xy: 701, 443 + xy: 647, 315 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 711, 443 + xy: 647, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 721, 443 + xy: 647, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 731, 443 + xy: 647, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow1 rotate: false - xy: 741, 443 + xy: 599, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow2 rotate: false - xy: 751, 443 + xy: 599, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow3 rotate: false - xy: 761, 443 + xy: 609, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 771, 443 + xy: 609, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 781, 443 + xy: 619, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 791, 443 + xy: 619, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone1 rotate: false - xy: 801, 443 + xy: 629, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone2 rotate: false - xy: 811, 443 + xy: 629, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone3 rotate: false - xy: 821, 443 + xy: 639, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass1 rotate: false - xy: 831, 443 + xy: 639, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass2 rotate: false - xy: 841, 443 + xy: 649, 275 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass3 rotate: false - xy: 851, 443 + xy: 649, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice1 rotate: false - xy: 861, 443 + xy: 365, 250 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice2 rotate: false - xy: 871, 443 + xy: 375, 250 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice3 rotate: false - xy: 881, 443 + xy: 354, 241 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand1 rotate: false - xy: 891, 443 + xy: 364, 240 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand2 rotate: false - xy: 901, 443 + xy: 374, 240 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand3 rotate: false - xy: 911, 443 + xy: 512, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow1 rotate: false - xy: 921, 443 + xy: 522, 254 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow2 rotate: false - xy: 931, 443 + xy: 532, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow3 rotate: false - xy: 941, 443 + xy: 542, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone1 rotate: false - xy: 951, 443 + xy: 552, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone2 rotate: false - xy: 961, 443 + xy: 562, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone3 rotate: false - xy: 971, 443 + xy: 572, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone1 rotate: false - xy: 981, 443 + xy: 582, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone2 rotate: false - xy: 991, 443 + xy: 592, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone3 rotate: false - xy: 1001, 443 + xy: 602, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass1 rotate: false - xy: 649, 433 + xy: 612, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass2 rotate: false - xy: 649, 423 + xy: 622, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass3 rotate: false - xy: 659, 433 + xy: 632, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice1 rotate: false - xy: 659, 423 + xy: 642, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice2 rotate: false - xy: 669, 433 + xy: 652, 255 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice3 rotate: false - xy: 669, 423 + xy: 512, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 679, 433 + xy: 522, 244 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 679, 423 + xy: 532, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 689, 433 + xy: 542, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow1 rotate: false - xy: 689, 423 + xy: 552, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow2 rotate: false - xy: 699, 433 + xy: 562, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow3 rotate: false - xy: 699, 423 + xy: 572, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 709, 433 + xy: 582, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 709, 423 + xy: 592, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 719, 433 + xy: 602, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone1 rotate: false - xy: 719, 423 + xy: 612, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone2 rotate: false - xy: 729, 433 + xy: 622, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone3 rotate: false - xy: 729, 423 + xy: 632, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass1 rotate: false - xy: 739, 433 + xy: 642, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass2 rotate: false - xy: 739, 423 + xy: 652, 245 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass3 rotate: false - xy: 749, 433 + xy: 396, 264 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice1 rotate: false - xy: 749, 423 + xy: 406, 264 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice2 rotate: false - xy: 759, 433 + xy: 386, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice3 rotate: false - xy: 759, 423 + xy: 385, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 769, 433 + xy: 416, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 769, 423 + xy: 163, 10 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 779, 433 + xy: 173, 12 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow1 rotate: false - xy: 779, 423 + xy: 183, 12 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow2 rotate: false - xy: 789, 433 + xy: 193, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow3 rotate: false - xy: 789, 423 + xy: 203, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 799, 433 + xy: 213, 7 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 799, 423 + xy: 223, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 809, 433 + xy: 233, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone1 rotate: false - xy: 809, 423 + xy: 243, 3 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone2 rotate: false - xy: 819, 433 + xy: 651, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone3 rotate: false - xy: 819, 423 + xy: 661, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass1 rotate: false - xy: 829, 433 + xy: 671, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass2 rotate: false - xy: 829, 423 + xy: 681, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass3 rotate: false - xy: 839, 433 + xy: 691, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice1 rotate: false - xy: 839, 423 + xy: 701, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice2 rotate: false - xy: 849, 433 + xy: 711, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice3 rotate: false - xy: 849, 423 + xy: 721, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 859, 433 + xy: 731, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 859, 423 + xy: 741, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 869, 433 + xy: 751, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow1 rotate: false - xy: 869, 423 + xy: 761, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow2 rotate: false - xy: 879, 433 + xy: 771, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow3 rotate: false - xy: 879, 423 + xy: 781, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 889, 433 + xy: 791, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 889, 423 + xy: 801, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 899, 433 + xy: 811, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge rotate: false - xy: 397, 244 + xy: 659, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-1 rotate: false - xy: 165, 12 + xy: 669, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-2 rotate: false - xy: 175, 12 + xy: 669, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-side rotate: false - xy: 218, 101 + xy: 679, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge rotate: false - xy: 223, 1 + xy: 729, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-1 rotate: false - xy: 240, 107 + xy: 729, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-2 rotate: false - xy: 250, 107 + xy: 739, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-side rotate: false - xy: 230, 105 + xy: 739, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge rotate: false - xy: 260, 110 + xy: 749, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-1 rotate: false - xy: 270, 110 + xy: 759, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-2 rotate: false - xy: 228, 85 + xy: 759, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-side rotate: false - xy: 260, 100 + xy: 769, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unit-icon-dagger rotate: false - xy: 186, 118 + xy: 186, 104 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-fortress rotate: false - xy: 229, 137 + xy: 265, 120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-icon-titan rotate: false - xy: 247, 137 + xy: 283, 114 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-icon-wraith rotate: false - xy: 214, 135 + xy: 200, 107 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 wraith rotate: false - xy: 214, 135 + xy: 200, 107 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 item-biomatter rotate: false - xy: 593, 243 + xy: 633, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 603, 243 + xy: 623, 365 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 351, 205 + xy: 633, 375 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-copper rotate: false - xy: 351, 195 + xy: 633, 365 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-dense-alloy rotate: false - xy: 351, 185 + xy: 645, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 351, 175 + xy: 643, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-phase-matter rotate: false - xy: 351, 165 + xy: 643, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 351, 155 + xy: 643, 375 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 351, 145 + xy: 643, 365 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 351, 135 + xy: 597, 355 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 351, 125 + xy: 597, 345 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 351, 115 + xy: 607, 355 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 351, 105 + xy: 597, 335 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 351, 95 + xy: 607, 345 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 605, 375 + xy: 617, 355 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon rotate: false - xy: 645, 365 + xy: 637, 355 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -5123,70 +5123,77 @@ alpha-mech-leg index: -1 delta-mech rotate: false - xy: 144, 132 + xy: 144, 118 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +delta-mech-base + rotate: false + xy: 144, 104 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-leg rotate: false - xy: 144, 118 + xy: 158, 162 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 omega-mech rotate: false - xy: 549, 295 + xy: 501, 279 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 omega-mech-armor rotate: false - xy: 565, 297 + xy: 517, 279 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 omega-mech-base rotate: false - xy: 581, 297 + xy: 533, 279 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 omega-mech-leg rotate: false - xy: 597, 297 + xy: 549, 279 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 tau-mech rotate: false - xy: 482, 255 + xy: 498, 263 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 tau-mech-base rotate: false - xy: 186, 132 + xy: 214, 135 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tau-mech-leg rotate: false - xy: 200, 135 + xy: 200, 121 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dart-ship rotate: false - xy: 144, 146 + xy: 144, 132 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -5207,21 +5214,21 @@ mech-icon-glaive-ship index: -1 javelin-ship rotate: false - xy: 158, 106 + xy: 172, 120 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-javelin-ship rotate: false - xy: 158, 106 + xy: 172, 120 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 javelin-ship-shield rotate: false - xy: 172, 134 + xy: 172, 106 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -5349,7 +5356,7 @@ clear index: -1 cursor rotate: false - xy: 233, 291 + xy: 89, 1 size: 4, 4 orig: 4, 4 offset: 0, 0 @@ -5433,21 +5440,21 @@ icon-arrow-down index: -1 icon-arrow-left rotate: false - xy: 186, 106 + xy: 186, 92 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 214, 123 + xy: 214, 109 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 186, 94 + xy: 228, 125 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5461,7 +5468,7 @@ icon-back index: -1 icon-ban rotate: false - xy: 557, 361 + xy: 501, 343 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5482,7 +5489,7 @@ icon-cancel index: -1 icon-chat rotate: false - xy: 501, 268 + xy: 240, 125 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5496,7 +5503,7 @@ icon-check index: -1 icon-crafting rotate: false - xy: 501, 256 + xy: 252, 125 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5517,14 +5524,14 @@ icon-defense index: -1 icon-dev-builds rotate: false - xy: 573, 361 + xy: 517, 343 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 501, 343 + xy: 533, 343 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5538,28 +5545,28 @@ icon-distribution index: -1 icon-donate rotate: false - xy: 517, 343 + xy: 549, 343 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 533, 343 + xy: 565, 343 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 549, 343 + xy: 581, 343 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 565, 345 + xy: 439, 323 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5580,7 +5587,7 @@ icon-eraser index: -1 icon-exit rotate: false - xy: 581, 345 + xy: 434, 307 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5601,7 +5608,7 @@ icon-file-image index: -1 icon-file-text rotate: false - xy: 589, 361 + xy: 434, 291 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5615,7 +5622,7 @@ icon-fill index: -1 icon-floppy rotate: false - xy: 597, 345 + xy: 434, 275 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5629,14 +5636,14 @@ icon-floppy-16 index: -1 icon-folder rotate: false - xy: 439, 323 + xy: 455, 323 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 434, 307 + xy: 450, 307 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5650,14 +5657,14 @@ icon-generated index: -1 icon-github rotate: false - xy: 434, 291 + xy: 450, 291 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 434, 275 + xy: 450, 275 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5685,14 +5692,14 @@ icon-holdDelete index: -1 icon-home rotate: false - xy: 455, 323 + xy: 471, 327 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 450, 307 + xy: 501, 327 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5706,7 +5713,7 @@ icon-info index: -1 icon-itch.io rotate: false - xy: 450, 291 + xy: 517, 327 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5720,7 +5727,7 @@ icon-item index: -1 icon-items-none rotate: false - xy: 573, 243 + xy: 613, 365 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -5734,7 +5741,7 @@ icon-line index: -1 icon-link rotate: false - xy: 450, 275 + xy: 533, 327 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5748,7 +5755,7 @@ icon-liquid index: -1 icon-load rotate: false - xy: 471, 327 + xy: 549, 327 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5790,7 +5797,7 @@ icon-logic index: -1 icon-map rotate: false - xy: 501, 327 + xy: 565, 327 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5825,7 +5832,7 @@ icon-none index: -1 icon-nullitem rotate: false - xy: 583, 243 + xy: 623, 375 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -5846,7 +5853,7 @@ icon-pencil index: -1 icon-pencil-small rotate: false - xy: 517, 327 + xy: 581, 327 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5867,7 +5874,7 @@ icon-play index: -1 icon-play-2 rotate: false - xy: 533, 327 + xy: 471, 311 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5881,21 +5888,21 @@ icon-players index: -1 icon-power rotate: false - xy: 338, 270 + xy: 228, 113 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 350, 270 + xy: 240, 113 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 549, 327 + xy: 466, 295 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5909,14 +5916,14 @@ icon-redo index: -1 icon-refresh rotate: false - xy: 565, 329 + xy: 466, 279 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 581, 329 + xy: 501, 311 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5930,35 +5937,35 @@ icon-resize index: -1 icon-rotate rotate: false - xy: 597, 329 + xy: 517, 311 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 471, 311 + xy: 533, 311 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 466, 295 + xy: 549, 311 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 466, 279 + xy: 565, 311 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 501, 311 + xy: 581, 311 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5979,7 +5986,7 @@ icon-save-map index: -1 icon-settings rotate: false - xy: 362, 270 + xy: 252, 113 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -5993,28 +6000,28 @@ icon-terrain index: -1 icon-tools rotate: false - xy: 517, 311 + xy: 482, 287 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 374, 270 + xy: 264, 108 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 331, 258 + xy: 338, 270 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 533, 311 + xy: 501, 295 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -6028,14 +6035,14 @@ icon-trash-16 index: -1 icon-trello rotate: false - xy: 549, 311 + xy: 517, 295 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 565, 313 + xy: 533, 295 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -6049,7 +6056,7 @@ icon-undo index: -1 icon-units rotate: false - xy: 331, 246 + xy: 350, 270 size: 10, 10 orig: 10, 10 offset: 0, 0 @@ -6063,21 +6070,21 @@ icon-unlocked index: -1 icon-unlocks rotate: false - xy: 581, 313 + xy: 549, 295 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 343, 258 + xy: 362, 270 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 597, 313 + xy: 565, 295 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -6091,7 +6098,7 @@ icon-zoom index: -1 icon-zoom-small rotate: false - xy: 482, 287 + xy: 581, 295 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -6256,7 +6263,7 @@ textfield-over index: -1 white rotate: false - xy: 233, 298 + xy: 390, 347 size: 3, 3 orig: 3, 3 offset: 0, 0 @@ -6293,28 +6300,21 @@ unit-icon-alpha-drone index: -1 dagger rotate: false - xy: 586, 283 + xy: 498, 249 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 600, 283 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 -delta-mech-base - rotate: false - xy: 600, 283 + xy: 144, 160 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 144, 160 + xy: 144, 146 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -6326,13 +6326,6 @@ fortress orig: 16, 16 offset: 0, 0 index: -1 -titan - rotate: false - xy: 90, 95 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 fortress-base rotate: false xy: 108, 94 @@ -6354,13 +6347,6 @@ fortress-leg orig: 16, 16 offset: 0, 0 index: -1 -titan-leg - rotate: false - xy: 126, 94 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 ghoul rotate: false xy: 84, 181 @@ -6377,21 +6363,21 @@ unit-icon-ghoul index: -1 phantom rotate: false - xy: 482, 271 + xy: 565, 279 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 unit-icon-phantom rotate: false - xy: 482, 271 + xy: 565, 279 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 power-cell rotate: false - xy: 466, 263 + xy: 581, 279 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -6412,84 +6398,98 @@ unit-icon-revenant index: -1 spirit rotate: false - xy: 137, 6 + xy: 186, 132 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-spirit rotate: false - xy: 137, 6 + xy: 186, 132 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 +titan + rotate: false + xy: 575, 377 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +titan-leg + rotate: false + xy: 229, 137 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 artillery-equip rotate: false - xy: 516, 281 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 -swarmer-equip - rotate: false - xy: 516, 281 + xy: 529, 265 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 blaster-equip rotate: false - xy: 544, 281 + xy: 557, 265 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 bomber-equip rotate: false - xy: 558, 281 + xy: 571, 265 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 missiles-equip rotate: false - xy: 558, 281 + xy: 571, 265 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 chain-blaster-equip rotate: false - xy: 572, 283 + xy: 585, 265 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flakgun-equip rotate: false - xy: 158, 148 + xy: 158, 134 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 flamethrower-equip rotate: false - xy: 172, 162 + xy: 172, 148 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 heal-blaster-equip rotate: false - xy: 172, 148 + xy: 158, 106 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shockgun-equip rotate: false - xy: 141, 48 + xy: 141, 20 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +swarmer-equip + rotate: false + xy: 186, 118 size: 12, 12 orig: 12, 12 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index ba940c15cf..9b681852b1 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 719d71c014..e695f30fab 100644 --- a/core/src/io/anuke/mindustry/content/AmmoTypes.java +++ b/core/src/io/anuke/mindustry/content/AmmoTypes.java @@ -9,14 +9,15 @@ import io.anuke.mindustry.type.AmmoType; import io.anuke.mindustry.type.ContentType; public class AmmoTypes implements ContentList{ - public static AmmoType bulletCopper, bulletDense, bulletThorium, bulletSilicon, bulletPyratite, - bulletDenseBig, bulletPyratiteBig, bulletThoriumBig, - shock, bombExplosive, bombIncendiary, bombOil, shellCarbide, flamerThermite, weaponMissile, weaponMissileSwarm, bulletMech, - healBlaster, bulletGlaive, - flakExplosive, flakPlastic, flakSurge, - missileExplosive, missileIncindiary, missileSurge, - artilleryDense, artilleryPlastic, artilleryHoming, artilleryIncindiary, artilleryExplosive, - basicFlame, lancerLaser, lightning, spectreLaser, meltdownLaser, fuseShotgun, oil, water, lava, cryofluid, arc; + public static AmmoType + bulletCopper, bulletDense, bulletThorium, bulletSilicon, bulletPyratite, + bulletDenseBig, bulletPyratiteBig, bulletThoriumBig, + shock, bombExplosive, bombIncendiary, bombOil, shellCarbide, flamerThermite, weaponMissile, weaponMissileSwarm, bulletMech, + healBlaster, bulletGlaive, + flakExplosive, flakPlastic, flakSurge, + missileExplosive, missileIncindiary, missileSurge, + artilleryDense, artilleryPlastic, artilleryHoming, artilleryIncindiary, artilleryExplosive, unitArtillery, + basicFlame, lancerLaser, lightning, spectreLaser, meltdownLaser, fuseShotgun, oil, water, lava, cryofluid, arc; @Override public void load(){ @@ -201,6 +202,13 @@ public class AmmoTypes implements ContentList{ reloadMultiplier = 1.6f; }}; + unitArtillery = new AmmoType(Items.blastCompound, ArtilleryBullets.unit, 1){{ + shootEffect = ShootFx.shootBig2; + smokeEffect = ShootFx.shootBigSmoke2; + reloadMultiplier = 1.6f; + }}; + + //flame basicFlame = new AmmoType(Liquids.oil, TurretBullets.basicFlame, 0.3f){{ diff --git a/core/src/io/anuke/mindustry/content/Mechs.java b/core/src/io/anuke/mindustry/content/Mechs.java index d409014194..a26d6f16fd 100644 --- a/core/src/io/anuke/mindustry/content/Mechs.java +++ b/core/src/io/anuke/mindustry/content/Mechs.java @@ -107,7 +107,7 @@ public class Mechs implements ContentList{ float healAmount = 10f; float healReload = 160f; Rectangle rect = new Rectangle(); - boolean wasHeadled; + boolean wasHealed; { drillPower = 4; @@ -128,20 +128,20 @@ public class Mechs implements ContentList{ public void updateAlt(Player player){ if(player.timer.get(Player.timerAbility, healReload)){ - wasHeadled = false; + wasHealed = false; rect.setSize(healRange*2f).setCenter(player.x, player.y); Units.getNearby(player.getTeam(), rect, unit -> { if(unit.distanceTo(player) <= healRange){ if(unit.health < unit.maxHealth()){ Effects.effect(UnitFx.heal, unit); - wasHeadled = true; + wasHealed = true; } unit.healBy(healAmount); } }); - if(wasHeadled){ + if(wasHealed){ Effects.effect(UnitFx.healWave, player); } } diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index cedd512d39..6c05fe61cc 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -167,6 +167,7 @@ public class Recipes implements ContentList{ new Recipe(units, UnitBlocks.daggerFactory, new ItemStack(Items.lead, 90), new ItemStack(Items.silicon, 70)); new Recipe(units, UnitBlocks.titanFactory, new ItemStack(Items.thorium, 90), new ItemStack(Items.lead, 140), new ItemStack(Items.silicon, 90)); + new Recipe(units, UnitBlocks.fortressFactory, new ItemStack(Items.thorium, 200), new ItemStack(Items.lead, 220), new ItemStack(Items.silicon, 150), new ItemStack(Items.surgealloy, 100), new ItemStack(Items.phasematter, 50)); new Recipe(units, UnitBlocks.wraithFactory, new ItemStack(Items.titanium, 60), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 90)); new Recipe(units, UnitBlocks.ghoulFactory, new ItemStack(Items.plastanium, 80), new ItemStack(Items.titanium, 100), new ItemStack(Items.lead, 130), new ItemStack(Items.silicon, 220)); diff --git a/core/src/io/anuke/mindustry/content/UnitTypes.java b/core/src/io/anuke/mindustry/content/UnitTypes.java index 2d981f7597..2e0a85cb84 100644 --- a/core/src/io/anuke/mindustry/content/UnitTypes.java +++ b/core/src/io/anuke/mindustry/content/UnitTypes.java @@ -58,17 +58,21 @@ public class UnitTypes implements ContentList{ speed = 0.18f; drag = 0.4f; range = 10f; + rotatespeed = 0.1f; weapon = Weapons.flamethrower; health = 440; }}; fortress = new UnitType("fortress", Fortress.class, Fortress::new){{ maxVelocity = 0.8f; - speed = 0.18f; + speed = 0.15f; drag = 0.4f; range = 10f; + rotatespeed = 0.06f; + weaponOffsetX = 1; + targetAir = false; weapon = Weapons.artillery; - health = 500; + health = 800; }}; wraith = new UnitType("wraith", Wraith.class, Wraith::new){{ @@ -86,6 +90,7 @@ public class UnitTypes implements ContentList{ maxVelocity = 1.4f; drag = 0.01f; isFlying = true; + targetAir = false; weapon = Weapons.bomber; }}; diff --git a/core/src/io/anuke/mindustry/content/Weapons.java b/core/src/io/anuke/mindustry/content/Weapons.java index d599518c5a..8523dc19c5 100644 --- a/core/src/io/anuke/mindustry/content/Weapons.java +++ b/core/src/io/anuke/mindustry/content/Weapons.java @@ -124,9 +124,10 @@ public class Weapons implements ContentList{ length = 1f; reload = 60f; roundrobin = true; - recoil = 1f; + recoil = 5f; + shake = 2f; ejectEffect = ShootFx.shellEjectMedium; - ammo = AmmoTypes.artilleryExplosive; + ammo = AmmoTypes.unitArtillery; }}; sapper = new Weapon("sapper"){{ diff --git a/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java b/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java index 31e06841b8..1e9fa9015d 100644 --- a/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java @@ -11,7 +11,7 @@ public class UnitBlocks extends BlockList implements ContentList{ public static Block spiritFactory, phantomFactory, wraithFactory, ghoulFactory, revenantFactory, - daggerFactory, titanFactory, + daggerFactory, titanFactory, fortressFactory, reconstructor, repairPoint, commandCenter; @Override @@ -75,6 +75,15 @@ public class UnitBlocks extends BlockList implements ContentList{ consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 20), new ItemStack(Items.thorium, 30)}); }}; + fortressFactory = new UnitFactory("fortress-factory"){{ + type = UnitTypes.fortress; + produceTime = 5000; + size = 3; + consumes.power(0.2f); + shadow = "shadow-round-3"; + consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 40), new ItemStack(Items.thorium, 50)}); + }}; + repairPoint = new RepairPoint("repair-point"){{ shadow = "shadow-round-1"; repairSpeed = 0.1f; diff --git a/core/src/io/anuke/mindustry/content/bullets/ArtilleryBullets.java b/core/src/io/anuke/mindustry/content/bullets/ArtilleryBullets.java index 66da97127c..3634557bde 100644 --- a/core/src/io/anuke/mindustry/content/bullets/ArtilleryBullets.java +++ b/core/src/io/anuke/mindustry/content/bullets/ArtilleryBullets.java @@ -9,7 +9,7 @@ import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.game.ContentList; public class ArtilleryBullets extends BulletList implements ContentList{ - public static BulletType dense, plastic, plasticFrag, homing, incindiary, explosive, surge; + public static BulletType dense, plastic, plasticFrag, homing, incindiary, explosive, surge, unit; @Override public void load(){ @@ -99,6 +99,20 @@ public class ArtilleryBullets extends BulletList implements ContentList{ } }; + unit = new ArtilleryBulletType(2f, 0, "shell"){ + { + hiteffect = BulletFx.blastExplosion; + knockback = 0.8f; + lifetime = 90f; + bulletWidth = bulletHeight = 14f; + collides = true; + splashDamageRadius = 45f; + splashDamage = 50f; + backColor = Palette.bulletYellowBack; + frontColor = Palette.bulletYellow; + } + }; + surge = new ArtilleryBulletType(3f, 0, "shell"){ { //TODO diff --git a/core/src/io/anuke/mindustry/entities/bullet/ArtilleryBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/ArtilleryBulletType.java index 52a1594c96..e0c9af0c27 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/ArtilleryBulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/ArtilleryBulletType.java @@ -13,6 +13,7 @@ public class ArtilleryBulletType extends BasicBulletType{ super(speed, damage, bulletSprite); collidesTiles = false; collides = false; + collidesAir = false; hitShake = 1f; } diff --git a/core/src/io/anuke/mindustry/entities/bullet/BombBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/BombBulletType.java index cdca80de79..be974f91e4 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/BombBulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/BombBulletType.java @@ -12,5 +12,6 @@ public class BombBulletType extends BasicBulletType{ lifetime = 30f; drag = 0.05f; keepVelocity = false; + collidesAir = false; } } diff --git a/core/src/io/anuke/mindustry/entities/bullet/Bullet.java b/core/src/io/anuke/mindustry/entities/bullet/Bullet.java index ff288068b3..926556e473 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/Bullet.java +++ b/core/src/io/anuke/mindustry/entities/bullet/Bullet.java @@ -180,7 +180,7 @@ public class Bullet extends BulletEntity implements TeamTrait, SyncT @Override public boolean collides(SolidTrait other){ - return type.collides && super.collides(other) && !supressCollision; + return type.collides && super.collides(other) && !supressCollision && !(other instanceof Unit && ((Unit) other).isFlying() && !type.collidesAir); } @Override diff --git a/core/src/io/anuke/mindustry/entities/bullet/BulletType.java b/core/src/io/anuke/mindustry/entities/bullet/BulletType.java index 98eff2bd67..62a59ab617 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/BulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/BulletType.java @@ -37,6 +37,8 @@ public abstract class BulletType extends Content implements BaseBulletType type.targetAir || !u.isFlying()); } public TileEntity getClosestEnemyCore(){ diff --git a/core/src/io/anuke/mindustry/entities/units/GroundUnit.java b/core/src/io/anuke/mindustry/entities/units/GroundUnit.java index bce9bbc398..ae881872e6 100644 --- a/core/src/io/anuke/mindustry/entities/units/GroundUnit.java +++ b/core/src/io/anuke/mindustry/entities/units/GroundUnit.java @@ -60,13 +60,7 @@ public abstract class GroundUnit extends BaseUnit{ if(distanceTo(target) > 400f){ moveAwayFromCore(); }else{ - vec.trns(baseRotation, type.speed); - velocity.add(vec.x, vec.y); - vec.trns(baseRotation, type.hitsizeTile); - Tile tile = world.tileWorld(x + vec.x, y + vec.y); - if((tile == null || tile.solid() || tile.floor().drownTime > 0) || stuckTime > 10f){ - baseRotation += Mathf.sign(id % 2 - 0.5f) * Timers.delta() * 3f; - } + patrol(); } } } @@ -128,7 +122,11 @@ public abstract class GroundUnit extends BaseUnit{ stuckTime = !vec.set(x, y).sub(lastPosition().x, lastPosition().y).isZero(0.0001f) ? 0f : stuckTime + Timers.delta(); if(!velocity.isZero(0.0001f) && (Units.invalidateTarget(target, this) || (distanceTo(target) > getWeapon().getAmmo().getRange()))){ - rotation = Mathf.slerpDelta(rotation, velocity.angle(), 0.2f); + rotation = Mathf.slerpDelta(rotation, velocity.angle(), type.rotatespeed); + } + + if(stuckTime < 1f){ + walkTime += Timers.delta(); } } @@ -145,9 +143,7 @@ public abstract class GroundUnit extends BaseUnit{ public void draw(){ Draw.alpha(hitTime / hitDuration); - float walktime = walkTime; - - float ft = Mathf.sin(walktime, 6f, 2f); + float ft = Mathf.sin(walkTime * type.speed*5f, 6f, 2f); Floor floor = getFloorOn(); @@ -241,6 +237,16 @@ public abstract class GroundUnit extends BaseUnit{ super.readSave(stream); } + protected void patrol(){ + vec.trns(baseRotation, type.speed); + velocity.add(vec.x, vec.y); + vec.trns(baseRotation, type.hitsizeTile); + Tile tile = world.tileWorld(x + vec.x, y + vec.y); + if((tile == null || tile.solid() || tile.floor().drownTime > 0) || stuckTime > 10f){ + baseRotation += Mathf.sign(id % 2 - 0.5f) * Timers.delta() * 3f; + } + } + protected void circle(float circleLength){ if(target == null) return; @@ -265,7 +271,6 @@ public abstract class GroundUnit extends BaseUnit{ vec.trns(baseRotation, type.speed); baseRotation = Mathf.slerpDelta(baseRotation, angleTo(targetTile), 0.05f); - walkTime += Timers.delta(); velocity.add(vec); } @@ -290,7 +295,6 @@ public abstract class GroundUnit extends BaseUnit{ vec.trns(baseRotation, type.speed); baseRotation = Mathf.slerpDelta(baseRotation, angleTo(targetTile), 0.05f); - walkTime += Timers.delta(); velocity.add(vec); } } diff --git a/core/src/io/anuke/mindustry/entities/units/UnitType.java b/core/src/io/anuke/mindustry/entities/units/UnitType.java index fb22a63e0e..9703c1759f 100644 --- a/core/src/io/anuke/mindustry/entities/units/UnitType.java +++ b/core/src/io/anuke/mindustry/entities/units/UnitType.java @@ -30,10 +30,11 @@ public class UnitType extends UnlockableContent{ public float hitsizeTile = 4f; public float speed = 0.4f; public float range = 160; - public float rotatespeed = 0.1f; + public float rotatespeed = 0.2f; public float baseRotateSpeed = 0.1f; public float mass = 1f; public boolean isFlying; + public boolean targetAir = true; public float drag = 0.1f; public float maxVelocity = 5f; public float retreatPercent = 0.2f; diff --git a/core/src/io/anuke/mindustry/entities/units/types/Fortress.java b/core/src/io/anuke/mindustry/entities/units/types/Fortress.java index 8730c16ee5..c39e356586 100644 --- a/core/src/io/anuke/mindustry/entities/units/types/Fortress.java +++ b/core/src/io/anuke/mindustry/entities/units/types/Fortress.java @@ -1,6 +1,21 @@ package io.anuke.mindustry.entities.units.types; +import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.entities.units.GroundUnit; public class Fortress extends GroundUnit{ + + @Override + protected void patrol(){ + if(Units.invalidateTarget(target, this)){ + super.patrol(); + } + } + + @Override + protected void moveToCore(){ + if(Units.invalidateTarget(target, this)){ + super.moveToCore(); + } + } } diff --git a/packer/src/io/anuke/mindustry/BundleLauncher.java b/packer/src/io/anuke/mindustry/BundleLauncher.java index e9965588bc..5cfe5bf6e6 100644 --- a/packer/src/io/anuke/mindustry/BundleLauncher.java +++ b/packer/src/io/anuke/mindustry/BundleLauncher.java @@ -63,7 +63,6 @@ public class BundleLauncher { result.append("\n"); } Files.write(child, result.toString().getBytes()); - //PropertiesUtils.store(other, Files.newBufferedWriter(output), null); }catch (IOException e){ throw new RuntimeException(e); @@ -71,4 +70,4 @@ public class BundleLauncher { }); } -} +} \ No newline at end of file