diff --git a/core/assets-raw/sprites/blocks/payload/payload-mass-driver-base.png b/core/assets-raw/sprites/blocks/payload/payload-mass-driver-base.png index fb55b6eb6f..373f195e1e 100644 Binary files a/core/assets-raw/sprites/blocks/payload/payload-mass-driver-base.png and b/core/assets-raw/sprites/blocks/payload/payload-mass-driver-base.png differ diff --git a/core/assets-raw/sprites/blocks/payload/payload-mass-driver-top.png b/core/assets-raw/sprites/blocks/payload/payload-mass-driver-top.png index 84b064a4f1..0707b165ad 100644 Binary files a/core/assets-raw/sprites/blocks/payload/payload-mass-driver-top.png and b/core/assets-raw/sprites/blocks/payload/payload-mass-driver-top.png differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 5f73b84936..355e320699 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -3617,15 +3617,14 @@ public class Blocks{ canOverdrive = false; }}; - //TODO payloadMassDriver = new PayloadMassDriver("payload-mass-driver"){{ - requirements(Category.units, with(Items.tungsten, 120, Items.silicon, 120, Items.oxide, 60)); + requirements(Category.units, with(Items.tungsten, 120, Items.silicon, 120, Items.oxide, 70)); size = 3; - reloadTime = 150f; - chargeTime = 120f; + reloadTime = 130f; + chargeTime = 90f; range = 300f; maxPayloadSize = 2.5f; - consumes.power(3f); + consumes.power(2f); }}; payloadPropulsionTower = new PayloadMassDriver("payload-propulsion-tower"){{ diff --git a/core/src/mindustry/content/ErekirTechTree.java b/core/src/mindustry/content/ErekirTechTree.java index 1271d504e8..5d23138469 100644 --- a/core/src/mindustry/content/ErekirTechTree.java +++ b/core/src/mindustry/content/ErekirTechTree.java @@ -56,26 +56,34 @@ public class ErekirTechTree{ }); }); - //TODO should only be unlocked in unit sector - node(constructor, Seq.with(new Research(siliconArcFurnace), new OnSector(four)), () -> { + node(reinforcedPayloadConveyor, Seq.with(new OnSector(four)), () -> { + //TODO should only be unlocked in unit sector + node(constructor, Seq.with(new Research(siliconArcFurnace), new OnSector(four)), () -> { - //TODO further limitations - node(payloadLoader, () -> { - node(payloadUnloader, () -> { - node(payloadPropulsionTower, () -> { + node(payloadMassDriver, () -> { + //TODO further limitations + node(payloadLoader, () -> { + node(payloadUnloader, () -> { + node(payloadPropulsionTower, () -> { + }); + }); + }); + + node(smallDeconstructor, () -> { + node(largeConstructor, () -> { + + }); + + node(deconstructor, () -> { + + }); }); }); }); - node(smallDeconstructor, () -> { - node(largeConstructor, () -> { + node(reinforcedPayloadRouter, () -> { - }); - - node(deconstructor, () -> { - - }); }); }); });