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-09-01 08:46:36 -04:00
parent 5ecd73bdb0 e8ec1c51f4
commit 56856c8166
39 changed files with 81 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -199,11 +199,11 @@ public class ErekirTechTree{
});
node(heatRedirector, Seq.with(new OnSector(ravine)), () -> {
node(electricHeater, Seq.with(new OnSector(ravine), new Research(afflict)), () -> {
node(slagHeater, Seq.with(tmpNever), () -> {
node(slagHeater, Seq.with(new OnSector(caldera)), () -> {
});
node(atmosphericConcentrator, Seq.with(tmpNever), () -> {
node(atmosphericConcentrator, Seq.with(new OnSector(caldera)), () -> {
node(cyanogenSynthesizer, Seq.with(tmpNever), () -> {
});
@@ -268,7 +268,7 @@ public class ErekirTechTree{
});
});
node(disperse, Seq.with(new OnSector(marsh)), () -> {
node(disperse, Seq.with(tmpNever), () -> {
});
});
@@ -360,7 +360,9 @@ public class ErekirTechTree{
node(basin, Seq.with(new SectorComplete(atlas)), () -> {
node(marsh, Seq.with(new SectorComplete(basin)), () ->{
node(ravine, Seq.with(new SectorComplete(marsh), new Research(Liquids.slag)), () ->{
node(caldera, Seq.with(new SectorComplete(peaks), new Research(heatRedirector)), () -> {
});
});
node(peaks, Seq.with(new SectorComplete(marsh), new SectorComplete(split)), () ->{

6
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;
onset, aegis, lake, intersect, basin, atlas, split, marsh, peaks, ravine, caldera;
public static void load(){
//region serpulo
@@ -152,6 +152,10 @@ public class SectorPresets{
captureWave = 24;
}};
caldera = new SectorPreset("caldera-erekir", erekir, 43){{
difficulty = 4;
}};
//endregion
}
}