Fixed wave turret being sporadic / Fixed unnecessary fluid usage
This commit is contained in:
@@ -1151,7 +1151,7 @@ public class Blocks implements ContentList{
|
||||
}};
|
||||
|
||||
blastDrill = new Drill("blast-drill"){{
|
||||
requirements(Category.production, ItemStack.with(Items.copper, 130, Items.silicon, 120, Items.titanium, 100, Items.thorium, 60));
|
||||
requirements(Category.production, ItemStack.with(Items.copper, 130, Items.silicon, 120, Items.titanium, 100, Items.thorium, 90));
|
||||
drillTime = 200;
|
||||
size = 4;
|
||||
drawRim = true;
|
||||
|
||||
@@ -95,8 +95,6 @@ public class MapPlayDialog extends FloatingDialog{
|
||||
show();
|
||||
}
|
||||
|
||||
|
||||
|
||||
private void displayGameModeHelp(){
|
||||
FloatingDialog d = new FloatingDialog(Core.bundle.get("mode.help.title"));
|
||||
d.setFillParent(false);
|
||||
|
||||
@@ -146,8 +146,7 @@ public abstract class Turret extends Block{
|
||||
public void update(Tile tile){
|
||||
TurretEntity entity = tile.entity();
|
||||
|
||||
if(entity.target != null && entity.target.isDead())
|
||||
entity.target = null;
|
||||
if(!validateTarget(tile)) entity.target = null;
|
||||
|
||||
entity.recoil = Mathf.lerpDelta(entity.recoil, 0f, restitution);
|
||||
entity.heat = Mathf.lerpDelta(entity.heat, 0f, cooldown);
|
||||
|
||||
@@ -25,7 +25,6 @@ import static io.anuke.mindustry.Vars.tilesize;
|
||||
* Liquids will take priority over items.
|
||||
*/
|
||||
public class ItemLiquidGenerator extends PowerGenerator{
|
||||
|
||||
protected float minItemEfficiency = 0.2f;
|
||||
/** The time in number of ticks during which a single item will produce power. */
|
||||
protected float itemDuration = 70f;
|
||||
@@ -71,6 +70,12 @@ public class ItemLiquidGenerator extends PowerGenerator{
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean shouldConsume(Tile tile){
|
||||
ItemLiquidGeneratorEntity entity = tile.entity();
|
||||
return entity.generateTime > 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void update(Tile tile){
|
||||
ItemLiquidGeneratorEntity entity = tile.entity();
|
||||
|
||||
@@ -4,6 +4,7 @@ import io.anuke.mindustry.type.Item;
|
||||
import io.anuke.mindustry.type.Liquid;
|
||||
|
||||
public class SingleTypeGenerator extends ItemLiquidGenerator{
|
||||
|
||||
public SingleTypeGenerator(boolean hasItems, boolean hasLiquids, String name){
|
||||
super(hasItems, hasLiquids, name);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user