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

Wave balancing & other tweaks

Browse Source
This commit is contained in:
Anuken
2020-10-10 12:26:57 -04:00
parent 3f74c61c0a
commit 837a8cecb3
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/blocks/environment/cliff3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 435 B

After

Width:  |  Height:  |  Size: 377 B

BIN
core/assets-raw/sprites/blocks/environment/cliff7.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 469 B

After

Width:  |  Height:  |  Size: 359 B

7
core/src/mindustry/core/NetServer.java
View File

@@ -329,8 +329,11 @@ public class NetServer implements ApplicationListener{
votes += d; votes += d;
voted.addAll(player.uuid(), admins.getInfo(player.uuid()).lastIP); voted.addAll(player.uuid(), admins.getInfo(player.uuid()).lastIP);
Call.sendMessage(Strings.format("[lightgray]A player has voted on kicking[orange] @[].[accent] (@/@)\n[lightgray]Type[orange] /vote <y/n>[] to agree.", for(Player other : Groups.player){
target.name, votes, votesRequired())); other.sendMessage(Strings.format("@[lightgray] has voted on kicking[orange] @[].[accent] (@/@)\n[lightgray]Type[orange] /vote <y/n>[] to agree.",
other.admin ? player.name : "[lightgray]A player",
target.name, votes, votesRequired()));
}
checkPass(); checkPass();
} }

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

@@ -252,7 +252,7 @@ public class DefaultWaves{
//max reasonable wave, after which everything gets boring //max reasonable wave, after which everything gets boring
int cap = 200; int cap = 200;
float shieldStart = 30, shieldsPerWave = 12; float shieldStart = 30, shieldsPerWave = 15 + difficulty*20f;
Intc createProgression = start -> { Intc createProgression = start -> {
//main sequence //main sequence
@@ -271,7 +271,7 @@ public class DefaultWaves{
unitAmount = f == 0 ? 1 : 10; unitAmount = f == 0 ? 1 : 10;
begin = f; begin = f;
end = f + next >= cap ? never : f + next; end = f + next >= cap ? never : f + next;
max = 16; max = 20;
unitScaling = Mathf.random(1f, 2f); unitScaling = Mathf.random(1f, 2f);
shields = shieldAmount; shields = shieldAmount;
shieldScaling = shieldsPerWave; shieldScaling = shieldsPerWave;
@@ -283,7 +283,7 @@ public class DefaultWaves{
unitAmount = 6; unitAmount = 6;
begin = f + next; begin = f + next;
end = f + next + Mathf.random(8, 12); end = f + next + Mathf.random(8, 12);
max = 10; max = 14;
unitScaling = Mathf.random(2f); unitScaling = Mathf.random(2f);
spacing = Mathf.random(2, 3); spacing = Mathf.random(2, 3);
shields = shieldAmount; shields = shieldAmount;