Fixed #5371
This commit is contained in:
@@ -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));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user