This commit is contained in:
Anuken
2020-10-17 10:37:28 -04:00
parent 3a7ee50db3
commit 46ec457819
42 changed files with 142 additions and 118 deletions

View File

@@ -260,8 +260,8 @@ public class ContentParser{
//TODO test this!
read(() -> {
//add reconstructor type
if(value.hasChild("requirements")){
JsonValue rec = value.remove("requirements");
if(value.has("requirements")){
JsonValue rec = value.remove("requirements");
//intermediate class for parsing
class UnitReq{
@@ -286,6 +286,16 @@ public class ContentParser{
}
//read extra default waves
if(value.has("waves")){
SpawnGroup[] groups = parser.readValue(SpawnGroup[].class, value.get("waves"));
for(SpawnGroup group : groups){
group.type = unit;
}
Vars.defaultWaves.get().addAll(groups);
}
readFields(unit, value, true);
});