diff --git a/build.gradle b/build.gradle index 9bca8edb25..0a2a28b66c 100644 --- a/build.gradle +++ b/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") } } diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index cdfe2330f2..e693d051b5 100644 --- a/core/assets/bundles/bundle.properties +++ b/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 diff --git a/core/assets/maps/facility32m.msav b/core/assets/maps/facility32m.msav index 0cea5d1b0a..a42a2deb39 100644 Binary files a/core/assets/maps/facility32m.msav and b/core/assets/maps/facility32m.msav differ diff --git a/core/assets/maps/taintedWoods.msav b/core/assets/maps/taintedWoods.msav index e1645c822d..237bae65ba 100644 Binary files a/core/assets/maps/taintedWoods.msav and b/core/assets/maps/taintedWoods.msav differ diff --git a/core/assets/maps/tarFields.msav b/core/assets/maps/tarFields.msav index 21f1c29690..e5ab17c0ee 100644 Binary files a/core/assets/maps/tarFields.msav and b/core/assets/maps/tarFields.msav differ diff --git a/core/src/mindustry/content/SectorPresets.java b/core/src/mindustry/content/SectorPresets.java index 286d6c1404..f2ca42957f 100644 --- a/core/src/mindustry/content/SectorPresets.java +++ b/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){{ diff --git a/core/src/mindustry/content/SerpuloTechTree.java b/core/src/mindustry/content/SerpuloTechTree.java index b12bf55aa1..87a93926c7 100644 --- a/core/src/mindustry/content/SerpuloTechTree.java +++ b/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)), () -> { }); diff --git a/core/src/mindustry/content/StatusEffects.java b/core/src/mindustry/content/StatusEffects.java index ff3dcf43df..1ccaabc80f 100644 --- a/core/src/mindustry/content/StatusEffects.java +++ b/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; diff --git a/gradle.properties b/gradle.properties index 39d5565595..0c6c42e01d 100644 --- a/gradle.properties +++ b/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