mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-25 22:58:47 +07:00
Code Issues Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
Anuken 2020-10-10 14:47:59 -04:00
parent 2079a91ac6
commit 8482221c83
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -329,11 +329,8 @@ 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);
for(Player other : Groups.player){ Call.sendMessage(Strings.format("[lightgray]@[lightgray] has voted on kicking[orange] @[].[accent] (@/@)\n[lightgray]Type[orange] /vote <y/n>[] to agree.",
other.sendMessage(Strings.format("@[lightgray] has voted on kicking[orange] @[].[accent] (@/@)\n[lightgray]Type[orange] /vote <y/n>[] to agree.", player.name, target.name, votes, votesRequired()));
other.admin ? player.name : "[lightgray]A player",
target.name, votes, votesRequired()));
}
checkPass(); checkPass();
} }

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

@ -311,7 +311,7 @@ public class DefaultWaves{
while(step <= cap){ while(step <= cap){
createProgression.get(step); createProgression.get(step);
step += (int)(Mathf.random(15, 30) * Mathf.lerp(1f, 0.4f, difficulty)); step += (int)(Mathf.random(12, 25) * Mathf.lerp(1f, 0.4f, difficulty));
} }
int bossWave = Mathf.random(30, 60); int bossWave = Mathf.random(30, 60);
@ -331,7 +331,7 @@ public class DefaultWaves{
//alt boss progression //alt boss progression
out.add(new SpawnGroup(Structs.random(species)[4]){{ out.add(new SpawnGroup(Structs.random(species)[4]){{
unitAmount = 1; unitAmount = 1;
begin = bossWave + Mathf.random(4, 6) * bossSpacing; begin = bossWave + Mathf.random(3, 5) * bossSpacing;
spacing = bossSpacing; spacing = bossSpacing;
end = never; end = never;
max = 16; max = 16;