diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 0da58ff1f1..6af0357476 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -4518,6 +4518,7 @@ public class Blocks{ }}); }}; + scaleDamageEfficiency = true; shootSound = Sounds.none; loopSoundVolume = 1f; loopSound = Sounds.laserbeam; diff --git a/core/src/mindustry/world/blocks/defense/turrets/ContinuousTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ContinuousTurret.java index cfd5171b41..0b454c2737 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/ContinuousTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/ContinuousTurret.java @@ -15,6 +15,7 @@ public class ContinuousTurret extends Turret{ public BulletType shootType = Bullets.placeholder; /** Speed at which the turret can change its bullet "aim" distance. This is only used for point laser bullets. */ public float aimChangeSpeed = Float.POSITIVE_INFINITY; + public boolean scaleDamageEfficiency = false; public ContinuousTurret(String name){ super(name); @@ -115,6 +116,9 @@ public class ContinuousTurret extends Turret{ entry.bullet.aimX = Tmp.v1.x; entry.bullet.aimY = Tmp.v1.y; + if(scaleDamageEfficiency){ + entry.bullet.damage = entry.bullet.type.damage * Math.min(efficiency, 1f); + } if(isShooting() && hasAmmo()){ entry.bullet.time = entry.bullet.lifetime * entry.bullet.type.optimalLifeFract * Math.min(shootWarmup, efficiency);