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

Initial support for arbitrary types of content in tech tree

Browse Source
This commit is contained in:
Anuken
2020-05-18 09:40:38 -04:00
parent f290f688d0
commit 3784251108
5 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -242,8 +242,9 @@ public class ContentParser{
//add research tech node
if(research[0] != null){
//TODO only works with blocks
Block parent = find(ContentType.block, research[0]);
TechNode baseNode = exists && TechTree.all.contains(t -> t.block == block) ? TechTree.all.find(t -> t.block == block) : TechTree.create(parent, block);
TechNode baseNode = exists && TechTree.all.contains(t -> t.content == block) ? TechTree.all.find(t -> t.content == block) : TechTree.create(parent, block);
LoadedMod cur = currentMod;
postreads.add(() -> {
@@ -254,7 +255,7 @@ public class ContentParser{
baseNode.parent.children.remove(baseNode);
}
TechNode parnode = TechTree.all.find(t -> t.block == parent);
TechNode parnode = TechTree.all.find(t -> t.content == parent);
if(parnode == null){
throw new IllegalArgumentException("Block '" + parent.name + "' isn't in the tech tree, but '" + block.name + "' requires it to be researched.");
}