From 5a79960ce0085b991ffcaa1daa0dac2fe5ccb7ac Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 27 Sep 2022 14:57:53 -0400 Subject: [PATCH] Minor changes to disassembler/separator sprites --- .../production/disassembler-spinner.png | Bin 307 -> 573 bytes .../blocks/production/disassembler.png | Bin 2253 -> 2224 bytes .../blocks/production/separator-spinner.png | Bin 233 -> 315 bytes core/src/mindustry/content/Blocks.java | 4 ++-- core/src/mindustry/world/draw/DrawRegion.java | 6 ++++++ 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/core/assets-raw/sprites/blocks/production/disassembler-spinner.png b/core/assets-raw/sprites/blocks/production/disassembler-spinner.png index 63758c0e823d475e445b590ec596a7c0dd760503..8fe3e325267cc720931542a210caf583a56530a9 100644 GIT binary patch delta 536 zcmdnYw3lUqK|SMlPZ!6KiaBp@@AW+#Aae90a}oy^S69fqrmk6@0?H{Z9iA&z&QKC% zWo3Qxnv&QadqZxhYL00Rwa>lW!JT)+MM`1_6ffByVs_v82N z-@6yj|NQ00glGTv_3dl$c4s`Op%Af(NhY~?*~fUVu=<88W(#s2dUJA5xWzKnutxKy zQOW%qn@Vytt+uh8mD)FD4?|`Zr|9A7llUBi->})Gex7>O_Y3QpK+7L-H?1GU1TZkf ztaH77;=KOr`s{Dl&su$zs#*1S?}+ok^eEc?Cl$?+R9)f_pT z)2tKL%s3s{wTo1p`QH|hQAyRif z^w6T;4PB1%k2D%Rp~hbO-0^Z!eK>A0e?|Q^kpRs<^H#S!V-4Zi z|6F5XCgaq@?^Ej!GBc!k*zY@AyFmN5%@MHEv|}Bvul1T^EFZM3;qC+N=@Y7&q-Hnx z*D~mQcA4|-kRR{<@U<;doCCVcIXCT_KVeFVdQ&MBb@0OLdSfB*mh delta 268 zcmdnXvYBauK|RA;PZ!6KiaBrZSn@F$3b;Bxm~*5MPJb<{e_H(f^2W2fZt?tj^^8AOX^X_CyJzLCTq5cY_?y>9*d9`} zJ+NO`!KcB1@em6G1H+7*Tb>U$2cP|tnOe0@Gyl+ixq40YGqZNuI2=DKpLQlrYQg7c z{8zIJB*fJmW-uf&wQvf+8DUZiwHLOvzA~Ls&uryB!|?YM_kiOZvgvFL3{?^TQV;J} z(Nu+L+V(}irxIu7&VSSdTi(^Q|oVT%ivtryOY@>L}WP>ag96CD5iBro-ETss6DbEaxd_1I<*y&~d*m}2Rjl;9bGY0uA{`EI@Y`nP$n-rcn> zPdm5s{+~MI&0jygx%%ki4m!*Gh>!L@``~UrG_BruWJ-+N+;i19>wdFE>r;@qyPH#$PWV~b5IC+B%qh?V{ z!J)tp3i2l=zr9$a&&8nAJ)yqa=Tqn!XBPcW%sZ4kT2^u~OmUqsOJzfp;GUEG3tT2d zxo+iSxW_3_cRkK;qI`R-JAa7Oaus{iD_#N%5*Qo*{D`_`)iu%WoZ|Ij4JTy_SA*qs zPfP->nT|YJ{=G;kWB-)U&V-F--5ht+UQJ@K{1kjdDdOywtsHW$bK6y~%v0B{Pkivd zO5xwzP`7PD2RF~V*m2-&{c<6{wF;{C-+RnHNyr>J_b!8*wIO|e>E$_2!6&orcA5D6 z@+s3$Dwn;`RMX(j(S9TB33HkEiB^3x=i(0v|9^e`@vrKA!j+%*lQ^S3tu$HsL9322 zO_t$k=Uf}XpHl%VtmtYrD#);i<4m^3+_3}TAG|Rj8({f!FbM6+%$2!frAYVWK?*;2m%uAG}C`j6gn>zES zoA0=DFV%kjr2mh8uI%_zU;mI_W_z3tIshr*DTO+w4OBENr%Cq`+;NKj&H9xtGgb!+6Bzy|MBvpz4!k7y86qNZNV~; zC;Ao7CU{z8GB+s4)a&Ke|J`}!etvxIY~JWC41LBTp@!8H`A_I9{I=$*P*8zgkJR+5 zN++CI^!oh$#IHnfxwD)z4ifa*Fp1ybRYPcpK$m0RcGup7&Z!Zu9~9&h!Vc-Wdc0Ox z%Q5Rzly;N&PlgW*T<)06N*q|^7;SnN_ibg4dQ*A6Lt6;b2+ z_cMMfYqbjZwiTUt8s(HJVbidw<>y6+{eW5cdhU*FS`di2iS^sa2f2eDzBcNZhXD?r1o*i2qtsJs0rskx-JqpHu;xU zQ#XU|{+e!%Szk}aRCFeYC5RsFb7MLED@D)7#ej3eDWm&~Eq3*MT=aaN@-v)3yKg!k@+|qsWZ1AL7W%~tNOti|^zgOzG z6J&Gp|Fh@Cllxz!7#;oaO6KtD;%h}KrFN|A)^(`}P|8uS-KhMNQGee2F0roZmz>YK zUVk=YX{NonRM$6*_&L6dvy&$e$AM{*T;lE+VGV`r@pJcoXW>3iUtZQ&- zk-8`(xF%axQd_Uhv(&zdkR$zp}if@6Us6xuyR8t(VJwT{4L}$^Y}wj^)emU7TO{QA4^tOJk8+ zT@~*QorCq49`_xtnm9j>J)`~A!*^2$rIP~%4OQm<} z5#M_=tfXcg{;lIQN9^1U!ScTwUT0_=cYj_hqUd}0-oX`{57vA9vTu!WxPI{hzi*4o zPex0@Ew`^;aZxDuKYwsju~);^&1tT^e+6iIF{|2URXh=6+J?(u4*QB$%H?Ljrg<<}kdesP<8(W?ne^Bu{GVP;@^@;0z zpH|LOoZNlpuu#zlh55gGwiRukFh7o6C(=Q)>Dsglhn^n&JvZ!=_xV-Z*MHyCQZM$T z_;7)4M{BNg8dfp7XzQSv^yv88{KYDc$1rtnwi_LlxR9B2Ikf6Y*MsI1#(wtMLs#*L~gbP|}Yn^ga> avtI0U6?iA>>d3&rz~JfX=d#Wzp$Pzi%oS1q delta 2228 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 JWt~$(697LzH^Kk_ diff --git a/core/assets-raw/sprites/blocks/production/separator-spinner.png b/core/assets-raw/sprites/blocks/production/separator-spinner.png index 310c92c02059df567acaab855405047a2720cd2c..0ab52e41dcb86e99d47816f2ff2130d8d259d054 100644 GIT binary patch delta 275 zcmaFKxSMH$Vf|N67srr_Id5+q;_zlu z^3ngM3DpNGe6BMxFfcF(WX*YI<5wJZ?%^`2ioGAMe^#8?opNFA@^u`FH3#;F+gY_- zIN0~@`w4+}fy`G|{bXQZ&@I-M`8%Ob_4#MN=^`^zCw|iM*0W8h-}yr$Zo5Y@L)TGp zImH=F0ebs3v=vx2NQuQqIA#3PE3j%TVrYmYDNVV$B_QNlPqzd?!R zs(%Q>0eencufBWoO8uelm|k(NXx+YYZ?3>yE!EN@Z5G$1)4ske)BPcjMEm+Og!xKx{!f^VZnU$;~fS{`>T9rfL!3|>gTe~DWM4flz3PK diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index d087f4ae94..e80bdbb3ea 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1063,7 +1063,7 @@ public class Blocks{ consumePower(1.1f); consumeLiquid(Liquids.slag, 4f / 60f); - drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawLiquidTile(), new DrawRegion("-spinner", 3), new DrawDefault()); + drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawLiquidTile(), new DrawRegion("-spinner", 3, true), new DrawDefault()); }}; disassembler = new Separator("disassembler"){{ @@ -1083,7 +1083,7 @@ public class Blocks{ consumeItem(Items.scrap); consumeLiquid(Liquids.slag, 0.12f); - drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawLiquidTile(), new DrawRegion("-spinner", 3), new DrawDefault()); + drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawLiquidTile(), new DrawRegion("-spinner", 3, true), new DrawDefault()); }}; sporePress = new GenericCrafter("spore-press"){{ diff --git a/core/src/mindustry/world/draw/DrawRegion.java b/core/src/mindustry/world/draw/DrawRegion.java index 26416abaa5..6ef9259105 100644 --- a/core/src/mindustry/world/draw/DrawRegion.java +++ b/core/src/mindustry/world/draw/DrawRegion.java @@ -26,6 +26,12 @@ public class DrawRegion extends DrawBlock{ this.rotateSpeed = rotateSpeed; } + public DrawRegion(String suffix, float rotateSpeed, boolean spinSprite){ + this.suffix = suffix; + this.spinSprite = spinSprite; + this.rotateSpeed = rotateSpeed; + } + public DrawRegion(){ }