diff --git a/core/assets-raw/sprites/blocks/environment/cliff3.png b/core/assets-raw/sprites/blocks/environment/cliff3.png index 5531a94cc6..e78a6f27ce 100644 Binary files a/core/assets-raw/sprites/blocks/environment/cliff3.png and b/core/assets-raw/sprites/blocks/environment/cliff3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/cliff7.png b/core/assets-raw/sprites/blocks/environment/cliff7.png index f1195f1916..5978387bbe 100644 Binary files a/core/assets-raw/sprites/blocks/environment/cliff7.png and b/core/assets-raw/sprites/blocks/environment/cliff7.png differ diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index fa64e60be9..a1637c4ac6 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -329,8 +329,11 @@ public class NetServer implements ApplicationListener{ votes += d; 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 [] to agree.", - target.name, votes, votesRequired())); + 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())); + } checkPass(); } diff --git a/core/src/mindustry/game/DefaultWaves.java b/core/src/mindustry/game/DefaultWaves.java index 8c7d217662..7b3e153587 100644 --- a/core/src/mindustry/game/DefaultWaves.java +++ b/core/src/mindustry/game/DefaultWaves.java @@ -252,7 +252,7 @@ public class DefaultWaves{ //max reasonable wave, after which everything gets boring int cap = 200; - float shieldStart = 30, shieldsPerWave = 12; + float shieldStart = 30, shieldsPerWave = 15 + difficulty*20f; Intc createProgression = start -> { //main sequence @@ -271,7 +271,7 @@ public class DefaultWaves{ unitAmount = f == 0 ? 1 : 10; begin = f; end = f + next >= cap ? never : f + next; - max = 16; + max = 20; unitScaling = Mathf.random(1f, 2f); shields = shieldAmount; shieldScaling = shieldsPerWave; @@ -283,7 +283,7 @@ public class DefaultWaves{ unitAmount = 6; begin = f + next; end = f + next + Mathf.random(8, 12); - max = 10; + max = 14; unitScaling = Mathf.random(2f); spacing = Mathf.random(2, 3); shields = shieldAmount;