From 837a8cecb3d85d79894536858a272f1112f72f15 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 10 Oct 2020 12:26:57 -0400
Subject: [PATCH] Wave balancing & other tweaks

---
 .../sprites/blocks/environment/cliff3.png       | Bin 435 -> 377 bytes
 .../sprites/blocks/environment/cliff7.png       | Bin 469 -> 359 bytes
 core/src/mindustry/core/NetServer.java          |   7 +++++--
 core/src/mindustry/game/DefaultWaves.java       |   6 +++---
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/core/assets-raw/sprites/blocks/environment/cliff3.png b/core/assets-raw/sprites/blocks/environment/cliff3.png
index 5531a94cc6214dd7a19e76d1809d34c918beedb2..e78a6f27cec984d2b2208c5d71b5406dbdd44094 100644
GIT binary patch
delta 337
zcmdnY{F7;dVZE`Zi(^Q|oVT+M@*OhZapwO2|NPS}+^@{GZWT`dY~6Ha3IB4|jn~fX
z{>gIX#lf%363nl#ulMx)A#`0XH;!*vgYl9h2CN>ge|bVCm$T1(<Jghm_HV)Nr0o}1
zSL!J?YBofQyB*WLFzbTv1}%n-jeJq*-BUG;X8B2Xt`Yp9uFJW({@KmmHuXd`#+RQ@
zIi#}i9a3G*$>AR8kijLw+OkMXL5DT#`UCqf*@32v>?IF3Go{oWT^Qi+ko`nt4M#-?
zSDD%84(7si7P*Nnca0b9VL7505yiCWXNNJPp7h=XOU@VX8J`|&ylG&}yJ6qo=NSdI
zAzBHw>9t<FmArZmh#EZ>^!hvD%8F-RQm0fBw(PW4T$o~`S{A;W|K4)X(-MtWZz&tz
qb~)z%%~CPB$MBd0gg8_EgVFb~y6vxq-FgfR3=E#GelF{r5}E*mX_Q9*

delta 396
zcmey#w3&H=VSTQri(^Q|oVPOr`I`+mT3-MAU;i#{*-fe3r3E5)YEQ;((<nGJbw|*N
z`ppZOuSC5T%(?yG;}QqqUwZ#IBz#)LUmZ(7>dvBeK=fiuBd5UHtLqIsi&9D^_6E%L
zVO#uqq1P7k^N}tMoELbdJY>EHFPIXcesB%LE2dZMZ)>-l+49K0{*svK8X3;791&0U
zZ4zF>bU-LpwaKO7-o*3?r=-sKHLh8_;fX{~%Sr~x-3RtCZ~EzYLh!>Irk9U*&5fAG
z%BgmsurY{Z3&*R_h?0jb5*ds!wh7C`w#c91m~i?Tdq!8~5seJD2ZD1Kd~MJaRMPbp
zQ=1XRvO4&{SN|~YHNx%sUf1f=GWN1}OpdnYI`LwWyY@?#(|QhhO@=Xf4ds&#AFo+1
zys6}XWVB?*ySJRH<2qUd4>~v8swvxb_kk)?RKw=Ry#3Kx(_TEVb>H0;d;9)v-3ymk
zY_IGWaulf+KUgLFC1-!xKTgFK0VfU!ab&J}A!DP%q;qD$3=9kmp00kZF6*2UngBrz
Bw8H=Z

diff --git a/core/assets-raw/sprites/blocks/environment/cliff7.png b/core/assets-raw/sprites/blocks/environment/cliff7.png
index f1195f19164cb9bb0c8e8299379270d1943f2c4b..5978387bbef1d9a6bae864121e0768fb5ea7a2e9 100644
GIT binary patch
delta 319
zcmcc0{G4fmVZEZKi(^Q|oVT;Q`3@QIurhz&Z=AD2WGdUFW9RRi3nj5`TVCem9i`kN
z;KZQ_CSL8a(-)RwGyE^Qde-D^4L7ydPP;DrWp8ct{QK$l>zlS@zC7}9u7V^(<<$hG
z0A&SUpF9ypgHzle_Ho21&MH2_Cor`qB6jPyf{AwmZ+lDBbDofwQdDt?VRkvGkg)o)
z5yuUs!%`PE$M~BuvR^J;m~Vd9`@|kLpOfy~8!DddXbEe|b65P#;j{4OBE8)XtC@AW
z|9k!vT)^;}Wr{>!f+(Z&Dee`Uc;#xYM(<<Ra4?*9T6*y(*#{pxc)CtU=~_8B|FS%0
zu<UEhEcsO%#0;FAd@M2;*S_^E_#9F(-CAf`)~9{EZC0vnY0IQz{u;L|nJ&1M?NO6?
ZQk;_Q`X`fjGcYhPc)I$ztaD0e0ssnZg}VR%

delta 430
zcmaFPbd`C6VST@+i(^Q|oVT-X_Z?Q?acRH$@4tR|e3zLQ_tQrkH(I%`y3)SlL83&v
zNrQkBhhhtu`0(_jO4gr8whxvkd26mKE|SeDS!(P0L-Fss$3IuzZ||PJw@f^H>1^Tn
zl_w8#PGc_7z7rX;Okj;}0#~v35`l)3*SQ~vH64iK3t98IUSTftn$Har*OiDfl=&rW
zoo=FJkZ%&yAux^cT>3n<g^C%9hw?Pq${Xi#EEU-me8}j*(?_?R?s3aUzL;ub;l}V_
z|B3R_GZwXO9M8lIM9b3((~A^sn6<83MsGP0D0qWOXZHiU`fHsxR!j1qofr6Ixs62{
zH-n+M`#j~mtw&|6^y)tp9Vju4%llC(nL2Sb#~J|}E#|5XG85ex5@K8K**a=5GE}QC
z5oXw6t6Ie=@bAmwt-L{23z8l-U14JQtyIC~aGT9qX-T<5s;PwXq0WDw4)5NRJ(pcc
z=0N?+hhaJI4MgtFn~^86N;j%OOzhASF@_t$i96O!W@WhMGGo=tFJ?2;U+Ef}Dd$<d
lny;u9Zn){1Lf-@anBe+=rh`Gd7#J8BJYD@<);T3K0RYloyZ`_I

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 <y/n>[] 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 <y/n>[] 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;