From af1746932fed4c7866f3cab7b229db4e1c6c5b94 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 11 Jun 2019 08:47:16 -0400
Subject: [PATCH] Fixed incorrect scaling

---
 .../sprites/blocks/turrets/salvo.png          | Bin 5732 -> 5697 bytes
 .../io/anuke/mindustry/core/NetServer.java    |   2 +-
 .../mindustry/entities/type/BaseUnit.java     |   4 ++
 .../mindustry/entities/type/base/Drone.java   |  35 ++++++++----------
 .../io/anuke/mindustry/net/CrashSender.java   |   3 +-
 .../src/io/anuke/mindustry/type/UnitType.java |   2 +-
 .../mindustry/ui/fragments/HudFragment.java   |   7 +++-
 7 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/core/assets-raw/sprites/blocks/turrets/salvo.png b/core/assets-raw/sprites/blocks/turrets/salvo.png
index 2af563f8217c1fdaf565f2135684248bcf4de7ba..f43f7bbd47aa57ce7a965e67c27eeda67a236f50 100644
GIT binary patch
delta 5236
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
HB{Ts5KS=n8

delta 5289
zcmX@8^F(KY3ghF6s`B;OWlwhWwfrv@-OTdQSFiniaT@#PKR=s-mc{1n-nHxf*4;Ww
zCoS?&5a4jgz4rg_d$a$C{kPc76e#vIUD`cAz`3+{a?xG;?-%19{;{=x__OQ${uuN3
z`ZCjP-0SOoUQ6EJA!na=;ymxR|5bONd^{68uXCP$oN$%x%|fI3u6Dwe<@NE~&!-39
zt-W+<`CFU+-wHyfC+*+=>z8FpkD>DC%Je&*uEl@9|J!q3=#N*@$4mZw(ph(;_}%&Y
zpTd97-2QT(;e+3Ay8o{G81r5J*$(xpT<zM8my7Qnd;hk4&6i5oYkTLvv0I;!{(9Yc
z`}uFTr{Ao;yE~gv=IVrbzI(S7os;PBY__l8u3BgOU+MYJKVfyJudZvnt``0F*{hlr
z*AidnHqYI5GxxeBpLIl1!Rge#bG*;bZ+*0Rb)L*}mcO^&ZaQdxS-i&d!<^@vs@ET#
z_dLwDzg={mjjr<CRHM_f`~S>ZFaGcCdwt=zx-+7yr*2;xF@5sE$Tpkh`+E*4mf4&2
z9^ZHEPW$Wn*ZnfDKPK3u>E&#Q{X1`w`|n2G`af^hXGloRo3O3YPB=kno@`{#*NO*T
z47b&)Q=f0zdSl~*`NvMp<zM%hQQEg;a_FuHwTCQ^zPx#7@>|K*i+1Zf>su%ZnMht2
zaInyBkr4VA)(~KP@wh;;kKu8l?3|O!CnR}ks(%bQZPzYSe5&4ZdQ7qQz7`>Gt({YX
zyjQQQ%FvlLD{I}-YqzBMa~B$hC)Yf7D!=>vLbAW@_e<IN%s+Yz9(gGD8@<Z7>}$V}
z!T9o-&1bA`Z{pTiyWx?S_WDh)vZUAK?mygT{dUjkb-VZO{Z{cce0}ZLJMZ_V$*<q}
zSflr}eB9%rbL%zNyihrnUQvIBwfp#H8-@jQYsy5Wn<hVhvU#;t{+|B6P&do;s7fCG
zw$#`=-`?)#KmYfId2{LimG|$I&oeH%TYtFNZQbuDJNN&3E4}_~*^6uP?3!E~HF;ig
z+Ow^>6q9+%`~MG%<NMCsQhk2+bKK?kp^v$CM%DI|uC=WGp8fM>)w5`6_0x*x@9TT@
z&A4BzyZXktJxh3+#EjHX>pxoxP1)jgzwMo6-@N*<+c#caJ^61(MVd42oqQGDGdKPA
zX`eR}zrScIxFi%YOO{()_ow2NdBFviI(BE=A~K!V@pAmmc~{l<>{rpl`*QYbpLE}I
zr?5yK{(3hu<8<Y<J;&a}^rYrW`l|8X%j?@%|M0?Zy~Ve4D(+via;wjiey(@7ZE5lS
zg%cG|7+l}z+fnB`C-%8tZn^Na8@tu=rnNrXcwwH+?NWov*acmz-_6t+o@cxLKC?x8
zsqGEsMGJfGZhvX~_^pdyk@RxjfO~~6(^{wg-TJmRu5S9dA5+rjcY8`tbe^_4^Y%9G
zvWROF#DA;S*Gbg%?h1b5mz#6_)Uin$3IvPeZX8l^cv$=XW|DoqyTKj%&1FA#*%$wQ
z^e-grTkN!(ypO~G8y+s_H@CN!b?JW@{;vK>{pa_LPYNTlZ#mxY6t!Hd{8@4RpBq=+
zPxLyzLHa=Qk9Ec#2`;sn-#-<;nXzg8=Jp9UYF%9t<V5bNzduyZe*fq8^E;w9>#h}3
z6xw|$Zgsz1_RZ70&8~*x*WOt>1+PB5c#i#J#yhrkXKIgaR^UDF!^z2F8*d?hnWN^-
zWLExo&anLlQgV9cOJ<2hy2Zblv6B6)Y|(mUcZ;iQuT75sXlVBQ|I{6(_kSfP<;-2r
z@M!(9MgAqBf%1R0&(+}Cd$-=I;9%a~2q%~6>y+Moem-Y+;LO@(vbhSg&sZ|4|7kCG
z?|yFbd{<ECb1UOp332NGUw-sSVf^@4CSuXGnPQEz`Odw+Fn9fhv*j-yEp+S1-uv$3
zrk~a3#(OI6A2(EZ*E;2Oq}Lqn>)+l;34YA^Z*NoQ<03crx#i-N4b3l&S3Ph|`B=}m
z%h&vZv5i=@OqreX+4pU`SQf_Re*NPxqhL1sK?y&Ouos*MXYcvuo>rP^GjprZmy36w
zy-Hr}I=?0RpKIGR?h})rToF7mX$6}}+swsNE@tnX&p6RRV~XpegN|2rTF*9fVawE9
zw<6_M<em)o`?-tGDLI_@+mfss@O=N=M`t$hJgl#swkP0T>K4|CFD^Vxno;ebXV;^$
zB-BO1ZPHC)mx&s0COR^gy5F#1zW8uTOMH$rZ(^&*&bJ#U<jpUrc%*2N>U&yeZo}Fm
zg++WD*?V1DPG2ok@tAd<Y4Vk@_YY;#Bo>|JacOFA@?+|{@R?^q#_g-$pYCZ$=u=(v
zCua4zl~zlp)mOZ;hzU4(bKP<i5x2|ESLW(Vm#aJymW(M2G&1A1xm*12wdQ&*MuES9
ziPeo>Jxv{6hvgfL4xM#X+RvA8G3<rMH?etd7n&dQ6b-HEzA)*@jY$E?cP}yS-RNP!
zcUagsf%hw~Q<dwIZMS)E_O5rRRgNyO{pYx1ZA0?L52f2)Onp+XTD?U`-nh_fX`IfU
z*>@(^cTSaL)P9)7)a`phG5O0R_Y*G_cQcv2IZ!3`F+6<=hw@M7Z7m<?Y^|PoLxVMP
z>4F88D>x3gtqx$S6rL4e<2zeZO?Y<O_nI2!O<oUzs@kXJ8c%InysI+zg8ST=$F~UU
z@_!R+;r@1F%g3&m<$v}sn_O@7(c<*)nHs)YN7;{rERWpJwC!j72d<b%u9Zc*jGjkb
z&yIQf=zwgcT=#0lSr68kX_?ALmx#(aB%PL<VraQ3=gH-mz#6`$zTIoD9G<|@X&`KR
zSVHI4f_X6u-UQj`JUMda@X^(7?FY(&H_q)pyK<SIS9{----}+gy#BUiwn%`QU;X#T
z(<jbcDb3yKoT+wOqI~94PsK(jo*8%7$u7GddWyf3Ki{bDR?74%?k~#y?g?E?F*VCw
zxlpd;@Xbp{C)lo%*eKaPLqvJ%OauL^(;^y^o<{wiAz6H8nqYs&tD;B6WnWW$Tp2aI
zOES;j>NwWA;&_82tMClx?aF2k&EK)#_qcwvzPHstDf^)Ef;m4<rt!c2op@5vOtnB$
z?!h-zIW1Y!jy=vNl_oEn=KREGip43@Ym6@!K6k(Q=F*?dCO<xVXx2ZERGm8I?5cy8
zCfS`8P>)koKJoH}ERWAw?xovLExD3$K}0QHNA{P~Pw%%6IXu5j(D!F`c~Z8D!|2qa
zKdVKKiaftoFShdD9h+16cXrmca|<#S9iC_^`1tsnT<w*6uM5xr`lZ^ob{o@)$JQ@y
z3xE08_p`G%DZ^;x+$itsQJbzUS|m1O`NL^T(<Yy3%fEZx>A;^wEP09_q9rF}2gJ@7
zy!+wC!)wZGc{I|EzeO&+uB9whbwDQmc%Atc|Nb}Zk2uQ2le-t!Z#NTMaeAqBvP&c1
zs`drSKb=F=R@eQn^*_B~v*hCAb{|}qebb2GeC8pT%J-*?t!}}!$i}kxkZ4n7>yRI-
z!WK5|HCSYx{bhHYzY%BR@d=8XH%d<Od(k1vCBDu<L+&M0y?@2)WesoL&#50fyFE)>
z^w;-~|FU<?PE>ufex>!+nBDc(OwYo0F<)FX`;NoO4WD-vK5&{c=O>5oy4x4hl!|Ap
zSjT(f=K2iL-Fp|A?q7U$enu*9%Smf>ozUk?c-8t;PHYiyd~r^~fMr?BteuBmO{%(h
zaP>D2_1^Ms7th`!N8MC)Pyb#s`=YUHNW+Fkxrt9~Drdeq(Y31f%O>UZb06_6wr!|q
zo3VXUulYPrcWb$6$86l?wwy_vk}Pc`uIBRm`gCPBmrC`@8UEVKew`N*`}tyVRaSY?
zYxlq(ix>4t8nQUZFMJ;|+jRfl#)tyBttwO5uf2(~dFk{j@Z{0ow?vn7T%F2PS=#9u
z=P9&bRfP4rK6B!4%kl`J?T4FQ`zpGxn!NLvYyDnX)k%I2udC*N)XWh!n^MnhWFE>b
zndV=v)@&RZ+iZAIH&K}FFxSM^1v(b&5r3AYC;DAx+OpvNl@jR=U9C4Ef~gtPBIPbC
zEv$Q`{KU?t>+H7bn+BRZ``_91epdhUz-X)0CV@_&9QT3=0vZl}UwAhbbmuKyEql~$
zTD`dXi3Rm6U4_9s)3^lRFBUTr(9kGWKkIX4u`EZf(%G{uZmNqVvQ9>S;?>I1j(^wh
zwB^ZcEm`NklLK9*ikNP9_{!dVAY-<!0B46$=*|Vf*Y!nJ4n22NH|LmdTx+87@6v^c
zs)I#RQlUq)_U&Hmm_PT3U~@vcUXjOVkEXZB3LIr0&5=G?Z+v}A*NO1l0OxaS-#(QI
zIrHnuG;#T=wHJ2H=0E!IRaH%9{4D>!-cJOi^dc=T_FrLMWj?vLW}h9mqS5sq%N)%7
z6K&*Qxh&kZoA1|><YPJ=w;Lab-e0tQioRg`il-*?3fmeJ=jE=vE$*qw*ZST_Xr^i4
z-m;C;_s-^Wy7~6xw@)ec`)xfnZ%z5SPUe4^#vb0ks%KWjU0A)K&tJ{-Rr}nKSN>YM
zS@Ty&|GfJk{`j?N6?OdE6?<g)`L}gj6i*WRc=bZh`nG4ge=ciND_Ugl#kr_<icrIz
zr9pO!yu?<8|1>U{zFc?tD#n!Oej82w!u^u3ObzxG_;RiP)v2|@6&-BT-iFrKJminB
z`L4)wptWdyr<ab@ftc6YJCz$(aCOBQrey0Hb*yn0axM*SHehf0kWl{esQ#DFSJE!_
z$R6^KZC~Ej9BQ^h&(vO0<dBQjJ;^T{_Qs{p5s4D$f9fE8tubrw+uA<X=P6B-9C*rv
zPX1NNee;~Nb+SFT;7UJXo}D4tr?OAi*J)+HS|amO(c}5VrqE|WRvqP6Sk#Vw_@X{D
zTkT5Y$1@=j+*T2;6Lx>|)%NUKuifq?u-ab#*c*0c=QHcXeOBaJS2J9`r;_&h+te>N
z&R^{CTKTGc-ju5C*7hg2?5X<r_WHzUzZXuKqS7b5<*9L+y}~!vglFz8e_1x%dT-V#
zTI*6@+9>=pcUE-9yMIEn<awiA^d2rzuu}?WniKLp^^tGu!>_*%X}q4K%fP)#BY2u$
zj=-(TsZS!rOIK|3V{(_6r*zOOYh~YMX&E8myk#;5%DyW6S6A7uY>~<Ree$AeOP$D4
zqc4>;S5Gh3JXU{iy2aLGCw-snN}clIiay7qFqwrrcGdsuh&dmawYjL;ev{iSH`94f
zp54%1@^{i~YwhV@vNzl=WGOn_c5!}r;?1DT{;QePqJ$%Lr#@vl@bTJ)6CaMOc`U)T
z)!5a#VnS2M(le_o(hf1l=(H8hVSD(aFHmQ()F-)LArl+^#kyWA4WH<}>x$KhaLY;V
zQLnZt|8ASSXVTRb59@FA-cxfdZU3NU#Uonz^~x!!-ZvgR#XGO;mY;BG(!nz)-F}u{
ztW7yy>HEG}s`J}};J+M`p4uJst(z9|sG99%>2(8#Sw+gH+2&V@Y`V64*~{OTUiYn*
z{m#DC`rWt2>QC`<rFlGgR}!3O^JTcL<?mpqZTrmfqxs41=E_rSTyw+O>xCOb17vmg
zC#0)v+UI<4E${w=^JcH;_}KU|D0)Ge`S~FI|Hs$&%xhb>_uOj3`ts!Nz>jygF4`@5
zI?OMzX0r71&=Q8dntPkJUfn<Uxs%*~i^;q4<&9syy?Xch)tB71@(&F6JNpOBUwilc
zZn-7@I)Xnly$Tha=4%xDX`Voo_RiaN^-}~(*FE1O!oIcc!E;vm&#d-O-v{nkp{cR&
z@Gag)4K;!Jg;LeZGAXTATtTN(O%=c2mA*B7%F0=M+_4QtA>2Yi0<-mc3`76<JmHQ$
ztg|Z1@A-7jvd*LTYvU)Gd|!EZ-MaN+&jLH1=bp((G3KoLbm`?!xtHJLE2>kLAMDRJ
z(kici{`Gsxmqki~7q9$hd~`Uow>7w1VU^#<a-nsfw>yNE*)G=G8km3W%7*U?&U+ib
zH%&{NCjGfMd2jxfU4jlb(!YIQP<=vj0qYFm27U9+toj0B$3IsC`{z#+`j`6ehv?aB
z|IZ%~`zQb8y2N+o<U?Kz42-Rr&dvdz&dv%2Mfqu&Ih$DoH!{|93Nv#|y|urNfq}Wu
z)5S5Q;?~<)`?GI5h#cQ9#wikIRGD!+XyQ)B=}sIKI<j2%niWNU9Zp_(GHO$aLF1*9
z&V`yk<PB0ZVtJOSB?!Hc3$ZFI6o2frP@uGP&gQD+zrVgqN!hE(;=Sv=`}@7W?K~YM
zQ`eM+eA@A1_w(Nj0?Y^U>i2GoIDPnU_))eCufH11<`I7s%)qeV)8}WgCQ`il*|$EZ
z&gryxyxg$iRDuBmgT6wO&FlQ_afe^Nu(>WLP_gg#gQfd8oF;L$o^A-ao9?6`(r`0H
z;`5Qs0`LC(6BHLZkYf}g_DtC6L3B;ns?9eaayv~pKKHrfgQ;!&9MUH=g*YPXZ5I~!
z7KkRlWqcCEq$E7W-IArUE1uOj<XeM~gWv7>d6gns%ptu23%wQIzuPZl`=F#`-fm%)
z&y0a0M;Sh37cnvX`11DPRf7v#t@4-K_cJDZe$CC`@cC^ugTvOSwQGFXR36nHE3xX`
z%aF14c*fS_#~$f#i#paV9cyRYbm8Uszx62%ujZOJDhT_tI__j&vdO{vuimz(8)0wQ
zS3SC1%e3;l%-nx6?PsH(NG8NoYt3AseXlIHaW%Khn>m@z0-gS44B`Sz(@RPf1Uj$B
zt)9rgW8G8bl{+nOSnmGDBEwOy|DJpOWHEgs->(mv3xBdadvta0J`LebPAdO?Pv7@p
z1`CU3eZ#wtawiWgW_B!lzFA>|;%&w$#tp3#t{(BT%3q_nVwo*JQ#6y-qyM+fMfW(I
znRaOMVdaGt6FW?%Y;m}(X{Z_(IsKc%M28#OWQta}KV)g>tI*cYdHiwZ;bS(E(;Lp}
zB~E74N-Eu?ut4O!m2t>>6JzNM3<09=g_@2wr2Mr}IJdjrea5vNTrFGcP2HFpa%)a2
zWnHSZ&+ha1x1G~Y<@Cjy|2hTMzkbbeZR_Qi#WO4FgBTX+_A@oTvdmFrx$;O;;e}i_
zvtyP-#qI;Ir*EH{#xV8h>A23*efz(!*!ko4<LA=1mU&n+M|@<M#-=3P81jhm!OO??
zdEN`E_Z(mPlBsE3g>b#}8de9Dd#o(MAN`I!46Bye{AjTTlaZX&sj8;81}cK_E5lZM
z`vtH$|E@eB%3#D{#gOudv4QnLiZsvR051P9KDCEVdp7ca;5|6CVzH3Gl-5Ga8zweg
z`79p$_&E+=@KoC&=FfJ3l|}xMCu4xq2i19N*jIdM(XrU`p!SD@?!F!gqf-a$Jzg(S
VTHF7fm4ShQ!PC{xWt~$(69B3nL#qG)

diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java
index dbc09ca4c4..7da3a47a24 100644
--- a/core/src/io/anuke/mindustry/core/NetServer.java
+++ b/core/src/io/anuke/mindustry/core/NetServer.java
@@ -40,7 +40,7 @@ import static io.anuke.mindustry.Vars.*;
 
 public class NetServer implements ApplicationListener{
     public final static int maxSnapshotSize = 430;
-    private final static float serverSyncTime = 20, kickDuration = 30 * 1000;
+    private final static float serverSyncTime = 15, kickDuration = 30 * 1000;
     private final static Vector2 vector = new Vector2();
     private final static Rectangle viewport = new Rectangle();
     /** If a player goes away of their server-side coordinates by this distance, they get teleported back. */
diff --git a/core/src/io/anuke/mindustry/entities/type/BaseUnit.java b/core/src/io/anuke/mindustry/entities/type/BaseUnit.java
index 334b21db3c..440cab7a2b 100644
--- a/core/src/io/anuke/mindustry/entities/type/BaseUnit.java
+++ b/core/src/io/anuke/mindustry/entities/type/BaseUnit.java
@@ -80,6 +80,10 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
         return type.drag;
     }
 
+    public Tile getSpawner(){
+        return world.tile(spawner);
+    }
+
     /** Initialize the type and team of this unit. Only call once! */
     public void init(UnitType type, Team team){
         if(this.type != null) throw new RuntimeException("This unit is already initialized!");
diff --git a/core/src/io/anuke/mindustry/entities/type/base/Drone.java b/core/src/io/anuke/mindustry/entities/type/base/Drone.java
index 6fd10ba022..bc34545637 100644
--- a/core/src/io/anuke/mindustry/entities/type/base/Drone.java
+++ b/core/src/io/anuke/mindustry/entities/type/base/Drone.java
@@ -25,8 +25,6 @@ import java.io.*;
 import static io.anuke.mindustry.Vars.*;
 
 public class Drone extends FlyingUnit implements BuilderTrait{
-
-
     protected Item targetItem;
     protected Tile mineTile;
     protected Queue<BuildRequest> placeQueue = new Queue<>();
@@ -77,20 +75,14 @@ public class Drone extends FlyingUnit implements BuilderTrait{
 
         public void update(){
 
-            retarget(() -> {
-                target = Units.findDamagedTile(team, x, y);
+            retarget(() -> target = Units.findDamagedTile(team, x, y));
 
-                if(target == null){
-                    setState(mine);
+            if(target != null){
+                if(target.dst(Drone.this) > type.range){
+                    circle(type.range * 0.9f);
+                }else{
+                    getWeapon().update(Drone.this, target.getX(), target.getY());
                 }
-            });
-
-            if(target == null) return;
-
-            if(target.dst(Drone.this) > type.range){
-                circle(type.range * 0.9f);
-            }else{
-                getWeapon().update(Drone.this, target.getX(), target.getY());
             }
         }
     },
@@ -196,10 +188,14 @@ public class Drone extends FlyingUnit implements BuilderTrait{
             if(health >= maxHealth()){
                 state.set(attack);
             }else if(!targetHasFlag(BlockFlag.repair)){
-                if(timer.get(timerTarget, 20)){
-                    Tile target = Geometry.findClosest(x, y, world.indexer.getAllied(team, BlockFlag.repair));
-                    if(target != null) Drone.this.target = target.entity;
-                }
+                retarget(() -> {
+                    Tile repairPoint = Geometry.findClosest(x, y, world.indexer.getAllied(team, BlockFlag.repair));
+                    if(repairPoint != null){
+                        target = repairPoint;
+                    }else if(getSpawner() != null){
+                        target = getSpawner();
+                    }
+                });
             }else{
                 circle(40f);
             }
@@ -300,8 +296,7 @@ public class Drone extends FlyingUnit implements BuilderTrait{
 
     @Override
     public void behavior(){
-        if(health <= health * type.retreatPercent &&
-        Geometry.findClosest(x, y, world.indexer.getAllied(team, BlockFlag.repair)) != null){
+        if(health <= health * type.retreatPercent){
             setState(retreat);
         }
     }
diff --git a/core/src/io/anuke/mindustry/net/CrashSender.java b/core/src/io/anuke/mindustry/net/CrashSender.java
index f771091b7a..c551cf8828 100644
--- a/core/src/io/anuke/mindustry/net/CrashSender.java
+++ b/core/src/io/anuke/mindustry/net/CrashSender.java
@@ -7,6 +7,7 @@ import io.anuke.arc.util.Log;
 import io.anuke.arc.util.OS;
 import io.anuke.arc.util.Strings;
 import io.anuke.arc.util.io.PropertiesUtils;
+import io.anuke.arc.util.io.Streams;
 import io.anuke.arc.util.serialization.JsonValue;
 import io.anuke.arc.util.serialization.JsonValue.ValueType;
 import io.anuke.arc.util.serialization.JsonWriter.OutputType;
@@ -66,7 +67,7 @@ public class CrashSender{
             try{
                 File file = new File(OS.getAppDataDirectoryString(Vars.appName), "crashes/crash-report-" + DateTimeFormatter.ofPattern("MM_dd_yyyy_HH_mm_ss").format(LocalDateTime.now()) + ".txt");
                 new File(OS.getAppDataDirectoryString(Vars.appName)).mkdir();
-                new BufferedOutputStream(new FileOutputStream(file), 2048).write(parseException(exception).getBytes());
+                new BufferedOutputStream(new FileOutputStream(file), Streams.DEFAULT_BUFFER_SIZE).write(parseException(exception).getBytes());
                 Files.createDirectories(Paths.get(OS.getAppDataDirectoryString(Vars.appName), "crashes"));
 
                 writeListener.accept(file);
diff --git a/core/src/io/anuke/mindustry/type/UnitType.java b/core/src/io/anuke/mindustry/type/UnitType.java
index d187380fb0..1500fb2738 100644
--- a/core/src/io/anuke/mindustry/type/UnitType.java
+++ b/core/src/io/anuke/mindustry/type/UnitType.java
@@ -28,7 +28,7 @@ public class UnitType extends UnlockableContent{
     public boolean rotateWeapon = false;
     public float drag = 0.1f;
     public float maxVelocity = 5f;
-    public float retreatPercent = 0.2f;
+    public float retreatPercent = 0.6f;
     public int itemCapacity = 30;
     public ObjectSet<Item> toMine = ObjectSet.with(Items.lead, Items.copper);
     public float buildPower = 0.3f, minePower = 0.7f;
diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
index 4a044323c5..fe8672b53b 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
@@ -142,9 +142,14 @@ public class HudFragment extends Fragment{
             });
 
             Table wavesMain, editorMain;
+            boolean[] prev = {false};
 
             cont.stack(wavesMain = new Table(), editorMain = new Table()).height(wavesMain.getPrefHeight()).update(s -> {
-                ((Table)s.getParent()).getCell(s).height(wavesMain.isVisible() ? wavesMain.getPrefHeight() : editorMain.getPrefHeight());
+                ((Table)s.getParent()).getCell(s).height((wavesMain.isVisible() ? wavesMain.getPrefHeight() : editorMain.getPrefHeight()) / Unit.dp.scl(1f));
+                if(prev[0] != wavesMain.isVisible()){
+                    s.getParent().pack();
+                    prev[0] = wavesMain.isVisible();
+                }
             });
 
             {