mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-27 06:51:30 -08:00
Code Issues Projects Releases Wiki Activity

Fixed #9537

Browse source
This commit is contained in:
Anuken 2024-02-11 09:00:51 -05:00
parent 5ed1c5d29b
commit e99b9c2ad1
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/src/mindustry/game/Schematic.java
View file

@ -31,7 +31,7 @@ public class Schematic implements Publishable, Comparable<Schematic>{
}
public float powerProduction(){
return tiles.sumf(s -> s.block instanceof PowerGenerator p ? p.powerProduction : 0f);
return tiles.sumf(s -> s.block instanceof PowerGenerator p ? p.getDisplayedPowerProduction() : 0f);
}
public float powerConsumption(){

4
core/src/mindustry/world/blocks/power/PowerGenerator.java
View file

@ -46,6 +46,10 @@ public class PowerGenerator extends PowerDistributor{
flags = EnumSet.of(BlockFlag.generator);
}
public float getDisplayedPowerProduction(){
return powerProduction;
}
@Override
public TextureRegion[] icons(){
return drawer.finalIcons(this);

5
core/src/mindustry/world/blocks/power/ThermalGenerator.java
View file

@ -26,6 +26,11 @@ public class ThermalGenerator extends PowerGenerator{
noUpdateDisabled = true;
}
@Override
public float getDisplayedPowerProduction(){
return powerProduction / displayEfficiencyScale;
}
@Override
public void init(){
if(outputLiquid != null){