Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed battery balance from displayed balance

Browse Source
This commit is contained in:
Anuken
2019-02-15 09:15:00 -05:00
parent f33e924cdf
commit 070bb4d2d1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/io/anuke/mindustry/world/blocks/power/PowerGraph.java
View File

@@ -88,7 +88,7 @@ public class PowerGraph{
public float useBatteries(float needed){ public float useBatteries(float needed){
float stored = getBatteryStored(); float stored = getBatteryStored();
if(Mathf.isEqual(stored, 0f)){ return 0f; } if(Mathf.isEqual(stored, 0f)) return 0f;
float used = Math.min(stored, needed); float used = Math.min(stored, needed);
float consumedPowerPercentage = Math.min(1.0f, needed / stored); float consumedPowerPercentage = Math.min(1.0f, needed / stored);
@@ -155,6 +155,8 @@ public class PowerGraph{
float powerNeeded = getPowerNeeded(); float powerNeeded = getPowerNeeded();
float powerProduced = getPowerProduced(); float powerProduced = getPowerProduced();
powerBalance.addValue((powerProduced - powerNeeded) / Time.delta());
if(!Mathf.isEqual(powerNeeded, powerProduced)){ if(!Mathf.isEqual(powerNeeded, powerProduced)){
if(powerNeeded > powerProduced){ if(powerNeeded > powerProduced){
powerProduced += useBatteries(powerNeeded - powerProduced); powerProduced += useBatteries(powerNeeded - powerProduced);
@@ -163,8 +165,6 @@ public class PowerGraph{
} }
} }
powerBalance.addValue((powerProduced - powerNeeded) / Time.delta());
distributePower(powerNeeded, powerProduced); distributePower(powerNeeded, powerProduced);
} }