Wave versions
This commit is contained in:
@@ -101,7 +101,7 @@ public class Map implements Comparable<Map>, Publishable{
|
||||
//this replacement is a MASSIVE hack but it fixes some incorrect overwriting of team-specific rules.
|
||||
//may need to be tweaked later
|
||||
Rules result = JsonIO.read(Rules.class, base, tags.get("rules", "{}").replace("teams:{2:{infiniteAmmo:true}},", ""));
|
||||
if(result.spawns.isEmpty()) result.spawns = Vars.defaultWaves.get();
|
||||
if(result.spawns.isEmpty()) result.spawns = Vars.waves.get();
|
||||
return result;
|
||||
}catch(Exception e){
|
||||
//error reading rules. ignore?
|
||||
|
||||
@@ -420,7 +420,7 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
|
||||
state.rules.waves = sector.info.waves = true;
|
||||
|
||||
//TODO better waves
|
||||
state.rules.spawns = DefaultWaves.generate(difficulty);
|
||||
state.rules.spawns = Waves.generate(difficulty);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user