From 5a79960ce0085b991ffcaa1daa0dac2fe5ccb7ac Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
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
zcmV+z0_Xj+0=)!~Fn<B}Nkl<Zc%1Fqy-mYV6vgoaVh9Qfid3G0ike9fBV>e#NvNrq
zA{7M%1zSL6DMWVS$bRSEoBV$zAjO;`zmGgy0ssI200000004kyuA(ns*W3HY@3Fu6
z`T9Qi``i1wqo4Ei_>kuRzK*_tOGg30C?Hs>0vuy=rtx1&R)2uhHlS?bO9=~*+60v`
zd@0#7bl=#rbZjX)wgk-@zLdNGX?h72!<Ui{K~wAoK4tTj)lKvT%uzY`UfDa~Tu=Z2
zT&_je$j>k9e{1&F%{uiOe5(Du$dY@Drjzh~Ar(zIB$}i7DyVV^t;3g0%g~A?IKr2V
z`+!O%xWbprUw=gml@L8qJHsBrPB<6^1fzgpi_QUEw;KHUcKf;H$JiWu2y6+KJ7BDs
z%pBoM#v!Ou39j%Z^Bhp21ZVgXlW;g|0Tm`=_c^nzfC}OFoF!Nas1$zBRl=hCfQmsM
z;wXVhI2Z*4qkv%6^ML5@{)Y@5ushEPY<ED$@W(ixsDHK;P$~SLtAyqSR1Cl8D4}Tq
zmBa64f58I)W=KE2&3&LN`#i)>I2Z*4D_ua>txB9TA5yk}-QX*ika~g|n}AP!04(!F
zoc6*_4Zl~dgp@;2i+2gKzMqh;fR;gJEFo0^j)1b2kg9-7L;=Al00000000000002a
a*B@b%j1ko3+zCkl0000<MNUMnLSTa9L-c?E

delta 268
zcmdnXvYBauK|RA;PZ!6KiaBrZSn@F$3b;Bxm~*5<SuyDy=R{|fX_@urAxBwq?G2N3
z9^U0+fC97a{`?>MPJb<{e_H(f^2W2fZt?tj^^8AOX^X_CyJzLCTq5cY_?y>9*d9`}
zJ+NO`!KcB1@em78^NgHZo)0$%pZ$`VTD49y|ImH8dQJ5+vv%4z96u|cb|y}0!RKfE
zSF;Nw#MK;TFeEaya0<W~VNwdU7q+#&GM!S-Y~?<~@b?t=fa4sp>1+%PRT2ME5ARpe
xRE25U_C>$tV5%&4LF`$kx{rs{U=G*#!0?UB!Dgw3;BSzSr>h^U%Q~loCIDNkXGZ`4

diff --git a/core/assets-raw/sprites/blocks/production/disassembler.png b/core/assets-raw/sprites/blocks/production/disassembler.png
index b99ebbd59879c4fecbe563f1955c3d1d132d2676..ce6ded3a03d9abc48deabd25b80910d73b3137da 100644
GIT binary patch
delta 2199
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
Z2L;iIMG)>CML_@n002ovPDHLkV1j|n6;c2I

delta 2228
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
CKsUkw

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
zcmV+u0qp+i0lNZ_F@N<*L_t(|obA}b4TCTcL{XB;a>_ZCAWCovQ7YlgiO!spBZP!N
z?6PCU|21HHz<5m80RR9101#@N<~&YwR?gw38hE|%*YhEni)7HPr>+Pge89a|K01WZ
z!H(|t$Pn&P1J$be0000jb1NMEkbWiS^G=r(nPrjkDoZXsV1K#zC|<Wna{!9P7ak#)
z0#Gi#u!e9tfEpHGSVCz2E^s=4tG@JSSWX1f8&E?C*5lB;1(YFpbOD!dfFcCdPgDTF
zKM6fbj@}<4k5%ph>ItZYx2e5t5Zx*zb#f~NMWvSY>2(M-+$_WOL&`P%Spon6006Y&
Z3r}%VFsZ-?OAG)2002ovPDHLkV1mX;cXI#$

delta 192
zcmV;x06+h`0_g#eF@K{;L_t(|obA~$4#F@D1<=AdJ0p&Sn7L<}A~AqKs%uC1y|K$r
zzB*X(vH$=80NtD_LT~rS_U`-jvZkLWJ@C`zhwKtk!@ga9$SmQU6*Q~%1pv@l*ue2R
z<Qz4~9FY++2mCtWMT*MYT|mX<BeUC2f(ocUKs5zaAE4Uq0y!$4u_CiW{(y=SDvJl;
uUs#M}1<k5`0hXhgVZ%)8aR2}Spr0qlh%h3*dQ6xA0000<MNUMnLSTZFcvu7g

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(){
     }