Erekir Impact and Eruption Drill - Balancing PR

core/src/mindustry/content/Blocks.java

@@ -2847,17 +2847,19 @@ public static void load(){
             blockedItem = Items.thorium;
             researchCostMultiplier = 0.5f;
 
-            drillMultipliers.put(Items.beryllium, 2.5f);
+            drillMultipliers.put(Items.beryllium, 1.95f);
+            liquidBoostIntensity = 1.75f;
 
             fogRadius = 4;
 
             consumePower(160f / 60f);
-            consumeLiquid(Liquids.water, 0.2f);
+            consumeLiquid(Liquids.water, 10f / 60f);
+            consumeLiquid(Liquids.ozone, 3f / 60f).boost();           
         }};
 
         eruptionDrill = new BurstDrill("eruption-drill"){{
             requirements(Category.production, with(Items.silicon, 200, Items.oxide, 20, Items.tungsten, 200, Items.thorium, 120));
-            drillTime = 60f * 6f;
+            drillTime = 281.25f;
             size = 5;
             hasPower = true;
             tier = 7;
@@ -2869,18 +2871,20 @@ public static void load(){
                 Fx.mineImpactWave.wrap(Liquids.hydrogen.color, 45f)
             );
             shake = 4f;
-            itemCapacity = 50;
+            itemCapacity = 60;
             arrowOffset = 2f;
             arrowSpacing = 5f;
             arrows = 2;
             glowColor.a = 0.6f;
             fogRadius = 5;
 
-            drillMultipliers.put(Items.beryllium, 2.5f);
-
+            drillMultipliers.put(Items.beryllium, 1.35f);
+            liquidBoostIntensity = 2f;
+
             //TODO different requirements
             consumePower(6f);
-            consumeLiquids(LiquidStack.with(Liquids.hydrogen, 4f / 60f));
+            consumeLiquid(Liquids.hydrogen, 4f / 60f);
+            consumeLiquid(Liquids.cyanogen, 3f / 60f).boost();
         }};
 
         //endregion

core/src/mindustry/world/blocks/production/BurstDrill.java

@@ -11,6 +11,8 @@
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
+import mindustry.world.consumers.*;
+import mindustry.world.meta.*;
 
 public class BurstDrill extends Drill{
     public float shake = 2f;
@@ -35,7 +37,6 @@ public BurstDrill(String name){
 
         //does not drill in the traditional sense, so this is not even used
         hardnessDrillMultiplier = 0f;
-        liquidBoostIntensity = 1f;
         //generally at center
         drillEffectRnd = 0f;
         drillEffect = Fx.shockwave;
@@ -53,6 +54,20 @@ public float getDrillTime(Item item){
         return drillTime / drillMultipliers.get(item, 1f);
     }
 
+    @Override
+    public void setStats(){
+        super.setStats();
+
+        if(liquidBoostIntensity != 1 && findConsumer(f -> f instanceof ConsumeLiquidBase && f.booster) instanceof ConsumeLiquidBase consBase){
+            stats.remove(Stat.booster);
+            stats.add(Stat.booster,
+                StatValues.speedBoosters("{0}" + StatUnit.timesSpeed.localized(),
+                consBase.amount, liquidBoostIntensity, false,
+                l -> (consumesLiquid(l) && (findConsumer(f -> f instanceof ConsumeLiquid).booster || ((ConsumeLiquid)findConsumer(f -> f instanceof ConsumeLiquid)).liquid != l)))
+            );
+        }
+    }
+
     public class BurstDrillBuild extends DrillBuild{
         //used so the lights don't fade out immediately
         public float smoothProgress = 0f;
@@ -77,7 +92,7 @@ public void updateTile(){
             if(items.total() <= itemCapacity - dominantItems && dominantItems > 0 && efficiency > 0){
                 warmup = Mathf.approachDelta(warmup, progress / drillTime, 0.01f);
 
-                float speed = efficiency;
+                float speed = Mathf.lerp(1f, liquidBoostIntensity, optionalEfficiency) * efficiency;
 
                 timeDrilled += speedCurve.apply(progress / drillTime) * speed;