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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2021-06-05 09:49:04 -04:00
parent 2f2dc01c6b 9f087214a1
commit f87054c667
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/mindustry/entities/bullet/BulletType.java
View File

@@ -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 //pierceBuilding is not enabled by default, because a bullet may want to *not* pierce buildings
} }
if(lightningType == null){ if(lightning > 0){
lightningType = !collidesAir ? Bullets.damageLightningGround : Bullets.damageLightning; if(status == StatusEffects.none){
status = StatusEffects.shocked;
}
if(lightningType == null){
lightningType = !collidesAir ? Bullets.damageLightningGround : Bullets.damageLightning;
}
} }
} }

8
core/src/mindustry/world/meta/StatValues.java
View File

@@ -270,10 +270,6 @@ public class StatValues{
sep(bt, "@bullet.incendiary"); 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){ if(type.homingPower > 0.01f){
sep(bt, "@bullet.homing"); sep(bt, "@bullet.homing");
} }
@@ -285,6 +281,10 @@ public class StatValues{
if(type.fragBullet != null){ if(type.fragBullet != null){
sep(bt, "@bullet.frag"); 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); }).padTop(unit ? 0 : -9).left().get().background(unit ? null : Tex.underline);
table.row(); table.row();