From bf1909295e54534203024495d38d3a2cd4ba5ed1 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 15 Nov 2021 15:17:20 -0500 Subject: [PATCH] Electrolyzer finalization --- .../electrolyzer-hydrogen-output1.png | Bin 548 -> 641 bytes .../electrolyzer-hydrogen-output2.png | Bin 543 -> 626 bytes .../production/electrolyzer-ozone-output1.png | Bin 554 -> 640 bytes .../production/electrolyzer-ozone-output2.png | Bin 541 -> 630 bytes .../blocks/production/electrolyzer-top.png | Bin 302 -> 233 bytes .../blocks/production/electrolyzer.png | Bin 1240 -> 2238 bytes core/src/mindustry/content/Blocks.java | 13 +++++++------ core/src/mindustry/graphics/MultiPacker.java | 2 +- .../mindustry/world/draw/DrawGlowRegion.java | 4 ++-- 9 files changed, 10 insertions(+), 9 deletions(-) diff --git a/core/assets-raw/sprites/blocks/production/electrolyzer-hydrogen-output1.png b/core/assets-raw/sprites/blocks/production/electrolyzer-hydrogen-output1.png index bae0b401462153becac4c23008d255ce2d1a37b7..f5cae9dcf9a97dc60097207fb680b3f1d58d88a7 100644 GIT binary patch delta 604 zcmZ3&(#Sf&pq|Ov)5S5QV$R#U`+W~P$Q=DBeuOFDk`Y7fgp3;vvltgRbV(=*ieyf_ z6tIE8RC>vhl!h%+5?O-(PI!9bx%K?F)=%CqcT(E6=6lgU>DxjK3=9n`XD*FvSo!Oh zCRZoZqzxZbxg=sOYdV?SLV4pCHC(*XsvmejW7eVROBNf7v$Si}D;RQl^e_qCdKWG- z;Z)iFNk=$54jr0)gSWTrYti)`-I;m$=cN9Z-+6t>=S13e9hH}VA6sYHt!c8_@Im$a z_S@{NEL!dPNnQ&Y7)l==U&P?=+@c@YFn!^n=^6@_eatpH-3~tfSsc*!w9=4CskJSB zZX1(Q3FrR)OhyKVfA(dqO!YhK9$$X;D5Y$IIV(#C=lu}x1q}YRE%~QZ0~*?Yx1V>K zB=)*8|MM0hjRmc(`M>lUnPgTyoNed5pn=Wz;q0STal6BVpKZSTASc5;_u=olHo*rM zOt|jF={FY@_p)$h1nMf9)Et&I5?s@=?&0iRLO0k{j&Woh)Y4EiJH)wFmi(Eb zIa+KEZ?8b{{|&z0j1zZF37FRwI)Q!ugxLPIg|=s!1t&a$^xwVUv9W*clF$ahkoAkE%HKJqrP28M^78%rH5CN48$&N} zR5ZIC(*Va#?g5V-&T7niPUtf4Ic31S=ZrCP?Y}#+3=9kh{(s_DQ2lt%WcHHp3=9km Mp00i_>zopr02=`fPXGV_ delta 510 zcmZo{<`UWxxQH8bA6J}n>FVg8CdTeT0i%$6w3t7l55vn z92g{{Vv1^57F=2ULy2X5l|T8E6I^pd_S~P}oqym5hr&UA z#qB@D`qjcVC{7W(&((TBW`nVt1Jm>cvWA@RHMa6!Xq#}0+kjo!OdJ=O+ZLk~z!-E+SVw$bf=5IZHs?xA6FQdG5mTjZ$GzP7yEeEtu z8)bI=`T1A+Z_jsD-W~>#s&54x4lBbsSSBoV=U|zjDRSr*%N!>L);j`OUHVQ8N6#(K z%qsLulHVXG=PSdoUQdoe|GgZ;-UWr;B4q#hkZy_xc`okZ5?we}qXRdC3Bolx~xm3|wX%MvhjqJVbIF z4vQ&V3N&y#!m(`EiNc!teV=Q^f7WWLJkj`d?}vKXoDK#C28J24wBM>5g!-Sq-^;-m zGUH*lz=9p$KDcrOgp~hKV$oQZ4I2CzG~*;kRR$y@1iL?R`aQyMn`#d*O9XEKDvZ zw%*KCc35E8rtj3Ckjxw3!tkm>Uf{%5v6_ALE@wCXjab9jnbdwiwvBHW?NJ=UH7@ng^4`g`-w&Snq{YRfNC7ElQ2dno;ugN5V6=j$d)O1sb6-ARVIxGE~p56IxJEYymfj5 zCzpW9llGZ^>-+RSC-4TiH83RKyX@WIknF19&|;`0pb(VLa-Hu+GXwJ+7Y~Vj9PJBF z2JPQAiGj6b{i3b=cTDx2(DXCMt@h7s1}`5LCXHF=ud!TkV@PEQIF^{9ctS$`Ow=X&yIhcyEOL&ND${I55?U{Kus;5I12Jzf1=);T3K0RTV}0O zDfaM$;T)aFY5#4W-`p6u@BY@T(7pPZLd&~27@*+p-JX9;)uk43VuDOO58L#e8qWSa zEUtK9*`bHs0tv<&A9f2Ic=PqKxmCpd=fBH8ZQZ@>epR8Tj^573 zsC9H(jW-KZNXFOAkChvO`X6=+I4r&X!Ii^6<~pO-&b<%be%+bX_b+`TyTnyK`x<^m zo@+e&k5)4>F#NOkYt@RJrkb>T9?OagNxm9A4h&1DaTnFGFlp5M)#>gy@v|iN+e|$s zMy@*_=3W!zm>|eke?L>Qk%4pNL+j_4x9(W5%rZ|vVWG%_k8$5$2X;9$^n|dy{V+F% zg-N7EFsuFjhwCoP;)!oR%#C1q*TH*CF5rOw1qYcH_FJz^rX(Nmn$@kNccdqxYX(Di zp>Tp_71NywGa0t4s9*TC%!YyCfL&qK5)tdaTjqty^-XWR8o+$ow6UmKpRwnf%Y%uj zQ%#)fswzG9O{<>4UVR{eCE&%*HfM&Vae^EH3*A|mLb_Z}$ToO$Y-o}{XjCKU=X`ce z|5}v;Za=agu~d|NWT~k5&Jw{r%i+AbArmw{1b#55Xg}DpXYv0qkcg+NpUXO@geCxT Cp4+bg diff --git a/core/assets-raw/sprites/blocks/production/electrolyzer-ozone-output1.png b/core/assets-raw/sprites/blocks/production/electrolyzer-ozone-output1.png index 0728839ede57ad2a9ecd47b7f5eca8eb9744af70..f81b37607ec3fd810da18fc2084035c4e905d688 100644 GIT binary patch delta 603 zcmZ3*(!e^wpq|Of)5S5QV$R#Ux_(C-B#wP#Kg1c9WXasd!YLBk$`#$R*^3|s+Khb$%UVv zB*Ew!@k40$!aVoy;d^(_c=jh}|M&Xp$mwa_HaXXNRrcEW@1%&!F9izN$ITMJ{QKoXI$}%8Xj5jb(olN}7#Qm1cRO{q)jc+@Pka91LHIq92?vDtWlncsoLJP7e@I9};n3}`)ykgg)Ay~8 zSJZA~a*Oz(R?aD6ut0X-$tb67mVb?FAI_e9`tP~DvjWbPHE&)h+}kSuccxAEXZx?c zO_!HHUUH|+jfu4CTkjZTWmsUq_fn)M<#*Ou=J+j;z zcxPxlQ_y~9+|$4~r)vd+`eUsFFJEvKI4)y~nY6~?UH2yj28P?6cNclYn!l{fH?F#| zM*3WvRmD5`ZJC+}GQBt-nyhJ3I?`hE<;JXq?Ue>hT#FkxitkGcYhP Nc)I$ztaD0e0su?K2KWE~ delta 516 zcmZo*UBxoNpq}xGr;B4q#hkZy4E+uph#dPUo{;|jmb5}?injX8LlaL$N=RxKGAy~r z$k%WvMRU`fA2-kU`F{StHh0mB+ESVQA!3XS5U^m^!mq43S1We*DY0B=(cZ_wxF#>E zMvy6DYCMSaUGYPSCE?rOZ=yPHt~|c{_f0y#>-se3`aAl+o`1exGH8x3m&3PGWzUIMS=Ne5fp8d@2;OU>1 zzgc_w8I=AA1a-gvaNUJj+$rzl+yIU}H%>D$&u-a6APctL_uqS3>^s#~tjG-cDB zwJt5D3pk8x1o@m7pN*GW(>|m6e*Lxjxyx&ef{pga|6pH#KrN%8`Jr{(T`3lhE5A?m zcQ`aKtTeOEWeJc<{-MMYAesF`iAAIDJEPaStq)$mwaw^zdpwD^L&WOOJ0q43gOned z(^wf8ENW%ASc__p*B^iW?(4UVdn_CR#x;wj8yUPb+w!+43pgzN`7_tW#q4$NrsF1p z91jxP@|W~EFtoq>&^twtBOy_G-^R%N>i(=-Cck-^B7QKPS+_o9^JiCuhGyNSvL9{Q zOpG?W1fAOR3tD|xgcDzU=-tOLM^L-R^gy$3fa9AM?o*`_r|c3G&eqS?x!2+PXmJPE zhr}4x9~Qfq=1f@0uv|rZ!mlMZ3=9WM3L}tBQ%GS_gha2U9;FtNPqeQ=AhS|FjJnM3ff z_(KDes5j@sgcO?JMQ-`VzkL&@m)3)yk23$8GjbUU-e5^RAZw!K)^La;K;n0U&km<$ zOm|MKWx8`}1Jj)|o0&BCzvE+IV0f_Q5A!7Z4?je&oIc3Fz`)??>gTe~DWM4f=2rig delta 503 zcmeyyGM8n7K|SMjPZ!6KiaBrZ*ykNG5NY`6e%1O5gRLX`vA#R4%3GP$8+#`%tX2(M zlDF5NlxDQ7KXI_^Y0%#_$x2o{^Ip{tLtX-cGl-!TskkS=ESuhhy8Q!O0j5&-1?*| z$PuvM+WEeI1~1(?v{QBQC&3d-Ov7sZT;qJds)7>#FOe#l|GTPrSQ4&x{mRnfz zgRkD#q(E>Q-+fNk2YnIgZx|*2u#_Hg+_8A8pR*;K&XS!c9yy)qSlYq3LBgD2+G6$t zyfYaKyo(sN=AU9_V8{_(?&`Jhvj6MMr#~y^M(~<$h!NiLy+G(dh9`?$WSEEXlfSpU zzihp7*yaYam2!jAX;T>{jjde{4NSU90t*5(oL(`^ac*G!!!hk)cY#z^T5XOhW7wg1 vVfF)yyV(yM-pzg>>HgTe~DWM4f&V3tZ7*FhGXO5^n3sNCLKQVN`G}Zid_s0 b40j%IF1V~BomxFn3MA#}>gTe~DWM4f>A*|$ delta 261 zcmaFKxQ=OpVf_nF7srr_Id5+s%xVr0alQEY*Z==HZcd&POm1A6H+!p_AJg>Rj`P(R z8KB@n_}bO%6<4?A-mcqwZPo1m_pV=Mp7YVxZS^Y#&-#{M44&mJr>b9EJS07zvy}P$ zGM5#5S-0x`^2lvSachAosc$iy)xVgbX5OjGb%&>Hf3U>hz~;$*(JiYI>#NS>bOji{ z$ct*}QhYzR^TYjl@>3ZnSqf(DXPp~)?PC7=A5#LQ6=n)9v~sv4ztGO%l5C<&!xLM< ue}`r;oP4YlADMHy+L^Wf4Aix7%K0t>Lvw)3OLtCdkeH{dpUXO@geCy)k8*_o diff --git a/core/assets-raw/sprites/blocks/production/electrolyzer.png b/core/assets-raw/sprites/blocks/production/electrolyzer.png index cdd56536828b1ab162a436e7e4db9546e8cec995..4558855096b359dfac07ca59248977c1e7c1474d 100644 GIT binary patch delta 2227 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 diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 6d43933bef..336542056a 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -955,9 +955,9 @@ public class Blocks implements ContentList{ craftTime = 10f; rotate = true; - liquidCapacity = 100f; + liquidCapacity = 50f; - consumes.liquid(Liquids.water, 1f); + consumes.liquid(Liquids.water, 5f / 60f); consumes.power(2f); drawer = new DrawMulti( @@ -974,13 +974,15 @@ public class Blocks implements ContentList{ new DrawLiquidOutputs(), new DrawRegion("-top"), new DrawGlowRegion(){{ - alpha = 0.5f; - color = new Color(1f, 0.22f, 0.22f); + alpha = 0.7f; + color = Color.valueOf("c4bdf3"); + glowIntensity = 0.3f; + glowScale = 6f; }} ); iconOverride = new String[]{"-bottom", "", "-top"}; - outputLiquids = LiquidStack.with(Liquids.ozone, 0.5f, Liquids.hydrogen, 0.5f); + outputLiquids = LiquidStack.with(Liquids.ozone, 2f * craftTime / 60, Liquids.hydrogen, 3f * craftTime / 60); liquidOutputDirections = new int[]{1, 3}; }}; @@ -988,7 +990,6 @@ public class Blocks implements ContentList{ requirements(Category.crafting, with(Items.tungsten, 60, Items.graphite, 30)); size = 3; - //TODO multi liquid output //converts oxygen (?) + beryllium into heat + oxide }}; diff --git a/core/src/mindustry/graphics/MultiPacker.java b/core/src/mindustry/graphics/MultiPacker.java index b286a3f2d6..c8e7dd0e88 100644 --- a/core/src/mindustry/graphics/MultiPacker.java +++ b/core/src/mindustry/graphics/MultiPacker.java @@ -79,7 +79,7 @@ public class MultiPacker implements Disposable{ //ui page (sprites5.png) - content icons, white icons, fonts and UI elements public enum PageType{ main(4096), - environment, + environment(4096, 2048), editor(4096, 2048), rubble, ui(4096); diff --git a/core/src/mindustry/world/draw/DrawGlowRegion.java b/core/src/mindustry/world/draw/DrawGlowRegion.java index b9dc5511e6..3fcd8fa1b4 100644 --- a/core/src/mindustry/world/draw/DrawGlowRegion.java +++ b/core/src/mindustry/world/draw/DrawGlowRegion.java @@ -15,7 +15,7 @@ import mindustry.world.blocks.production.GenericCrafter.*; public class DrawGlowRegion extends DrawBlock{ public Blending blending = Blending.additive; public String suffix = "-glow"; - public float alpha = 0.9f, glowScale = 3f; + public float alpha = 0.9f, glowScale = 10f, glowIntensity = 0.5f; public float layer = Layer.blockAdditive; public Color color = Color.red.cpy(); public TextureRegion top; @@ -28,7 +28,7 @@ public class DrawGlowRegion extends DrawBlock{ Draw.z(layer); Draw.blend(blending); Draw.color(color); - Draw.alpha(Mathf.absin(build.totalProgress, glowScale, alpha) * build.warmup); + Draw.alpha((Mathf.absin(build.totalProgress, glowScale, alpha) * glowIntensity + 1f - glowIntensity) * build.warmup * alpha); Draw.rect(top, build.x, build.y); Draw.reset(); Draw.blend();