diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java index 9509424f12..70562ee8df 100644 --- a/core/src/mindustry/entities/bullet/BulletType.java +++ b/core/src/mindustry/entities/bullet/BulletType.java @@ -401,8 +401,14 @@ public class BulletType extends Content implements Cloneable{ //pierceBuilding is not enabled by default, because a bullet may want to *not* pierce buildings } - if(lightningType == null){ - lightningType = !collidesAir ? Bullets.damageLightningGround : Bullets.damageLightning; + if(lightning > 0){ + if(status == StatusEffects.none){ + status = StatusEffects.shocked; + } + + if(lightningType == null){ + lightningType = !collidesAir ? Bullets.damageLightningGround : Bullets.damageLightning; + } } } diff --git a/core/src/mindustry/world/meta/StatValues.java b/core/src/mindustry/world/meta/StatValues.java index 319dd27eb3..c3d3141332 100644 --- a/core/src/mindustry/world/meta/StatValues.java +++ b/core/src/mindustry/world/meta/StatValues.java @@ -270,10 +270,6 @@ public class StatValues{ sep(bt, "@bullet.incendiary"); } - if(type.status != StatusEffects.none){ - sep(bt, (type.minfo.mod == null ? type.status.emoji() : "") + "[stat]" + type.status.localizedName); - } - if(type.homingPower > 0.01f){ sep(bt, "@bullet.homing"); } @@ -285,6 +281,10 @@ public class StatValues{ if(type.fragBullet != null){ sep(bt, "@bullet.frag"); } + + if(type.status != StatusEffects.none){ + sep(bt, (type.minfo.mod == null ? type.status.emoji() : "") + "[stat]" + type.status.localizedName); + } }).padTop(unit ? 0 : -9).left().get().background(unit ? null : Tex.underline); table.row();