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

Fixed #7526

Browse Source
This commit is contained in:
Anuken
2022-09-07 08:09:04 -04:00
parent 6d2251c52d
commit 67552add78
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/core/World.java
+5
View File
@@ -272,6 +272,10 @@ public class World{
state.rules.sector = sector; state.rules.sector = sector;
}); });
if(saveInfo && state.rules.waves){
sector.info.waves = state.rules.waves;
}
//postgenerate for bases //postgenerate for bases
if(sector.preset == null && sector.planet.generator != null){ if(sector.preset == null && sector.planet.generator != null){
sector.planet.generator.postGenerate(tiles); sector.planet.generator.postGenerate(tiles);
@@ -314,6 +318,7 @@ public class World{
sector.planet.applyRules(state.rules); sector.planet.applyRules(state.rules);
sector.info.resources = content.toSeq(); sector.info.resources = content.toSeq();
sector.info.resources.sort(Structs.comps(Structs.comparing(Content::getContentType), Structs.comparingInt(c -> c.id))); sector.info.resources.sort(Structs.comps(Structs.comparing(Content::getContentType), Structs.comparingInt(c -> c.id)));
if(saveInfo){ if(saveInfo){
sector.saveInfo(); sector.saveInfo();
} }
core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java
+1 -1
View File
@@ -644,7 +644,7 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
float waveTimeDec = 0.4f; float waveTimeDec = 0.4f;
state.rules.waveSpacing = Mathf.lerp(60 * 65 * 2, 60f * 60f * 1f, Math.max(difficulty - waveTimeDec, 0f)); state.rules.waveSpacing = Mathf.lerp(60 * 65 * 2, 60f * 60f * 1f, Math.max(difficulty - waveTimeDec, 0f));
state.rules.waves = sector.info.waves = true; state.rules.waves = true;
state.rules.env = sector.planet.defaultEnv; state.rules.env = sector.planet.defaultEnv;
state.rules.enemyCoreBuildRadius = 600f; state.rules.enemyCoreBuildRadius = 600f;