Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#4440

Browse Source
This commit is contained in:
Anuken
2021-07-20 10:56:58 -04:00
parent 6ffc8ba3c5
commit b2ed0ee884
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/bundles/bundle.properties
View File

@@ -725,7 +725,7 @@ stat.maxconsecutive = Max Consecutive
stat.buildcost = Build Cost stat.buildcost = Build Cost
stat.inaccuracy = Inaccuracy stat.inaccuracy = Inaccuracy
stat.shots = Shots stat.shots = Shots
stat.reload = Shots/Second stat.reload = Firing Rate
stat.ammo = Ammo stat.ammo = Ammo
stat.shieldhealth = Shield Health stat.shieldhealth = Shield Health
stat.cooldowntime = Cooldown Time stat.cooldowntime = Cooldown Time

2
core/src/mindustry/type/Weapon.java
View File

@@ -128,7 +128,7 @@ public class Weapon implements Cloneable{
t.add("[lightgray]" + Stat.inaccuracy.localized() + ": [white]" + (int)inaccuracy + " " + StatUnit.degrees.localized()); t.add("[lightgray]" + Stat.inaccuracy.localized() + ": [white]" + (int)inaccuracy + " " + StatUnit.degrees.localized());
} }
t.row(); 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); StatValues.ammo(ObjectMap.of(u, bullet)).display(t);
} }

2
core/src/mindustry/world/blocks/defense/turrets/PointDefenseTurret.java
View File

@@ -51,7 +51,7 @@ public class PointDefenseTurret extends ReloadTurret{
public void setStats(){ public void setStats(){
super.setStats(); super.setStats();
stats.add(Stat.reload, 60f / reloadTime, StatUnit.none); stats.add(Stat.reload, 60f / reloadTime, StatUnit.perSecond);
} }
public class PointDefenseBuild extends ReloadTurretBuild{ public class PointDefenseBuild extends ReloadTurretBuild{

2
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View File

@@ -106,7 +106,7 @@ public class Turret extends ReloadTurret{
super.setStats(); super.setStats();
stats.add(Stat.inaccuracy, (int)inaccuracy, StatUnit.degrees); 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.targetsAir, targetAir);
stats.add(Stat.targetsGround, targetGround); stats.add(Stat.targetsGround, targetGround);
if(ammoPerShot != 1) stats.add(Stat.ammoUse, ammoPerShot, StatUnit.perShot); if(ammoPerShot != 1) stats.add(Stat.ammoUse, ammoPerShot, StatUnit.perShot);

2
core/src/mindustry/world/blocks/distribution/MassDriver.java
View File

@@ -59,7 +59,7 @@ public class MassDriver extends Block{
super.setStats(); super.setStats();
stats.add(Stat.shootRange, range / tilesize, StatUnit.blocks); 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 @Override