From eddac79c540d6c1eb191dc6db09e58d0a071046c Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 7 Feb 2022 17:36:58 -0500
Subject: [PATCH] Core units done

---
 core/assets-raw/sprites/units/emanate.png     | Bin 1527 -> 1483 bytes
 core/assets-raw/sprites/units/evoke.png       | Bin 896 -> 848 bytes
 core/assets-raw/sprites/units/incite.png      | Bin 1141 -> 1123 bytes
 .../sprites/units/weapons/build-weapon.png    | Bin 0 -> 408 bytes
 core/src/mindustry/content/UnitTypes.java     |  28 +++++++++++++-----
 .../type/weapons/RepairBeamWeapon.java        |   3 +-
 .../world/blocks/defense/BaseShield.java      |  11 ++++---
 7 files changed, 28 insertions(+), 14 deletions(-)
 create mode 100644 core/assets-raw/sprites/units/weapons/build-weapon.png

diff --git a/core/assets-raw/sprites/units/emanate.png b/core/assets-raw/sprites/units/emanate.png
index 73dc16d4ff6df7a3ec412f361263d73bc4cdf0f8..3a1bbb40bd4de8956020c168fc432ee294a4d0ff 100644
GIT binary patch
delta 1452
zcmV;d1ylO>3(E_TF@J?gL_t(|ob8;yYg9oH$4BuW5F%)QX`V?d2>t~I6t%SzqLo^S
zW$Z#KwTcIJX+;#`Umyf*Bd^Kz3Ksqev5=Lyy_wmW-Pzp}-WLM*-rJp>{oL%&w-<m(
zlO|1?G^w&K^ep^vesqqnpX@#~`BR$TQ{4)VAp~h*l;-!=#eW`!au5Ijo<84WpJ~!a
zwri?6NU5UZxKP`X()NJa6r>kKO`g^;n}PI(sL9(BW|uw^s|2E_jZ$?78EY73Vk8~T
zkIsi-*3u=Fx`V_}@Mj7pzQ^V3rAxgX0LTZi4giDJ0wkqzT&&C&$8oV%@UXf!ZA#MM
zu?_<ZrLG`v{eL)Fxu*d|rJ-!KR5y^J;ut{g%7(JlT1`O4BXDjcYVyRkTTRNV@04gD
z&VOGa^Tq=U2YdJOua$dWuiad_uDvT%H6k?-uixJw^HQTTH)2yZT1RFzklqke&w9hG
z0<spwRGOYJ-9grdm`d9VX4O8@1L8O?*g>WQrnj2TBY$%sQlB+>xw2}h8pzL|J}zBz
z6?=EGN#3U-h>I%DMqFm>lc%bH3=Y5e_7ebnAf}$BU<O}m!E^^1I~pnwD+gjK4QDg<
zp$1G>khgapkfY(w%kN9qB@k0-W7~1rL7cC-aszodKRUm2_a6H^RLBEjDo-ebg9rd{
z=k7h%X@8IlNbHaV(-UGUFIN`8vX5Rci$PM3NHAl0%<n8VDBnC_7J=j(7{>+7Hn)@c
zIRMx1Z;&HBcVDuFHQU@~=cA=Cvq4G_gETN>X(rM+lWpuv4VYOVH4uX=FfD*AX(=DP
zVVXf&AOif|bUnCnHEA~|$~1WnZd@fdegS-8ntwn_1yE~VTmcDY$+}p|i_4^7O1n)~
zm}-z3!`Lw{3SxO|E@*9FpEO%`7MLoK7K6huYYNe7YxnXm)4r#+?n#i=5Ra!JC9sBJ
zw)B^)*az#}Rl`68=>?I3S>wb6Ws~#48zu|VI}-7A&0{Cnw&VkVFHF;@Ep7W_NzJ*%
z*?%3W3{6*~ttXZmq-NV6zz-s|=^$-HSjy7+Xz^DCk}@duN0gquUp?r+ZF5P$xM!3t
zs>~p5zpaIt1gSk@XN9;pI|Ts!rmvJH*a$XLWd~{dZ4FHEJWT4xL)h`-{Vg($1QF|a
zf6LT#0RSG~JR>8KT3f$)L{|mpPwfl5eSf{j@)9Fb%1FV8rG*H<H*=}u=ki!1GvynA
z%mP4p8ZC}Yu0R}>7Km7Q<243|C*_(KSgFY5zKA$q3L=1Vu)&5T7{Rd%+pks%)~-wf
zAgSZmz6GSp48BS4b8sCs5CM$mBQ<Z{z8rt}XEQ{yHIe}M{z?<o0CZ$yDAu~9WPd(<
zDLFtDOsxiTVdg*#q7Ir`>mtd#vC9>pg=i55r-jIg^2Jh@l(LTl<8RXfvF7<3EbdKa
zDl&5*0#rIfPW6od?H~rlFsZ)MOYR2asZxO18e&j@8P5W|VY(XQRzjuyTdBAifG12h
zLzd;FMFB!-eokI6U5se{p$C8+Mt|<~hs)2&17?-8Kb$Ow1*o*8`8j!<{VDn;umhG&
z&{SllAe83E!ZVAKUx&G!{jt2|%Q+KN!*=X*Nn~by1780zMT)GPwRQ<atenW~`g?7u
z;?w{j4GJ}*Tq9SIUT+A)G7W<ZpL3URvAo}Ax;5<_$Eaqi1x4-L<U}Ra#DBXrZ3^Pz
z>{RT}N+5D+Q{_?5y&|(1BnOfDEZxg#vRarae>`Aj_cw?0qw^F*ENQ7%+V4rtJmnA8
zFwC;&l0_BJz7&(>HF)Iw04e7s7pLM%1eiS`29>}pU2k`b25*SHeQ~Rdr2@4e_VlHB
z)2a=zmoM&>@_fblKl#$EpCxJyaUFe`G-=YLNs}h6gZ=<6DXV+&$+8{*0000<MNUMn
GLSTZlMycKa

delta 1496
zcmV;}1t<E;3-=3<F@Ld1L_t(|ob8;yYScjx$0y<o1XAPyF3lxr1A<RrAR)1}6QY$`
ziDm3UDz%CMyR;$-@f8GH<r>o~<RM}q8|Nl7vopK1`@6vJ3nARy?#%4x_P4*;KfePQ
zHEPtTQKK4bX-MZMr)O9A_0xk#u6SzeM`|#~6he{}Ms59Q-G3RvsRRK4;Mt2q@iR*q
z&2~$52dOo5HoGv}(aH`1vn$9bh?Y9NVRi!<4bf7!C(J>{NGuBC;@6LC9a^U5i-^*o
zASH+owjYW;DSftRFb4yf>xmpp`rabJ90a80a^Bh9GrhMcFz@zu=z+-Pi#xk}@a6NT
z8#X3un{z&<(|<`wyjFDsY3(Uouj9&4n5F)rH0aIdVEJ<HwFRP7mfGsAZXl=A$@L$=
z|ArrLtpb1#Vp6J;Y$Ti1R}XaoNfYCmo=BDJnZ1(o<{)W9?*IPQ+T{%&JzzEkX@R)D
zzf$dov(X!7GmyO?YPNd9Yyz@3M9pR|nBgFYf~eW<0e`c59w|YLT#sz|MM-K3lFmLN
zA?E5*U%8o3t(t+fLVW&#->c$=1SxfrZ1jZL1Y`?{xzC1%84i*L`tti9w%q$~YwY`$
zgk35l*`zVFfEfx>TG`%y^>glZ4a8hoYMc5_(pKS16bAC-^z2HTGp7bg5KC5Xq&mrm
z1QFoh9DhAB4GIB?1JYndLd?~bd;!eI7zMK$Bo~NhH78;n(PM*)Edpj0NGX8X>|$=|
zUy=l1eSd|$(@XDbwy-8^n_}Ks3$qxc1~JJ3lgctHDVe#@JsnOpFpEG+hnTnkJup3h
zJY~5UB$$>%T%6n>lOr046xhM?<@Hv8rjlM}seg04wJKirQX5KOx<FC~I1p}s1UEo~
zS+mHX)x|zJm^fw%)eF-M^5pdFio()fbAb=JLQZ3{w8b-Knm}TM$)U7EH=Rz*=}7Ap
za!v=!mul?zKY;xPlm*Ed(zZEiPpE-~w^eJlR%r~{RFv~$fvJM@rUMd04rYs!5S&dZ
z27m8vW{!mjG72L1y5(^aY+H)~AQmPIQcJci5Twg_eSf9PnVi||LXE*v-<!0X@7ma~
z215%}T72ciEjnlm5guP!jMjEinLu&|weg4(*Dz_BO9Li-#@X`1w6>EI3lcx{qZ!i1
zBP^~#>0G3B(N`;zY;b2StuU?alpcsuuYa{%c8>!;KiXi+Xb`c^k2YMFE&#xjd%xJ8
z$jz<aKIWT(>*v-5-n}^#d8wDSR?+hGffXWve3@$lzf{NDGjp*4=qvz?&mz*EDLKTw
z(gP6-FT7HKI9axAVC8zI^hMBmIfwwpn+-Ok!AOBEZN9$Y*g7*wfV6?%x(mqpOn<Ry
z`#HFc7Ki}Or(-QUZ(q+pUfWDP+1rx<<nhYVs{#0)jiGqkl9T(9TrB|3F_*xW!YqN9
z#NBPZZPDaj*p(buA$o+tSs_Z|V)3*kr{agi@we%L*!nP2lC+bV>zO4G0UG^+05>)Q
z^n;j0VRB<-l)??tR4Kvi4KXRfq<>jJG|W(A(oCp!e5;j|0Yt(KGvt|0dXym4)|V6o
zGsK8>$IT0)H2sn4ONxNm<m`_m&tU<sY;Ao>5odp@z6l(FXAv~lvvLq>>to@}qUJY)
z!p{D9cKJ%q1hueDW3K6$Mc+WwFQ#Zct7NWS0}-pFXS#c2<SAFJ;T*6ih<`biv@!Gy
zdGrop<XoF7I@U0dC4pIg<EP}efGmoH83K|EC<ma$Y$xZB`#cI}_02|th-FEv)2fU0
zu??+!&L20P)}}$ldDF@1*_8!ik~Y<&OIJCVmh!o&r3AAym#j+2t(#(+r1d`urnkJN
zl1(m2)pN`QGZJDFh2t%6QBi_fJKqjjv?ysn=}PpX#uC;TPXk&(95R;B21Rdi-lkZ>
y8x^_5d7EPCHcs`1xQMZg8Z~Ovs8OR9L4N@xmfHYHpkX-x0000<MNUMnLSTY7fYV$6

diff --git a/core/assets-raw/sprites/units/evoke.png b/core/assets-raw/sprites/units/evoke.png
index 01d7d777bb5e85ecef3158db0df7ed25cec0d1ef..11e8f689faa38852fdd671a18c9594cccbeedc46 100644
GIT binary patch
delta 812
zcmV+{1JnF~2hawPF@Fk4L_t(&f$f>GP8>lDhJA<^KmsZB(12(oox~G>1OnRBkP4`%
zucnGp1tdD!fQS^H0O_Q(h-<i>NFe1ANP!H-XV2K)ok@!QD{gl@_P3rLdk26{ojP?Y
zs9r5c-%ih;>F>|GpQ`w-;)KJYYCslupuwR^Lxv`|F1H+<*MC0pFx&>#<z|KR+It~g
zgRRR=8@Ku}1OR}W`F_ZrkF&@;(3=r1ghOeNR#_oUgW85e)qu<nC<TWq4LOy%xqmol
z6>fQZ7M8bXlViNf#i#<J;b=4#?`zjJQ7{gfQ!a)SWHN)A1N?1;lz^;|nlGzw6JQfZ
zDUcjw(+3NX*?(j_@8HtX!o;<`{=LceWVkqS%>(iE%RuGG?xImhD;$bKwgm@Ztb<-i
z4Gtkv_uGU6FusG@MAEWceHg;s#nZ%fnjvXP-d#M2B}4L&iiykBi_%O|$N1EDXCB{;
z$4x{60(i?Le;}uS=2Ra5b~u2**Tnwe;91L@q+F-sv40zl#x6JjN0~rrOGc8V4fC{W
z9^a@|K9{5=>g_RUCZ#1xRrPa8+Vvt&+B=sO(!E5Z0a+y3dV5~3FkstosX3ZJhTg#l
z953!#=|H7?6nO_xQdi@JLq#BqmkF-%{cZAoswd6$tGT%?YE%a?fFD<v;#kYqx;6&q
zq>xqXpnn9lvAOm7Hw|3-?xQUlt(&>ItJOg*bH^V)OkCrTQbT_9>$f-`g+sMk2el%<
zu()C|2Y?r#gR>qSob^OFO_~quX<zu*knV8OX27$E?H7uFc}Ur#aM6w?nL$r`#zh0>
zaQvFKG%Y@JnN;bq-ti~L9a*+=ZJ9-EwRp7pD1T;<7IO*|fom%6LyJc{R++Xqk(Ngd
zIO>aL($kxUI+>bqO?`@h-hS_YkQQ_J;Me;^`DW47o~qcvZ#2kSZ~zStex*RKe}3-)
z0IaR=xc>E)veN)9uafy)<B%yhloirq$03Uz{952pIY^HkLKZ#vl^kn9rfi~iIUBA}
qIVGTutqysx5j!tjr%s*zz5W7vo&$JV2!gZ#0000<MNUMnLSTZyLy6`9

delta 860
zcmV-i1Ec)V27m{UF@HKqL_t(&f$f^TPE|n=$LAVfzyuTRp@G<%knjYMXoS`pt;C9&
z+R9id37xIn+?(hVnB0WcKm$D_lK2Q%kUtJ{W_D)weAt|S#XV=|<9GJ#?(80jMvWRZ
zsz*(R3iSE#>ka??cK7ulu?Gnv;h-TPdk<j2L48A3Ie+*5;D27ypFSR_empqHf{ex~
zDQzHwTEU}mkc5oJ@sw(81(m@qxQ)vN5fS}-x~|#-G8!kMa6>OBw7R;iUI!dxL7tsm
zgz||(h8lGZ2Mqz~Hs}iu>KpPw>E`CvPN#5d+e@^zy;N-D`IPc<Gy!3FasErakL%Gy
zIGBXA1m9i`C4b0b4@yV!w-s1Q1Byagv7)g<fTck5*|ca^0`VZF@9cvmaweJR7$hQk
z@$yyU+MD(BknNYnO5>XM;JAK#|7LQyvuG`36b|B$UBM9r*TF2L1qX=I{Vw5%f@3h^
z2->(@(CP7Y<2vsl?Ug(|zINBlnw(O#DDO$Uj{J##cz^!nUVBU;8W7RHo|F${|K#fK
zZ!J#dfv0y9n_D|KazdHUrVTjAs#GAW*Y;1Y8WY!iHci11RRDTB1uhS+#x}b_PBpgR
zP&e*A`h9mT3I}n>!#|IS$gYwykl}_N99Oh_YvU^l8Lnj7CKQoo8{Jh{ss`*DuH>T)
zWYrj~fq#>WyR~#cr5L@8K}g#GXW^h4$n2q0t1(FASN5fv)T>uBy9P^XK;BzOz^Wf3
zrI*zPJ~?E~7_VLjH7H(r@WicsA1~4Py6O2IY#p?EPAl6aq*jpg8k9@hYj(O0T8sSh
z%Cm?$5#0jq9ZhKOXrjVdvSLI}&fTXFsbI9pK!5fk$}fnQbwqmaak$!wrg$?`o|Paa
z90W)Y4yu7PZ(zNXPNQ&K)@xQ{XXRt9kLnoYi#Z3Xfomhpx0R1|0{<`)$f^bVgyS(}
zPiAV<>Plt^xGrL;fL^^fBwRG6m2(lK^kpdvDPOa;_FSb7Y4!Q6Hp!vjh+2LC)e^<2
zS5@Y)*t4?$JNW<#Nyri$6orh~Nytt=VMBn7z(F2l#tx9Z{1ZYcuy+`1LDtyye();;
mM+3@aYwWUcqehMT|N0A8t{7Z_3xp>C0000<MNUMnLSTZrV51EH

diff --git a/core/assets-raw/sprites/units/incite.png b/core/assets-raw/sprites/units/incite.png
index a316eb6ebb77251b2a19650481720df4134eb9ac..84da4c8278405977346af03263f0cef7a23ad150 100644
GIT binary patch
delta 1089
zcmV-H1it(A2;&HlF@GINL_t(|ob8&wYTGdo$FHR?U`Qd^oyAGkK)_GXKugoLTOf2w
zGnI}RL#C#aF?7pXmloV72n4#O@e=PTB+y52hjK-h@1(oaA2*=yl*rQE>0|w*)BOz4
z)YR0})YPQZquLG!!}FP>-<yNiRb#8_ObP*26Gk;hS_r6GFn_8zu|h!AfKl8*Dg;z%
z7)6cef`BRsqnKd|LjU#>001u5cK)?ZCQ|?a==Hk6eyCC~9+xmm2`A?YA^3lX#*|VO
z5HSd$wpuWrq#AG^0e9I>CR6D3x?%|KXZ_B6TmSYFF4lGy#&NzaN?H;AK7jup9v#mB
z!V^aIdfmDGfqxU)Lff2gtIQxc#~7$YE&vIPn2!_~CJ>xM$qLxmTLA!i;@F0LLgIW`
zVW>frf`D2U3>AnR5HzX@LkuG2`LjUCF;)|^2*k1=<gg))y=X#pwjYmSGMS1VEs3oZ
zWdT8Leo_e3-<&9$nqxO45eR8wgwjIL_;GD(60w-XD}O=?!wNy;=WKtL6#{_r(TExD
z-(JG?=swuz?Wg#aAlB!4bRWHpX&?X?_6W{_8yE*;_x(??AFi)!n}eZ+0ASoKeMeM4
zJ`9}L^yX@={h)IP2c5gQHtgfWpaA>6Ef4?{6)OLt<4@>xdzBowvA05gyWRDz1pvd}
zPZ#V00Dp{6HrZA7?#HhMyRJTdI2O%OydqqKRIq+PC~k@S5V*FG4a%n*n-l_op=SAP
z_f_y%a90Kghg&_Gaa<qN_wi@d+)P!S7>tm72$(+mOFuTzkhBm05~|o17#svt4j2{)
z02#{pgW>t?+t)AAe&dr(lYPmN`~1br<<>0SKz~BALXeD&`Iai%?UM^A1wzb5E(idb
zui<`Rr`xO1lv|?f(fz{yk`n?zfqDc6=mwqw!ySt@b3*_qRG6Xi1PcsmOe_bnDru)Z
zJUX6n*J18LghwLx+~X<1O_+Ky4Dk1kp~)nDnFqRe4=D^kFYsabN2L!V1Oa7*VH!le
zX@82r;F2SR!Q~4GLjnP1fuSBS7@p54=b?&`B;g7vv^jFIXcH{c3m$*cxeBNjaj{f;
z!GjK$2?52$qJbe=K9(0e{*t9?7!vt~77KXEV^SoKpq^WQLK0D9tfjb^)W4X)jgQ;F
zLV<SIx8_!ce`R*B_91ZiYaB~_oK!2q-GBY5lR)xq;RLC=0k%n259KQsUr1sQlwr4x
z3T%3FMeYru;tBN`XUFv!i!Ub8W*MtSQQx2+IQEeyJD9X_c0#^<Nvc*^Kmg1K$OWb?
zqj7#EzO;VDfu$5|QMo{r@G0IStVPjfN)xl{)ObiRw6Uras)qpMzkaV_1z5{Z(mJ;*
z4Kj5V)$o(N%ws|3dX!50DH>$%{iK$krlzK*rlzK*CWHO}MP+jWX)#_v00000NkvXX
Hu0mjf`nvo2

delta 1107
zcmV-Z1g!hx2=xe%F@G;fL_t(|ob8%DYm`9{$4BuC1R^B;rMV<+AaI|+fMRUz0*6&h
zC6-r)RL1H!u)EfXLi_}QfUVv&ULPR`euT4-k-fQ{-I>{!v)F%id9ph*`@4Oao#z0W
znwpxLnwpe)P}|{fG+s#Bz3RWL8e3IoQV6J;FseDyLO|7mQGdmW6#}XTjN%SbA)rdb
zC~7<x1XM{F#SHr(^zLo}0N`f(@ZYoPbOrzb-EJq?4pj=q!xBb)!oj&h2=sHPPbpOa
z5rYtVRtv_XR0Hl3aHs8bI)iSvBZlDqueY)Mtao<{H`|9R{W#wiCCv!B58&UYXM+Vm
zc)+M`x3jcAaDPHuXq)qGl^F!*7z35a1t5VD^N|9>1cGxYnE|`Un*iV+I6lKRA#uK}
zFw`JQK|rkwh6+Ru2pZLdAqJ7M{wxr3^wq>H0<kU#Ic!K{FPczYp2TCAPG_Q}C9##F
zEFgTFpA>@cGbf)-&9NJj2!u2-LTMpr{J6F?iC9eH8Gj*#VTGXab9u7J3IRa5G-8H(
zcegOPng`pw{t&+s#M(@*=F!WT1_FR#kKi1*fpIX7-u@8#;o7>kIT%_90LIOdI`RcX
zVc@`KKff<M?{C~gf8&1X8MdJ?e1NHM3j_c~g^FHu=zuN`w!Hmzk2k&FZf9qI1;FU{
z;}yFA0Dsr#d+aQG^X=D)U03hl4MbxU&j{C`FIXB7ikspT0{1Lr!{^hDO$q_PP_uk;
z^dfjHxHE%;!_6K|Kduex>-9&~*i2QO7>tl81Wcdl)Q=4`BrODhgetZL1_uF^1BL|x
zK!$Sua5P?g`TQx`?)rSsWM6XRK7ICly){cWkbjV@5F~wLzNN}``{V*jfe^Ei3j#pq
zYd8(;;$SP9a!WM1ny>6HIUxWPs7GLcZr~{}+`ectHw1t}g&AL-V1eQ56U#xYO4?~p
z&jt(bI?P>&@JQs=J)RQWfPF890sh`GG?^roxubjckiwvO0fj-2N(v(c0cC|@>g0RV
z6n}%kB}WK@%NG!a1OmzeL)~FG8ZUg#Llq-Q!WB|zbL3*tCRnByJao{x3aA!wu~d7(
zgAUgT0ma3V{RK}ffS72pL?db6)Gws?FJ^EJTVP-xYxzy1<X_B$L<i8>*<Y$4(JQli
zwWr|l7dWL<Y({Y3A`Z}3H^67y>?t`j)PEo(M`0}BQ1K*ISdqZ69M>uk=pf`M7N{iI
ziM0v&ki_VdIO*_}=4hfr1Eke%Z5fUFq)UeG8NR_weJ1S@uHzVl9HKT|pQ+hv@~PpQ
zrX?V_w%wVLYXeQ15x(8MB!rNUl%x$H^YK{&LMdNj5WY>v4W=dpsejGpoc)zwNKC1x
zMoC}lrD1)OR8#-;D?cm1T7HtgU1^Z1v#5rj<Y^uYGS^Zn?Wbsvx%ZP=ewvz^nwpxz
Z`U9j=dfw>~xl8~6002ovPDHLkV1nPY2H^kz

diff --git a/core/assets-raw/sprites/units/weapons/build-weapon.png b/core/assets-raw/sprites/units/weapons/build-weapon.png
new file mode 100644
index 0000000000000000000000000000000000000000..30591fa51f24e93ba70c574edf52f24ccca9e91c
GIT binary patch
literal 408
zcmV;J0cZY+P)<h;3K|Lk000e1NJLTq000>P001lq1^@s6kX{pg00001b5ch_0Itp)
z=>Px$Qb|NXR9J=W*0D+hF&GE%f5cI75;{56rL+&=E8Kx1x4H@HB#v%9-=G!>rL(JU
z`Vi7lyXaacK`8EV&@0!w<oog^8Km5Qy1V4^OTr}=pvixW;wp?Mcja4MeedGzghe(4
z9nzNTFeFJce9Y&zMm10ysSHWd3;-~lK2yDRg1G6@05F@qvvqutm6sXF8>z(?5+S~j
z81aFekWQyfLW{+B7;<=Y%tAp(0TkgzBu1(L1^w*`)@-ufFy!|1cL}A}FU2FBq?rPM
zr^owReeu_Ie(+{1vaWm)LI5P>j5q++I3XtB_2Dxf5(=<L41h#p0VJY&H!Ft>Uw}l)
zkO`Q4?Z!dMkO^q-_u?P`(Cv?wP;~?@kn>{f_D9M#MI0pBR)&Mzdg7!Y@dimjt=68g
z%<CU-fz;Oaj<G&_;HGkUl`jwA!$BU>RFfu6)+RqA`f<+El)u~n0000<MNUMnLSTXn
C#k7h5

literal 0
HcmV?d00001

diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 02462592d1..9dc92b446c 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -3153,6 +3153,7 @@ public class UnitTypes{
             );
 
             weapons.add(new RepairBeamWeapon(){{
+                widthSinMag = 0.11f;
                 reload = 25f;
                 x = 0f;
                 y = 6.5f;
@@ -3205,13 +3206,14 @@ public class UnitTypes{
             engineSize = 3.1f;
 
             setEnginesMirror(
-            new UnitEngine(27 / 4f, -1 / 4f, 2.4f, 315f)
+            new UnitEngine(25 / 4f, -1 / 4f, 2.4f, 300f)
             );
 
             weapons.add(new RepairBeamWeapon(){{
+                widthSinMag = 0.11f;
                 reload = 25f;
                 x = 0f;
-                y = 6.5f;
+                y = 7.5f;
                 rotate = false;
                 shootY = 0f;
                 beamWidth = 0.7f;
@@ -3232,6 +3234,17 @@ public class UnitTypes{
                     maxRange = 60f;
                 }};
             }});
+
+            drawBuildBeam = false;
+
+            weapons.add(new BuildWeapon("build-weapon"){{
+                rotate = true;
+                rotateSpeed = 7f;
+                x = 14/4f;
+                y = 15/4f;
+                layerOffset = -0.001f;
+                shootY = 3f;
+            }});
         }};
 
         emanate = new ErekirUnitType("emanate"){{
@@ -3249,7 +3262,7 @@ public class UnitTypes{
             mineTier = 4;
             buildSpeed = 1.4f;
             drag = 0.08f;
-            speed = 7.1f;
+            speed = 7.2f;
             rotateSpeed = 8f;
             accel = 0.08f;
             itemCapacity = 110;
@@ -3257,15 +3270,16 @@ public class UnitTypes{
             armor = 3f;
             hitSize = 12f;
 
-            engineOffset = 7.4f;
-            engineSize = 3.3f;
+            engineOffset = 7.5f;
+            engineSize = 3.4f;
 
             setEnginesMirror(
-            new UnitEngine(34 / 4f, -12 / 4f, 2.7f, 315f),
-            new UnitEngine(27 / 4f, -34 / 4f, 2.7f, 315f)
+            new UnitEngine(35 / 4f, -13 / 4f, 2.7f, 315f),
+            new UnitEngine(28 / 4f, -35 / 4f, 2.7f, 315f)
             );
 
             weapons.add(new RepairBeamWeapon(){{
+                widthSinMag = 0.11f;
                 reload = 25f;
                 x = 19f/4f;
                 y = 19f/4f;
diff --git a/core/src/mindustry/type/weapons/RepairBeamWeapon.java b/core/src/mindustry/type/weapons/RepairBeamWeapon.java
index 7014830d21..fa6d21a869 100644
--- a/core/src/mindustry/type/weapons/RepairBeamWeapon.java
+++ b/core/src/mindustry/type/weapons/RepairBeamWeapon.java
@@ -30,6 +30,7 @@ public class RepairBeamWeapon extends Weapon{
     public float beamWidth = 1f;
     public float pulseRadius = 6f;
     public float pulseStroke = 2f;
+    public float widthSinMag = 0f, widthSinScl = 4f;
 
     public TextureRegion laser, laserEnd, laserTop, laserTopEnd;
 
@@ -157,7 +158,7 @@ public class RepairBeamWeapon extends Weapon{
 
         float z = Draw.z();
         RepairPoint.drawBeam(wx, wy, unit.rotation + mount.rotation, shootY, unit.id, mount.target == null || controllable ? null : (Sized)mount.target, unit.team, heal.strength,
-            pulseStroke, pulseRadius, beamWidth, heal.lastEnd, heal.offset, laserColor, laserTopColor,
+            pulseStroke, pulseRadius, beamWidth + Mathf.absin(widthSinScl, widthSinMag), heal.lastEnd, heal.offset, laserColor, laserTopColor,
             laser, laserEnd, laserTop, laserTopEnd);
         Draw.z(z);
     }
diff --git a/core/src/mindustry/world/blocks/defense/BaseShield.java b/core/src/mindustry/world/blocks/defense/BaseShield.java
index 9bfe3e972c..6989525569 100644
--- a/core/src/mindustry/world/blocks/defense/BaseShield.java
+++ b/core/src/mindustry/world/blocks/defense/BaseShield.java
@@ -80,17 +80,16 @@ public class BaseShield extends Block{
 
         @Override
         public void updateTile(){
-            //TODO smooth radius
-            float radius = radius();
-
             broken = efficiency() <= 0.0001f;
             smoothRadius = Mathf.lerpDelta(smoothRadius, radius * efficiency(), 0.04f);
 
-            if(radius > 0 && !broken){
+            float rad = radius();
+
+            if(rad > 0 && !broken){
                 paramBuild = this;
                 //paramEffect = absorbEffect;
-                Groups.bullet.intersect(x - radius, y - radius, radius * 2f, radius * 2f, bulletConsumer);
-                Units.nearbyEnemies(team, x, y, radius + 10f, unitConsumer);
+                Groups.bullet.intersect(x - rad, y - rad, rad * 2f, rad * 2f, bulletConsumer);
+                Units.nearbyEnemies(team, x, y, rad + 10f, unitConsumer);
             }
         }