diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 45c67867bd..300ab3f2c4 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -4227,6 +4227,7 @@ public class Blocks{ newTargetInterval = 40f; shootWarmupSpeed = 0.07f; + warmupMaintainTime = 120f; coolant = consume(new ConsumeLiquid(Liquids.water, 30f / 60f)); coolantMultiplier = 1.5f; @@ -4950,7 +4951,7 @@ public class Blocks{ outlineColor = Pal.darkOutline; size = 5; envEnabled |= Env.space; - warmupMaintainTime = 30f; + warmupMaintainTime = 120f; reload = 100f; recoil = 2f; range = 300; @@ -5277,7 +5278,7 @@ public class Blocks{ velocityRnd = 0.15f; heatRequirement = 90f; maxHeatEfficiency = 2f; - warmupMaintainTime = 30f; + warmupMaintainTime = 120f; consumePower(10f); shoot = new ShootSummon(0f, 0f, circleRad, 48f); diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index 4cbc7199dc..947b87f767 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -371,7 +371,7 @@ public class Turret extends ReloadTurret{ if(!validateTarget()) target = null; float warmupTarget = (isShooting() && canConsume()) || charging() ? 1f : 0f; - if(warmupTarget > 0 && shootWarmup >= minWarmup && !isControlled()){ + if(warmupTarget > 0 && !isControlled()){ warmupHold = 1f; } if(warmupHold > 0f){