diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java index d92183fb85..a2dcf018a5 100644 --- a/core/src/mindustry/entities/bullet/BulletType.java +++ b/core/src/mindustry/entities/bullet/BulletType.java @@ -277,9 +277,8 @@ public abstract class BulletType extends Content{ bullet.damage = damage < 0 ? this.damage : damage; bullet.add(); - if(keepVelocity && owner instanceof Hitboxc) bullet.vel.add(((Velc)owner).vel().x, ((Velc)owner).vel().y); + if(keepVelocity && owner instanceof Velc) bullet.vel.add(((Velc)owner).vel().x, ((Velc)owner).vel().y); return bullet; - } public void createNet(Team team, float x, float y, float angle, float damage, float velocityScl, float lifetimeScl){ diff --git a/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java index 4e15baf9e1..6c5f047a90 100644 --- a/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java @@ -295,16 +295,6 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{ //TODO better waves state.rules.spawns = defaultWaves.get(); - - float waveScaling = 1f + difficulty*2; - - //scale up the spawning base on difficulty (this is just for testing) - for(SpawnGroup group : state.rules.spawns){ - group.unitAmount *= waveScaling; - if(group.unitScaling != SpawnGroup.never){ - group.unitScaling /= waveScaling; - } - } } @Override