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

Option to not hardcode a bullet's status and despawnHit (#6553)

Browse Source 
* Make not being hardcoded an option

* No one is gonna set a negative light radius, but just in case...
This commit is contained in:
Matthew (or Maya) Peng
2022-02-03 06:48:44 -08:00
committed by GitHub
parent 4ee2ce3ba5
commit 16b9d68773
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,6 +120,9 @@ public class BulletType extends Content implements Cloneable{
public boolean despawnHit = false; public boolean despawnHit = false;
//additional effects //additional effects
/** Whether status and despawnHit should automatically be set. */
public boolean setDefaults = true;
public float fragCone = 360f; public float fragCone = 360f;
public float fragAngle = 0f; public float fragAngle = 0f;
@@ -405,9 +408,15 @@ 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(lightning > 0){ if(setDefaults){
if(status == StatusEffects.none){ if(lightning > 0){
status = StatusEffects.shocked; if(status == StatusEffects.none){
status = StatusEffects.shocked;
}
}
if(fragBullet != null || splashDamageRadius > 0 || lightning > 0){
despawnHit = true;
} }
} }
@@ -415,13 +424,10 @@ public class BulletType extends Content implements Cloneable{
lightningType = !collidesAir ? Bullets.damageLightningGround : Bullets.damageLightning; lightningType = !collidesAir ? Bullets.damageLightningGround : Bullets.damageLightning;
} }
if(fragBullet != null || splashDamageRadius > 0 || lightning > 0){ if(lightRadius <= -1){
despawnHit = true;
}
if(lightRadius == -1){
lightRadius = Math.max(18, hitSize * 5f); lightRadius = Math.max(18, hitSize * 5f);
} }
drawSize = Math.max(drawSize, trailLength * speed * 2f); drawSize = Math.max(drawSize, trailLength * speed * 2f);
} }