From a4d342c397e44df63824f0ca2e6f83733d278506 Mon Sep 17 00:00:00 2001 From: Epowerj Date: Wed, 28 Sep 2022 16:54:46 -0400 Subject: [PATCH] Added stronghold to campaign, tweaked tech tree --- .../src/mindustry/content/ErekirTechTree.java | 24 +++++++++++-------- core/src/mindustry/content/SectorPresets.java | 6 ++++- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/core/src/mindustry/content/ErekirTechTree.java b/core/src/mindustry/content/ErekirTechTree.java index 9216879006..fc43e16bf2 100644 --- a/core/src/mindustry/content/ErekirTechTree.java +++ b/core/src/mindustry/content/ErekirTechTree.java @@ -8,6 +8,8 @@ import mindustry.type.*; import mindustry.type.unit.*; import mindustry.world.blocks.defense.turrets.*; +import java.awt.*; + import static mindustry.Vars.*; import static mindustry.content.Blocks.*; import static mindustry.content.SectorPresets.*; @@ -136,7 +138,7 @@ public class ErekirTechTree{ node(plasmaBore, () -> { node(impactDrill, Seq.with(new OnSector(aegis)), () -> { node(largePlasmaBore, Seq.with(new OnSector(caldera)), () -> { - node(eruptionDrill, Seq.with(tmpNever), () -> { + node(eruptionDrill, Seq.with(new OnSector(stronghold)), () -> { }); }); @@ -147,7 +149,7 @@ public class ErekirTechTree{ node(beamNode, () -> { node(ventCondenser, Seq.with(new OnSector(aegis)), () -> { node(chemicalCombustionChamber, Seq.with(new OnSector(basin)), () -> { - node(pyrolysisGenerator, () -> { + node(pyrolysisGenerator, Seq.with(tmpNever), () -> { node(fluxReactor, () -> { node(neoplasiaReactor, () -> { @@ -164,8 +166,8 @@ public class ErekirTechTree{ node(regenProjector, Seq.with(new OnSector(peaks)), () -> { //TODO more tiers of build tower or "support" structures like overdrive projectors - node(buildTower, Seq.with(tmpNever), () -> { - node(shockwaveTower, () -> { + node(buildTower, Seq.with(new OnSector(stronghold)), () -> { + node(shockwaveTower, Seq.with(tmpNever), () -> { }); }); @@ -268,8 +270,8 @@ public class ErekirTechTree{ node(diffuse, Seq.with(new OnSector(lake)), () -> { node(sublimate, Seq.with(new OnSector(marsh)), () -> { node(afflict, Seq.with(new OnSector(ravine)), () -> { - node(titan, Seq.with(new OnSector(marsh)), () -> { - node(lustre, () -> { + node(titan, Seq.with(new OnSector(stronghold)), () -> { + node(lustre, Seq.with(tmpNever), () -> { node(smite, () -> { }); @@ -278,8 +280,8 @@ public class ErekirTechTree{ }); }); - node(disperse, Seq.with(tmpNever), () -> { - node(scathe, () -> { + node(disperse, Seq.with(new OnSector(stronghold)), () -> { + node(scathe, Seq.with(tmpNever), () -> { node(malign, () -> { }); @@ -322,13 +324,13 @@ public class ErekirTechTree{ node(UnitTypes.avert); //TODO - node(primeRefabricator, Seq.with(tmpNever), () -> { + node(primeRefabricator, Seq.with(new OnSector(stronghold)), () -> { node(UnitTypes.precept); node(UnitTypes.anthicus); node(UnitTypes.obviate); }); - node(tankAssembler, Seq.with(new OnSector(intersect), new Research(constructor), new Research(atmosphericConcentrator)), () -> { + node(tankAssembler, Seq.with(tmpNever, new OnSector(intersect), new Research(constructor), new Research(atmosphericConcentrator)), () -> { node(UnitTypes.vanquish, () -> { node(UnitTypes.conquer, Seq.with(tmpNever), () -> { @@ -379,7 +381,9 @@ public class ErekirTechTree{ 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(stronghold, Seq.with(new SectorComplete(caldera), new Research(coreCitadel)), () -> { + }); }); }); diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java index c26e1136da..078edb8a6b 100644 --- a/core/src/mindustry/content/SectorPresets.java +++ b/core/src/mindustry/content/SectorPresets.java @@ -12,7 +12,7 @@ public class SectorPresets{ impact0078, desolateRift, nuclearComplex, planetaryTerminal, coastline, navalFortress, - onset, aegis, lake, intersect, basin, atlas, split, marsh, peaks, ravine, caldera; + onset, aegis, lake, intersect, basin, atlas, split, marsh, peaks, ravine, caldera,stronghold; public static void load(){ //region serpulo @@ -156,6 +156,10 @@ public class SectorPresets{ difficulty = 4; }}; + stronghold = new SectorPreset("stronghold", erekir, 18){{ + difficulty = 6; + }}; + //endregion } }