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

Misc tech tree & block stuff

Browse Source
This commit is contained in:
Anuken
2022-05-16 17:53:09 -04:00
parent 13e57ba89e
commit 07ff2de2a2
5 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/src/mindustry/mod/ContentParser.java
View File

@@ -886,7 +886,7 @@ public class ContentParser{
researchName = research.asString();
customRequirements = null;
}else{
researchName = research.getString("parent");
researchName = research.getString("parent", null);
customRequirements = research.has("requirements") ? parser.readValue(ItemStack[].class, research.get("requirements")) : null;
}
@@ -922,18 +922,28 @@ public class ContentParser{
node.setupRequirements(unlock.researchRequirements());
}
//find parent node.
TechNode parent = TechTree.all.find(t -> t.content.name.equals(researchName) || t.content.name.equals(currentMod.name + "-" + researchName) || t.content.name.equals(SaveVersion.mapFallback(researchName)));
if(parent == null){
Log.warn("Content '" + researchName + "' isn't in the tech tree, but '" + unlock.name + "' requires it to be researched.");
if(research.getBoolean("root", false)){
node.name = research.getString("name", unlock.name);
node.requiresUnlock = research.getBoolean("requiresUnlock", false);
TechTree.roots.add(node);
}else{
//add this node to the parent
if(!parent.children.contains(node)){
parent.children.add(node);
if(researchName != null){
//find parent node.
TechNode parent = TechTree.all.find(t -> t.content.name.equals(researchName) || t.content.name.equals(currentMod.name + "-" + researchName) || t.content.name.equals(SaveVersion.mapFallback(researchName)));
if(parent == null){
Log.warn("Content '" + researchName + "' isn't in the tech tree, but '" + unlock.name + "' requires it to be researched.");
}else{
//add this node to the parent
if(!parent.children.contains(node)){
parent.children.add(node);
}
//reparent the node
node.parent = parent;
}
}else{
Log.warn(unlock.name + " is not a root node, and does not have a `parent: ` property. Ignoring.");
}
//reparent the node
node.parent = parent;
}
});
}