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

Fixed compilation errors

Browse Source
This commit is contained in:
Anuken
2018-03-14 20:15:25 -04:00
parent 1cd30e9057
commit 01ba051c43
26 changed files with 64 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/game/EnemySpawn.java
+4 -3
View File
@@ -1,6 +1,6 @@
package io.anuke.mindustry.game;
import io.anuke.mindustry.entities.enemies.UnitType;
import io.anuke.mindustry.entities.units.UnitType;
import io.anuke.ucore.util.Mathf;
import static io.anuke.mindustry.Vars.state;
@@ -30,7 +30,8 @@ public class EnemySpawn{
public EnemySpawn(UnitType type){
this.type = type;
}
//TODO
public int evaluate(int wave, int lane){
if(wave < after || wave > before || (wave - after) % spacing != 0){
return 0;
@@ -41,6 +42,6 @@ public class EnemySpawn{
}
public int tier(int wave, int lane){
return Mathf.clamp(tier + (wave-after)/tierscale, 1, UnitType.maxtier);
return Mathf.clamp(tier + (wave-after)/tierscale, 1, 5);
}
}
core/src/io/anuke/mindustry/game/EventType.java
+1 -1
View File
@@ -3,7 +3,7 @@ package io.anuke.mindustry.game;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.entities.BulletType;
import io.anuke.mindustry.entities.TileEntity;
import io.anuke.mindustry.entities.enemies.BaseUnit;
import io.anuke.mindustry.entities.units.BaseUnit;
import io.anuke.mindustry.resource.Weapon;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile;