Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

core/src/mindustry/content/Blocks.java

@@ -1199,6 +1199,7 @@ public class Blocks implements ContentList{
 
         distributor = new Router("distributor"){{
             requirements(Category.distribution, with(Items.lead, 4, Items.copper, 4));
+            buildCostMultiplier = 3f;
             size = 2;
         }};
 

core/src/mindustry/content/Fx.java

@@ -32,7 +32,9 @@ public class Fx{
         //lifetime is how many frames it takes to fade out the trail
         e.lifetime = trail.length * 1.4f;
 
-        trail.shorten();
+        if(!state.isPaused()){
+            trail.shorten();
+        }
         trail.drawCap(e.color, e.rotation);
         trail.draw(e.color, e.rotation);
     }),

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,15 @@ public class SectorPresets implements ContentList{
             useAI = false;
         }};
 
+        coastline = new SectorPreset("coastline", serpulo, 108){{
+            captureWave = 30;
+            difficulty = 5;
+        }};
+
+        navalFortress = new SectorPreset("navalFortress", serpulo, 216){{
+            difficulty = 9;
+        }};
+
         fungalPass = new SectorPreset("fungalPass", serpulo, 21){{
             difficulty = 4;
             useAI = false;

core/src/mindustry/content/TechTree.java

@@ -421,11 +421,11 @@ 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, () -> {
+                                            node(navanax, Seq.with(new SectorComplete(navalFortress)), () -> {
 
                                             });
                                         });
@@ -531,7 +531,22 @@ public class TechTree implements ContentList{
                                     new Research(airFactory),
                                     new Research(door)
                                 ), () -> {
+                                    node(coastline, Seq.with(
+                                        new SectorComplete(windsweptIslands),
+                                        new Research(navalFactory),
+                                        new Research(payloadConveyor)
+                                    ), () -> {
+                                        node(navalFortress, Seq.with(
+                                            new SectorComplete(coastline),
+                                            new SectorComplete(extractionOutpost),
+                                            new Research(oxynoe),
+                                            new Research(minke),
+                                            new Research(cyclone),
+                                            new Research(ripple)
+                                        ), () -> {
 
+                                        });
+                                    });
                                 });
                             });
                         });