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

Rename leak rate to leak resistance

Browse Source 
Since the higher the number is the slower it leaks.
This commit is contained in:
Patrick 'Quezler' Mounier
2019-11-05 14:55:14 +01:00
parent e04b756d36
commit 8f9a9ec3e5
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/io/anuke/mindustry/world/BlockStorage.java
View File

@@ -138,7 +138,7 @@ public abstract class BlockStorage extends UnlockableContent{
return tryMoveLiquid(tile, next, leak ? 1.5f : 0f, liquid); return tryMoveLiquid(tile, next, leak ? 1.5f : 0f, liquid);
} }
public float tryMoveLiquid(Tile tile, Tile next, float leakrate, Liquid liquid){ public float tryMoveLiquid(Tile tile, Tile next, float leakResistance, Liquid liquid){
if(next == null) return 0; if(next == null) return 0;
next = next.link(); next = next.link();
@@ -171,8 +171,8 @@ public abstract class BlockStorage extends UnlockableContent{
} }
} }
} }
}else if(leakrate > 0f && !next.block().solid && !next.block().hasLiquids){ }else if(leakResistance > 0f && !next.block().solid && !next.block().hasLiquids){
float leakAmount = tile.entity.liquids.get(liquid) / leakrate; float leakAmount = tile.entity.liquids.get(liquid) / leakResistance;
Puddle.deposit(next, tile, liquid, leakAmount); Puddle.deposit(next, tile, liquid, leakAmount);
tile.entity.liquids.remove(liquid, leakAmount); tile.entity.liquids.remove(liquid, leakAmount);
} }

3
core/src/io/anuke/mindustry/world/blocks/distribution/ArmoredConduit.java
View File

@@ -14,7 +14,7 @@ public class ArmoredConduit extends Conduit{
public ArmoredConduit(String name) { public ArmoredConduit(String name) {
super(name); super(name);
leakRate = 10f; leakResistance = 10f;
} }
@Override @Override
@@ -27,6 +27,7 @@ public class ArmoredConduit extends Conduit{
public void draw(Tile tile) { public void draw(Tile tile) {
super.draw(tile); super.draw(tile);
// draw the cap when a conduit would normally leak
Tile next = tile.getNearby(tile.rotation()); Tile next = tile.getNearby(tile.rotation());
if (next.getTeam() == tile.getTeam() && next.block().hasLiquids) return; if (next.getTeam() == tile.getTeam() && next.block().hasLiquids) return;

4
core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java
View File

@@ -21,7 +21,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
protected TextureRegion[] topRegions = new TextureRegion[7]; protected TextureRegion[] topRegions = new TextureRegion[7];
protected TextureRegion[] botRegions = new TextureRegion[7]; protected TextureRegion[] botRegions = new TextureRegion[7];
protected float leakRate = 1.5f; protected float leakResistance = 1.5f;
public Conduit(String name){ public Conduit(String name){
super(name); super(name);
@@ -111,7 +111,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
entity.smoothLiquid = Mathf.lerpDelta(entity.smoothLiquid, entity.liquids.total() / liquidCapacity, 0.05f); entity.smoothLiquid = Mathf.lerpDelta(entity.smoothLiquid, entity.liquids.total() / liquidCapacity, 0.05f);
if(tile.entity.liquids.total() > 0.001f && tile.entity.timer.get(timerFlow, 1)){ if(tile.entity.liquids.total() > 0.001f && tile.entity.timer.get(timerFlow, 1)){
tryMoveLiquid(tile, tile.getNearby(tile.rotation()), leakRate, tile.entity.liquids.current()); tryMoveLiquid(tile, tile.getNearby(tile.rotation()), leakResistance, tile.entity.liquids.current());
entity.noSleep(); entity.noSleep();
}else{ }else{
entity.sleep(); entity.sleep();