diff --git a/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-base.png b/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-base.png new file mode 100644 index 0000000000..71926c7682 Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-base.png differ diff --git a/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-cap.png b/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-cap.png new file mode 100644 index 0000000000..f04e6f0949 Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-cap.png differ diff --git a/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-left.png b/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-left.png new file mode 100644 index 0000000000..ea8ec25805 Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-left.png differ diff --git a/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-right.png b/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-right.png new file mode 100644 index 0000000000..6169ea0ff9 Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-right.png differ diff --git a/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-top.png b/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-top.png new file mode 100644 index 0000000000..651424a4b3 Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver-top.png differ diff --git a/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver.png b/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver.png new file mode 100644 index 0000000000..607b2c2443 Binary files /dev/null and b/core/assets-raw/sprites/blocks/payload/large-payload-mass-driver.png differ diff --git a/core/assets-raw/sprites/blocks/payload/payload-propulsion-tower-base.png b/core/assets-raw/sprites/blocks/payload/payload-propulsion-tower-base.png deleted file mode 100644 index 22f0f40623..0000000000 Binary files a/core/assets-raw/sprites/blocks/payload/payload-propulsion-tower-base.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/payload/payload-propulsion-tower-cap.png b/core/assets-raw/sprites/blocks/payload/payload-propulsion-tower-cap.png deleted file mode 100644 index ed5066a871..0000000000 Binary files a/core/assets-raw/sprites/blocks/payload/payload-propulsion-tower-cap.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/payload/payload-propulsion-tower-left.png b/core/assets-raw/sprites/blocks/payload/payload-propulsion-tower-left.png deleted file mode 100644 index ac79f7b59b..0000000000 Binary files a/core/assets-raw/sprites/blocks/payload/payload-propulsion-tower-left.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/payload/payload-propulsion-tower-right.png b/core/assets-raw/sprites/blocks/payload/payload-propulsion-tower-right.png deleted file mode 100644 index 0bb4969d84..0000000000 Binary files a/core/assets-raw/sprites/blocks/payload/payload-propulsion-tower-right.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/payload/payload-propulsion-tower-top.png b/core/assets-raw/sprites/blocks/payload/payload-propulsion-tower-top.png deleted file mode 100644 index 2e40b34e97..0000000000 Binary files a/core/assets-raw/sprites/blocks/payload/payload-propulsion-tower-top.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/payload/payload-propulsion-tower.png b/core/assets-raw/sprites/blocks/payload/payload-propulsion-tower.png deleted file mode 100644 index d66a166412..0000000000 Binary files a/core/assets-raw/sprites/blocks/payload/payload-propulsion-tower.png and /dev/null differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 3e999fb74d..c82f8f679b 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1546,7 +1546,7 @@ block.payload-router.name = Payload Router block.duct.name = Duct block.duct-router.name = Duct Router block.duct-bridge.name = Duct Bridge -block.payload-propulsion-tower.name = Payload Propulsion Tower +block.large-payload-mass-driver.name = Large Payload Mass Driver block.payload-void.name = Payload Void block.payload-source.name = Payload Source block.disassembler.name = Disassembler diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index e878bd06e3..f76ab6cb48 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -331,7 +331,6 @@ 63397=disarmed|status-disarmed-ui 63385=duct|block-duct-ui 63376=repair-turret|block-repair-turret-ui -63375=payload-propulsion-tower|block-payload-propulsion-tower-ui 63374=payload-incinerator|block-payload-incinerator-ui 63373=payload-void|block-payload-void-ui 63372=payload-source|block-payload-source-ui @@ -581,3 +580,4 @@ 63102=sand-floor|block-sand-floor-ui 63101=crystalline-vent|block-crystalline-vent-ui 63100=heat-router|block-heat-router-ui +63099=large-payload-mass-driver|block-large-payload-mass-driver-ui diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat index 9fa464644f..f7b1fcc882 100644 Binary files a/core/assets/logicids.dat and b/core/assets/logicids.dat differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index c971d153a9..b525f091a7 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -155,7 +155,7 @@ public class Blocks{ unitRepairTower, //payloads - payloadConveyor, payloadRouter, reinforcedPayloadConveyor, reinforcedPayloadRouter, payloadMassDriver, payloadPropulsionTower, smallDeconstructor, deconstructor, constructor, largeConstructor, payloadLoader, payloadUnloader, + payloadConveyor, payloadRouter, reinforcedPayloadConveyor, reinforcedPayloadRouter, payloadMassDriver, largePayloadMassDriver, smallDeconstructor, deconstructor, constructor, largeConstructor, payloadLoader, payloadUnloader, //logic message, switchBlock, microProcessor, logicProcessor, hyperProcessor, largeLogicDisplay, logicDisplay, memoryCell, memoryBank, @@ -5583,15 +5583,15 @@ public class Blocks{ consumePower(0.5f); }}; - payloadPropulsionTower = new PayloadMassDriver("payload-propulsion-tower"){{ - requirements(Category.units, with(Items.thorium, 300, Items.silicon, 200, Items.plastanium, 200, Items.phaseFabric, 50)); + largePayloadMassDriver = new PayloadMassDriver("large-payload-mass-driver"){{ + requirements(Category.units, with(Items.thorium, 200, Items.tungsten, 200, Items.silicon, 200, Items.graphite, 100, Items.oxide, 30)); regionSuffix = "-dark"; size = 5; reload = 130f; chargeTime = 100f; range = 1100f; maxPayloadSize = 3.5f; - consumePower(6f); + consumePower(3f); }}; smallDeconstructor = new PayloadDeconstructor("small-deconstructor"){{ diff --git a/core/src/mindustry/content/ErekirTechTree.java b/core/src/mindustry/content/ErekirTechTree.java index 0e455d7a1b..d5f14d47be 100644 --- a/core/src/mindustry/content/ErekirTechTree.java +++ b/core/src/mindustry/content/ErekirTechTree.java @@ -107,10 +107,9 @@ public class ErekirTechTree{ //TODO further limitations node(payloadLoader, () -> { node(payloadUnloader, () -> { - //TODO replace. - //node(payloadPropulsionTower, () -> { + node(largePayloadMassDriver, () -> { - //}); + }); }); });