From 2aff73a958477d043ff679e8a035098f1f97cee1 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 28 Feb 2019 09:45:03 -0500
Subject: [PATCH] Added drill output rate bar

---
 .../items/item-spore-pod.png                  | Bin 2273 -> 2282 bytes
 core/assets/bundles/bundle.properties         |   1 +
 .../io/anuke/mindustry/content/Blocks.java    |   3 +++
 .../world/blocks/production/Drill.java        |  19 +++++++++++++++++-
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/core/assets-raw/sprites_replacement/items/item-spore-pod.png b/core/assets-raw/sprites_replacement/items/item-spore-pod.png
index 32bcf69fed989a73565d437afd96b1e339e44e4b..aa69408ee722a704c671acf44102130dfa85be89 100644
GIT binary patch
delta 2157
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

delta 2148
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
a8~^}q4a)@Z>J{<;0000<MNUMnLSTX)Z4Ng8

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 0bfa2ebd53..b20b6e0de4 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -305,6 +305,7 @@ no = No
 info.title = Info
 error.title = [crimson]An error has occured
 error.crashtitle = An error has occured
+blocks.outputspeed = Drill Speed: {0}/s
 blocks.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Block Info
 blocks.powerbalance = Power: {0}
diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java
index 3ca432a273..093098f960 100644
--- a/core/src/io/anuke/mindustry/content/Blocks.java
+++ b/core/src/io/anuke/mindustry/content/Blocks.java
@@ -913,6 +913,7 @@ public class Blocks implements ContentList{
             drillTime = 480;
             size = 2;
             drawMineItem = true;
+            consumes.liquid(Liquids.water, 0.06f).optional(true);
         }};
 
         laserDrill = new Drill("laser-drill"){{
@@ -925,6 +926,7 @@ public class Blocks implements ContentList{
             drillEffect = Fx.mineBig;
 
             consumes.power(1.10f);
+            consumes.liquid(Liquids.water, 0.08f).optional(true);
         }};
 
         blastDrill = new Drill("blast-drill"){{
@@ -941,6 +943,7 @@ public class Blocks implements ContentList{
             warmupSpeed = 0.01f;
 
             consumes.power(3f);
+            consumes.liquid(Liquids.water, 0.1f).optional(true);
         }};
 
         waterExtractor = new SolidPump("water-extractor"){{
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java
index bdd3279187..a91b74e466 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java
@@ -3,6 +3,7 @@ package io.anuke.mindustry.world.blocks.production;
 import io.anuke.arc.Core;
 import io.anuke.arc.collection.Array;
 import io.anuke.arc.collection.ObjectIntMap;
+import io.anuke.arc.util.Strings;
 import io.anuke.mindustry.entities.Effects;
 import io.anuke.mindustry.entities.Effects.Effect;
 import io.anuke.arc.graphics.Blending;
@@ -15,7 +16,9 @@ import io.anuke.mindustry.content.Fx;
 import io.anuke.mindustry.content.Liquids;
 import io.anuke.mindustry.entities.type.TileEntity;
 import io.anuke.mindustry.graphics.Layer;
+import io.anuke.mindustry.graphics.Pal;
 import io.anuke.mindustry.type.Item;
+import io.anuke.mindustry.ui.Bar;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.consumers.ConsumeLiquid;
@@ -72,7 +75,18 @@ public class Drill extends Block{
         liquidCapacity = 5f;
         hasItems = true;
 
-        consumes.add(new ConsumeLiquid(Liquids.water, 0.05f)).optional(true);
+        consumes.liquid(Liquids.water, 0.05f).optional(true);
+    }
+
+    @Override
+    public void setBars(){
+        super.setBars();
+
+        bars.add("drillspeed", e -> {
+            DrillEntity entity = (DrillEntity)e;
+
+            return new Bar(() -> Core.bundle.format("blocks.outputspeed", Strings.toFixed(entity.lastDrillSpeed * 60, 2)), () -> Pal.ammo, () -> entity.warmup);
+        });
     }
 
     @Override
@@ -197,6 +211,7 @@ public class Drill extends Block{
                 speed *= entity.power.satisfaction; // Drill slower when not at full power
             }
 
+            entity.lastDrillSpeed = (speed * entity.dominantItems * entity.warmup) / (drillTime + hardnessDrillMultiplier * Math.max(totalHardness, 1f) / entity.dominantItems);
             entity.warmup = Mathf.lerpDelta(entity.warmup, speed, warmupSpeed);
             entity.progress += entity.delta()
             * entity.dominantItems * speed * entity.warmup;
@@ -204,6 +219,7 @@ public class Drill extends Block{
             if(Mathf.chance(Time.delta() * updateEffectChance * entity.warmup))
                 Effects.effect(updateEffect, entity.x + Mathf.range(size * 2f), entity.y + Mathf.range(size * 2f));
         }else{
+            entity.lastDrillSpeed = 0f;
             entity.warmup = Mathf.lerpDelta(entity.warmup, 0f, warmupSpeed);
             return;
         }
@@ -257,6 +273,7 @@ public class Drill extends Block{
         public int index;
         public float warmup;
         public float drillTime;
+        public float lastDrillSpeed;
 
         public int dominantItems;
         public Item dominantItem;