This commit is contained in:
Anuken
2021-06-05 16:55:15 -04:00
parent d0b70fd70d
commit 41082e9429
3 changed files with 4 additions and 1 deletions
@@ -163,6 +163,8 @@ public class BulletType extends Content implements Cloneable{
public float puddleAmount = 5f; public float puddleAmount = 5f;
public Liquid puddleLiquid = Liquids.water; public Liquid puddleLiquid = Liquids.water;
public boolean displayAmmoMultiplier = true;
public float lightRadius = -1f; public float lightRadius = -1f;
public float lightOpacity = 0.3f; public float lightOpacity = 0.3f;
public Color lightColor = Pal.powerLight; public Color lightColor = Pal.powerLight;
@@ -36,6 +36,7 @@ public class LiquidBulletType extends BulletType{
shootEffect = Fx.none; shootEffect = Fx.none;
drag = 0.001f; drag = 0.001f;
knockback = 0.55f; knockback = 0.55f;
displayAmmoMultiplier = false;
} }
public LiquidBulletType(){ public LiquidBulletType(){
@@ -246,7 +246,7 @@ public class StatValues{
sep(bt, Core.bundle.format("bullet.splashdamage", (int)type.splashDamage, Strings.fixed(type.splashDamageRadius / tilesize, 1))); sep(bt, Core.bundle.format("bullet.splashdamage", (int)type.splashDamage, Strings.fixed(type.splashDamageRadius / tilesize, 1)));
} }
if(!unit && !Mathf.equal(type.ammoMultiplier, 1f)){ if(!unit && !Mathf.equal(type.ammoMultiplier, 1f) && type.displayAmmoMultiplier){
sep(bt, Core.bundle.format("bullet.multiplier", (int)type.ammoMultiplier)); sep(bt, Core.bundle.format("bullet.multiplier", (int)type.ammoMultiplier));
} }