diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java index e3d344a3f0..281627dca8 100644 --- a/core/src/mindustry/entities/bullet/BulletType.java +++ b/core/src/mindustry/entities/bullet/BulletType.java @@ -217,7 +217,7 @@ public class BulletType extends Content implements Cloneable{ /** Use a negative value to disable homing delay. */ public float homingDelay = -1f; - /** Range of healing bock suppression effect. */ + /** Range of healing block suppression effect. */ public float suppressionRange = -1f; /** Duration of healing block suppression effect. */ public float suppressionDuration = 60f * 8f; diff --git a/core/src/mindustry/maps/SectorDamage.java b/core/src/mindustry/maps/SectorDamage.java index 2cd7f57694..4031c120a5 100644 --- a/core/src/mindustry/maps/SectorDamage.java +++ b/core/src/mindustry/maps/SectorDamage.java @@ -281,10 +281,10 @@ public class SectorDamage{ float avgHealth = totalPathBuild <= 1 ? sumHealth : sumHealth / totalPathBuild; //block dps + regen + extra health/shields - for(Building build : Groups.build){ - float e = build.efficiency; + for(Building build : state.rules.defaultTeam.data().buildings){ + float e = build.potentialEfficiency; if(e > 0.08f){ - if(build.team == state.rules.defaultTeam && build instanceof Ranged ranged && sparse.contains(t -> t.within(build, ranged.range() + 4*tilesize))){ + if(build instanceof Ranged ranged && sparse.contains(t -> t.within(build, ranged.range() + 4*tilesize))){ //TODO make sure power turret network supports the turrets? if(build instanceof TurretBuild b && b.hasAmmo()){ sumDps += b.estimateDps(); @@ -296,7 +296,7 @@ public class SectorDamage{ //point defense turrets act as flat health right now if(build.block instanceof PointDefenseTurret){ - sumHealth += 150f * build.timeScale() * build.efficiency; + sumHealth += 150f * build.timeScale() * build.potentialEfficiency; } if(build.block instanceof ForceProjector f){ diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index e96f7f3e31..2e73e906db 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -183,7 +183,7 @@ public class Turret extends ReloadTurret{ public float estimateDps(){ if(!hasAmmo()) return 0f; - return shoot.shots / reload * 60f * peekAmmo().estimateDPS() * efficiency * timeScale; + return shoot.shots / reload * 60f * peekAmmo().estimateDPS() * potentialEfficiency * timeScale; } @Override