mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-07-08 23:07:33 +07:00
BulletType delayFrags workaround
This commit is contained in:
@ -160,6 +160,8 @@ public class BulletType extends Content implements Cloneable{
|
|||||||
|
|
||||||
/** Bullet type that is created when this bullet expires. */
|
/** Bullet type that is created when this bullet expires. */
|
||||||
public @Nullable BulletType fragBullet = null;
|
public @Nullable BulletType fragBullet = null;
|
||||||
|
/** If true, frag bullets are delayed to the next frame. Fixes obscure bugs with piercing bullet types spawning frags immediately and screwing up the Damage temporary variables. */
|
||||||
|
public boolean delayFrags = false;
|
||||||
/** Degree spread range of fragmentation bullets. */
|
/** Degree spread range of fragmentation bullets. */
|
||||||
public float fragRandomSpread = 360f;
|
public float fragRandomSpread = 360f;
|
||||||
/** Uniform spread between each frag bullet in degrees. */
|
/** Uniform spread between each frag bullet in degrees. */
|
||||||
@ -446,8 +448,12 @@ public class BulletType extends Content implements Cloneable{
|
|||||||
Effect.shake(hitShake, hitShake, b);
|
Effect.shake(hitShake, hitShake, b);
|
||||||
|
|
||||||
if(fragOnHit){
|
if(fragOnHit){
|
||||||
|
if(delayFrags && fragBullet != null && fragBullet.delayFrags){
|
||||||
|
Core.app.post(() -> createFrags(b, x, y));
|
||||||
|
}else{
|
||||||
createFrags(b, x, y);
|
createFrags(b, x, y);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
createPuddles(b, x, y);
|
createPuddles(b, x, y);
|
||||||
createIncend(b, x, y);
|
createIncend(b, x, y);
|
||||||
createUnits(b, x, y);
|
createUnits(b, x, y);
|
||||||
|
@ -38,6 +38,7 @@ public class LaserBulletType extends BulletType{
|
|||||||
hittable = false;
|
hittable = false;
|
||||||
absorbable = false;
|
absorbable = false;
|
||||||
removeAfterPierce = false;
|
removeAfterPierce = false;
|
||||||
|
delayFrags = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public LaserBulletType(){
|
public LaserBulletType(){
|
||||||
|
@ -24,6 +24,7 @@ public class RailBulletType extends BulletType{
|
|||||||
collides = false;
|
collides = false;
|
||||||
keepVelocity = false;
|
keepVelocity = false;
|
||||||
lifetime = 1f;
|
lifetime = 1f;
|
||||||
|
delayFrags = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Reference in New Issue
Block a user