diff --git a/core/assets/contributors b/core/assets/contributors index bb40130061..d382955c6c 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -183,3 +183,4 @@ RushieWashie ITY Iniquit DSFdsfWxp +Someone's Shadow \ No newline at end of file diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 4491580f73..a935307e19 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -6256,7 +6256,7 @@ public class Blocks{ }}; tankAssembler = new UnitAssembler("tank-assembler"){{ - requirements(Category.units, with(Items.thorium, 500, Items.oxide, 150, Items.carbide, 80, Items.silicon, 500)); + requirements(Category.units, with(Items.thorium, 500, Items.oxide, 150, Items.carbide, 80, Items.silicon, 650)); regionSuffix = "-dark"; size = 5; plans.add( @@ -6266,12 +6266,12 @@ public class Blocks{ areaSize = 13; researchCostMultiplier = 0.4f; - consumePower(3f); + consumePower(2.5f); consumeLiquid(Liquids.cyanogen, 9f / 60f); }}; shipAssembler = new UnitAssembler("ship-assembler"){{ - requirements(Category.units, with(Items.carbide, 100, Items.oxide, 200, Items.tungsten, 500, Items.silicon, 800, Items.thorium, 400)); + requirements(Category.units, with(Items.carbide, 100, Items.oxide, 200, Items.tungsten, 550, Items.silicon, 900, Items.thorium, 400)); regionSuffix = "-dark"; size = 5; plans.add( @@ -6280,12 +6280,12 @@ public class Blocks{ ); areaSize = 13; - consumePower(3f); + consumePower(2.5f); consumeLiquid(Liquids.cyanogen, 12f / 60f); }}; mechAssembler = new UnitAssembler("mech-assembler"){{ - requirements(Category.units, with(Items.carbide, 200, Items.thorium, 600, Items.oxide, 200, Items.tungsten, 500, Items.silicon, 900)); + requirements(Category.units, with(Items.carbide, 200, Items.thorium, 600, Items.oxide, 200, Items.tungsten, 550, Items.silicon, 1000)); regionSuffix = "-dark"; size = 5; //TODO different reqs @@ -6295,14 +6295,14 @@ public class Blocks{ ); areaSize = 13; - consumePower(3.5f); + consumePower(3f); consumeLiquid(Liquids.cyanogen, 12f / 60f); }}; //TODO requirements / only accept inputs basicAssemblerModule = new UnitAssemblerModule("basic-assembler-module"){{ - requirements(Category.units, with(Items.carbide, 300, Items.thorium, 500, Items.oxide, 200, Items.phaseFabric, 400)); - consumePower(4f); + requirements(Category.units, with(Items.carbide, 300, Items.thorium, 500, Items.oxide, 250, Items.phaseFabric, 400)); + consumePower(3.5f); regionSuffix = "-dark"; researchCostMultiplier = 0.75f; @@ -6352,7 +6352,7 @@ public class Blocks{ }}; payloadMassDriver = new PayloadMassDriver("payload-mass-driver"){{ - requirements(Category.units, with(Items.tungsten, 120, Items.silicon, 120, Items.graphite, 50)); + requirements(Category.units, with(Items.tungsten, 40, Items.silicon, 50, Items.graphite, 20)); regionSuffix = "-dark"; size = 3; reload = 130f; @@ -6364,13 +6364,13 @@ public class Blocks{ }}; 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)); + requirements(Category.units, with(Items.phaseFabric, 20, 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; + range = 2100f; + maxPayloadSize = 4f; consumePower(3f); }}; @@ -6380,24 +6380,24 @@ public class Blocks{ itemCapacity = 100; consumePower(1f); size = 3; - deconstructSpeed = 1f; + deconstructSpeed = 3f; }}; deconstructor = new PayloadDeconstructor("deconstructor"){{ - requirements(Category.units, with(Items.beryllium, 250, Items.oxide, 100, Items.silicon, 250, Items.carbide, 250)); + requirements(Category.units, with(Items.beryllium, 250, Items.oxide, 100, Items.silicon, 250, Items.carbide, 50)); regionSuffix = "-dark"; itemCapacity = 250; consumePower(3f); size = 5; - deconstructSpeed = 2f; + deconstructSpeed = 6f; }}; constructor = new Constructor("constructor"){{ - requirements(Category.units, with(Items.silicon, 100, Items.beryllium, 150, Items.tungsten, 80)); + requirements(Category.units, with(Items.silicon, 50, Items.beryllium, 75, Items.tungsten, 40)); regionSuffix = "-dark"; hasPower = true; buildSpeed = 0.6f; - consumePower(2f); + consumePower(2.5f); size = 3; //TODO expand this list filter = Seq.with(Blocks.tungstenWallLarge, Blocks.berylliumWallLarge, Blocks.carbideWallLarge, Blocks.reinforcedSurgeWallLarge, Blocks.reinforcedLiquidContainer, Blocks.reinforcedContainer, Blocks.beamNode); @@ -6405,7 +6405,7 @@ public class Blocks{ //yes this block is pretty much useless largeConstructor = new Constructor("large-constructor"){{ - requirements(Category.units, with(Items.silicon, 150, Items.oxide, 150, Items.tungsten, 200, Items.phaseFabric, 40)); + requirements(Category.units, with(Items.silicon, 150, Items.oxide, 100, Items.tungsten, 200, Items.thorium, 80)); regionSuffix = "-dark"; hasPower = true; buildSpeed = 0.75f; @@ -6413,11 +6413,11 @@ public class Blocks{ minBlockSize = 3; size = 5; - consumePower(2f); + consumePower(3f); }}; payloadLoader = new PayloadLoader("payload-loader"){{ - requirements(Category.units, with(Items.graphite, 50, Items.silicon, 50, Items.tungsten, 80)); + requirements(Category.units, with(Items.graphite, 80, Items.silicon, 160, Items.tungsten, 90)); regionSuffix = "-dark"; hasPower = true; consumePower(2f); @@ -6426,7 +6426,7 @@ public class Blocks{ }}; payloadUnloader = new PayloadUnloader("payload-unloader"){{ - requirements(Category.units, with(Items.graphite, 50, Items.silicon, 50, Items.tungsten, 30)); + requirements(Category.units, with(Items.graphite, 140, Items.silicon, 220, Items.tungsten, 180)); regionSuffix = "-dark"; hasPower = true; consumePower(2f); diff --git a/core/src/mindustry/world/blocks/payloads/PayloadLoader.java b/core/src/mindustry/world/blocks/payloads/PayloadLoader.java index 3ec56f4a81..9c409a77b8 100644 --- a/core/src/mindustry/world/blocks/payloads/PayloadLoader.java +++ b/core/src/mindustry/world/blocks/payloads/PayloadLoader.java @@ -228,7 +228,7 @@ public class PayloadLoader extends PayloadBlock{ return payload != null && ( exporting || (payload.block().hasLiquids && liquids.currentAmount() >= 0.1f && payload.build.liquids.currentAmount() >= payload.block().liquidCapacity - 0.001f) || - (payload.block().hasItems && items.any() && payload.block().separateItemCapacity && content.items().contains(i -> payload.build.items.get(i) >= payload.block().itemCapacity)) || + (payload.block().hasItems && items.any() && payload.block().separateItemCapacity && content.items().contains(i -> (payload.build.items.get(i) >= payload.block().itemCapacity) && items.has(i))) || (hasBattery() && payload.build.power.status >= 0.999999999f)); }