mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-25 22:12:16 -08:00
Code Issues Projects Releases Wiki Activity

Fixed #7738

Browse source
This commit is contained in:
Anuken 2022-10-18 09:26:44 -04:00
parent 326002c338
commit e6de58fbdc
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/src/mindustry/content/Blocks.java
View file

@ -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);
}};

4
core/src/mindustry/mod/ContentParser.java
View file

@ -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);

4
core/src/mindustry/type/Planet.java
View file

@ -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();
}