diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index 2b29514b5b..2bcf2d22de 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -1,6 +1,6 @@ 63743=spawn|block-spawn-ui 63742=deepwater|block-deepwater-ui -63741=water|block-water-ui +63741=water|block-shallow-water-ui 63740=tainted-water|block-tainted-water-ui 63739=darksand-tainted-water|block-darksand-tainted-water-ui 63738=sand-water|block-sand-water-ui diff --git a/core/assets/maps/coastline.msav b/core/assets/maps/coastline.msav new file mode 100644 index 0000000000..eacc6615ea Binary files /dev/null and b/core/assets/maps/coastline.msav differ diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java index e66908e247..b1f0796a29 100644 --- a/core/src/mindustry/content/SectorPresets.java +++ b/core/src/mindustry/content/SectorPresets.java @@ -10,7 +10,8 @@ public class SectorPresets implements ContentList{ groundZero, craters, biomassFacility, frozenForest, ruinousShores, windsweptIslands, stainedMountains, tarFields, fungalPass, extractionOutpost, saltFlats, overgrowth, - impact0078, desolateRift, nuclearComplex, planetaryTerminal; + impact0078, desolateRift, nuclearComplex, planetaryTerminal, + coastline, navalFortress; @Override public void load(){ @@ -64,6 +65,18 @@ public class SectorPresets implements ContentList{ useAI = false; }}; + coastline = new SectorPreset("coastline", serpulo, 108){{ + captureWave = 30; + difficulty = 5; + }}; + + //TODO + if(false) + navalFortress = new SectorPreset("navalFortress", serpulo, 216){{ + useAI = true; + difficulty = 8; + }}; + fungalPass = new SectorPreset("fungalPass", serpulo, 21){{ difficulty = 4; useAI = false; diff --git a/core/src/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java index 199c81a5f8..a28af513a5 100644 --- a/core/src/mindustry/content/TechTree.java +++ b/core/src/mindustry/content/TechTree.java @@ -421,8 +421,8 @@ public class TechTree implements ContentList{ }); }); - node(retusa, () -> { - node(oxynoe, () -> { + node(retusa, Seq.with(new SectorComplete(windsweptIslands)), () -> { + node(oxynoe, Seq.with(new SectorComplete(coastline)), () -> { node(cyerce, () -> { node(aegires, () -> { node(navanax, () -> { @@ -533,6 +533,14 @@ public class TechTree implements ContentList{ ), () -> { }); + + node(coastline, Seq.with( + new SectorComplete(windsweptIslands), + new Research(navalFactory), + new Research(payloadConveyor) + ), () -> { + //TODO naval fortress + }); }); });