diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 32902a6c98..11015dc89d 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -158,7 +158,7 @@ mod.circulardependencies = [red]Circular Dependencies mod.incompletedependencies = [red]Incomplete Dependencies mod.requiresversion.details = Requires game version: [accent]{0}[]\nYour game is outdated. This mod requires a newer version of the game (possibly a beta/alpha release) to function. -mod.outdatedv7.details = This mod is incompatible with the latest version of the game. The author must update it, and add [accent]minGameVersion: 136[] to its [accent]mod.json[] file. +mod.incompatiblemod.details = This mod is incompatible with the latest version of the game. The author must update it, and add [accent]minGameVersion: 147[] to its [accent]mod.json[] file. mod.blacklisted.details = This mod has been manually blacklisted for causing crashes or other issues with this version of the game. Do not use it. mod.missingdependencies.details = This mod is missing dependencies: {0} mod.erroredcontent.details = This mod caused errors when loading. Ask the mod author to fix them. diff --git a/core/assets/maps/fungalPass.msav b/core/assets/maps/fungalPass.msav index 6ef6328c79..ce09c7f1de 100644 Binary files a/core/assets/maps/fungalPass.msav and b/core/assets/maps/fungalPass.msav differ diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java index af9a2bc53e..5a63ab2995 100644 --- a/core/src/mindustry/content/SectorPresets.java +++ b/core/src/mindustry/content/SectorPresets.java @@ -106,9 +106,10 @@ public class SectorPresets{ difficulty = 8; }}; - frontier = new SectorPreset("frontier", serpulo, 203){{ - difficulty = 4; - }}; + //TODO: removed for now + //frontier = new SectorPreset("frontier", serpulo, 203){{ + // 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 e791f67680..a056ee1b53 100644 --- a/core/src/mindustry/content/SerpuloTechTree.java +++ b/core/src/mindustry/content/SerpuloTechTree.java @@ -147,7 +147,7 @@ public class SerpuloTechTree{ }); }); - node(kiln, Seq.with(new SectorComplete(craters)), () -> { + node(kiln, Seq.with(new OnSector(craters)), () -> { node(pulverizer, () -> { node(incinerator, () -> { node(melter, () -> { @@ -458,6 +458,48 @@ public class SerpuloTechTree{ new Research(mender), new Research(combustionGenerator) ), () -> { + node(fungalPass, Seq.with( + new SectorComplete(stainedMountains), + new Research(groundFactory) + ), () -> { + node(overgrowth, Seq.with( + new SectorComplete(craters), + new SectorComplete(fungalPass), + new Research(cultivator), + new Research(sporePress), + new Research(additiveReconstructor), + new Research(UnitTypes.mace), + new Research(UnitTypes.flare) + ), () -> { + 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) + ), () -> { + + }); + }); + + node(taintedWoods, Seq.with( + new SectorComplete(biomassFacility), + new SectorComplete(fungalPass), + new Research(Items.sporePod), + new Research(wave) + ), () -> { + + }); + }); + + /* node(frontier, Seq.with( new Research(groundFactory), new Research(airFactory), @@ -466,7 +508,7 @@ public class SerpuloTechTree{ new Research(mono) ), () -> { - }); + });*/ node(ruinousShores, Seq.with( new SectorComplete(craters), @@ -483,6 +525,7 @@ public class SerpuloTechTree{ ), () -> { node(seaPort, Seq.with( new SectorComplete(biomassFacility), + new SectorComplete(fungalPass), new Research(navalFactory), new Research(risso), new Research(retusa), @@ -565,6 +608,7 @@ public class SerpuloTechTree{ ), () -> { node(extractionOutpost, Seq.with( new SectorComplete(windsweptIslands), + new SectorComplete(fungalPass), new SectorComplete(facility32m), new Research(groundFactory), new Research(nova), @@ -592,6 +636,7 @@ public class SerpuloTechTree{ node(saltFlats, Seq.with( new SectorComplete(windsweptIslands), + new SectorComplete(fungalPass), new Research(groundFactory), new Research(additiveReconstructor), new Research(airFactory), @@ -637,33 +682,6 @@ public class SerpuloTechTree{ }); }); }); - - node(overgrowth, Seq.with( - new SectorComplete(craters), - new SectorComplete(fungalPass), - new Research(cultivator), - new Research(sporePress), - new Research(additiveReconstructor), - new Research(UnitTypes.mace), - new Research(UnitTypes.flare) - ), () -> { - 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) - ), () -> { - - }); - }); }); node(biomassFacility, Seq.with( @@ -673,34 +691,22 @@ public class SerpuloTechTree{ new Research(scatter), new Research(graphitePress) ), () -> { - node(taintedWoods, Seq.with( - new SectorComplete(biomassFacility), - new Research(Items.sporePod), - new Research(wave) - ), () -> { - - }); node(stainedMountains, Seq.with( new SectorComplete(biomassFacility), new Research(pneumaticDrill), new Research(siliconSmelter) ), () -> { - node(fungalPass, Seq.with( - new SectorComplete(stainedMountains), - new Research(groundFactory), - new Research(door) + + //TODO bad order + node(infestedCanyons, Seq.with( + new SectorComplete(fungalPass), + new Research(navalFactory), + new Research(risso), + new Research(minke), + new Research(additiveReconstructor) ), () -> { - node(infestedCanyons, Seq.with( - new SectorComplete(fungalPass), - new Research(navalFactory), - new Research(risso), - new Research(minke), - new Research(additiveReconstructor) - ), () -> { - - }); - + //TODO difficulty jump! node(nuclearComplex, Seq.with( new SectorComplete(fungalPass), new Research(thermalGenerator), @@ -711,6 +717,8 @@ public class SerpuloTechTree{ }); }); + + }); }); });