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

Cleanup of merged PR

Browse Source
This commit is contained in:
Anuken
2020-10-30 19:03:05 -04:00
parent e02458122b
commit 4ec8e24bd8
6 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,8 +116,8 @@ public abstract class BulletType extends Content{
public float lightningDamage = -1;
public float lightningCone = 360f;
public float lightningAngle = 0f;
/** The lighting "hitter"; Use when trying to implement special lightning. */
public BulletType lightningHitter;
/** The bullet created at lightning points. */
public BulletType lightningType;
public float weaveScale = 1f;
public float weaveMag = -1f;
@@ -257,6 +257,10 @@ public abstract class BulletType extends Content{
//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(killShooter && b.owner() instanceof Healthc){
((Healthc)b.owner()).kill();
}