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 zcmV-W2CwXUG|md?J5hA8fZ<)eD{dc)2^_-R%u|%=MqYMavV@ zY$pB+zW?C`d2@cb{<{8Me&Pas*5V?*`6(^G`dXJdp_uuhzFa;vFALBB0M~pcO9))^ zomxOJ1t2xw$pV7Zd?#xNW&ldf*ZRJ%S`#fHm;k6X@6qEEmGb}}&5H$o>3OuJ4xoRw z`Ecet)j$YMtA$Y7jHRRspw|5BSI1gKiRzor|E~JJHUu>QT=S!SfDh)cPw$^*eRWZs zkB7PZYB2{8hY;4jm^2}%0MIhu$w86rFawavxtHgg{eLzve|ISYLM#>lwh&AJa5_9^Z#)kgn!mfG2jSV<_u1pE zAXH^RR1oHv@83*Gs_9?XKUYac;`f$0Cg0uOsAfW{H9%@UpgUY$JKS7S{#t)EnUHac z6`l=YlQ%e)?}v&FuGNkgN!1KM?#anQ_+Wl&yvSuTIS9Ft&6W_F)_|O%5P~P4f)J*W zF$k@u8oBBU06;(>njI>QrP9a{LT}~+6#%GUs1=}g5SZpWr66dTPc=_9!x2RQQs#40 zx$Ngc^POT4a^;egTN8p90OxaE5Y* z1j30G9{{iqfs(5+oMUt4kKI2P0;>s1^*&1r=;Rw3nwvT{rm#6meV%_iw&vcr%~2Kr zXS%Vppp>C8lR4%)#f+u?A3L`8!2);?k^m&D9HhO+l%e5gv15;(JjA;{{vkixo7_)4 z?YWu|N|J8pAVk}#(!7}}90f=6L{oBYzXK4)0;#BYK$W|+uM>+2>OEmjx>hU7>{v~x zktDq?mFa{`EAyQ!Ay|J+$V@UNSt?F5)1oG5s=L9sPfZ5}pmZ##XPEVinj)s+&o_JKOAMUad|;v= ztO>!_p_va%m<4G=I7IV-iPKQcn7~y}<^u`Inkp`@VU-n-4H!Ko1ZkapCOE z>>$hs1VNZGb+womy<62H-IS`t{Oec8Bv=V7Q5F<4bt(vMWn8UF&6gY>lQ<3S1%ls9 z)j*iie4wx&U=4pE2c~2wf|DWnYGFQ*0FZlm&I&?_`A!lDEzM7D0GM4HntF98we^d1 z4+f4X^Qnn?&YI7d#4nd4JxiC{eKFevmF`#)dm2ku7-%d_%qeDm>69vG>&pk66Roc< zW+gjUtxvb))94`hHK=uJ>O)FB!ItI&f*`D26GCZD+~d?_Pe#jt#Mx5NfrUtH%T@^JgcQ)9siA$b+YEL~1#SW=%+$?+0M% zHEYscCzTno8VITHK6-powJ`SX_9ofy@C}^8d_ZwhUK@g6J4zt<##3o#59R~Pt0J@@ zP)(C$^&5X>xc|Ri%m)mXrAQ(8UHoTn-zSacKuC3}mgk#$21<9))ixh6S{GCbfz#Ba zAaItiyQZlJ^8v$!SsXKbarcd0UtP?Op1m2Zv;s4X00TbmC|^p<4GV9TZ|W$+Z{4-E|s4Gj%VsQ&;&+!2Gio8&?O O00004naIyxg7e?)HW}=K9ay*z$0i z&D3AP_dmQKZ_Y2*U)R6uPn@C8T3p08Kc?kZU)xeA#F-!J%jMJRWdRxhkecsQ6N1!y zrxp;Z0??Z8R0D$6e5cwFssYF~-|G9mN=>W@p$dRf^Bz4uF*y(L(L65jYtLgXa{zy( z&4)AJsRTl3S}BCwW-KOC0Hx+%zdE)m3af8E|GVh>))349NX=*a03Xa>pWZ*s`syM( z9}jc+)nX2ShY;32PL>c%09cvt}Fy&5&M5={%SGDYB9(9bh|f)!1Zdma!DSZuv}IU zR2?yGv!l(c!{c4BrObCadh&4h_r2aVJ_hCxh<}~Z8cTg&(=ihR;5tC58<0S7hDwG6 z!ig0h0I&~%lB+S2V^ihl?q3Q))C9$PpScBe@(m5mjUCG=Y>r}|r;dLuxi@KZlmsA| zZpKk~Gv zYCG`#e@_e&rzNS|@ zwfVqALD&+4uR}8*m@o^nhH!}H0~4pAp^+sqL8{Pv?LeHhiUEI=&WN>ykYj%7{iS45 z0}cT~kLCjr0NTz|O9<3wvFXLB&5s=)tpPnkh=HLX^lUyLXo7lzAZeO>!+SR$5XOKW zAZX&k*_+uxm=7p|FjctKVxIMG)s%TRr=0R$zd9ztYVJ>!1#yL(3W8f1SE^j|HOF&O zr=gY*O43cgnJRyQ5X+uwn-66618PG^fyo()kYq@{T9^++0Hj`?s|6v)d?yWrmgdJc z08Fk8jlDV)+xkVj2ZKbE`P4+cWX&fh^~>dm&(fuKUraVZxjU9{Ph;-%q{Y(2lsNNq z7m-P}zI-4#(faCQma}u!`gBV^jShlegIbJ)`tl*gp5T9)<^zf#Y+VyVl`d7(sCJn& zo4%^Dp#KAep3Da_($GVO(3|;yFb0J3A-sF}oj5jdF(K4yF*lD1walNLTu!%R7N8HF zz7etIB$hQHX1*VQwbv|3cb!aT#7ZEY_MGL|2;y-))K5DcCLabA@Jm1_iP`it+wfR7$ zbwRlhBuz~Wf@Jx+Ynpm6AE>x6OJasE>AunHtBcvu^VfTB%uX(6(mY&ie$96ds;-RF zLP*K)fA|pmT-^G%UuwVbQGIEm20|=lqZXV$y95xL`{GlE9Vho=$BSzy;!#<^zUJP)SX& z4%QNtboQ*w2O9j6Udhjz)T{wgS(;6$dJxX}dBR>)+kBu=7IcUZT9^+sd`0PyAha?c zX#7Num 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 zcmV+r0`L9S0;mL#BYyw^b5ch_0Itp)=>Px$;z>k7R9J<*m$6PlF%*V>2#L5F22B_o zhy%!-d;r627<>UX!(@z4;1f6#HWOzC!sK9l049_>5C#Sk8HlSm;h?=K?K$mf5&wh) z=(+vBoVMrm<~rTSH2@qQmm$$&Hg}Fo=TXW_Czcq5ngc*SO@F7^k8L1g%z@twYzq-< z4gdx9B~7QORx26A)zNe#u)lZigfP|odhtFFXnR0G0KnzPn|DH&s95g#y!l7vsfW>U zg5`J>1>uUJ#tK9n0AMtnAi)VrwPG+th^!2l5L71qQfvlv2s0DU4sv zbEQ(PXc;OX7X)PvXiMOOP`c>6vSSpO%X|YM1Y#SRy~bGw{zGIh*rm({mH|l32kkmL zcDuh0hOq7fl*}DXK@8gU?1%#Xs;D4x*Ee@0c5`kYBY#P$U5-~)0|SKj0hc-8KidFb zF~#=*&Rhba#zG*x-7pkFiMvmj+G!n-G_c?dP@PhjxrDwwT1E9{rwUQ@Ce$aBc2VjLEDC@!jD-jWa2drwd;>~V>G|am SYDWM700{s|MNUMnLSTYEOW+v* delta 316 zcmV-C0mJ^N1l9tOBYy!MNkl_Q3R8ySGSo%{xH>*#)<4~>C*^*{b&h6lR@%QoP;a|e9!N<8uTI-#&7Yj_?uGBzLG!5Ij#}44}Tnw>fZ3gK1X@H%zvr<%71DK{$zjU&@HSvWpg*GxaOMlU-r1Uj0tQFk_>4KGX^80 za-wv`yu7okc@)dTCCl7)9D9^HZ?53Et(9|g(_4ypVqe^md>FA*`>eIHOmgm@6m^HB zmh{}-`8+HhJs(!={W$p`L#N;>w`2ZXj6%viQnL1%Y#u!umK)Vgs$rhID9Pen<}G0S PFfe$!`njxgN@xNAtYD$; 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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 delta 487 zcmVVuuPk+aZ(=+NGP@IY`o^d6#>4u@t{8clX}=z3=XF zz=~y2gF=Y;$FPj1b?pySL@gS#cN<^CBFpdqny*tqt%-odKz}R+fCQ01!~v|uC4U~g zqqO}kj|M{9VV+Vp_J25PCQ_2B$)2UGRT$wy589Kb8yKq+D=Rool*AOK+Jvk?m*Jp)%~C&*MEL&dZC!`Nht zaGbM10u(20xOM^O_LH=Du*)QpIzZWOB9#lQYbdk+FI*r2bh=Lpp>%+A@cQmF1fl~K zdkuAE;>Q1aj8+0L>huy7P{p$xFood6kpOi#k#}DQVqnzi`Rl1%L22CrFRAQmnm8o| zsKc>jKO}A;Rri464BS88dyTDp2-GbIEhl|Y*KOvxg dBTQgdt{)izup9h8ZoU8j002ovPDHLkV1mb?+@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 zcmV;u0Yd)e1LOmcF@K&(L_t(oh0T?{YQr!P$1fspU}^|t&z7N(r6xn^UQ$B$E`Ex1 zGR*@ttC#M^L}bqt=o0AQsm0ywkvu)#dft8c~< zSZ_uJ|9`muYV0B8Q5nSZJa>SUW(BsU4x)lk0TAho#@3rrA%7~vSmNYI3oxIJQI$jx zr^u!NHV`f<7$3o@Ae?KUD~L`3T+9kUcMJgbDx5?Co6hKCgWs&&KO|+szn`zd?5!~f zV~O^bL;*yQ!C_VXFJe|qrvLNv*|@PMr5ON}Dqz>P6#x&uh*?8YEI1$M5CHmGkk-K9 zumV4bj)G67cYjJ}bvTn+KmmB>;nTA;xR_-dlPZA8?qWI>jM`8peHSXA05;jTh0rQs zQg|uNjzDanlx=8hE^1uqLdV18IqptLNX1c%N{^c1AY)e{Pv=CAT!gw=r$rsDcoFrRR6XQQ$2G(h@@+! nNAUi0T|sb%IuH}dFV6k|%2czdhbp!*00000NkvXXu0mjfagWZ& delta 446 zcmV;v0YU!c1LXsdF@K*)L_t(oh1He4PQx$|$FCM|5D}>od$$fqU5Gj$_Nu62XUS8P zDWVTR*DUN&RI7WZN-UKaGC^lHlt;i}h#cJH{FzjxHzl_3?stEmZGaP74;#$$y!vJ= zfz^6Y@c;YCXTyh(2W1k^^V|VanibfZI*1BF1wf=T8e6Rgg@33FV~JB7Ex>F#L{$<& zoHCmN*g&|bV7vv#f^hDEt{^%Ea4{F<}-|2$^JX#6)nn+_X3Da`<&Q~|rTtpIrPdCVG;V#)b9hXBy`g0u(v z`z826bdY>BzJF5&tHYV}0t&z@4;S|DN_h-z%|(s#dW=p2u-k50CD8dBDc}lW;)en(Leh9dY#?^qO|>42C7RVK z;6Y_a(?uyMz#=3)*@a}9NLM|8q6hpSg821W8$f2JzBlM1N-5l2zE}UY4^zEzKZvAj orCad!eO*EDfI1Kp$^V`G0-}1espEV9Pyhe`07*qoM6N<$f@g2am;e9( diff --git a/core/assets-raw/sprites/items/liquid-oil.png b/core/assets-raw/sprites/items/liquid-oil.png index 402be18572f906b3c7b963f8f13ed2517af07b81..5af0c2531a0f3b4c3c07276a59f1069dc0696881 100644 GIT binary patch delta 400 zcmV;B0dM~N1N;M!I04O(IYNK_r`+T2z2E!aT@Ki@94Z*c@y{UWz`J@)0>Pk}U*p}Y zi#TK%9)Rb0F*PR#qJY>500|<2PyrmMl0Q%1F&d5JtAWh+*oaI%et81`)GDPU=KDU+ z3Bm+H2|C)pBnglPX|IOKxYeJ<N7uGddqKzat+t07Kqo-)PL-K!+vIA?(b5S>@6uC#c%%Oa9GK-q31oeQjMD6{@A zTp$5Vx-SZ$b%1m5!f=0{0WpD6UPDvaxbgoVqbS?%g+m zh@wq0pURb%(Jc^3WmnV2DJj6D+i+w*ByJ&H_kiXMEEXTy1Vz`90KK)Fd~>?^tx31x ueBNEK=1RAqw{{_t2ngL9VFSB&Z2<=iwo!ra7vlf`002ovPDBK*LSTZz{<$mw delta 400 zcmV;B0dM~N1N;M!I04m>IYNKWm^5Cz0e07wuCgbLt5mHc`7j?ri&j|MW^V)kN}2AtvVmYbuqzn>=(YhccVQ_> z<^==*9Dm&^0iPm~JyDTE91C;GH(z(F8hBE8_ z!UYn*r2C=}S_e1>FARU@84wdFwjT`^#G1?126m1F>(8aSHu!Z2nkpPo!Blqr` zKt$0dSx@Ck%jgz}q_V4N5au6sap1{RACZGxh)BtUQNCf}ScerwWg uIG=YHthLfD=&fCdBmzSBM%cjaU0a_dwo%vUkwgFh002ovPDBK*LSTZn3AE|} diff --git a/core/assets-raw/sprites/items/liquid-slag.png b/core/assets-raw/sprites/items/liquid-slag.png index 21b9d3ea7eb1dd86d35673313514f4e0654fd8e3..1b17f29e504ae116bd62917176991311adf434f1 100644 GIT binary patch delta 444 zcmV;t0Ym=e1LFgbF@K#&L_t(oh0T_+Zo)7ShJROm0T?lqOF;s38a1PO2RTE8Y{H|+2|%z6fMXZ_s{`W6 zAS-%)`v3sk-`%9qCXe~MR?Nm3J$-B2@r)a5vtKv9jDcL2^ zl9!KPDmh_q?teyp0E6um?cpp-4ghHN>TECqqH?)NfUNTMxNlEhv^q%K5(J&`(m0|q zw6^{TU9bVjs}F>z?0{(FMN1RJ0g62boaNDt^Zyxb=KIqEgsQ3l5rA(OBz`u4((lU! zVl&_C-?MiJrzyyS+D6l-QyhSTr0H8UDnC>%QM3H3x0B3CEfrt1ueJP}uNdRnSf_Or(0DteRFT@uQcKr$vZzGd0 zK0W~eoklJ9HFu+`LTN5yKZNc90FW!;xD+Hnr%^Lz?_kalA)D|h<^&*E2Eb8;-%>!_ z8RU!}U)}%!w>MX5w#j||uhpwdljmK*b-_88;dQaXU^~@aX7TQIIVf7{V^ti-EG4@H zTJiGnOBE;l&41m<4`8sJqCK2t#Q^}VUY$)wKvXUl36RZvJ?`6!7g7fqw**0Fyflxf z4Xx52K?NIteD;A5l?sS9UbHkp9H7{9z}Y<1_+OXNNdPwUeNcg_c##6W5Ry0>K2Bs0IbJ-Krjo! n)FIXnK!?Z@3PGgf{*L_sO#XS^OeSot00000NkvXXu0mjfh8e#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 zcmV;}0Vn>31cn5VIDgHRF-yZh6vzJ&cd3Izv0a2va8u~&AQ-y0egV-8ogCX$&`;n{ z#mS*ivWtZZjs}`RDU^bX4IMfZ`~-0^X=2{py-O|aA2QtK?!Djp=Uxt2u?%W52!i>* zvr&1lqlu@pR(j7tOP<6a)9?T)buXaSq(CGPO93E31Q0TS4S!ki7xx4AjUDlBAn|#! zhz#C)dj|lR`CK%2elz7cLAa3Ffw%e z+N4b;4wF+VnSTWgN8@O`JH3(u2py*&j#1S$L_Z{MB31Q(4&2uZ zWdM=5dr1dwzxVKUUHu)2oe;^fx(2MOdZ7p)gs5+Q&I3YyM{q1(JN*DRB(=spx5lIZ O000031cn5VIDgfZF-yZh7>3`7yVSv<*e*gSxG8jX5DeX0|A1(QPLAy==r3@n z;^a^$*~LNyM+42E6iUIxh7KJH{(`ueG%?@ZeV1CQFLcN?_kGVj$>o3*$Djs-Aedix zHY#^^H1KfJO3&GA$(tBt8y-NV?gi96DG&+7QUFL00fY=-O@CJW$$i6ZV@o_6NIae_ zA&d83UI74RJ{OIhUQKx>2n(4F#KSh>+1!$105hLUte%@J5Nrd>iWY$CF#!4&mSR9> zXRK3$ot_H-I6f=`0D}AT*uM=viDxUnl2QYmo||Z1eLPC6tYj8azc8T%-}j{eq=7KC zNtzP(AZCMpbU#%q9<5yv78PyHET)72j#1S$L?0w>Bh~5w$vaSNI&h!Q zlm$fL&Ls_8f9~Mpvif}`HX({*bq!cm^^GEc5Td^EJ}(IM8NpHh=kf*YcD2SKOv_pT O0000Vedw!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){