diff --git a/core/assets/maps/five.msav b/core/assets/maps/five.msav deleted file mode 100644 index 8c64894b92..0000000000 Binary files a/core/assets/maps/five.msav and /dev/null differ diff --git a/core/src/mindustry/content/ErekirTechTree.java b/core/src/mindustry/content/ErekirTechTree.java index bdb049527e..8d7e24bb59 100644 --- a/core/src/mindustry/content/ErekirTechTree.java +++ b/core/src/mindustry/content/ErekirTechTree.java @@ -102,7 +102,7 @@ public class ErekirTechTree{ node(reinforcedPayloadConveyor, Seq.with(new OnSector(four)), () -> { //TODO should only be unlocked in unit sector node(constructor, Seq.with(new Research(siliconArcFurnace), new OnSector(four)), () -> { - node(payloadMassDriver, Seq.with(new OnSector(five)), () -> { + node(payloadMassDriver, Seq.with(new OnSector(four)), () -> { //TODO further limitations node(payloadLoader, () -> { node(payloadUnloader, () -> { @@ -133,7 +133,7 @@ public class ErekirTechTree{ //TODO move into turbine condenser? node(plasmaBore, () -> { node(impactDrill, Seq.with(new OnSector(two)), () -> { - node(largePlasmaBore, Seq.with(new OnSector(five)), () -> { + node(largePlasmaBore, Seq.with(new OnSector(four)), () -> { node(eruptionDrill, () -> { }); @@ -158,7 +158,7 @@ public class ErekirTechTree{ node(regenProjector, () -> { //TODO more tiers of build tower or "support" structures like overdrive projectors - node(buildTower, Seq.with(new OnSector(five)), () -> { + node(buildTower, Seq.with(new OnSector(four)), () -> { }); }); @@ -195,7 +195,7 @@ public class ErekirTechTree{ }); node(atmosphericConcentrator, Seq.with(new OnSector(four)), () -> { - node(cyanogenSynthesizer, Seq.with(new OnSector(five)), () -> { + node(cyanogenSynthesizer, Seq.with(new OnSector(four)), () -> { }); }); @@ -252,11 +252,11 @@ public class ErekirTechTree{ node(diffuse, Seq.with(new OnSector(two)), () -> { node(sublimate, () -> { //TODO implement - node(titan, Seq.with(new OnSector(five)), () -> { + node(titan, Seq.with(new OnSector(four)), () -> { }); - node(disperse, Seq.with(new OnSector(five)), () -> { + node(disperse, Seq.with(new OnSector(four)), () -> { }); }); @@ -313,7 +313,7 @@ public class ErekirTechTree{ }); }); - node(shipAssembler, Seq.with(new OnSector(five)), () -> { + node(shipAssembler, Seq.with(new OnSector(four)), () -> { node(UnitTypes.quell, () -> { node(UnitTypes.disrupt, Seq.with(tmpNever), () -> { @@ -339,10 +339,7 @@ public class ErekirTechTree{ node(two, Seq.with(new SectorComplete(onset), new Research(ductRouter), new Research(ductBridge)), () -> { node(three, Seq.with(new SectorComplete(two), new Research(ventCondenser)), () -> { node(four, Seq.with(new SectorComplete(three)), () -> { - //TODO doesn't work - node(five, Seq.with(new SectorComplete(four), tmpNever), () -> { - }); }); }); }); diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java index efdd1cb896..dddfdf9003 100644 --- a/core/src/mindustry/content/SectorPresets.java +++ b/core/src/mindustry/content/SectorPresets.java @@ -16,7 +16,7 @@ public class SectorPresets{ impact0078, desolateRift, nuclearComplex, planetaryTerminal, coastline, navalFortress, - onset, two, three, four, five + onset, two, three, four ; public static void load(){ @@ -230,10 +230,6 @@ public class SectorPresets{ }; }}; - five = new SectorPreset("five", erekir, 12){{ - difficulty = 7; - }}; - //endregion } }