From 8482221c831c301bf238acc6261b7e51d68e2e11 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 10 Oct 2020 14:47:59 -0400 Subject: [PATCH] . --- core/src/mindustry/core/NetServer.java | 7 ++----- core/src/mindustry/game/DefaultWaves.java | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index a1637c4ac6..77ab732cf6 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -329,11 +329,8 @@ public class NetServer implements ApplicationListener{ votes += d; voted.addAll(player.uuid(), admins.getInfo(player.uuid()).lastIP); - for(Player other : Groups.player){ - other.sendMessage(Strings.format("@[lightgray] has voted on kicking[orange] @[].[accent] (@/@)\n[lightgray]Type[orange] /vote [] to agree.", - other.admin ? player.name : "[lightgray]A player", - target.name, votes, votesRequired())); - } + Call.sendMessage(Strings.format("[lightgray]@[lightgray] has voted on kicking[orange] @[].[accent] (@/@)\n[lightgray]Type[orange] /vote [] to agree.", + player.name, target.name, votes, votesRequired())); checkPass(); } diff --git a/core/src/mindustry/game/DefaultWaves.java b/core/src/mindustry/game/DefaultWaves.java index 7b3e153587..e21b13ca8c 100644 --- a/core/src/mindustry/game/DefaultWaves.java +++ b/core/src/mindustry/game/DefaultWaves.java @@ -311,7 +311,7 @@ public class DefaultWaves{ while(step <= cap){ 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); @@ -331,7 +331,7 @@ public class DefaultWaves{ //alt boss progression out.add(new SpawnGroup(Structs.random(species)[4]){{ unitAmount = 1; - begin = bossWave + Mathf.random(4, 6) * bossSpacing; + begin = bossWave + Mathf.random(3, 5) * bossSpacing; spacing = bossSpacing; end = never; max = 16;