Merge remote-tracking branch 'upstream/master' into unit-stats

core/src/mindustry/content/Blocks.java

@@ -1246,7 +1246,7 @@ public class Blocks implements ContentList{
             powerProduction = 130f;
             itemDuration = 140f;
             ambientSound = Sounds.pulse;
-            ambientSoundVolume = 0.2f;
+            ambientSoundVolume = 0.07f;
 
             consumes.power(25f);
             consumes.item(Items.blastCompound);

core/src/mindustry/content/SectorPresets.java

@@ -10,7 +10,7 @@ public class SectorPresets implements ContentList{
     groundZero,
     craters, frozenForest, ruinousShores, stainedMountains, tarFields, fungalPass,
     saltFlats, overgrowth,
-    desolateRift, nuclearComplex;
+    impact0078, desolateRift, nuclearComplex;
 
     @Override
     public void load(){
@@ -55,17 +55,22 @@ public class SectorPresets implements ContentList{
         }};
 
         tarFields = new SectorPreset("tarFields", serpulo, 23){{
-            captureWave = 50;
+            captureWave = 40;
             difficulty = 5;
         }};
 
+        impact0078 = new SectorPreset("impact0078", serpulo, 227){{
+            captureWave = 45;
+            difficulty = 7;
+        }};
+
         desolateRift = new SectorPreset("desolateRift", serpulo, 123){{
-            captureWave = 40;
+            captureWave = 30;
             difficulty = 8;
         }};
 
         nuclearComplex = new SectorPreset("nuclearComplex", serpulo, 130){{
-            captureWave = 60;
+            captureWave = 50;
             difficulty = 7;
         }};
     }

core/src/mindustry/content/StatusEffects.java

@@ -151,7 +151,7 @@ public class StatusEffects implements ContentList{
         boss = new StatusEffect("boss"){{
             color = Pal.health;
             permanent = true;
-            damageMultiplier = 1.5f;
+            damageMultiplier = 1.3f;
             healthMultiplier = 1.5f;
         }};
 

core/src/mindustry/content/TechTree.java

@@ -479,19 +479,25 @@ public class TechTree implements ContentList{
                             new Research(kiln),
                             new Research(mechanicalPump)
                         ), () -> {
-
                             node(tarFields, Seq.with(
                                 new SectorComplete(ruinousShores),
                                 new Research(coalCentrifuge),
                                 new Research(conduit),
                                 new Research(wave)
                             ), () -> {
-                                node(desolateRift, Seq.with(
+                                //TODO change positions?
+                                node(impact0078, Seq.with(
                                     new SectorComplete(tarFields),
-                                    new Research(thermalGenerator),
-                                    new Research(thoriumReactor)
+                                    new Research(Items.thorium),
+                                    new Research(overdriveProjector)
                                 ), () -> {
+                                    node(desolateRift, Seq.with(
+                                        new SectorComplete(impact0078),
+                                        new Research(thermalGenerator),
+                                        new Research(thoriumReactor)
+                                    ), () -> {
 
+                                    });
                                 });
                             });