diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 9ddebf16a4..70bbc4711a 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1700,12 +1700,12 @@ public class Blocks{ }}; overflowDuct = new OverflowDuct("overflow-duct"){{ - requirements(Category.distribution, with(Items.graphite, 8)); + requirements(Category.distribution, with(Items.graphite, 8, Items.beryllium, 8)); speed = 4f; }}; ductBridge = new DuctBridge("duct-bridge"){{ - requirements(Category.distribution, with(Items.graphite, 15, Items.tungsten, 5)); + requirements(Category.distribution, with(Items.graphite, 15, Items.beryllium, 10)); speed = 4f; }}; diff --git a/core/src/mindustry/content/ErekirTechTree.java b/core/src/mindustry/content/ErekirTechTree.java index d4c8c16f76..762a73317e 100644 --- a/core/src/mindustry/content/ErekirTechTree.java +++ b/core/src/mindustry/content/ErekirTechTree.java @@ -80,39 +80,41 @@ public class ErekirTechTree{ }); node(siliconArcFurnace, () -> { - node(electrolyzer, () -> { - node(oxidationChamber, () -> { - node(electricHeater, () -> { - node(heatRedirector, () -> { - - }); - - node(atmosphericConcentrator, () -> { - node(cyanogenSynthesizer, () -> { + node(cliffCrusher, () -> { + node(electrolyzer, () -> { + node(oxidationChamber, () -> { + node(electricHeater, () -> { + node(heatRedirector, () -> { }); - }); - node(carbideCrucible, () -> { - node(surgeCrucible, () -> { - node(phaseSynthesizer, () -> { - node(phaseHeater, () -> { + node(atmosphericConcentrator, () -> { + node(cyanogenSynthesizer, () -> { + }); + }); + + node(carbideCrucible, () -> { + node(surgeCrucible, () -> { + node(phaseSynthesizer, () -> { + node(phaseHeater, () -> { + + }); }); }); }); }); }); - }); - node(slagIncinerator, () -> { + node(slagIncinerator, () -> { - node(slagCentrifuge, () -> { + node(slagCentrifuge, () -> { - }); + }); - node(heatReactor, () -> { + node(heatReactor, () -> { + }); }); }); }); @@ -120,14 +122,13 @@ public class ErekirTechTree{ //TODO move into turbine condenser? node(plasmaBore, () -> { - node(cliffCrusher, () -> { - node(largePlasmaBore, () -> { - }); + node(largePlasmaBore, () -> { - node(impactDrill, () -> { + }); + + node(impactDrill, () -> { - }); }); }); diff --git a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java index 5dbad79057..5a92c99e13 100644 --- a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java @@ -190,7 +190,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ if(nearAir(x, y)){ if(block == Blocks.carbonWall && noise(x + 78, y, 4, 0.7f, 33f, 1f) > 0.52f){ block = Blocks.graphiticWall; - }else if(block != Blocks.carbonWall && noise(x + 782, y, 4, 0.8f, 38f, 1f) > 0.68f){ + }else if(block != Blocks.carbonWall && noise(x + 782, y, 4, 0.8f, 38f, 1f) > 0.665f){ ore = Blocks.wallOreBeryl; } //TODO generate tungsten, or not?