@@ -209,7 +209,7 @@ public class Turret extends ReloadTurret{
|
||||
}
|
||||
|
||||
public void targetPosition(Posc pos){
|
||||
if(!hasAmmo()) return;
|
||||
if(!hasAmmo() || target == null) return;
|
||||
BulletType bullet = peekAmmo();
|
||||
float speed = bullet.speed;
|
||||
//slow bullets never intersect
|
||||
|
||||
@@ -18,7 +18,7 @@ public class LiquidConverter extends GenericCrafter{
|
||||
@Override
|
||||
public void init(){
|
||||
ConsumeLiquidBase cl = consumes.get(ConsumeType.liquid);
|
||||
cl.update(true);
|
||||
cl.update(false);
|
||||
outputLiquid.amount = cl.amount;
|
||||
super.init();
|
||||
}
|
||||
@@ -40,11 +40,13 @@ public class LiquidConverter extends GenericCrafter{
|
||||
|
||||
@Override
|
||||
public void updateTile(){
|
||||
ConsumeLiquidBase cl = consumes.get(ConsumeType.liquid);
|
||||
ConsumeLiquid cl = consumes.get(ConsumeType.liquid);
|
||||
|
||||
if(cons.valid()){
|
||||
float use = Math.min(cl.amount * edelta(), liquidCapacity - liquids.get(outputLiquid.liquid));
|
||||
|
||||
liquids.remove(cl.liquid, Math.min(use, liquids.get(cl.liquid)));
|
||||
|
||||
progress += use / cl.amount;
|
||||
liquids.add(outputLiquid.liquid, use);
|
||||
if(progress >= craftTime){
|
||||
|
||||
@@ -10,6 +10,7 @@ import mindustry.*;
|
||||
import mindustry.content.*;
|
||||
import mindustry.entities.*;
|
||||
import mindustry.entities.units.*;
|
||||
import mindustry.game.EventType.*;
|
||||
import mindustry.gen.*;
|
||||
import mindustry.graphics.*;
|
||||
import mindustry.type.*;
|
||||
@@ -174,6 +175,7 @@ public class Reconstructor extends UnitBlock{
|
||||
Effect.shake(2f, 3f, this);
|
||||
Fx.producesmoke.at(this);
|
||||
consume();
|
||||
Events.fire(new UnitCreateEvent(payload.unit));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user