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

Removed redundant parens

Browse Source
This commit is contained in:
Anuken
2021-01-15 17:10:38 -05:00
parent f3b1ef02e3
commit 02ef633529
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/blocks/distribution/Conveyor.java
View File

@@ -114,7 +114,7 @@ public class Conveyor extends Block implements Autotiler{
@Override @Override
public void draw(){ public void draw(){
int frame = enabled && clogHeat <= 0.5f ? (int)(((Time.time * speed * 8f * timeScale())) % 4) : 0; int frame = enabled && clogHeat <= 0.5f ? (int)(((Time.time * speed * 8f * timeScale)) % 4) : 0;
//draw extra conveyors facing this one for non-square tiling purposes //draw extra conveyors facing this one for non-square tiling purposes
Draw.z(Layer.blockUnder); Draw.z(Layer.blockUnder);

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

@@ -45,7 +45,7 @@ public class ImpactReactor extends PowerGenerator{
bars.add("poweroutput", (GeneratorBuild entity) -> new Bar(() -> bars.add("poweroutput", (GeneratorBuild entity) -> new Bar(() ->
Core.bundle.format("bar.poweroutput", Core.bundle.format("bar.poweroutput",
Strings.fixed(Math.max(entity.getPowerProduction() - consumes.getPower().usage, 0) * 60 * entity.timeScale(), 1)), Strings.fixed(Math.max(entity.getPowerProduction() - consumes.getPower().usage, 0) * 60 * entity.timeScale, 1)),
() -> Pal.powerBar, () -> Pal.powerBar,
() -> entity.productionEfficiency)); () -> entity.productionEfficiency));
} }
@@ -72,7 +72,7 @@ public class ImpactReactor extends PowerGenerator{
if(consValid() && power.status >= 0.99f){ if(consValid() && power.status >= 0.99f){
boolean prevOut = getPowerProduction() <= consumes.getPower().requestedPower(this); boolean prevOut = getPowerProduction() <= consumes.getPower().requestedPower(this);
warmup = Mathf.lerpDelta(warmup, 1f, warmupSpeed * timeScale()); warmup = Mathf.lerpDelta(warmup, 1f, warmupSpeed * timeScale);
if(Mathf.equal(warmup, 1f, 0.001f)){ if(Mathf.equal(warmup, 1f, 0.001f)){
warmup = 1f; warmup = 1f;
} }
@@ -81,7 +81,7 @@ public class ImpactReactor extends PowerGenerator{
Events.fire(Trigger.impactPower); Events.fire(Trigger.impactPower);
} }
if(timer(timerUse, itemDuration / timeScale())){ if(timer(timerUse, itemDuration / timeScale)){
consume(); consume();
} }
}else{ }else{

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

@@ -81,7 +81,7 @@ public class NuclearReactor extends PowerGenerator{
if(fuel > 0 && enabled){ if(fuel > 0 && enabled){
heat += fullness * heating * Math.min(delta(), 4f); heat += fullness * heating * Math.min(delta(), 4f);
if(timer(timerFuel, itemDuration / timeScale())){ if(timer(timerFuel, itemDuration / timeScale)){
consume(); consume();
} }
}else{ }else{

2
core/src/mindustry/world/blocks/production/Drill.java
View File

@@ -90,7 +90,7 @@ public class Drill extends Block{
super.setBars(); super.setBars();
bars.add("drillspeed", (DrillBuild e) -> bars.add("drillspeed", (DrillBuild e) ->
new Bar(() -> Core.bundle.format("bar.drillspeed", Strings.fixed(e.lastDrillSpeed * 60 * e.timeScale(), 2)), () -> Pal.ammo, () -> e.warmup)); new Bar(() -> Core.bundle.format("bar.drillspeed", Strings.fixed(e.lastDrillSpeed * 60 * e.timeScale, 2)), () -> Pal.ammo, () -> e.warmup));
} }
public Item getDrop(Tile tile){ public Item getDrop(Tile tile){

2
core/src/mindustry/world/blocks/storage/Unloader.java
View File

@@ -52,7 +52,7 @@ public class Unloader extends Block{
@Override @Override
public void updateTile(){ public void updateTile(){
if(timer(timerUnload, speed / timeScale())){ if(timer(timerUnload, speed / timeScale)){
if(rotations == null || rotations.length != proximity.size){ if(rotations == null || rotations.length != proximity.size){
rotations = new int[proximity.size]; rotations = new int[proximity.size];
} }