From f55fb48ea7c8980375d3f212e0ecf99b0f2fa581 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 13 Jun 2020 12:24:50 -0400 Subject: [PATCH] Slightly higher contrast black palette --- .../blocks/distribution/block-unloader.png | Bin 1368 -> 895 bytes .../blocks/production/graphite-press.png | Bin 1025 -> 698 bytes .../sprites/blocks/production/multi-press.png | Bin 994 -> 991 bytes .../blocks/production/silicon-smelter.png | Bin 1085 -> 1109 bytes .../sprites/blocks/walls/door-large.png | Bin 586 -> 585 bytes core/assets-raw/sprites/blocks/walls/door.png | Bin 282 -> 281 bytes tools/build.gradle | 9 +++++++-- 7 files changed, 7 insertions(+), 2 deletions(-) diff --git a/core/assets-raw/sprites/blocks/distribution/block-unloader.png b/core/assets-raw/sprites/blocks/distribution/block-unloader.png index 123ba4c0c6ab539ede1cdd7dd0cdd8461a026a82..2ee0b89d9bae55ce804c89c1df79800af95cf419 100644 GIT binary patch delta 873 zcmcb?^`C8may_$~r;B4q#jUq@4U6s=@URBl)6%SIT5?A8QQ`EDf<-+(S@H);weFvh z6PMbooClf;vKr*-4}IEx@B8}Ghp+3; ze){71#pBjhw)f;SH-{y0{_A0gYe`#qMCwl@qYcN~4AprL&hsR=E@1zlu;5j{%Yyx^ zk%AY#x+^X*KNRiw;ZbFOGsnNcmM?iP_A0piXJ7crUAcs@iv5LR&F_DY>u(lcdVSt~ z%Hrn_TshcpIDLq-VQvstWPMOC#`NluB!dk{CPOyMm!rlE5rRRC(;n^p;lbka_X@)b z1{Vc|*UMN|aJZz-4PoG6T)Co~X~CzuGXdu}FhuTM^unr*?M5-F8pT(^I6Em}4~vTKGYgP}-at$OC( zrLxyHF1X1cknFfU@9Em@``9d5B_&s^N`B9}xwD=_doe9`mp#aRi^F=2m#TYz#$CFcy~^`$ zz}^+U`;w>CZ_~PvCVOj*^X;n{hnIcMyRk&~^p?!|W^XTVo9eD#1h&ZN% znX6LRH@uUIXG@s5E`{|&&fR#ff?flqhV<8U91bBy=Gli#Lmruh9NMnS;=$C;!IJ$U z;O6HGk>B$a4+PCvAh_nB^HPHzui71M4eB2ql_HoL&L~UHtWNqg>6x}pzXa3642BCQ zZQ9vCD4pS&P{i$|aE4>TC62`cY0Mrk+rq?3jLyHg-WPEz87^W44>K zX%gREZfyaT)g0MZ`5o994(w2jFp)pN%wXWh5q6ecf`P$6k7L?db`A!H4a|veth!?F z@3`^{MLJ{x{N=EBynvP{S9(u^4v zpB9=)rgJu>>8#qkP)s4?_=LT30zoVK>d&6Nk+)lId7yIb%6ElA4jJpyvbG<5loHC~ z7-V`(ZQ<5uSN27hh)&tu8CDb!>MioQ*d>ek7@y; zZ5zYFvK|$NYu{t936yFI^ClSm->)Iiw`=W>04L4Gf9=Y+ukyGq{4>qr#W%TX)rMP3 znJ(1J-}3HK&ab=vH&E2XQDR!lPliS_2QDV{8Ang9`hHw>3G=F&h{{6lG z(@pjTsV1KIFlp!VDH<<-#K+yYk3YIs;brp`&7=F?-jZeTIotTEEz9wQVFWkRwp(Iz zd7p-KZrrLkV;=8Qfnyh<1ZK_PUD}bfq-^#C<;x6N`QG&xCuB1GUclL~NsZx@5pP3w zbXV$3HUH(r3n4j@@hZbZ=rQ|CJ>9T3y#}I9 zPagEn`u6guFER#fdXU^EXN3)W@tkN_@sA&I=70){Y zMNVscn{_O`2~kx@+Oie=5frZ!LOfbGd5C!r)bbX7yg1N|$;yWirUv z+s{2VkuB7aBaN{@DqXV4lR>C0vNeIPVM(Bv;tb{u{I8r8-uKLInJjJnhxu^et$W`# Tin1{S)_z9}1lS(j;o{QUSk7=!vG0JPfGPWedtI|xmv)Fm z&inpHSbbpuv-I)Ln*ASd%(UCT@A>@S>v!Ak-?M4$ukY8)_U^4eBiItm;3DA1{J_;h zl%aLQpWdwPw|jFhHZ1wKbK_2iD3*6DicPc~HXLdVFCJ(ysIZtjm?W=Zc_0wO za4|)*YJS?h(>w}KIhC2eoSV)h;Ap|yz^?e~TpNRpt=*a1*VLpgIj{Dez4X5OY|$0H z%Y6?VVt5-G%$VS)!S0|`kykHj!7$xiq4~Pf0mdEdGDa1-k3!fQoF@EgVai}zQF(P? z)AeQN^cdbMY<*wt@?qLeW=?^kGcl<*VlnQ**jz=Pk5wRmcr%VHqpYZGLTg zf*(3FRb;n5z5H-hlgBYGp(P4IfkLNa+;y}&Q$<|`wfCgDUd)J;*?Gp6=Rn-*J%@FA zDyFXy(B8Y7u|iDOSfGvR#4YD3vB@Hg^;+RoTcuTuE-tio5#YEvd6PFo0msYRPuy5v zC@#sLawcOYtBCJO+tSr<1R2)cu3di0d&?^>4#ow76BsmaKizCMV*mdKI;Vst0GTlzbN~PV delta 1004 zcmdnR+Q>0Mxt@WsILO_JVcj{ImkbQdyFFbTLn`Jxjo#QN?8sBPD5U(XV~dDmm&nSn zUHl7N8Wt>Un)WVh2j9huie6SN>zakMR9aY^N@@;xMlbac3|Mmcps9Ox2=nC5dm_~<$tbyt9ax4{OarN;>{NYiatKPTm9+RUiR6)>5^L@64YMqkX}I>Na@xL03GMZ4+?W5@Q_*vTV`xpD>}}Sc8C`eaBNyp(Qas+|3sa z>LtHCobs*T{G`yPX$Q?FPH-xdo8ZipUUT_KS>ByJ#SiE2xU+wg!Gl|&x6)T<{W*W- z+2xy)PG=mhmt)WG>l5qy{!LF;W^;RxCd>E%4s-wNJHi6&Kn_Geod@5KTaBiCDf;(@LRc3^?7`R$yo0}aox^AG%piqDP#r^cT8KQy* zzUFRE@w}F+SGjbj!}}jUtg9Y=oV;9%|I7UaTk7W-Nbp9AJvgsv_V3Sm%__SrM*Vmj ze>)5IeX1E#?pbzd@=qveRP$iiaF;3g6te{TL5Ve=e#xw9X(&D9#c_b?>ME~yDvTSa zIxs(cmGG2lC11!ErIeL>oKFgA9(?C#FU7OCx^cbyepS|Dp@plYHgDcJfn{Cjk0mop z+YAasC%<8|e{rHrrrCP^~hkbbhu=Una1h+Et{_BrG^vM_|-o0;`a z&0WabV8=g)8{!>N2m0q%@-Ln;-C^?{F*Em?33>{uj^358;xsv@d}8P_bcn9>YD@Fc z$m=~iP5W$1+bY9pi*7K@I`z6ZyGL`yjt2jxr^}8xZHwZ`*i`R5Cpfuh;pZ10ZXWv1 zxG+CcOHFf;S4z+{!AT;0xm)B81p0VYtW?c$ab3~UqQdA~do7HshlNjbjm-iR{_hjJ zo~WMx_?k1OJ7KrOY~98t4Yn)M~4*kiVzrV)m_>xzg ziPtqlTYBI6Lt#Y~-9TffK#PmH1YkqDLT)BZ|p=ypSBSW`}$n+z(xSsRXGfr6Z WSwzTPuZMwwfx*+&&t;ucLK6U3;?xWP diff --git a/core/assets-raw/sprites/blocks/production/multi-press.png b/core/assets-raw/sprites/blocks/production/multi-press.png index e0a57702e095be3b9918003f753c413800fd2ac4..fac4209d6bd503cdcb77068736193225c3f0a4ba 100644 GIT binary patch delta 969 zcmaFFexH4UO8qiV7srr_TW{~$=G`$6U`@EIrCHOt*SV?0t#3jy%gW-0D=UjO^Tu!p zuyj5-v&a0;&F~GI!o1I>NB@zWbo+e#{`vL){wwZAy=Dz|8R?vn@oJPl4a-1zE56c^`R+>tZ!K{{iFz@}HC zt~d4^Oz&TGE^H5n9>X_=d-Yx%1q|PAT+HIgWN?yTaNuBO*dP!kud%z-Ooc(};3o&$ zStp#C76`22zp{G%Besg)e_lpvJwK><{zl*ucWKrW?;Php4xRmBA@du@FMR41b+Z>U z2(~CPep`^jvfunr0mE|;L;cVN26vVtF7COPj((EWXHMYtdELB8VA>zNQT$Cx#Ev-UXBumZ2JR7+wx`09aB=jdu_P&+WURS*0j~G z%=@nv87V8Sr* zs^*HKE6lC;h0kPdoy-##xG7CdBq#fgt6KR1l*RTBa!bR4IM2W9g_}$M;5JbvW~jqMoVgix#JrauxYX z{<_z}>!vZY@Wo=D&5Re^C9972nT2s5*zBRl%}_fdJ>^YCve{vq(=Im|UOdiOob3MP z$(>s*=XW}}*!S;~uYTjfkkTO4#301r#lhskw8L4zLFs^K6T>9Na~w=B7z$hj9Ml_R bAKEWyowC=v>DvPa1_lOCS3j3^P6eC^?1n4;xSdPVKNgptEhY?#JPZmgj0_PRYx$?#wUQQM=uN0x zAm{r;kuiYd8vCoO{)NmnKYo1DnELs_l=L?mmlpRjrF>s-{^Kg&9~T(EDO9x!+w4CZ z*uZgU0z-9xQPX|tM2m)E5JNaIqd}P|Y0+Y{mq|bSmNRZ(TlUp4lEb_HAFB(a&gK4V z?}Z&$4_LA5Ffcw~5LnxBmGN9@3*&-Wh36Rx)~K^E%$)i`hoL%lHN(X%{ERA3+PD$~ z8C>KSOnE2askF~Ig6)8C%j$-EPv=~#Iv2-c)v#4QLGt$YzTFC&HdU)ey#2bg{7BU1 ztBV@@Q&Q8Pf0ubZi>si$fv3*9sy@ZPrP#Ke1J~IX5Dn2eL?!x zMZyL*zxMjQD!FUe-Po{aTH^+l0~_U5ypG_gKh4w=AW?mdlc7hU;T%V-*?TdkN6+p$ z?QmO=8*k6$^zEX0hs(w(%06y9b!twh1l4Q>tK^xE*oCu~^<3S|SYmnXl<~!jo2*!O zF5{`qKf~YDnd?%N#Pyt#JK0o~SXTzBusC%vb#^Jm za`Ye2RxsCS)%Mm@YH^sTlqIDizKLpmr3H@d2{F9ocmSPFh2GE+xy?| zzIpTZP0Zt??;h;9n%OMM_wDUR}Q zJoz^`)R}>S<0ng}!~Xie9QSr_t&BHWvAtct`MXN;g&$j%)hniOid{P>czH^vqwzIK zMus%k4RfSq9JxPnyqw|5$ndW-;E;ZRi|$EfmE`!YX#z~o@3wYNcYSJKS7H7&K8pYM zM7tR$GtT^KS-@JdTYC{-{T)Zf8~a!6D7byi!pcu4s3GK2hmcZ0Zd8YXvV&e_%TkV* z=$%R|%N=+&_Ngy6T(d5BiCKNq)vdiRYR=z0t-^iaplm@ON8a5ar4_6zRw@3zvY`IN?(eT| zxJGpfh&CwmFNiiFv&YJEXkP4)806BINRj9z?yaPjfm2esD~ALgqV+Wb1R zZEw+6smi^p+Sbg_e8Oln?cfB}fO`_Uif(cZ;uU+IX2NGHc!)j#43-Z5U`4QmiO9{Sm> z$2p+B;j@F>!9qpW4Ql(h3fJZGDSq*q( zw5*-`_JN+!7RghbJG-5d>~_pmIHdG7&q!*1PJ_zrtgPS^A)#VLMgD|hzlLcFy_!oR zn!FgaEKV)#`^@xq<(3ErmHEwe1-TaNoQZZlq$vU$@#w7opeu65IT814u4@|lQtf!vyoARY_mdk;C zI+v%i zRo+U?X?u9QTu#(0_Dg)JcHJCu;yvq<2Ugo`JfGbSELmvr`mcN0tQf8pk5>sDFW9&x zj-lDbQ`chAG^HPzdmp`LRpDLc4n5j?KuP!YnbI!qa#W)_^WtZ0b$xhqwe#g~w?a)Df0m@(dSSJYmtn)ndZjHNk1y-m@burx zRh$eAEj3Lp3s$ebf3Uh=&Q6T?)#c~?2dgI;X4FL8-Y>9;h5Pk`j?7a>7D#6MGBoVs zm=@fuoZ%>^C~K_AaKK*B>j!Js3f0P%lsC~Ag`6Jjxqb7d=+yte-kv^GpK1HX{a3=X z%aX5!o5TzxzPQTnXlB|FzhXyy!R>1nR(?7`4I!U8gp>kuqdEeF6{g!93SwEeHb$^1 zSfMTA_~(~A-@fw&&E9|X-#y2Yeb3*dPGWuVfX~96WqY2c;1#Bjt1Yo+!PkRb7QC7w z;P_SQ$kI)}Z@--)z2Ioc0XvIDbK}hGRXq->zK=V6ZraX?o3^k_WDu$R9w)rpL%UvZ z5mUhv#*+2E*%2KRzKUf`vQfJJE6RVK+`S#*+urBui|qJU%=`B@f0pRhC&|;M+_w9= zMgP2h)<@3z^NO1qPWHc#Y`#3nf92!oCKC(oc}yCIj7}`S<|=41F>@;a2i-);3tbC% zPp_W)pu$9C>gzANF1#%Dm023XVt-7*F~}jsre5mMXL0@J@3HMI`zN}b>C$NL{%UC$ ze1bV;51aEehsxwFEGI=CoodlhoNB|M*kDq!wzcFH!<5gaBIcKv*0@?&*Dha|tn1Vf zT);JDQ;XVx!o=DGu>y+67J9g3%>5AGu#EkJNd%*pOt`MJA)h1TJElsO{HzF)W?8$BiX#{zT@k=uN^rypy;CJzXrUEcxCkInQ1=XToj`m1oYM zT6BWmKf8SMEt|)twad(0)f5fIgFbKJn7UZiBbiHc+5#bm*E42W=wF!U)y?YgY3IRH zlS&J3Wx5D(KCu6p+A+aPPEmB>*I#FEv#P&1Z{GJtOQwh6Lp|Sh@k{!%w~C+Otc+It zo+~V>@NLR$5yweOg_=(=g$1_USXolGXi0yl5aaJn98wRBlT(Yg&ORuMxcgQt<*18V|D&4Gvw7tN zfh_`x)2_W%vW&E1(dy_r5h;>+OknkEtE0Wv(qD8FAG0t-h#Y*gd1ooJU%Tjjr)15F VJ7Ej2GcYhPc)I$ztaD0e0suBg>>L09 diff --git a/core/assets-raw/sprites/blocks/walls/door-large.png b/core/assets-raw/sprites/blocks/walls/door-large.png index 84d035c251e70da08604a22e19296f1947c9be23..d667bd7029a8ba76f465956619ded32fab32ab55 100644 GIT binary patch delta 560 zcmX@ba*}0&O1*%mi(^Q|t+%t!`mz}EwB8k!(O`FB^$2lfjCsKr$jo}-g3<)Gw{0_T zc+Q*rd@BFGw`z6w&-wikudMxTvA4c1^zFZgfu^~NU|-N8;AnH`IyZwf%jqWj`N^B&IQ}!-xqGig*q+JJ>*MTtSK<5Ij^B>RJ0^(V zXLjs6GF>1`dR^5|MFkJvKWROW0tHkyRj{yh>eY!f#WepA8Ye?;pp3c|UA9HZ#c{2`*t=Ad(^)-+YW~ z;Ta`Y;lo@9xEz0Y)%iqA z$3BIo74k~I`MkN6II>r&2TVP3L12Yf(q_dAqOR#q3v|2Flb=LIC3ig2s4s2~$?fag zc0Al+!#CM8Z$I8+CaBgzojKERLGGGLC=bSU%oph^*ms++&_3QqT8LS}nCU+tGbx RHUk3#gQu&X%Q~loCII)%<3Ioa delta 561 zcmX@fa*AbwO1+?`i(^Q|t+%t!`mz}EwBD6^j(3kH7r;8M^g%yZhBGrWe{idCr>`?`O)<^JwC}zf2ZQ z2Xy3~K9+9~a$@<&5wFjXBcQ|mucq&0mEs@fg5qj%zdsx-nn&yN#e8e@S#Ao~voyxm z@UvJ7#XGIY-SO&adxL`M$JvHm?v4{qJQ5U8+4UokqlovByMo8+3f=M>#cYZvxSO_g zt$)gAsxGj98G8#i!)ycJ8eXPH>mToQn`wPw=MQCu>PO!d&Ty3o_+Mmg2$~RD!z-oT zV$?0-%cISp&GOdzFhf}V@xR`T3i4Oyi7!g!H)k+DqO7ok!D0Uj8$}()1kPzT3IPlb zM>tO?Wd5>dC=L4JQX#UO;nND2Cmfd_GnCA^pryg6(!er-LCAs0gMm|lF-5~?3Xh_& z(yu0tMRgr-taWrd6xJ-A=MXC7?7Tp$^K6?#xX4`2#%((DdM9RQ_A1V*Uwno)Xse~w zExCBcgSW~JwjZx%SDD}_wCKHoiNZxIrREcY0ohXocDbkQQBde}$Ub6Wqte=9a62Kn zNKo+ryQ;Edf%Mc~hQx}9DCz0xZ2_N87JYWzYjBaN@uZG<{1t8EK*fl>eJiFfTjaFi zPEFwEgDV8q*v)2$P~0HXth;ZTfELTv0+x@}0!NaW(>|)Qe7x5Y_{Xv(Us-Wc_WO>l S?->{v7(8A5T-G@yGywo<(Bm@z diff --git a/core/assets-raw/sprites/blocks/walls/door.png b/core/assets-raw/sprites/blocks/walls/door.png index 17b214671a0266df8b056ff4d18b75a37676d07c..92ac126a1c6cecba72c19131c695c878fdef0fbd 100644 GIT binary patch delta 253 zcmbQmG?Qt9O8o;*7srr_TW_Zy)Oud_uN}uRpNuk+Vu{T5)SPZvTwXw z=GW}B#u8*cRv@CzY6jkB1m;!f{K3F7_a41{l zK%2X24Aa*C_O1!9RIjkiauEJe-*{Ai(arUbj><0%wK={z!{gbc4bS>=f=^AlV7ke7 zW!~vXp{n}KcQ1I=rn%%Ed&W0KY?I2Goy_xieRj;V7Pxz&!MoEu>~Y}y0*fWZ3=9km Mp00i_>zopr0QLQJh5!Hn delta 254 zcmbQqG>d71O8rAm7srr_TW_ZyW&_9O3CdI?KkzrA?3ef-`x{Kp-?NNL}bvY4wscS^zm<*oaeJexSbd;MWC zyDcmGZlXie@+lAI>x*=TGYQRG#O?A>u(PqjMmYFE9OshF7f)Fu#Yn97b(v4J~YdEldq`VBaSQ+e diff --git a/tools/build.gradle b/tools/build.gradle index bd77f189c5..04e1bfdda3 100644 --- a/tools/build.gradle +++ b/tools/build.gradle @@ -240,7 +240,8 @@ task swapColors(){ fileTree(dir: '../core/assets-raw/sprites', include: "**/*.png").visit{ file -> if(file.isDirectory()) return - swaps++ + + boolean found = false def img = ImageIO.read(file.file) for(x in (0..img.getWidth() - 1)){ @@ -250,10 +251,14 @@ task swapColors(){ if(tmpc.a < 0.1f) continue if(map.containsKey(c)){ img.setRGB(x, y, (int)map.get(c)) + found = true } } } - ImageIO.write(img, "png", file.file) + if(found){ + swaps++ + ImageIO.write(img, "png", file.file) + } } println "Swapped $swaps images." }else{