Fixed waves not appearing / Fixed ore tile blending

This commit is contained in:
Anuken
2018-09-23 12:45:22 -04:00
parent 4eab89d73e
commit 6bab6c57f2
5 changed files with 6 additions and 6 deletions
@@ -33,8 +33,6 @@ public class Sector{
public transient Array<Mission> missions = new Array<>();
/**Enemies spawned at this sector.*/
public transient Array<SpawnGroup> spawns;
/**Ores that appear in this sector.*/
//public transient Array<Item> ores = new Array<>();
/**Difficulty of the sector, measured by calculating distance from origin and applying scaling.*/
public transient int difficulty;
/**Items the player starts with on this sector.*/
@@ -10,6 +10,7 @@ import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.io.SaveIO;
import io.anuke.mindustry.maps.generation.WorldGenerator.GenResult;
import io.anuke.mindustry.maps.missions.BattleMission;
import io.anuke.mindustry.maps.missions.Mission;
import io.anuke.mindustry.maps.missions.WaveMission;
import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.type.ItemStack;
@@ -269,7 +270,9 @@ public class Sectors{
: new BattleMission());
}
sector.spawns = sector.missions.first().getWaves(sector);
for(Mission mission : sector.missions){
sector.spawns.addAll(mission.getWaves(sector));
}
//sector.ores.addAll(Items.copper);