diff --git a/core/assets/maps/five.msav b/core/assets/maps/five.msav new file mode 100644 index 0000000000..df46eccec4 Binary files /dev/null and b/core/assets/maps/five.msav differ diff --git a/core/assets/maps/four.msav b/core/assets/maps/four.msav index fa3cf8f5b5..16e3baf663 100644 Binary files a/core/assets/maps/four.msav and b/core/assets/maps/four.msav differ diff --git a/core/assets/maps/seven.msav b/core/assets/maps/seven.msav deleted file mode 100644 index cd7b5aea51..0000000000 Binary files a/core/assets/maps/seven.msav and /dev/null differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index f96543fee2..93703559b3 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -2040,6 +2040,7 @@ public class Blocks{ liquidCapacity = 20f; liquidPressure = 1.03f; health = 250; + researchCostMultiplier = 6; }}; //TODO is this necessary? junctions are not good design @@ -2049,12 +2050,14 @@ public class Blocks{ buildCostMultiplier = 3f; health = 260; ((Conduit)reinforcedConduit).junctionReplacement = this; + researchCostMultiplier = 6; }}; reinforcedBridgeConduit = new DirectionLiquidBridge("reinforced-bridge-conduit"){{ requirements(Category.liquid, with(Items.graphite, 6, Items.beryllium, 10)); range = 4; hasPower = false; + researchCostMultiplier = 6; ((Conduit)reinforcedConduit).rotBridgeReplacement = this; }}; @@ -2064,6 +2067,7 @@ public class Blocks{ liquidCapacity = 30f; newDrawing = true; liquidPadding = 3f/4f; + researchCostMultiplier = 6; }}; //TODO is there a need for a container if unloaders can unload 3x3s? @@ -2073,6 +2077,7 @@ public class Blocks{ size = 2; newDrawing = true; liquidPadding = 6f/4f; + researchCostMultiplier = 4; }}; reinforcedLiquidTank = new LiquidRouter("reinforced-liquid-tank"){{ diff --git a/core/src/mindustry/content/ErekirTechTree.java b/core/src/mindustry/content/ErekirTechTree.java index 4a1f0d4c43..ecf770ee3e 100644 --- a/core/src/mindustry/content/ErekirTechTree.java +++ b/core/src/mindustry/content/ErekirTechTree.java @@ -62,7 +62,7 @@ public class ErekirTechTree{ //TODO should only be unlocked in unit sector node(constructor, Seq.with(new Research(siliconArcFurnace), new OnSector(four)), () -> { - node(payloadMassDriver, () -> { + node(payloadMassDriver, Seq.with(new OnSector(five)), () -> { //TODO further limitations node(payloadLoader, () -> { node(payloadUnloader, () -> { @@ -155,7 +155,7 @@ public class ErekirTechTree{ }); node(atmosphericConcentrator, Seq.with(new OnSector(four)), () -> { - node(cyanogenSynthesizer, () -> { + node(cyanogenSynthesizer, Seq.with(new OnSector(five)), () -> { }); }); @@ -207,7 +207,7 @@ public class ErekirTechTree{ }); - node(disperse, () -> { + node(disperse, Seq.with(new OnSector(five)), () -> { }); }); @@ -231,7 +231,7 @@ public class ErekirTechTree{ }); }); - node(shipAssembler, () -> { + node(shipAssembler, Seq.with(new OnSector(five)), () -> { node(UnitTypes.quell, () -> { node(UnitTypes.disrupt, Seq.with(tmpNever), () -> { @@ -253,7 +253,10 @@ public class ErekirTechTree{ node(aware, Seq.with(new SectorComplete(onset), new Research(ductRouter)), () -> { node(three, Seq.with(new SectorComplete(aware), new Research(reinforcedContainer), new Research(ductUnloader), new Research(ventCondenser)), () -> { node(four, Seq.with(new SectorComplete(three), new Research(electrolyzer), new Research(oxidationChamber), new Research(chemicalCombustionChamber)), () -> { + //TODO research reqs? + node(five, Seq.with(new SectorComplete(four)), () -> { + }); }); }); }); diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java index d0483036ad..3fe0dba5fa 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, aware, three, four + onset, aware, three, four, five ; public static void load(){ @@ -132,6 +132,10 @@ public class SectorPresets{ difficulty = 6; }}; + five = new SectorPreset("five", erekir, 12){{ + difficulty = 7; + }}; + //endregion } } diff --git a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java index cf65b029b3..1e1e2fd03d 100644 --- a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java @@ -27,7 +27,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ public static float crystalScl = 0.9f, crystalMag = 0.3f; public static float airThresh = 0.13f, airScl = 14; - Block[] terrain = {Blocks.regolith, Blocks.regolith, Blocks.regolith, Blocks.regolith, Blocks.yellowStone, Blocks.rhyolite, Blocks.carbonStone}; + Block[] terrain = {Blocks.regolith, Blocks.regolith, Blocks.regolith, Blocks.regolith, Blocks.yellowStone, Blocks.rhyolite, Blocks.rhyolite, Blocks.carbonStone}; { baseSeed = 2;