From e115b3487327baf568c073ec1dcd85e00562bc04 Mon Sep 17 00:00:00 2001 From: kilbith Date: Thu, 7 May 2015 20:21:27 +0200 Subject: [PATCH] Phase out excess desk lamp inv images --- homedecor/lighting.lua | 3 +-- .../textures/homedecor_desk_lamp_inv_blue.png | Bin 531 -> 0 bytes .../textures/homedecor_desk_lamp_inv_green.png | Bin 1154 -> 0 bytes .../textures/homedecor_desk_lamp_inv_red.png | Bin 1029 -> 0 bytes .../textures/homedecor_desk_lamp_inv_violet.png | Bin 1111 -> 0 bytes .../textures/homedecor_desk_lamp_metal_inv.png | Bin 0 -> 2236 bytes .../textures/homedecor_desk_lamp_stem_inv.png | Bin 0 -> 1846 bytes 7 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 homedecor/textures/homedecor_desk_lamp_inv_blue.png delete mode 100644 homedecor/textures/homedecor_desk_lamp_inv_green.png delete mode 100644 homedecor/textures/homedecor_desk_lamp_inv_red.png delete mode 100644 homedecor/textures/homedecor_desk_lamp_inv_violet.png create mode 100644 homedecor/textures/homedecor_desk_lamp_metal_inv.png create mode 100644 homedecor/textures/homedecor_desk_lamp_stem_inv.png diff --git a/homedecor/lighting.lua b/homedecor/lighting.lua index 7c51a0d2..76c9fb5e 100644 --- a/homedecor/lighting.lua +++ b/homedecor/lighting.lua @@ -491,8 +491,7 @@ for _, color in ipairs(dlamp_colors) do "homedecor_generic_metal_black.png", "homedecor_generic_metal_black.png^[colorize:"..color..":150" }, - inventory_image = "homedecor_desk_lamp_inv_"..color..".png", - wield_image = "homedecor_desk_lamp_inv_"..color..".png", + inventory_image = "homedecor_desk_lamp_stem_inv.png^(homedecor_desk_lamp_metal_inv.png^[colorize:"..color..":140)", selection_box = dlamp_cbox, walkable = false, groups = {snappy=3}, diff --git a/homedecor/textures/homedecor_desk_lamp_inv_blue.png b/homedecor/textures/homedecor_desk_lamp_inv_blue.png deleted file mode 100644 index 120a280a1730b27ad4875c728f8bc689edca1dfe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 531 zcmV+u0_^>XP)L;#2d9Y_EG010qNS#tmY3ljhU3ljkVnw%H_000McNliru z-vST}5+y&6T~z=80bEH$K~zY`?Ub)i!$1_rPi$=o`=cga(~yOL=w-oGEZveBL@$@3 zP?t&!Ay8MKY(|1xV~Nj2{U}fnfJNx_kKRc{`EtRro(lJ%i;L| z^BWH^Yyl`^0Hy=L3{B?pk^l<$5|^3)ULa1vS(L<5Cxz%Nii>_AdQQ6#Nct_R`x^lSDhn~JU9Yk|Ks~1_^Lz<)?EzL^hu;E0?lFie z4-hDJ@CdKNA4CK`fT_h`3zV{2P#*>raz0aQvx(2CI?PPIe&SU38e{V_z`2w}ZyLF} z12h2~n~f`%y1pkIQrCmEZkjCth(z$Kx@lT!mv@QQShrj19O@Wnw|3|xTYC0^^$E=h VgfxDD1~&iz002ovPDHLkV1h9K#!UbK diff --git a/homedecor/textures/homedecor_desk_lamp_inv_green.png b/homedecor/textures/homedecor_desk_lamp_inv_green.png deleted file mode 100644 index 59651eb7c7b7ea8b466519891c9e8c3d9fe4f444..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1154 zcmV-|1bzF7P)dJ~A6I5g9EI5D*a;ClL`F4iOO&4-XM&Wl|I$5Dyp(6CDo|Ar1~1 z3Jwkr5giT`Bn}cG3=tX*6eJFKc4>cpZx9{}5)u;-5E2+G5ECK|7%LDD4-pX`3l9$w z6($c56c89I5EUm64h|0zAPgEW5hyz#AvPBd4-XI;4H_>I4Gj(u8ww5@3Kb>}6Cw={ z910XA4h|X$4H69+E)f(Z4H_>I5)=|MGA#}n3Jwzt95WLXBo20YZxkgCc6xDKWmFU- z4h;(0K4;l#%5D*+39AjTl5)u@EeuI5|e;O|l7AFo54-pwI5Ev>D z6(tT7BMuTF3>z^L7%UJG5fc|G4;?fT7by=B9}Eo*4hd4i-~)5WMf`cG93B$_VVoO>f_PJz`MD(rJ0z8fqQCO{Q39d-P_vG z(4v`^kdBIcQ8pkXgkTZ?00NFlL_t(o!|j&WciJ!%hh+#50)-?HAbao8X3r+wduw^g z*k)$6|NmRBRg#muS@@jxq4{2{m+$ARE6Emm;C~^Wuk&HjrV7Wmyf(xZ}Fp3rMA-6&K%uIYc*%NusjnOu_39wgR zugZb57}oC}qy9Q^>_6J&i&txMlnUL0aoWztbyo(k*7fxTmQ029XEXH464D*n#MaOA z^Gi8O_J^H7min^@$sVw)i}Q<1EUBQ76ovm59@{dY^{d5YDeU9-A0Y!Ww4H`WiGasV z(;yrJhoMj8yzmS1K<&X!GQCc~`|$fXD`-v*7M~MRZ`Ms60;a ze;pv`*QgcbqgD_pAa)`|IZ8m^XX>A%)9IeB?9$XuYD0*DBwUJ8$7w}-`G~lj+lHXJ z1vDBfb4qhB63!U5s+>}zYGKS>{iVu0hB$6mRlwp9#2rF(eLyAP5bP_^gIk@=T^D>q zDd0n(S35ch?qr6k6mSI7ZUp~e4su|dUVTgD>paz3saVc;caXF=plPuLdf;#H8w9J! UYtg8Oh5!Hn07*qoM6N<$g5-d^bpQYW diff --git a/homedecor/textures/homedecor_desk_lamp_inv_red.png b/homedecor/textures/homedecor_desk_lamp_inv_red.png deleted file mode 100644 index 5db1dc101458783ed076061a65f0bef17adba3c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1029 zcmV+g1p51lP)l8-fZ7U@a_+ zUR!`FDSmi!Km`R03k-h=3J(tvcnJw|2nb*X2Yv|(Z3qcy2MA;b2#pE~df+PW)62uOs;8HCVPH>BM=bmL`S|eb>5*aea;As?00L=AL_t(o!|j*XQrkcjK!qz{ zOz*uzAOzBrz1!4Q70Hc|xisZL;a z=nInLg#F0kyw)xrxaOJ1oN<9=1wL22aAGQIQt}%I$6zGVC{zz*6p}v(M-f6TZWLz9 zm13-Sf94g*i~BHO&e;Dr-yJSkt*HMB;z6H^(e~%Rj{@{{LB9cUJct<01D}tMKIJRN zC`cXRJTRki2fpH06E($spJO2N-xT%l5~vR!X)`1;2m+tuLc_;1 z0IS1A)1;XJd4^a-g(()x0 z#ItR?1B0IDgwnLES)IT>@p?AW>-C(F^<|_Rc%RugJaOpA=c!ge;Ke=lm(KlQMJLdA zgi?6pvf0s2eLrxu0yRbjV2PPCo2ywCJibW3mO#<7cvnvEDta?5;!Og zDqmDxCJibZ2_7U2C=L%0B@HMg3@IH7AQBN1EDtXr3nMHKFD4Bt83`OF4JsiDBozx7 z84DXE3@8r|5iSogEDtXc5fd5-9W4+q4Gj-35Hb!95HAoi77Z8?5fUE?A}kKZW0m{4hs)25Hc+f zFfkD`D-JFw4J;)LDIN+TEDtXc5fe2MH!ct{Ck-nQ5E2^+9xxCxDh@3e2pbX-6b}y( zBMc`Y3nd^5BMuG^Bn&7n4>3tQNiz{OD+@1re061IVHXS;6A%>(3=D;ZfNybXZEtB( zLsC62KRF&d;^c_z0000*bW%=J00gip2OJ_50^^i$Jvj{WVl@%``u6kj=i=DP$-lj- zj*Ww4QZg_p8u;z&=iJ-Z(zURrq?CVsc5qHZ3HS8w<4^jL~>_{fe-+P^AxlsUyu16|js>~24eYBy2CRxoG`ZW(kMGX~lqnk6$%2)52JO!MeFw$) zqiotQVB=r}fVGLJZmshx)Z4B3(Vv94L~SJ0<`33 zL8%GSa=Gd3j>b>tq2(Kf?1~yi{h)Z}1SiR3Zq9GDT86Ll3k8a^>;MPr-Tg4xBFHnR z94Mw2Ok>>JQIX(;?rdJSai;e+RBr%E>b7$ZSU6V62w0d`oh*}J8t~z>q9rIuRUZ+-G+`-ElOOpcD4K?Du5s`{;#%}$HB3|e5|2olfHa<0 z1WVK4wF zMA!2?pTv!=0?iN?EmspHLg>j6#^hoF(9m3#1;z7|wGCsgR-rwcxqNwP&LB+g*XsE! d2L}9m{s4xyuLdb-6zBi|002ovPDHLkV1haoo8kZf diff --git a/homedecor/textures/homedecor_desk_lamp_metal_inv.png b/homedecor/textures/homedecor_desk_lamp_metal_inv.png new file mode 100644 index 0000000000000000000000000000000000000000..ba28cbd21b5970a7f484e3df38d30f5659f05330 GIT binary patch literal 2236 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 KMNUMnLSTZx@jA`` literal 0 HcmV?d00001 diff --git a/homedecor/textures/homedecor_desk_lamp_stem_inv.png b/homedecor/textures/homedecor_desk_lamp_stem_inv.png new file mode 100644 index 0000000000000000000000000000000000000000..55bfa42236dff08499110e47dd9d88e3d01269d6 GIT binary patch literal 1846 zcmV-62g&$}P)PAG%Z?P zsh7o#F~-Icgcy=lr3KHri;TjW*h7qe*e`;%Cd_ z0625z^5c#lym;}mJ${p5{6C!P=~;(i7&wkYp^&FiStK4$P%f9AST{WUK7)h%m*)o$ z?nNoZd+&Yn7hn%i0iu4|w&DaN5=o|}?vY3&DV2%0P$&71$>%9Tq196x^kAaL5Y9W2Ww9F8D_Kq>XrrAwb9rS#24ZKa&wwd;BE`5c{{ zUEIHakLRB2zGfIk3SeMh3#J)ZUYpGha^=b;_U`>DpMLre0)fye&vUVD3(KmZX>~J| zQa|xL&sRHFjDYd+8zhq*y!6udFbw^NiA2Y)LLn~!3WXeVb2CfM4>3AAOg1~n<;(B# z#TTE~rl#%+%d&7?7o|Yg^<~)$A=tO?`^`;2ES6yB&gY3n6I{J|k?!vG7c8qrEEWeK z8jX=ktso+hzKTB6v_sivSX*rG`K>|-?^8^38S0E6ulgU`{$dNY~8TklZ z*D(x}*I$3xH+#iOu-ezx&&0%S`uaBh)$`o%Xqrww{{UUr`SQyX;>8z#fv)Sk^2$D- zx>Vb^Cqdf>!~rFQxPI>3@f`q%51-(jcZQn3jNQ6*Cp|sA^!055ptm2#+`r#lM(>2xRYc>1Y(WV1hiB#8sR=57q=F%vZ^1-hGi%2BM$&h92(i93g8sp=&z~g8f zjiaN(U!P8{ySrz3J}|J^%49aFL?Wf)@uW&7JN8GTF_Os+48v#|n|-STwrtsfVbrU; z{{C+qE|-hu;$j)oG%!t57K?@VL!mImVu4g@)w4&ywr#tXt2N82emfRRh)5)g5FmsY zYpjb#W6aObHVpy3Y4O^%uef{nHuXj)u(ez+;dvg0VPY8Oxz($?2!~@ld^q1!VJrNL z|6Zo2CrPE!#N)}Dt{Xwev2k4o&vS*Y8_dkyZ@RqYTL=UK_4rRFQ?CMnYPEuGTSzGv zK*RGSy}g;HBfz&1Xf!EOdIKPYVVKlAS1}n3MzQS*laqIzT>={Yz2~WJA;9w-q*S=B z^Y`iLNy6c9Qy$&Eg~09GV@p{+(y!|pN-3n27>02TpjxdqB>}!yB!xmgQ!jJ`x~>B} zXy)S0*9(#D+rLFBwJH$|hEYnPlvE%-0a&+gLsJsqYcCLsB?*Tk1;fyio+nXCIhsab zc6O#|72sdx4Z5N-4*-?bab65{aQ{x-O-Q zWm#yNa1x0G#bUlS2yh$+P4k3O5~UQb>n+^6b+f4z;Oi-181?&mDJ4>RfY5q+*0fFt zD5cOeeYq-BN-{V1pmh{bFNIw!tA^t^NGZu=Hnt7{^=B-DP$-OP*2Q)6=DpS-K-V>- zl#b)rNGZ`YU1Tzu)*-;MEI>7S06fo4mdkUklLSpOh!D6^x$Mtt#t?(AHRWN7)8@G2?PR5WpN8B0H9i}mMfJC zmC7QH;|NXD_Ot{6AAE2XfOtG{zoR2XJf6TbO#xc4C6eHqZ~m;&66d5;Na literal 0 HcmV?d00001