Bugfixes / Sector preset cleanup

core/src/mindustry/content/Blocks.java

@@ -1836,13 +1836,15 @@ public class Blocks implements ContentList{
             consumes.power(6f);
         }};
 
+        //TODO remove later
+        /*
         coreSilo = new CoreLauncher("core-silo"){{
             requirements(Category.effect, BuildVisibility.campaignOnly, ItemStack.with(Items.copper, 350, Items.silicon, 140, Items.lead, 200, Items.titanium, 150));
             size = 5;
             itemCapacity = 500;
 
             consumes.items(ItemStack.with(Items.copper, 500));
-        }};
+        }};*/
 
         dataProcessor = new ResearchBlock("data-processor"){{
             requirements(Category.effect, BuildVisibility.campaignOnly, ItemStack.with(Items.copper, 200, Items.lead, 100));

core/src/mindustry/content/SectorPresets.java

@@ -4,10 +4,8 @@ import mindustry.ctype.*;
 import mindustry.game.Objectives.*;
 import mindustry.type.*;
 
-import static arc.struct.Seq.with;
-import static mindustry.content.Items.*;
-import static mindustry.content.Planets.starter;
-import static mindustry.type.ItemStack.list;
+import static arc.struct.Seq.*;
+import static mindustry.content.Planets.*;
 
 public class SectorPresets implements ContentList{
     public static SectorPreset
@@ -20,8 +18,6 @@ public class SectorPresets implements ContentList{
     public void load(){
 
         groundZero = new SectorPreset("groundZero", starter, 15){{
-            baseLaunchCost = list(copper, -60);
-            startingItems = list(copper, 60);
             alwaysUnlocked = true;
             conditionWave = 5;
             launchPeriod = 5;
@@ -31,8 +27,6 @@ public class SectorPresets implements ContentList{
         }};
 
         saltFlats = new SectorPreset("saltFlats", starter, 101){{
-            startingItems = list(copper, 200, silicon, 200, lead, 200);
-            loadout = Loadouts.basicFoundation;
             conditionWave = 10;
             launchPeriod = 5;
             requirements = with(
@@ -45,8 +39,6 @@ public class SectorPresets implements ContentList{
         }};
 
         frozenForest = new SectorPreset("frozenForest", starter, 86){{
-            loadout = Loadouts.basicFoundation;
-            startingItems = list(copper, 250);
             conditionWave = 10;
             requirements = with(
             new SectorWave(groundZero, 10),
@@ -56,7 +48,6 @@ public class SectorPresets implements ContentList{
         }};
 
         craters = new SectorPreset("craters", starter, 18){{
-            startingItems = list(copper, 100);
             conditionWave = 10;
             requirements = with(
             new SectorWave(frozenForest, 10),
@@ -66,8 +57,6 @@ public class SectorPresets implements ContentList{
         }};
 
         ruinousShores = new SectorPreset("ruinousShores", starter, 19){{
-            loadout = Loadouts.basicFoundation;
-            startingItems = list(copper, 140, lead, 50);
             conditionWave = 20;
             launchPeriod = 20;
             requirements = with(
@@ -81,8 +70,6 @@ public class SectorPresets implements ContentList{
         }};
 
         stainedMountains = new SectorPreset("stainedMountains", starter, 20){{
-            loadout = Loadouts.basicFoundation;
-            startingItems = list(copper, 200, lead, 50);
             conditionWave = 10;
             launchPeriod = 10;
             requirements = with(
@@ -94,7 +81,6 @@ public class SectorPresets implements ContentList{
         }};
 
         fungalPass = new SectorPreset("fungalPass", starter, 21){{
-            startingItems = list(copper, 250, lead, 250, Items.metaglass, 100, Items.graphite, 100);
             requirements = with(
             new SectorWave(stainedMountains, 15),
             //new Unlock(Blocks.daggerFactory),
@@ -105,10 +91,8 @@ public class SectorPresets implements ContentList{
         }};
 
         overgrowth = new SectorPreset("overgrowth", starter, 22){{
-            startingItems = list(copper, 1500, lead, 1000, Items.silicon, 500, Items.metaglass, 250);
             conditionWave = 12;
             launchPeriod = 4;
-            loadout = Loadouts.basicNucleus;
             requirements = with(
             new SectorWave(craters, 40),
             new Launched(fungalPass),
@@ -120,8 +104,6 @@ public class SectorPresets implements ContentList{
         }};
 
         tarFields = new SectorPreset("tarFields", starter, 23){{
-            loadout = Loadouts.basicFoundation;
-            startingItems = list(copper, 250, lead, 100);
             conditionWave = 15;
             launchPeriod = 10;
             requirements = with(
@@ -133,8 +115,6 @@ public class SectorPresets implements ContentList{
         }};
 
         desolateRift = new SectorPreset("desolateRift", starter, 123){{
-            loadout = Loadouts.basicNucleus;
-            startingItems = list(copper, 1000, lead, 1000, Items.graphite, 250, titanium, 250, Items.silicon, 250);
             conditionWave = 3;
             launchPeriod = 2;
             requirements = with(
@@ -146,8 +126,6 @@ public class SectorPresets implements ContentList{
 
 
         nuclearComplex = new SectorPreset("nuclearComplex", starter, 130){{
-            loadout = Loadouts.basicNucleus;
-            startingItems = list(copper, 1250, lead, 1500, Items.silicon, 400, Items.metaglass, 250);
             conditionWave = 30;
             launchPeriod = 15;
             requirements = with(

core/src/mindustry/content/TechTree.java

@@ -71,6 +71,12 @@ public class TechTree implements ContentList{
                 });
             });
 
+            node(coreFoundation, () -> {
+                node(coreNucleus, () -> {
+
+                });
+            });
+
             node(duo, () -> {
                 node(scatter, () -> {
                     node(hail, () -> {