From 0014c7a525b62a27d2b3876ede71b9d1bd357593 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 21 Nov 2021 11:59:35 -0500 Subject: [PATCH] Slag centrifuge implementation --- .../sprites/blocks/defense/build-tower.png | Bin 1750 -> 1742 bytes .../sprites/blocks/production/melter.png | Bin 342 -> 552 bytes .../production/slag-centrifuge-bottom.png | Bin 0 -> 462 bytes .../production/slag-centrifuge-glow.png | Bin 0 -> 12531 bytes .../production/slag-centrifuge-liquid.png | Bin 0 -> 485 bytes .../blocks/production/slag-centrifuge.png | Bin 0 -> 1635 bytes .../sprites/items/liquid-cryofluid.png | Bin 526 -> 525 bytes .../sprites/items/liquid-gallium.png | Bin 485 -> 484 bytes core/assets-raw/sprites/items/liquid-oil.png | Bin 508 -> 508 bytes core/assets-raw/sprites/items/liquid-slag.png | Bin 484 -> 483 bytes .../assets-raw/sprites/items/liquid-water.png | Bin 518 -> 518 bytes core/assets/icons/icons.properties | 1 + core/assets/logicids.dat | Bin 3423 -> 3440 bytes core/src/mindustry/content/Blocks.java | 27 +++++++++++++++--- .../world/blocks/production/BeamDrill.java | 2 +- .../mindustry/world/draw/DrawGlowRegion.java | 16 ++++++++--- .../world/draw/DrawLiquidRegion.java | 3 +- core/src/mindustry/world/draw/DrawMulti.java | 5 ++++ 18 files changed, 44 insertions(+), 10 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/production/slag-centrifuge-bottom.png create mode 100644 core/assets-raw/sprites/blocks/production/slag-centrifuge-glow.png create mode 100644 core/assets-raw/sprites/blocks/production/slag-centrifuge-liquid.png create mode 100644 core/assets-raw/sprites/blocks/production/slag-centrifuge.png diff --git a/core/assets-raw/sprites/blocks/defense/build-tower.png b/core/assets-raw/sprites/blocks/defense/build-tower.png index e0c015d92edf08cc33aa3fa304d9089249e46be1..867a67b561b33502706e4171ec851cf908e54551 100644 GIT binary patch delta 1616 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 diff --git a/core/assets-raw/sprites/blocks/production/melter.png b/core/assets-raw/sprites/blocks/production/melter.png index f499dd989344ed17847419b321c3f26dd7b189d3..304f7119a534be361f7d014bb692e0b502c84967 100644 GIT binary patch delta 528 zcmcb{w1Q=VayKMy?Rtv*enWfrr8op1f}oBg>8NoN}G^W<;~ zX7e$yepU5dz9LLp^2pVTCCVH2m%nQ>hIhN!2UKvyy4OBjOSvQ79Mj_*mKuF#Hn+)|BPFivJ*@;Jm3kK8#H}q%RZlu zcg#V>dTyzUe&>Q>I)r`^XDnVzxqg=nHE$0gSqIN}na#`RjULCFm lqn=g{wgSnc4mHePp)Y?v70hyHU|`^6@O1TaS?83{1OPru;28h_ delta 316 zcmZ3%a*b(%ay_H0r;B4q#jUf`4fzfk@VM66-DoIQ=(~`tkjB?=q|K_psH0;o zw>hUg%-{BZ^`je_bM>z$UU~bmWy&Mfg{6};Cfzyphq=I})S0`Z<0nf1x1i~H28$!F z@1=ecbNg)Ez;aQ(teZ)$BWT@}{R|RkCo2g|+Bs!ClZSw55%ZS%HV(!D4izMLLHS0`_n9Ufxf6VMJ1{?pKYUh~BeyHhS2_mt7>234hyl&pY*}>3!jq9(ug0n3B5^2?illGZerId=4aU&j_F!t{sKqGv(-zT9`bcWCKUY}1 axaiMo(`jxmJsB7n7(8A5T-G@yGywqgWsSiA diff --git a/core/assets-raw/sprites/blocks/production/slag-centrifuge-bottom.png b/core/assets-raw/sprites/blocks/production/slag-centrifuge-bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..4f4b6a2b8fa10ba52de5f54471a2bd0c9083c362 GIT binary patch literal 462 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&z}VsG z;uumf=k49yg@+A9STAymr>MW%&!n2-T*lI$`ng$s;vI)-rOuW#lX7kc?~A{WKM((E zzCLAM-rAylB{x1E4^iTgFZna;B8PLk%zr~=!7_e}f5qRFa`u({NzQSNsD1e3cvSa> z9~VBJ-zf6%KJ#(=>-Raz<7NI!?N|O&Q}8GID~E1j%_*C^QN=aar2n$V&1FnrYmj6} zW0)}*8I=>IGv?);UCpCd9xhqtw&U2N)Om9S&uy)oo15NJ%oF?Kj^x9LrP^n$m1UB1 z|D>opB(~+ literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/production/slag-centrifuge-glow.png b/core/assets-raw/sprites/blocks/production/slag-centrifuge-glow.png new file mode 100644 index 0000000000000000000000000000000000000000..f85f42d1a7a0df08e253926308b0ceaeb02091fd GIT binary patch literal 12531 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 literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/production/slag-centrifuge-liquid.png b/core/assets-raw/sprites/blocks/production/slag-centrifuge-liquid.png new file mode 100644 index 0000000000000000000000000000000000000000..a8fb90921fda0d7ad831c4d4fc8fd22f211f502d GIT binary patch literal 485 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&z&PL2 z#WAE}&fB{e`wkiKxLlm_|Nrw3O|1>fbT?TK%ei7*^kwe1b#x)ocm z&3nBqcXEC0C+2T$`B%Ir$eokk7pUi0wqeDG-Ym{Z&aUnGBHk0EGeUm2tz}u6=+>S; z#cP6OO4tv#r7h9l7*u%=SqB;m>jW z3{cP@dbRzHWysej#g#MrRQDzC{rTsvQaPKy-E#X6*|%-dK0kYWE4lcq+J7yj`OmJo z)ZIL0d8%kT!=e7`r@ky^I3%C0AN~E^i_rQ1mmb+u7S5>Mp1()3MBL$r|2&-^%)Kch z6MC2?1v(gUdAKp2)KG{lXRJy6_~hiFubc~5>e=48UpS@evgcbr(~qviIeT-;?HQ*C zte=|sSEuy0dJ;JwTji~ij74dcJhb9dUMU7Qd1&zi&^E!;m5;eLgisYgTq)$V-~ zAoE~Chq8}QVTZrcIYDQx&ho~Gf+`J%ZCDHDtYzRU5j!yP8PgtBjrRCc{2~Ef^_;IB dGBaE&WB>e{!SctN>SR!Wc)I$ztaD0e0swzR)O`Q| literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/production/slag-centrifuge.png b/core/assets-raw/sprites/blocks/production/slag-centrifuge.png new file mode 100644 index 0000000000000000000000000000000000000000..087cb47e6026f82fd866242b4af9ad4fb28760dc GIT binary patch literal 1635 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^Tsv^-rLLn`LHo$K2tVlB|} zyk-OQxyFc1DJKO5vhxm<`5jS|2+{57IX+YH=kubiRZC)QcFh%)jGy{{*ZkivIserD z{`dH()c*Rqz{8U#pNyYsK1u%P?7TYD2JL6}PW|yv^m+H{kGDe1%>{Em2S2O-^JF)J zc3paN*p&sd{y%&Bd%E%(fx6niHQibtmmN3%ptAW_^xl;Mvwntg`0{WkPW>4waI7j= zq379V0XIXALs_3UD|&owQ}B4E%yE3bcT<|cIU{@Srm)rJclKQEWH_TB^Z%}s@HOt7 z!nU7c99OsQWcVWRi`&R4{k{F+8aAiWTtx=nCXqD`z8PD8O0~SY6*RBm%nqT3HNTva z4{$XePiQ}LneB_m?@-fOj3FGC88XxsNro=@d&(-4!KYq5_JZ=N`QJRB88Ym7ySTLX z;2L2UhG~xOM%Sv`UA7w;ZFAaF>iJBWBbZ@Yrnu3yPZsYO8m{IT#y5Z9I`Fx@{Mkg!Z_#GHuuH+MnX|#dtcL&8%6Gmr6|-HfM*-ysyN{uv`8}-8_Rf6J}{eh0pFBC;o&*tFk=v z3}M_LT{KPi?ajGsGG8!mxc-tm{nhHG110TB3}xX{OjBDFbQvOTHP%>eR@{&r^g`Hh zwPx+S6^S#Sr8{rfV#;`;Bd&zCC4*0&C0~ctV0W<*@0qHucR~%{enj2dT7C7Kt0cq9ie&=V0!+Rp->S%;!^NS-@b+`)vh`cV4oRF^ z=P=Xkp0xYi%m4psGaA&Ln9I1pF`@S?pGjWDne9#s7(C)XpI|6B63MV=m+EI-0R;xl zpOOLr<*jk?nReWctPPW*8C(<>IL?;5viWQ}g93*VgW5*X2Jt49d9`~_)rd8)C2}?R z?qYI?mabS{xtn2vLJPwgu7t1|It}|`#aPb%S?1sUW_iM|ty8={Z*@}n9PTioB+co? z{r~a}fj(P*ZgxtG^;ctAtDW@KO|j?we#RLyJB1>{&ifeNa?)gOGPPg*JG4BBrJ#A6 zaRU#>ygU31o&tL+Xe8 z!<6{C^@fDcCJvVKVJ<98M)lomIrtekoxY{Turyu!nzLI{yq3#|aX~4==U;pbM;fDd zcW+{>I5XX6+rBtf#UwkH0}c_1|1vgx|H{Q7_*s)ds%7f4a2HdSthWdFvf@4mD&BHh zY1OxD)h?x~k7+X_E6!Z!N(@^)PrWts^7W~<3bVt`-^;wGqtj}zI@G`X>Del$OB7N&@#}6;|vM_AZShoIbj&<{fQ-7W^1QZH> z-mI|3%4bt?v+2&m~C6V`CdCTo{`_} zlJbwkp{e26?v9@su}Mquk%^v zR(U>yj=-7rZ<$TD$HVSvGw?RCF~~)0c7Bt&vx~ch>$56Hlz58Oj;-SFEq6(D#-+wQ zd(f?r!Mx%1i$`Mf4(~SIsH1Vr=Inut>h3fX)>8RM5{AxA$`0As1tTT3$BB4_nr+5`L>W_nWfaq{c~=dpo5V@_!qj zS3F(;OJ=Jc=I7ul70|K1{Bv|ETFJ9o{`G=@nR&XgXOe3pJa>>JCOmMo^dx5d+E z%#V%!C1D`EinCkq?|Fm${ekvP3Y9F36-TxvoVAyBx>Cc!cz4CBpK%j~THg3>h&?l1 zVZ+|mtU9rlHG601aNK;>FQButnq%dnwU2BW)?B}_wT;>7{+<;hi7}U@}~b3bP0l+XkKE!WfM literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/items/liquid-cryofluid.png b/core/assets-raw/sprites/items/liquid-cryofluid.png index dca841ea690ca6defa5edb5365754f998f199bc0..a72f3b4d6273bda102e3ab3b8e0f105a1372fab9 100644 GIT binary patch delta 486 zcmeBU>1CN!pDY!l6!uCVq>`ByZn#g^X%s5EDxJDGCOXZD=}@S;!}p*FGE&Tt@Ba1 z!KdRL#jq-w;Y(~p7qivejefj#CF~3hmlxMEH0;HTG@`k_~p;n zFHd4!dX+UUAToQFg(~Zc!y8lVRq~WVzcxJLyA#?!m2uKLRmP~zG7JZ{a<9=63vEx{ wS=P8UtcqoAB%k0_B-SbxIP#W5tJ_3G4(-iIATj_vPgo-I`p=!N##PkOmsNHxaO#8 zz1*I~TmI_yvpL;PRx+ym{*;$t!)(8w$>*-Ko##Bnn#|smWNoNZ9DItg?DEQh?=dqS zHpoUy+rkiXo8iUo4I=C%dB?0we_W7dVDRhz#>nvKUy5 za%RT5DX@=gB{;t4~@O-l%w}LHmc)I$D z5P9dLn|~g@kXkZ8cs%`yh94~|S^D7Bba9?zbXaOLIC z*DGTjGw(9#uY8j=%R-fP#o>)9_9}Ubq2C)G@!SdRpUOGu*d&Ivk$emfZn1`mcdt6U xF=qFHDDAsV*L2#u&+^+VE~r!XNeEvjFUhz;`j36yJ_ZH`22WQ%mvv4FO#sKC+@k;h diff --git a/core/assets-raw/sprites/items/liquid-gallium.png b/core/assets-raw/sprites/items/liquid-gallium.png index ad5cf133fd31faf39fa5ce598ba915ead28c06fa..7f1d7f8a243a498d4e4cfd1b15a9ac98a35e0ff1 100644 GIT binary patch delta 445 zcmaFL{DgUeVf{Q$7srr@*0WRhW*s&VIIgdhpOD3oa(>#v2}{+SU&aMFeb=k&Dlt0C zY_fX#yJIdX=S5x!y?C(l?47kg1hvWyibQ{Z$!ve37A;@C|MzP@CX3BqHypG%zdHYz zP(;2P>;L*4|FhmGJ_(dO^4X@mVM-e7wq<;angSRFUiKWjHak$UUh8ngqbKg%2J?FZ zr@9C%Ke3F#Oh8XdLjK@Ng*n*^v^)G5W6p3nl=Cor)0*SLIQ!g-E&4LOoKzfE&tbeV84G4!u~Qkc)O|DQkK+_6!8sU*V`t%U2_L>c(^bwoM`=~&1= z7hw1mHR0NU2OF5|JNlaZmzCFhrI%Vvj&fkEc=qt}W|JK=Ql%$rHJp5xWF^{jD?qJQ zTx$V?+0E^(7qk+BDm2gbIpi#ulADpOmlg9bdCUFW^V}D%m2gTh?pT$uiJvv1ZOO-u z8xC*EZ)e#)^EO$n_rNc8?aM_|L=q$?&3ofy#Jl9QoI@aUoq*$?Z;MJ5j4$tfVW#Az zc_*eeN$XE8DfU88I+0FnGH9xvXS1?B&DAWo}#&k z-{HE>o4}CO)yutfrb-w&rkhQ1KakiVbLYvQnITKfRkyu=S6)9qw?R0XU;51FJ-^a) z8n0FbeE9$SWcuOu3GAst=ReVaJMuJ*>x@3f?uYQ?Oz!Fw|zaYsPS6b%6+Lj^8m>vmZyj{%Z$`{rUV+ z>C8Q;W`k)N`JN&UEHB?rzxv-M?P$gybNktR(sr6>85V>v?%uYRq2g2J8L3H0Cx2SB zGhF!Iw1xfGZ`B`;B@=2)_SFZotv)>S3lrA?ZGQRrOHLlux;-O=(WgxO^2&q~p43a_ z3z@hQf@`BW)-tK}PQUbq;Ru^oB~R{I*WS-nJ$_6ZZs$d*Uic}k`G70&Q9F~4)1?ZR z9EGymzFXzGRcBq*eBhYse%V!1^MI0y?akJdSsvlG4U5?SC^Y@}8Y%6NwrrpI3neej zJ2Csh|8L_D-dkkfu_SwG^oMV?v5p@atOSHl{-67oX;IbYm5;0c2QV-&FnGH9xvX@O?mQMBmmfv~&Ztwly_hb2PY?jfIIR5dx!ixjDt9+RbE|?kr`0na% zixf$@hUb-rrt0jA8g6hha4IzhFv_f$Wbc39P^$OI>c%tQZglwA)m1VxT+v#p^6aZN(vHrz}ghrLWync=P(!!x}%M;Is1F7#lPuRk8laNy}r zNd|?w9ov*St#0jC;heyhxxVe>j;r&JKK&GEwC=iparU7Cz6ZBk6E2iYJH6DlLF3-5 z^F`Bwj=IJ;FdX=JeXWo~72B=Vihg$X(vI;}Lx%Hd|7 z@?7pU*&3Vw>BlHA`s~u@T3Fgp{NYeR{X9m)#-KRo;F~)>{+C~@aqErvf)ypa8yIq8 zAFNSkRJ-f;?yh-b$0A>&`KP8%yQnMRnHqlin5O1|CASMw>{ap;Ffe$! M`nj;Ib4q9e0K)#cEC2ui delta 400 zcmeyv{D*mh1>@C;mQM9Q<`*5``@QaceYs`A`JxpkE&A%&9NF((%{CI`ne|iReO&Aj z#nT@cY|eMDG_@39J>tjUA;8(f^}u23pUPi-7c*4)*^F){D;xd%@syV#VD*$qmiNC` z`U&VoSWghU-MQefuO|D7P_LQqc5Z4+u->38$@pR$qd|G1I^T>tJI-dH8Di$m zXJmNPo^3s8!Q#K(lNd55e9M~A6a6dB~<)T`o|5LBiFT^^QY+9Z9c#25ErCf_m@a5>SSRDkMf?XG#FrVRWZY*^Vq;rk=V;ZUvaM*}oLsFR+hdB#@6WC6YZUelJf`B= z)&7E!!G!tY<=Ur{HH>%}9yEQm`5QqY|2SedFrHY=-?HLOL&jrQZ{Z`1UAF9Vo?h(z{9iKn+3(9tEvr^B z2sY%4tJIk_TzY?+HOct?>-(F_IhJdlXu9Qgd3mr*L(@}-B9D;D=A`cq)fSUYV-7ae zcs5MGpUrTf>JB?gs6Y^Vygh@g61N7+#JY03U(8dcSKbrKi+#bsz`)??>gTe~DWM4f Dv{}eH delta 445 zcmaFN{DgUeVf{Q$7srr@)~nMt`Y|~QwEZ{T#~>oclHpUqz-6t?9mi0^njI~qEo9}* zZ7s|t)XeYD$U9Xe{Dt&^)~2Q->K5IP-<1__F5bLbqGZ?X+cSTDyFd3Xt6xr6k(y^v zjY~Ph0?UpW?~LPJCZ;klq~|IPHDHIRVAlA2gn^C`7Ow2yDF{ zd*`|ftPco4hf zb{5C+2`7T##I#) znf3`xvXFLo`Kze$#+mQGD!%bPyuun86rKG`<0zv>1fNQ~(^P$pGX5>?#%3plbu^~2 zRQ%eMFN4p&%6mR)Icpgh7#KWV{an^LB{Ts5 Dh8e#d diff --git a/core/assets-raw/sprites/items/liquid-water.png b/core/assets-raw/sprites/items/liquid-water.png index b675b3cfb87d5c041015d448bd65c50a70f08f65..4fd8b92f741933741a941a4e1624a4fa04fbb2b8 100644 GIT binary patch delta 472 zcmZo;X=9mSQGa%-q4!}2k>mdb%U3o#Z;WjTCNY&??nmaBYc$ihwtxf+LH7Q3G#%$UVAB%T1;2P2 z_Hla`IxIIfTY1v&JS)Q-x#^4y2Op=t$!+$3bo12yC082#&iksYx0|n`r9HFtim+D6 z!SA)23@;s4+*;zR#y2@wYi2zwkNe|{J=S|CF>%PQ@V%vBHrM6T+rQ448}=8>+3dj7 zGIe_YyOxuWL-mvvGEaFMxumG^YMavQ|A$$H9G3rbRh+_Cz;~~}#INCngXisl@W?w6 z|4(O_y;v`n5V(>nfib1DadSUQ!J52R_pUe2;Qe*6N-HcTDpr6^bZeT}@)m}^z^kS% z_9}TwpH8FZGL@kwO;5Kta$V! zK;!07CsudnvkOGL4jygeljZu?v}1;e;r+X{)1y}Dmz*&DUVGm5;d*{aaR;qDu&*VLF*zDoWJCl+ajOTl=nKxTUAcy&MmsrCqLxx{s z(~=z0)7Jzy&z;B3U}2}j%+U1v^NszycAe?k`zHl4&z(0rBd*rQYt5Pzv7r413t8`f zU&^qg(O|3R>>L@hB zH3iB!a`8`<1f>>iN$)(xlr7zL<$oKikVE>{ZYK@ig19{oGv+W{Y@C$md^cs|$NhYZ zr!t&j``aqD;@M`Nl-37llo@4K&$jwrs*u)PS7INkEw?sSKuk3Etj@9)hQ7e7rY`a- zdCFH`F`l#z$gwJze|`$9%foZ3yfO9f9z5Rkt5(%au`9WhHzM?FuTq1+qJ1Cj^f|st g9t`~V{1fY&vaQDyeNIO)FfcH9y85}Sb4q9e02{;5+yDRo diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index f61cb723ac..076df440ae 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -453,3 +453,4 @@ 63253=cyanogen-synthesizer|block-cyanogen-synthesizer-ui 63252=cyanogen|liquid-cyanogen-ui 63251=gallium|liquid-gallium-ui +63250=slag-centrifuge|block-slag-centrifuge-ui diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat index 4c325f53df3bd58e853fe3ebbbbd5643e49255ce..070602aef609298e968f6ec0dfe2d298f27f43be 100644 GIT binary patch delta 33 pcmcaF^+Ae>Vedw!w_F1J#W{)Ty2+_|B}JKOrRk}g-*FW(0RYv)45|PC delta 15 Wcmew$bzh2!Vb4aUw_KaJ3zz^g=>?kr diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 0433c675b6..4ff7944899 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1039,20 +1039,37 @@ public class Blocks implements ContentList{ }}; //TODO implement - is this even necessary? - if(false) slagCentrifuge = new GenericCrafter("slag-centrifuge"){{ requirements(Category.crafting, with(Items.tungsten, 60, Items.graphite, 60, Items.oxide, 40)); + consumes.power(2f / 60f); + size = 3; consumes.item(Items.sand, 1); + consumes.liquid(Liquids.slag, 40f / 60f); liquidCapacity = 80f; - consumes.liquid(Liquids.slag, 40f / 60f); - outputLiquid = new LiquidStack(Liquids.gallium, 1f); + var drawers = Seq.with(new DrawRegion("-bottom"), new DrawLiquidRegion(Liquids.slag){{ alpha = 0.7f; }}); + + for(int i = 0; i < 5; i++){ + int fi = i; + drawers.add(new DrawGlowRegion(-1f){{ + glowIntensity = 0.3f; + rotateSpeed = 3f / (1f + fi/1.4f); + alpha = 0.4f; + color = new Color(1f, 0.5f, 0.5f, 1f); + }}); + } + + drawer = new DrawMulti(drawers.and(new DrawBlock())); + iconOverride = new String[]{"-bottom", ""}; + + craftTime = 60f * 2f; + + outputLiquid = new LiquidStack(Liquids.gallium, 2f); outputItem = new ItemStack(Items.scrap, 1); }}; - //TODO "crucible" is getting old //TODO should have a useful turret ammo byproduct? //original: consumes.items(with(Items.copper, 3, Items.lead, 4, Items.titanium, 2, Items.silicon, 3)); surgeCrucible = new HeatCrafter("surge-crucible"){{ @@ -1107,6 +1124,8 @@ public class Blocks implements ContentList{ particleLife = 140f; }}); + iconOverride = new String[]{"-bottom", "", "-top"}; + size = 3; outputLiquid = new LiquidStack(Liquids.cyanogen, 3f); diff --git a/core/src/mindustry/world/blocks/production/BeamDrill.java b/core/src/mindustry/world/blocks/production/BeamDrill.java index 1c401454fe..039f1e1580 100644 --- a/core/src/mindustry/world/blocks/production/BeamDrill.java +++ b/core/src/mindustry/world/blocks/production/BeamDrill.java @@ -38,7 +38,7 @@ public class BeamDrill extends Block{ public Color sparkColor = Color.valueOf("fd9e81"), glowColor = Color.white; public float glowIntensity = 0.2f, pulseIntensity = 0.07f; public float glowScl = 3f; - public int sparks = 8; + public int sparks = 7; public float sparkRange = 10f, sparkLife = 27f, sparkRecurrence = 4f, sparkSpread = 45f, sparkSize = 3.5f; public Color heatColor = new Color(1f, 0.35f, 0.35f, 0.9f); diff --git a/core/src/mindustry/world/draw/DrawGlowRegion.java b/core/src/mindustry/world/draw/DrawGlowRegion.java index ee3272ae06..dd60d48cab 100644 --- a/core/src/mindustry/world/draw/DrawGlowRegion.java +++ b/core/src/mindustry/world/draw/DrawGlowRegion.java @@ -15,20 +15,28 @@ public class DrawGlowRegion extends DrawBlock{ public Blending blending = Blending.additive; public String suffix = "-glow"; public float alpha = 0.9f, glowScale = 10f, glowIntensity = 0.5f; + public float rotateSpeed = 0f; public float layer = Layer.blockAdditive; public Color color = Color.red.cpy(); - public TextureRegion top; + public TextureRegion region; + + public DrawGlowRegion(){ + } + + public DrawGlowRegion(float layer){ + this.layer = layer; + } @Override public void drawBase(Building build){ if(build.warmup() <= 0.001f) return; float z = Draw.z(); - Draw.z(layer); + if(layer > 0) Draw.z(layer); Draw.blend(blending); Draw.color(color); Draw.alpha((Mathf.absin(build.totalProgress(), glowScale, alpha) * glowIntensity + 1f - glowIntensity) * build.warmup() * alpha); - Draw.rect(top, build.x, build.y); + Draw.rect(region, build.x, build.y, build.totalProgress() * rotateSpeed); Draw.reset(); Draw.blend(); Draw.z(z); @@ -36,7 +44,7 @@ public class DrawGlowRegion extends DrawBlock{ @Override public void load(Block block){ - top = Core.atlas.find(block.name + suffix); + region = Core.atlas.find(block.name + suffix); } @Override diff --git a/core/src/mindustry/world/draw/DrawLiquidRegion.java b/core/src/mindustry/world/draw/DrawLiquidRegion.java index 11cb308cf2..c1c27fb02f 100644 --- a/core/src/mindustry/world/draw/DrawLiquidRegion.java +++ b/core/src/mindustry/world/draw/DrawLiquidRegion.java @@ -14,6 +14,7 @@ public class DrawLiquidRegion extends DrawBlock{ public Liquid drawLiquid; public TextureRegion liquid; public String suffix = "-liquid"; + public float alpha = 1f; public DrawLiquidRegion(Liquid drawLiquid){ this.drawLiquid = drawLiquid; @@ -31,7 +32,7 @@ public class DrawLiquidRegion extends DrawBlock{ Liquid drawn = drawLiquid != null ? drawLiquid : build.liquids.current(); Drawf.liquid(liquid, build.x, build.y, build.liquids.get(drawn) / build.block.liquidCapacity, - drawn.color + Tmp.c1.set(drawn.color).a(drawn.color.a * alpha) ); } diff --git a/core/src/mindustry/world/draw/DrawMulti.java b/core/src/mindustry/world/draw/DrawMulti.java index 580184e606..2aa69d1eb3 100644 --- a/core/src/mindustry/world/draw/DrawMulti.java +++ b/core/src/mindustry/world/draw/DrawMulti.java @@ -1,6 +1,7 @@ package mindustry.world.draw; import arc.graphics.g2d.*; +import arc.struct.*; import arc.util.*; import mindustry.entities.units.*; import mindustry.gen.*; @@ -19,6 +20,10 @@ public class DrawMulti extends DrawBlock{ this.drawers = drawers; } + public DrawMulti(Seq drawers){ + this.drawers = drawers.toArray(DrawBlock.class); + } + @Override public void drawBase(Building build){ for(var draw : drawers){