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
zcmey)eVTiMVSTHoi(^Q|oVRoKXNNcn9C!aHFQAlBpE=J{o8uoVo5<F!!i%Oxb*8>?
z(%Ra^UY6-9@+e+`B}aMv$*){u|2Q{Jn7VWC%$qas-n=V(Pn_xdz1wr={=M_&{C4pM
z&&g`OvrJZQ()*(Gr=YH+Z~go?b|ycAXWb9J%hjjIl9@Q=+4pNl>*ZRD1Q;0R+1*c`
zpLxk+TlOkTkClra?+Ca(@zS@3n<7iZU3}+VGnn1@rESH@+d^s6?SxjdELz?hRLU-y
zEs>U_B73g?TzlfROR7_MH6IE1kj|yH@A%W#OTG8XGMr%F$j8upjY(x`Va%E{;>Qa&
zhJDzu%RJZX(u0kB%-l=YDdhjHw}{-ioY8gZ!kn!k<`Wh^l5lu;s%_KNC|`$T$_05U
zS)Yz<i}pRW`u&s)g>&`sil2`$bF)`}|FnK;b^Q9fF}v37)ebRLG8I^V|GvWKpvA`K
zNx^1O?rEkI?g<2+uR6SjX_MHIkXiE#?mAv;o8fhvJMF67CFVyKdN&-Gu`Js@>zs0Z
zu|m*%)5@KjvQ|o+I6vP`FSb~;x_p!8z2!<B-CF0|V$$ABUcRb<hj0InZ^8^U3d`m#
zO<;@9I#|LkX)UECpv|77#hY&YZ6TXa_=N4{auXImJa_uN_jOf);LPOPg*P4NtlwG0
zTxnr%wZHhg+;5wZ6U<3k{u<5A91I1|-`QTzte?Q`@n!<cW#J?({cy1ZoBHDnx*dc1
zJPeX6&%D<$)3|SwAlCRqM&dZ@8MEz^e_AqJf1f`=*|t1>Q>*FiJ891sFE!Zg=q1o>
zVvwAvcFA&b?i+938IcO60?j%Gx(zy+n(})RXE{bGF#Wk(V!NZzG}B!Dlu0FDUW}@F
z9b--6ta=A8)`0A|7)H*tle;2Lb)R06;I-Q~Y(~}uslzu6^|+EMbM!KD6Xu&lmx;~L
znjqGE*dUwhVpjI|Px_blE#LOebHX)&{^g3Q8`=`LeVM-c2K(zfp@$t<Ub0SXihO*8
zC3W)WgVJi;m#l?8mYz*kzp?EJbA!Im<rTWQzmq-B?mT+4UUnsqZ}{T1>eHl_q}`T3
zz^}CRr9!St#HmZaGCqd0PBPN?>ON)O-gw&=2Xc!&59~;vqPyyhLhk;xtut9x+9sv9
z?y#_CW%#>n{S>tu9A?3(?3urFd3`?G_`EvqeB<Nezq&@fEP}5q>Q7%OVPufIZ=<X{
zF)Dh0rAs*LbN{#8dur?V9{(hy9CXU#V8_x{jsxb!D<41q6rpVVRJ!2|lS8GHZlBLO
z2brm29T63eP1!ospUx7GSb5^fz7C6cE~SQ|4F}s)Bo1!mzP&z->)JXWCWV!cukT}B
za*Ai4=lkLUSyKVVp6AM@`S<q8)c;5~cG+Y)iQ&gTFX5{UB`L`o*LE#Qskf`qv~&>l
zS<6<G_{@Q45#Ow+*Geb%Y&<Qxpfy8~ZF%d7&QC{!rcc?_&-^(5GSkLqKc#iv`KD<Z
z6)P}>SULNB?PYkYz;@JN<-SYa@7Nx%3~IP3l@!n*d7f!c;x4JjVNOf`Mz7o<*`V%Y
z?mX@35?4m2%sRg~gV>&oe+$_gWZmlDeQ7^^{v>nS)XnyDblO>0Y+3r#vU1K}&0lI8
zn5X$(2uWG0Fy-0tL&n{c;@fx5{kw6`)6<s1A&1M}6nmzm)iTHZH+1b<GiPfVr^}i-
zC*J(3&RzNF3WEYKm+9gd<?sn{`5cFhc$>NB7f&zPxaWS_F4MO%$5*7SVs(9c=ZTBz
z)g$%0O>?;(J$e)J=De3eQD*Sd!1H^RHcP0mPyD5G_jKl_s2Q5|HVJ9p&D%dO{w(66
zlesed)_c#hHc$Dl8JyYle3Gl^g?%EEpO{uW`NN?3TvdGeBQKU2wu)?159q|^mv^(}
zckHb#T-~#jX{*AwFH0*guj1V}UH{$GPc=t>+W)+?X1;0`Z=r1MOq0w@OFSp5t!@6t
Zpr^UI`s2w>atsU%44$rjF6*2UngFy$sonqp

delta 1496
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
Q1_lNOPgg&ebxsLQ05^csTmS$7

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
zcmZo*zrZ%Zu%64)#W5tK@$Jlwelm_cZM7ZZ4osR~E;M8)&pjgCz`}Iv$^@<zE7mXT
z3Sw2Uy4BDjGLPZqk}VzCJLY*PJQeh4<T;jp{>Htzo?U;n^U7_$ZJ#Gw&EDWQ*Q!)&
zMVzkteZTYbU%o%Td;Y2)>mIcnUYO+|R=(iiLNDhwwe5P_W#(M3xBFyphwa+awARnJ
zsug3K*Piy3-u}ygg`r{g&$<)y`Zu4jxiDK$uf;iYLRh4tZ}Y7-=c^58_%vACwRkP3
z?%G*zks+E_SuHkgd-~+$J*SSYU|RGr!$j<T_I1-h1HPHTdTk;pM$NOB|Kzq#X;?F1
zmj3E|;RIoK%?UCom)W@|+^kQrdH>+jr9(%y?)|s-<hPU^7KLY-KYl&!@btvHMS&jL
zGF?vFSlJWSG{<@H@+k&=zum%Yu&?=+%cV^*wGxN!9=&{|be3YK=e<~)PF3em6T3Q3
zU+uo+6LkE?mGX4C`@P3~U6`0EPOH=_EU$kSBF|7}(Qx4Uk$(>#M4q0rBxd=ejrG#K
z$Mh^1+-Evudb>?p%KLdsmfZanVRqA(sJ?n@n5ni@)hqOCvFEL?O8&R3r;A?N>#~?J
zQsrh<b=*3GgxduxEoV8j-8;x3qyH}IrNh!1kxKT!pzz17&aMjG(>d3D{G0o!Zk77k
zud8?N)XfTEH*Am(pZ+M~^z~h4Y|ocW2z|Yvo@MLConL>M^Tzysw^&zd?d+X9S6_A1
zEj})9?-TQQLXdOam)F}Z<XfG$MzL>I+P`5(k|BG8_=4umax!zix>)$m;(whP|KrAl
zcLkTy4s7mtE8bOK>2Y&$!NoqcnU4O|$6T4875tgC%|zF(cxK4UjrTsPAD4~XR+Kx_
zHD_zZmR}n6X%obXxkMVXwca^*yIY6N+-5Oxnmez>tM0T*muI(G&74)>TiexeukL;Q
z1hL{D53c`q`I&a{%Dh!K4(6Mjh$>*<<*!@nu)e<TJtM=KweNTQ`#NpYWd_~#lYYiN
zo}g(lMf6hAam8-AKT!_?EIs;Voy2T^OqI!YT$Zz_%u;$?fTik!zO{Un8w9QOW0w2P
d{kQiYQ`J1?iYShzEes3{44$rjF6*2UngGE=iRJ(R

delta 860
zcmcb>*1$f&u-?kk#W5tK@$Ia=exZ&6$Dd2ZA7BxFyRh-btO*}jCS<f+lUjSEYu2q(
z5t^KH*WS4^`-Sj~J1y57m~B-i{osh0V9!^aR+jdy=Ej`*qqgbKAD4f7^X`pYhg+|d
z=_+^MHm)x}KfLDs|F`V>SA~u2oJtQDC@NI*CmeLFbq=$v|NiemecYw_c5*A~Y%ESR
z^&HdG%vETPI=HxCLQBuFk5jU8Sf?J;-O+oRRZ#G6&8~H~n2n^=7Zo_`Yi!xIYfT)x
zOp4>Yxv?#uI-T02N_p9N8DE;c;O2WJ{mJp=vuD@*mKS8-_TI8>Z%EGLpHn^+nJ^|+
z6#nzx+yDBai^YtVEiCur_*CmpB=LK>f7&h@;l<qL6t!{DM(2j54xevs$p~lqsIc_?
zn`YG_wV5v@RFtYdehPhjYxdXA6W&fg>h*Zm_Xj)bYW}Ac?bw{5n<B#ZXhQ5kLDuUB
zb(XNQcU=0b_pqZW+29e!tsOBJUVbcnZ1rC8?Nl4veP!3r%$gIlRpY(qp1wbw^%eF1
zp2SuAC`k!i+&^y$f6D(SuioYB`aNr0UM@U4+S<IxY3BK5ycQ=`g($4P{>^`#l<@T$
zGv9-Pp$t{lta|+Gj+yOt^fTS|Ai(^c-LKkmT`u;*6Nl~lJ5Q{eWHjMno19GemYVFx
z+FX+BQf{e<OiYu$8yc~S?TysBCyRMgu1c(Fte@PyduxfqQi;7ijvlue(jP96I`L*<
z@M=SkC*j|g&bqQX+;}&ecc#O=XpaM{<dv6BzshE3nQ~TQeH^=~MqK5GBWr8r^)LR|
z_421&j_j5yKkeHpOTs36mYU*yJG*QbUsU&>Pp39_SPI@{dMoRj@jheGp~y{1F8=54
zE*Dstu;rvf{Wqmk`W@3tU8>#}?zq*ptim{W-c$uu85R$IzEzDT`3ZX``z<brxt1N4
zoc=U<ZT~BYC*79ps~WSF&u*XEU&{2~K<LCO*556U4O9HnvM#^!O5@m}m$b4WZm+pY
zjLEX8#ez$|q-t_&#&6#CEoLcS=GUKV%uX(R&=FO~a8>B&%J9%<8*Xgg%wYYKfy?uR
zkc>!c&kfHLe)fsZ4Lt`O<x-CEP1yTK*hzCkxkR?(wHsgSK4>$$GoMPyezU1yv0Lx2
c|G&7y*Ga@Qa<`~6FfcH9y85}Sb4q9e0J>nK4FCWD

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
zcmey$@t9+RVZE%Ui(^Q|oVT;~XWcdwIKF<Veu9VM&ACTCuQ?p>zu@3~d26&niI?%z
zK1t_g%O)F^oQ|3<c1N9qW!JKgLhm(IF1Q!87r9P*zhw7idGiJDr<}NS_hs_mC71v5
zT(|-TORg-w#m9d5^UNjpXE$FDO<w)Vhl?>(*v-^Eiep8TLH#O=jZO|%8v^e*YO#c5
zO1SnuZ)(uuTs$L@%jy3&AqED$Yi0ko`l<ypFueG>>tNlAAOpGS240-%&$$$T)VCj-
z5+o{M$gyx+l)=0uQU&si<v0D*f?s^ymBjHb{qMP&=>Ok@^sbeO9V^_Y>lG#V&#vLW
zyqxTLhC{+`U#sr!{M%SBe9P(focz^i6fBNQtZ>m|;Ov>vFCw8PFvs~M*Nq#|j0{ze
zZnV`pJ*tUJT;VvSsUb>?N3=smz+@GtGmp~KpPL;{7={UN<~XuR;mHQY-n|)4rQ78D
z6OCqe$?0~k6-i}u%&iOJxN?7v#_U<i<|=|5nMo~|oG$z*%*__sIOB+Ry%X1AF2~2u
zbLyvwGBtd<*dh7ue%zt2FYInSf4lt0RE2BLt4iee_GBtBNPOcs*C;K)p8Wl<|3>+B
z>$7J!FKlH<xT90+9^zofGv~&aXIbn1E+}SapSydf*_+3Q7cl(Zrz^l9BC7R&(PRG?
zCDl`9wr||-RJZ%?*R`w+hwuA~zhPpi@9{Ug8T#$r@%5~`*V)xsh@B1GqZHE|vZ2mF
zBd_zfz>aMbcuy^to-M-EurTds&iBv{5e4CF?CsIEvkGJ6uYCWQe)Wz|=v;}O2{jxu
z?0$ROn_Zl+MSwwQ)eSKT8I}+}2{8@^$x}a@AO3uE`?~(cy2q1!C)b{w`1{Y%(@(GI
z+;ymT+T=8$r}yVHt=n%Wb8E0VopICSV3@i7VO_%V+p8~5iC*;j;@?C6CJ8e+G*+>&
zy<nTibXd0Atk{`BBV@+HPb}O#Sw1@K8?`c*+uB&oE4-fg&Z)&+>HD3>ng@MnR2lMo
z_};hhq)P2f_Fd)tnmqRU9}<7KFXdNeVN7jJlycddS>JW=!6fCDgHO3RoS7I?8yCtM
zNX$F0@qA&|M3skJnp-T3Hf9LxT;`UmzqFHUg;?Rnkm`fYeA77@j~-prs2F88P2A?+
zq@`IBLO)x@xGPR32dVTgm=|5|BovsuX6cR@SN6|1*xP^mfKy}H_3h8X+Uirw)_+qh
z_>nE+T{9;{`_SF`zbhv@e9C>uvT_&WHqS8rr`lri9!UaI61Vqq<x~~BzT;i^i1Vvt
z`th%l-TG=5(<E2B1>RpEZ}DxSn)Qq=g=J3rYCKnkMLIB?VL!pTOm}f%o$9_Vbw?YQ
zisS_DbeQr%^Pch=*NdrM!kb@Rsqiq^vT>F0s&<CQ`|H*xvPPWtzht#to7bpR^y-Jn
xd(I>~KC7DI^;=Ua<=x*U)8;RO0=4FU46dogOqqsp4h#$o44$rjF6*2UngIH``}zO?

delta 1107
zcmaFN@s(qOVZFYmi(^Q|oVT-Vv!^%;9C!c7&7!38cj-=*T!n)92O5%c-ZHg^`lwC|
zZwop0%3{OrYaLF1SQ;DF-ZPDpS7fhi**sz5-ko#r&b&E&^Nsq_%1zeBzjxQpoco+%
z76eSG3b_5Sz$DJ&*4|h9*GNT&rU!AXm}Ria@{*Io)uzDuqn)BmtJr!T@dYU^@H(uK
zWh2fK;wf>I=eNR_cX^Bq57K^rxWD;j2^#~$-8}Uhe4$*&4hy-}9y++wiQ`N03V+Q|
zM!{x*sxa<ji$j>-2^B1VTVmCmw_UmI!N2v}H~v{uUe0ZPyIuRQ#eFf=vmCqlAKYJ_
z-puMyabQK>_RU-D3+kPsGiHCzohr%lT!MM(308$h!Os(!4zn~BYs_TaeS9{<19=O(
z!)A(w`_>p-QSfqfSj*kU<-*4yb+tv2ZQ`bXIs!#st{%~0+Nj52nd6bHKPw=1-jU=P
ze(8&rs&1URNJpV&_I#11_r~h;ea~)`p2X2&V(65qnDJ-FHq*`spGT7Qimi#Q3qBTC
zZaTrm=&;iysja$vyTQ&`?6>#)6WA|w<d)C6XBSV;U}I`X?0+D$qp{GS@7_Ow-w$u?
z+GZ&c#ldjw>?EsCtS*TU4y4)d*SCG2f5*B0aotPFZ3_)*8dm0WvoN@}cEy#vXwc)^
zw&!nIzxm$#dFko(tOs6ve=NG2fua8T^XfM`)t}#9?}`n7f1lSSS>!y&^#%G7QUYDG
zABix1*GW12{Bo}^7vq6|%{4_|lqz&~7&kW`J}c*IzmE6S>#y!tZ}^1HmFStE!QwOj
z<&}P36BS*Sh8C@DtZeLzQ<>XXnH<`R{uP+S)%^UUdF$P;n)4~~MNjN%zt!wD^){bS
zKVgl4N^SDKrKie%KVkA}6xckGo5|r>wgvB-M+w@qio8vB&RYLQ-%^o5WQBV|L*4^T
zgFE{&jLlgZoLVL0=Or{gd@X$1agEolO#kz2-0!T;#CCk}cyi5lp3t3!TKzW0fA<Vc
zW~xlxxw!iKghLA|8CxCuy||QF7*kslUp=Y5EK=WmP}QBI`Lwt|8w=AZCg;0}7E<~(
z=bS~AJr9WnWfVV2x~LYhOx&jA!cMLgVuc$+st-2vUFT#xdUVoXR)3v_85tX0lr!&N
z(O>dIKdpc_Iw3(m`={^XC-G-mT-Yz%ycxer;iC5D>aEKkd=R%-8j|Bya9@e<Lb&;X
z^gC}fEsd|#E2y|9>O2Ves1g=2@xTU|>skUY6rN~^tx&nyxs~(hgd;B|TfF=*^;yOu
zXXYhW^KvD7e=YHDdndW?pm(j>TfudYC0b+_nZ?duc{BUd%7?R;sVeN)c6a8)Y-ZnC
zg8T07RcV>fKV=E8!sm~X%ubr|Ndo(PkMk~5V_8{$_Su}jQ{z2+RxWq*jDNK>v37Du
z@c*yc_Sy%c>L%@r&781u^NP0lPcr4Wjjji2y<MI$VdwYBQFV|^edrhSlAx-4F9mn{
RFfcGMc)I$ztaD0e0s!B%2H^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
zcmeAS@N?(olHy`uVBq!ia0y~yV31^BV9?=UV_;yI5GP#Az`(#*9OUlAu<o49O9lqU
zAWs*^kcif|*EV`F8%nT$s6P@|C}d@Mb?FxV2ikWUmA3EVe5KNtXM2Bv7}wIxtMh&d
zTngO%B1+v+<6Yqe?d!Xr{QjgWx#Uj$uH8>Qc^^_0UvRR%`;k_Udim4n*xL7x-n6)y
zvB+MU_S!(j)41l$^KEXX0n#gZJTLJu7|gW`-donR<K-m=gV}pGm)1<2I$iRF^va{+
zLW=t)NPKLZGr@1UuT%HYa*3jfk~2<@9*iOn-BjFGF|hu9%XKYh(_Mon-@cS{F1@aQ
zRC(@_nM@7KkN=LU{dm2!?n9dPrgb%fP7EqfdMp^OStzPK`1;UTPKaxR2Ty}b5~IqZ
zDs%02p7;irQxiC6)Vw|BcxnP?#{2J&6c{eN?VlD<%Az;nbJCk{?x)OLWmIm3wKd<V
zdbC90Bb%q=+H3PRo_Q^w-+1NPx4w;b)en{xRZi9Ce{k4Q?o!BPHQ#G$_R7Bs&t00b
S{|*BK1B0ilpUXO@geCwC#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);
             }
         }