From 3bd4cc8e81d3f8fa5b840093d30fac573989cbe3 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 9 Dec 2021 18:02:45 -0500 Subject: [PATCH] Vent condenser resprite --- ...ater-heat.png => electric-heater-heat.png} | Bin ...-liquid.png => electric-heater-liquid.png} | Bin ...ater-top1.png => electric-heater-top1.png} | Bin ...ater-top2.png => electric-heater-top2.png} | Bin .../production/vent-condenser-bottom.png | Bin 0 -> 2049 bytes .../blocks/production/vent-condenser-mid.png | Bin 0 -> 186 bytes .../production/vent-condenser-rotator.png | Bin 825 -> 1142 bytes .../blocks/production/vent-condenser.png | Bin 2371 -> 1616 bytes core/src/mindustry/content/Blocks.java | 11 +++++------ .../blocks/production/AttributeCrafter.java | 1 + .../mindustry/world/draw/DrawBlurSpin.java | 3 ++- 11 files changed, 8 insertions(+), 7 deletions(-) rename core/assets-raw/sprites/blocks/production/{eletric-heater-heat.png => electric-heater-heat.png} (100%) rename core/assets-raw/sprites/blocks/production/{slag-heater-liquid.png => electric-heater-liquid.png} (100%) rename core/assets-raw/sprites/blocks/production/{slag-heater-top1.png => electric-heater-top1.png} (100%) rename core/assets-raw/sprites/blocks/production/{slag-heater-top2.png => electric-heater-top2.png} (100%) create mode 100644 core/assets-raw/sprites/blocks/production/vent-condenser-bottom.png create mode 100644 core/assets-raw/sprites/blocks/production/vent-condenser-mid.png diff --git a/core/assets-raw/sprites/blocks/production/eletric-heater-heat.png b/core/assets-raw/sprites/blocks/production/electric-heater-heat.png similarity index 100% rename from core/assets-raw/sprites/blocks/production/eletric-heater-heat.png rename to core/assets-raw/sprites/blocks/production/electric-heater-heat.png diff --git a/core/assets-raw/sprites/blocks/production/slag-heater-liquid.png b/core/assets-raw/sprites/blocks/production/electric-heater-liquid.png similarity index 100% rename from core/assets-raw/sprites/blocks/production/slag-heater-liquid.png rename to core/assets-raw/sprites/blocks/production/electric-heater-liquid.png diff --git a/core/assets-raw/sprites/blocks/production/slag-heater-top1.png b/core/assets-raw/sprites/blocks/production/electric-heater-top1.png similarity index 100% rename from core/assets-raw/sprites/blocks/production/slag-heater-top1.png rename to core/assets-raw/sprites/blocks/production/electric-heater-top1.png diff --git a/core/assets-raw/sprites/blocks/production/slag-heater-top2.png b/core/assets-raw/sprites/blocks/production/electric-heater-top2.png similarity index 100% rename from core/assets-raw/sprites/blocks/production/slag-heater-top2.png rename to core/assets-raw/sprites/blocks/production/electric-heater-top2.png diff --git a/core/assets-raw/sprites/blocks/production/vent-condenser-bottom.png b/core/assets-raw/sprites/blocks/production/vent-condenser-bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..07cfe1dc61c687d48c78c0a24d02bfb37d9d67d7 GIT binary patch literal 2049 zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&z`onl z#WAE}&fD1i*|P2e|LzH1SuxR5oqhR)H%$^RY^ds~M2z@wkt5m8Yp-2XGbWZ!XS`0;oCrTNpJ*{_RvbZb>MN7c7C z3yRK8K5T#L|BolNVK>9m?bClhlNIV z{R6@5xraWFId__Dg!kl{@4i|0lc=Ljg?-@3KpU((ZA>hk}5ryV@Hbidt-Kj&5d zXMCHX_vF8&;?$Z4C3(_%Is9yGHO)FoHv8QF$!&Vr6)>G);WT;Shp$ehZPI^tXwe~; zGo057Tr9je&qxUgIo@1Qv%0y4VZ|4QKI4XU>PJp}d6@CE=f}KBXOI6sm21_zLGKge zBS)Qb{|giNUvT*Bz5Z>h->1eCVJ>UF7P=OktpEE;V12yor0+K`2x#s+{`~x%6(^kP z-Z+|CurSUz^Jn9!g0{tb*}pR`2)elW`LmP1U%8!_|Mj%=$yDi2`{VepPc+qg@`CgA zbn`uH<1PsoDL?V|`;?r(e`cl9pB=xQKWsO1S&$R7ujs%%`DOPP!#{+a%8{=uf(b7Ec}Fps{^R{we1ACB?^C#$=dI_yP=SdldYCKr7c)3HapN>_ze?au0&21JzfrE9<;YoKz72Wn}p6Ixc`iZxP zqwUWNv2Nw2-&I?R%*)Ro)6I}NVO~((G|gCH16P;m3$ZD`9(>X}w7uL#QN&Vkk9J6c z|3A$gN&$)5OLEwEKb^mIqr+vEaF+NVy}d6Ulx~PlNc-j`f=f!Qshj=`~Fj?Q&&d>=9_ zSo~-UYk6*E6#LKX>tiKF7(TpsX!}W-$#;+6^s1(3drjMG4oEe<5=e|Xs4CBJZ*zUc zmk)B1s)_AfdW~jAxf^yy#_$~v*%==&O)b&L;r zvpayn>J#s>$d)NPLY18+I@R@?fHL_t*E8Qvw8b?{yU2aPsERSlP2b`43)T$Dy$rgG z#TTT0VcOF3X#4#4-JgzqJ<Z~KxV?3I-hIj2>s2Cu zHZfH0Ic=gWwk!ELw^l>diT6PfUC(Z_uj6R8Q|surN@_mAzH#0kqa<5LVNZ=Jp?PVa zcukZ761Xo+uJ4+ow1MTt$@NOpIRY8Qw)cHZ`&nu5`m)KSd;y_{8Q&z_Hy{7kvVre~ zXT@rnr0-_WYwMyPEUWG4R5&O3yz9bJjSS5@shZP`rQ;ZrIDc0O{&*t2VY8Z>@d-Ar z9P97VlMAHhOfxg}L z_p5#9p5vI%9l%g1>a5fvWL6s3a=}LYjINX=!=a7?r=+tImakv9DOEDVc*PadmD%$n z?V|rVO$dPP(dD z&i&xc$J!Ny9Hdzf2rfLC&e^9s|NPB!S2i9HQ&44LUf`PX*s*Vu=g(QuEYlcPK4Dh( zHj7_+yQYipr*L%KGZDpIT&G<3@otuyI6?ofM8G93=YK~wDHWZ+vM|hX3BxUC@thfV z7HQtxwk1Ak*%7^&rByi>4+=V#HaPozO7;uz_{kGiz5eZLlkjc)A&)bDfN?d{H5%=t+(dZXf} zclQ#fO?Jr<>7Kk?%bqFog{IqhD<|2*zTa|XCbA_|juH=~0qqwhY zM`UH=w?3mUKM%d!8zfl6ZpD7`*%{7ThO?}1KA*$7#d=ib~=?gKmp3mUb)1e)`8; ZySl^d+uwh?85kHCJYD@<);T3K0RZF}&Po6P literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/production/vent-condenser-mid.png b/core/assets-raw/sprites/blocks/production/vent-condenser-mid.png new file mode 100644 index 0000000000000000000000000000000000000000..b70942ba6b378f4ded0f0945e635198b7ccd0c81 GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0y~yU=RUe4mJh`hTcwDUIqpR#^NA%Cx&(BWL`2bFqC+@ zIEGmCCMQUUImBQ8w13~ar}ar!jD(UUjQ&4*`ncljgQ-WJYSpwonxgQ;HKr{|RK;x1 z2FWf(hc$^icw8S&$dWK~e#leA>uf%yQ^G0q>|xK_3aP0i^rowB6G_e8*^ oO>%n9oT7X#j6q%N5ArjpZ?sA{p50x|z`(%Z>FVdQ&MBb@0MT4Qq5uE@ literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/production/vent-condenser-rotator.png b/core/assets-raw/sprites/blocks/production/vent-condenser-rotator.png index f9ec07df8b73e82138b81e5bd832313d382d2f1e..09acceb3e5dcc7d8f6fd92856c53c733d6e52eaa 100644 GIT binary patch delta 1122 zcmdnV_KjnLay7aPVVwMEO8w&>+MG%LkAu3NTj;lc+Rixj1g%O|ft{&?^2|4Te} z?vA}}{a?2J%ncU?6mX;TU8K3f^w0hCw{5&%AHTQ8aCQ2u(B$A_>CaRS~U{|rI?ta>qlWPc6AfAg2ycfGRN zVe#kx{w@2TS4Fcvp5>;pw076~wP!^Wb86hQnpAoMyO&+QpvnKtIOE;cN$*xH{n*(P zG)d9_Mog^G#Zq%oqp(xLDo(973%7pkUc;Gsl-f7ditfg!AI<0%e zsQ7sLfq4(?cD&|1oK*T+pN%{G^V#)N7tGXg@O^B&?_I|WHb1Ey?U<}i1M${WRkWweVWqz`TmdUaF%~D!7Wh>JMtDSbSb}I7+Jw zQpridgS@f7-`#yZB}Ge9URgvlHEE`)SmOH0pH}X5G!zUvmY$@vBtzHfa_fwgC(_UWF6m)FXV^P>;*zwG%<1}C8+*Xde91d5~M5B^@R&<`U zd>Hk8N>EWt+4FOp)8nGMWdzGU%`s3mt$QbTCF*I`{%9Gs=Pj!Hw;tM6>&upSzxhi- z&9P0jcO?{C!^Bg3!!KW`Wnq#q<~C1Va`!^aF8M_>IUQ2$b6HR_G{cFf@B@G{B Q-+&}MUHx3vIVCg!0Kv2gi~s-t delta 803 zcmeyyv6F3ray>JHr;B4q#hkY@V*QRP2)M;g_r9Q>{K%+B+hE;6^~alU7wKM4aB`B8 zc*ei1^}UMC)~AQc^G+YQE6aca4xIe)>)*~m-KrYz%iQupY=?N|h1eJw4>~jmW_u{J z>gZokUJ=MNt-gEDAt}X#pZ+%wKmPpo>)XTisvEBKFZuc_y3W?~;qzyT2ZI~FQ*fl$N-LFvjDrZ*#5ie9)31cwtw1G~-g1ya`c^ zdw)+8nef2tLEB2f1AEJNelV7MSpRR|>{;zCFJycp4*5^s&h?Vlee>W!0%Wt{hIdlJ~fdM4;jumVskGG zs4zwxTCP%1U%%4Gcp>LOp*r6tl|M_fYERo=6sps76#ge9q~k8KGmVZHro5pj4f;rCF>4(GnD7J zbMAZTb4dG7%W{TyH#V`%H);C7G5_}Y4!hjV_MCFUGKvSXbEY4#IvB`gb8H){GAjd{ qfB+B69EO&9CILHm+LZyb)*X|tSL|(geR%pT5Z}|)&t;ucLK6U&Yh)$> diff --git a/core/assets-raw/sprites/blocks/production/vent-condenser.png b/core/assets-raw/sprites/blocks/production/vent-condenser.png index c663d143630e3c42df715bf2b8ed9cdbceac4d22..c2eb1105c95413dbfa6d92b95855835dcb6e95b3 100644 GIT binary patch delta 1587 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 bfAyycN9Wwz{jz|8fq}u()z4*}Q$iB}T7Gh! diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 61a8973f39..fad5a899bc 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1073,6 +1073,7 @@ public class Blocks{ requirements(Category.crafting, with(Items.tungsten, 30, Items.graphite, 30)); drawer = new DrawMulti(new DrawHeatOutput(true)); + rotateDraw = false; drawer.iconOverride = new String[]{""}; size = 2; heatOutput = 2f; @@ -2015,7 +2016,7 @@ public class Blocks{ spinSpeed = 0.6f; spinners = true; hasLiquids = true; - outputLiquid = new LiquidStack(Liquids.water, 10f / 60f / 9f); + outputLiquid = new LiquidStack(Liquids.water, 5f / 60f / 9f); liquidCapacity = 20f; }}; @@ -2189,11 +2190,9 @@ public class Blocks{ baseEfficiency = 0f; displayEfficiency = false; craftEffect = Fx.turbinegenerate; - drawer = new DrawMulti(new DrawBlock(), new DrawBlurSpin("-rotator"){{ - rotateSpeed = 6f; - }}); - ignoreLiquidFullness = true; - craftTime = 50f; + drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawBlurSpin("-rotator", 6f), new DrawRegion("-mid"), new DrawLiquidTile(Liquids.water, 38f / 4f), new DrawBlock()); + drawer.iconOverride = new String[]{"-bottom", "-rotator", ""}; + craftTime = 120f; size = 3; ambientSound = Sounds.hum; ambientSoundVolume = 0.06f; diff --git a/core/src/mindustry/world/blocks/production/AttributeCrafter.java b/core/src/mindustry/world/blocks/production/AttributeCrafter.java index 0568404d90..c40ebd6d6b 100644 --- a/core/src/mindustry/world/blocks/production/AttributeCrafter.java +++ b/core/src/mindustry/world/blocks/production/AttributeCrafter.java @@ -72,6 +72,7 @@ public class AttributeCrafter extends GenericCrafter{ @Override public void pickedUp(){ attrsum = 0f; + warmup = 0f; } @Override diff --git a/core/src/mindustry/world/draw/DrawBlurSpin.java b/core/src/mindustry/world/draw/DrawBlurSpin.java index a02bc29d95..760b2dead1 100644 --- a/core/src/mindustry/world/draw/DrawBlurSpin.java +++ b/core/src/mindustry/world/draw/DrawBlurSpin.java @@ -14,8 +14,9 @@ public class DrawBlurSpin extends DrawBlock{ public String suffix = ""; public float rotateSpeed = 1f, x, y, blurThresh = 0.7f; - public DrawBlurSpin(String suffix){ + public DrawBlurSpin(String suffix, float speed){ this.suffix = suffix; + rotateSpeed = speed; } public DrawBlurSpin(){