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

Cleanup

Browse Source
This commit is contained in:
Anuken
2020-09-22 11:16:19 -04:00
parent ce4f67341c
commit b2b8949e26
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -277,9 +277,8 @@ public abstract class BulletType extends Content{
bullet.damage = damage < 0 ? this.damage : damage; bullet.damage = damage < 0 ? this.damage : damage;
bullet.add(); 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; return bullet;
} }
public void createNet(Team team, float x, float y, float angle, float damage, float velocityScl, float lifetimeScl){ public void createNet(Team team, float x, float y, float angle, float damage, float velocityScl, float lifetimeScl){

10
core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java
View File

@@ -295,16 +295,6 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
//TODO better waves //TODO better waves
state.rules.spawns = defaultWaves.get(); 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 @Override