From 521d44714d7ecd9e541f94099be6f0dde7bf8361 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 17 Oct 2020 19:49:13 -0400 Subject: [PATCH] Disabled spawnpoints during ongoing attack maps --- core/assets/maps/fungalPass.msav | Bin 10519 -> 10637 bytes core/src/mindustry/ai/WaveSpawner.java | 8 +++++--- core/src/mindustry/core/GameState.java | 4 ++++ .../src/mindustry/entities/comp/UnitComp.java | 2 +- .../mindustry/graphics/OverlayRenderer.java | 2 +- core/src/mindustry/maps/SectorDamage.java | 3 ++- 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/core/assets/maps/fungalPass.msav b/core/assets/maps/fungalPass.msav index c154c2e4db35245649d325f401d00a1d8500895e..1e3a26f520c2255501f3e85b877bcffc4471d9a3 100644 GIT binary patch literal 10637 zcmb=JbG0_JXO4T>jo)|K^yb!o7Mb&+)PcTPI5FYe?W#acE$PU@zFi`M|e

5(Hueu}lkB)4Z`$qJL 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 JoUp@C9so^=`@8@E literal 10519 zcmb=JbG0V3XO4T>jo*Fy)>~HdO)`G+K_;thPV*9tt|cn3isr-yExMMSzLo33oOhDj zu3o--n|N zSiylw!cXAo-c{l2U%mcU#rNt!8^h15;a~5qF2BBd)%u@L&EtM(F|;royq>^y>8)Gp z`tbW}8@IE)JU-Rk^y{Rk{Y9y{Z!bxy?79)!dg#~H?C^Q}cJ15v^USShr5v+GSx)7B zpKU$$SoYLB@u2=!TaUjD6Xz0NmzNh46&<<1@5Si}S=+Wn&5aTlx;@oxJKIUG{oglS zb>tJe8@Kd2>;Jvq6}LubYIh0ihriw%_WViqk&v~wSDTkF*l{)Mo7Gyk#bJL>#qDk@ z{w~dX;@y>5x4*irzvd{EzmK(({cqJ`u79trT6VA1Dz{q~Ud^u*~Mlja$3v_TG>8e)WF87k_id$2i$cv)6lXaqr%}R(h}B{%`+&YcH9+ zt}1fnm#V32x9`8R>e`oT`Na1Z_T+EL-ui0#@7}n*cUN4uGB*p$I(zHgy>5-2Qv2gq zUi*Dl`t|i|B0J4*P1O~7du;30ty`z&?f$gm=H8Fbs%@vdbK8CO#$r9wy3(b)Lo)-i zAO97#ja&QX%@wOl`|C1;|L#mWR<0erbt?PTxmA}BPP^!}KDe^Ieg4EuGhIvO9amS{ zvnTWB%?RNa z`xm|4xIO6hy>+=?^J41%ubt|)Iw<#R^$G)%EAM*OhVAa{G18u$oo&%5m2pMu>Wp`H zqt@eLl`E^;&^59JSBh#$ET>C9B>Fj~%_L!~L?!LNmdvDe1PPsWtZ>%gm(Vk&) zb*`JaJf^VnXY+&`jXh`hGL0o$?s{$JdKk9)QbWo5d#g=e|BdwsoDrbh z7#w!XWAD8c$r>vnck@iiw_j6|z54c4_PM{rp6vR2&M$ZCrHn1#6fWm3{=Rlwbf|`% zLeJH;*Yc!~u1Y%dzEsO1@NBcZQ^3md0=^+giCDPR|loU%XTzlo7B++sUNrNB-uo5>3CtcscW~hF#4LS}7i^ zIPsOz>=ebje4<}X8efVjy`0$d@^ISL`%~iP#LnuS=Uuop*1b$*US8X)`zhZOm;YbD zz4Z8#($#zY)^3YZU4G^kpGF2(bZ=ew%e}uhTsq*gUaqRIDQmr5##iakmJ`}{XPNu# zjZJjkTKwc=@71?%+>`$;`MfD=?SiPx%tCAPMeAo@yuNyZ`q}l{w9iH{8}I$SO|bHI z&z{)MJ+3Qbn%7hXe|A_ETm6AyIvdXsDXks%95Sakm53}~xmI~*l$FtCDTa-ouT0`N zx6-`t(IU?8SIyS7EfJ5>{jv1O#=W=huDv*kEqPh;>dW_6DLV`7i_JGlymf3JSNb8h zy+u+LF^6qh0~ZN3T+qrZ{T6k*w{GvQ=z8}1#a7ZUrZ4hj{WC9RiO=?H>mG0juD`bX z#f`18Da;#h9u>KNvuuB(@wNL$8-+3xN>{gKm)7pyAKVYgX34!s*kSWJhS_&VKF`F|+KWGC-Kd;?&pjM zRsVCB_A~kCB|KP~yQ8d1Zc?1u+`hTL_|`Sg*mc>K$4|5dN9FREeQ4O%Gs)29m2Y!xR`&k-rH*iGtFN|xUJdtdw1@M z(x@3fzJKAi@>sh$yDi9L>82>YWU-J_LW@;Aw>9VSp_WGlA zOEc=NLGEIiud{Nu%Ox|IY@Fnhx#XGoSevxgByZpu*ofW z{$R=K2%+K~z0#a_*VR2|+|_tFblsz(kk<((t|>2Q^~*nAdA2m#V!GdSgLiu*_{{~c ztqk1~eyx1tl-DPJ&q(GywUU?TY1-QT-JR*()*&7Z^_ z*cM`X- zfwvDD94kuL?O!dgBYT^7mBqJhQmeka*kg`EceCQ_ZIK+?Hhfn zr$-%p9Mzwaxgxe`Q}jX8tzBPdM9tql!}6nUrzihs^DynSxfjl^ZPPQCzm^@b{o%96 zj90TXw?;h3_F`2qD>(V0#NcnpkKbz0VshxLO+W1p^ z=@BXZ*I&5YB={!s1!XYCu5Oq0VcxawSk=DGr$g6dr7N&U%67ybHj0>jXT8abA4>c0 zW-8XN*9h1>U8CgJ*R<95YacJP`Xljrl}hkmqg?HcS9|BoO*yIJ@z0QJrepVBr!dD$ zJ8tJ(lq%W3uh(&zQTWo&O4Dk4Z&|Z`P<-)i_LO9+6|ck&Y&U;k{y=}BPrLPYMy3cR z3-`69Su6MHY&E(vtNYO0<=1X$>}ZHe6gjs%Y+h7k)>*fQdO@$J^|UoT4CXe`ORBiy z6?orhYu@QST*{KI-of`k5cOSeiePd{8A7hYzq{W&f5-sHfZJqbUW1iRja-j}>M>ySoPB`@37 zcdIPZT2=?FIP!4W;vJd?&$=7-9Zi_feJ?eC7w>nQwVuf@xeY<$+<6*1&cE#r6zEx! zaHr>2z`dS*=dQW;e9`D}?KEn2JlEB>Da`cN0?qfD-1h|TOny|FxpCDaeFL#Q%PaQj zeTx<8nNsns>42?nWP;a=n-Lyee&Vit-G;gwS3T-gYu~T7c=MI=rl@?kTHju+%H=D* zmP*>HPW&|Oi*DfkA1n4vs(60ht1L#~lR^HS|OLZ2D z#lj&oD|fD{G<2D|;xg0pC5<*^83Ic$e+`s~T&s5Um!Z1u zYdsIMWoOK|x8p)^t+0vJTaDv-XWCw@u~^1?WX^^(-c=7A)aDDE*3dMzdOn5o?2QxG zOs0uE7h+BKnm$Ef#+5ul$Iq&U^R8qZd#1`8{>)^#%_0?vOwSVvadSl9{%Q&n3itC$ zi=DFL4EHUrt;gmbJ-9_obx>>F5wA}lTo*ldQdJex@tUBqW2T0v z(b2t(TEQ3BY|^MpcsW-tq;Fx;+EB6V#=fZ6s&3m<1J^8nsr#~i3+wb&=I+GjUl&Up zUu%?nekrJD=yZM;1xY}>qCyIE1^IM(^rK9|*xyCk>pl;hjC z`)*{!8t8G<&%3typhvgb)STH(j#5ElSL9}QGVV-B`Y$J5)Rv*~X4SQ}CI5@1$~(1E zk{c$?DAUz)QtC?7v{%*>n0V(;|5XG~gGqPRy;cJ8E$E+KQv zrsR~EYc5uun9OC7e9!l2kD4majB4jpWv=w*h;4GSru%Y=@80Nb-O2M%i4jA3zqQUB^|j%t_X3(M_}(?$xRlrP_Rw~f;)=xuS6}p;5aak>$UT3md0&^U zha&R|t4DeqPg^3?N_H4cQEy3~X1;0Z*3BzR=9<@5@kLABxUt=|!#8i6k(b2m>_i2x zeGGH_-}8NtajD$4vN9?D)V>ufC7ez4GrU?f3y)t|614Z3W>8tUiQ1AicQ-vc>NR82 z1g@UzcY~Kb{hQU&5UYL8?cy;PzTK%ydVk*yka;)f#KYH})9x%fA--i(#Oei$&qN$E z7rwhWU1XJCj4azlzgoZcA0Jk%VhAbSp|<#&Pe7>TmOZaca_*KzeR%$b%V89iz9DpgsPSzgzU^c<^o{Bz29-)cj(rK$dV9JVan z^GRpC1+V+$Q!M^*UR<%LhYRQR<1cVLy-(wiHk799Vbayi}nYU79L=6)6WD}%cgzi#m{d1>%u-tAXaHmMg% zPFm{i*yC)h+Sz-|X2;KauJu%hifog?{B7nh_?RJI%{!#f=x| zI_Bkb?KQkORekLj15u8ahP|^s9&InO3geZY7UE`eTu%1JtwVYL-@e+eInQ_I>ve0~ z%Y~0kEV*(^dwR^2d9OBa-CnvR*(o(@$9eD73TwTco^J675!2#6^m)^nLbo$Nd`vFi z;PO9M>-@|@t-x2(R&C1bi#vE)?RWS3WLxGPu62FCZpJo+kQ_NB-+SRjd!$M)PAOaB zvCPxmu+FVw+t+x{Lv>bOH}z^3mgzB@JDk^h(0IW2#Wmh(Mgli;+IB13{0_Y1GiBb> zQ{QfKJNo}Rwlv={ZFBcmS$9>vgg2Fom&?AwL#*qzg~BX3;X@o;12J{4Lx7x z%JHWA&6{MDpwIB>k%!ogDv1}uuQ|?}F){UqrKvV)T$DR_vwFj(o?8t8EbCq#PAG23 z4V^CVnMEr6Zp)0{Q#d_E;;saoF4}%ry__xC>vPf$E9LEOj$i&|L=~q#@Z;RuBD1yG zqr}(3Vxeea+GDAcbK2qrcU0~a-<1AK#yC~4WxYjU*t1=>3w0yP8sAQ2ZO@F-y_MGv>6$i*CHq`PJ~PeyZj>o>}XKyDaDK(<;7U{9_ScGlyHG!J4>D7rhy07flXS zOMhzcm(`N#nZDMUJf#Vimzd1;-mU1nmSY()t@w8IrC9g$)6A7?M2JK;}^z?SQaG9)jCD)`(o zZZLG*t-fq)c{!Iw&o@I&<=e3*3%2!bExw^!uE02ZvQEDK&$n|AM@(rbH(k%C0kWqH%+=EeE0ap;LUS|#dY0+ zSDsD#+%!$()8>S7hr=%Cxh7Zo=67=Y?&kKf6m3;CXxj64*V#$uXIKQ;+-JYrWw37B zFNGap;R%1TKD;qi)V}P&H)Wk4H#IhHC%WN1x5J4gRpGSS9({hsDJamd6gxGcKqt&=;s) zqAK>Rwd?MUNWaH^!IutvJ#AavHDek_Xw|m%&&=OHUW>mH7JtrB=9J_@883+zrJb># z-GaiFOD(+kc|qCQDTykp?@ZVK{_f`L?OQUE9|-9&e#^=13}1Gk;SPW66w`*ikrU7V zd3Wl`Imvr5JS%TXFztJBzHa+W`xyt4rZm(vtn{Aq(xdB&*39l*tw%%o+(S3}am7tJ zFzLt{%Z(GC`(zq%99gik@pGT>tdg}}mo*vnI-Z!bMr?f6xk6aT!t&y0-<6@$SX2a= zgM=39ihkd5HX}JyEWG@b>hiP#1EZ#e+ft6p@bw%L3gl6})|GIEyDgUaP{xMax2J8| zc2TJQn8}AycZsBmReP>wOx60?^$g# z7w-*+gJud?Dnv2fcpCia!s~5D^E-k9t$#%(9`09Ua8eLd4G>@|He`9TeZQyUY~e*u zHQ0*-T|c~aKJrXh==rxOL+w{vmKJ-}*yv^$Z>sa@>h{Y#nZJ8ica(E}1J! zeP1jQ9C+%RR8?5R@}oV%kG=;#di;6T9!9<64EbIYZhT%S`O%Mcy14z^iAtq$Y{ytC zT(_hN`}6rs3aeXsuC|Z!L=(r1sV9QPi;uIW6vhk0U+T4u4}KLg^FvF+9I?NtY%5(# z>=~AS*|eszFXC&{krKC*-4ai;B4vz~=k1jf{lCcXPWFqs**7+~W!4KPeyJ9lFIjWW z^6~SJJH?FU9vGJ#tF3wVapuwIYmDmz=WpL(pJE|D|G)=1yWk%&$DZdd^DppBx9L64 zeXgSEr>4c@>hgdO(m&=U?Th&%{D)@- zf0O^FKc3GHAGmCD{Kwt$2c7RyYy1uD^=w|2I(==vbe-$)(~3I>&TihrGQDAagR-Iqk%! z5cRp5pHIb}M)_Jo)zK*Sx$4zi<(xS@t8;0!>A6l(%oK!zhS^WQ@J^K&q8+Q8JE*zGu zxp$~D;`90cFYE7op7)!9L*hYxww&LleI{o(RHs><4!pKQVD*v3RUQi}3~GG11iht+h{`udl3p%g3H+}A$+5bf@ z@tyy-y#C|f+H`-}!f6vHKbJ8StK_uln)R=E=U)BA4F6Ab|64l8*yHv&$FyDN{>*uz z`qERWFvK86VrD|p*$?Z}`Bmq(i(c}sU-_JSYE?J~+ke%2t4~>H$GNa7Ys!^22z|Xg zXMwnEuWG;2i}`;a=D$w#I%_Oc5VA2)(}IyX%Hjk|p_@EUq`+o|rz=)GohOqb^K}0) z?$$`rX7%f*^((V7rZ~*+r?IJj((}He7z&BioMb^&xm(xA_y48~GAq?*Rz#ot_~^Y>m)swQ_~(Dc@3a0m@x=U3@pJjt zZXdf@w?`R>N@Oxm;g`Gk|KIC;&Htw@f@_}ecK>f#EPte@Y1KR4&&#jqJze4R|5dix zOqt0kLMyKRwo+Re{bPFOoFcX8M<<1T|2lo=L}vX2)d|KPFJCbnop`it%M^(yy?^I- zE6d((fB*16Q}EG4pY8v>|9|K=%m0jB=7AQstg;!;E>l~+;cQd+im%!tZBAZ=CN)_J z76B854t@Wa%lE%d_`zz9Z936<@r|id3p7JLWZO^7U;pm-*@sr`t!Mi${eG_XJze9B z=(=qG4F=16Jhfh*cVF{=v3%Y1o_!zgnA`v4PH?}IQnS}t@hboCxBdT)+pEk<|9K$s zuYiVq-M`l@MSYIbW%alh2mCv^nk{vbBj?jCEI$lR`I{~0O}>0aVBwrlbx!4ge^00M z9W>=BjjhREk^x&|t)n1L24C>7dP3J%K)wF$|nU>S}S-7A! zC}D=pW$WcN2M@8HF+MnT=6B6!cbSVbSPvy1s1VMvD&8S%aDVd~jpa9=^ZbphGIe~AbYD_eZR%BSAlDbh3_-`O3*)Ruw|u=^}gb!<3($@`)gOc z`LUq$iOp*j)@KZUpC8^TpZNFefqBI>3J1>z>x9pHZo|LeSA($cgPw}|($|1h4mI#wLGM{h&TYd`y+zc`oeeEDUv{2AUa@c};;JepB)C*i&= z`z|@_bHAdPH~+r+0<-ARorf;intCW^8 zZvVaT@bR7>q9+>bwAhX%Tl*IG?D)Xx-kz*=-sRz$qYXPdcAPP@J^QE9OU(EDlP^=4 z)35P;>g4Q94A?Ydj$`4@BVU}qEl>Wljz4r$pWrU)59+B)(+d%CACY)(q^7OI)@_xjwT!yl`$>sQ8TL$1;-^2HWmp zkJGcA|MBc3gL5m}VifHi^6wn{EOT=5nd1ug4E;2p@oDjY>&xnzE_&E}=kYmS;Z|2A z=IHF+#r~^L`M8xv;V-T3XOU{c~f0$AG&KlOwa~5yj*rd{{aR1?cXOn(I-Qu|qthe-Ue$1BhV@|=}%&(8m z%_{W~YFPOxb6ayy)|ZbWH@cI8y=QwfMP;99-Fm!lnh5*lf&+g38>ACn|JPwxYq)t> zpr>yCQ6YvIlSSrkx8*w#dhPjUnJsGlueT~zofFZY%eg*1!fNxWp3lV|_FJ}_)@yp% z#~%5??&M?8d_AH!ZKsXs`59I_|DR(&W$ixqPWWEuqW|ru9>@KXeETM_-}~@t3%SRy z{X5Lg6%+|E~*_e=>|X36*8XZiE~N0*8lBCquEN4Fm9e8(td_t0m~#Lkz|Q(S8e zUQNE!IO$&9#G>D4>;E(Vo1tvu;cW@_F^lS?5@8iDm6y_r!6zLi5MTX`LoY9 z#Wbb{ZH3DI`DnL?_*_5Z}QBK`q-RJofD>fHX%*(q|TbdJEYPS>?Y}WHF4kS zF?J5hESBGxq{b3=dQtrL7p7*+RrRwUOPt&+qVB>Kd!_Zy7t47@I<^Pb8|QCXH;-xe z^V3Fe4c9ep$`NCBE-6abrX}@GGyU!IpDR4$b zGhdl_f8NPzQ0=w3@KW`o(>cnU!*wk~-EK8TGw&@l_#IXJ&FZ90pQd&Fv(pnS zpK(OoF`QS_w0zH||5M!0zIt}$oK5B~PWMC1%c_Go&(6E$GqW(lAUK{?V7b}u3xx*T z1*D!yy>RZ*>7O`J>_E+i1=Cw)&QDC)Q)s5uyPW-4|K}aYA8X3Vr$4uS*b~n_H(}F) z^23bhZ4W*cpPAN{YSw<^7sHi9y3MvP&TsZn%QZt{{G1 z>FY~2?^*m0oD@0`*5u!4>+y~K*x9xtETIg$oY@FiS- z?#VRoiPDYRdPz?8e169>mzhYP+`9xPL=LYkuwjD24caV2@p&eBn z_557Cj1cP$r&-@wa*Ecmm+lCbIUv93QR0v5>uLplwkYM_U@n~ZfniSM2JfU{?}>4&#Z6TUyN++4rHvGzu!#KFn@+tz(P!m@bZj-I;8nKBD3j~{$m{OW_^ubr3K zFFOB8EDlinmC44w)5vtS?bJKRBT}^5)#o2rV|e#hgUw5yDM|NdJ@a(Csan~gJnOIG zo4fL7-MwF3xp>9w|Iwz&XWBbI`WL?w-hARn)Y-j~=3&;yqGBeUNwoL<<*_OC!2cTg z4DojtmwWzhtZm4*KeRu-==)o-Gmq<^eUtxJTweWW;$6Aj<^JD({E=DiE?@FBvBj$E zm3>#%=NIeQSIx7qeSJladsUlix}3qI59Yf*{NLSruE|a&^2w8h`dn_O^zJWwUq4GW z^n$wY5nMXP(!aY+W26m07vESyfN-j>+GJ=XxqP z#Phyf+_A$;H*@iefWV>|!RI1&%WnCgVwvaPc+;EDL!{jP#hq=ho0nwN%qg)yxizcj z>f7`SKVLFg9_2Dnla&u?*t=BbAB$4s&U2Hr3k=I03hQ>fs%Q~vkS^J!=M&+H_ z?XMFHzq8A=>?&?C@pso{HvTWTPw$8R*7l2E!W0~y*gw+bcGF$#{;t&6#tXGY;pY9#kTr{<|=e(>E+Z^8qJ3co{T>qck!}03<`h@axr*hcs zlDm(*cy6qkzE8ooxa(5<2HV0jYkGGDa@BQhUGV+?v(4sOob6q$imTW0-{sh~f7ai} z=N+F2PA{FmS}v~e|7J#M^Lxeje=PYK^S#=)RPy&}5iYySpY49Ch`Ag8zVmkfKg0M3 zzh1eUrqA7-{P&;=V|wC)^9S++9%=P~%I#6Kz$9vD;yqW)d)lyd{b1z!`m__V@(eA)L@3Vh- zFC5oPwtFAnxv~4>>U%xHOexPUKATZ|Md8WBWfgTXxx}#=nz!|EyJH{;#&;zk0)szoFCb=4X}JR*3&Q z;ykVXhq>r#=JV%!Q3?px-wMJ&%AfAnpQ zWBJVJ>Lb$M^MHf>-#(c?%TkTlu5Xx@cCCn^rfl8%1;MNCYrH!-#Y{`nzvEs9OO*j2M{xusE@I#lgG*e~1>zvN|6{#4#Y`vb1; zzI-TgrToON{q|cEznF9B-GA1u{#l0GaF2ZJpA!>mlzLa^ADXlve`dIa*4guM-yZ%* z$PMSeR`%8SLfMJ!+g;oLt3)^KQ##@Nh54!awI6nN)eZ05Q?iP`*UVgBKRKbkBC_R0 z`%S@F?5X$r`>O&?gYwR*q@F0fu%E&BT<**s-NT1!gCD$aEZVcUYl%80G(*v6o?LXI@9GyYXy z=4iGVF0^F+CeA;Z@68lv^^;#-KAtBOKdGnjZ$?^|zV9>1We416>haudy%m4)B~#0T zOK)xqZ%~V`mSg@ro4Z_2cmx=lX;>Ph!(5&xkJC+^A5 zGx}0z^>1I_`CsYwGQM9H{$&q8?P+)X`RKauwgqQ@c7K^FHud))OCWA5~Qf8TxoFMr0S?KJ?u-oLH@ diff --git a/core/src/mindustry/ai/WaveSpawner.java b/core/src/mindustry/ai/WaveSpawner.java index 42c76c058e..429ba00587 100644 --- a/core/src/mindustry/ai/WaveSpawner.java +++ b/core/src/mindustry/ai/WaveSpawner.java @@ -49,7 +49,7 @@ public class WaveSpawner{ /** @return true if the player is near a ground spawn point. */ public boolean playerNear(){ - return state.rules.waves && !player.dead() && spawns.contains(g -> Mathf.dst(g.x * tilesize, g.y * tilesize, player.x, player.y) < state.rules.dropZoneRadius && player.team() != state.rules.waveTeam); + return state.hasSpawns() && !player.dead() && spawns.contains(g -> Mathf.dst(g.x * tilesize, g.y * tilesize, player.x, player.y) < state.rules.dropZoneRadius && player.team() != state.rules.waveTeam); } public void spawnEnemies(){ @@ -105,8 +105,10 @@ public class WaveSpawner{ } private void eachGroundSpawn(SpawnConsumer cons){ - for(Tile spawn : spawns){ - cons.accept(spawn.worldx(), spawn.worldy(), true); + if(state.hasSpawns()){ + for(Tile spawn : spawns){ + cons.accept(spawn.worldx(), spawn.worldy(), true); + } } if(state.rules.attackMode && state.teams.isActive(state.rules.waveTeam) && !state.teams.playerCores().isEmpty()){ diff --git a/core/src/mindustry/core/GameState.java b/core/src/mindustry/core/GameState.java index 061d82c1cc..7d39da5176 100644 --- a/core/src/mindustry/core/GameState.java +++ b/core/src/mindustry/core/GameState.java @@ -48,6 +48,10 @@ public class GameState{ state = astate; } + public boolean hasSpawns(){ + return rules.waves && !(isCampaign() && rules.attackMode); + } + /** Note that being in a campaign does not necessarily mean having a sector. */ public boolean isCampaign(){ return rules.sector != null; diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java index 989f24a305..0a703366e9 100644 --- a/core/src/mindustry/entities/comp/UnitComp.java +++ b/core/src/mindustry/entities/comp/UnitComp.java @@ -277,7 +277,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I drag = type.drag * (isGrounded() ? (floorOn().dragMultiplier) : 1f); //apply knockback based on spawns - if(team != state.rules.waveTeam && state.rules.waves){ + if(team != state.rules.waveTeam && state.hasSpawns()){ float relativeSize = state.rules.dropZoneRadius + hitSize/2f + 1f; for(Tile spawn : spawner.getSpawns()){ if(within(spawn.worldx(), spawn.worldy(), relativeSize)){ diff --git a/core/src/mindustry/graphics/OverlayRenderer.java b/core/src/mindustry/graphics/OverlayRenderer.java index 524ee79ea6..9bb3a95fa3 100644 --- a/core/src/mindustry/graphics/OverlayRenderer.java +++ b/core/src/mindustry/graphics/OverlayRenderer.java @@ -121,7 +121,7 @@ public class OverlayRenderer{ Lines.stroke(2f); Draw.color(Color.gray, Color.lightGray, Mathf.absin(Time.time(), 8f, 1f)); - if(state.rules.waves){ + if(state.hasSpawns()){ for(Tile tile : spawner.getSpawns()){ if(tile.within(player.x, player.y, state.rules.dropZoneRadius + spawnerMargin)){ Draw.alpha(Mathf.clamp(1f - (player.dst(tile) - state.rules.dropZoneRadius) / spawnerMargin)); diff --git a/core/src/mindustry/maps/SectorDamage.java b/core/src/mindustry/maps/SectorDamage.java index 02e2c20016..0400d28717 100644 --- a/core/src/mindustry/maps/SectorDamage.java +++ b/core/src/mindustry/maps/SectorDamage.java @@ -303,7 +303,8 @@ public class SectorDamage{ //enemy units like to aim for a lot of non-essential things, so increase resulting health slightly info.sumHealth = sumHealth * 1.2f; - info.sumDps = sumDps; + //players tend to have longer range units/turrets, so assume DPS is higher + info.sumDps = sumDps * 1.2f; info.sumRps = sumRps; //finally, find an equation to put it all together and produce a 0-1 number