diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 935fafce0f..48ef9d80df 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -2120,13 +2120,14 @@ public class Blocks{ mechanicalPump = new Pump("mechanical-pump"){{ requirements(Category.liquid, with(Items.copper, 15, Items.metaglass, 10)); pumpAmount = 7f / 60f; + liquidCapacity = 20f; }}; rotaryPump = new Pump("rotary-pump"){{ requirements(Category.liquid, with(Items.copper, 70, Items.metaglass, 50, Items.silicon, 20, Items.titanium, 35)); pumpAmount = 0.2f; consumePower(0.3f); - liquidCapacity = 30f; + liquidCapacity = 80f; hasPower = true; size = 2; }}; @@ -2135,33 +2136,34 @@ public class Blocks{ requirements(Category.liquid, with(Items.copper, 80, Items.metaglass, 90, Items.silicon, 30, Items.titanium, 40, Items.thorium, 35)); pumpAmount = 0.22f; consumePower(1.3f); - liquidCapacity = 40f; + liquidCapacity = 200f; hasPower = true; size = 3; }}; conduit = new Conduit("conduit"){{ requirements(Category.liquid, with(Items.metaglass, 1)); + liquidCapacity = 20f; health = 45; }}; pulseConduit = new Conduit("pulse-conduit"){{ requirements(Category.liquid, with(Items.titanium, 2, Items.metaglass, 1)); - liquidCapacity = 16f; + liquidCapacity = 40f; liquidPressure = 1.025f; health = 90; }}; platedConduit = new ArmoredConduit("plated-conduit"){{ requirements(Category.liquid, with(Items.thorium, 2, Items.metaglass, 1, Items.plastanium, 1)); - liquidCapacity = 16f; + liquidCapacity = 50f; liquidPressure = 1.025f; health = 220; }}; liquidRouter = new LiquidRouter("liquid-router"){{ requirements(Category.liquid, with(Items.graphite, 4, Items.metaglass, 2)); - liquidCapacity = 20f; + liquidCapacity = 120f; underBullets = true; solid = false; }}; @@ -2192,6 +2194,7 @@ public class Blocks{ arrowSpacing = 6f; range = 4; hasPower = false; + liquidCapacity = 100f; }}; phaseConduit = new LiquidBridge("phase-conduit"){{ @@ -2202,6 +2205,7 @@ public class Blocks{ hasPower = true; canOverdrive = false; pulse = true; + liquidCapacity = 100f; consumePower(0.30f); }}; @@ -2220,7 +2224,7 @@ public class Blocks{ requirements(Category.liquid, with(Items.beryllium, 2)); botColor = Pal.darkestMetal; leaks = true; - liquidCapacity = 20f; + liquidCapacity = 50f; liquidPressure = 1.03f; health = 250; researchCostMultiplier = 3; @@ -2243,6 +2247,7 @@ public class Blocks{ requirements(Category.liquid, with(Items.graphite, 8, Items.beryllium, 20)); range = 4; hasPower = false; + liquidCapacity = 120f; researchCostMultiplier = 1; underBullets = true; @@ -2251,7 +2256,7 @@ public class Blocks{ reinforcedLiquidRouter = new LiquidRouter("reinforced-liquid-router"){{ requirements(Category.liquid, with(Items.graphite, 8, Items.beryllium, 4)); - liquidCapacity = 30f; + liquidCapacity = 150f; liquidPadding = 3f/4f; researchCostMultiplier = 3; underBullets = true; @@ -2434,7 +2439,7 @@ public class Blocks{ itemDuration = 140f; ambientSound = Sounds.pulse; ambientSoundVolume = 0.07f; - liquidCapacity = 60f; + liquidCapacity = 80f; consumePower(25f); consumeItem(Items.blastCompound);