diff --git a/core/src/mindustry/entities/bullet/ContinuousBulletType.java b/core/src/mindustry/entities/bullet/ContinuousBulletType.java index 90ffdb93b5..9dfb85ad25 100644 --- a/core/src/mindustry/entities/bullet/ContinuousBulletType.java +++ b/core/src/mindustry/entities/bullet/ContinuousBulletType.java @@ -32,7 +32,7 @@ public class ContinuousBulletType extends BulletType{ @Override public float continuousDamage(){ if(!continuous) return -1f; - return 60f / damageInterval; + return damage / damageInterval * 60f; } @Override diff --git a/core/src/mindustry/entities/bullet/PointLaserBulletType.java b/core/src/mindustry/entities/bullet/PointLaserBulletType.java index d317afd0e1..ca81ce7ad7 100644 --- a/core/src/mindustry/entities/bullet/PointLaserBulletType.java +++ b/core/src/mindustry/entities/bullet/PointLaserBulletType.java @@ -47,7 +47,7 @@ public class PointLaserBulletType extends BulletType{ @Override public float continuousDamage(){ - return 60f / damageInterval; + return damage / damageInterval * 60f; } @Override diff --git a/core/src/mindustry/world/meta/StatValues.java b/core/src/mindustry/world/meta/StatValues.java index f124084683..7ec773185a 100644 --- a/core/src/mindustry/world/meta/StatValues.java +++ b/core/src/mindustry/world/meta/StatValues.java @@ -641,7 +641,7 @@ public class StatValues{ if(type.damage > 0 && (type.collides || type.splashDamage <= 0)){ bt.add(Core.bundle.format("bullet.damage", type.damage) + (type.continuousDamage() > 0 ? - "[lightgray] ~ [stat]" + Strings.autoFixed(type.continuousDamage(), 0) + "[lightgray] " + StatUnit.perSecond.localized() : "")); + "[lightgray] ~ [stat]" + Core.bundle.format("bullet.damage", type.continuousDamage()) + StatUnit.perSecond.localized() : "")); } if(type.buildingDamageMultiplier != 1){