From 634ece405f875d73df36e979b8572a156f516016 Mon Sep 17 00:00:00 2001
From: Epowerj <epowerj@homecore.space>
Date: Tue, 18 Oct 2022 22:48:15 -0400
Subject: [PATCH] Added karst and crossroads to campaign

---
 core/assets/bundles/bundle.properties         |  4 +++
 .../src/mindustry/content/ErekirTechTree.java | 32 +++++++++++--------
 core/src/mindustry/content/SectorPresets.java | 11 ++++++-
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 6801e6dd31..496a329c7a 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -770,6 +770,8 @@ sector.caldera-erekir.name = Caldera
 sector.stronghold.name = Stronghold
 sector.crevice.name = Crevice
 sector.siege.name = Siege
+sector.crossroads.name = Crossroads
+sector.karst.name = Karst
 
 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.
@@ -783,6 +785,8 @@ sector.caldera-erekir.description = The resources detected in this sector are sc
 sector.stronghold.description = WiP Description.
 sector.crevice.description = WiP Description.
 sector.siege.description = WiP Description.
+sector.crossroads.description = WiP Description.
+sector.karst.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 469dab4861..3b1ddf575e 100644
--- a/core/src/mindustry/content/ErekirTechTree.java
+++ b/core/src/mindustry/content/ErekirTechTree.java
@@ -148,8 +148,8 @@ public class ErekirTechTree{
                     node(ventCondenser, Seq.with(new OnSector(aegis)), () -> {
                         node(chemicalCombustionChamber, Seq.with(new OnSector(basin)), () -> {
                             node(pyrolysisGenerator, Seq.with(new OnSector(crevice)), () -> {
-                                node(fluxReactor, Seq.with(tmpNever), () -> {
-                                    node(neoplasiaReactor, () -> {
+                                node(fluxReactor, Seq.with(new OnSector(crossroads), new Research(cyanogenSynthesizer)), () -> {
+                                    node(neoplasiaReactor, Seq.with(new OnSector(karst)), () -> {
 
                                     });
                                 });
@@ -214,8 +214,8 @@ public class ErekirTechTree{
                                         });
 
                                         node(carbideCrucible, Seq.with(new OnSector(crevice)), () -> {
-                                            node(phaseSynthesizer, Seq.with(tmpNever), () -> {
-                                                node(phaseHeater, () -> {
+                                            node(phaseSynthesizer, Seq.with(new OnSector(karst)), () -> {
+                                                node(phaseHeater, Seq.with(new Research(phaseSynthesizer)), () -> {
 
                                                 });
                                             });
@@ -274,7 +274,7 @@ public class ErekirTechTree{
                         node(afflict, Seq.with(new OnSector(ravine)), () -> {
                             node(titan, Seq.with(new OnSector(stronghold)), () -> {
                                 node(lustre, Seq.with(new OnSector(crevice)), () -> {
-                                    node(smite, Seq.with(tmpNever), () -> {
+                                    node(smite, Seq.with(new OnSector(karst)), () -> {
 
                                     });
                                 });
@@ -340,25 +340,25 @@ public class ErekirTechTree{
                                             });
                                         });
 
-                                        node(shipAssembler, Seq.with(tmpNever), () -> {
+                                        node(shipAssembler, Seq.with(new OnSector(crossroads)), () -> {
                                             node(UnitTypes.quell, () -> {
                                                 node(UnitTypes.disrupt, Seq.with(tmpNever), () -> {
 
                                                 });
                                             });
+                                        });
 
-                                            node(mechAssembler, Seq.with(tmpNever), () -> {
-                                                node(UnitTypes.tecta, () -> {
-                                                    node(UnitTypes.collaris, Seq.with(tmpNever), () -> {
-
-                                                    });
-                                                });
-
-                                                node(basicAssemblerModule, () -> {
+                                        node(mechAssembler, Seq.with(new OnSector(crossroads)), () -> {
+                                            node(UnitTypes.tecta, () -> {
+                                                node(UnitTypes.collaris, Seq.with(tmpNever), () -> {
 
                                                 });
                                             });
                                         });
+
+                                        node(basicAssemblerModule, Seq.with(tmpNever), () -> {
+
+                                        });
                                     });
                                 });
                             });
@@ -386,7 +386,11 @@ public class ErekirTechTree{
                                             node(stronghold, Seq.with(new SectorComplete(caldera), new Research(coreCitadel)), () -> {
                                                 node(crevice, Seq.with(new SectorComplete(stronghold)), () -> {
                                                     node(siege, Seq.with(new SectorComplete(crevice)), () -> {
+                                                        node(crossroads, Seq.with(new SectorComplete(siege)), () -> {
+                                                            node(karst, Seq.with(new SectorComplete(crossroads), new Research(coreAcropolis)), () -> {
 
+                                                            });
+                                                        });
                                                     });
                                                 });
                                             });
diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java
index 0ff2a0f558..4048999d2d 100644
--- a/core/src/mindustry/content/SectorPresets.java
+++ b/core/src/mindustry/content/SectorPresets.java
@@ -12,7 +12,8 @@ public class SectorPresets{
     impact0078, desolateRift, nuclearComplex, planetaryTerminal,
     coastline, navalFortress,
 
-    onset, aegis, lake, intersect, basin, atlas, split, marsh, peaks, ravine, caldera, stronghold, crevice, siege;
+    onset, aegis, lake, intersect, basin, atlas, split, marsh, peaks, ravine, caldera, stronghold, crevice, siege,
+            crossroads, karst;
 
     public static void load(){
         //region serpulo
@@ -171,6 +172,14 @@ public class SectorPresets{
             difficulty = 4;
         }};
 
+        crossroads = new SectorPreset("crossroads", erekir, 36){{
+            difficulty = 5;
+        }};
+
+        karst = new SectorPreset("karst", erekir, 5){{
+            difficulty = 5;
+        }};
+
         //endregion
     }
 }