From 2eb3e5e034a2a8d8e56d45927d771a3da8dc06b9 Mon Sep 17 00:00:00 2001
From: Epowerj <epowerj@homecore.space>
Date: Mon, 10 Oct 2022 17:31:58 -0400
Subject: [PATCH] Added siege to campaign

---
 core/assets/bundles/bundle.properties          |  2 ++
 core/src/mindustry/content/ErekirTechTree.java | 14 ++++++++------
 core/src/mindustry/content/SectorPresets.java  |  6 +++++-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index f821dc19e8..bbf99f9fca 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -769,6 +769,7 @@ sector.ravine.name = Ravine
 sector.caldera-erekir.name = Caldera
 sector.stronghold.name = Stronghold
 sector.crevice.name = Crevice
+sector.siege.name = Siege
 
 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.
@@ -781,6 +782,7 @@ sector.ravine.description = No enemy cores detected in the sector, although it's
 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.
+sector.siege.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 b8fbb2d4b2..b1d2c9af47 100644
--- a/core/src/mindustry/content/ErekirTechTree.java
+++ b/core/src/mindustry/content/ErekirTechTree.java
@@ -165,7 +165,7 @@ 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(new OnSector(stronghold)), () -> {
-                            node(shockwaveTower, Seq.with(tmpNever), () -> {
+                            node(shockwaveTower, Seq.with(new OnSector(siege)), () -> {
 
                             });
                         });
@@ -208,7 +208,7 @@ public class ErekirTechTree{
                                         });
 
                                         node(atmosphericConcentrator, Seq.with(new OnSector(caldera)), () -> {
-                                            node(cyanogenSynthesizer, Seq.with(tmpNever), () -> {
+                                            node(cyanogenSynthesizer, Seq.with(new OnSector(siege)), () -> {
 
                                             });
                                         });
@@ -283,8 +283,8 @@ public class ErekirTechTree{
                     });
 
                     node(disperse, Seq.with(new OnSector(stronghold)), () -> {
-                        node(scathe, Seq.with(tmpNever), () -> {
-                            node(malign, () -> {
+                        node(scathe, Seq.with(new OnSector(siege)), () -> {
+                            node(malign, Seq.with(tmpNever), () -> {
 
                             });
                         });
@@ -332,7 +332,7 @@ public class ErekirTechTree{
                                         node(UnitTypes.obviate);
                                     });
 
-                                    node(tankAssembler, Seq.with(tmpNever, new OnSector(intersect), new Research(constructor), new Research(atmosphericConcentrator)), () -> {
+                                    node(tankAssembler, Seq.with(new OnSector(siege), new Research(constructor), new Research(atmosphericConcentrator)), () -> {
 
                                         node(UnitTypes.vanquish, () -> {
                                             node(UnitTypes.conquer, Seq.with(tmpNever), () -> {
@@ -340,7 +340,7 @@ public class ErekirTechTree{
                                             });
                                         });
 
-                                        node(shipAssembler, Seq.with(new OnSector(basin)), () -> {
+                                        node(shipAssembler, Seq.with(tmpNever), () -> {
                                             node(UnitTypes.quell, () -> {
                                                 node(UnitTypes.disrupt, Seq.with(tmpNever), () -> {
 
@@ -385,7 +385,9 @@ public class ErekirTechTree{
                                         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)), () -> {
+                                                    node(siege, Seq.with(new SectorComplete(crevice)), () -> {
 
+                                                    });
                                                 });
                                             });
                                         });
diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java
index 02dc9b3bdb..af8a2a3e4c 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, crevice;
+    onset, aegis, lake, intersect, basin, atlas, split, marsh, peaks, ravine, caldera, stronghold, crevice, siege;
 
     public static void load(){
         //region serpulo
@@ -165,6 +165,10 @@ public class SectorPresets{
             captureWave = 45;
         }};
 
+        siege = new SectorPreset("siege", erekir, 58){{
+            difficulty = 4;
+        }};
+
         //endregion
     }
 }