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 zcmW-jdpy(oAICrYHf^(0o3G1svtgn}Q^(Pf%r=WP5>aF-jyfUY2)Si58_ua8BbP2N zo5-b-A|b?fI&=|Ar^_NMm5#>x5zD3Xo8RZ3&*SlVe;%LD`|^4}Kc6P-w1L>1r|Yx!mO7kzeCnj1<5Qx+(B9d; zd;z221nvLh7XM`gHDye%a}HT&VO#dLA1gLLG-e2do8W}9w_ezKr5uf*tJxzz-Agm* zv@GeKNQj=9@8c+p{#?N0;&6np&r{a{^I0;u0}OJkFtT*7 zw)ZA5jReBymPcIQ$1DJAI`FFMl|&ZE=QMvG`|@EkFEJz}WY*p;^Z$!8yQ&MktVz0u z>K()7C>sz1qlw`;8`Dm`ZOvOf8>x}#0M%GS|Mc=mZ11(ct@Da1KJ z{>~Q4(ILy~n>Y$cs9o>B{=*5c>xb_)Kpgq)X>`BRWvAQrpN$VElBK@<=Vfax;5>*I zAV)=Ix5&JssBiBD^)~ z=?1QHnIG#0kQKS2&o3FiF$~1mLs_LsPJbZB)H=-d5jr*}Tx&wPbyWH?bHQJ!id9+Ug)i^?4EnsyK;qz2*cDAm zsXs}ngv2rbd6&3nVZhcbT)KVXd%)a7s&lVu z_wW44roPG4MEx&gHJL*lg)1E|gd>71Qer03hmsFv`|gI6E~i2BLZAD5hXFN>`ndf| zI}5}$pMJN-&VBHCp<22VWFcRgcJVl3b(enUmQzNyQPSdzpegL(c68Z$2gE?61=PvO zntQdHW{2fl;d3Q&6g4o&!F1WA&7OT`3|VGA-zo*K^*KTVohq2MiN&zHa>^rG2zB&T zjH&S87IB_7C^mg#Nh5tZ3`L&$qCb*pVT5fxDli}R8>Cd=*+GC=>C}h zL@f&BNnM$|Tx}F-C2xPRnlfSzNW;)ux32Yelh~{e%bBHXNK;~cuQf}D<#T#;dqh-x z)@ENxbB92ar1H4r%{#I^S7DXVBUEBXM>*oJZPDpKGE zT^Fo0*4o!RXgqBnzGi_qTa*sWZKsl^&`^wSJ_G3fmQof(+sdctIPCtSGcC6 z^%#3WOpV`a9Jm97S}c>Jk}kv;=P`b z+Q_bkC2|5fcZnMl1 zmfDyF52t)foPB%LG#dL*h&@*Y-p3Oxo z-c=Gz%COo;Z=#KN{O+f1Q4J>)(?QPX8il25sk;^o7-A9nMLV@mWCU-TYz%^9qlDXCgUbBKy4;dgMaqCn_R|1r0mT z&rEn%(Y4G18=UJ7zlyzuYCqmI;*UmZYR+*vOEkWlJNQ zu2oMvL{6!PF8@F@+6clevH%|Ar2TwIbUfD4tOLOydx=HYZc7*Lp0l?z3o?}PGIbFR zo8sdiN3CmDzW8;pXVN*Uude0GhnJPuyS;nA&0M55eK0Z_iJTlX$Mu$`+7G=Rzkb|g zLue|xXhm417{>S=4|IC|ij8;^Syp!JP{Sj2a1BJVRKC53ohMHtf4LpEIPmT>lik-8 zu)h`5clonqS@gr)E5@g1V~3FHkMYUGoy7uj&z}os41ve#*Pa_FrX#iuMz))eA@rxV_8U|d TmFuin1+-)54o_AcGf411M0~E} delta 1445 zcmV;W1zP&_6t)YHBYyw^b5ch_0Itp)=>Px)a7jc#RCt{2ol8y|K@f(^Q4WyPg%STQZqiUM{ee8i)KtN_cgFk&%L@+KiE zU_|)4PELZmQpCQI6yT|GX;;XNh_YwEBteeSaJ2Xq)Kce}C{vpYRIdRg37*OcqbSX! zMJ8eZX@3bA{ys~<@KX|6E2GV$pin{_daDGlW$2K_a@BOdIP~y$N?DpT4BgzXXSuL< zK|*i%;dbhp0J$7p3h*UM;D(R;FeyiCNqF<_ee2WdW^=!OwoNL0gd(9yK&mMB5+zuK zkF-kY9t8p9CH(pQvt_qgG$f?Lr!YS`Pj1f%RDT@>g~SrL;Ukg~xZxwQ1a9~M9iyPs zc9b9$J|ZDODtrVbNQ4j2Q4P&W`1J8Z@xZ-xc+R3wZ>Mu@U1FB`Xr@V93czy-_!7q0&(MMMDXfS2tb9Yzwo)C^ zV$Hd=05m07h94ihgn4srZx9>_(&4uplY)73uC;_7tingg&AD7WORx^V#_&=^jHU!{ z;R7i5hI*1PGW?;vp&lf74IhBn8`?^%g!m7ZkPwI8`&@cZ?G2?O^@o@C!+9)aKYuNl zbwvQkS2BBolnTEUZdWwI?uyXrlBNVYDtt~?G{WkN=d z2yT}&XASVq_#>X-4%_nzOKfr1ncmTAzxSHO~R<~5w#UD z0D6~n%S1|2f^_%*`B}77Zzy?Det&bnp5@MjFigrUmfDsQN~rw@jU1HDh{baC-~FY+ z2N3EFMKHvk5`y=(6bxN5d;o#o(3o16bP0=o9gb+pu4qKGH&mi#q$xq-ER*VrM%W87 zxh`oA8WJSm;v~AF5s?)!jqj9@l%R2ak(y<@=?&diCIN$SC7^fdkb<{Q>3^#Ts9h6E zA!thA99O!sim06d-XwSoA3*sn$cqH8;R6_412_`2867@=(M8y!1P|c@7>qYz;=JSA&61;^EFlZt+LW0Ne0S3;5YZ7YzOP)fl(|c6-0E0^rISCro z)m+FU!v}Cs3({EB$sxU%G9EE8F)=YQ@q+ma8W(6}?+rdp00000NkvXXu0mjf_*kM} diff --git a/core/assets-raw/sprites/blocks/turrets/titan/titan-barrel.png b/core/assets-raw/sprites/blocks/turrets/titan/titan-barrel.png index a04e3afd076175b3a35f2ae888d4db602294c295..5aaa45dc4f93a2827f355fbc6eb42c4349b6e3ff 100644 GIT binary patch delta 813 zcmbQnK81aPVZEQHi(^Q|oVRn<7Ku2DwE8cq;1ua}aa*LpqZy*o+TYaM8P}WW_)s$? zL`#C}sIrUDaqkBX0o${(X1sj4|7Nk?&iOu@g6Dodd#3FEZDR)k7RQ2k%LIOfqn|Ht zzW;cB?arNEeLugZ{XU;=_h#Fs|I6PTSa!(#nTk(q{tB-NG9g;NHOV@PqWczVIOaK6 zKIFHws*5S9G39K3!^jiKWv~8bxBT{#_n*gT{&w+l=$d3)>)9lv$1>$!8iT#i6V@v& z`4tlsbRRr=xa_CI`}lpYCjNJ;ulQbky{5-}zJ000$*L1vF9i23)Nu?t5c5O#FGDD2 z5mVG5a~sbILKl>44tKL?G6uWYH+Xzu?m(fM_CEG4?I00V56%;opM!;pyhO8vQdp+kDO;v8{~mZwABB7Anmt(dUySDVCXyK{b)-E2AdZs z7$(f*WjJvC^ZRb=E5{!8YcICks`%_wdCwiu2}!Tc$WJa-)p+Q2;J*ilf-utw56+JC zBP<=uRaiS}9hrPQSKJj}B4wwb!=N$!fo_dM48sKdgULS{W;EFVdQ&MBb@0F^;qs{jB1 delta 815 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 delta 563 zcmcb@a+76(VZE@Yi(^Q|oVRx!^;jGw+8*Z5X2Pciy!$bF8c_a%dEIF(CdN5}2P7ecQm%RSUR&E4^)XB? zH}bCS-o92@Ai<^l&$Lt)CYCR~_cwJpG%$vx?@Q*mu=v^!A;xc4Wa5<$m~TBko#R0t z18Zwt{p?#x4vEQv9086ROpIERT@DQCECv&bZ9E%%cBUU@IgwCk;NRd9Bl@u8b<;mV zCJSW;$A!XM#TdDyyB!+1oPZin2Cx8y8;oJZ0r7tCAQdK$Ptx&94JUudzh8gy``l87 z_aB!^vj5}|~ZA^O<#G%1DYSAPiAGv0xFMys;2F6PT!zXqef_!^Zhxv$&IlrZi)wVw&&mRrhAG_Rsc<@n&D-dw=o#Z7eer 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^*}Fzb-(!J{AfeD)&5-_GS}r6 zJo@3Q)MV=L^rLin%fI=;_v(#2lY8!O;W&R^zU04i*!kzob?y?K$u%b{IIGGxN~s-s z?k}JFJZmp|kHA68eIga2A(l3h3F3LVMv4vU9&ylwf|qJZC;9UJG9W+#_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