From 4446be612f89a4c7cd7129c82e09f21f8fcadd32 Mon Sep 17 00:00:00 2001 From: Epowerj Date: Fri, 7 Oct 2022 20:24:38 -0400 Subject: [PATCH] Added crevice to campaign --- core/assets/bundles/bundle.properties | 4 ++++ core/src/mindustry/content/ErekirTechTree.java | 14 ++++++++------ core/src/mindustry/content/SectorPresets.java | 7 ++++++- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 3a3fc719fc..a68aba4e58 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -767,6 +767,8 @@ sector.marsh.name = Marsh sector.peaks.name = Peaks sector.ravine.name = Ravine sector.caldera-erekir.name = Caldera +sector.stronghold.name = Stronghold +sector.crevice.name = Crevice sector.onset.description = The tutorial sector. This objective has not been created yet. Await further information. sector.aegis.description = This sector contains deposits of tungsten.\nResearch the [accent]Impact Drill[] to mine this resource, and destroy the enemy base in the area. @@ -777,6 +779,8 @@ sector.split.description = The minimal enemy presence in this sector makes it pe sector.basin.description = Large enemy presence detected in this sector.\nBuild units quickly and capture enemy cores to gain a foothold. sector.ravine.description = No enemy cores detected in the sector, although it's an important transportation route for the enemy. Expect a variety of enemy forces.\nProduce [accent]surge alloy[]. Construct [accent]Afflict[] turrets. sector.caldera-erekir.description = The resources detected in this sector are scattered across several islands.\nResearch and deploy drone-based transportation. +sector.stronghold.description = WiP Description. +sector.crevice.description = WiP Description. status.burning.name = Burning status.freezing.name = Freezing diff --git a/core/src/mindustry/content/ErekirTechTree.java b/core/src/mindustry/content/ErekirTechTree.java index 33537fb4b1..b8fbb2d4b2 100644 --- a/core/src/mindustry/content/ErekirTechTree.java +++ b/core/src/mindustry/content/ErekirTechTree.java @@ -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)), () -> { + }); }); }); }); diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java index 078edb8a6b..02dc9b3bdb 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,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 } }