From b2ed0ee8847f22209a3f46ca408a067e3ca78f6b Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 20 Jul 2021 10:56:58 -0400 Subject: [PATCH] #4440 --- core/assets/bundles/bundle.properties | 2 +- core/src/mindustry/type/Weapon.java | 2 +- .../world/blocks/defense/turrets/PointDefenseTurret.java | 2 +- core/src/mindustry/world/blocks/defense/turrets/Turret.java | 2 +- core/src/mindustry/world/blocks/distribution/MassDriver.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 1c90dd8c8a..b59c82b302 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -725,7 +725,7 @@ stat.maxconsecutive = Max Consecutive stat.buildcost = Build Cost stat.inaccuracy = Inaccuracy stat.shots = Shots -stat.reload = Shots/Second +stat.reload = Firing Rate stat.ammo = Ammo stat.shieldhealth = Shield Health stat.cooldowntime = Cooldown Time diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java index 33729c9636..d3a29943bb 100644 --- a/core/src/mindustry/type/Weapon.java +++ b/core/src/mindustry/type/Weapon.java @@ -128,7 +128,7 @@ public class Weapon implements Cloneable{ t.add("[lightgray]" + Stat.inaccuracy.localized() + ": [white]" + (int)inaccuracy + " " + StatUnit.degrees.localized()); } t.row(); - t.add("[lightgray]" + Stat.reload.localized() + ": " + (mirror ? "2x " : "") + "[white]" + Strings.autoFixed(60f / reload * shots, 2)); + t.add("[lightgray]" + Stat.reload.localized() + ": " + (mirror ? "2x " : "") + "[white]" + Strings.autoFixed(60f / reload * shots, 2) + " " + StatUnit.perSecond.localized()); StatValues.ammo(ObjectMap.of(u, bullet)).display(t); } diff --git a/core/src/mindustry/world/blocks/defense/turrets/PointDefenseTurret.java b/core/src/mindustry/world/blocks/defense/turrets/PointDefenseTurret.java index 9c0259c8b2..f540fb6864 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/PointDefenseTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/PointDefenseTurret.java @@ -51,7 +51,7 @@ public class PointDefenseTurret extends ReloadTurret{ public void setStats(){ super.setStats(); - stats.add(Stat.reload, 60f / reloadTime, StatUnit.none); + stats.add(Stat.reload, 60f / reloadTime, StatUnit.perSecond); } public class PointDefenseBuild extends ReloadTurretBuild{ diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index e797bf19b4..d6da331293 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -106,7 +106,7 @@ public class Turret extends ReloadTurret{ super.setStats(); stats.add(Stat.inaccuracy, (int)inaccuracy, StatUnit.degrees); - stats.add(Stat.reload, 60f / (reloadTime) * (alternate ? 1 : shots), StatUnit.none); + stats.add(Stat.reload, 60f / (reloadTime) * (alternate ? 1 : shots), StatUnit.perSecond); stats.add(Stat.targetsAir, targetAir); stats.add(Stat.targetsGround, targetGround); if(ammoPerShot != 1) stats.add(Stat.ammoUse, ammoPerShot, StatUnit.perShot); diff --git a/core/src/mindustry/world/blocks/distribution/MassDriver.java b/core/src/mindustry/world/blocks/distribution/MassDriver.java index cb2e52113d..4b0f40d87b 100644 --- a/core/src/mindustry/world/blocks/distribution/MassDriver.java +++ b/core/src/mindustry/world/blocks/distribution/MassDriver.java @@ -59,7 +59,7 @@ public class MassDriver extends Block{ super.setStats(); stats.add(Stat.shootRange, range / tilesize, StatUnit.blocks); - stats.add(Stat.reload, 60f / reloadTime, StatUnit.none); + stats.add(Stat.reload, 60f / reloadTime, StatUnit.perSecond); } @Override