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

Fixed #2779

Browse Source
This commit is contained in:
Anuken
2020-09-30 19:55:22 -04:00
parent a0394e4382
commit f3c642d0d7
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/content/Bullets.java
View File

@@ -481,6 +481,7 @@ public class Bullets implements ContentList{
drag = 0.001f; drag = 0.001f;
ammoMultiplier = 2f; ammoMultiplier = 2f;
statusDuration = 60f * 4f; statusDuration = 60f * 4f;
damage = 0.1f;
}}; }};
heavyCryoShot = new LiquidBulletType(Liquids.cryofluid){{ heavyCryoShot = new LiquidBulletType(Liquids.cryofluid){{
@@ -491,6 +492,7 @@ public class Bullets implements ContentList{
drag = 0.001f; drag = 0.001f;
ammoMultiplier = 2f; ammoMultiplier = 2f;
statusDuration = 60f * 4f; statusDuration = 60f * 4f;
damage = 0.1f;
}}; }};
heavySlagShot = new LiquidBulletType(Liquids.slag){{ heavySlagShot = new LiquidBulletType(Liquids.slag){{
@@ -512,6 +514,7 @@ public class Bullets implements ContentList{
drag = 0.001f; drag = 0.001f;
ammoMultiplier = 2f; ammoMultiplier = 2f;
statusDuration = 60f * 4f; statusDuration = 60f * 4f;
damage = 0.1f;
}}; }};
driverBolt = new MassDriverBolt(); driverBolt = new MassDriverBolt();

2
core/src/mindustry/world/meta/values/AmmoListValue.java
View File

@@ -33,7 +33,7 @@ public class AmmoListValue<T extends UnlockableContent> implements StatValue{
table.table(Tex.underline, bt -> { table.table(Tex.underline, bt -> {
bt.left().defaults().padRight(3).left(); bt.left().defaults().padRight(3).left();
if(type.damage > 0 && type.collides){ if(type.damage > 0 && (type.collides || type.splashDamage <= 0)){
bt.add(Core.bundle.format("bullet.damage", type.damage)); bt.add(Core.bundle.format("bullet.damage", type.damage));
} }