Merge pull request #3421 from MEEPofFaith/fix-absorbing-lasers

Lasers cannot and should not collide with anything.
This commit is contained in:
Anuken
2020-11-16 15:41:36 -05:00
committed by GitHub
3 changed files with 10 additions and 7 deletions

View File

@@ -30,15 +30,15 @@ public class ContinuousLaserBulletType extends BulletType{
hitSize = 4;
drawSize = 420f;
lifetime = 16f;
keepVelocity = false;
pierce = true;
hittable = false;
hitColor = colors[2];
collidesTiles = false;
incendAmount = 1;
incendSpread = 5;
incendChance = 0.4f;
lightColor = Color.orange;
keepVelocity = false;
collides = false;
pierce = true;
hittable = false;
absorbable = false;
}

View File

@@ -23,16 +23,17 @@ public class LaserBulletType extends BulletType{
public LaserBulletType(float damage){
super(0.01f, damage);
keepVelocity = false;
hitEffect = Fx.hitLancer;
despawnEffect = Fx.none;
shootEffect = Fx.hitLancer;
smokeEffect = Fx.none;
collides = false;
hitSize = 4;
lifetime = 16f;
keepVelocity = false;
collides = false;
pierce = true;
hittable = false;
absorbable = false;
}
public LaserBulletType(){

View File

@@ -24,9 +24,11 @@ public class ShrapnelBulletType extends BulletType{
shootEffect = smokeEffect = Fx.lightningShoot;
lifetime = 10f;
despawnEffect = Fx.none;
pierce = true;
keepVelocity = false;
collides = false;
pierce = true;
hittable = false;
absorbable = false;
}
@Override