diff --git a/core/assets/maps/split.msav b/core/assets/maps/split.msav new file mode 100644 index 0000000000..41af95da13 Binary files /dev/null and b/core/assets/maps/split.msav differ diff --git a/core/assets/maps/three.msav b/core/assets/maps/three.msav index 745a45b268..6f132415a6 100644 Binary files a/core/assets/maps/three.msav and b/core/assets/maps/three.msav differ diff --git a/core/assets/maps/two.msav b/core/assets/maps/two.msav index 9ab26b37ba..05b048c870 100644 Binary files a/core/assets/maps/two.msav and b/core/assets/maps/two.msav differ diff --git a/core/src/mindustry/content/ErekirTechTree.java b/core/src/mindustry/content/ErekirTechTree.java index 759fb8e3e2..9ed219f616 100644 --- a/core/src/mindustry/content/ErekirTechTree.java +++ b/core/src/mindustry/content/ErekirTechTree.java @@ -100,10 +100,10 @@ public class ErekirTechTree{ }); }); - node(reinforcedPayloadConveyor, Seq.with(new OnSector(four)), () -> { + node(reinforcedPayloadConveyor, Seq.with(new OnSector(atlas)), () -> { //TODO should only be unlocked in unit sector - node(constructor, Seq.with(new Research(siliconArcFurnace), new OnSector(four)), () -> { - node(payloadMassDriver, Seq.with(new OnSector(four)), () -> { + node(constructor, Seq.with(new Research(siliconArcFurnace), new OnSector(split)), () -> { + node(payloadMassDriver, Seq.with(new OnSector(split)), () -> { //TODO further limitations node(payloadLoader, () -> { node(payloadUnloader, () -> { @@ -189,7 +189,7 @@ public class ErekirTechTree{ node(cliffCrusher, () -> { node(siliconArcFurnace, () -> { - node(electrolyzer, Seq.with(new OnSector(three)), () -> { + node(electrolyzer, Seq.with(new OnSector(atlas)), () -> { node(oxidationChamber, Seq.with(new Research(tankRefabricator), new OnSector(four)), () -> { node(electricHeater, Seq.with(new OnSector(four)), () -> { node(heatRedirector, () -> { @@ -257,7 +257,7 @@ public class ErekirTechTree{ }); }); - node(diffuse, Seq.with(new OnSector(two)), () -> { + node(diffuse, Seq.with(new OnSector(lake)), () -> { node(sublimate, () -> { node(titan, Seq.with(new OnSector(four)), () -> { node(afflict, Seq.with(new OnSector(four)), () -> { @@ -296,7 +296,7 @@ public class ErekirTechTree{ node(mechFabricator, Seq.with(new OnSector(three)), () -> { node(UnitTypes.merui); - node(tankRefabricator, Seq.with(new OnSector(three)), () -> { + node(tankRefabricator, Seq.with(new OnSector(atlas)), () -> { node(UnitTypes.locus); node(mechRefabricator, Seq.with(new OnSector(three)), () -> { @@ -350,8 +350,14 @@ public class ErekirTechTree{ }); node(three, Seq.with(new SectorComplete(two), new SectorComplete(lake), new Research(ventCondenser), new Research(shipFabricator)), () -> { - node(four, Seq.with(new SectorComplete(three)), () -> { + node(atlas, Seq.with(new SectorComplete(three), new Research(mechFabricator)), () -> { + node(split, Seq.with(new SectorComplete(atlas), new Research(payloadConveyor)), () -> { + }); + + node(four, Seq.with(new SectorComplete(three)), () -> { + + }); }); }); }); diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java index 808306fc02..a63946070f 100644 --- a/core/src/mindustry/content/SectorPresets.java +++ b/core/src/mindustry/content/SectorPresets.java @@ -16,8 +16,7 @@ public class SectorPresets{ impact0078, desolateRift, nuclearComplex, planetaryTerminal, coastline, navalFortress, - onset, two, lake, three, four - ; + onset, two, lake, three, four, atlas, split; public static void load(){ //region serpulo @@ -209,6 +208,14 @@ public class SectorPresets{ captureWave = 9; }}; + atlas = new SectorPreset("atlas", erekir, 14){{ //TODO random sector, pick a better one + difficulty = 5; + }}; + + split = new SectorPreset("split", erekir, 19){{ //TODO random sector, pick a better one + difficulty = 5; + }}; + four = new SectorPreset("four", erekir, 29){{ difficulty = 6;