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

Fix inconsistent power bar name (#6942)

Browse Source 
* Fix inconsistent power bar name

* Fix missing power generation bar

The boolean i removed was flipped, i don't even know why this check exists at all so i made it go poof
This commit is contained in:
buthed010203
2022-06-08 08:28:15 -04:00
committed by GitHub
parent 99eee2e738
commit ee03469f7c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/blocks/power/ImpactReactor.java
View File

@@ -50,7 +50,7 @@ public class ImpactReactor extends PowerGenerator{
public void setBars(){ public void setBars(){
super.setBars(); super.setBars();
addBar("poweroutput", (GeneratorBuild entity) -> new Bar(() -> addBar("power", (GeneratorBuild entity) -> new Bar(() ->
Core.bundle.format("bar.poweroutput", Core.bundle.format("bar.poweroutput",
Strings.fixed(Math.max(entity.getPowerProduction() - consPower.usage, 0) * 60 * entity.timeScale(), 1)), Strings.fixed(Math.max(entity.getPowerProduction() - consPower.usage, 0) * 60 * entity.timeScale(), 1)),
() -> Pal.powerBar, () -> Pal.powerBar,

2
core/src/mindustry/world/blocks/power/PowerGenerator.java
View File

@@ -47,7 +47,7 @@ public class PowerGenerator extends PowerDistributor{
public void setBars(){ public void setBars(){
super.setBars(); super.setBars();
if(hasPower && outputsPower && consPower != null){ if(hasPower && outputsPower){
addBar("power", (GeneratorBuild entity) -> new Bar(() -> addBar("power", (GeneratorBuild entity) -> new Bar(() ->
Core.bundle.format("bar.poweroutput", Core.bundle.format("bar.poweroutput",
Strings.fixed(entity.getPowerProduction() * 60 * entity.timeScale(), 1)), Strings.fixed(entity.getPowerProduction() * 60 * entity.timeScale(), 1)),