This commit is contained in:
Anuken
2020-10-20 14:02:10 -04:00
parent 82fe66b931
commit 30abfc0619
28 changed files with 53 additions and 19 deletions

View File

@@ -37,6 +37,10 @@ public class LiquidTurret extends Turret{
super.setStats();
stats.add(Stat.ammo, new AmmoListValue<>(ammoTypes));
}
@Override
public void init(){
consumes.add(new ConsumeLiquidFilter(i -> ammoTypes.containsKey(i), 1f){
@Override
public boolean valid(Building entity){
@@ -53,6 +57,8 @@ public class LiquidTurret extends Turret{
}
});
super.init();
}
public class LiquidTurretBuild extends TurretBuild{

View File

@@ -24,7 +24,6 @@ import mindustry.type.*;
import mindustry.world.blocks.*;
import mindustry.world.consumers.*;
import mindustry.world.meta.*;
import mindustry.world.meta.values.*;
import static mindustry.Vars.*;
@@ -60,7 +59,6 @@ public abstract class Turret extends ReloadTurret{
public boolean alternate = false;
public boolean targetAir = true;
public boolean targetGround = true;
public boolean acceptCoolant = true;
public Sortf unitSort = Unit::dst2;
@@ -105,10 +103,6 @@ public abstract class Turret extends ReloadTurret{
stats.add(Stat.reload, 60f / reloadTime * shots, StatUnit.none);
stats.add(Stat.targetsAir, targetAir);
stats.add(Stat.targetsGround, targetGround);
if(acceptCoolant){
stats.add(Stat.booster, new BoosterListValue(reloadTime, consumes.<ConsumeLiquidBase>get(ConsumeType.liquid).amount, coolantMultiplier, true, l -> consumes.liquidfilters.get(l.id)));
}
}
@Override

View File

@@ -279,10 +279,13 @@ public class LogicBlock extends Block{
//store link objects
executor.links = new Building[links.count(l -> l.valid && l.active)];
executor.linkIds.clear();
int index = 0;
for(LogicLink link : links){
if(link.active && link.valid){
executor.links[index ++] = world.build(link.x, link.y);
Building build = world.build(link.x, link.y);
executor.links[index ++] = build;
if(build != null) executor.linkIds.add(build.id);
}
}