From 4d94c1632d35b16c342a00769489e316b44feca0 Mon Sep 17 00:00:00 2001 From: Shade Date: Sun, 25 May 2025 12:08:11 +0800 Subject: [PATCH 1/7] Payload Adjustments --- core/src/mindustry/content/Blocks.java | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index fc1b4d5f75..78950f6596 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -6356,7 +6356,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; @@ -6368,13 +6368,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 = 5f; consumePower(3f); }}; @@ -6384,24 +6384,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); @@ -6409,7 +6409,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; @@ -6417,11 +6417,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, 100, Items.silicon, 140, Items.tungsten, 180)); regionSuffix = "-dark"; hasPower = true; consumePower(2f); @@ -6430,7 +6430,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, 60, Items.silicon, 100, Items.tungsten, 90)); regionSuffix = "-dark"; hasPower = true; consumePower(2f); From bf935a62ff8c0c90bd03df414b4a3a1983c1b649 Mon Sep 17 00:00:00 2001 From: Shade Date: Sun, 25 May 2025 12:25:42 +0800 Subject: [PATCH 2/7] CounterBalance: Assemblers --- core/src/mindustry/content/Blocks.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 78950f6596..87927e3d7d 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -6260,7 +6260,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( @@ -6270,12 +6270,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( @@ -6284,12 +6284,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 @@ -6299,14 +6299,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; From 8433819ffb170b3172975f79acf2ac4b105dd373 Mon Sep 17 00:00:00 2001 From: Shade Date: Sun, 25 May 2025 14:00:27 +0800 Subject: [PATCH 3/7] Loader/Unloader Counterbalance 100% CB for Graphite, Silicon Maintaining 50% CB for Tungsten --- core/src/mindustry/content/Blocks.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 87927e3d7d..29f0c231c4 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -6421,7 +6421,7 @@ public class Blocks{ }}; payloadLoader = new PayloadLoader("payload-loader"){{ - requirements(Category.units, with(Items.graphite, 100, Items.silicon, 140, Items.tungsten, 180)); + requirements(Category.units, with(Items.graphite, 140, Items.silicon, 220, Items.tungsten, 180)); regionSuffix = "-dark"; hasPower = true; consumePower(2f); @@ -6430,7 +6430,7 @@ public class Blocks{ }}; payloadUnloader = new PayloadUnloader("payload-unloader"){{ - requirements(Category.units, with(Items.graphite, 60, Items.silicon, 100, Items.tungsten, 90)); + requirements(Category.units, with(Items.graphite, 80, Items.silicon, 160, Items.tungsten, 90)); regionSuffix = "-dark"; hasPower = true; consumePower(2f); From 112917b188ecff84b7403dd3f6ed5acbcfcc4a19 Mon Sep 17 00:00:00 2001 From: Shade Date: Sun, 25 May 2025 15:54:58 +0800 Subject: [PATCH 4/7] Payload Loaders now being able to chain with each other --- core/src/mindustry/world/blocks/payloads/PayloadLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)); } From 8c4cfe907657a086b91d9c3b22d812b8bff078ba Mon Sep 17 00:00:00 2001 From: Shade Date: Sun, 25 May 2025 15:56:13 +0800 Subject: [PATCH 5/7] Flipped Cost Between PayLoader and PayUnloader --- core/src/mindustry/content/Blocks.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 29f0c231c4..b912f1f2cf 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -6421,7 +6421,7 @@ public class Blocks{ }}; payloadLoader = new PayloadLoader("payload-loader"){{ - requirements(Category.units, with(Items.graphite, 140, Items.silicon, 220, Items.tungsten, 180)); + requirements(Category.units, with(Items.graphite, 80, Items.silicon, 160, Items.tungsten, 90)); regionSuffix = "-dark"; hasPower = true; consumePower(2f); @@ -6430,7 +6430,7 @@ public class Blocks{ }}; payloadUnloader = new PayloadUnloader("payload-unloader"){{ - requirements(Category.units, with(Items.graphite, 80, Items.silicon, 160, Items.tungsten, 90)); + requirements(Category.units, with(Items.graphite, 140, Items.silicon, 220, Items.tungsten, 180)); regionSuffix = "-dark"; hasPower = true; consumePower(2f); From 53c73b72592ec9cb5064abda4c63201c17b8a265 Mon Sep 17 00:00:00 2001 From: Shade Date: Sun, 25 May 2025 22:53:20 +0800 Subject: [PATCH 6/7] Update Contributors Honestly after some self reflection... I'm satisfied with what I've done --- core/assets/contributors | 1 + 1 file changed, 1 insertion(+) diff --git a/core/assets/contributors b/core/assets/contributors index c8b2ef69de..7acc360402 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -181,3 +181,4 @@ IchMagSchokolade MonoChronos RushieWashie ITY +Someone's Shadow \ No newline at end of file From b5aa9f41d9c0fdca60949982196003e4c77365e4 Mon Sep 17 00:00:00 2001 From: Shade Date: Mon, 26 May 2025 00:48:47 +0800 Subject: [PATCH 7/7] maxPayloadSize from 5by5 to 4by4 --- core/src/mindustry/content/Blocks.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index b912f1f2cf..c3efb77c8d 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -6374,7 +6374,7 @@ public class Blocks{ reload = 130f; chargeTime = 100f; range = 2100f; - maxPayloadSize = 5f; + maxPayloadSize = 4f; consumePower(3f); }};