diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java b/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java index 2f81cb86fb..688948759e 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java @@ -7,6 +7,7 @@ import io.anuke.arc.collection.ObjectSet; import io.anuke.arc.collection.Queue; import io.anuke.arc.math.Mathf; import io.anuke.arc.math.WindowedMean; +import io.anuke.arc.util.Time; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.consumers.Consume; import io.anuke.mindustry.world.consumers.ConsumePower; @@ -131,7 +132,6 @@ public class PowerGraph{ //if(!otherConsumersAreValid(consumer, consumePower)){ // consumer.entity.power.satisfaction = 0.0f; // Only supply power if the consumer would get valid that way //}else{ - //currently satisfies power even if it's not required yet if(consumePower.isBuffered){ // Add an equal percentage of power to all buffers, based on the global power coverage in this graph @@ -140,7 +140,7 @@ public class PowerGraph{ }else{ consumer.entity.power.satisfaction = coverage; } - // } + //} } } } @@ -163,7 +163,7 @@ public class PowerGraph{ } } - powerBalance.addValue(powerProduced - powerNeeded); + powerBalance.addValue((powerProduced - powerNeeded) / Time.delta()); distributePower(powerNeeded, powerProduced); } diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java index b92833bac3..67de830e95 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java @@ -95,7 +95,7 @@ public class PowerNode extends PowerBlock{ Core.bundle.format("blocks.powerbalance", entity.power.graph == null ? "+0" : ((entity.power.graph.getPowerBalance() >= 0 ? "+" : "") + Strings.toFixed(entity.power.graph.getPowerBalance()*60, 1))), () -> Pal.powerBar, - () -> entity.power.graph == null ? 0 :Mathf.clamp(entity.power.graph.getPowerProduced() / entity.power.graph.getPowerNeeded()))); + () -> entity.power.graph == null ? 0 : Mathf.clamp(entity.power.graph.getPowerProduced() / entity.power.graph.getPowerNeeded()))); } @Override diff --git a/core/src/io/anuke/mindustry/world/consumers/Consumers.java b/core/src/io/anuke/mindustry/world/consumers/Consumers.java index 23f6f456bf..c048e9644d 100644 --- a/core/src/io/anuke/mindustry/world/consumers/Consumers.java +++ b/core/src/io/anuke/mindustry/world/consumers/Consumers.java @@ -53,7 +53,7 @@ public class Consumers{ * @param powerCapacity The maximum capacity in power units. */ public ConsumePower powerBuffered(float powerCapacity){ - return powerBuffered(powerCapacity, 1f); + return powerBuffered(powerCapacity, 60f * 3); } /**