From feb1135bccee4cfb97d04660f7e83007014e7f7c Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 9 Jan 2022 19:08:35 -0500 Subject: [PATCH] Some visual tweaks --- .../sprites/blocks/drills/cliff-crusher.png | Bin 1234 -> 1742 bytes .../blocks/drills/large-plasma-bore.png | Bin 1507 -> 3257 bytes .../blocks/drills/plasma-bore-glow.png | Bin 2306 -> 2237 bytes .../sprites/blocks/drills/plasma-bore-top.png | Bin 450 -> 455 bytes .../sprites/blocks/drills/plasma-bore.png | Bin 1086 -> 1534 bytes core/src/mindustry/content/Blocks.java | 1 + core/src/mindustry/content/Planets.java | 2 ++ .../abilities/SuppressionFieldAbility.java | 13 +++++++++---- .../mindustry/entities/comp/BuildingComp.java | 9 +++++++++ .../world/blocks/defense/MendProjector.java | 1 + .../world/blocks/defense/RegenProjector.java | 1 + 11 files changed, 23 insertions(+), 4 deletions(-) diff --git a/core/assets-raw/sprites/blocks/drills/cliff-crusher.png b/core/assets-raw/sprites/blocks/drills/cliff-crusher.png index ba6e5f2a2e348067210c34bcb4b7d036dd2d37e5..384a6b7e92a5333c3e6997273b63758354a3d2e1 100644 GIT binary patch delta 1727 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 diff --git a/core/assets-raw/sprites/blocks/drills/large-plasma-bore.png b/core/assets-raw/sprites/blocks/drills/large-plasma-bore.png index 4d85f466950e894c316735f8e501129a583d8c96..7fb0859b715539e52c9947f75beeb5f85fc62cd2 100644 GIT binary patch delta 3254 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 E0I59P8UO$Q delta 1490 zcmdlf`Ivixay{!RPZ!6KiaBrZ7_Jks6<|p?$1YjG=i=dULQufaT;ZvUOjEnshLoQ- z->rI=b$fHpgD2PXx5wT;*K>UL9`pHj^|e3$J%0Z2?fdoXLvGu~Z`oV<``zKwvI25a z5BNCv`3tNL)iX|LEa+XHmGR@$tkaBBI8G_7D?59ZYyX-5dK|F~^{h^AKbD?7wElTL zdyAq2%fjsq_V@SkNDKeFT3285U+d57{a>HiXTO;4Co)uV-20hwXPH8S)WPciY2voCxw!+B7kvI;=YEM{kMOGB#vD06 zPJ|w4k&i6CB`Ux<-}OU_y>mzXm9s7l^BKE7tUtErWYwYfiZRIxOQ%ZaFiZ3XcNrb$ z2yCd**|JWneet@6Z3e|{k6B;zwqD!&RrG?A#<$Zt4U5uB{zfy1aLd;gUHo9|@7&LJ zBC3SZ;;F?ikA_eG|MD|vG_f?)K3LRxvs0VlO89!FgEqW#dG9bg2-pbsGo{>ds=vMZ zzVW*+zZp^v$Q|He+*`lxuQJ2ESsV@O#=;G<8Er3k7p;BH+HqyeET!G=$`8FcvgY;- z^NwBX*cGBKGapFHV4C8r<^SWN_{@7Yo6dc@%CWdIfZ^?;vey0F2f7Vrdvh#si;(>1 z#~^lambb)%tZUo-=Y5#iUTX5^MB4$T9rLVD)YqgioGITh?`Wl1M;k?yf*Uo-^ zUwupR9;OX-*V_HkSRS}$Y+oVC@z!SM2f>zm7O@S2P3cay4E17(U*;`vd2#mQ?l_Y_ znhrmERc}Qwh$NO+Y74r3{=9Db$wICJ3Ka|jEjMjL84YI7W;$@{?KTFDL&6Gz42~5{ zD$Efa+u1C>DxOie^G&hlmDv=>ge;k@ytZFmdmKMpv3TUV#^>3Q#T;x0Z%>nVHDGt& zJ583Od%>Ei8~<(luiL-4e(^)&^PL(^ruRN`&vao)S@S%6k|)Ot3->zB`K<}85-;m* z119>qaV&Vlm*!vV`Xj5QY7bA#rp1nBRe23n)n>P=G#N!W_I{kg@O7Hd&Ai1M-%fgjV;vveKAZWx8#ZuxUw!pRCf{npd;;ZZV z=~s5}vo_pOoA5!IV>?@bu9x6Gc15Xw8PdC09BMPQ52Xu)Jlw9I^pas|^0ULnLi<`D zWQP4Hm0QWMc#*b18Kc3&et|m-Uk_b;6v<)DVDoT0$F&(R>({w87JNad@1 z+2NF0w|tlNpInB$oEl>1{sjEU>Y8`HM?DJ>tSgre~bAUr`t@W*scbE=T6(+u` zzrS=n`vO;o*L~0Gr5hp(pD9Lt|I8%9vSpoCjb?)oqpi>DuU}i%ub3@r$GX5F!OzHD z_*+Z7(-(!5Hh*Rpfg8zBZZ5g`;kAM!%lRm8w@d~(miLnTxExI7RsL8lHenD`-*iL6 z;fZr%Yfs8XnFGxS?gdx>w^_k1u+wPq!^Iq$4Bq$BS-To?6t8|=9I3;8!pY&=NA=cx z#U)HD1TRcqdHK+M#U;!uZh0QR=+&ZrAPtV|KLxGnSI^uT#K6G7;OXk;vd$@?2>_eG Bvf}^% diff --git a/core/assets-raw/sprites/blocks/drills/plasma-bore-glow.png b/core/assets-raw/sprites/blocks/drills/plasma-bore-glow.png index c0d753b707ffd108e323f4f2940b41759984078c..fbfe8c4a7a1b52d9267ae05b80af47d8fa3694da 100644 GIT binary patch delta 1824 zcmZn?+AFwWGh;p57f%<*kcv4^XIBT`4ih+9KdDk!h^b{s@Pe1hp7QtqFWz!lEpwT# zhj+(W>6|}7|1EaML{92G8xb(kdhy1M>s!9vxw|*LKfJ)-ZIVjhB$bOxp8M7u`ky)D zVBsr<7rzBv1B>pOYH>G6+B2VFNqP{>TTHMZd^}4pjf~Y zQ^3n%{PfFls?E#;Evd=$$miZ!^MC5JSL@Ra7<-VNdCjNfq4(ZK6bO*TXq|g zJ}WIa$04A_+#ngxEOs#~pLu=5{6={J1qT0IKOPkgMKz9=II)&f3=Lt$Vr$+9-4_Qt_N57j=+1rK07~ zBF_hmr4RC5TJ$cg`!I#!f_lmy%?oRI7z$XO#3jSr<1V@$TchaU7w~PrOJ{-f4?e~# zu5rQca)!a03<~T_Csqhg`B?kEKfvz>Q+=G$xepSIr7aCJSs$HZWUv(2rE#&+FT!c{ z-p;Upte=`Ht!o+IN*D@+3Nc79EcCy@R=YpmEvJxOaA~QCo_ot3#*l7~r)`G2Gzejp86=AGNCpcD|Ze2=`q{`*@kEd`9W9!j6R-=&~Fy-9a>nf#1>auWpguAe#K z+Z15QZDYc)ZNjd{SFSi8vpv8Vp+05r;+AuEs~GzPBkcAkf4}HjdT3|uwfR~MtdqX- zEm~}S;_b%zH(!6(ckQi;egAu_^ktoCowNv;8$RvpIg_n>Y(!z&AXY^4aaXO zJ1Kq={vfkDo2xU9e{(iI!!25#eP+V4v*pgeR=!qc5vcin$Dv`JV3D)V*6M<6pSL`DTjD=^ ziSF~?dZ721iS2=jxr?uUk+4_HsQ;YHWZSyn<$5Lkg74p7J9d0mYkc@txb97caf?#= zi5cpbRtso2i}@RGjD521^og&RJU<+Hwq9v_UE875#tr4p2LI+bblhXAzx9=0aE6>& z_~M2hUE>)n%eA}t6O;Zar*{7_lbCsNHp_x67NIF=&Abn6Kd^t0{=l|!-*KL2y=y+! zXButuyTRr?`RHaJ9W&)VO*N;_Gpw@BuWb4JH%eE;OTO{?f%P0M-#MnlFuNS|e{uW3 z_Kr#`K`nPN{e+}*hoqjYENBX=Wo$I+;`*P;u*dB2>tu=dK3_zYQv6y^Pd(Z`VS@9g zqXFFldXq(*Teb5ScXa-1`o*5-FQ%`cn9eipaJ^sCzo%?Z4OoxyCoa-|yQ4O;hJ$nE zLY5c3KEm8eJ$Y4L#usx#n(xfj$uocThv75V`&$;tOrB@@0w>L2-s6zabN$q#?W;I< z_2oBQZdu^{r6 z_Ff6e`mUb8E*X<&@6)N{PM(zZQj%@A7r!9GOSh9=Oa`8tzgX5A)yPZUR}cwVdg4)P z|7;WQ-7@dbPDx*~?U4S$$X{pf{dNwKO?a@da}}dO-sUgvO-)16$8tGI-cL wd1_6O$i5Hm>9szOAHJ+M&Xf4{<4?WT%q<~tZy#_mFfcH9y85}Sb4q9e0F=v5*Z=?k delta 1893 zcmdlh*d(-JGh;owrKgKyNX4ADvnzw8-35-;YZrE$PB;+W(|@F|xb}blq>x7zor)HH zy#~*wICxC9k25#k9mUz9y2A9`D&0<3Dc}7sKcCg9nK)bbW~qOIh>+8X33_#``#0%u zAKn*T$>8(T%7D{{(R2a(90u71);uj<%n7Ib8H^7w8T2>2U|_F5V0VGZkG(MKpkF2r@g&*s+SUKZxtpdZzw{^aD}`>@rOC%$JY2+Hom3l=|^Akd0fdV-UxgzY-0t@CaWhu7kls0=YCOmsDX3#%ncehBq z)9U`(XHG$y4Cf}wefrGzK`?{qeV~}dhTm7uF-1;m6=)K-WcS$lUE}Z0o7)@A4`@H& zuioFzaH3&Xuiz#f?x{=%mb8o9Wi;#jSDW;nzp?Z|ILiU+-+xq2apkGbtru|GzKUTE z!|sey+pD!I*BE9Wh(8dWBFH<%H0#^l+TDHH>YiQ^&TpO!&sO?{S)X z%G2+=izbP$Si&me$dM6huVDOM>FDkgN^%VTfh%L2^)4R$)#Am(P^(b!IoRFHk7;|u z`hbOBm>3JP{ugJ@T%p5Iz~&@=w6&g(>45d&-zyw`os7$09Qr-Nkn@TbF9QdQLW=+s zQv%n|-^p7(=?82!$&Jrk5D~z?OunV)7K|!Z&!MGyz_1L_1eEO3N{R80l#LuE{oq@ z|8bA$w;hJ}ybKhzV?Ce0t7+n06e)I;Ia=EFmsmlJTh@#v`$OHkqqkSbhG@&&yt-{; zbu#mUmNj!Wd^bMfGJRs@xm*8(v_D+UTHKW{y>;7eo`f>4NwapX-(l|IE4`d|P9JN7 z(552BwckWG8dWz0T@^A4-p;gqtL<@f!M$7iykhDt)5Sr8{PR2 zFl_py$8>P*12Luq-qIqug~4(Ay;%~D9xI-lcZt90J!?hu9k)vPD;9g1;*=D&8*Hms z!oc(3^}dbQU4PFI*YW0AslVuIZ9U_khEE@Lw-}u}pEx-~QDIM4u{XyT_ESl77?>L~Om&l1-*H^9$MtUF zxj*iw*i{_!*=BwfR*L@3G4p4q?*mybFKaW$$cG7kR_6K~c?B5AqUJyQe=dZ*oVhm?rui1+CkKTM#bT%OG>E-!q@zy3j zKdm_m?h9Ku>D^$mN`A@4Zm=!W`i<*_=zs3k^=Bq1>)Ww@x@OQH^Qs}D)2wmv#*d7u zJ!_|*YBv+y-sLT*G-thyi~aX!XM)#WPU-%3`|;AFb2lDcv?bD&U31c>AJ2o5%6Jza zae8R|?)f<}f8oqc#t+s{5#DmLJh%MXS|&E;f^Sugq3w06EtS5pAl38RDD-D zuXk&wjFT$A#~e@2&u{kKb=$gs`E|a+;u7}MMISFcdOS_>c#19GmWKL{qY;yL*zP-Q z;c;>Gq~gAl%h*+9TFkN*{%trS78elv^@)9Go5A^W)?)o9Wa@=pH@uRcnE1i-qWTf% zpnHE(IC^ZC6jV)Fx5;opMbH;ZriX@`8pJm7)#oj6p4Vx0TVm}U!<~xiuJ47;Gg#bz z@aK@7R?i&KcYTwEcKdxat7y9MW67J1yIuUWSPx8?yy*K0VZFVL%_2*J7-oq0cj+zo z@;vSR@u&BL56Ol9YvlapAKUe-EsLMksy-n}*6>8?n~yU?_!@-nUDVvd7i3bK^34C# z&Bw+oWf(57J54^}mS1?XeVJA`=dz;3^0SL~UgY=NRdZ_b=J+SePS^i$>Bwv{`z^u1 Pz`)??>gTe~DWM4ffkkEO diff --git a/core/assets-raw/sprites/blocks/drills/plasma-bore-top.png b/core/assets-raw/sprites/blocks/drills/plasma-bore-top.png index 27ec8788cfb6f1012d12e09cd6d6fc9ea438bd69..4d8673451e0d5a6768d6cef5f5d4cf23c8e08b73 100644 GIT binary patch delta 416 zcmX@ae4KfLVSS^gi(^Q|oVT+L`3@QIxbh}F(3sOS*}x!FhSSinVA8y%#T%wFx~@`k zx+C)2y7PXAOX_~BwZc3TA6xVV+pjO25%<_Y_wPM7C5hZeN4_7IwqE~=b;&!caHp$G zMXKi~2CQXxS9RWVMHoZib5Vg8za#}BK8t0r`N;=dQa5q-x*%3B*kiW;UCn2vqSX6a z7|zYgk78gKZ{TC-<#u3iNK>!;`1&0!G*82!x*DZ{%_i>E+Cko_|w7f(EaHQ z=086tro?~#XCrpp`OCx!SzTA;nhFnjPl{5~c3mYD!qUQ`<0T+2z}`1aKv_#cbb~5q znv~)c7GtJ>8G;LbM$J*K*HRG8_+zP6snp8V!MtsX&BRMW9F2=7x6k8>_L=ALV!Gnn zvjKV5HvV?+*j%*|&i?yz|3KeSU5^Jc-QDvzA}35Z?4#Urh;;$8!(*lkj0-ZO7~VwO z5whew%dPM#C1X{I$0|-^JDtC+dTgq@<)(g3%zU+ni7D2enaNJa_i6pCB1xI!FK3y5 Yopt)$vV^MZ3=9kmp00i_>zopr07#^+DF6Tf delta 411 zcmX@ke2961VSSCKi(^Q|oVT;A`3@QIv@s_=(3sOS*}x!FhO;#3fr>4wdt$R@P^#+6 z%UAlX{<*bi{a!!!#yaN$nd5~r#x=_yhJXIgJXKNX%v}3;_bK^lEFOC+dpOisG+O^o z;yC{H?8BvI&lPuzFL1f8dEu*KN9jG8wa*)q=Z3V**vIBo7&6SMP_}nft zCFHSQW=ePw*C71#@chTKml{;^Y`;2HK9Z%t@;+B5L)2XVuN~d$4i$NU9kUn4So6sG zi@K=@Ubr+r_>h&@buFfr5~VHdf>%VGf_5-mVhd2Z$CvF;qp+wkPh3r5pF`qY)BGDg zd23=P87Vqk&o0u<-lQn8pY5toi$><&$K~^xCa$~wRC%AC^qyPAGRF(EelUylKimdKI;Vst04|iU!TPPNQ?N-U3+JfFt=JhZ2> z`1!dz<@x_kG@jo5-Z1}O&GWt1-T7JL%nt4C$(yR5G^JdSRc=4Ib>a7Vu zsz=NMmUyh#oHyNvL4TQtNA7}-i2><%?aWvm*0em{T>NbQ(XBzZm)rlzS++d?X`cS~ zuhUme|K{_RS4g?jj4?pv;j{X)lEt-87gYW`XxgP-_;2~`)~EaD=FT+lGv_+Jv*y$H zziEXVr{0-f%F$rM*&@DDDCtml2$->l>A=*4cJYluL5I2{ILj&~Dk+9Dcrb}R3shO? zQxT|gP(1F!vl+qF0Sr7QeIEo^ILqbjr(5*f91~iwswVZsjQ8(Fu1BaShC6sw2o}$KFLtO~OQnK!3a9?7DGBZ3 zcfB%%Kh)i~E&li=qs&MA;CZ`#E0rH0w}@9iJ2P|P(`~OO`7*Y&EBBjiay<8SYO~GP zPrv5xpY6Q&@3Y2(e~d!CI9kPBh3f69p4?xfk-P2oG|qqu2L^*npFI_9&Yag3_43%u zbf%f@_yl#whm4F4bGNL2-o5~UyLn%}wRATYO%X4v zn84uRbUylQ4Wj~QUd6-74nI~YiabnOAoKL@hXn2hC&q%O$EH}`Jv~o8+DY~y>p~9k z`olT*H%LauzR-yBVsO3`e~nMX>qpJXiYqsC4Tbjo$+q}C!;96y> zgy=EU2yHXk^TBh&VP{>Y1JgFhK5W%J$jiT#lR;&}(HPxpoO5NL7t2rO_>uPDWX?am z{0yEr%QwFUPb+lzBH_!oY2==g9zB~7m0I+Ee-GoCc>4Xgz>Qk)a(PEAr^ z1*}rQW`UKV7 z&)e;pr|Wq0P5o562d`#M+>u$hZc#+LaJ3`D!^VjUlNau4I`fNRU**97i5$+|u?>fq znH+?gE0~1`#fX`3!v0dJC7!uc}wG zIMV)j?VH(G408`pe;(AyaHxCo>Cd;-4#q8b`uvU83fBhNxSV#Ddh0y}sv&v@#N%?7 zvcy*;danp^(AaZ>i*rrjF}<_lY6+kAB}eX%cs0eLV#9T%&p%#WpO%<-U3I7Mm9-hr zXkRbXDz3;GwczPLws5ERh6`JE9O8Bo)MGnUYrcQN-Ru*8+wSH(4}ZQ_{^jHa9}Z1T z;7%wqk>)a%JY^|sB2r&=xLbttN;GTMZ2ssb>9`w0Dh(eda3-`L`{c-Rf?GdHB__^x z!K2v4+nzSIELvI#je!Tv5?_z<`2bi7I8by zjSpv^{hvRp;3HRqkQ_4)dephYI;j5BzDhw621B78(%qsF z_m2fh2VYDz*UPN^T2!|@SzBpK4PPshf=c5DMTx#!m$NnJWc#vpx2v4F^G`Xu{NnzH zi&z@`odPQY-JAkJ>Ak{nx3kb9R)(oB-v~&@E%E5!)z9H9t8m=?Sw)4DL2LIP7yI2O zk9c_S>Q4Y=g?VLZ4!diGCb1s4@F>XaR}#y#U9oe|{6DWSdHvlhXKyOD_&aGb)&$&J zq2qGKV&S=62d4&jF)T4NQQNa(bKVBkDPjy8d3`zcU#+<mdKI;Vst0H-Fv5&!@I delta 1066 zcmeyzy^mvpayf>Wl%BPz5Y zq6-?#4O#+8Gp`?6!>nj*|HGjpH%@rBR*UKH={0t&3?A8s&dYPB-#+^Ex>sk0>7AP; z=6OGkpYE!kkaj3%+T#~>cW>4mQ;i6Yd9(QUSFh|yPKF0<3IBD?SWfPlsLvwA5YXnp z+Q;gceeVRj)APUW{od;iCw#77EAeE*^Elye`p;jbX#AYDeQD)BP9_KI2#-wrR89To zsthmA&VO^QUg6`#74sjbgkKM5ddl)3`JUgJ%$vzA4Gv5zlJ2eW7aC}4HpjyL>H{{HH%moDzRF7^57KmB`C-XCYb|Forc$=qj0 zH+Dbk-nnVJqcuaS+=6tcjL-WFd39a}v57D=Jm2mzJ%_`0hWV$?wY3Jpj0_ErkMrHO z+qooo90E$&(BHxQQ*66=Kt>Bd=b-1_7<;yyu6&bQt(OI zq5FDg<63^{eb~Q>b%Isnl`O_3ehOQo7*+~Z7Jd)}VZTRu_Ub!+#$*F_we_olrLx^T|x z)rFSNTXwizIp909{OG!5IRU@!>=gA2ODeN^c0FrsXkWVZfRpAG#doILMECc4Hp_k! zbLg+Hd%Y?;uH1f>e#rMq&#nHQh3*%f=IB01DoB3*dF89_gjeN^TuzstnQmMm^Cm`> zBQ83r>_NmcQ^U70EBL#bAM911aen#5v)M`V-^AW5ebuC(*EB^f-2B|O?&DSW1t*y# z#Gn3o+u-Zo6JEOy-TAxkWUZ6lwr`S4EQGc4yN|aC98%shk#}KOtb$m}glD}xE%AW{ X67!AoxRx_8Ffe$!`njxgN@xNAjY$PL diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index d9cfd2bb5c..130e1a6cba 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1644,6 +1644,7 @@ public class Blocks{ arrowTimeScl = 2.75f; hasPower = true; pulse = true; + envEnabled |= Env.space; consumes.power(0.30f); }}; diff --git a/core/src/mindustry/content/Planets.java b/core/src/mindustry/content/Planets.java index 8ddcb84f63..355e962995 100644 --- a/core/src/mindustry/content/Planets.java +++ b/core/src/mindustry/content/Planets.java @@ -104,6 +104,8 @@ public class Planets{ //define launch candidates after all planets initialize serpulo.launchCandidates.add(gier); + + //TODO WHAT IF THERE'S NO TRANSITION?? gier.launchCandidates.add(erekir); } diff --git a/core/src/mindustry/entities/abilities/SuppressionFieldAbility.java b/core/src/mindustry/entities/abilities/SuppressionFieldAbility.java index c97de62c22..01b13d62f6 100644 --- a/core/src/mindustry/entities/abilities/SuppressionFieldAbility.java +++ b/core/src/mindustry/entities/abilities/SuppressionFieldAbility.java @@ -9,6 +9,8 @@ import mindustry.*; import mindustry.content.*; import mindustry.gen.*; import mindustry.graphics.*; +import mindustry.world.blocks.defense.MendProjector.*; +import mindustry.world.blocks.defense.RegenProjector.*; import static mindustry.Vars.*; @@ -48,11 +50,14 @@ public class SuppressionFieldAbility extends Ability{ float prev = build.healSuppressionTime; build.applyHealSuppression(reload + 1f); - any = true; + //TODO maybe should be block field instead of instanceof check + if(build.wasRecentlyHealed(60f * 12f) || (build instanceof MendBuild || build instanceof RegenProjectorBuild)){ + any = true; - //add prev check so ability spam doesn't lead to particle spam (essentially, recently suppressed blocks don't get new particles) - if(!headless && prev - Time.time <= reload/2f){ - builds.add(build); + //add prev check so ability spam doesn't lead to particle spam (essentially, recently suppressed blocks don't get new particles) + if(!headless && prev - Time.time <= reload/2f){ + builds.add(build); + } } } }); diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index b55656f55c..c31e160f3f 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -77,6 +77,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, ConsumeModule cons; public transient float healSuppressionTime = -1f; + public transient float lastHealTime = -120f * 10f; private transient float timeScale = 1f, timeScaleDuration; private transient float dumpAccum; @@ -339,6 +340,14 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, return Time.time <= healSuppressionTime; } + public void recentlyHealed(){ + lastHealTime = Time.time; + } + + public boolean wasRecentlyHealed(float duration){ + return lastHealTime + duration >= Time.time; + } + public Building nearby(int dx, int dy){ return world.build(tile.x + dx, tile.y + dy); } diff --git a/core/src/mindustry/world/blocks/defense/MendProjector.java b/core/src/mindustry/world/blocks/defense/MendProjector.java index 5767939183..4a59734b38 100644 --- a/core/src/mindustry/world/blocks/defense/MendProjector.java +++ b/core/src/mindustry/world/blocks/defense/MendProjector.java @@ -106,6 +106,7 @@ public class MendProjector extends Block{ indexer.eachBlock(this, realRange, b -> b.damaged() && !b.isHealSuppressed(), other -> { other.heal(other.maxHealth() * (healPercent + phaseHeat * phaseBoost) / 100f * efficiency()); + other.recentlyHealed(); Fx.healBlockFull.at(other.x, other.y, other.block.size, baseColor); }); } diff --git a/core/src/mindustry/world/blocks/defense/RegenProjector.java b/core/src/mindustry/world/blocks/defense/RegenProjector.java index 95c3df59ac..46559c8cc3 100644 --- a/core/src/mindustry/world/blocks/defense/RegenProjector.java +++ b/core/src/mindustry/world/blocks/defense/RegenProjector.java @@ -134,6 +134,7 @@ public class RegenProjector extends Block{ var build = world.build(entry.key); if(build != null){ build.heal(entry.value); + build.recentlyHealed(); } } mendMap.clear();