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

Merge branch 'master' into unit-stats

Browse Source
This commit is contained in:
genNAowl
2020-11-11 16:50:37 -08:00
committed by GitHub
parent 14ee997a76 b1b84fe380
commit 21a8a39344
14 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/world/meta/values/AmmoListValue.java
+5 -3
View File
@@ -46,11 +46,13 @@ public class AmmoListValue<T extends UnlockableContent> implements StatValue{
sep(bt, Core.bundle.format("bullet.splashdamage", (int)type.splashDamage, Strings.fixed(type.splashDamageRadius / tilesize, 1)));
}
//ammo multiplyers do not make sense for units
if(!(t instanceof UnitType) && !Mathf.equal(type.ammoMultiplier, 1f))
if(!(t instanceof UnitType) && !Mathf.equal(type.ammoMultiplier, 1f) && !(type instanceof LiquidBulletType)){
sep(bt, Core.bundle.format("bullet.multiplier", (int)type.ammoMultiplier));
if(!Mathf.equal(type.reloadMultiplier, 1f))
}
if(!Mathf.equal(type.reloadMultiplier, 1f)){
sep(bt, Core.bundle.format("bullet.reload", Strings.fixed(type.reloadMultiplier, 1)));
}
if(type.knockback > 0){
sep(bt, Core.bundle.format("bullet.knockback", Strings.fixed(type.knockback, 1)));