From fb09d6bca0060c7941d17ed63e05fd51657d0aa5 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 21 Dec 2021 10:06:02 -0500 Subject: [PATCH] titan recolor --- .../sprites/blocks/turrets/afflict.png | Bin 1462 -> 2676 bytes .../blocks/turrets/titan/titan-barrel.png | Bin 918 -> 916 bytes .../blocks/turrets/titan/titan-preview.png | Bin 1367 -> 1347 bytes .../blocks/turrets/titan/titan-side1.png | Bin 566 -> 568 bytes .../blocks/turrets/titan/titan-side2.png | Bin 601 -> 596 bytes .../sprites/blocks/turrets/titan/titan.png | Bin 627 -> 631 bytes core/src/mindustry/content/Blocks.java | 7 +++---- core/src/mindustry/content/Liquids.java | 4 ++-- 8 files changed, 5 insertions(+), 6 deletions(-) diff --git a/core/assets-raw/sprites/blocks/turrets/afflict.png b/core/assets-raw/sprites/blocks/turrets/afflict.png index 4c8c999ef6a055e88007850e23f9968e6bb87ff8..00cab93b53d6d5de2897628dfd6f0b0ff40832ce 100644 GIT binary patch delta 2668 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 delta 1336 zcmX@ib)9R1K|QOWr;B4q#hkZu@A}FZ3LIBosl<99`US&MhCXqYScRvHnLJoqJW3po za4%tSVSlKr*`TNAue|o#p5*h>)5ZQw_w%TpbN>7PwQoP(*v)NVVq#+QCG4x-E~Y7c zX3KB?+<2dV{|T%5e^om_&zx_sclqDBEuz{p`=goyjO3?^I-T;W4}7-xnSjRUKuN_V zs{^`!2ETnPzv0w*wuiMPtjku-yr1-K|Nig@J70nUxL4VQGLH9bhRJH_Sn($8q>)~2O zmo@BDPHk>UU}`vZJHoLef`7rOjZGKoQw6T6eNwu{T=iD*tr)8(NZFS=2X344JazgI z#lPT6_4ktRl@8i0@4q%oQrfnz-RDRar*SZCHB8UyS2j^M>s|w-zyca?tSPIiOUWnOe8jhQYE$Ec4QxRbmSo6LRa;#xTfp z+%jb=6;GLY`1~HZ2cgq`uj`nXy5-cN9VNS!OxV7e$S*ZCxVulGSLuv z=o#zpP7~r?xI~XZ=X?#9)9D4%d7G>m`tz2vG)_K$l0~sbiA~}4=j8$_Cr$cm=Lxkk zU*OpxZ&%mU{yX~Pb7Kb%)&++3w`?=if-VXiV%TG2-(?^DYPP9>+41y8=d)DV78nYg zxAMI2%iAMV&tWkwBWf|*f>o>@3TI~9useB&9BMS^U#23kWv%;N)z@S=9|@^_yb#5mSITU@_J;ftBPf}>WF-nyR} zucuw`c4grIzFpCO=7d@Or+5-yo|Ns@Rp4S;I?d8OB`VSLN^zDx>qh~Reh!} zyWL3M!GLXx(~6mQgqyDXx%7J)NYR3oE8cZXw!c*7e(N^xl{52CJ)Zb7iNSE%C5H+3 xb}=-h@0%X9M9F5?V$&J+pi<1lL}bPPq*XqPCmi^{iGhKE!PC{xWt~$(699d$WW4|Y diff --git a/core/assets-raw/sprites/blocks/turrets/titan/titan-side1.png b/core/assets-raw/sprites/blocks/turrets/titan/titan-side1.png index 9da1210170b609da0b3c482a41e4a22bd17b11e0..90eff75c1c958097d486e6c18d763d23f007a1fe 100644 GIT binary patch delta 472 zcmdnSvV&!UVf`mh7srr_IdAV81|2pKalOc%?RhFkMKjnahjGP<%`6GrJlcy|_O`H9 zGDU34seM^}!B&*@qrrP7R---^1}M1p;@!iNZM&{bz1mt;X!-B-<&_ooOlJ(f&5f6O zxa-MLjsK-C49u#690@6zEKCwnLX8Z^p1CPFuof!`)GJ*6S72j*|4v$cT^IsK9OGzW`^gtYyJE(eBmmI600(cm-tt>5?j_0O)WI<%cFGq1^!ZDbJE zJI=48ETE8>^XGsT6Qhz2|Gi)igGE<=2r>T4u-xa;ARpDQFL*$fQOoPEsi}fPYOo;3 z1qUrA#(JqvSA_;+CJ7D8c`6PIFKtd_64_ueL;Zl$9nps!znlIEGFd1)xULl5+Q2Z? z*HyuRc_jx+hKg7t!#R!zJuu?K*~imFIvFPYIX0am!RX(^FFSs0jb;BJ7yruQfYh<+ zR=gXgeO&6tJY|zqyi$WTlZA4FG00fujn5~qVN_)PQ?Y&W1x7_z$s>H3)B5KBzUv8hiUf(*BqP9F+ta5gG{{A0iBhHYr4OSFf%YPNd06IJk)!~X9|ZVC>}gr L{an^LB{Ts5apJnZ delta 500 zcmdnNvW;beVf_bB7srr_IdAV;2OTyLX?@6??RhFkWf}MD2OF6VaaH8>3Vjojn&Nq2 zQtE3j^X7l+7b(a+`{U5qqs+(v0S(?I-#6Gt#J)cD%4x5K?Ek-|@q6SM(a z{ggE2zm-x$<0K9igH0w(j6AxX4h+e~$^r|TECo3xWY$~1;mgwb&fmMg^8RrIpa#xE-`xexWs_9AQiC;2ql5Cs=iNe+H!#X){`#}wPtY$O1>Noh+kICG88YKquKchx ze|W4!*5OolKz2>%b_2^U*-JXI_TQIxGYBXBPslag=hC3FUpb;zUr-^sBf)Z?OG9K( j`%kg=nrsXV3?`p=cLes{={NhJ0E#6~S3j3^P6{;YPD$W)=D-@QU!2C6VXL4ea`lSqB@&%4#0*2SLFs(-7VUsrwq z&Hi()4TAsr@&p?hW)>+69B}YsVUqCdbzpGT6y!+Asn20y5;0I?VpOu#nRfQkBg0>R zla&P&4joR~DP8Q-BEcfD!M^Ua5fdZRu4DO;t_lstOcu&u!ePnVw6#~SZ~l2))uH8W z+TQBhR!od+Z~E_V>TzgjSobkHOpxQk;a6wMIT)?3NX081Xq@%fo8`ySZ$E?>?+7kf za3Mc9nnj~NM}vt`i^EmHLA6$p<3SGtTT!1n=LF5~IWrg}b@-lfPUu*zBvTlB!QP1> zokc^VWYIMxheT&VjsQoH#+Tg=4CyQdZZP7Ws*JVs07tHs$G(2*8?9HN) zl~L2l@D8j%O;X|6&YkCTaH~-8b@nKVyRm9mx*85!>IDQN299N%S p!6l_yGDF_D?s~8Q0|Uc@2hwHB{#q6;W|Ia*tf#A=%Q~loCIHz5=zIVG delta 563 zcmcb@a+76(VZE@Yi(^Q|oVRx!^;jGw+8*Z5X2Pciy!$bFnjnY31@pSoT1<>{1P@3;2&G)}?7g<|8)d{FXLW+x~<+lXURvPO#l)@|fY$7LJ7yNsUwX+3}wH-$hs$7#J*muuMy4@(B1isSXsgp00i_>zopr0Dgnx3IG5A diff --git a/core/assets-raw/sprites/blocks/turrets/titan/titan.png b/core/assets-raw/sprites/blocks/turrets/titan/titan.png index 58b4fad36ce5775e34801673b9cde1a018fbfbe8..0af33e57c2110c5064bf711bef5ada6b5139be13 100644 GIT binary patch delta 593 zcmey&@||UZVZEWJi(^Q|oVRy2`iTU}w0<-`lpP_d^F~uMcgq%)eN6|1H`p*{q~>er zes$H+xz=}%>9KH6uepoigS=<+KJS0{TXoBsCpC#_X29Bu1^C`zp#M{06?k@11#c z>-Z~Pa0s|H7%;U=<$6$IKBw;H&+S2sOZEw_>eUzJQTW;!P*}4vgCX-KN9ghCK8)LH zjkme9oOnQ_k4fF* zt_!vYIv$(%aiq$-+K8}lC_6|n9)dbjP(erN!P|$gk0ib?`Sio0D5koh>#=z!$2Eqj z$Mf$9<}kWR>@RfNz#@_P=a}fi>IT8%`7(kPl2UFB^#)8WVBIf1IX~J^Znb|`hs<@k z1&@CCDm9rpJpCwL-tuq0@V$B?&*Yx_TR6_&moNG69CrRWbDg_HXL8NS3eKwXjZ$id zp8Lz^KF`|A-Xn0(a-T?rXozJ~bxo&vQX#rSdl(YoLf32$c9|-DlQv@#xbR-NC7@yyWmdKI;Vst0PQCJ>;M1& delta 589 zcmey)@|k6VVZE-Wi(^Q|oVRyu{iFjWS|1v7MtgEyo6t2WBygL9IA^;VZyKx0#7#XN zTwxPr0|I7<1_-3GI+wQo5bRq!vv{BOJ@-Xld(LU6UJG9W+#_hXBH*Uvw^{`7^_ z^1uD_bB{+o_x;79l37@iB)`O~rJ~`;58qafi}egAKh7>`iD=+@Y<`ksGrL4v;ydRO z-8%k?w;Td)4F*gtQ@I{gn9ixY^)q56!=*ift9tcCc@)kHFMRYP=pw_VErP51^k*{V z{7%a0;+T4T`V!gejcth+Eb{gp-NkWz_35?eS2Dd;?bxn5Z_|C|jt>`ZA94KuPg-ra z-u-*`d_GycufO+RFMRdt$)0jK%-`-aJfAOTK6OW8G;@gD{zCT+tS=J(9FsgKv|#y1 z>F}1D%wH_(9(M$MTibEHi6N1NL)k%s@etIRu1tR{Z2e@uxyswscFJ6rTkzw%L2