mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-21 21:28:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

Power graph capacity display

Browse Source
This commit is contained in:
Anuken
2019-09-22 11:38:13 -04:00
parent 2dceb8927c
commit 2c0372f680
3 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/assets/bundles/bundle.properties
View File

@ -487,6 +487,7 @@ bar.drilltierreq = Better Drill Required
bar.drillspeed = Drill Speed: {0}/s bar.drillspeed = Drill Speed: {0}/s
bar.efficiency = Efficiency: {0}% bar.efficiency = Efficiency: {0}%
bar.powerbalance = Power: {0}/s bar.powerbalance = Power: {0}/s
bar.powerstored = Stored: {0}/{1}
bar.poweramount = Power: {0} bar.poweramount = Power: {0}
bar.poweroutput = Power Output: {0} bar.poweroutput = Power Output: {0}
bar.items = Items: {0} bar.items = Items: {0}

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

@ -100,6 +100,16 @@ public class PowerGraph{
return totalCapacity; return totalCapacity;
} }
public float getTotalBatteryCapacity(){
float totalCapacity = 0f;
for(Tile battery : batteries){
if(battery.block().consumes.hasPower()){
totalCapacity += battery.block().consumes.getPower().capacity;
}
}
return totalCapacity;
}
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;

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

@ -95,6 +95,12 @@ public class PowerNode extends PowerBlock{
((entity.power.graph.getPowerBalance() >= 0 ? "+" : "") + Strings.fixed(entity.power.graph.getPowerBalance() * 60, 1))), ((entity.power.graph.getPowerBalance() >= 0 ? "+" : "") + Strings.fixed(entity.power.graph.getPowerBalance() * 60, 1))),
() -> Pal.powerBar, () -> Pal.powerBar,
() -> Mathf.clamp(entity.power.graph.getPowerProduced() / entity.power.graph.getPowerNeeded()))); () -> Mathf.clamp(entity.power.graph.getPowerProduced() / entity.power.graph.getPowerNeeded())));
bars.add("batteries", entity -> new Bar(() ->
Core.bundle.format("bar.powerstored",
(ui.formatAmount((int)entity.power.graph.getBatteryStored())), ui.formatAmount((int)entity.power.graph.getTotalBatteryCapacity())),
() -> Pal.powerBar,
() -> Mathf.clamp(entity.power.graph.getBatteryStored() / entity.power.graph.getTotalBatteryCapacity())));
} }
@Override @Override