diff --git a/core/assets/maps/frontier.msav b/core/assets/maps/frontier.msav index abb69d11b8..819d77e5ac 100644 Binary files a/core/assets/maps/frontier.msav and b/core/assets/maps/frontier.msav differ diff --git a/core/assets/maps/overgrowth.msav b/core/assets/maps/overgrowth.msav index e13fd71bf5..7abed66b1c 100644 Binary files a/core/assets/maps/overgrowth.msav and b/core/assets/maps/overgrowth.msav differ diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java index 5a63ab2995..baaa86ad33 100644 --- a/core/src/mindustry/content/SectorPresets.java +++ b/core/src/mindustry/content/SectorPresets.java @@ -106,10 +106,9 @@ public class SectorPresets{ difficulty = 8; }}; - //TODO: removed for now - //frontier = new SectorPreset("frontier", serpulo, 203){{ - // difficulty = 4; - //}}; + frontier = new SectorPreset("frontier", serpulo, 50){{ + difficulty = 4; + }}; fungalPass = new SectorPreset("fungalPass", serpulo, 21){{ difficulty = 4; diff --git a/core/src/mindustry/content/SerpuloTechTree.java b/core/src/mindustry/content/SerpuloTechTree.java index a056ee1b53..373847c95e 100644 --- a/core/src/mindustry/content/SerpuloTechTree.java +++ b/core/src/mindustry/content/SerpuloTechTree.java @@ -462,30 +462,41 @@ public class SerpuloTechTree{ new SectorComplete(stainedMountains), new Research(groundFactory) ), () -> { - node(overgrowth, Seq.with( - new SectorComplete(craters), + node(frontier, Seq.with( + new SectorComplete(biomassFacility), new SectorComplete(fungalPass), - new Research(cultivator), - new Research(sporePress), + new Research(groundFactory), + new Research(airFactory), new Research(additiveReconstructor), - new Research(UnitTypes.mace), - new Research(UnitTypes.flare) + new Research(mace), + new Research(mono) ), () -> { - node(mycelialBastion, Seq.with( - new Research(atrax), - new Research(spiroct), - new Research(multiplicativeReconstructor), - new Research(exponentialReconstructor) - ), () -> { - - }); - - node(atolls, Seq.with( + node(overgrowth, Seq.with( + new SectorComplete(frontier), new SectorComplete(windsweptIslands), - new Research(multiplicativeReconstructor), - new Research(mega) + new Research(ripple), + new Research(salvo), + new Research(crawler), + new Research(atrax), + new Research(cultivator), + new Research(sporePress) ), () -> { + node(mycelialBastion, Seq.with( + new Research(atrax), + new Research(spiroct), + new Research(multiplicativeReconstructor), + new Research(exponentialReconstructor) + ), () -> { + }); + + node(atolls, Seq.with( + new SectorComplete(windsweptIslands), + new Research(multiplicativeReconstructor), + new Research(mega) + ), () -> { + + }); }); }); @@ -499,17 +510,6 @@ public class SerpuloTechTree{ }); }); - /* - node(frontier, Seq.with( - new Research(groundFactory), - new Research(airFactory), - new Research(thermalGenerator), - new Research(dagger), - new Research(mono) - ), () -> { - - });*/ - node(ruinousShores, Seq.with( new SectorComplete(craters), new Research(graphitePress), @@ -525,6 +525,7 @@ public class SerpuloTechTree{ ), () -> { node(seaPort, Seq.with( new SectorComplete(biomassFacility), + new SectorComplete(frontier), new SectorComplete(fungalPass), new Research(navalFactory), new Research(risso), @@ -637,6 +638,7 @@ public class SerpuloTechTree{ node(saltFlats, Seq.with( new SectorComplete(windsweptIslands), new SectorComplete(fungalPass), + new SectorComplete(frontier), new Research(groundFactory), new Research(additiveReconstructor), new Research(airFactory), @@ -701,6 +703,7 @@ public class SerpuloTechTree{ //TODO bad order node(infestedCanyons, Seq.with( new SectorComplete(fungalPass), + new SectorComplete(frontier), new Research(navalFactory), new Research(risso), new Research(minke), diff --git a/core/src/mindustry/logic/GlobalVars.java b/core/src/mindustry/logic/GlobalVars.java index 732c870983..8ad79b5c0f 100644 --- a/core/src/mindustry/logic/GlobalVars.java +++ b/core/src/mindustry/logic/GlobalVars.java @@ -74,7 +74,7 @@ public class GlobalVars{ varMapW = putEntry("@mapw", 0); varMapH = putEntry("@maph", 0); - varWait = putEntry("@wait", null); + varWait = put("@wait", null, true, true); putEntryOnly("sectionNetwork");