New WIP sector preset

core/src/mindustry/content/Blocks.java

@@ -50,7 +50,7 @@ public class Blocks{
     iceSnow, sandWater, darksandWater, duneWall, sandWall, moss, sporeMoss, shale, shaleWall, grass, salt,
     //boulders
     shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, carbonBoulder, ferricBoulder, beryllicBoulder, yellowStoneBoulder,
-    arkyicBoulder, crystalCluster, vibrantCrystalCluster, crystalBlocks, crystallineBoulder, redIceBoulder, rhyoliteBoulder, redStoneBoulder,
+    arkyicBoulder, crystalCluster, vibrantCrystalCluster, crystalBlocks, crystalOrbs, crystallineBoulder, redIceBoulder, rhyoliteBoulder, redStoneBoulder,
     metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, basalt, magmarock, hotrock, snowWall, saltWall,
     darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal,
     pebbles, tendrils,
@@ -705,6 +705,13 @@ public class Blocks{
             shadowOffset = -2.5f;
         }};
 
+        crystalOrbs = new TallBlock("crystal-orbs"){{
+            variants = 3;
+            clipSize = 128f;
+            shadowAlpha = 0.5f;
+            shadowOffset = -2.5f;
+        }};
+
         crystallineBoulder = new Prop("crystalline-boulder"){{
             variants = 2;
             crystallineStone.asFloor().decoration = this;
@@ -725,7 +732,6 @@ public class Blocks{
             denseRedStone.asFloor().decoration = redStone.asFloor().decoration = this;
         }};
 
-
         metalFloor = new Floor("metal-floor", 0);
         metalFloorDamaged = new Floor("metal-floor-damaged", 3);
 

core/src/mindustry/content/ErekirTechTree.java

@@ -11,6 +11,7 @@ import static mindustry.content.TechTree.*;
 public class ErekirTechTree{
 
     public static void load(){
+        //TODO might be unnecessary with no asteroids
         Seq<Objective> erekirSector = Seq.with(new OnPlanet(Planets.erekir));
 
         var costMultipliers = new ObjectFloatMap<Item>();
@@ -25,7 +26,7 @@ public class ErekirTechTree{
         Planets.erekir.techTree = nodeRoot("erekir", coreBastion, true, () -> {
             context().researchCostMultipliers = costMultipliers;
 
-            node(duct, () -> {
+            node(duct, erekirSector, () -> {
                 node(ductRouter, () -> {
                     node(ductBridge, () -> {
                         node(surgeConveyor, () -> {
@@ -76,8 +77,7 @@ public class ErekirTechTree{
 
             //TODO move into turbine condenser?
             node(plasmaBore, () -> {
-
-                node(impactDrill, erekirSector, () -> {
+                node(impactDrill, Seq.with(new OnSector(aware)), () -> {
                     node(largePlasmaBore, () -> {
                         node(eruptionDrill, () -> {
 
@@ -88,7 +88,7 @@ public class ErekirTechTree{
 
             node(turbineCondenser, () -> {
                 node(beamNode, () -> {
-                    node(ventCondenser, erekirSector, () -> {
+                    node(ventCondenser, Seq.with(new OnSector(aware)), () -> {
                         node(chemicalCombustionChamber, () -> {
                             node(pyrolysisGenerator, () -> {
 
@@ -109,8 +109,9 @@ public class ErekirTechTree{
                     });
                 });
 
-                node(reinforcedConduit, erekirSector, () -> {
-                    node(reinforcedPump, () -> {
+                node(reinforcedConduit, () -> {
+                    //TODO so should this be *on* or *complete*?
+                    node(reinforcedPump, Seq.with(new SectorComplete(aware)), () -> {
                         //TODO T2 pump
                     });
 
@@ -131,7 +132,7 @@ public class ErekirTechTree{
 
                 node(siliconArcFurnace, () -> {
                     node(cliffCrusher, () -> {
-                        node(electrolyzer, erekirSector, () -> {
+                        node(electrolyzer, () -> {
                             node(oxidationChamber, () -> {
                                 node(electricHeater, () -> {
                                     node(heatRedirector, () -> {
@@ -201,7 +202,9 @@ public class ErekirTechTree{
 
             //TODO more sectors
             node(onset, () -> {
+                node(aware, Seq.with(new SectorComplete(onset), new Research(ductRouter)), () -> {
 
+                });
             });
 
             nodeProduce(Items.beryllium, () -> {

core/src/mindustry/content/SectorPresets.java

@@ -12,7 +12,7 @@ public class SectorPresets{
     impact0078, desolateRift, nuclearComplex, planetaryTerminal,
     coastline, navalFortress,
 
-    onset
+    onset, aware
     ;
 
     public static void load(){
@@ -118,6 +118,11 @@ public class SectorPresets{
             difficulty = 1;
         }};
 
+        aware = new SectorPreset("aware", erekir, 88){{
+            captureWave = 5;
+            difficulty = 3;
+        }};
+
         //endregion
     }
 }