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

the tests pass

Browse Source
This commit is contained in:
Anuken
2022-02-15 17:04:40 -05:00
parent c324f2124b
commit bcf7479dbc
4 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/world/blocks/defense/ForceProjector.java
View File

@@ -20,6 +20,7 @@ import mindustry.world.meta.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
@Deprecated
public class ForceProjector extends Block{ public class ForceProjector extends Block{
public final int timerUse = timers++; public final int timerUse = timers++;
public float phaseUseTime = 350f; public float phaseUseTime = 350f;

2
core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java
View File

@@ -54,7 +54,7 @@ public class BaseTurret extends Block{
super.init(); super.init();
if(acceptCoolant){ if(acceptCoolant){
coolantConsumer = findConsumer(c -> c instanceof ConsumeLiquidBase && c.booster); coolantConsumer = findConsumer(c -> c instanceof ConsumeLiquidBase);
} }
} }

2
core/src/mindustry/world/blocks/defense/turrets/LaserTurret.java
View File

@@ -5,7 +5,6 @@ import arc.util.*;
import mindustry.entities.bullet.*; import mindustry.entities.bullet.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.type.*; import mindustry.type.*;
import mindustry.world.consumers.*;
import mindustry.world.meta.*; import mindustry.world.meta.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
@@ -19,7 +18,6 @@ public class LaserTurret extends PowerTurret{
public LaserTurret(String name){ public LaserTurret(String name){
super(name); super(name);
consume(new ConsumeCoolant(0.01f)).update(false);
coolantMultiplier = 1f; coolantMultiplier = 1f;
} }

20
core/src/mindustry/world/blocks/power/PowerGraph.java
View File

@@ -257,17 +257,15 @@ public class PowerGraph{
//there's something to update, add the entity //there's something to update, add the entity
entity.add(); entity.add();
if(build.block.consPower != null){ if(build.block.outputsPower && build.block.consumesPower && !build.block.consPower.buffered){
if(build.block.outputsPower && build.block.consumesPower && !build.block.consPower.buffered){ producers.add(build);
producers.add(build); consumers.add(build);
consumers.add(build); }else if(build.block.outputsPower && build.block.consumesPower){
}else if(build.block.outputsPower && build.block.consumesPower){ batteries.add(build);
batteries.add(build); }else if(build.block.outputsPower){
}else if(build.block.outputsPower){ producers.add(build);
producers.add(build); }else if(build.block.consumesPower){
}else if(build.block.consumesPower){ consumers.add(build);
consumers.add(build);
}
} }
} }
} }