diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index f7aeab2413..642330901d 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -992,6 +992,7 @@ stat.abilities = Abilities stat.canboost = Can Boost stat.flying = Flying stat.ammouse = Ammo Use +stat.ammocapacity = Ammo Capacity stat.damagemultiplier = Damage Multiplier stat.healthmultiplier = Health Multiplier stat.speedmultiplier = Speed Multiplier @@ -1093,7 +1094,7 @@ bullet.pierce = [stat]{0}x[lightgray] pierce bullet.infinitepierce = [stat]pierce bullet.healpercent = [stat]{0}%[lightgray] repair bullet.healamount = [stat]{0}[lightgray] direct repair -bullet.multiplier = [stat]{0}x[lightgray] ammo multiplier +bullet.multiplier = [stat]{0}[lightgray] ammo/item bullet.reload = [stat]{0}%[lightgray] fire rate bullet.range = [stat]{0}[lightgray] tiles range @@ -1118,6 +1119,7 @@ unit.items = items unit.thousands = k unit.millions = mil unit.billions = b +unit.shots = shots unit.pershot = /shot category.purpose = Purpose category.general = General diff --git a/core/assets/contributors b/core/assets/contributors index 3b3153b7ee..c402672c93 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -165,3 +165,4 @@ OpalSoPL BalaM314 Redstonneur1256 ApsZoldat +hexagon-recursion diff --git a/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java index 14aa007d35..93a77b644f 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java @@ -49,6 +49,7 @@ public class ItemTurret extends Turret{ stats.remove(Stat.itemCapacity); stats.add(Stat.ammo, StatValues.ammo(ammoTypes)); + stats.add(Stat.ammoCapacity, maxAmmo / ammoPerShot, StatUnit.shots); } @Override diff --git a/core/src/mindustry/world/meta/Stat.java b/core/src/mindustry/world/meta/Stat.java index 5248a70c80..b1257d6232 100644 --- a/core/src/mindustry/world/meta/Stat.java +++ b/core/src/mindustry/world/meta/Stat.java @@ -86,6 +86,7 @@ public class Stat implements Comparable{ targetsGround = new Stat("targetsGround", StatCat.function), damage = new Stat("damage", StatCat.function), ammo = new Stat("ammo", StatCat.function), + ammoCapacity = new Stat("ammoCapacity", StatCat.function), ammoUse = new Stat("ammoUse", StatCat.function), shieldHealth = new Stat("shieldHealth", StatCat.function), cooldownTime = new Stat("cooldownTime", StatCat.function), diff --git a/core/src/mindustry/world/meta/StatUnit.java b/core/src/mindustry/world/meta/StatUnit.java index 1c2408ad74..4362c6ecdd 100644 --- a/core/src/mindustry/world/meta/StatUnit.java +++ b/core/src/mindustry/world/meta/StatUnit.java @@ -24,6 +24,7 @@ public class StatUnit{ degrees = new StatUnit("degrees"), seconds = new StatUnit("seconds"), minutes = new StatUnit("minutes"), + shots = new StatUnit("shots"), perSecond = new StatUnit("perSecond", false), perMinute = new StatUnit("perMinute", false), perShot = new StatUnit("perShot", false),