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

Reverted unnecessary sector number changes

Browse Source
This commit is contained in:
Anuken
2025-05-21 23:24:02 -04:00
parent 2161dd519a
commit 6d8096ded4
4 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/src/mindustry/content/SectorPresets.java
View File

@@ -39,12 +39,12 @@ public class SectorPresets{
captureWave = 33; captureWave = 33;
}}; }};
frozenForest = new SectorPreset("frozenForest", serpulo, 170){{ frozenForest = new SectorPreset("frozenForest", serpulo, 86){{
captureWave = 15; captureWave = 15;
difficulty = 2; difficulty = 2;
}}; }};
biomassFacility = new SectorPreset("biomassFacility", serpulo, 63){{ biomassFacility = new SectorPreset("biomassFacility", serpulo, 81){{
captureWave = 20; captureWave = 20;
difficulty = 3; difficulty = 3;
}}; }};
@@ -54,17 +54,17 @@ public class SectorPresets{
difficulty = 5; difficulty = 5;
}}; }};
craters = new SectorPreset("craters", serpulo, 175){{ craters = new SectorPreset("craters", serpulo, 18){{
captureWave = 20; captureWave = 20;
difficulty = 2; difficulty = 2;
}}; }};
ruinousShores = new SectorPreset("ruinousShores", serpulo, 41){{ ruinousShores = new SectorPreset("ruinousShores", serpulo, 213){{
captureWave = 30; captureWave = 30;
difficulty = 3; difficulty = 3;
}}; }};
seaPort = new SectorPreset("seaPort", serpulo, 98){{ seaPort = new SectorPreset("seaPort", serpulo, 47){{
difficulty = 4; difficulty = 4;
}}; }};
@@ -73,7 +73,7 @@ public class SectorPresets{
difficulty = 4; difficulty = 4;
}}; }};
windsweptIslands = new SectorPreset("windsweptIslands", serpulo, 97){{ windsweptIslands = new SectorPreset("windsweptIslands", serpulo, 246){{
captureWave = 30; captureWave = 30;
difficulty = 4; difficulty = 4;
}}; }};
@@ -106,11 +106,11 @@ public class SectorPresets{
difficulty = 8; difficulty = 8;
}}; }};
frontier = new SectorPreset("frontier", serpulo, 41){{ frontier = new SectorPreset("frontier", serpulo, 50){{
difficulty = 4; difficulty = 4;
}}; }};
fungalPass = new SectorPreset("fungalPass", serpulo, 219){{ fungalPass = new SectorPreset("fungalPass", serpulo, 21){{
difficulty = 4; difficulty = 4;
}}; }};
@@ -118,19 +118,19 @@ public class SectorPresets{
difficulty = 4; difficulty = 4;
}}; }};
atolls = new SectorPreset("atolls", serpulo, 40){{ atolls = new SectorPreset("atolls", serpulo, 1){{
difficulty = 7; difficulty = 7;
}}; }};
mycelialBastion = new SectorPreset("mycelialBastion", serpulo, 23){{ mycelialBastion = new SectorPreset("mycelialBastion", serpulo, 260){{
difficulty = 8; difficulty = 8;
}}; }};
overgrowth = new SectorPreset("overgrowth", serpulo, 220){{ overgrowth = new SectorPreset("overgrowth", serpulo, 134){{
difficulty = 5; difficulty = 5;
}}; }};
tarFields = new SectorPreset("tarFields", serpulo, 101){{ tarFields = new SectorPreset("tarFields", serpulo, 23){{
captureWave = 40; captureWave = 40;
difficulty = 5; difficulty = 5;
}}; }};

4
core/src/mindustry/content/SerpuloTechTree.java
View File

@@ -712,7 +712,7 @@ public class SerpuloTechTree{
new Research(additiveReconstructor) new Research(additiveReconstructor)
), () -> { ), () -> {
node(nuclearComplex, Seq.with( node(nuclearComplex, Seq.with(
new SectorComplete(fungalPass), new SectorComplete(infestedCanyons),
new Research(thermalGenerator), new Research(thermalGenerator),
new Research(laserDrill), new Research(laserDrill),
new Research(Items.plastanium), new Research(Items.plastanium),
@@ -730,8 +730,6 @@ public class SerpuloTechTree{
}); });
}); });
}); });
}); });
}); });

5
core/src/mindustry/content/TechTree.java
View File

@@ -42,6 +42,11 @@ public class TechTree{
node.objectives.addAll(objectives); node.objectives.addAll(objectives);
} }
//insert missing sector parent dependencies
if(context != null && context.content instanceof SectorPreset preset && !node.objectives.contains(o -> o instanceof SectorComplete sc && sc.preset == preset)){
node.objectives.insert(0, new SectorComplete(preset));
}
TechNode prev = context; TechNode prev = context;
context = node; context = node;
children.run(); children.run();

2
core/src/mindustry/type/Planet.java
View File

@@ -395,7 +395,7 @@ public class Planet extends UnlockableContent{
clipRadius = Math.max(clipRadius, radius + atmosphereRadOut + 0.5f); clipRadius = Math.max(clipRadius, radius + atmosphereRadOut + 0.5f);
} }
public PlanetData getData(){ public @Nullable PlanetData getData(){
if(loadPlanetData && data == null){ if(loadPlanetData && data == null){
Fi file = tree.get("planets/" + name + ".json"); Fi file = tree.get("planets/" + name + ".json");
if(file.exists()){ if(file.exists()){