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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2020-10-09 10:02:12 -04:00
parent 22f1c3b2d1 1d34b8474b
commit 99539bbab0
6 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/blocks/liquid/ArmoredConduit.java
View File

@@ -11,7 +11,7 @@ public class ArmoredConduit extends Conduit{
public ArmoredConduit(String name){
super(name);
leakResistance = 10f;
leaks = false;
}
@Override

4
core/src/mindustry/world/blocks/liquid/Conduit.java
View File

@@ -27,7 +27,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
public @Load(value = "@-top-#", length = 5) TextureRegion[] topRegions;
public @Load(value = "@-bottom-#", length = 5, fallback = "conduit-bottom-#") TextureRegion[] botRegions;
public float leakResistance = 1.5f;
public boolean leaks = true;
public Conduit(String name){
super(name);
@@ -131,7 +131,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
smoothLiquid = Mathf.lerpDelta(smoothLiquid, liquids.currentAmount() / liquidCapacity, 0.05f);
if(liquids.total() > 0.001f && timer(timerFlow, 1)){
moveLiquidForward(leakResistance, liquids.current());
moveLiquidForward(leaks, liquids.current());
noSleep();
}else{
sleep();