From 6983f574591a4aeb6ba33b4110954bcd29546f74 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 11 Dec 2020 13:31:31 -0500 Subject: [PATCH] circleTarget unit AI parameter --- core/assets/maps/fungalPass.msav | Bin 10885 -> 10885 bytes core/src/mindustry/ai/types/BuilderAI.java | 2 +- core/src/mindustry/ai/types/FlyingAI.java | 2 +- core/src/mindustry/content/UnitTypes.java | 2 ++ core/src/mindustry/core/Control.java | 2 -- core/src/mindustry/type/UnitType.java | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/assets/maps/fungalPass.msav b/core/assets/maps/fungalPass.msav index 95c75030c102fffcc70f6d383410c39b6fa8b565..53dd6935f2bb5b55c853d9f543d998da6612de36 100644 GIT binary patch literal 10885 zcmb=J^R_0sCnmfo;_klf_xmfq+jyMgv8>@Wbv{?%k>z5mF>y+Y^}X22=_Z_SwH%6n zo!hW>-n)Bs6QoWyZP{HQqd(__$ApB*{R#G;1P?guX)u2+|NQGig`Y)sJq(3R7JVCc zpYxx<;+bIKFlANot1Fhj=-gFSrE=5bf8EO7&%wa>?{eudf`Z_6Ye^F}g+ecC=))AqtkA7Xv4xhJwS6$`f)~&t198#hz zr*gkbSx@~HJ=Kr>Qh(ON$6=e9kA4m}*Ncydj=b;kCDp@xR`l7j8;wuOmfqu341HND zZ+82HWqmg)ncXY;tlRdxYpx%DHFs}V zNA34lr6=CD^uCSSE4^*vk?Z#xpESpupb)mcY5617`#kR6NG52|* z_@C21Cgps8m3aKS{foA#ch7z0zqY>q!^2ZgU&~*akhb_5Z~X1MxpD8eRX=Q(UpK+e z>Q(B}OK-!r-TND~S?bkyxkLAs)a}2_Z{yd7 zWbZxq^|XFW^vZ3s*KVKPJ7M)T{q-y5_FY?*vvAAx^=sFzU0V`0^?2{Ouj}hCxHhie zKI^OPs-U;wVOG&ot)}X&FOj?E^k(+`>(|2$y?tA-x_WQp6Z@EpC$644=XXPF$=7b_ zSIc8?H+5`GwCr-el@%^` zePV9!HqDG}pSO00w|5n&_Nhq4zWtll?71$!^WuwN3t6f}u4((E9xmFpQ7xq|O#0$H z$GQt|N?ayB^mCmeXtwIh^_P$4POaJ;l>2R$#kY*M-PgCzS}XRdk@a>&w6oKyg>qr5 z46p7^+`cK;z1<}D^|svQv6;3e7H?qQBO?Y{2*HpK)+qpBj zm_j^~rcV_MT7NbB#fw$f`Itqc__gO2lk86#ezqH?t)nOCp{>Pp!-Q@R`eg z{in}T_Vb@VSF?|A*s^SM8rSP(1vf>^d>(db#+bHdPgvWQ__~mlS)xtzt45jjRyXrC z>t0^jLB&H-z;8s@zFwrawvMH?T_P%A7coWSg={K8~b z|H1W%>5_jouZo*Iw|%PBIe}H>DSb-Y`^MWt(xEJ26L&@%eA4-4^4GLd9K`_csym+>bqqU>%vYJ6>nqek}6((@AU+)%lxzU zR*7=6x*pvlS{lD?qJ(k2>NL-LTX#K`O<&=6e8Y-Ul|^%Zy(-(=S^T)=^QNe^4=!Bb zc@q}bw=d5ne!WwpTmIJ2%$CwQ0(ZBcp18gD#Of1+>ybU*4wLCRWtTyLkR~0r7i=JUJAuc26>2yIpq1AKm zPDrbhFcpn{doPSvvgyIysJ)EAW*sYbINVqf-lyL0%u`{}q&10S?Zma;;)-|QTOAr+ zp8fvff|(YF-dD<|fAQ|xxM}W&P)CDBacfI2XdjAw!o2Y2Kas~f!`Ao3Ub`3mcL7(} zcBeC$S-1Dj75KE3jqO^1@X2i6ENQvoxUkovJ#`Yw5xG)HN}o;{DEEEg%38I)=^@ve z5?+&c`wU(BMBUyl-j)+p>TqrCwlixTr}|jB*R#%hbKrpY&4RaAY*hC8ScqD0o$Ix@ zd$Pl_?se<_2)Qp}kg}_td1dYs?JK%iPS{wmpV{M^@r@ zL4l!F%7sO8t<@3MYOkiQ>g>oYe44RzZ};NZt)?^MUzu*Z;$qb_IlNSTi?8Zhk4pcA znOe+i5?yCMvI$>uYX-*z&4q~zH`=@qT&7agzxf_GZtze7WB*VeEG ztXI9_5q^5z?AKfKCy7hG`zc!bO|R!ecgFIRt%tYt7G23+ceSR6@4|r|>7^5mX7i-8 z#I9;j+3FVXl6}UK_P4egMU9E-hI}>-rw{st7rs33&MZx3OQ^E!sfsyWMWUPAHuUmE zcQc6HzAO9O^nPZNzg5(s8K0Bh-2M@6y(VM!nzxU5?oRz4n69I-3 zMStDU-o4FTRE0S*swq^%!*SVl1?ELDi*IEo-P^YGN>5l%M>M};Ma0UhmdkyvYWM0k zt=V$1Skv#?>#5%bo*Vw+=9Tp8>hEyd(d^fA(_{PP!>I|pO>gCNMGeJsuWFXxyuB(| zX!7l4Q=d5dOpsR&;ufabwm6H3{aw4fq_k$bc&Wy-gx5Jg;QLkCZe212=~q&15RBxI7_Lf7QJm(%U7GzB9 z7t(6^9)~Pgc&Fytzt}3hrF`PeV?Cd0LtmMe&F){(vSW(AJ>TvLN0#i`cn#{_p#kH8hnzaBEL7Oi62@?&Xe z{BJ?Gb`$-}iYvu_KACJPGgWViLGT^t-`?f3-WI`_tXWw3w`ue3o0+&d+HK1{qNgn zeq!O~}QfujoB^J7zZec%yZ+&oKpBJDR@X}OkY3p-4Ep?W|;{WoxWM*o# zy?Q(2is~W>&xfn{lc&8p)+)|AUHqNyojETaEX&A^qu3w&IqFigoX0E$~^&l_H_hb7cTn{R2e5ba>);(v%g3?wAn_nFhJHI6w ziXAyE!X~NBH$^sdaqo53Zw+KJ}WtTXkt!&#R_{B}eD=3(t}2e}444dh5Ke z4O22cwFGRF2!6Ei)ag&R%6g~F%Q%sAM&J(T+PjWB&aP0^;#u13scU&iQ+uCYf%?(K z_a^QN4ly@dljpML$8(jgbKdf*8!xv!P;>dNe>_2C>$OucK?T=KR-Sofqj(@v_Qa_( zr$f(nE3RspC$vMvRAhrw^NPR-`L>Cdxq@?i1Pf*!PqyqztlTJ}dQgMA<7kAC`H9Ym z$t{8$#|jmndY{nXV9SV`CZX)QV^v<*o;CdD`dRa@d#49QB)GR%YS^8}=CxpejanJdX;33*FWz(|az#vY^O@WF}xf?gV&=+`pCc{_C zEW)|@%dwVutE87-({#5iV={M1KVq;}`B|%}^#U%wC7%l=B~??y+*cYcoN2geXTR#v zjV=dgim2QjD!w3uCY+R<;!uaV@8oz(#NJB zsg4)IR+v2VQChY|A#bYigXdce+KLvGZe=OA>HM^okI_L75nHBK@hreveX>)MnV5wT*qZ1Z#E@Qe$ajQDd&B)%+o-a&^8G#{-*8G?v zcKQR8lfGuiBq{SlQ|Fe3PBUBY-PYU^u(8rFs$%2Kg>yUIRo1P1DA#%-<%RoQ|K3+U zEKveiQ(Hp()?_N3nyP=mtbMU&l>5(~9alTrj5i-^F-Te2P|-E%?T!G?(<`PODHOR= zGKEX?QJ(zNlPgwmCrMAc7c`|yJ;Y|>3Z2JnwI^o8S^w<-6m(5t3Mar&U-*{xhGKWou2cG*bC^%8Q=;NM*m}xs7 ztqE&s^zK@yz46+jE)T9Y(a?+4jybvlJl3Uiy0yX%?p2Xl!@WFV$Nu!S??flQ6`Hzi zi|uTkKSf(gS(GC8HhH_TKbZ7`srS{~DO>tF_DnvI_`}a?nW<{sksv9p>5B`@xK8YH z|GY`@Ut0K7Np-b*%NBGk)n?kRcfh3pzg-OK4olWH|K4_G zZMWZjv31v4r-!$E>Y1YF{W{;{nLCbO{vy-K!vam&r~JmuqiGq$Rib=Hxus_A=~J&rUJ6MNhg92>$SsKVLT`UHZ)N?@Q+hm`+XV5M%M} zG|+q|F+*Xky07agy{&GoQ)IW#iP$K#OlL_=a%uV13!juMoDQ7ROJ9_+SgAd>{nEci zzpGOY&K0#3Qp@@FJe+H-&f?H3acOR9iB`L^w|j+r+G)kHsQ1^JvX2MDraG;dQtTV` zwrz=5u!jAG#2d5TPI;lKxNP~fo#(k@oL(&}nLBfnNS@b~cb=K1QeMwfYCKD;=FOXQ zVN%boVx_KXn^#UYCp=VHz2C{TE}hhU>RI=#;HKFvd& z;RbFM=1ZNs6~FE&F?ne4Bv0zKs>7`XGq2ox@G0s15|wMx+z;}?Uc356y-;m*R>|RF z@A6VOcGX=~IV5P2kf-JQTbZ}{%H^MyOqutn)$QRr`OvwOgj(*Mex%ve<@3JWMtSx! z^{%T@o4Qj|wbpZp3jOlC#Ix4#md?~A0UPhl6}8>3^2NO-y z-Vt9CGUbx%!c8hdQ(I5%`LIW)cFwfK8bzthoVMi;_G#A22=8dyA}4%m>xy``L-S)R z(zeKKf4Fba_f*MSivl(lc9>MgpZu71#pUv?2}%>ygpdA^e0cL&z4D`P!GWjB9&v9e zl-yxgRmSw4H7{m*ScF%6%4WfL%RbEMc$BvIi%$5qbMxG8P5m(A%31IHvQ7Im{fyLX z^f_X@p6pfJd@w`g+`Q|{j+Fj>@Qn4`GRE~Tzn_|RYVOrp`}ojG-v~X9r*jVYc066f zd1q5kN!Wup@!UC+txk4-{gZ90zx-{Tz`I=$5n->UwH=d=XbJoNO?y$7X z*~HHJ#yHilWxYjQ*t0#hE8RD|VY;o$U3PiXoHqTJ0_&c)2Hs5Aua&ei_e1inxKoqv zNN#E2(?~o0d)1dj^Kag_c$Fkl4{oSB>FO_)bHdkk=A4PLzpkh7&s<+T<7$h3Z3;`C z&zXyPw^Uj6*5BQ!b9s5=W;a{iwfdY-J>UAIZJpeGsXFjn`jst<%QmLB{{9`}zWIJ_ zTm)A3JWS^OE&X zNAz_nPg5-NdDlI~bK!G2KFNPNd-tW}xNeuKYV^o_`8D^{t-lMG6qE+8xMAWD_%T(Y zQZ;=AOVZ@ik1m&OSJz$|Y^1NDX?w9&#`fy%NW+UkCR1)@n5k!ID%vw|zZ-nPZc%#6 z$);u7k901JWnDJ6=a7(u)4jO0o1bhx)-Q7YyW@1Fp4Ch3IM!VimDv62ezotZGbU4* zm#$WQ*wFC)bkv=gFGfMPe9PaTsGW1En4$k^?M>4i>FZa1?OnC?(UvFr-z2Vfe_Po0 zJY`G&zN^*8e9X$<&TA5Xt1NoiUFlZ))MTDFcFfP&%WEb3dwv|66R?rn`gG=M7Ev9UCvJ^1qa4E8W&bxF?nJLra=XGzRG@Cs_ zcAmeM^2@_hUj695H;OSrZ|+?ZI`7lSxKo}()0*L1ifVGiZsobw)fJl!m!u_esJPUB zyOi-Tfr&eispxm`a*N=J0xLs}q)oZISM&63N|P1YqtO`r$T&T<$7Z>=u%iN-uj!oP zo(nD6Q)l^c6$Gl(dp3w>&+D+#>zgcYyI*DJDNRPtV+}nW7p8UXzMHmXqt@irx1Ua$ zY-}MBc`(3xQ!*dBTjEKLHlb`+gJ&#<&oMe)x%oEJJF@?x(EZ*`)w4S_qP#+q_;)N{ za_(Nw<{fn+;V-jdH=A{2PmVmvAQQ9Hs(Ov>!kc@~8k@NUZ#WzzDQ>ASi}A+G;71p1 zXV2_+U%5i`Z_kE_9f}N23X-Y;B21eNS>7CdJY~UIu8T!ens2U9`te24=-J~(&%Z?& zs=wN@vN$ToMmgiMQN2$`r(f2|{N204OOp@9M;RCend?gVyBMl1p7Pf4OAmwpNrS%b zyZ&9h=QBUC?T}&Kqv)6Py?xnHE72IoHziS%u2^PDh&~X#IE&Y&(!eq5=G0r?E!7l0 zD<$~Z_{*M=6`#;r>nJ3Y_vYWMpygdH>MSXqU#7oZE_AV0e$J)So1R%3t$KcR`DUft zts3E{lV(J2eDih15Al)*_Z&XoJ~E4!=l5)m#rKPUoOx7yEz`dJ{MH#|^79)n&pVLL zIN!47oW)!54?m5rv-3c^Y| z&sYCA^T7CM%@hf}(|>>enfF-zq39KBjUT6f%uCxB^GEp4mzn%c{u}>jK0ACM*#7tr z+lL2)?|T23mr@r~aq0DrRqRXGi?*FE-rYDmxsp?lGrwBSt2SHkK{EfH`P;8*8*V$p zH9MW@_{Yc)mO9pn?hl@cx?N+jTYV~W<(CQhe^$?${NbX2jF1EO#K8MT8M&fAc3x2T ziF){#fm1X#H$aqUwc7EGvGu3Rd<9$nMQhqJSiZ};_;S+%o~djOm$&c#EwD6D`sqOr z!;P17LS42jS>q~fJ4;5cCjRC@-<)54mp*t)TueTua_Bru^wf{n66EWCwSH+AoSU+U zwf%-+`;7msh8vt8@MPyP{884KKY8PYvynCXdSo{~i~qa0e*g2kKO{IL9>{0OiABa= zUmtVpTbt&_Gaq{&9sL=hDtFbX=4kW7WTzh=4A%KY$ECH3^9S}Euw!#wppzi{R%_mD z$KOBX9`$J!-BNmZ)xPepeTHJYhi&(lxROP=4>gy_zWLk#?@jgZZ}aSu^qsBGTPNv! zcv3E6`geIzcDx&7-SO^!L1$hr&;7k1@m5NmSfx>wkiX58dRL2H*|vJ)VvUy>D}VjE z{om;!tJmJ=oX4UA_k>R^4O^@w;q`F^ugHq|&l&bU$j~Vjas2~EYw58tKJRa`?StF%LNYg+J(Tj-NfY}zKc;{G zo0ZEFxhmA0?Lv-N%v@%1^^1#Gc2s~+6x)mnH~r1542UL z_cE{l_htV-@AtufE|$bQc}qy?>}v@7lRfYG+QZrZdw-rewE5T1Zr_*sr9Y?d`lA$7 z^~&;WOa11^>ET<|WF@7h?Qi5&pX2d*rKsDJ=hCYVw%{l_VmF^65`U$-WH z{2#E|JL>&QPQ?YR9H#T%WPb}?CvhPE@ok-dbxT_R9IK1930(T`qSxmKd&*z8|9)}v z=TD!In%3_vejB=c7tIPPejJmM_vd84{X)&cf5+VC|C_1ZlBmmBy7k`Wb2*S-A@gtyhnT;|GB^nNb( zy8XfXpOs|~OE zd=v@x`FyU<-gWU6p6%y99y=tIU&y*<63_gNB0qWB`kdTCLY6Wzvd(|{_HX9BEoQmP zE#|V`+oNIR)A(|3=(dE1HP2=~ICbW?%I9~DmcN-EUQFLpC}&md_Qd$UagK&}PI22m zp8f1T_9rX0C>kEx^|8{`Zx;Qt=L>!>nxiN#-bT_&Su`CFT7 zdPeb$H`eB=N5?<-rgFUTVA<>X1DpDa;-9SltaE=?u>ZEYrp!ExuPN-CYrj4hwbQUy zlhfb)b{^~Ai$!z3Ze>f;j(t3zRaR1bhJLa$yZPs=gz6ugg6mIKs^4ADba!q4zUedPpWXLMGgZB$GW_~v zKK&*;1{u}>!^D=~dyf?Vwz$6k(2pniBJy$1>Rxb9=T11kN8c!B=Ii1+=T+Y=U-M<@ zar@JIzHXms&D41K_?8=@C-yd!@bnyiY;x4@(IItN*}hd4!mY;NxzE(LdD|@WJ~MxL z%Ed1}KK|APY3~$fONh&}sdjftKAFCJM%{sLB|Z1Qo?JWms>%eG)Z}6<>EC`%XA`ux zFU&a;toOU*!LO#~#49qIvrnF#XZ!M`@u@ZIxUcML)HhM_@tU_~w|jwrLsZD>(3E?d z-`tW6E1hU*aZXRt#jGv&=F;g2HO8tvg)0<;HNISwF8*NS{z>HX#s2ah=dPWnf*7i= zrcPQedf0sC@ikoGR#znE$jsiw{_Bv-yi$Wh4_E6%U90WgAd@Z=QFM2YQ9bYM=NDxX zW9P9J8|+@V?9v?O-6!-m9x4%*5vskWyz@zB+5D?^Gp0Q9Zf`KwIegS^hDm!ylVR{p z)pQ@V8GH|etR8=telaob>z9Jg<2@zL?`*}hmwH~6mQIwPTfc1Xi}=Tzk`Hudw6O1r zE!d@cF+Fi|XzrO$!c%SBcOPHn&t`r7^M>ZwRgwfXLA%k9!&Xp<+fvU)|ZbmH-4w7O*b>=%UEal{hp24mMIc5 z+L+C%n)dRT{Xf4knQ4Y8&%qbpr$;g|Y~H#4@wVf9J5T+pnK<{_kwRN@7x6tGFG+r{ zYFui(`HX};`U8!Rhxct-c7f;A{XG{4@ zA_wxTiV}UeTR*&7cj=zlZ|~w|9F8%mw0r+~ zZ&N(o+caQqdC1=vyVsO#Eq|f$bK>TV=zHy()n#psu0F5STIx|O^KU2L`TKp`=k44A zZ`)aDUCDbV`DXD$VZY;%FK4XVqIclzG&e5|Wv>^SeqTSIy8i!d|Btkcf{uoit7&;3 z@|teSF0wp&&zN`KnM4Gm?OC_cs{_@kk%hj{UX?AIqhi2|O2Z(eYHd*!!@ zOx}e~OD=fE9yrhPJ9yes^&h3rdY@gLoN&Fya+&QZ%YeT2qXz`$+RRwm)mD9O=I@pE zUYEoV-c!{7aQT91b;y*GbH=uZW;4#cGe5OT*h_71dT`OCua76aXuj2Mb>3*^>f>sk z7nYr3%bYv^@i&GyMqMwahcd0ZeO6-D-}y>6Y-Nnjf3&OEJU@bE^D+}|^}TBQjwGjC zTczwbZDQerYYzG{XLenCv)9j{e{t5F`9DokwprGQl~36%^IUKJoBK}#7w@{c)!6@4 z-kpgb8s5zdaoW7hEH+J6%;$PI-v1=^1@}+RUWe~izKg=&3etXCVKia%j1OtZP}RF?0aMex zFZzTAGm8f|s*0^Ah5fpmP#*8KfO+@Eo5>5zYtAaIWcbDxDEB38 z&&e6jcj%oqu)ERR$+KO2$K4Nel4owd6PFZS-K)%W(*E?WGX;MoUO3pFwpvnHH*@}D zpW|2dAE}sp<}v5A(|7)|8L)FyIT={neV@C_aN6%U`Cg^#FI(r|tC`DG?6H}%{9xV( z-%W2XKfEHlysqo3SJfZZj&~b-<&-inUGtaOd$ry65`UdTU;4MR8NdE;-N%tz zr4OJ6+a5-t=hcVqGdVD zjXmckD@uI(>Gs9AFGT)qWZ62F_P&-T>0O=n7BV88`%XMia9@_TZTXbn65T#8KO7O} z$@bZLPr=_(cInM+%XUmod_2kOh}hYG0^i>B|5~hB`Y9u8_V1d5p3e^d_;LBo?;}1& z8y7#D*E2iN`dE~W>cqqM6n<}W@t*(xkJ$ySJI3by{G4XD*`Ix!&pbEH!DfEtD}f>Z->xw0|5vr(Rp(`6zjub~iz1Ak?Q@j*)4=|(UVfqR0&{mU zi;5S`O$#@zzWc_$y}4}jVy<6G7PF@HQtv!`@g%*4q%nJ0ZdoO;}O z3dbJD_2JjlXTH3$`Rt)2^*_!xTJzr?Qdt~!*Q|5C)rC3yWtT=a2JKu3ur^{d8}Cpo{TuiP_dI{1)8@44-p{UH_NN zCV1uj{UfjTOucDl^H{L+;(24$^t=ga7A`NPbNt^JXCL;P@<)Gz*q2}TW2zTVDNu-% zkhuD_QP}bO{s${+*p&D!*ZlVR`k~G0!Q83Lao?ohA2YYlz4M}G{X)Lv`nfTR2fys` zx9>fA@yxx7r|bW@+a2&-k-zYqMf&kyhg2A!FL=NFeel8^KFUeCa_@~(E6pdQ>=YG0 zm%QqX}GPB{~vj3MW^A9Y$6Z~wuspf3i zXo0!1>W0?S?)4VMWW8G+Wv!RY8Mj|3S^QD@-pu2y88h1XkFQxgZASm$HdAHi`$s>; z7bm~cKP-E28{}*rax3B%{U;n+W>few2|5~=cd7sYwdxP=cxebhJW&2-m z`aLo2dh_>({I)4SkJmeIy!HLhnFuv8wu)cV9&(nxoF4c8gT^Wtk%BjeKgM}lf6Rq z?-xP2O<^5V6JPL2b(T$a)&BS|F382UroVkc!Hjp>&P$pj9@VaUcF*JT%X?b<9s3rp z3txWpaFD&yYioa7gI|43r?>z7kkVJH*!F$#1o>B!{8ts$W;glG48Ng$HeLUB!5^P3 zf4}4{=>OBeAHn-yQ?AkI#clSV=?gzD=DPU5^{>Mcv-I=RfBZ0K{dV}Ykc)nrdxo4y zZFyf+fN4nHSryk4r5EBGBp+|{IkqhEV4~B52Ro<#JU`(~tls9yY5PpiT1}o=zoIfJ zV-8Qnyq?#6d0_!}bY!h&_Pi9I(|2rVv&fCt7MD+L?5kQNae%G<;yUIf3*F|w6G<}3 zx|2ModHK(t;}=d@{0QcI!*k<&%as)$&Az(uyxC&x6?sf?hNr>&FE8va^CZUFWjr$387KU=@MVeO`W$LB|jf8b9&$=UID=hwp;nxQc}Y#;x9wYL16>VJ777Y1Jd DnJ`}E literal 10885 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 Gv>O0UAZbbf diff --git a/core/src/mindustry/ai/types/BuilderAI.java b/core/src/mindustry/ai/types/BuilderAI.java index a3c3d9070b..ce8b5ae92d 100644 --- a/core/src/mindustry/ai/types/BuilderAI.java +++ b/core/src/mindustry/ai/types/BuilderAI.java @@ -130,6 +130,6 @@ public class BuilderAI extends AIController{ @Override public boolean shouldShoot(){ - return !((Builderc)unit).isBuilding(); + return !unit.isBuilding(); } } diff --git a/core/src/mindustry/ai/types/FlyingAI.java b/core/src/mindustry/ai/types/FlyingAI.java index bf7367731d..6c2507ca5a 100644 --- a/core/src/mindustry/ai/types/FlyingAI.java +++ b/core/src/mindustry/ai/types/FlyingAI.java @@ -12,7 +12,7 @@ public class FlyingAI extends AIController{ @Override public void updateMovement(){ if(target != null && unit.hasWeapons() && command() == UnitCommand.attack){ - if(unit.type.weapons.first().rotate){ + if(unit.type.circleTarget){ moveTo(target, unit.range() * 0.8f); unit.lookAt(target); }else{ diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index d371f63202..d1a771621e 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -918,6 +918,7 @@ public class UnitTypes implements ContentList{ range = 140f; targetAir = false; commandLimit = 4; + circleTarget = true; weapons.add(new Weapon(){{ y = 0f; @@ -950,6 +951,7 @@ public class UnitTypes implements ContentList{ armor = 3f; targetFlag = BlockFlag.factory; commandLimit = 5; + circleTarget = true; weapons.add(new Weapon(){{ minShootVelocity = 0.75f; diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java index 8eeb50200e..00d4096e78 100644 --- a/core/src/mindustry/core/Control.java +++ b/core/src/mindustry/core/Control.java @@ -335,8 +335,6 @@ public class Control implements ApplicationListener, Loadable{ state.wave = 1; //set up default wave time state.wavetime = state.rules.waveSpacing * 2f; - //slightly increase wave spacing as a handicap - state.rules.waveSpacing += 60f * 10; //reset captured state sector.info.wasCaptured = false; //re-enable waves diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index fc32ec7bbc..3b42f7b61a 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -46,7 +46,7 @@ public class UnitType extends UnlockableContent{ public float health = 200f, range = -1, armor = 0f, maxRange = -1f; public float crashDamageMultiplier = 1f; public boolean targetAir = true, targetGround = true; - public boolean faceTarget = true, rotateShooting = true, isCounted = true, lowAltitude = false; + public boolean faceTarget = true, rotateShooting = true, isCounted = true, lowAltitude = false, circleTarget = true; public boolean canBoost = false; public boolean destructibleWreck = true; public float groundLayer = Layer.groundUnit;