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

Impact reactor display bugfix

Browse Source
This commit is contained in:
Anuken
2019-04-04 15:14:45 -04:00
parent bf56200c06
commit 09a435320a
19 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,6 @@ public class ImpactReactor extends PowerGenerator{
super(name);
hasPower = true;
hasLiquids = true;
powerProduction = 2.0f;
liquidCapacity = 30f;
hasItems = true;
outputsPower = consumesPower = true;
@@ -53,7 +52,7 @@ public class ImpactReactor extends PowerGenerator{
bars.add("poweroutput", entity -> new Bar(() ->
Core.bundle.format("bar.poweroutput",
Strings.fixed(Math.max(entity.block.getPowerProduction(entity.tile) - consumes.getPower().powerPerTick, 0)*60 * entity.delta(), 1)),
Strings.fixed(Math.max(entity.block.getPowerProduction(entity.tile) - consumes.getPower().powerPerTick, 0)*60 * entity.timeScale, 1)),
() -> Pal.powerBar,
() -> ((GeneratorEntity)entity).productionEfficiency));
}
@@ -73,6 +72,9 @@ public class ImpactReactor extends PowerGenerator{
if(entity.cons.valid()){
entity.warmup = Mathf.lerpDelta(entity.warmup, 1f, warmupSpeed);
if(Mathf.isEqual(entity.warmup, 1f, 0.001f)){
entity.warmup =1f;
}
if(entity.timer.get(timerUse, itemDuration)){
entity.cons.trigger();