Closes #9664

core/src/mindustry/world/blocks/power/ConsumeGenerator.java

@@ -3,6 +3,7 @@ package mindustry.world.blocks.power;
 import arc.*;
 import arc.graphics.*;
 import arc.math.*;
+import arc.struct.*;
 import arc.util.*;
 import mindustry.content.*;
 import mindustry.entities.*;
@@ -21,6 +22,7 @@ public class ConsumeGenerator extends PowerGenerator{
     public float effectChance = 0.01f;
     public Effect generateEffect = Fx.none, consumeEffect = Fx.none;
     public float generateEffectRange = 3f;
+    public float baseLightRadius = 65f;
 
     public @Nullable LiquidStack outputLiquid;
     /** If true, this block explodes when outputLiquid exceeds capacity. */
@@ -28,6 +30,8 @@ public class ConsumeGenerator extends PowerGenerator{
 
     public @Nullable ConsumeItemFilter filterItem;
     public @Nullable ConsumeLiquidFilter filterLiquid;
+    /** Multiplies the itemDuration for a given item. */
+    public ObjectFloatMap<Item> itemDurationMultipliers = new ObjectFloatMap<>();
 
     public ConsumeGenerator(String name){
         super(name);
@@ -47,6 +51,11 @@ public class ConsumeGenerator extends PowerGenerator{
         filterItem = findConsumer(c -> c instanceof ConsumeItemFilter);
         filterLiquid = findConsumer(c -> c instanceof ConsumeLiquidFilter);
 
+        //pass along the duration multipliers to the consumer, so it can display them properly
+        if(filterItem instanceof ConsumeItemEfficiency eff){
+            eff.itemDurationMultipliers = itemDurationMultipliers;
+        }
+
         if(outputLiquid != null){
             outputsLiquid = true;
             hasLiquids = true;
@@ -56,9 +65,8 @@ public class ConsumeGenerator extends PowerGenerator{
             explosionPuddleLiquid = outputLiquid.liquid;
         }
 
-        //TODO hardcoded
         emitLight = true;
-        lightRadius = 65f * size;
+        lightRadius = baseLightRadius * size;
         super.init();
     }
 
@@ -77,7 +85,7 @@ public class ConsumeGenerator extends PowerGenerator{
     }
 
     public class ConsumeGeneratorBuild extends GeneratorBuild{
-        public float warmup, totalTime, efficiencyMultiplier = 1f;
+        public float warmup, totalTime, efficiencyMultiplier = 1f, itemDurationMultiplier = 1;
 
         @Override
         public void updateEfficiencyMultiplier(){
@@ -106,6 +114,11 @@ public class ConsumeGenerator extends PowerGenerator{
                 generateEffect.at(x + Mathf.range(generateEffectRange), y + Mathf.range(generateEffectRange));
             }
 
+            //make sure the multiplier doesn't change when there is nothing to consume while it's still running
+            if(filterItem != null && valid && itemDurationMultipliers.size > 0 && filterItem.getConsumed(this) != null){
+                itemDurationMultiplier = itemDurationMultipliers.get(filterItem.getConsumed(this), 1);
+            }
+
             //take in items periodically
             if(hasItems && valid && generateTime <= 0f){
                 consume();
@@ -125,7 +138,7 @@ public class ConsumeGenerator extends PowerGenerator{
             }
 
             //generation time always goes down, but only at the end so consumeTriggerValid doesn't assume fake items
-            generateTime -= delta() / itemDuration;
+            generateTime -= delta() / (itemDuration * itemDurationMultiplier);
         }
 
         @Override