More campaign map progress

core/assets/bundles/bundle.properties

@@ -631,6 +631,8 @@ sector.biomassFacility.name = Biomass Synthesis Facility
 sector.windsweptIslands.name = Windswept Islands
 sector.extractionOutpost.name = Extraction Outpost
 sector.planetaryTerminal.name = Planetary Launch Terminal
+sector.coastline.name = Coastline
+sector.navalFortress.name = Naval Fortress
 
 sector.groundZero.description = The optimal location to begin once more. Low enemy threat. Few resources.\nGather as much lead and copper as possible.\nMove on.
 sector.frozenForest.description = Even here, closer to mountains, the spores have spread. The frigid temperatures cannot contain them forever.\n\nBegin the venture into power. Build combustion generators. Learn to use menders.

core/src/mindustry/content/SectorPresets.java

@@ -71,9 +71,7 @@ public class SectorPresets implements ContentList{
         }};
 
         navalFortress = new SectorPreset("navalFortress", serpulo, 216){{
-            //TODO AI or not?
+            difficulty = 9;
-            useAI = true;
-            difficulty = 8;
         }};
 
         fungalPass = new SectorPreset("fungalPass", serpulo, 21){{

core/src/mindustry/content/TechTree.java

@@ -425,7 +425,7 @@ public class TechTree implements ContentList{
                                 node(oxynoe, Seq.with(new SectorComplete(coastline)), () -> {
                                     node(cyerce, () -> {
                                         node(aegires, () -> {
-                                            node(navanax, () -> {
+                                            node(navanax, Seq.with(new SectorComplete(navalFortress)), () -> {
 
                                             });
                                         });
@@ -539,7 +539,16 @@ public class TechTree implements ContentList{
                                     new Research(navalFactory),
                                     new Research(payloadConveyor)
                                 ), () -> {
-                                    //TODO naval fortress
+                                    node(navalFortress, Seq.with(
+                                        new SectorComplete(coastline),
+                                        new SectorComplete(extractionOutpost),
+                                        new Research(oxynoe),
+                                        new Research(minke),
+                                        new Research(cyclone),
+                                        new Research(ripple)
+                                    ), () -> {
+
+                                    });
                                 });
                             });
                         });

core/src/mindustry/game/Waves.java

@@ -350,8 +350,8 @@ public class Waves{
             step += (int)(rand.random(15, 30) * Mathf.lerp(1f, 0.5f, difficulty));
         }
 
-        int bossWave = (int)(rand.random(50, 70) * Mathf.lerp(1f, 0.7f, difficulty));
+        int bossWave = (int)(rand.random(50, 70) * Mathf.lerp(1f, 0.5f, difficulty));
-        int bossSpacing = (int)(rand.random(25, 40) * Mathf.lerp(1f, 0.6f, difficulty));
+        int bossSpacing = (int)(rand.random(25, 40) * Mathf.lerp(1f, 0.5f, difficulty));
 
         int bossTier = difficulty < 0.6 ? 3 : 4;
 

core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java

@@ -517,7 +517,7 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
 
         float waveTimeDec = 0.4f;
 
-        state.rules.waveSpacing = Mathf.lerp(60 * 65 * 2, 60f * 60f * 1f, Math.max(difficulty - waveTimeDec, 0f) / 0.8f);
+        state.rules.waveSpacing = Mathf.lerp(60 * 65 * 2, 60f * 60f * 1f, Math.max(difficulty - waveTimeDec, 0f));
         state.rules.waves = sector.info.waves = true;
         state.rules.enemyCoreBuildRadius = 600f;