Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Many misc sector fixes

Browse Source
This commit is contained in:
Anuken
2024-09-06 15:07:54 -04:00
parent 5bff681096
commit ac8a38d98d
9 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@@ -220,7 +220,7 @@ configure(subprojects - project(":annotations")){
tasks.withType(Javadoc){ tasks.withType(Javadoc){
options{ options{
addStringOption('Xdoclint:none', '-quiet') addStringOption('Xdoclint:none', '-quiet')
addStringOption('-release', '16') addStringOption('-release', '17')
encoding('UTF-8') encoding('UTF-8')
} }
} }
@@ -253,7 +253,7 @@ project(":core"){
kapt{ kapt{
javacOptions{ javacOptions{
option("-source", "16") option("-source", "17")
option("-target", "1.8") option("-target", "1.8")
} }
} }

2
core/assets/bundles/bundle.properties
View File

@@ -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.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.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. 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 = Tech Tree
techtree.select = Tech Tree Selection techtree.select = Tech Tree Selection
techtree.serpulo = Serpulo techtree.serpulo = Serpulo

BIN
core/assets/maps/facility32m.msav
View File

Binary file not shown.

BIN
core/assets/maps/taintedWoods.msav
View File

Binary file not shown.

BIN
core/assets/maps/tarFields.msav
View File

Binary file not shown.

2
core/src/mindustry/content/SectorPresets.java
View File

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

2
core/src/mindustry/content/SerpuloTechTree.java
View File

@@ -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)), () -> { node(phaseWeaver, Seq.with(new SectorComplete(tarFields)), () -> {
}); });

6
core/src/mindustry/content/StatusEffects.java
View File

@@ -61,12 +61,12 @@ public class StatusEffects{
color = Pal.lightishGray; color = Pal.lightishGray;
speedMultiplier = 0.4f; speedMultiplier = 0.4f;
init(() -> opposite(fast)); init(() -> opposite(fast));
}}; }};
fast = new StatusEffect("fast"){{ fast = new StatusEffect("fast"){{
color = Pal.boostTo; color = Pal.boostTo;
speedMultiplier = 1.6f; speedMultiplier = 1.6f;
init(() -> opposite(slow)); init(() -> opposite(slow));
}}; }};

2
gradle.properties
View File

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