Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'private/7.0-features' into 7.0-features

Browse Source
This commit is contained in:
Anuken
2022-03-02 15:33:29 -05:00
parent fb9a509a6f a511b885f6
commit 6d568318f9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/content/Blocks.java
View File

@@ -2080,7 +2080,7 @@ public class Blocks{
liquidCapacity = 20f; liquidCapacity = 20f;
liquidPressure = 1.03f; liquidPressure = 1.03f;
health = 250; health = 250;
researchCostMultiplier = 6; researchCostMultiplier = 3;
}}; }};
//TODO is this necessary? junctions are not good design //TODO is this necessary? junctions are not good design
@@ -2090,14 +2090,14 @@ public class Blocks{
buildCostMultiplier = 3f; buildCostMultiplier = 3f;
health = 260; health = 260;
((Conduit)reinforcedConduit).junctionReplacement = this; ((Conduit)reinforcedConduit).junctionReplacement = this;
researchCostMultiplier = 6; researchCostMultiplier = 1;
}}; }};
reinforcedBridgeConduit = new DirectionLiquidBridge("reinforced-bridge-conduit"){{ reinforcedBridgeConduit = new DirectionLiquidBridge("reinforced-bridge-conduit"){{
requirements(Category.liquid, with(Items.graphite, 6, Items.beryllium, 10)); requirements(Category.liquid, with(Items.graphite, 6, Items.beryllium, 10));
range = 4; range = 4;
hasPower = false; hasPower = false;
researchCostMultiplier = 6; researchCostMultiplier = 1;
((Conduit)reinforcedConduit).rotBridgeReplacement = this; ((Conduit)reinforcedConduit).rotBridgeReplacement = this;
}}; }};