From 8f9a9ec3e5de7e4679f7aea8e6a1dfa52c53d002 Mon Sep 17 00:00:00 2001
From: Patrick 'Quezler' Mounier <patrick@queztech.net>
Date: Tue, 5 Nov 2019 14:55:14 +0100
Subject: [PATCH] Rename leak rate to leak resistance

Since the higher the number is the slower it leaks.
---
 core/src/io/anuke/mindustry/world/BlockStorage.java         | 6 +++---
 .../mindustry/world/blocks/distribution/ArmoredConduit.java | 3 ++-
 .../anuke/mindustry/world/blocks/distribution/Conduit.java  | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/core/src/io/anuke/mindustry/world/BlockStorage.java b/core/src/io/anuke/mindustry/world/BlockStorage.java
index 143171ad22..59d3ae4165 100644
--- a/core/src/io/anuke/mindustry/world/BlockStorage.java
+++ b/core/src/io/anuke/mindustry/world/BlockStorage.java
@@ -138,7 +138,7 @@ public abstract class BlockStorage extends UnlockableContent{
         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;
 
         next = next.link();
@@ -171,8 +171,8 @@ public abstract class BlockStorage extends UnlockableContent{
                     }
                 }
             }
-        }else if(leakrate > 0f && !next.block().solid && !next.block().hasLiquids){
-            float leakAmount = tile.entity.liquids.get(liquid) / leakrate;
+        }else if(leakResistance > 0f && !next.block().solid && !next.block().hasLiquids){
+            float leakAmount = tile.entity.liquids.get(liquid) / leakResistance;
             Puddle.deposit(next, tile, liquid, leakAmount);
             tile.entity.liquids.remove(liquid, leakAmount);
         }
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/ArmoredConduit.java b/core/src/io/anuke/mindustry/world/blocks/distribution/ArmoredConduit.java
index 995eb42391..d9ed02dddc 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/ArmoredConduit.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/ArmoredConduit.java
@@ -14,7 +14,7 @@ public class ArmoredConduit extends Conduit{
 
     public ArmoredConduit(String name) {
         super(name);
-        leakRate = 10f;
+        leakResistance = 10f;
     }
 
     @Override
@@ -27,6 +27,7 @@ public class ArmoredConduit extends Conduit{
     public void draw(Tile tile) {
         super.draw(tile);
 
+        // draw the cap when a conduit would normally leak
         Tile next = tile.getNearby(tile.rotation());
         if (next.getTeam() == tile.getTeam() && next.block().hasLiquids) return;
 
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java
index 2602f21058..9ee5ee4aab 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java
@@ -21,7 +21,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
     protected TextureRegion[] topRegions = new TextureRegion[7];
     protected TextureRegion[] botRegions = new TextureRegion[7];
 
-    protected float leakRate = 1.5f;
+    protected float leakResistance = 1.5f;
 
     public Conduit(String 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);
 
         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();
         }else{
             entity.sleep();