Many misc sector fixes

build.gradle

@@ -10,7 +10,7 @@ buildscript{
             return "com.github.Anuken${localArc ? "" : ".Arc"}:$name:$arcHash"
         }
     }
-    
+
     repositories{
         mavenLocal()
         mavenCentral()
@@ -32,7 +32,7 @@ plugins{
 
 allprojects{
     apply plugin: 'maven-publish'
-    
+
     version = project.hasProperty("packageVersion") ? project.getProperty("packageVersion") : 'release'
     group = 'com.github.Anuken'
 
@@ -220,7 +220,7 @@ configure(subprojects - project(":annotations")){
     tasks.withType(Javadoc){
         options{
             addStringOption('Xdoclint:none', '-quiet')
-            addStringOption('-release', '16')
+            addStringOption('-release', '17')
             encoding('UTF-8')
         }
     }
@@ -253,7 +253,7 @@ project(":core"){
 
     kapt{
         javacOptions{
-            option("-source", "16")
+            option("-source", "17")
             option("-target", "1.8")
         }
     }

core/assets/bundles/bundle.properties

@@ -197,7 +197,7 @@ campaign.select = Select Starting Campaign
 campaign.none = [lightgray]Select a planet to start on.\nThis can be switched at any time.
 campaign.erekir = Newer, more polished content. Mostly linear campaign progression.\n\nMore difficult. Higher quality maps and overall experience.
 campaign.serpulo = Older content; the classic experience. More open-ended, more content.\n\nPotentially unbalanced maps and campaign mechanics. Less polished.
-completed = [accent]Completed
+completed = [accent]Researched
 techtree = Tech Tree
 techtree.select = Tech Tree Selection
 techtree.serpulo = Serpulo

core/src/mindustry/content/SectorPresets.java

@@ -44,7 +44,7 @@ public class SectorPresets{
 
         taintedWoods = new SectorPreset("taintedWoods", serpulo, 221){{
             captureWave = 32;
-            difficulty = 4;
+            difficulty = 5;
         }};
 
         craters = new SectorPreset("craters", serpulo, 18){{

core/src/mindustry/content/SerpuloTechTree.java

@@ -139,7 +139,7 @@ public class SerpuloTechTree{
                                 });
                             });
 
-                            node(plastaniumCompressor, Seq.with(new SectorComplete(windsweptIslands)), () -> {
+                            node(plastaniumCompressor, Seq.with(new SectorComplete(windsweptIslands), new OnSector(tarFields)), () -> {
                                 node(phaseWeaver, Seq.with(new SectorComplete(tarFields)), () -> {
 
                                 });

core/src/mindustry/content/StatusEffects.java

@@ -61,12 +61,12 @@ public class StatusEffects{
             color = Pal.lightishGray;
             speedMultiplier = 0.4f;
 
-	    init(() -> opposite(fast));
+            init(() -> opposite(fast));
         }};
 
         fast = new StatusEffect("fast"){{
-                color = Pal.boostTo;
-                speedMultiplier = 1.6f;
+            color = Pal.boostTo;
+            speedMultiplier = 1.6f;
 
             init(() -> opposite(slow));
         }};
@@ -89,7 +89,7 @@ public class StatusEffects{
                 opposite(burning, melting);
             });
         }};
-		
+
         muddy = new StatusEffect("muddy"){{
             color = Color.valueOf("46382a");
             speedMultiplier = 0.94f;

gradle.properties

@@ -26,4 +26,4 @@ org.gradle.caching=true
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
 android.enableR8.fullMode=false
-archash=3284de5f0f
+archash=29c4199b83