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

WIP sector reorganization + loading system (broken, do not use!)

Browse Source
This commit is contained in:
Anuken
2025-05-10 23:53:30 -04:00
parent d51e350d75
commit e6182605f4
9 changed files with 197 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/content/Planets.java
View File

@@ -125,7 +125,7 @@ public class Planets{
}};
serpulo = new Planet("serpulo", sun, 1f, 3){{
attackSectorBitString = "YzyZ01aASxvcUBAgAAUMsicEMEQgAFAAAAAEASsOCsEKAg==";
loadPlanetData = true;
generator = new SerpuloPlanetGenerator();
meshLoader = () -> new HexMesh(this, 6);
cloudMeshLoader = () -> new MultiMesh(

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

@@ -1,6 +1,5 @@
package mindustry.content;
import mindustry.*;
import mindustry.type.*;
import static mindustry.content.Planets.*;
@@ -40,12 +39,12 @@ public class SectorPresets{
captureWave = 33;
}};
frozenForest = new SectorPreset("frozenForest", serpulo, 86){{
frozenForest = new SectorPreset("frozenForest", serpulo, 170){{
captureWave = 15;
difficulty = 2;
}};
biomassFacility = new SectorPreset("biomassFacility", serpulo, 81){{
biomassFacility = new SectorPreset("biomassFacility", serpulo, 63){{
captureWave = 20;
difficulty = 3;
}};
@@ -55,17 +54,17 @@ public class SectorPresets{
difficulty = 5;
}};
craters = new SectorPreset("craters", serpulo, 18){{
craters = new SectorPreset("craters", serpulo, 175){{
captureWave = 20;
difficulty = 2;
}};
ruinousShores = new SectorPreset("ruinousShores", serpulo, 213){{
ruinousShores = new SectorPreset("ruinousShores", serpulo, 41){{
captureWave = 30;
difficulty = 3;
}};
seaPort = new SectorPreset("seaPort", serpulo, 47){{
seaPort = new SectorPreset("seaPort", serpulo, 98){{
difficulty = 4;
}};
@@ -74,7 +73,7 @@ public class SectorPresets{
difficulty = 4;
}};
windsweptIslands = new SectorPreset("windsweptIslands", serpulo, 246){{
windsweptIslands = new SectorPreset("windsweptIslands", serpulo, 97){{
captureWave = 30;
difficulty = 4;
}};
@@ -107,11 +106,11 @@ public class SectorPresets{
difficulty = 8;
}};
frontier = new SectorPreset("frontier", serpulo, 50){{
frontier = new SectorPreset("frontier", serpulo, 41){{
difficulty = 4;
}};
fungalPass = new SectorPreset("fungalPass", serpulo, 21){{
fungalPass = new SectorPreset("fungalPass", serpulo, 219){{
difficulty = 4;
}};
@@ -119,19 +118,19 @@ public class SectorPresets{
difficulty = 4;
}};
atolls = new SectorPreset("atolls", serpulo, 1){{
atolls = new SectorPreset("atolls", serpulo, 40){{
difficulty = 7;
}};
mycelialBastion = new SectorPreset("mycelialBastion", serpulo, 260){{
mycelialBastion = new SectorPreset("mycelialBastion", serpulo, 23){{
difficulty = 8;
}};
overgrowth = new SectorPreset("overgrowth", serpulo, 134){{
overgrowth = new SectorPreset("overgrowth", serpulo, 220){{
difficulty = 5;
}};
tarFields = new SectorPreset("tarFields", serpulo, 23){{
tarFields = new SectorPreset("tarFields", serpulo, 101){{
captureWave = 40;
difficulty = 5;
}};
@@ -164,6 +163,7 @@ public class SectorPresets{
difficulty = 10;
}};
/*
registerHiddenSectors(serpulo,
68, //Winter Forest by wpx: https://discord.com/channels/391020510269669376/1165421701362897000/1235654407006322700
241,//River Bastion by wpx: https://discord.com/channels/391020510269669376/1165421701362897000/1232658317126402050
@@ -179,7 +179,7 @@ public class SectorPresets{
Vars.content.sector("sector-serpulo-173").captureWave = 17;
Vars.content.sector("sector-serpulo-240").captureWave = 40;
serpulo.sectors.get(173).generateEnemyBase = false;
serpulo.sectors.get(240).generateEnemyBase = false;
serpulo.sectors.get(240).generateEnemyBase = false;*/
//endregion
//region erekir

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

@@ -475,6 +475,19 @@ public class SerpuloTechTree{
new Research(mace),
new Research(mono)
), () -> {
node(seaPort, Seq.with(
new SectorComplete(biomassFacility),
new SectorComplete(frontier),
new Research(navalFactory),
new Research(risso),
new Research(retusa),
new Research(steamGenerator),
new Research(cultivator),
new Research(coalCentrifuge)
), () -> {
});
node(overgrowth, Seq.with(
new SectorComplete(frontier),
new SectorComplete(windsweptIslands),
@@ -519,30 +532,6 @@ public class SerpuloTechTree{
new Research(siliconSmelter),
new Research(steamGenerator)
), () -> {
node(taintedWoods, Seq.with(
new SectorComplete(biomassFacility),
new SectorComplete(fungalPass),
new SectorComplete(windsweptIslands),
new Research(Items.sporePod),
new Research(Items.plastanium),
new Research(wave)
), () -> {
});
node(seaPort, Seq.with(
new SectorComplete(biomassFacility),
new SectorComplete(frontier),
new SectorComplete(fungalPass),
new Research(navalFactory),
new Research(risso),
new Research(retusa),
new Research(steamGenerator),
new Research(cultivator),
new Research(coalCentrifuge)
), () -> {
});
node(tarFields, Seq.with(
new SectorComplete(windsweptIslands),
@@ -729,6 +718,15 @@ public class SerpuloTechTree{
), () -> {
});
node(taintedWoods, Seq.with(
new SectorComplete(infestedCanyons),
new Research(Items.sporePod),
new Research(Items.plastanium),
new Research(wave)
), () -> {
});
});