From c1477e1f2f37168ce9f6c513628f133d8cae7fb4 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 27 Nov 2021 18:23:41 -0500 Subject: [PATCH] WIP erekir tech tree --- core/src/mindustry/content/Blocks.java | 12 +++++----- core/src/mindustry/content/Liquids.java | 5 ---- core/src/mindustry/content/TechTree.java | 30 +++++++++++++++++++++++- 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index f8fdb6bedb..d80f70bc42 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1560,7 +1560,7 @@ public class Blocks implements ContentList{ //special transport blocks duct = new Duct("duct"){{ - requirements(Category.distribution, with(Items.graphite, 5)); + requirements(Category.distribution, with(Items.graphite, 2)); speed = 4f; }}; @@ -1575,12 +1575,12 @@ public class Blocks implements ContentList{ }}; ductBridge = new DuctBridge("duct-bridge"){{ - requirements(Category.distribution, with(Items.graphite, 20)); + requirements(Category.distribution, with(Items.graphite, 15)); speed = 4f; }}; ductUnloader = new DirectionalUnloader("duct-unloader"){{ - requirements(Category.distribution, with(Items.graphite, 10)); + requirements(Category.distribution, with(Items.graphite, 20, Items.silicon, 20)); speed = 4f; }}; @@ -2130,7 +2130,7 @@ public class Blocks implements ContentList{ coreBastion = new CoreBlock("core-bastion"){{ //TODO cost - requirements(Category.effect, BuildVisibility.editorOnly, with(Items.beryllium, 2000, Items.graphite, 2000, Items.tungsten, 1000)); + requirements(Category.effect, BuildVisibility.editorOnly, with(Items.graphite, 1000, Items.beryllium, 800)); unitType = UnitTypes.evoke; health = 7000; @@ -2192,7 +2192,7 @@ public class Blocks implements ContentList{ }}; reinforcedContainer = new StorageBlock("reinforced-container"){{ - requirements(Category.effect, with(Items.tungsten, 250, Items.graphite, 100)); + requirements(Category.effect, with(Items.tungsten, 100, Items.graphite, 50)); size = 3; //TODO should it really be kept the same, at 1000? itemCapacity = 1000; @@ -2200,7 +2200,7 @@ public class Blocks implements ContentList{ }}; reinforcedVault = new StorageBlock("reinforced-vault"){{ - requirements(Category.effect, with(Items.tungsten, 250, Items.graphite, 100)); + requirements(Category.effect, with(Items.tungsten, 250, Items.carbide, 125)); size = 4; itemCapacity = 2500; health = size * size * 120; diff --git a/core/src/mindustry/content/Liquids.java b/core/src/mindustry/content/Liquids.java index d4411b9d0e..2269139eb6 100644 --- a/core/src/mindustry/content/Liquids.java +++ b/core/src/mindustry/content/Liquids.java @@ -58,7 +58,6 @@ public class Liquids implements ContentList{ colorTo = Color.valueOf("9e172c"); }}; - //TODO I have doubts about this liquid's usefulness gallium = new Liquid("gallium", Color.valueOf("9a9dbf")){{ }}; @@ -85,9 +84,5 @@ public class Liquids implements ContentList{ gas = true; flammability = 2f; }}; - - //TODO dicyanoacetylene vs cyanogen - - //TODO molten lead (maybe) } } diff --git a/core/src/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java index 235d3eb749..8fefcc9527 100644 --- a/core/src/mindustry/content/TechTree.java +++ b/core/src/mindustry/content/TechTree.java @@ -17,12 +17,13 @@ public class TechTree implements ContentList{ static TechNode context = null; public static Seq all; - public static TechNode root; + public static TechNode root, rootErekir; @Override public void load(){ setup(); + //region serpulo root = node(coreShard, () -> { node(conveyor, () -> { @@ -658,6 +659,33 @@ public class TechTree implements ContentList{ }); }); }); + + //endregion + //region erekir + + rootErekir = node(coreBastion, () -> { + node(duct, () -> { + node(ductRouter, () -> { + node(ductBridge, () -> { + node(surgeConveyor, () -> { + node(surgeRouter); + }); + }); + + node(overflowDuct, () -> { + + }); + + node(reinforcedContainer, () -> { + node(reinforcedVault, () -> { + + }); + }); + }); + }); + }); + + //endregion } public static void setup(){