From e682a0f1d3b3bd42d1daa2b774bfc67adad13ea0 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 23 Jun 2022 16:55:16 -0400 Subject: [PATCH] WIP/unfinished map --- core/assets/maps/lake.msav | Bin 0 -> 8199 bytes core/src/mindustry/content/ErekirTechTree.java | 9 ++++++--- core/src/mindustry/content/SectorPresets.java | 7 ++++++- 3 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 core/assets/maps/lake.msav diff --git a/core/assets/maps/lake.msav b/core/assets/maps/lake.msav new file mode 100644 index 0000000000000000000000000000000000000000..da7acda1fa2c9b6bf082513488b79f19b8f56bb2 GIT binary patch literal 8199 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 { + node(shipFabricator, Seq.with(new OnSector(lake)), () -> { node(UnitTypes.elude); node(mechFabricator, Seq.with(new OnSector(three)), () -> { @@ -342,10 +342,13 @@ public class ErekirTechTree{ }); }); - //TODO more sectors node(onset, () -> { node(two, Seq.with(new SectorComplete(onset), new Research(ductRouter), new Research(ductBridge)), () -> { - node(three, Seq.with(new SectorComplete(two), new Research(ventCondenser), new Research(shipFabricator)), () -> { + node(lake, Seq.with(new SectorComplete(two)), () -> { + + }); + + node(three, Seq.with(new SectorComplete(two), new SectorComplete(lake), new Research(ventCondenser), new Research(shipFabricator)), () -> { node(four, Seq.with(new SectorComplete(three)), () -> { }); diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java index 9260b99e68..f635257929 100644 --- a/core/src/mindustry/content/SectorPresets.java +++ b/core/src/mindustry/content/SectorPresets.java @@ -16,7 +16,7 @@ public class SectorPresets{ impact0078, desolateRift, nuclearComplex, planetaryTerminal, coastline, navalFortress, - onset, two, three, four + onset, two, lake, three, four ; public static void load(){ @@ -198,6 +198,11 @@ public class SectorPresets{ }; }}; + lake = new SectorPreset("lake", erekir, 41){{ + difficulty = 4; + + }}; + three = new SectorPreset("three", erekir, 36){{ difficulty = 5;