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

Campaign fixes & balance

Browse Source
This commit is contained in:
Anuken
2020-11-23 10:36:41 -05:00
parent 075be1a862
commit dcbe06229c
9 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/mindustry/game/Objectives.java
View File

@@ -48,7 +48,8 @@ public class Objectives{
}
}
public static class SectorComplete extends SectorObjective{
public static class SectorComplete implements Objective{
public SectorPreset preset;
public SectorComplete(SectorPreset zone){
this.preset = zone;
@@ -67,11 +68,6 @@ public class Objectives{
}
}
//TODO merge
public abstract static class SectorObjective implements Objective{
public SectorPreset preset;
}
/** Defines a specific objective for a game. */
public interface Objective{
@@ -86,9 +82,5 @@ public class Objectives{
default void build(Table table){
}
default SectorPreset zone(){
return this instanceof SectorObjective ? ((SectorObjective)this).preset : null;
}
}
}

6
core/src/mindustry/game/Waves.java
View File

@@ -277,7 +277,7 @@ public class Waves{
int cap = 150;
float shieldStart = 30, shieldsPerWave = 20 + difficulty*30f;
float[] scaling = {1, 1, 1.5f, 3f, 4f};
float[] scaling = {1, 1.2f, 1.5f, 3f, 4f};
Intc createProgression = start -> {
//main sequence
@@ -298,7 +298,7 @@ public class Waves{
begin = f;
end = f + next >= cap ? never : f + next;
max = 13;
unitScaling = (difficulty < 0.4f ? rand.random(2.5f, 4f) : rand.random(1f, 4f)) * scaling[ctier];
unitScaling = (difficulty < 0.4f ? rand.random(2.5f, 5f) : rand.random(1f, 4f)) * scaling[ctier];
shields = shieldAmount;
shieldScaling = shieldsPerWave;
spacing = space;
@@ -310,7 +310,7 @@ public class Waves{
begin = f + next - 1;
end = f + next + rand.random(6, 10);
max = 6;
unitScaling = rand.random(1f, 2f);
unitScaling = rand.random(2f, 4f);
spacing = rand.random(2, 4);
shields = shieldAmount/2f;
shieldScaling = shieldsPerWave;