Merge pull request #3421 from MEEPofFaith/fix-absorbing-lasers
Lasers cannot and should not collide with anything.
This commit is contained in:
@@ -30,15 +30,15 @@ public class ContinuousLaserBulletType extends BulletType{
|
|||||||
hitSize = 4;
|
hitSize = 4;
|
||||||
drawSize = 420f;
|
drawSize = 420f;
|
||||||
lifetime = 16f;
|
lifetime = 16f;
|
||||||
keepVelocity = false;
|
|
||||||
pierce = true;
|
|
||||||
hittable = false;
|
|
||||||
hitColor = colors[2];
|
hitColor = colors[2];
|
||||||
collidesTiles = false;
|
|
||||||
incendAmount = 1;
|
incendAmount = 1;
|
||||||
incendSpread = 5;
|
incendSpread = 5;
|
||||||
incendChance = 0.4f;
|
incendChance = 0.4f;
|
||||||
lightColor = Color.orange;
|
lightColor = Color.orange;
|
||||||
|
keepVelocity = false;
|
||||||
|
collides = false;
|
||||||
|
pierce = true;
|
||||||
|
hittable = false;
|
||||||
absorbable = false;
|
absorbable = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,16 +23,17 @@ public class LaserBulletType extends BulletType{
|
|||||||
public LaserBulletType(float damage){
|
public LaserBulletType(float damage){
|
||||||
super(0.01f, damage);
|
super(0.01f, damage);
|
||||||
|
|
||||||
keepVelocity = false;
|
|
||||||
hitEffect = Fx.hitLancer;
|
hitEffect = Fx.hitLancer;
|
||||||
despawnEffect = Fx.none;
|
despawnEffect = Fx.none;
|
||||||
shootEffect = Fx.hitLancer;
|
shootEffect = Fx.hitLancer;
|
||||||
smokeEffect = Fx.none;
|
smokeEffect = Fx.none;
|
||||||
collides = false;
|
|
||||||
hitSize = 4;
|
hitSize = 4;
|
||||||
lifetime = 16f;
|
lifetime = 16f;
|
||||||
|
keepVelocity = false;
|
||||||
|
collides = false;
|
||||||
pierce = true;
|
pierce = true;
|
||||||
hittable = false;
|
hittable = false;
|
||||||
|
absorbable = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public LaserBulletType(){
|
public LaserBulletType(){
|
||||||
|
|||||||
@@ -24,9 +24,11 @@ public class ShrapnelBulletType extends BulletType{
|
|||||||
shootEffect = smokeEffect = Fx.lightningShoot;
|
shootEffect = smokeEffect = Fx.lightningShoot;
|
||||||
lifetime = 10f;
|
lifetime = 10f;
|
||||||
despawnEffect = Fx.none;
|
despawnEffect = Fx.none;
|
||||||
pierce = true;
|
|
||||||
keepVelocity = false;
|
keepVelocity = false;
|
||||||
|
collides = false;
|
||||||
|
pierce = true;
|
||||||
hittable = false;
|
hittable = false;
|
||||||
|
absorbable = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user