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 zcmV-v1D5>Q3jYR>BYy)%Nkl>563DN_vsPjW{)_-#gl4J48vI!SJP7S*C7$5V3}8i|2k;=E>W@UAzXe$l(Dg?l zq&LD_LGa>vkAn#QQH1nv=)E9B{|BM!M(57&qvzm72nX0g z@LoIvfEOVJ;C~hZ>f#vyJP2t3YXtPgGXPi-QUR9Yz4%B3ME%qNr~pJDAnT?Cs0c)5 zom2n}0ja2q0-*AK%uvs;09n1F=sJc5*mD7+A3q!babZ=Ba8z3Y1?Ww7S3Xo_70)1H z7{CRg`pK3#_~8IcVHjRu4L%LPhzO|p2^xTr5Rg->RDS>?AfV^C%Nya@0m>TTJ>Af= z0JyrLy@~0gPr|bUAfANRKjhY19bg%Xm=ypq6mfkgX}zT#*0G@301#tAw{GRFx4s5B z1sNHrs$=g3xYw4pUN@@u!ovu^(#&(|#m^0JjlkYWW}eU9__+br2#j6CigP*|KR3Vy zfwh00d4FEk__+a=!u)WQacV}@N8>$Df!Ur)8 zMHCK2XfUpDFiykKNyE{akSUyy(UfH2l%yu*3n%5ZETv#siWX)SFU-=?#6g!PYH_ZX zr)zn-UeFi>K(8q2CB6Ax($j0IN!?Jrs7=0OmVdS?&}JRltV7$?Xv3!SZrG$P%d}~q zHto~4l|%rRY06PHZnbP!UIJj5s$>VS?iybPV41FD1@LU$UkY%IFd~3w>wXA8R5CYf z!ZlRlHdMm5Ed)pchX@2~@KD+F&{_9xA;40Ypb@OWL!~f`N`1ISfG6=mB3J@|%p)0@ zdt&mE<|{0Z7y{vF0MN-ihX?Q?%nFcl3ql~w2$0eUqY!2TNa==F7IZSt?9xLJKrup_ zIrt+WwAq8tj?m5!d}f4pmf*7@2%s220L2I&8{Hd*eGf8r00000NkvXXu0mjf_$QQJ delta 1350 zcmV-M1-bhF2G|OaBYyw^b5ch_0Itp)=>Px)5=lfsRCt{2ox5%mK@^5hq7)$U04`Fv za2iW~06Ij8Lks=Kxw4sP5>`r!W=Q8KadVeXB zVb|j`|L3{Scn{7mukK#HdI47S`Qs^h2F+-!CL z05F>$4_?2$zInJOSL^ln==Ig=dGFu9e*P#*-`CeK-$7`jewz32+LP1dRD( z6t$*E0vP&`$$$L5C=jAmkpCe=uP5CrRb7XaRRT0sS|@Y87b8qb$OhmVo7wyrmdizP za1>#TtZlwiDTFKleoIe*5HkjQP2)3SDuIv$5b9=eL&(XzVCe-7 zK^TMiPLg?H>xOnAjLCc_sXVcc17`DMa-fttS2}G82&@1;ynD}*jsyg*G`S(L0mw1G zBzR5;C28fv$O(Z3K*=}1HUw_-G55wq27sw{EH=`Zm^kvGHW_CLf@UnLv!NCsXvdJf z9uQKfj(^R~*lxQfr%@w)sqS$SKxnUKYPZ4SWK{$~QZ>dVp|$4JzFTw^l(UIea!^%E z6!UXLY6Hd&LE3zPN{w)f5NgF-tryf1gqpEd?S{4hp>~WU0M_?i)(~|m6AfT8|Gy{@ zj=HV*P(mrA{XTXJ)eJ?U{FXrI_8xmBfZC-3(0?D=ONt|Je%Jj`6*NH@mW25Lfi^%2 z0wV|4T$T3(80=C)~oekwwiLtdIn4S&g5XR725So|`rHEprcAJnR(*SC3 zOMlUjX#o4634pRD0Ln5AfNNWdWtj#5Kr_&~`2dZqh-vNH%+cPgh-vIx&J_g$3V_yf zWbM8CCBi}|2B5tb95YzE&c{Fqt_QfpD8DJ{k3u=;>!s2LpvCP&aQ=nn%?3*V$Eoqq zq6wFF+jZ}cOHy%%YK}($q|9$!QV@CoCV%tel7MiOGCg%ZV9bUODU{!m^8sB5&8&!7 z*63HnEUT#%G3|bOj%vqP4L}R#JJpP}3V@c(cd8Y$_-ts4<~!xYZhAJfW%He+AtcWU zV<+D@4ncDPlsruCgoQvpDKB{lnq$K)SNfs*r~^^eB}ogTXzdu(0BC2tE6rHQ0Dn#| z&Whh-$$TfR{iiG?pag={FIaJ;p|Jy-tqRJ4P}_V=TD8w0u(ko1>S#z3;|J+3EmrJ} zFcpI2;EkI0>BSlQPxp)Tg1Ab8CAmCtKR-dN8#*QkeqJ~sh>ios03nnIE(izbmsfYO z8>r983dvth%bjydt-@i`!OnTbo_{En;~n}rViXOTn6tboc@K7ZHB=IEzqqL9h*1>F zDE6AhXLRL5D5*8F+W^gHOJa{U=# z)1z+t^37*`j#x+&gnNa$p}GDf#{t@+?mW|aq@h!)Q8s@{vUR0Of@uI8KR=zukp@*U z2xb9r8fO`TNdOXtS%qK@fTU3tA(#WO59&f7?~I#-lN&qy1H)0;-uAH-1^@s607*qo IM6N<$f&)}*+W-In diff --git a/core/assets-raw/sprites/blocks/production/graphite-press.png b/core/assets-raw/sprites/blocks/production/graphite-press.png index 91607c0dc0475c5181d6906a6e3bac3b1ffaea47..ae10817332cf08bd6f43fef280376a76ed8b3162 100644 GIT binary patch delta 675 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 delta 972 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 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 zcmVpz=ATb34aA60;3=F_RMIZ&a zZc^LnuUe!W{w?u)s?x;9_4erQ&sQ(|!*LM3#)`KFPUlM}B^dBXt*=0mV8Xo;KY`tL zLx+1Lkl-mL_~#2n;+24er|1Gvctm0#AkV}UxK{!>xRhXIOm+fMxOL#75@5n>B*2D8 zC0qiv|35`w>Lt_!nm`lye}Tm>qS>$F#UG<`C5^cpMP8aSOVos?j}BelK)NrDOYO8f*i z+Z`S5kwAi{l;EE)6p2>?5}u+9MBx#Mfq*;{Q{Y|+O({!4*T^=dx-Dl( z=>4U+qc@mX615qdJ5XB4lCb6ucs4NMdhS4UBLgla-qv+pOAGG!ga7~l07*qoM6N<$ Eg0%N>3;+NC 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{