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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2022-10-08 07:50:26 -04:00
parent 09f5439c33 72b408158d
commit 719a2f1419
38 changed files with 240 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/mindustry/content/ErekirTechTree.java
View File

@@ -147,8 +147,8 @@ public class ErekirTechTree{
node(beamNode, () -> {
node(ventCondenser, Seq.with(new OnSector(aegis)), () -> {
node(chemicalCombustionChamber, Seq.with(new OnSector(basin)), () -> {
node(pyrolysisGenerator, Seq.with(tmpNever), () -> {
node(fluxReactor, () -> {
node(pyrolysisGenerator, Seq.with(new OnSector(crevice)), () -> {
node(fluxReactor, Seq.with(tmpNever), () -> {
node(neoplasiaReactor, () -> {
});
@@ -213,8 +213,8 @@ public class ErekirTechTree{
});
});
node(carbideCrucible, Seq.with(tmpNever), () -> {
node(phaseSynthesizer, () -> {
node(carbideCrucible, Seq.with(new OnSector(crevice)), () -> {
node(phaseSynthesizer, Seq.with(tmpNever), () -> {
node(phaseHeater, () -> {
});
@@ -273,8 +273,8 @@ public class ErekirTechTree{
node(sublimate, Seq.with(new OnSector(marsh)), () -> {
node(afflict, Seq.with(new OnSector(ravine)), () -> {
node(titan, Seq.with(new OnSector(stronghold)), () -> {
node(lustre, Seq.with(tmpNever), () -> {
node(smite, () -> {
node(lustre, Seq.with(new OnSector(crevice)), () -> {
node(smite, Seq.with(tmpNever), () -> {
});
});
@@ -384,7 +384,9 @@ public class ErekirTechTree{
node(ravine, Seq.with(new SectorComplete(marsh), new Research(Liquids.slag)), () ->{
node(caldera, Seq.with(new SectorComplete(peaks), new Research(heatRedirector)), () -> {
node(stronghold, Seq.with(new SectorComplete(caldera), new Research(coreCitadel)), () -> {
node(crevice, Seq.with(new SectorComplete(stronghold)), () -> {
});
});
});
});

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

@@ -12,7 +12,7 @@ public class SectorPresets{
impact0078, desolateRift, nuclearComplex, planetaryTerminal,
coastline, navalFortress,
onset, aegis, lake, intersect, basin, atlas, split, marsh, peaks, ravine, caldera,stronghold;
onset, aegis, lake, intersect, basin, atlas, split, marsh, peaks, ravine, caldera, stronghold, crevice;
public static void load(){
//region serpulo
@@ -160,6 +160,11 @@ public class SectorPresets{
difficulty = 6;
}};
crevice = new SectorPreset("crevice", erekir, 3){{
difficulty = 4;
captureWave = 45;
}};
//endregion
}
}