diff --git a/core/assets-raw/sprites/blocks/mechs/dart-ship-factory.png b/core/assets-raw/sprites/blocks/mechs/dart-ship-pad.png similarity index 100% rename from core/assets-raw/sprites/blocks/mechs/dart-ship-factory.png rename to core/assets-raw/sprites/blocks/mechs/dart-ship-pad.png diff --git a/core/assets-raw/sprites/blocks/mechs/delta-mech-factory.png b/core/assets-raw/sprites/blocks/mechs/delta-mech-pad.png similarity index 100% rename from core/assets-raw/sprites/blocks/mechs/delta-mech-factory.png rename to core/assets-raw/sprites/blocks/mechs/delta-mech-pad.png diff --git a/core/assets-raw/sprites/blocks/mechs/glaive-ship-factory.png b/core/assets-raw/sprites/blocks/mechs/glaive-ship-pad.png similarity index 100% rename from core/assets-raw/sprites/blocks/mechs/glaive-ship-factory.png rename to core/assets-raw/sprites/blocks/mechs/glaive-ship-pad.png diff --git a/core/assets-raw/sprites/blocks/mechs/javelin-ship-factory.png b/core/assets-raw/sprites/blocks/mechs/javelin-ship-pad.png similarity index 100% rename from core/assets-raw/sprites/blocks/mechs/javelin-ship-factory.png rename to core/assets-raw/sprites/blocks/mechs/javelin-ship-pad.png diff --git a/core/assets-raw/sprites/blocks/mechs/omega-mech-factory.png b/core/assets-raw/sprites/blocks/mechs/omega-mech-pad.png similarity index 100% rename from core/assets-raw/sprites/blocks/mechs/omega-mech-factory.png rename to core/assets-raw/sprites/blocks/mechs/omega-mech-pad.png diff --git a/core/assets-raw/sprites/blocks/mechs/tau-mech-factory.png b/core/assets-raw/sprites/blocks/mechs/tau-mech-pad.png similarity index 100% rename from core/assets-raw/sprites/blocks/mechs/tau-mech-factory.png rename to core/assets-raw/sprites/blocks/mechs/tau-mech-pad.png diff --git a/core/assets-raw/sprites/blocks/mechs/trident-ship-factory.png b/core/assets-raw/sprites/blocks/mechs/trident-ship-pad.png similarity index 100% rename from core/assets-raw/sprites/blocks/mechs/trident-ship-factory.png rename to core/assets-raw/sprites/blocks/mechs/trident-ship-pad.png diff --git a/core/assets-raw/sprites/blocks/units/dagger-pad-top-open.png b/core/assets-raw/sprites/blocks/units/dagger-factory-top-open.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/dagger-pad-top-open.png rename to core/assets-raw/sprites/blocks/units/dagger-factory-top-open.png diff --git a/core/assets-raw/sprites/blocks/units/dagger-pad-top.png b/core/assets-raw/sprites/blocks/units/dagger-factory-top.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/dagger-pad-top.png rename to core/assets-raw/sprites/blocks/units/dagger-factory-top.png diff --git a/core/assets-raw/sprites/blocks/units/dagger-pad.png b/core/assets-raw/sprites/blocks/units/dagger-factory.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/dagger-pad.png rename to core/assets-raw/sprites/blocks/units/dagger-factory.png diff --git a/core/assets-raw/sprites/blocks/units/fortress-pad-top-open.png b/core/assets-raw/sprites/blocks/units/fortress-factory-top-open.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/fortress-pad-top-open.png rename to core/assets-raw/sprites/blocks/units/fortress-factory-top-open.png diff --git a/core/assets-raw/sprites/blocks/units/fortress-pad-top.png b/core/assets-raw/sprites/blocks/units/fortress-factory-top.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/fortress-pad-top.png rename to core/assets-raw/sprites/blocks/units/fortress-factory-top.png diff --git a/core/assets-raw/sprites/blocks/units/fortress-pad.png b/core/assets-raw/sprites/blocks/units/fortress-factory.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/fortress-pad.png rename to core/assets-raw/sprites/blocks/units/fortress-factory.png diff --git a/core/assets-raw/sprites/blocks/units/monsoon-pad-top-open.png b/core/assets-raw/sprites/blocks/units/ghoul-factory-top-open.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/monsoon-pad-top-open.png rename to core/assets-raw/sprites/blocks/units/ghoul-factory-top-open.png diff --git a/core/assets-raw/sprites/blocks/units/monsoon-pad-top.png b/core/assets-raw/sprites/blocks/units/ghoul-factory-top.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/monsoon-pad-top.png rename to core/assets-raw/sprites/blocks/units/ghoul-factory-top.png diff --git a/core/assets-raw/sprites/blocks/units/monsoon-pad.png b/core/assets-raw/sprites/blocks/units/ghoul-factory.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/monsoon-pad.png rename to core/assets-raw/sprites/blocks/units/ghoul-factory.png diff --git a/core/assets-raw/sprites/blocks/units/fabricator-pad-top-open.png b/core/assets-raw/sprites/blocks/units/phantom-factory-top-open.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/fabricator-pad-top-open.png rename to core/assets-raw/sprites/blocks/units/phantom-factory-top-open.png diff --git a/core/assets-raw/sprites/blocks/units/fabricator-pad-top.png b/core/assets-raw/sprites/blocks/units/phantom-factory-top.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/fabricator-pad-top.png rename to core/assets-raw/sprites/blocks/units/phantom-factory-top.png diff --git a/core/assets-raw/sprites/blocks/units/drone-pad.png b/core/assets-raw/sprites/blocks/units/phantom-factory.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/drone-pad.png rename to core/assets-raw/sprites/blocks/units/phantom-factory.png diff --git a/core/assets-raw/sprites/blocks/units/titan-pad-top-open.png b/core/assets-raw/sprites/blocks/units/revenant-factory-top-open.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/titan-pad-top-open.png rename to core/assets-raw/sprites/blocks/units/revenant-factory-top-open.png diff --git a/core/assets-raw/sprites/blocks/units/titan-pad-top.png b/core/assets-raw/sprites/blocks/units/revenant-factory-top.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/titan-pad-top.png rename to core/assets-raw/sprites/blocks/units/revenant-factory-top.png diff --git a/core/assets-raw/sprites/blocks/units/titan-pad.png b/core/assets-raw/sprites/blocks/units/revenant-factory.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/titan-pad.png rename to core/assets-raw/sprites/blocks/units/revenant-factory.png diff --git a/core/assets-raw/sprites/blocks/units/drone-pad-top-open.png b/core/assets-raw/sprites/blocks/units/spirit-factory-top-open.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/drone-pad-top-open.png rename to core/assets-raw/sprites/blocks/units/spirit-factory-top-open.png diff --git a/core/assets-raw/sprites/blocks/units/drone-pad-top.png b/core/assets-raw/sprites/blocks/units/spirit-factory-top.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/drone-pad-top.png rename to core/assets-raw/sprites/blocks/units/spirit-factory-top.png diff --git a/core/assets-raw/sprites/blocks/units/fabricator-pad.png b/core/assets-raw/sprites/blocks/units/spirit-factory.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/fabricator-pad.png rename to core/assets-raw/sprites/blocks/units/spirit-factory.png diff --git a/core/assets-raw/sprites/blocks/units/titan-factory-top-open.png b/core/assets-raw/sprites/blocks/units/titan-factory-top-open.png new file mode 100644 index 0000000000..f47586f6b6 Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/titan-factory-top-open.png differ diff --git a/core/assets-raw/sprites/blocks/units/titan-factory-top.png b/core/assets-raw/sprites/blocks/units/titan-factory-top.png new file mode 100644 index 0000000000..edbff201e8 Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/titan-factory-top.png differ diff --git a/core/assets-raw/sprites/blocks/units/titan-factory.png b/core/assets-raw/sprites/blocks/units/titan-factory.png new file mode 100644 index 0000000000..f798cd6418 Binary files /dev/null and b/core/assets-raw/sprites/blocks/units/titan-factory.png differ diff --git a/core/assets-raw/sprites/blocks/units/interceptor-pad-top-open.png b/core/assets-raw/sprites/blocks/units/wraith-factory-top-open.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/interceptor-pad-top-open.png rename to core/assets-raw/sprites/blocks/units/wraith-factory-top-open.png diff --git a/core/assets-raw/sprites/blocks/units/interceptor-pad-top.png b/core/assets-raw/sprites/blocks/units/wraith-factory-top.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/interceptor-pad-top.png rename to core/assets-raw/sprites/blocks/units/wraith-factory-top.png diff --git a/core/assets-raw/sprites/blocks/units/interceptor-pad.png b/core/assets-raw/sprites/blocks/units/wraith-factory.png similarity index 100% rename from core/assets-raw/sprites/blocks/units/interceptor-pad.png rename to core/assets-raw/sprites/blocks/units/wraith-factory.png diff --git a/core/assets-raw/sprites/units/monsoon.png b/core/assets-raw/sprites/units/ghoul.png similarity index 100% rename from core/assets-raw/sprites/units/monsoon.png rename to core/assets-raw/sprites/units/ghoul.png diff --git a/core/assets-raw/sprites/units/fabricator.png b/core/assets-raw/sprites/units/phantom.png similarity index 100% rename from core/assets-raw/sprites/units/fabricator.png rename to core/assets-raw/sprites/units/phantom.png diff --git a/core/assets-raw/sprites/units/revenant.png b/core/assets-raw/sprites/units/revenant.png index cbdbe065a1..8d49d55ddc 100644 Binary files a/core/assets-raw/sprites/units/revenant.png and b/core/assets-raw/sprites/units/revenant.png differ diff --git a/core/assets-raw/sprites/units/drone.png b/core/assets-raw/sprites/units/spirit.png similarity index 100% rename from core/assets-raw/sprites/units/drone.png rename to core/assets-raw/sprites/units/spirit.png diff --git a/core/assets-raw/sprites/units/interceptor.png b/core/assets-raw/sprites/units/wraith.png similarity index 100% rename from core/assets-raw/sprites/units/interceptor.png rename to core/assets-raw/sprites/units/wraith.png diff --git a/core/assets-raw/sprites/weapons/artillery-equip.png b/core/assets-raw/sprites/weapons/artillery-equip.png new file mode 100644 index 0000000000..a761a92a9d Binary files /dev/null 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 97d7dc6439..5d92c9a0c6 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -561,13 +561,13 @@ block.pneumatic-drill.name=Pneumatic Drill block.laser-drill.name=Laser Drill block.water-extractor.name=Water Extractor block.cultivator.name=Cultivator -block.dart-ship-factory.name=Dart Ship Reconstructor -block.delta-mech-factory.name=Delta Mech Reconstructor -block.javelin-ship-factory.name=Javelin Ship Reconstructor -block.trident-ship-factory.name=Trident Ship Reconstructor -block.glaive-ship-factory.name=Glaive Ship Reconstructor -block.omega-mech-factory.name=Omega Mech Reconstructor -block.tau-mech-factory.name=Tau Mech Reconstructor +block.dart-ship-pad.name=Dart Ship Pad +block.delta-mech-pad.name=Delta Mech Pad +block.javelin-ship-pad.name=Javelin Ship Pad +block.trident-ship-pad.name=Trident Ship Pad +block.glaive-ship-pad.name=Glaive Ship Pad +block.omega-mech-pad.name=Omega Mech Pad +block.tau-mech-pad.name=Tau Mech Pad block.repairpoint.name=Repair Point block.resupplypoint.name=Resupply Point block.conduit.name=Conduit @@ -598,10 +598,12 @@ block.solidifer.name=Solidifer block.solar-panel.name=Solar Panel block.solar-panel-large.name=Large Solar Panel block.oil-extractor.name=Oil Extractor -block.drone-pad.name=Drone Pad -block.fabricator-pad.name=Fabricator Pad -block.interceptor-pad.name=Interceptor Pad -block.monsoon-pad.name=Monsoon Pad +block.spirit-factory.name=Spirit Drone Pad +block.phantom-factory.name=Phantom Drone Pad +block.wraith-factory.name=Wraith Fighter Pad +block.ghoul-factory.name=Ghoul Bomber Pad +block.dagger-factory.name=Dagger Pad +block.titan-factory.name=Titan Pad block.repair-point.name=Repair Point block.resupply-point.name=Resupply Point block.pulse-conduit.name=Pulse Conduit @@ -616,8 +618,6 @@ block.command-center.name=Command Center block.mass-driver.name=Mass Driver block.blast-drill.name=Blast Drill block.thermal-pump.name=Thermal Pump -block.dagger-pad.name=Dagger Pad -block.titan-pad.name=Titan Pad block.thermal-generator.name=Thermal Generator block.alloy-smelter.name=Alloy Smelter block.mend-projector.name=Mend Projector @@ -634,15 +634,19 @@ block.spectre.name=Spectre block.meltdown.name=Meltdown unit.alpha-drone.name=Alpha Drone -unit.drone.name=Drone -unit.drone.description=The starter drone unit. Spawns in the core by default. Automatically mines ores, collects items and repairs blocks. -unit.fabricator.name=Fabricator -unit.fabricator.description=An advanced drone unit. Automatically mines ores, collects items and repairs blocks. Significantly more effective than a drone. +unit.spirit.name=Spirit Drone +unit.spirit.description=The starter drone unit. Spawns in the core by default. Automatically mines ores, collects items and repairs blocks. +unit.phantom.name=Phantom Drone +unit.phantom.description=An advanced drone unit. Automatically mines ores, collects items and repairs blocks. Significantly more effective than a drone. unit.dagger.name=Dagger unit.dagger.description=A basic ground unit. Useful in swarms. unit.titan.name=Titan unit.titan.description=An advanced, armored ground unit. Attacks both ground and air targets. -unit.monsoon.name=Monsoon -unit.monsoon.description=A heavy carpet bomber. Uses blast compound or pyratite as ammo. -unit.interceptor.name=Interceptor -unit.interceptor.description=A fast, hit-and-run strike unit. \ No newline at end of file +unit.ghoul.name=Ghoul Bomber +unit.ghoul.description=A heavy carpet bomber. Uses blast compound or pyratite as ammo. +unit.wraith.name=Wraith Fighter +unit.wraith.description=A fast, hit-and-run interceptor unit. +unit.fortress.name=Fortress +unit.fortress.description=A heavy artillery ground unit. +unit.revenant.name=Revenant +unit.revenant.description=A heavy laser platform. \ No newline at end of file diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas index a8b2f50199..58263d9147 100644 --- a/core/assets/sprites/sprites.atlas +++ b/core/assets/sprites/sprites.atlas @@ -6,441 +6,441 @@ filter: Nearest,Nearest repeat: none force-projector-top rotate: false - xy: 395, 362 + xy: 113, 166 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mend-projector-top rotate: false - xy: 89, 7 + xy: 283, 168 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 overdrive-projector-top rotate: false - xy: 120, 22 + xy: 301, 159 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 bridge-conveyor-arrow rotate: false - xy: 375, 222 + xy: 165, 42 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-bridge rotate: false - xy: 395, 222 + xy: 175, 52 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor-end rotate: false - xy: 405, 226 + xy: 165, 32 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-1 rotate: false - xy: 193, 28 + xy: 593, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-2 rotate: false - xy: 201, 2 + xy: 603, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-3 rotate: false - xy: 451, 225 + xy: 613, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-0 rotate: false - xy: 461, 225 + xy: 603, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-1 rotate: false - xy: 465, 235 + xy: 613, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-2 rotate: false - xy: 475, 235 + xy: 623, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-1-3 rotate: false - xy: 471, 225 + xy: 623, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-0 rotate: false - xy: 485, 235 + xy: 633, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-1 rotate: false - xy: 481, 225 + xy: 633, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-2 rotate: false - xy: 491, 225 + xy: 645, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-2-3 rotate: false - xy: 589, 395 + xy: 643, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-0 rotate: false - xy: 599, 395 + xy: 643, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-1 rotate: false - xy: 609, 395 + xy: 367, 250 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-2 rotate: false - xy: 619, 395 + xy: 377, 250 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-3-3 rotate: false - xy: 629, 397 + xy: 387, 252 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-0 rotate: false - xy: 639, 397 + xy: 397, 254 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-1 rotate: false - xy: 649, 397 + xy: 186, 84 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-2 rotate: false - xy: 659, 397 + xy: 185, 74 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-4-3 rotate: false - xy: 669, 397 + xy: 185, 64 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-1 rotate: false - xy: 515, 215 + xy: 653, 335 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-2 rotate: false - xy: 515, 205 + xy: 653, 325 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-3 rotate: false - xy: 515, 195 + xy: 653, 315 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-0 rotate: false - xy: 360, 216 + xy: 653, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-1 rotate: false - xy: 359, 206 + xy: 614, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-2 rotate: false - xy: 359, 196 + xy: 614, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-1-3 rotate: false - xy: 359, 186 + xy: 624, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-0 rotate: false - xy: 357, 176 + xy: 624, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-1 rotate: false - xy: 357, 166 + xy: 634, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-2 rotate: false - xy: 357, 156 + xy: 634, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-2-3 rotate: false - xy: 357, 146 + xy: 644, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-0 rotate: false - xy: 357, 136 + xy: 644, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-1 rotate: false - xy: 367, 176 + xy: 654, 295 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-2 rotate: false - xy: 367, 166 + xy: 654, 285 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-3-3 rotate: false - xy: 367, 156 + xy: 1011, 439 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-0 rotate: false - xy: 367, 146 + xy: 1009, 429 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-1 rotate: false - xy: 367, 136 + xy: 1009, 419 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-2 rotate: false - xy: 213, 9 + xy: 397, 234 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-4-3 rotate: false - xy: 223, 9 + xy: 226, 75 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mass-driver-turret rotate: false - xy: 292, 320 + xy: 338, 326 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-conveyor-arrow rotate: false - xy: 233, 69 + xy: 919, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-bridge rotate: false - xy: 223, 49 + xy: 919, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor-end rotate: false - xy: 233, 59 + xy: 929, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 warp-gate-top rotate: false - xy: 421, 370 + xy: 421, 344 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blast-drill rotate: false - xy: 621, 453 + xy: 651, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blast-drill-rim rotate: false - xy: 647, 453 + xy: 677, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blast-drill-rotator rotate: false - xy: 673, 453 + xy: 703, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 blast-drill-top rotate: false - xy: 699, 453 + xy: 729, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 laser-drill rotate: false - xy: 105, 76 + xy: 247, 191 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-rotator rotate: false - xy: 105, 58 + xy: 265, 192 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 laser-drill-top rotate: false - xy: 123, 76 + xy: 283, 186 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mechanical-drill rotate: false - xy: 123, 58 + xy: 301, 195 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mechanical-drill-rotator rotate: false - xy: 105, 40 + xy: 301, 177 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mechanical-drill-top rotate: false - xy: 123, 40 + xy: 265, 174 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 oil-extractor rotate: false - xy: 338, 326 + xy: 364, 326 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oil-extractor-liquid rotate: false - xy: 364, 326 + xy: 310, 290 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oil-extractor-rotator rotate: false - xy: 310, 290 + xy: 395, 336 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 oil-extractor-top rotate: false - xy: 395, 336 + xy: 338, 300 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -475,672 +475,672 @@ plasma-drill-top index: -1 pneumatic-drill rotate: false - xy: 157, 212 + xy: 301, 141 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pneumatic-drill-rotator rotate: false - xy: 157, 194 + xy: 211, 149 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pneumatic-drill-top rotate: false - xy: 175, 212 + xy: 229, 155 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor rotate: false - xy: 247, 191 + xy: 265, 120 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-liquid rotate: false - xy: 265, 192 + xy: 283, 114 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-rotator rotate: false - xy: 283, 186 + xy: 301, 105 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 water-extractor-top rotate: false - xy: 301, 195 + xy: 485, 363 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blackrock1 rotate: false - xy: 335, 152 + xy: 1015, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-blackrock rotate: false - xy: 335, 152 + xy: 1015, 449 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackrockshadow1 rotate: false - xy: 335, 142 + xy: 328, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone1 rotate: false - xy: 589, 405 + xy: 367, 260 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-blackstone rotate: false - xy: 589, 405 + xy: 367, 260 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone2 rotate: false - xy: 599, 405 + xy: 331, 212 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone3 rotate: false - xy: 609, 405 + xy: 343, 225 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstoneedge rotate: false - xy: 367, 252 + xy: 530, 281 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 coal1 rotate: false - xy: 415, 226 + xy: 175, 42 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal2 rotate: false - xy: 385, 214 + xy: 165, 22 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 coal3 rotate: false - xy: 395, 212 + xy: 175, 32 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper1 rotate: false - xy: 679, 397 + xy: 185, 54 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper2 rotate: false - xy: 689, 397 + xy: 185, 44 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper3 rotate: false - xy: 699, 397 + xy: 185, 34 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt2 rotate: false - xy: 769, 397 + xy: 195, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt3 rotate: false - xy: 779, 397 + xy: 205, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirtedge rotate: false - xy: 151, 2 + xy: 144, 104 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 generic-cliff-edge rotate: false - xy: 859, 397 + xy: 195, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge rotate: false - xy: 859, 397 + xy: 195, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-1 rotate: false - xy: 869, 397 + xy: 205, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-1 rotate: false - xy: 869, 397 + xy: 205, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-edge-2 rotate: false - xy: 879, 397 + xy: 163, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-edge-2 rotate: false - xy: 879, 397 + xy: 163, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 generic-cliff-side rotate: false - xy: 889, 397 + xy: 173, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice-cliff-side rotate: false - xy: 889, 397 + xy: 173, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge rotate: false - xy: 919, 397 + xy: 203, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-1 rotate: false - xy: 929, 397 + xy: 213, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-edge-2 rotate: false - xy: 939, 397 + xy: 226, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass-cliff-side rotate: false - xy: 949, 397 + xy: 236, 127 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass2 rotate: false - xy: 899, 397 + xy: 183, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass3 rotate: false - xy: 909, 397 + xy: 193, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grassedge rotate: false - xy: 451, 331 + xy: 158, 134 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 ice2 rotate: false - xy: 969, 397 + xy: 230, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice3 rotate: false - xy: 979, 397 + xy: 240, 117 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 iceedge rotate: false - xy: 450, 303 + xy: 158, 120 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 icerock2 rotate: false - xy: 989, 397 + xy: 250, 117 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow1 rotate: false - xy: 999, 397 + xy: 366, 240 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow1 rotate: false - xy: 999, 397 + xy: 366, 240 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerockshadow2 rotate: false - xy: 485, 395 + xy: 376, 240 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rockshadow2 rotate: false - xy: 485, 395 + xy: 376, 240 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lavaedge rotate: false - xy: 465, 331 + xy: 172, 120 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 lead1 rotate: false - xy: 425, 198 + xy: 635, 375 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead2 rotate: false - xy: 435, 218 + xy: 635, 365 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lead3 rotate: false - xy: 435, 208 + xy: 645, 375 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor2 rotate: false - xy: 475, 205 + xy: 623, 335 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor3 rotate: false - xy: 485, 215 + xy: 633, 345 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor4 rotate: false - xy: 485, 205 + xy: 643, 355 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor5 rotate: false - xy: 495, 215 + xy: 613, 315 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor6 rotate: false - xy: 495, 205 + xy: 623, 325 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalflooredge rotate: false - xy: 464, 275 + xy: 172, 92 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 oiledge rotate: false - xy: 464, 261 + xy: 141, 76 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 rock2 rotate: false - xy: 243, 39 + xy: 989, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand2 rotate: false - xy: 243, 19 + xy: 999, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand3 rotate: false - xy: 252, 148 + xy: 387, 242 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sandedge rotate: false - xy: 411, 264 + xy: 141, 62 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 shrubshadow rotate: false - xy: 272, 136 + xy: 215, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow2 rotate: false - xy: 272, 126 + xy: 215, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow3 rotate: false - xy: 272, 116 + xy: 215, 11 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snowedge rotate: false - xy: 383, 254 + xy: 141, 34 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 spaceedge rotate: false - xy: 411, 250 + xy: 141, 20 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 stone-cliff-edge rotate: false - xy: 498, 315 + xy: 290, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-1 rotate: false - xy: 498, 305 + xy: 280, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-edge-2 rotate: false - xy: 498, 295 + xy: 290, 94 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone-cliff-side rotate: false - xy: 498, 285 + xy: 300, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone2 rotate: false - xy: 292, 109 + xy: 270, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone3 rotate: false - xy: 292, 99 + xy: 280, 104 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stoneedge rotate: false - xy: 397, 242 + xy: 186, 146 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 thorium1 rotate: false - xy: 498, 275 + xy: 653, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium2 rotate: false - xy: 498, 265 + xy: 653, 385 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium3 rotate: false - xy: 499, 255 + xy: 655, 375 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium1 rotate: false - xy: 499, 245 + xy: 655, 365 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium2 rotate: false - xy: 505, 235 + xy: 653, 355 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium3 rotate: false - xy: 511, 225 + xy: 653, 345 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge rotate: false - xy: 243, 9 + xy: 225, 55 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-1 rotate: false - xy: 253, 98 + xy: 225, 45 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-edge-2 rotate: false - xy: 253, 88 + xy: 225, 35 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water-cliff-side rotate: false - xy: 253, 78 + xy: 225, 25 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 wateredge rotate: false - xy: 453, 247 + xy: 200, 121 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 block-border rotate: false - xy: 681, 407 + xy: 331, 142 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-elevation rotate: false - xy: 691, 407 + xy: 331, 132 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator-top rotate: false - xy: 691, 407 + xy: 331, 132 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-middle rotate: false - xy: 385, 244 + xy: 165, 72 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pump-liquid rotate: false - xy: 385, 244 + xy: 165, 72 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-slope rotate: false - xy: 365, 230 + xy: 175, 82 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 border rotate: false - xy: 375, 232 + xy: 165, 62 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-liquid rotate: false - xy: 192, 108 + xy: 341, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-1 rotate: false - xy: 709, 397 + xy: 185, 24 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cross-2 rotate: false - xy: 595, 415 + xy: 541, 413 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cross-3 rotate: false - xy: 343, 352 + xy: 369, 352 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -1154,7 +1154,7 @@ cross-4 index: -1 enemyspawn rotate: false - xy: 849, 397 + xy: 205, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1168,84 +1168,84 @@ nuclearreactor-shadow index: -1 place-arrow rotate: false - xy: 223, 39 + xy: 929, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 playerspawn rotate: false - xy: 233, 49 + xy: 939, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ripples rotate: false - xy: 311, 148 + xy: 331, 234 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 rubble-1-0 rotate: false - xy: 175, 194 + xy: 265, 138 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-1-1 rotate: false - xy: 175, 176 + xy: 283, 132 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-0 rotate: false - xy: 193, 196 + xy: 301, 123 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-2-1 rotate: false - xy: 193, 178 + xy: 485, 381 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rubble-3-0 rotate: false - xy: 390, 310 + xy: 421, 422 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 rubble-3-1 rotate: false - xy: 390, 310 + xy: 421, 422 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 shadow-1 rotate: false - xy: 323, 148 + xy: 343, 246 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-2 rotate: false - xy: 421, 350 + xy: 447, 433 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 shadow-3 rotate: false - xy: 565, 451 + xy: 595, 451 size: 26, 26 orig: 26, 26 offset: 0, 0 @@ -1273,294 +1273,294 @@ shadow-6 index: -1 shadow-corner rotate: false - xy: 345, 141 + xy: 355, 258 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-round-1 rotate: false - xy: 577, 403 + xy: 331, 222 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 shadow-round-2 rotate: false - xy: 447, 433 + xy: 447, 413 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 shadow-round-3 rotate: false - xy: 593, 451 + xy: 623, 451 size: 26, 26 orig: 26, 26 offset: 0, 0 index: -1 shadow-rounded-2 rotate: false - xy: 447, 413 + xy: 467, 433 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 shadow-shock-mine rotate: false - xy: 262, 108 + xy: 215, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-arrow rotate: false - xy: 385, 234 + xy: 175, 72 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-bridge rotate: false - xy: 395, 232 + xy: 165, 52 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit-end rotate: false - xy: 385, 224 + xy: 175, 62 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom rotate: false - xy: 415, 206 + xy: 341, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-0 rotate: false - xy: 425, 208 + xy: 341, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-1 rotate: false - xy: 193, 168 + xy: 341, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-2 rotate: false - xy: 192, 158 + xy: 341, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-3 rotate: false - xy: 192, 148 + xy: 341, 145 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-4 rotate: false - xy: 192, 138 + xy: 341, 135 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-5 rotate: false - xy: 192, 128 + xy: 341, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-bottom-6 rotate: false - xy: 192, 118 + xy: 341, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-0 rotate: false - xy: 192, 98 + xy: 341, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-1 rotate: false - xy: 193, 88 + xy: 595, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-2 rotate: false - xy: 193, 78 + xy: 605, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-3 rotate: false - xy: 193, 68 + xy: 615, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-4 rotate: false - xy: 193, 58 + xy: 625, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-5 rotate: false - xy: 193, 48 + xy: 635, 405 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conduit-top-6 rotate: false - xy: 193, 38 + xy: 593, 395 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-bottom rotate: false - xy: 465, 215 + xy: 623, 345 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-liquid rotate: false - xy: 465, 205 + xy: 633, 355 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-router-top rotate: false - xy: 475, 215 + xy: 613, 325 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-tank-bottom rotate: false - xy: 266, 346 + xy: 266, 320 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-tank-liquid rotate: false - xy: 292, 346 + xy: 292, 320 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 liquid-tank-top rotate: false - xy: 266, 320 + xy: 284, 294 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 phase-conduit-arrow rotate: false - xy: 223, 69 + xy: 899, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-bridge rotate: false - xy: 233, 79 + xy: 909, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit-end rotate: false - xy: 223, 59 + xy: 909, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-0 rotate: false - xy: 223, 29 + xy: 939, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-1 rotate: false - xy: 233, 39 + xy: 949, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-2 rotate: false - xy: 223, 19 + xy: 949, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-3 rotate: false - xy: 233, 29 + xy: 959, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-4 rotate: false - xy: 233, 19 + xy: 959, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-5 rotate: false - xy: 243, 89 + xy: 969, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulse-conduit-top-6 rotate: false - xy: 243, 79 + xy: 969, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 battery rotate: false - xy: 289, 150 + xy: 1015, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-battery rotate: false - xy: 289, 150 + xy: 1015, 459 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1637,28 +1637,28 @@ fusion-reactor-top index: -1 rtg-generator-top rotate: false - xy: 243, 29 + xy: 999, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium-reactor-center rotate: false - xy: 390, 284 + xy: 421, 396 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-reactor-lights rotate: false - xy: 421, 422 + xy: 421, 370 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 turbine-generator-top rotate: false - xy: 265, 210 + xy: 575, 377 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1686,238 +1686,238 @@ block-icon-alloy-smelter index: -1 alloy-smelter-top rotate: false - xy: 447, 395 + xy: 467, 415 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 arc-smelter rotate: false - xy: 467, 415 + xy: 447, 375 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-arc-smelter rotate: false - xy: 467, 415 + xy: 447, 375 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 arc-smelter-top rotate: false - xy: 447, 377 + xy: 467, 397 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter-top rotate: false - xy: 447, 377 + xy: 467, 397 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor rotate: false - xy: 265, 282 + xy: 447, 357 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame0 rotate: false - xy: 265, 264 + xy: 265, 282 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame1 rotate: false - xy: 265, 246 + xy: 265, 264 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-frame2 rotate: false - xy: 283, 276 + xy: 265, 246 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-liquid rotate: false - xy: 283, 258 + xy: 283, 276 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 biomattercompressor-top rotate: false - xy: 310, 272 + xy: 283, 258 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 blast-mixer rotate: false - xy: 421, 332 + xy: 310, 272 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-blast-mixer rotate: false - xy: 421, 332 + xy: 310, 272 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 centrifuge-liquid rotate: false - xy: 577, 415 + xy: 505, 413 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-bottom rotate: false - xy: 613, 433 + xy: 559, 413 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-liquid rotate: false - xy: 613, 415 + xy: 577, 413 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cryofluidmixer-top rotate: false - xy: 631, 435 + xy: 595, 415 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator rotate: false - xy: 649, 435 + xy: 613, 415 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-middle rotate: false - xy: 631, 417 + xy: 631, 415 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cultivator-top rotate: false - xy: 667, 435 + xy: 503, 395 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lavasmelter rotate: false - xy: 349, 186 + xy: 625, 365 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oilrefinery rotate: false - xy: 505, 195 + xy: 643, 325 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-weaver rotate: false - xy: 119, 4 + xy: 247, 173 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-bottom rotate: false - xy: 139, 210 + xy: 193, 160 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-weaver-weave rotate: false - xy: 139, 192 + xy: 265, 156 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plastanium-compressor-top rotate: false - xy: 139, 174 + xy: 283, 150 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pulverizer rotate: false - xy: 243, 69 + xy: 979, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 pulverizer-rotator rotate: false - xy: 243, 59 + xy: 979, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator-liquid rotate: false - xy: 262, 118 + xy: 215, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 core-open rotate: false - xy: 369, 378 + xy: 395, 388 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 core-top rotate: false - xy: 395, 388 + xy: 343, 352 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 sortedunloader rotate: false - xy: 282, 110 + xy: 228, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1 rotate: false - xy: 661, 407 + xy: 331, 162 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-1-top rotate: false - xy: 671, 407 + xy: 331, 152 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -1938,14 +1938,14 @@ block-2-top index: -1 block-3 rotate: false - xy: 725, 453 + xy: 755, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-3-top rotate: false - xy: 751, 453 + xy: 781, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -1973,35 +1973,35 @@ arc index: -1 arc-heat rotate: false - xy: 289, 160 + xy: 1015, 469 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 cyclone rotate: false - xy: 369, 352 + xy: 395, 362 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 duo rotate: false - xy: 839, 397 + xy: 195, 21 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 fuse rotate: false - xy: 239, 245 + xy: 266, 346 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 hail rotate: false - xy: 959, 397 + xy: 246, 127 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2015,14 +2015,14 @@ hail-heat index: -1 lancer rotate: false - xy: 87, 59 + xy: 265, 210 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 lancer-heat rotate: false - xy: 87, 41 + xy: 283, 204 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2043,63 +2043,63 @@ meltdown-heat index: -1 ripple rotate: false - xy: 338, 300 + xy: 390, 310 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 ripple-heat rotate: false - xy: 364, 300 + xy: 390, 284 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 salvo rotate: false - xy: 211, 203 + xy: 467, 379 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-heat rotate: false - xy: 211, 185 + xy: 465, 361 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-panel-left rotate: false - xy: 229, 209 + xy: 465, 343 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 salvo-panel-right rotate: false - xy: 229, 191 + xy: 503, 377 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 scatter rotate: false - xy: 252, 118 + xy: 218, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch rotate: false - xy: 262, 128 + xy: 216, 81 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 scorch-shoot rotate: false - xy: 252, 108 + xy: 215, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2113,189 +2113,210 @@ spectre index: -1 swarmer rotate: false - xy: 247, 209 + xy: 557, 377 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave rotate: false - xy: 301, 177 + xy: 483, 345 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 wave-liquid rotate: false - xy: 265, 174 + xy: 503, 359 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -dagger-pad-top +dagger-factory-top rotate: false - xy: 649, 417 + xy: 521, 395 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -dagger-pad-top-open +dagger-factory-top-open rotate: false - xy: 685, 435 + xy: 539, 395 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -drone-pad-top - rotate: false - xy: 685, 417 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -drone-pad-top-open - rotate: false - xy: 721, 435 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -fabricator-pad-top - rotate: false - xy: 703, 417 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -fabricator-pad-top-open - rotate: false - xy: 739, 435 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -fortress-pad - rotate: false - xy: 113, 166 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -fortress-pad-top +fortress-factory rotate: false xy: 213, 257 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -monsoon-pad-top - rotate: false - xy: 213, 257 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -titan-pad-top - rotate: false - xy: 213, 257 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -fortress-pad-top-open +fortress-factory-top rotate: false xy: 239, 271 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -monsoon-pad-top-open +ghoul-factory-top rotate: false xy: 239, 271 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -titan-pad-top-open +revenant-factory-top rotate: false xy: 239, 271 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -interceptor-pad-top +titan-factory-top rotate: false - xy: 126, 94 + xy: 239, 271 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +fortress-factory-top-open + rotate: false + xy: 239, 245 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +ghoul-factory-top-open + rotate: false + xy: 239, 245 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +revenant-factory-top-open + rotate: false + xy: 239, 245 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +titan-factory-top-open + rotate: false + xy: 239, 245 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +ghoul-factory + rotate: false + xy: 292, 346 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +phantom-factory-top + rotate: false + xy: 211, 167 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -interceptor-pad-top-open +phantom-factory-top-open rotate: false - xy: 87, 77 + xy: 229, 173 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -monsoon-pad - rotate: false - xy: 284, 294 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 reconstructor-open rotate: false - xy: 157, 176 + xy: 247, 155 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 repair-point-turret rotate: false - xy: 243, 49 + xy: 989, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -titan-pad +revenant-factory rotate: false - xy: 421, 396 + xy: 364, 300 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 +titan-factory + rotate: false + xy: 364, 300 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +spirit-factory-top + rotate: false + xy: 521, 377 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +spirit-factory-top-open + rotate: false + xy: 539, 377 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +wraith-factory-top + rotate: false + xy: 521, 359 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +wraith-factory-top-open + rotate: false + xy: 539, 359 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 deflector-wall rotate: false - xy: 759, 397 + xy: 205, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deflector-wall-large rotate: false - xy: 667, 417 + xy: 557, 395 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large-open rotate: false - xy: 703, 435 + xy: 575, 395 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-open rotate: false - xy: 829, 397 + xy: 205, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 beam rotate: false - xy: 138, 26 + xy: 498, 289 size: 1, 12 orig: 1, 12 offset: 0, 0 @@ -2323,14 +2344,14 @@ bullet index: -1 bullet-back rotate: false - xy: 335, 219 + xy: 501, 280 size: 13, 13 orig: 13, 13 offset: 0, 0 index: -1 casing rotate: false - xy: 137, 16 + xy: 209, 260 size: 2, 4 orig: 2, 4 offset: 0, 0 @@ -2344,77 +2365,77 @@ clear index: -1 command-attack rotate: false - xy: 405, 216 + xy: 175, 22 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-idle rotate: false - xy: 415, 216 + xy: 343, 215 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-patrol rotate: false - xy: 425, 218 + xy: 341, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 command-retreat rotate: false - xy: 405, 206 + xy: 341, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 enemyarrow rotate: false - xy: 1009, 394 + xy: 185, 15 size: 8, 7 orig: 8, 7 offset: 0, 0 index: -1 error rotate: false - xy: 165, 2 + xy: 158, 162 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 laser rotate: false - xy: 233, 289 + xy: 498, 275 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 laser-end rotate: false - xy: 84, 181 + xy: 264, 300 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 laserfull rotate: false - xy: 264, 300 + xy: 318, 336 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 minelaser rotate: false - xy: 236, 283 + xy: 138, 26 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 minelaser-end rotate: false - xy: 318, 336 + xy: 318, 316 size: 18, 18 orig: 18, 18 offset: 0, 0 @@ -2428,7 +2449,7 @@ missile index: -1 missile-back rotate: false - xy: 439, 257 + xy: 200, 149 size: 9, 9 orig: 9, 9 offset: 0, 0 @@ -2470,77 +2491,77 @@ scorch5 index: -1 shell rotate: false - xy: 179, 1 + xy: 343, 235 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shell-back rotate: false - xy: 190, 1 + xy: 355, 247 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 shot rotate: false - xy: 272, 146 + xy: 215, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 transfer rotate: false - xy: 390, 338 + xy: 498, 261 size: 1, 12 orig: 1, 12 offset: 0, 0 index: -1 transfer-arrow rotate: false - xy: 233, 9 + xy: 225, 65 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 transfer-end rotate: false - xy: 467, 433 + xy: 447, 393 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 blackstone-cliff-edge rotate: false - xy: 619, 405 + xy: 331, 202 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-1 rotate: false - xy: 631, 407 + xy: 331, 192 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-edge-2 rotate: false - xy: 641, 407 + xy: 331, 182 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 blackstone-cliff-side rotate: false - xy: 651, 407 + xy: 331, 172 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-arc rotate: false - xy: 701, 407 + xy: 331, 122 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -2554,336 +2575,322 @@ block-icon-biomattercompressor index: -1 block-icon-blast-drill rotate: false - xy: 777, 453 + xy: 807, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-bridge-conduit rotate: false - xy: 711, 407 + xy: 331, 112 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conduit rotate: false - xy: 711, 407 + xy: 331, 112 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-bridge-conveyor rotate: false - xy: 721, 407 + xy: 377, 260 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 bridge-conveyor rotate: false - xy: 721, 407 + xy: 377, 260 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-centrifuge rotate: false - xy: 416, 314 + xy: 559, 431 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 centrifuge rotate: false - xy: 416, 314 + xy: 559, 431 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-combustion-generator rotate: false - xy: 731, 407 + xy: 331, 102 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 combustion-generator rotate: false - xy: 731, 407 + xy: 331, 102 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-command-center rotate: false - xy: 416, 296 + xy: 577, 431 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 command-center rotate: false - xy: 416, 296 + xy: 577, 431 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-conduit rotate: false - xy: 741, 407 + xy: 386, 272 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-conveyor rotate: false - xy: 751, 407 + xy: 396, 274 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 conveyor-0-0 rotate: false - xy: 751, 407 + xy: 396, 274 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-copper-wall rotate: false - xy: 761, 407 + xy: 406, 274 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 copper-wall rotate: false - xy: 761, 407 + xy: 406, 274 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-copper-wall-large rotate: false - xy: 90, 149 + xy: 595, 433 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 copper-wall-large rotate: false - xy: 90, 149 + xy: 595, 433 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-core rotate: false - xy: 803, 453 + xy: 833, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 core rotate: false - xy: 803, 453 + xy: 833, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-cryofluidmixer rotate: false - xy: 90, 131 + xy: 613, 433 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-cultivator rotate: false - xy: 90, 113 + xy: 631, 433 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-cyclone rotate: false - xy: 829, 453 + xy: 859, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -block-icon-dagger-pad +block-icon-dagger-factory rotate: false - xy: 108, 148 + xy: 447, 339 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-icon-dart-ship-factory +block-icon-dart-ship-pad rotate: false - xy: 108, 130 + xy: 90, 149 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -dart-ship-factory +dart-ship-pad rotate: false - xy: 108, 130 + xy: 90, 149 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-deepwater rotate: false - xy: 771, 407 + xy: 387, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater rotate: false - xy: 771, 407 + xy: 387, 262 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -block-icon-delta-mech-factory +block-icon-delta-mech-pad rotate: false - xy: 108, 112 + xy: 90, 131 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -delta-mech-factory +delta-mech-pad rotate: false - xy: 108, 112 + xy: 90, 131 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-dense-alloy-wall rotate: false - xy: 781, 407 + xy: 397, 264 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dense-alloy-wall rotate: false - xy: 781, 407 + xy: 397, 264 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-dense-alloy-wall-large rotate: false - xy: 126, 148 + xy: 90, 113 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dense-alloy-wall-large rotate: false - xy: 126, 148 + xy: 90, 113 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-dirt rotate: false - xy: 791, 407 + xy: 434, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt1 rotate: false - xy: 791, 407 + xy: 434, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-distributor rotate: false - xy: 126, 130 + xy: 108, 148 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 distributor rotate: false - xy: 126, 130 + xy: 108, 148 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-door rotate: false - xy: 801, 407 + xy: 444, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 door rotate: false - xy: 801, 407 + xy: 444, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-door-large rotate: false - xy: 126, 112 + xy: 108, 130 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 door-large rotate: false - xy: 126, 112 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -block-icon-drone-pad - rotate: false - xy: 283, 240 + xy: 108, 130 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-duo rotate: false - xy: 811, 407 + xy: 454, 265 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -block-icon-fabricator-pad - rotate: false - xy: 416, 278 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 block-icon-force-projector rotate: false - xy: 855, 453 + xy: 885, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 force-projector rotate: false - xy: 855, 453 + xy: 885, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-fuse rotate: false - xy: 881, 453 + xy: 911, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 @@ -2895,247 +2902,247 @@ block-icon-fusion-reactor orig: 32, 32 offset: 0, 0 index: -1 -block-icon-glaive-ship-factory +block-icon-ghoul-factory rotate: false - xy: 907, 453 + xy: 937, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -glaive-ship-factory +block-icon-glaive-ship-pad rotate: false - xy: 907, 453 + xy: 963, 453 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +glaive-ship-pad + rotate: false + xy: 963, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-grass rotate: false - xy: 821, 407 + xy: 200, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 grass1 rotate: false - xy: 821, 407 + xy: 200, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-hail rotate: false - xy: 831, 407 + xy: 198, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-ice rotate: false - xy: 841, 407 + xy: 198, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ice1 rotate: false - xy: 841, 407 + xy: 198, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-icerock rotate: false - xy: 851, 407 + xy: 210, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icerock1 rotate: false - xy: 851, 407 + xy: 210, 111 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-incinerator rotate: false - xy: 861, 407 + xy: 208, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 incinerator rotate: false - xy: 861, 407 + xy: 208, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -block-icon-interceptor-pad - rotate: false - xy: 301, 249 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 block-icon-itemsource rotate: false - xy: 871, 407 + xy: 208, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemsource rotate: false - xy: 871, 407 + xy: 208, 91 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-itemvoid rotate: false - xy: 881, 407 + xy: 220, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 itemvoid rotate: false - xy: 881, 407 + xy: 220, 113 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -block-icon-javelin-ship-factory +block-icon-javelin-ship-pad rotate: false - xy: 301, 231 + xy: 108, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -javelin-ship-factory +javelin-ship-pad rotate: false - xy: 301, 231 + xy: 108, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-junction rotate: false - xy: 891, 407 + xy: 513, 270 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 junction rotate: false - xy: 891, 407 + xy: 513, 270 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-lancer rotate: false - xy: 336, 282 + xy: 126, 148 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-laser-drill rotate: false - xy: 354, 282 + xy: 126, 130 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-lava rotate: false - xy: 901, 407 + xy: 513, 260 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava rotate: false - xy: 901, 407 + xy: 513, 260 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-junction rotate: false - xy: 911, 407 + xy: 523, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-junction rotate: false - xy: 911, 407 + xy: 523, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-router rotate: false - xy: 921, 407 + xy: 523, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-liquid-tank rotate: false - xy: 933, 453 + xy: 989, 453 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-liquidsource rotate: false - xy: 931, 407 + xy: 533, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquidsource rotate: false - xy: 931, 407 + xy: 533, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-mass-driver rotate: false - xy: 959, 453 + xy: 113, 192 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 mass-driver rotate: false - xy: 959, 453 + xy: 113, 192 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-mechanical-drill rotate: false - xy: 372, 282 + xy: 126, 112 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-mechanical-pump rotate: false - xy: 941, 407 + xy: 533, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mechanical-pump rotate: false - xy: 941, 407 + xy: 533, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3149,175 +3156,175 @@ block-icon-meltdown index: -1 block-icon-melter rotate: false - xy: 951, 407 + xy: 543, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 melter rotate: false - xy: 951, 407 + xy: 543, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-mend-projector rotate: false - xy: 447, 359 + xy: 283, 240 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 mend-projector rotate: false - xy: 447, 359 + xy: 283, 240 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-metalfloor rotate: false - xy: 961, 407 + xy: 543, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor1 rotate: false - xy: 961, 407 + xy: 543, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -block-icon-monsoon-pad - rotate: false - xy: 985, 453 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 block-icon-oil rotate: false - xy: 971, 407 + xy: 553, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil rotate: false - xy: 971, 407 + xy: 553, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-oil-extractor - rotate: false - xy: 113, 192 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 -block-icon-omega-mech-factory rotate: false xy: 282, 372 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 -omega-mech-factory +block-icon-omega-mech-pad rotate: false - xy: 282, 372 + xy: 308, 372 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +omega-mech-pad + rotate: false + xy: 308, 372 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-overdrive-projector rotate: false - xy: 265, 228 + xy: 301, 249 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 overdrive-projector rotate: false - xy: 265, 228 + xy: 301, 249 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-overflow-gate rotate: false - xy: 981, 407 + xy: 553, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 overflow-gate rotate: false - xy: 981, 407 + xy: 553, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 +block-icon-phantom-factory + rotate: false + xy: 301, 231 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 block-icon-phase-conduit rotate: false - xy: 991, 407 + xy: 563, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conduit rotate: false - xy: 991, 407 + xy: 563, 271 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-conveyor rotate: false - xy: 467, 405 + xy: 563, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-conveyor rotate: false - xy: 467, 405 + xy: 563, 261 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-wall rotate: false - xy: 477, 405 + xy: 573, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 phase-wall rotate: false - xy: 477, 405 + xy: 573, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-phase-wall-large rotate: false - xy: 283, 222 + xy: 336, 282 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 phase-wall-large rotate: false - xy: 283, 222 + xy: 336, 282 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-phase-weaver rotate: false - xy: 301, 213 + xy: 354, 282 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -3331,406 +3338,420 @@ block-icon-plasma-drill index: -1 block-icon-plastanium-compressor rotate: false - xy: 137, 246 + xy: 372, 282 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 plastanium-compressor rotate: false - xy: 137, 246 + xy: 372, 282 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-pneumatic-drill rotate: false - xy: 137, 228 + xy: 421, 326 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-power-node rotate: false - xy: 465, 395 + xy: 573, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 power-node rotate: false - xy: 465, 395 + xy: 573, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-power-node-large rotate: false - xy: 155, 248 + xy: 416, 308 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 power-node-large rotate: false - xy: 155, 248 + xy: 416, 308 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-powerinfinite rotate: false - xy: 465, 385 + xy: 583, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powerinfinite rotate: false - xy: 465, 385 + xy: 583, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-powervoid rotate: false - xy: 475, 395 + xy: 583, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 powervoid rotate: false - xy: 475, 395 + xy: 583, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulse-conduit rotate: false - xy: 465, 375 + xy: 593, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pulverizer rotate: false - xy: 475, 385 + xy: 593, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-pyratite-mixer rotate: false - xy: 173, 248 + xy: 416, 290 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 pyratite-mixer rotate: false - xy: 173, 248 + xy: 416, 290 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-reconstructor rotate: false - xy: 155, 230 + xy: 265, 228 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -dagger-pad +dagger-factory rotate: false - xy: 155, 230 + xy: 265, 228 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -drone-pad +phantom-factory rotate: false - xy: 155, 230 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -fabricator-pad - rotate: false - xy: 155, 230 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 -interceptor-pad - rotate: false - xy: 155, 230 + xy: 265, 228 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 reconstructor rotate: false - xy: 155, 230 + xy: 265, 228 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +spirit-factory + rotate: false + xy: 265, 228 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +wraith-factory + rotate: false + xy: 265, 228 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-repair-point rotate: false - xy: 465, 365 + xy: 603, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 repair-point rotate: false - xy: 465, 365 + xy: 603, 273 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 +block-icon-revenant-factory + rotate: false + xy: 343, 430 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 +block-icon-titan-factory + rotate: false + xy: 343, 430 + size: 24, 24 + orig: 24, 24 + offset: 0, 0 + index: -1 block-icon-ripple rotate: false - xy: 308, 372 + xy: 369, 430 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-rock rotate: false - xy: 475, 375 + xy: 603, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 rock1 rotate: false - xy: 475, 375 + xy: 603, 263 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rotary-pump rotate: false - xy: 191, 248 + xy: 283, 222 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rotary-pump rotate: false - xy: 191, 248 + xy: 283, 222 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-router rotate: false - xy: 475, 365 + xy: 513, 250 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 router rotate: false - xy: 475, 365 + xy: 513, 250 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-rtg-generator rotate: false - xy: 173, 230 + xy: 301, 213 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 rtg-generator rotate: false - xy: 173, 230 + xy: 301, 213 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-salvo rotate: false - xy: 191, 230 + xy: 137, 246 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-sand rotate: false - xy: 487, 407 + xy: 523, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand1 rotate: false - xy: 487, 407 + xy: 523, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-scorch rotate: false - xy: 469, 355 + xy: 533, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-separator rotate: false - xy: 469, 345 + xy: 543, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 separator rotate: false - xy: 469, 345 + xy: 543, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shock-mine rotate: false - xy: 479, 355 + xy: 553, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shock-mine rotate: false - xy: 479, 355 + xy: 553, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-shrub rotate: false - xy: 479, 345 + xy: 563, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 shrub rotate: false - xy: 479, 345 + xy: 563, 251 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-silicon-smelter rotate: false - xy: 209, 239 + xy: 137, 228 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 silicon-smelter rotate: false - xy: 209, 239 + xy: 137, 228 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-smelter rotate: false - xy: 479, 335 + xy: 573, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 smelter rotate: false - xy: 479, 335 + xy: 573, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-snow rotate: false - xy: 479, 325 + xy: 583, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow1 rotate: false - xy: 479, 325 + xy: 583, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-solar-panel rotate: false - xy: 478, 315 + xy: 593, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solar-panel rotate: false - xy: 478, 315 + xy: 593, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-solar-panel-large rotate: false - xy: 343, 430 + xy: 343, 404 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 solar-panel-large rotate: false - xy: 343, 430 + xy: 343, 404 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-solidifer rotate: false - xy: 478, 305 + xy: 603, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 solidifer rotate: false - xy: 478, 305 + xy: 603, 253 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-sorter rotate: false - xy: 478, 295 + xy: 155, 80 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sorter rotate: false - xy: 478, 295 + xy: 155, 80 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-space rotate: false - xy: 478, 285 + xy: 155, 70 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space rotate: false - xy: 478, 285 + xy: 155, 70 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -3742,1444 +3763,1465 @@ block-icon-spectre orig: 32, 32 offset: 0, 0 index: -1 +block-icon-spirit-factory + rotate: false + xy: 155, 248 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 block-icon-stone rotate: false - xy: 478, 275 + xy: 155, 60 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 stone1 rotate: false - xy: 478, 275 + xy: 155, 60 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-surge-wall rotate: false - xy: 478, 265 + xy: 155, 50 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 surge-wall rotate: false - xy: 478, 265 + xy: 155, 50 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-surge-wall-large rotate: false - xy: 209, 221 + xy: 173, 248 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 surge-wall-large rotate: false - xy: 209, 221 + xy: 173, 248 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-swarmer rotate: false - xy: 227, 227 + xy: 155, 230 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-icon-tau-mech-factory +block-icon-tau-mech-pad rotate: false - xy: 245, 227 + xy: 191, 248 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -tau-mech-factory +tau-mech-pad rotate: false - xy: 245, 227 + xy: 191, 248 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermal-generator rotate: false - xy: 487, 417 + xy: 173, 230 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-generator rotate: false - xy: 487, 417 + xy: 173, 230 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thermal-pump rotate: false - xy: 505, 413 + xy: 191, 230 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thermal-pump rotate: false - xy: 505, 413 + xy: 191, 230 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-thorium-reactor rotate: false - xy: 369, 430 + xy: 369, 404 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 thorium-reactor rotate: false - xy: 369, 430 + xy: 369, 404 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-thorium-wall rotate: false - xy: 479, 255 + xy: 155, 40 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 thorium-wall rotate: false - xy: 479, 255 + xy: 155, 40 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-thorium-wall-large rotate: false - xy: 523, 413 + xy: 209, 239 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 thorium-wall-large rotate: false - xy: 523, 413 + xy: 209, 239 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -block-icon-titan-pad - rotate: false - xy: 343, 404 - size: 24, 24 - orig: 24, 24 - offset: 0, 0 - index: -1 block-icon-titanium-conveyor rotate: false - xy: 479, 245 + xy: 155, 30 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 titanium-conveyor-0-0 rotate: false - xy: 479, 245 + xy: 155, 30 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 -block-icon-trident-ship-factory +block-icon-trident-ship-pad rotate: false - xy: 541, 413 + xy: 209, 221 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -trident-ship-factory +trident-ship-pad rotate: false - xy: 541, 413 + xy: 209, 221 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-turbine-generator rotate: false - xy: 559, 431 + xy: 227, 227 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 turbine-generator rotate: false - xy: 559, 431 + xy: 227, 227 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-unloader rotate: false - xy: 365, 240 + xy: 155, 20 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unloader rotate: false - xy: 365, 240 + xy: 155, 20 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-vault rotate: false - xy: 369, 404 + xy: 395, 414 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 vault rotate: false - xy: 369, 404 + xy: 395, 414 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-warp-gate rotate: false - xy: 395, 414 + xy: 343, 378 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 warp-gate rotate: false - xy: 395, 414 + xy: 343, 378 size: 24, 24 orig: 24, 24 offset: 0, 0 index: -1 block-icon-water rotate: false - xy: 375, 242 + xy: 165, 82 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 water rotate: false - xy: 375, 242 + xy: 165, 82 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 block-icon-water-extractor rotate: false - xy: 559, 413 + xy: 245, 227 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 block-icon-wave rotate: false - xy: 577, 433 + xy: 487, 417 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +block-icon-wraith-factory + rotate: false + xy: 485, 399 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 deepwater-cliff-edge rotate: false - xy: 719, 397 + xy: 196, 81 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-1 rotate: false - xy: 729, 397 + xy: 206, 81 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-edge-2 rotate: false - xy: 739, 397 + xy: 195, 71 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 deepwater-cliff-side rotate: false - xy: 749, 397 + xy: 195, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge rotate: false - xy: 789, 397 + xy: 195, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-1 rotate: false - xy: 799, 397 + xy: 205, 51 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-edge-2 rotate: false - xy: 809, 397 + xy: 195, 31 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 dirt-cliff-side rotate: false - xy: 819, 397 + xy: 205, 41 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge rotate: false - xy: 351, 226 + xy: 605, 365 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-1 rotate: false - xy: 350, 216 + xy: 615, 375 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-edge-2 rotate: false - xy: 349, 206 + xy: 615, 365 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 lava-cliff-side rotate: false - xy: 349, 196 + xy: 625, 375 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-cryofluid rotate: false - xy: 445, 215 + xy: 613, 355 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-lava rotate: false - xy: 445, 205 + xy: 613, 345 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-oil rotate: false - xy: 455, 215 + xy: 623, 355 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon-water rotate: false - xy: 455, 205 + xy: 613, 335 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 mech-icon-alpha-mech rotate: false - xy: 464, 317 + xy: 172, 106 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-dart-ship rotate: false - xy: 464, 303 + xy: 144, 90 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-delta-mech rotate: false - xy: 464, 289 + xy: 158, 92 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-omega-mech rotate: false - xy: 319, 192 + xy: 501, 295 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mech-icon-tau-mech rotate: false - xy: 319, 176 + xy: 517, 295 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mech-icon-trident-ship rotate: false - xy: 315, 160 + xy: 533, 295 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 trident-ship rotate: false - xy: 315, 160 + xy: 533, 295 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 metalfloor-cliff-edge rotate: false - xy: 445, 195 + xy: 633, 335 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-1 rotate: false - xy: 455, 195 + xy: 643, 345 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-edge-2 rotate: false - xy: 465, 195 + xy: 613, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 metalfloor-cliff-side rotate: false - xy: 475, 195 + xy: 623, 315 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge rotate: false - xy: 485, 195 + xy: 633, 325 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-1 rotate: false - xy: 495, 195 + xy: 643, 335 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-edge-2 rotate: false - xy: 505, 215 + xy: 623, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 oil-cliff-side rotate: false - xy: 505, 205 + xy: 633, 315 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone1 rotate: false - xy: 629, 387 + xy: 633, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone2 rotate: false - xy: 639, 387 + xy: 643, 315 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-blackstone3 rotate: false - xy: 649, 387 + xy: 643, 305 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass1 rotate: false - xy: 659, 387 + xy: 651, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass2 rotate: false - xy: 669, 387 + xy: 661, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-grass3 rotate: false - xy: 679, 387 + xy: 671, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice1 rotate: false - xy: 689, 387 + xy: 681, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice2 rotate: false - xy: 699, 387 + xy: 691, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-ice3 rotate: false - xy: 709, 387 + xy: 701, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand1 rotate: false - xy: 719, 387 + xy: 711, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand2 rotate: false - xy: 729, 387 + xy: 721, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-sand3 rotate: false - xy: 739, 387 + xy: 731, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow1 rotate: false - xy: 749, 387 + xy: 741, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow2 rotate: false - xy: 759, 387 + xy: 751, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-snow3 rotate: false - xy: 769, 387 + xy: 761, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone1 rotate: false - xy: 779, 387 + xy: 771, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone2 rotate: false - xy: 789, 387 + xy: 781, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-coal-stone3 rotate: false - xy: 799, 387 + xy: 791, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone1 rotate: false - xy: 809, 387 + xy: 801, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone2 rotate: false - xy: 819, 387 + xy: 811, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-blackstone3 rotate: false - xy: 829, 387 + xy: 821, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass1 rotate: false - xy: 839, 387 + xy: 831, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass2 rotate: false - xy: 849, 387 + xy: 841, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-grass3 rotate: false - xy: 859, 387 + xy: 851, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice1 rotate: false - xy: 869, 387 + xy: 861, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice2 rotate: false - xy: 879, 387 + xy: 871, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-ice3 rotate: false - xy: 889, 387 + xy: 881, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand1 rotate: false - xy: 899, 387 + xy: 891, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand2 rotate: false - xy: 909, 387 + xy: 901, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-sand3 rotate: false - xy: 919, 387 + xy: 911, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow1 rotate: false - xy: 929, 387 + xy: 921, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow2 rotate: false - xy: 939, 387 + xy: 931, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-snow3 rotate: false - xy: 949, 387 + xy: 941, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone1 rotate: false - xy: 959, 387 + xy: 951, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone2 rotate: false - xy: 969, 387 + xy: 961, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-copper-stone3 rotate: false - xy: 979, 387 + xy: 971, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone1 rotate: false - xy: 989, 387 + xy: 981, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone2 rotate: false - xy: 999, 387 + xy: 991, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-blackstone3 rotate: false - xy: 1009, 384 + xy: 1001, 443 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass1 rotate: false - xy: 202, 158 + xy: 649, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass2 rotate: false - xy: 202, 148 + xy: 649, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-grass3 rotate: false - xy: 202, 138 + xy: 659, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice1 rotate: false - xy: 202, 128 + xy: 659, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice2 rotate: false - xy: 202, 118 + xy: 669, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-ice3 rotate: false - xy: 202, 108 + xy: 669, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand1 rotate: false - xy: 202, 98 + xy: 679, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand2 rotate: false - xy: 212, 159 + xy: 679, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-sand3 rotate: false - xy: 212, 149 + xy: 689, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow1 rotate: false - xy: 212, 139 + xy: 689, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow2 rotate: false - xy: 212, 129 + xy: 699, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-snow3 rotate: false - xy: 212, 119 + xy: 699, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone1 rotate: false - xy: 212, 109 + xy: 709, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone2 rotate: false - xy: 212, 99 + xy: 709, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-lead-stone3 rotate: false - xy: 203, 88 + xy: 719, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone1 rotate: false - xy: 203, 78 + xy: 719, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone2 rotate: false - xy: 203, 68 + xy: 729, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-blackstone3 rotate: false - xy: 203, 58 + xy: 729, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass1 rotate: false - xy: 203, 48 + xy: 739, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass2 rotate: false - xy: 203, 38 + xy: 739, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-grass3 rotate: false - xy: 203, 28 + xy: 749, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice1 rotate: false - xy: 213, 89 + xy: 749, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice2 rotate: false - xy: 213, 79 + xy: 759, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-ice3 rotate: false - xy: 213, 69 + xy: 759, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand1 rotate: false - xy: 213, 59 + xy: 769, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand2 rotate: false - xy: 213, 49 + xy: 769, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-sand3 rotate: false - xy: 213, 39 + xy: 779, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow1 rotate: false - xy: 213, 29 + xy: 779, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow2 rotate: false - xy: 203, 18 + xy: 789, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-snow3 rotate: false - xy: 213, 19 + xy: 789, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone1 rotate: false - xy: 222, 149 + xy: 799, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone2 rotate: false - xy: 222, 139 + xy: 799, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-thorium-stone3 rotate: false - xy: 232, 149 + xy: 809, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone1 rotate: false - xy: 232, 139 + xy: 809, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone2 rotate: false - xy: 222, 129 + xy: 819, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-blackstone3 rotate: false - xy: 242, 149 + xy: 819, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass1 rotate: false - xy: 242, 139 + xy: 829, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass2 rotate: false - xy: 222, 119 + xy: 829, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-grass3 rotate: false - xy: 232, 129 + xy: 839, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice1 rotate: false - xy: 222, 109 + xy: 839, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice2 rotate: false - xy: 222, 99 + xy: 849, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-ice3 rotate: false - xy: 232, 119 + xy: 849, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand1 rotate: false - xy: 242, 129 + xy: 859, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand2 rotate: false - xy: 232, 109 + xy: 859, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-sand3 rotate: false - xy: 242, 119 + xy: 869, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow1 rotate: false - xy: 232, 99 + xy: 869, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow2 rotate: false - xy: 223, 89 + xy: 879, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-snow3 rotate: false - xy: 242, 109 + xy: 879, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone1 rotate: false - xy: 223, 79 + xy: 889, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone2 rotate: false - xy: 242, 99 + xy: 889, 423 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 ore-titanium-stone3 rotate: false - xy: 233, 89 + xy: 899, 433 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge rotate: false - xy: 252, 138 + xy: 397, 244 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-1 rotate: false - xy: 262, 148 + xy: 165, 12 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-edge-2 rotate: false - xy: 262, 138 + xy: 175, 12 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 sand-cliff-side rotate: false - xy: 252, 128 + xy: 218, 101 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge rotate: false - xy: 272, 106 + xy: 223, 1 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-1 rotate: false - xy: 282, 140 + xy: 240, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-edge-2 rotate: false - xy: 282, 130 + xy: 250, 107 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 snow-cliff-side rotate: false - xy: 282, 120 + xy: 230, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge rotate: false - xy: 282, 100 + xy: 260, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-1 rotate: false - xy: 292, 139 + xy: 270, 110 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-edge-2 rotate: false - xy: 292, 129 + xy: 228, 85 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 space-cliff-side rotate: false - xy: 292, 119 + xy: 260, 100 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 unit-icon-dagger rotate: false - xy: 439, 243 + xy: 186, 118 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-fortress rotate: false - xy: 283, 204 + xy: 229, 137 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 unit-icon-titan rotate: false - xy: 283, 204 + xy: 247, 137 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +unit-icon-wraith + rotate: false + xy: 214, 135 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +wraith + rotate: false + xy: 214, 135 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 item-biomatter rotate: false - xy: 485, 365 + xy: 593, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-blast-compound rotate: false - xy: 489, 355 + xy: 603, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-coal rotate: false - xy: 489, 345 + xy: 351, 205 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-copper rotate: false - xy: 489, 335 + xy: 351, 195 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-dense-alloy rotate: false - xy: 489, 325 + xy: 351, 185 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-lead rotate: false - xy: 488, 315 + xy: 351, 175 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-phase-matter rotate: false - xy: 488, 305 + xy: 351, 165 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-plastanium rotate: false - xy: 488, 295 + xy: 351, 155 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-pyratite rotate: false - xy: 488, 285 + xy: 351, 145 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-sand rotate: false - xy: 488, 275 + xy: 351, 135 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-silicon rotate: false - xy: 488, 265 + xy: 351, 125 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-stone rotate: false - xy: 489, 255 + xy: 351, 115 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-surge-alloy rotate: false - xy: 489, 245 + xy: 351, 105 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-thorium rotate: false - xy: 495, 235 + xy: 351, 95 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 item-titanium rotate: false - xy: 501, 225 + xy: 605, 375 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 liquid-icon rotate: false - xy: 435, 198 + xy: 645, 365 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 alpha-mech rotate: false - xy: 1011, 451 + xy: 487, 331 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 alpha-mech-base rotate: false - xy: 90, 167 + xy: 487, 317 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 alpha-mech-leg rotate: false - xy: 351, 236 + xy: 487, 303 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech rotate: false - xy: 275, 156 + xy: 144, 132 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-leg rotate: false - xy: 331, 162 + xy: 144, 118 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 omega-mech rotate: false - xy: 335, 266 + xy: 549, 295 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 omega-mech-armor rotate: false - xy: 351, 266 + xy: 565, 297 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 omega-mech-base rotate: false - xy: 335, 250 + xy: 581, 297 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 omega-mech-leg rotate: false - xy: 367, 266 + xy: 597, 297 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 tau-mech rotate: false - xy: 351, 250 + xy: 482, 255 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 tau-mech-base rotate: false - xy: 425, 254 + xy: 186, 132 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 tau-mech-leg rotate: false - xy: 425, 240 + xy: 200, 135 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dart-ship rotate: false - xy: 137, 2 + xy: 144, 146 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 glaive-ship rotate: false - xy: 318, 356 + xy: 395, 440 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 mech-icon-glaive-ship rotate: false - xy: 318, 356 + xy: 395, 440 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 javelin-ship rotate: false - xy: 450, 275 + xy: 158, 106 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 mech-icon-javelin-ship rotate: false - xy: 450, 275 + xy: 158, 106 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 javelin-ship-shield rotate: false - xy: 450, 261 + xy: 172, 134 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -5264,7 +5306,7 @@ button-map-over index: -1 button-select rotate: false - xy: 343, 378 + xy: 369, 378 size: 24, 24 split: 4, 4, 4, 4 orig: 24, 24 @@ -5307,7 +5349,7 @@ clear index: -1 cursor rotate: false - xy: 441, 364 + xy: 233, 291 size: 4, 4 orig: 4, 4 offset: 0, 0 @@ -5328,28 +5370,28 @@ discord-banner-over index: -1 controller-cursor rotate: false - xy: 595, 433 + xy: 523, 413 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-about rotate: false - xy: 1009, 435 + xy: 318, 356 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-add rotate: false - xy: 1009, 419 + xy: 89, 25 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-admin rotate: false - xy: 1009, 403 + xy: 193, 214 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5370,14 +5412,14 @@ icon-areaDelete index: -1 icon-arrow rotate: false - xy: 775, 435 + xy: 87, 77 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-arrow-16 rotate: false - xy: 775, 435 + xy: 87, 77 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -5391,210 +5433,210 @@ icon-arrow-down index: -1 icon-arrow-left rotate: false - xy: 439, 333 + xy: 186, 106 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 467, 249 + xy: 214, 123 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-arrow-up rotate: false - xy: 425, 228 + xy: 186, 94 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-back rotate: false - xy: 757, 417 + xy: 87, 59 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-ban rotate: false - xy: 89, 25 + xy: 557, 361 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-break rotate: false - xy: 793, 435 + xy: 87, 41 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-cancel rotate: false - xy: 775, 417 + xy: 105, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-chat rotate: false - xy: 453, 235 + xy: 501, 268 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-check rotate: false - xy: 811, 435 + xy: 105, 58 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-crafting rotate: false - xy: 345, 165 + xy: 501, 256 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-cursor rotate: false - xy: 157, 82 + xy: 319, 260 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-defense rotate: false - xy: 157, 70 + xy: 319, 248 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-dev-builds rotate: false - xy: 193, 214 + xy: 573, 361 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-discord rotate: false - xy: 283, 170 + xy: 501, 343 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-distribution rotate: false - xy: 157, 58 + xy: 319, 236 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-donate rotate: false - xy: 211, 169 + xy: 517, 343 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-dots rotate: false - xy: 229, 175 + xy: 533, 343 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-editor rotate: false - xy: 245, 175 + xy: 549, 343 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-egg rotate: false - xy: 434, 316 + xy: 565, 345 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-elevation rotate: false - xy: 793, 417 + xy: 123, 76 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-eraser rotate: false - xy: 829, 435 + xy: 123, 58 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-exit rotate: false - xy: 434, 300 + xy: 581, 345 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-file rotate: false - xy: 811, 417 + xy: 105, 40 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-image rotate: false - xy: 847, 435 + xy: 123, 40 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-file-text rotate: false - xy: 434, 284 + xy: 589, 361 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-fill rotate: false - xy: 829, 417 + xy: 89, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-floppy rotate: false - xy: 434, 268 + xy: 597, 345 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-floppy-16 rotate: false - xy: 865, 435 + xy: 120, 22 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-folder rotate: false - xy: 299, 161 + xy: 439, 323 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 144, 158 + xy: 434, 307 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -5608,448 +5650,448 @@ icon-generated index: -1 icon-github rotate: false - xy: 144, 142 + xy: 434, 291 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-google-play rotate: false - xy: 144, 126 + xy: 434, 275 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-grid rotate: false - xy: 847, 417 + xy: 119, 4 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-hold rotate: false - xy: 157, 46 + xy: 319, 224 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-holdDelete rotate: false - xy: 157, 34 + xy: 319, 212 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-home rotate: false - xy: 144, 110 + xy: 455, 323 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-host rotate: false - xy: 144, 94 + xy: 450, 307 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-info rotate: false - xy: 169, 84 + xy: 319, 200 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-itch.io rotate: false - xy: 141, 78 + xy: 450, 291 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-item rotate: false - xy: 169, 72 + xy: 319, 188 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-items-none rotate: false - xy: 485, 385 + xy: 573, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-line rotate: false - xy: 883, 435 + xy: 416, 272 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-link rotate: false - xy: 141, 62 + xy: 450, 275 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-liquid rotate: false - xy: 169, 60 + xy: 319, 176 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-load rotate: false - xy: 141, 46 + xy: 471, 327 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-load-image rotate: false - xy: 865, 417 + xy: 139, 210 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-load-map rotate: false - xy: 901, 435 + xy: 139, 192 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-loading rotate: false - xy: 883, 417 + xy: 139, 174 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-locked rotate: false - xy: 919, 435 + xy: 157, 212 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-logic rotate: false - xy: 169, 48 + xy: 319, 164 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-map rotate: false - xy: 160, 160 + xy: 501, 327 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-menu rotate: false - xy: 169, 36 + xy: 319, 152 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-menu-large rotate: false - xy: 901, 417 + xy: 157, 194 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-missing rotate: false - xy: 181, 84 + xy: 319, 140 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-none rotate: false - xy: 181, 72 + xy: 319, 128 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-nullitem rotate: false - xy: 485, 375 + xy: 583, 243 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 icon-pause rotate: false - xy: 181, 60 + xy: 319, 116 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-pencil rotate: false - xy: 937, 435 + xy: 175, 212 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-pencil-small rotate: false - xy: 176, 160 + xy: 517, 327 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-pick rotate: false - xy: 919, 417 + xy: 157, 176 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-play rotate: false - xy: 181, 48 + xy: 319, 104 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-play-2 rotate: false - xy: 160, 144 + xy: 533, 327 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-players rotate: false - xy: 181, 36 + xy: 151, 8 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-power rotate: false - xy: 169, 24 + xy: 338, 270 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-production rotate: false - xy: 181, 24 + xy: 350, 270 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-quit rotate: false - xy: 160, 128 + xy: 549, 327 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-redo rotate: false - xy: 955, 435 + xy: 175, 194 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 176, 144 + xy: 565, 329 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rename rotate: false - xy: 160, 112 + xy: 581, 329 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-resize rotate: false - xy: 937, 417 + xy: 175, 176 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-rotate rotate: false - xy: 176, 128 + xy: 597, 329 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-arrow rotate: false - xy: 160, 96 + xy: 471, 311 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-left rotate: false - xy: 176, 112 + xy: 466, 295 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-rotate-right rotate: false - xy: 176, 96 + xy: 466, 279 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save rotate: false - xy: 141, 30 + xy: 501, 311 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-save-image rotate: false - xy: 973, 435 + xy: 193, 196 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-save-map rotate: false - xy: 955, 417 + xy: 193, 178 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-settings rotate: false - xy: 179, 12 + xy: 362, 270 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-terrain rotate: false - xy: 991, 435 + xy: 211, 203 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-tools rotate: false - xy: 227, 159 + xy: 517, 311 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-touch rotate: false - xy: 191, 12 + xy: 374, 270 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-touchDelete rotate: false - xy: 439, 231 + xy: 331, 258 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 243, 159 + xy: 533, 311 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-trash-16 rotate: false - xy: 973, 417 + xy: 211, 185 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-trello rotate: false - xy: 259, 158 + xy: 549, 311 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-tutorial rotate: false - xy: 319, 256 + xy: 565, 313 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-undo rotate: false - xy: 991, 417 + xy: 229, 209 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-units rotate: false - xy: 345, 153 + xy: 331, 246 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-unlocked rotate: false - xy: 90, 95 + xy: 229, 191 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-unlocks rotate: false - xy: 319, 240 + xy: 581, 313 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-weapon rotate: false - xy: 299, 149 + xy: 343, 258 size: 10, 10 orig: 10, 10 offset: 0, 0 index: -1 icon-wiki rotate: false - xy: 319, 224 + xy: 597, 313 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-zoom rotate: false - xy: 108, 94 + xy: 247, 209 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 icon-zoom-small rotate: false - xy: 319, 208 + xy: 482, 287 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -6198,7 +6240,7 @@ text-sides-over index: -1 textfield rotate: false - xy: 535, 449 + xy: 565, 449 size: 28, 28 split: 6, 6, 6, 6 orig: 28, 28 @@ -6206,7 +6248,7 @@ textfield index: -1 textfield-over rotate: false - xy: 505, 449 + xy: 535, 449 size: 28, 28 split: 2, 2, 2, 2 orig: 28, 28 @@ -6214,7 +6256,7 @@ textfield-over index: -1 white rotate: false - xy: 437, 448 + xy: 233, 298 size: 3, 3 orig: 3, 3 offset: 0, 0 @@ -6237,210 +6279,217 @@ window-empty index: -1 alpha-drone rotate: false - xy: 1011, 465 + xy: 90, 167 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 unit-icon-alpha-drone rotate: false - xy: 1011, 465 + xy: 90, 167 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dagger rotate: false - xy: 383, 268 + xy: 586, 283 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dagger-base rotate: false - xy: 397, 270 + xy: 600, 283 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 delta-mech-base rotate: false - xy: 397, 270 + xy: 600, 283 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 dagger-leg rotate: false - xy: 141, 16 + xy: 144, 160 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 -drone - rotate: false - xy: 155, 16 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 -unit-icon-drone - rotate: false - xy: 155, 16 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 -fabricator - rotate: false - xy: 395, 440 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 -unit-icon-fabricator - rotate: false - xy: 395, 440 - size: 14, 14 - orig: 14, 14 - offset: 0, 0 - index: -1 fortress rotate: false - xy: 721, 417 + xy: 90, 95 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan rotate: false - xy: 721, 417 + xy: 90, 95 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fortress-base rotate: false - xy: 757, 435 + xy: 108, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-base rotate: false - xy: 757, 435 + xy: 108, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 fortress-leg rotate: false - xy: 739, 417 + xy: 126, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 titan-leg rotate: false - xy: 739, 417 + xy: 126, 94 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 -interceptor +ghoul rotate: false - xy: 450, 289 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 -unit-icon-interceptor - rotate: false - xy: 450, 289 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 -monsoon - rotate: false - xy: 318, 316 + xy: 84, 181 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 -unit-icon-monsoon +unit-icon-ghoul rotate: false - xy: 318, 316 + xy: 84, 181 size: 18, 18 orig: 18, 18 offset: 0, 0 index: -1 -power-cell +phantom rotate: false - xy: 335, 234 + xy: 482, 271 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 -blaster-equip +unit-icon-phantom rotate: false - xy: 335, 205 + xy: 482, 271 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +power-cell + rotate: false + xy: 466, 263 + size: 14, 14 + orig: 14, 14 + offset: 0, 0 + index: -1 +revenant + rotate: false + xy: 505, 449 + size: 28, 28 + orig: 28, 28 + offset: 0, 0 + index: -1 +unit-icon-revenant + rotate: false + xy: 505, 449 + size: 28, 28 + orig: 28, 28 + offset: 0, 0 + index: -1 +spirit + rotate: false + xy: 137, 6 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 -bomber-equip +unit-icon-spirit rotate: false - xy: 335, 191 + xy: 137, 6 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 -missiles-equip +artillery-equip rotate: false - xy: 335, 191 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 -chain-blaster-equip - rotate: false - xy: 335, 177 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 -flakgun-equip - rotate: false - xy: 441, 345 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 -flamethrower-equip - rotate: false - xy: 455, 345 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 -heal-blaster-equip - rotate: false - xy: 450, 317 - size: 12, 12 - orig: 12, 12 - offset: 0, 0 - index: -1 -shockgun-equip - rotate: false - xy: 397, 256 + xy: 516, 281 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 swarmer-equip rotate: false - xy: 411, 236 + xy: 516, 281 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +blaster-equip + rotate: false + xy: 544, 281 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +bomber-equip + rotate: false + xy: 558, 281 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +missiles-equip + rotate: false + xy: 558, 281 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +chain-blaster-equip + rotate: false + xy: 572, 283 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +flakgun-equip + rotate: false + xy: 158, 148 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +flamethrower-equip + rotate: false + xy: 172, 162 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +heal-blaster-equip + rotate: false + xy: 172, 148 + size: 12, 12 + orig: 12, 12 + offset: 0, 0 + index: -1 +shockgun-equip + rotate: false + xy: 141, 48 size: 12, 12 orig: 12, 12 offset: 0, 0 diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 1d0075e8b5..3202437499 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/Vars.java b/core/src/io/anuke/mindustry/Vars.java index 37374a0ce2..6376266c97 100644 --- a/core/src/io/anuke/mindustry/Vars.java +++ b/core/src/io/anuke/mindustry/Vars.java @@ -28,6 +28,7 @@ import io.anuke.ucore.util.Translator; import java.util.Arrays; import java.util.Locale; +@SuppressWarnings("unchecked") public class Vars{ public static final String discordURL = "https://discord.gg/mindustry"; public static final String releasesURL = "https://api.github.com/repos/Anuken/Mindustry/releases"; @@ -139,7 +140,6 @@ public class Vars{ } Arrays.sort(locales, (l1, l2) -> Platform.instance.getLocaleName(l1).compareTo(Platform.instance.getLocaleName(l2))); - Version.init(); content = new ContentLoader(); diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index b86a5109fe..019f9dc0c6 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -145,18 +145,18 @@ public class Recipes implements ContentList{ //UNITS //bodies - new Recipe(units, UpgradeBlocks.dartFactory, new ItemStack(Items.lead, 150), new ItemStack(Items.copper, 150), new ItemStack(Items.silicon, 200), new ItemStack(Items.titanium, 240)).setDesktop(); //dart is desktop only, because it's the starter mobile ship - new Recipe(units, UpgradeBlocks.tridentFactory, new ItemStack(Items.lead, 250), new ItemStack(Items.copper, 250), new ItemStack(Items.silicon, 250), new ItemStack(Items.titanium, 300), new ItemStack(Items.plastanium, 200)); - new Recipe(units, UpgradeBlocks.javelinFactory, new ItemStack(Items.lead, 350), new ItemStack(Items.silicon, 450), new ItemStack(Items.titanium, 500), new ItemStack(Items.plastanium, 400), new ItemStack(Items.phasematter, 200)); - new Recipe(units, UpgradeBlocks.glaiveFactory, new ItemStack(Items.lead, 450), new ItemStack(Items.silicon, 650), new ItemStack(Items.titanium, 700), new ItemStack(Items.plastanium, 600), new ItemStack(Items.surgealloy, 200)); + new Recipe(units, UpgradeBlocks.dartPad, new ItemStack(Items.lead, 150), new ItemStack(Items.copper, 150), new ItemStack(Items.silicon, 200), new ItemStack(Items.titanium, 240)).setDesktop(); //dart is desktop only, because it's the starter mobile ship + new Recipe(units, UpgradeBlocks.tridentPad, new ItemStack(Items.lead, 250), new ItemStack(Items.copper, 250), new ItemStack(Items.silicon, 250), new ItemStack(Items.titanium, 300), new ItemStack(Items.plastanium, 200)); + new Recipe(units, UpgradeBlocks.javelinPad, new ItemStack(Items.lead, 350), new ItemStack(Items.silicon, 450), new ItemStack(Items.titanium, 500), new ItemStack(Items.plastanium, 400), new ItemStack(Items.phasematter, 200)); + new Recipe(units, UpgradeBlocks.glaivePad, new ItemStack(Items.lead, 450), new ItemStack(Items.silicon, 650), new ItemStack(Items.titanium, 700), new ItemStack(Items.plastanium, 600), new ItemStack(Items.surgealloy, 200)); - new Recipe(units, UpgradeBlocks.tauFactory, new ItemStack(Items.lead, 250), new ItemStack(Items.densealloy, 250), new ItemStack(Items.copper, 250), new ItemStack(Items.silicon, 250)).setDesktop(); - new Recipe(units, UpgradeBlocks.deltaFactory, new ItemStack(Items.lead, 350), new ItemStack(Items.densealloy, 350), new ItemStack(Items.copper, 400), new ItemStack(Items.silicon, 450), new ItemStack(Items.thorium, 300)).setDesktop(); - new Recipe(units, UpgradeBlocks.omegaFactory, new ItemStack(Items.lead, 450), new ItemStack(Items.densealloy, 550), new ItemStack(Items.silicon, 650), new ItemStack(Items.thorium, 600), new ItemStack(Items.surgealloy, 240)).setDesktop(); + new Recipe(units, UpgradeBlocks.tauPad, new ItemStack(Items.lead, 250), new ItemStack(Items.densealloy, 250), new ItemStack(Items.copper, 250), new ItemStack(Items.silicon, 250)).setDesktop(); + new Recipe(units, UpgradeBlocks.deltaPad, new ItemStack(Items.lead, 350), new ItemStack(Items.densealloy, 350), new ItemStack(Items.copper, 400), new ItemStack(Items.silicon, 450), new ItemStack(Items.thorium, 300)).setDesktop(); + new Recipe(units, UpgradeBlocks.omegaPad, new ItemStack(Items.lead, 450), new ItemStack(Items.densealloy, 550), new ItemStack(Items.silicon, 650), new ItemStack(Items.thorium, 600), new ItemStack(Items.surgealloy, 240)).setDesktop(); //actual unit related stuff - new Recipe(units, UnitBlocks.dronePad, new ItemStack(Items.copper, 70), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 130)); - new Recipe(units, UnitBlocks.fabricatorPad, new ItemStack(Items.densealloy, 90), new ItemStack(Items.thorium, 80), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 210)); + new Recipe(units, UnitBlocks.spiritPad, new ItemStack(Items.copper, 70), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 130)); + new Recipe(units, UnitBlocks.phantomPad, new ItemStack(Items.densealloy, 90), new ItemStack(Items.thorium, 80), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 210)); new Recipe(units, UnitBlocks.daggerPad, new ItemStack(Items.lead, 90), new ItemStack(Items.silicon, 70)); new Recipe(units, UnitBlocks.titanPad, new ItemStack(Items.thorium, 90), new ItemStack(Items.lead, 140), new ItemStack(Items.silicon, 90)); diff --git a/core/src/io/anuke/mindustry/content/UnitTypes.java b/core/src/io/anuke/mindustry/content/UnitTypes.java index 38a62b4b54..b7c79e7860 100644 --- a/core/src/io/anuke/mindustry/content/UnitTypes.java +++ b/core/src/io/anuke/mindustry/content/UnitTypes.java @@ -8,20 +8,14 @@ import io.anuke.mindustry.game.ContentList; import io.anuke.mindustry.type.ContentType; public class UnitTypes implements ContentList{ - public static UnitType drone, alphaDrone, dagger, wraith, monsoon, revenant, titan, fortress, fabricator; + public static UnitType + spirit, phantom, + alphaDrone, + wraith, ghoul, revenant, + dagger, titan, fortress; @Override public void load(){ - drone = new UnitType("drone", Drone.class, Drone::new){{ - isFlying = true; - drag = 0.01f; - speed = 0.2f; - maxVelocity = 0.8f; - range = 50f; - healSpeed = 0.25f; - health = 60; - }}; - alphaDrone = new UnitType("alpha-drone", AlphaDrone.class, AlphaDrone::new){ { isFlying = true; @@ -40,6 +34,16 @@ public class UnitTypes implements ContentList{ } }; + spirit = new UnitType("spirit", Spirit.class, Spirit::new){{ + isFlying = true; + drag = 0.01f; + speed = 0.2f; + maxVelocity = 0.8f; + range = 50f; + healSpeed = 0.25f; + health = 60; + }}; + dagger = new UnitType("dagger", Dagger.class, Dagger::new){{ maxVelocity = 1.1f; speed = 0.2f; @@ -76,7 +80,7 @@ public class UnitTypes implements ContentList{ health = 70; }}; - monsoon = new UnitType("monsoon", Monsoon.class, Monsoon::new){{ + ghoul = new UnitType("ghoul", Ghoul.class, Ghoul::new){{ health = 250; speed = 0.2f; maxVelocity = 1.4f; @@ -94,7 +98,7 @@ public class UnitTypes implements ContentList{ weapon = Weapons.bomber; }}; - fabricator = new UnitType("fabricator", Fabricator.class, Fabricator::new){{ + phantom = new UnitType("phantom", Phantom.class, Phantom::new){{ isFlying = true; drag = 0.01f; speed = 0.2f; diff --git a/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java b/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java index 721f33b094..c6d43f4a23 100644 --- a/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java @@ -8,29 +8,31 @@ import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.blocks.units.*; public class UnitBlocks extends BlockList implements ContentList{ - public static Block repairPoint, dronePad, - fabricatorPad, interceptorPad, monsoonPad, daggerPad, titanPad, - reconstructor, commandCenter; + public static Block + spiritPad, phantomPad, + interceptorPad, monsoonPad, revenantPad, + daggerPad, titanPad, + reconstructor, repairPoint, commandCenter; @Override public void load(){ - dronePad = new UnitPad("drone-pad"){{ - type = UnitTypes.drone; + spiritPad = new UnitFactory("spirit-factory"){{ + type = UnitTypes.spirit; produceTime = 5700; size = 2; consumes.power(0.08f); consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 30), new ItemStack(Items.lead, 30)}); }}; - fabricatorPad = new UnitPad("fabricator-pad"){{ - type = UnitTypes.fabricator; + phantomPad = new UnitFactory("phantom-factory"){{ + type = UnitTypes.phantom; produceTime = 7300; size = 2; consumes.power(0.2f); consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 70), new ItemStack(Items.lead, 80), new ItemStack(Items.titanium, 80)}); }}; - interceptorPad = new UnitPad("wraith-pad"){{ + interceptorPad = new UnitFactory("wraith-factory"){{ type = UnitTypes.wraith; produceTime = 1800; size = 2; @@ -38,8 +40,8 @@ public class UnitBlocks extends BlockList implements ContentList{ consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 10), new ItemStack(Items.titanium, 10)}); }}; - monsoonPad = new UnitPad("monsoon-pad"){{ - type = UnitTypes.monsoon; + monsoonPad = new UnitFactory("ghoul-factory"){{ + type = UnitTypes.ghoul; produceTime = 3600; size = 3; consumes.power(0.2f); @@ -47,7 +49,16 @@ public class UnitBlocks extends BlockList implements ContentList{ consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 30), new ItemStack(Items.titanium, 30), new ItemStack(Items.plastanium, 20)}); }}; - daggerPad = new UnitPad("dagger-pad"){{ + revenantPad = new UnitFactory("revenant-factory"){{ + type = UnitTypes.revenant; + produceTime = 3600; + size = 4; + consumes.power(0.2f); + shadow = "shadow-round-3"; + consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 30), new ItemStack(Items.titanium, 30), new ItemStack(Items.plastanium, 20)}); + }}; + + daggerPad = new UnitFactory("dagger-factory"){{ type = UnitTypes.dagger; produceTime = 1700; size = 2; @@ -55,7 +66,7 @@ public class UnitBlocks extends BlockList implements ContentList{ consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 10), new ItemStack(Items.copper, 10)}); }}; - titanPad = new UnitPad("titan-pad"){{ + titanPad = new UnitFactory("titan-factory"){{ type = UnitTypes.titan; produceTime = 3400; size = 3; diff --git a/core/src/io/anuke/mindustry/content/blocks/UpgradeBlocks.java b/core/src/io/anuke/mindustry/content/blocks/UpgradeBlocks.java index dfcc60b5a9..843b6d2250 100644 --- a/core/src/io/anuke/mindustry/content/blocks/UpgradeBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/UpgradeBlocks.java @@ -2,53 +2,53 @@ package io.anuke.mindustry.content.blocks; import io.anuke.mindustry.content.Mechs; import io.anuke.mindustry.world.Block; -import io.anuke.mindustry.world.blocks.units.MechFactory; +import io.anuke.mindustry.world.blocks.units.MechPad; public class UpgradeBlocks extends BlockList{ - public static Block deltaFactory, tauFactory, omegaFactory, dartFactory, javelinFactory, tridentFactory, glaiveFactory; + public static Block deltaPad, tauPad, omegaPad, dartPad, javelinPad, tridentPad, glaivePad; @Override public void load(){ - deltaFactory = new MechFactory("delta-mech-factory"){{ + deltaPad = new MechPad("delta-mech-pad"){{ mech = Mechs.delta; size = 2; powerCapacity = 70f; }}; - tauFactory = new MechFactory("tau-mech-factory"){{ + tauPad = new MechPad("tau-mech-pad"){{ mech = Mechs.tau; size = 2; powerCapacity = 100f; }}; - omegaFactory = new MechFactory("omega-mech-factory"){{ + omegaPad = new MechPad("omega-mech-pad"){{ mech = Mechs.omega; size = 3; powerCapacity = 120f; }}; - dartFactory = new MechFactory("dart-ship-factory"){{ + dartPad = new MechPad("dart-ship-pad"){{ mech = Mechs.dart; size = 2; powerCapacity = 50f; shadow = "shadow-rounded-2"; }}; - javelinFactory = new MechFactory("javelin-ship-factory"){{ + javelinPad = new MechPad("javelin-ship-pad"){{ mech = Mechs.javelin; size = 2; powerCapacity = 80f; shadow = "shadow-rounded-2"; }}; - tridentFactory = new MechFactory("trident-ship-factory"){{ + tridentPad = new MechPad("trident-ship-pad"){{ mech = Mechs.trident; size = 2; powerCapacity = 100f; shadow = "shadow-rounded-2"; }}; - glaiveFactory = new MechFactory("glaive-ship-factory"){{ + glaivePad = new MechPad("glaive-ship-pad"){{ mech = Mechs.glaive; size = 3; powerCapacity = 120f; diff --git a/core/src/io/anuke/mindustry/core/ContentLoader.java b/core/src/io/anuke/mindustry/core/ContentLoader.java index 6284c9a1e6..20046d3ff9 100644 --- a/core/src/io/anuke/mindustry/core/ContentLoader.java +++ b/core/src/io/anuke/mindustry/core/ContentLoader.java @@ -201,6 +201,9 @@ public class ContentLoader{ if(id < 0) id += 256; if(temporaryMapper != null && temporaryMapper[type.ordinal()] != null && temporaryMapper[type.ordinal()].length != 0){ + if(temporaryMapper[type.ordinal()][id] == null){ + return getByID(type, 0); //default value is always ID 0 + } return (T)temporaryMapper[type.ordinal()][id]; } diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index 5cafdccc02..beeccfc38c 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -290,10 +290,6 @@ public class Renderer extends RendererModule{ float trnsX = -12, trnsY = -13; - //Graphics.end(); - //Core.batch.getTransformMatrix().translate(trnsX, trnsY, 0); - //Graphics.begin(); - for(EntityGroup group : unitGroups){ if(!group.isEmpty()){ drawAndInterpolate(group, unit -> unit.isFlying() && !unit.isDead(), baseUnit -> baseUnit.drawShadow(trnsX, trnsY)); @@ -304,11 +300,6 @@ public class Renderer extends RendererModule{ drawAndInterpolate(playerGroup, unit -> unit.isFlying() && !unit.isDead(), player -> player.drawShadow(trnsX, trnsY)); } - //Graphics.end(); - //Core.batch.getTransformMatrix().translate(-trnsX, -trnsY, 0); - //Graphics.begin(); - - //TODO this actually isn't necessary Draw.color(0, 0, 0, 0.15f); Graphics.flushSurface(); Draw.color(); diff --git a/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java b/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java index 1e99a92618..43e01340be 100644 --- a/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java +++ b/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java @@ -136,11 +136,13 @@ public abstract class FlyingUnit extends BaseUnit implements CarryTrait{ public void update(){ super.update(); - updateRotation(); + if(!Net.client()){ + updateRotation(); + wobble(); + } + trail.update(x + Angles.trnsx(rotation + 180f, 6f) + Mathf.range(wobblyness), y + Angles.trnsy(rotation + 180f, 6f) + Mathf.range(wobblyness)); - - wobble(); } @Override @@ -185,11 +187,11 @@ public abstract class FlyingUnit extends BaseUnit implements CarryTrait{ protected void wobble(){ if(Net.client()) return; - x += Mathf.sin(Timers.time() + id * 999, 25f, 0.07f)*Timers.delta(); - y += Mathf.cos(Timers.time() + id * 999, 25f, 0.07f)*Timers.delta(); + x += Mathf.sin(Timers.time() + id * 999, 25f, 0.08f)*Timers.delta(); + y += Mathf.cos(Timers.time() + id * 999, 25f, 0.08f)*Timers.delta(); if(velocity.len() <= 0.05f){ - rotation += Mathf.sin(Timers.time() + id * 99, 10f, 5f)*Timers.delta(); + rotation += Mathf.sin(Timers.time() + id * 99, 10f, 2.5f)*Timers.delta(); } } 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 5b64224cc7..f321995dff 100644 --- a/core/src/io/anuke/mindustry/entities/units/types/Drone.java +++ b/core/src/io/anuke/mindustry/entities/units/types/Drone.java @@ -27,7 +27,6 @@ import io.anuke.ucore.core.Effects; import io.anuke.ucore.core.Events; import io.anuke.ucore.core.Timers; import io.anuke.ucore.entities.EntityGroup; -import io.anuke.ucore.entities.EntityPhysics; import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Shapes; import io.anuke.ucore.util.Angles; diff --git a/core/src/io/anuke/mindustry/entities/units/types/Monsoon.java b/core/src/io/anuke/mindustry/entities/units/types/Ghoul.java similarity index 72% rename from core/src/io/anuke/mindustry/entities/units/types/Monsoon.java rename to core/src/io/anuke/mindustry/entities/units/types/Ghoul.java index b87e0d2f81..bc026434ab 100644 --- a/core/src/io/anuke/mindustry/entities/units/types/Monsoon.java +++ b/core/src/io/anuke/mindustry/entities/units/types/Ghoul.java @@ -2,6 +2,6 @@ package io.anuke.mindustry.entities.units.types; import io.anuke.mindustry.entities.units.FlyingUnit; -public class Monsoon extends FlyingUnit{ +public class Ghoul extends FlyingUnit{ } diff --git a/core/src/io/anuke/mindustry/entities/units/types/Fabricator.java b/core/src/io/anuke/mindustry/entities/units/types/Phantom.java similarity index 57% rename from core/src/io/anuke/mindustry/entities/units/types/Fabricator.java rename to core/src/io/anuke/mindustry/entities/units/types/Phantom.java index 90119c8550..622a5f245c 100644 --- a/core/src/io/anuke/mindustry/entities/units/types/Fabricator.java +++ b/core/src/io/anuke/mindustry/entities/units/types/Phantom.java @@ -1,5 +1,5 @@ package io.anuke.mindustry.entities.units.types; -public class Fabricator extends Drone{ +public class Phantom extends Drone{ } diff --git a/core/src/io/anuke/mindustry/entities/units/types/Spirit.java b/core/src/io/anuke/mindustry/entities/units/types/Spirit.java new file mode 100644 index 0000000000..1c535dc3ab --- /dev/null +++ b/core/src/io/anuke/mindustry/entities/units/types/Spirit.java @@ -0,0 +1,4 @@ +package io.anuke.mindustry.entities.units.types; + +public class Spirit extends Drone{ +} diff --git a/core/src/io/anuke/mindustry/game/Waves.java b/core/src/io/anuke/mindustry/game/Waves.java index 792f0add0b..6917ed4f1e 100644 --- a/core/src/io/anuke/mindustry/game/Waves.java +++ b/core/src/io/anuke/mindustry/game/Waves.java @@ -116,7 +116,7 @@ public class Waves{ end = 130; }}, - new SpawnGroup(UnitTypes.monsoon){{ + new SpawnGroup(UnitTypes.ghoul){{ begin = 40; unitAmount = 2; spacing = 2; @@ -134,7 +134,7 @@ public class Waves{ max = 8; }}, - new SpawnGroup(UnitTypes.monsoon){{ + new SpawnGroup(UnitTypes.ghoul){{ begin = 53; unitAmount = 2; unitScaling = 3; @@ -143,7 +143,7 @@ public class Waves{ end = 74; }}, - new SpawnGroup(UnitTypes.monsoon){{ + new SpawnGroup(UnitTypes.ghoul){{ begin = 53; unitAmount = 2; unitScaling = 3; diff --git a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java index e2011f08ca..ca5794fe63 100644 --- a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java +++ b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java @@ -27,7 +27,7 @@ import io.anuke.mindustry.world.blocks.production.Drill; import io.anuke.mindustry.world.blocks.production.Pump; import io.anuke.mindustry.world.blocks.storage.CoreBlock; import io.anuke.mindustry.world.blocks.storage.StorageBlock; -import io.anuke.mindustry.world.blocks.units.UnitPad; +import io.anuke.mindustry.world.blocks.units.UnitFactory; import io.anuke.mindustry.world.consumers.ConsumePower; import io.anuke.ucore.function.BiFunction; import io.anuke.ucore.function.IntPositionConsumer; @@ -206,7 +206,7 @@ public class FortressGenerator{ Tile tile = gen.tile(x + point.x, y + point.y); if(tile != null){ tile = tile.target(); - if(tile.getTeamID() == team.ordinal() && !(tile.block() instanceof Wall) && !(tile.block() instanceof UnitPad)){ + if(tile.getTeamID() == team.ordinal() && !(tile.block() instanceof Wall) && !(tile.block() instanceof UnitFactory)){ gen.setBlock(x, y, wall, team); break; } diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java index 5d8af4f5a4..a0f99c4a62 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java @@ -39,7 +39,7 @@ import static io.anuke.mindustry.Vars.unitGroups; public class CoreBlock extends StorageBlock{ protected float droneRespawnDuration = 60 * 6; - protected UnitType droneType = UnitTypes.drone; + protected UnitType droneType = UnitTypes.spirit; protected TextureRegion openRegion; protected TextureRegion topRegion; diff --git a/core/src/io/anuke/mindustry/world/blocks/units/MechFactory.java b/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java similarity index 98% rename from core/src/io/anuke/mindustry/world/blocks/units/MechFactory.java rename to core/src/io/anuke/mindustry/world/blocks/units/MechPad.java index 3eb8c7bc76..91b604352b 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/MechFactory.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java @@ -34,13 +34,13 @@ import java.io.IOException; import static io.anuke.mindustry.Vars.mobile; import static io.anuke.mindustry.Vars.tilesize; -public class MechFactory extends Block{ +public class MechPad extends Block{ protected Mech mech; protected float buildTime = 60 * 5; protected TextureRegion openRegion; - public MechFactory(String name){ + public MechPad(String name){ super(name); update = true; solidifes = true; @@ -83,7 +83,7 @@ public class MechFactory extends Block{ if(entity.player == null) return; - Mech result = ((MechFactory) tile.block()).mech; + Mech result = ((MechPad) tile.block()).mech; if(entity.player.mech == result){ entity.player.mech = (entity.player.isMobile ? Mechs.starterMobile : Mechs.starterDesktop); diff --git a/core/src/io/anuke/mindustry/world/blocks/units/UnitPad.java b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java similarity index 97% rename from core/src/io/anuke/mindustry/world/blocks/units/UnitPad.java rename to core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java index 93b297dcf5..003de053f0 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/UnitPad.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java @@ -34,7 +34,7 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -public class UnitPad extends Block{ +public class UnitFactory extends Block{ protected float gracePeriodMultiplier = 23f; protected float speedupTime = 60f * 60f * 20; protected float maxSpeedup = 2f; @@ -44,7 +44,7 @@ public class UnitPad extends Block{ protected float launchVelocity = 0f; protected TextureRegion topRegion; - public UnitPad(String name){ + public UnitFactory(String name){ super(name); update = true; hasPower = true; @@ -58,10 +58,10 @@ public class UnitPad extends Block{ @Remote(called = Loc.server) public static void onUnitFactorySpawn(Tile tile){ - if(!(tile.entity instanceof UnitFactoryEntity) || !(tile.block() instanceof UnitPad)) return; + if(!(tile.entity instanceof UnitFactoryEntity) || !(tile.block() instanceof UnitFactory)) return; UnitFactoryEntity entity = tile.entity(); - UnitPad factory = (UnitPad) tile.block(); + UnitFactory factory = (UnitFactory) tile.block(); entity.buildTime = 0f;