From b2a634e5e71d10cf08b876ebc4709c8140b3f820 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 10 Sep 2021 09:17:25 -0400 Subject: [PATCH] Untested/WIP naval campaign map --- core/assets/icons/icons.properties | 2 +- core/assets/maps/coastline.msav | Bin 0 -> 16630 bytes core/src/mindustry/content/SectorPresets.java | 15 ++++++++++++++- core/src/mindustry/content/TechTree.java | 12 ++++++++++-- 4 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 core/assets/maps/coastline.msav 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 0000000000000000000000000000000000000000..eacc6615ea2abd7b5266732c7a7a91e1a7b43961 GIT binary patch literal 16630 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 literal 0 HcmV?d00001 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 + }); }); });