From fe51500e8e5c81323c86bd44af38d87c349fa557 Mon Sep 17 00:00:00 2001 From: Goobrr <73060700+Goobrr@users.noreply.github.com> Date: Tue, 5 Jul 2022 21:44:15 +0700 Subject: [PATCH] Use new drawers (#7127) --- ...rbine1.png => steam-generator-turbine.png} | Bin .../blocks/power/steam-generator-turbine0.png | Bin 260 -> 0 bytes .../blocks/production/spore-press-bottom.png | Bin 0 -> 222 bytes .../blocks/production/spore-press-frame0.png | Bin 568 -> 0 bytes .../blocks/production/spore-press-frame1.png | Bin 562 -> 0 bytes .../blocks/production/spore-press-frame2.png | Bin 531 -> 0 bytes .../blocks/production/spore-press-piston0.png | Bin 0 -> 217 bytes .../blocks/production/spore-press-piston1.png | Bin 0 -> 219 bytes .../sprites/blocks/production/spore-press.png | Bin 1098 -> 1146 bytes core/src/mindustry/content/Blocks.java | 18 +++++++- core/src/mindustry/mod/ClassMap.java | 1 - core/src/mindustry/world/draw/DrawRegion.java | 6 +-- .../mindustry/world/draw/DrawTurbines.java | 39 ------------------ 13 files changed, 19 insertions(+), 45 deletions(-) rename core/assets-raw/sprites/blocks/power/{steam-generator-turbine1.png => steam-generator-turbine.png} (100%) delete mode 100644 core/assets-raw/sprites/blocks/power/steam-generator-turbine0.png create mode 100644 core/assets-raw/sprites/blocks/production/spore-press-bottom.png delete mode 100644 core/assets-raw/sprites/blocks/production/spore-press-frame0.png delete mode 100644 core/assets-raw/sprites/blocks/production/spore-press-frame1.png delete mode 100644 core/assets-raw/sprites/blocks/production/spore-press-frame2.png create mode 100644 core/assets-raw/sprites/blocks/production/spore-press-piston0.png create mode 100644 core/assets-raw/sprites/blocks/production/spore-press-piston1.png delete mode 100644 core/src/mindustry/world/draw/DrawTurbines.java diff --git a/core/assets-raw/sprites/blocks/power/steam-generator-turbine1.png b/core/assets-raw/sprites/blocks/power/steam-generator-turbine.png similarity index 100% rename from core/assets-raw/sprites/blocks/power/steam-generator-turbine1.png rename to core/assets-raw/sprites/blocks/power/steam-generator-turbine.png diff --git a/core/assets-raw/sprites/blocks/power/steam-generator-turbine0.png b/core/assets-raw/sprites/blocks/power/steam-generator-turbine0.png deleted file mode 100644 index 27d0b9354ccb2cf796ae87cd1a069c7d17708abd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 260 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&z_8EL z#WAE}&f6Q-e9aC#Es4eFuL!z3tt>vjWK)Yk{{&g_Yk%U;pAbshXwJj{0vbB&zb|)A zb2+kvFGk$TUVhS_t}`mUx2wGuvxcXvJK1zD>dXBmZKLf^bgQ1^9Tc5e-NyV*#&5q^ z%*0BUf39-r?6b6R2eXdc*_9sWL$OQ2{UHx3v IIVCg!05f}JQvd(} diff --git a/core/assets-raw/sprites/blocks/production/spore-press-bottom.png b/core/assets-raw/sprites/blocks/production/spore-press-bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..a100086fe3e930f46cacddbd2bf436d548664bbb GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&z%awp z#WAE}&f5!tq6`8I2OL^N9RIT&*}=b?rFwStd~3UHB@NdYWEYq^uxIdIV2om>6ZaOg ZI5*S8=_UVuF)%PNc)I$ztaD0e0szG}Lx2DP literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/production/spore-press-frame0.png b/core/assets-raw/sprites/blocks/production/spore-press-frame0.png deleted file mode 100644 index a8b86d93bd52d0931c94580c125f58f66fa9bd6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 568 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&z`&C3 z=SF5- z9&$RWwYq@2X>ONUl4??>>N{{nNFVcCJDvQEhC(#ezKHNRYTdsM5Wy;Z+LK;k44(V{7WsPu^6q;4f zzhloX)A$en-la92Rx^oby!=vc-L#GKq`6MXEf7teBA&6_A#z4&+yYL4B^I0aT!=aF z^JZe{(6|7jY}-@p9t+}B&mH^$ZOzbdNmv~Z@`HnYO53;sJLJ7~|}xa{nz zhD|kTXN1;#nmMaQl`-n)841-jL3WEhJAxU0o<99Kv-GgUtWI{X1-!;klvj;0#WsyC8>fGJ0%pVOSFF1aYU>DhA244eeScjH!jo zSh^V28hASuGlm7WvAmK~aK83$!B$fYsg`HPj<5U04@#Zpcl<1xAes{!x8Mz9RG?dB oV;R?!*2t%=KjI-F;N@knB)WBT>$K-Z3=9kmp00i_>zopr0OhOb#sB~S diff --git a/core/assets-raw/sprites/blocks/production/spore-press-frame1.png b/core/assets-raw/sprites/blocks/production/spore-press-frame1.png deleted file mode 100644 index 9b403cb9ceb691dba5e8b95b3de6e968908ede14..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 562 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&z`&C3 z=8wYy zGajjmnHY*WDvSCa@i=n9!=|xg;tY+Xl$4xB8>W9yTXfLle6!^~!@6Wq zcKq)8=T25>9t+kn2HA)oY|vW357Kq!KI^%2>sQr(c=oHP!CCms`i3aS*Poc4ie2b3 zI>o)kR6+lYmi`eNhL_U>8cMu59CoR)DBKldnvloI=&?QIJ}V!eyp{c(oAH_3%&uqZ z>zk%r+pxE)adW+y-}J8k`5(D1oKlawZ&&r5EmV5Tm1SpFG2C1s!6#n0?6NxNeVuGrCnWpzeLu#1EaOYF@?1New#mype;)I`r@JtY@zcRd zjrlX&n!@5V?lJlIyC03eb^LgOuhUyY31i14(M}APbQMuu>LjYbEcz{=RZT(v+!P1F z1)^!52I2wQrzRxW@vrE;-FizQP3%Z8SkDp#Y5mD&@oBv~8@8Nydi3(fuS^;N>loH* wEZ*a=oApy~*QI5xtQ+;gpOV diff --git a/core/assets-raw/sprites/blocks/production/spore-press-frame2.png b/core/assets-raw/sprites/blocks/production/spore-press-frame2.png deleted file mode 100644 index 34f8aad11b355a520eee0dc120dd49f603868c4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 531 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&z`&C3 z=P?S) z_qd3~9h%yacVz1FLe)Hx!l$Y+PlWEdlo$qm?B6o;mD22&_dmUE{KGl9;s4U*?JL(D zE0mdH>2PWi(}Ya{tat49^n7cdE|S4?>X8qp2xDC0w3cT~ix%;4?&MUOUHGZ6ZL#IW zol6(2VOX!Rc#q?5mQ#n;d}1r*-|*icix%Z>_cc_@~6Rx}vjU_wPT!&;I@>oo#;o z`PKj1cQKvfd|Or9u~=SDPkwiG)2gZFi!wKBANcKXUTD!LVN*_H#))g?RNn;G9eO>j zobieN#kPx&({@<k44ofy`glX=O&z%bd< z#WAE}&fBYoTug=n4i_(;D(+BtldEIXV=kC&{a#q$n?hOCS`C#)O%IHI$BCX0IjKL1 zg8>W@_{9F(9f&x7`RBj4IhwU^uC?!2r+0SdQ-42G$E9D+fBm*C|J+iZ4^=-MwVie` zY(34NC3uNdLOZr$-EEWaS^bH-7zDp^tevlr+R*WxWBxuzu%QeIa&n35C7))B2}^?n NJYD@<);T3K0RVd?Pv`&u literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/production/spore-press-piston1.png b/core/assets-raw/sprites/blocks/production/spore-press-piston1.png new file mode 100644 index 0000000000000000000000000000000000000000..e1b46944abb2b98ef7c1dec9f9ac4da0c4879f29 GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&z%bR* z#WAE}&fBYse1{A~8XmGUbQr#1dJ$l&cEW&3gz<16rrpw^?ud=lA zvhr^~-(^qv{_X6!?|09=dAFywmtTIrPq_It#*HOgxfjmJiD#*|U(CoGKik!?;o{kV zvk6l>UhY1#k&_`ng!#wkzmckZ8Oot8Y77S|?lhhLZTDx_-?>{K$9M=X{8;z?^OZdt zH(zQKU;CVaVU0rf+w5x_X8PAueE$~8%<$m#%b!=Si#0ycnC3QIOlbP)#RrFQ5k3FvF!eR_eJ_j--%{gGg*^dD*ir8W%JKj!FAzf&c@PR0)o4K z$8MVUV3T}zTiBfGbFbdo)|c0oGB@b-zG4;+ZL1LLwej^`t93lz{=T)5X~~4?WqOUL z+uAsmFwA=TV$OS3lbp!c3~!@s9BS`z_vE#Oz4MsIS~K-ANJePkDU%bHvwrVwV4L;0 z(EDh>&5LvLr*G+dtrPq9-+9Kzh1$P*9ByumdEmE-;Ycf!+=Lme4c9z44t@+=KQSt@ zOOo?iVI_;IQ(t5~C4DRd=P;|DNr{t^<$}<13NML-bmzL8D{-e(tA_SN8#m{P4nrb;e_uTf= zzwLgp_NF`%gdg z_au2wsQ)%$`xy?Y?hS6MKFn*i6J^^j!*xN(?ZXOo-|7n-^Q%AfvHwj|-NN-?Bgd@% zL*ZTv>R4*sRb{vyT=J=CRb2ETkn_q~hyRO(yjTNb7M#@jwf!8&x$uSi13BL^Y3ve; z>owZ4$$7Sc|7wP=wNhKu_I{|h{_3teg?qsXNjAy4_I(cLomMmGUDn|*TcG#wkIofQ zFV+Ij5C3+2N??DbJtw;Lms148e~YSz=d~Komp{B)$o=77e;}i^_k-8giE_1nLm7EO zbsJPG+RF@ApSAgRb1Q>>z;cHCWCkxc_ zZbHt#00!rek`EdA--RsfV`rY2b4~Yv-1FBhZ5+>c2lN{VoP5^C`l4{(Gsj@A=V=S` z#JX5NY%OAxwJA=Yc0gfsj<&;xGdG3gO5o z&FcRWZn2l4?bW20>xIM=<_o8E*f&^+OQzH>(3`pM=x5FUd(T^*-oWs8ibQAi2L|TS zlV6PMf358Q+!fvMSJv^VN6Li8T`9k2>i@nuzxvQZ2I+aMDaUP^d9J8lKL6)~xx=0R z@eJZEfs8i|&ntj6#|Ks%)OAQ;yg2a$M4&#fA~B+20c+0@+lmH|Sz_nYMdCQ>xo0%8 zORVr-w*S;iRt}!f)?3PdMe~9h4irc(-Y!)delx0J-}efa#1n#6=Y@>^N^TQ9An#yf z(mkzUT3rOgf8L%2JMXHkynXRJD1-#}`DJu{NDzM|cy4meIo$(t4~(6ho?~ z-h8u=LGD5Ep-Oll*X?A;uV21f-qDu(a7BuBG}ni3R=Xvy$hLkwQ8w-W_a7P4&xd{7 zve%)d@{RG&IUByPc7~SSNzgcCWA%S{leqg zjlY=col7(ne$Tq2bwzc~dxhVDKQ3K=vPj?S(*vHc^Twxt>U~+WWuHc68Yj>BdLfJZ zt#!FS${5q9JZRmnTCk6~*62?N<8JSSj6*-QzC3T8ua^+w#OBMj$KAr7Yr5nAr%Yv2 z4+u;ZvM`Tks_j3-&mE!L_{_GV|GaI*@#eba+%t3=mnmC46uq~)WqTzbYlO0F#+!Q= z?sG&p{kc&4)8foQE|Wt27uwEV7xtIN{nfW?Xcoc>&?mA&n#>ZJy`7^FZyQR cln>%RZ6C13zI=0mfq{X+)78&qol`;+0L$G1qW}N^ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 53fdf7ae10..8e27d2b8c0 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1092,8 +1092,11 @@ public class Blocks{ hasPower = true; craftEffect = Fx.none; drawer = new DrawMulti( + new DrawRegion("-bottom"), + new DrawPistons(){{ + sinMag = 1f; + }}, new DrawDefault(), - new DrawFrames(), new DrawLiquidRegion(), new DrawRegion("-top") ); @@ -2298,7 +2301,18 @@ public class Blocks{ consume(new ConsumeItemFlammable()); consume(new ConsumeItemExplode()); - drawer = new DrawMulti(new DrawDefault(), new DrawWarmupRegion(), new DrawTurbines()); + drawer = new DrawMulti( + new DrawDefault(), + new DrawWarmupRegion(), + new DrawRegion("-turbine"){{ + rotateSpeed = 2f; + }}, + new DrawRegion("-turbine"){{ + rotateSpeed = -2f; + rotation = 45f; + }}, + new DrawRegion("-cap") + ); }}; differentialGenerator = new ConsumeGenerator("differential-generator"){{ diff --git a/core/src/mindustry/mod/ClassMap.java b/core/src/mindustry/mod/ClassMap.java index cd09d64cc5..c95603abac 100644 --- a/core/src/mindustry/mod/ClassMap.java +++ b/core/src/mindustry/mod/ClassMap.java @@ -447,7 +447,6 @@ public class ClassMap{ classes.put("DrawShape", mindustry.world.draw.DrawShape.class); classes.put("DrawSideRegion", mindustry.world.draw.DrawSideRegion.class); classes.put("DrawSpikes", mindustry.world.draw.DrawSpikes.class); - classes.put("DrawTurbines", mindustry.world.draw.DrawTurbines.class); classes.put("DrawTurret", mindustry.world.draw.DrawTurret.class); classes.put("DrawWarmupRegion", mindustry.world.draw.DrawWarmupRegion.class); classes.put("DrawWeave", mindustry.world.draw.DrawWeave.class); diff --git a/core/src/mindustry/world/draw/DrawRegion.java b/core/src/mindustry/world/draw/DrawRegion.java index df04838cfd..492310eafb 100644 --- a/core/src/mindustry/world/draw/DrawRegion.java +++ b/core/src/mindustry/world/draw/DrawRegion.java @@ -13,7 +13,7 @@ public class DrawRegion extends DrawBlock{ public String suffix = ""; public boolean spinSprite = false; public boolean drawPlan = true; - public float rotateSpeed, x, y; + public float rotateSpeed, x, y, rotation; /** Any number <=0 disables layer changes. */ public float layer = -1; @@ -29,9 +29,9 @@ public class DrawRegion extends DrawBlock{ float z = Draw.z(); if(layer > 0) Draw.z(layer); if(spinSprite){ - Drawf.spinSprite(region, build.x + x, build.y + y, build.totalProgress() * rotateSpeed); + Drawf.spinSprite(region, build.x + x, build.y + y, build.totalProgress() * rotateSpeed + rotation); }else{ - Draw.rect(region, build.x + x, build.y + y, build.totalProgress() * rotateSpeed); + Draw.rect(region, build.x + x, build.y + y, build.totalProgress() * rotateSpeed + rotation); } Draw.z(z); } diff --git a/core/src/mindustry/world/draw/DrawTurbines.java b/core/src/mindustry/world/draw/DrawTurbines.java deleted file mode 100644 index 11273d94aa..0000000000 --- a/core/src/mindustry/world/draw/DrawTurbines.java +++ /dev/null @@ -1,39 +0,0 @@ -package mindustry.world.draw; - -import arc.*; -import arc.graphics.g2d.*; -import mindustry.gen.*; -import mindustry.world.*; - -public class DrawTurbines extends DrawBlock{ - public TextureRegion[] turbines = new TextureRegion[2]; - public TextureRegion cap; - public float turbineSpeed = 2f; - - @Override - public void draw(Building build){ - float totalTime = build.totalProgress(); - Draw.rect(turbines[0], build.x, build.y, totalTime * turbineSpeed); - Draw.rect(turbines[1], build.x, build.y, -totalTime * turbineSpeed); - - if(cap.found()){ - Draw.rect(cap, build.x, build.y); - } - } - - @Override - public void load(Block block){ - super.load(block); - - cap = Core.atlas.find(block.name + "-cap"); - - for(int i = 0; i < 2; i++){ - turbines[i] = Core.atlas.find(block.name + "-turbine" + i); - } - } - - @Override - public TextureRegion[] icons(Block block){ - return new TextureRegion[]{turbines[0], turbines[1], cap}; - } -}