diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 35a677b248..b5c804d9ea 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -5512,9 +5512,9 @@ public class Blocks{ new AssemblerUnitPlan(UnitTypes.tecta, 60f * 60f, PayloadStack.list(UnitTypes.merui, 4, Blocks.tungstenWallLarge, 10)), new AssemblerUnitPlan(UnitTypes.collaris, 60f * 60f * 3f, PayloadStack.list(UnitTypes.cleroi, 6, Blocks.carbideWallLarge, 20)) ); - consumePower(3f); areaSize = 13; + consumePower(3f); consumeLiquid(Liquids.cyanogen, 9f / 60f); }}; diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java index 37da8496f2..506df53c1b 100644 --- a/core/src/mindustry/mod/ContentParser.java +++ b/core/src/mindustry/mod/ContentParser.java @@ -998,6 +998,10 @@ public class ContentParser{ node.setupRequirements(unlock.researchRequirements()); } + if(research.has("planet")){ + node.planet = find(ContentType.planet, research.getString("planet")); + } + if(research.getBoolean("root", false)){ node.name = research.getString("name", unlock.name); node.requiresUnlock = research.getBoolean("requiresUnlock", false); diff --git a/core/src/mindustry/type/Planet.java b/core/src/mindustry/type/Planet.java index 418546c9cb..892e147851 100644 --- a/core/src/mindustry/type/Planet.java +++ b/core/src/mindustry/type/Planet.java @@ -299,6 +299,10 @@ public class Planet extends UnlockableContent{ @Override public void init(){ + if(techTree == null){ + techTree = TechTree.roots.find(n -> n.planet == this); + } + for(Sector sector : sectors){ sector.loadInfo(); }