From 9736e3d18755ba97a57f516a63966b8afc0999c9 Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Sun, 3 May 2015 22:20:06 -0400 Subject: [PATCH] phase out extra curtain textures use a single "base" color and colorize it --- homedecor/textures/homedecor_curtain.png | Bin 0 -> 605 bytes homedecor/textures/homedecor_curtain_blue.png | Bin 406 -> 0 bytes .../textures/homedecor_curtain_green.png | Bin 528 -> 0 bytes homedecor/textures/homedecor_curtain_open.png | Bin 0 -> 536 bytes .../textures/homedecor_curtain_open_blue.png | Bin 379 -> 0 bytes .../textures/homedecor_curtain_open_green.png | Bin 453 -> 0 bytes .../textures/homedecor_curtain_open_pink.png | Bin 573 -> 0 bytes .../textures/homedecor_curtain_open_red.png | Bin 420 -> 0 bytes .../homedecor_curtain_open_violet.png | Bin 445 -> 0 bytes .../textures/homedecor_curtain_open_white.png | Bin 429 -> 0 bytes homedecor/textures/homedecor_curtain_pink.png | Bin 672 -> 0 bytes homedecor/textures/homedecor_curtain_red.png | Bin 439 -> 0 bytes .../textures/homedecor_curtain_violet.png | Bin 461 -> 0 bytes .../textures/homedecor_curtain_white.png | Bin 486 -> 0 bytes homedecor/window_treatments.lua | 29 +++++++++--------- 15 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 homedecor/textures/homedecor_curtain.png delete mode 100644 homedecor/textures/homedecor_curtain_blue.png delete mode 100644 homedecor/textures/homedecor_curtain_green.png create mode 100644 homedecor/textures/homedecor_curtain_open.png delete mode 100644 homedecor/textures/homedecor_curtain_open_blue.png delete mode 100644 homedecor/textures/homedecor_curtain_open_green.png delete mode 100644 homedecor/textures/homedecor_curtain_open_pink.png delete mode 100644 homedecor/textures/homedecor_curtain_open_red.png delete mode 100644 homedecor/textures/homedecor_curtain_open_violet.png delete mode 100644 homedecor/textures/homedecor_curtain_open_white.png delete mode 100644 homedecor/textures/homedecor_curtain_pink.png delete mode 100644 homedecor/textures/homedecor_curtain_red.png delete mode 100644 homedecor/textures/homedecor_curtain_violet.png delete mode 100644 homedecor/textures/homedecor_curtain_white.png diff --git a/homedecor/textures/homedecor_curtain.png b/homedecor/textures/homedecor_curtain.png new file mode 100644 index 0000000000000000000000000000000000000000..075573d78272fe3128c9ef84331ebc1c7eab5352 GIT binary patch literal 605 zcmV-j0;2tiP)!CqPiBbwe2&QQwgg_}}j8#fO zN{QO{ooSk=wc@=e#z+W(hldAx?|*X&G2(C}=Ztd>QEUD4QwVCUoX=;LWuewe&Y5|h zxn8fFPN%_(_nzK6DJ4V*fqmacYuD=)tu+8jDPoND-Uky>N`w$7rT(ln#teuK;tn3Z zzrTqwa({n6azY5^c^>CPN{MAzxZQ3@DRIsXY^}9eYx({CrT308W{i4hCwlLM5b)k} zSbBu_epH+1d0alah%q8sYg{fDQcCpRS=SX~%y7mzH?TIwAf=?WHgpq@kB?}rS=V)V re!JZeLa^^U+qMm$4oy-@9DnFPaAs&gE5z$U00000NkvXXu0mjf9}N*| literal 0 HcmV?d00001 diff --git a/homedecor/textures/homedecor_curtain_blue.png b/homedecor/textures/homedecor_curtain_blue.png deleted file mode 100644 index eab2ed60344aa10be2bc40da4076938ae0a8bcf5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcmV;H0crk;P){H{r+qB zdcA&_iT(WZzHbk-wHp94BqJFK?ZuiI3CXB+&X{%)1SBMpRC~?P(pEBNj<)Pbj+r@< zU?oQjB#$K8m^p~Hc0Z_OwDq(ri6o%CI9N##3CU=$|WEdyI}W921UT`)h-Hl zA(EIm28dmfAd-=cwvy3Sy9fXdYGxt{fCSim+l_NbMlzCdPPElt$(WXQC6yd)!OS<$ zb9_EUQAxA~jJBp-$w;F8AgK0guOtXY`vK6taST8U2ej2z8$cxhP{{*^pk_uAkVG5MAZO5Tf5N~ z1AuCa(N;3rtBHA@aZXS(j~O6|b^#=Vq9|zVKV~5T4xNA&LjV8(07*qoM6N<$g7tf; ATmS$7 diff --git a/homedecor/textures/homedecor_curtain_green.png b/homedecor/textures/homedecor_curtain_green.png deleted file mode 100644 index 05debd85c23030ef6539bcdd965a5ec6d71c3c09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 528 zcmV+r0`L8aP)5kqnHn84kSa0E~lk#fwUQm?9(q7$h0 z*r$z%0%QWIsGhs1;_SlCJvE_w?L(ERB~d&xlKH_A8mNsEJ)U8z3Ijt&`rQ>ovA4)) zlwUy_)tBV(1-caX&5+GD?KNkrEPuD>KDxNzi~|sX%Z*TU2E|J)D)63C&ns#X!Qjj+ zz@G%~12fk=Nzyr7P?g>N5tzZsB%oUME$$rUFwVK~i|Po>Gwx{RqsRxFIjbKIWh&zz SM15ia0000)`iY#bkK98c2k(e2Xf|)O-FJx*cx}dnzJJWwRSa#v=Rj&scI;lg| zSJgZ`JUn^td3kvurNr^^F)>Eo-`}~tz3l-WA0MCI-rlISa&mG4!1MDn)>^dInqe52 zriofBB7!l7X`0xeltOEbQi^dLvDPx1%>a-XBYS&$IOnj|5@RIijJ0+vh%qvb<6nPc z3?hO!=cu*foFnHQ2!UZ3kWD*X*D*~K^Z6X5)IWlpGt1?Y*Vk7<2()d>{{H?tgK->j&QVGs zgz%-HZCkweIOk}ZhPG|jBODzaky2t928=P=40Z`25MxAZy$w?-g`|{dnueS+&N)`A z6{n}C{jT8d?ylEb6Jy-29YAu<>yHRIXXf)c-?3aSnWl-Z>!`Idjw3pR0D#t-rfK;2 z_~0j$Qi#a*u*6!+=H;BZxVY%QE55(K??r^RZP8kjb6&6U;NXDI&(AN@-(@rECOfIM z5<;NsIe&(F7AtX30fhdEP)?>pklI|0PG zUI40UmIUXT6(EG0OoS%5LxW%ko_Zjo9i8js!8?-7zreVlk1AyUq1!x5T0*eNrmzo7&xV6d)iDx5n4N7F2ZaFG``T5g%CHmVg@1KEbpAdGbLf?XVAkhJyl( z;x3p%_PP@)GK$ggj}PQv7hn>A=q~KW{^5g9iZxaz+WZ}W_<+0P|1sw?IE^0{YXAV= Z`2|A(9cLrTouvQ(002ovPDHLkV1j2&pa}o~ diff --git a/homedecor/textures/homedecor_curtain_open_green.png b/homedecor/textures/homedecor_curtain_open_green.png deleted file mode 100644 index a149844a0c467ba493c03abaf174cb85b2dcf57d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 453 zcmV;$0XqJPP);MI2j6ncRZ$!g;u^-P@YQIr4GpOHP*~Y@*Wgy#&X^7HHf(;Sn&H4#c?P(ie~^Y@&(T zK9kXq9=1UM>W4@s3H;HE$!;C@r-?0arc}TRH0HbN_ef`{6rcinA|7yYsDkoH{7nIU zpkFkZxm2v~#B`BLU+RzeoG&eK6S+uK!1D@#3YhDb4oa`Jc)(3mFUI&fhFSHiFH^7^ vi)5O-44~08Gb@?P)JvBfauOfe8sVlye?EJ-u}SVB`%i6s@q7K3kUCJK^LqVWNT&;*Zd0yrTA$6v9J z#D2|`m6G6OJ>b2kZEM6iN1haM7NZ8Mg`yL;-tKn%v3zsCLk!+~+AA%t@*swO7?I>B zTew|Wu)>{l|wbL+}c8%;VkPNLmc^jbU@Ap zV};6jq^Mza_yb!&%S4P3aTWi`;Egb!&vA8ya}Es_S#B>8AZf;WN7M*1aaJ691jB4L zV?Fltam0y5@_Hbtl2o}mTVSlkKHcd!(>onYwuo|F!;W*@ zdHtx%n?$ekU=guo`--cU;6mAkz zL%&90X}gcqPR@m3Q(nX1z^6!;Q)|p@g~=NukjJJrpL>G zj}1@*K!){z{{{fy$8Luv77a2qa1sDG0iYubC?U=a=;oJ^ZjFN0dj)9_^W9L-JwS{1 zX8`OTW(Gr1$Wdk6i2-FCJ#{-75Z@r<83W4byjOq|08aM|A`X<8EIW+Y$^*bW^(%7B zp9ugr92%W;2*Bj6c$5&3@frP< z1z56}GQzwSodE|KQl~xwaFc;^%8&qYxk&38adBc|H;Wfr7_eB^$i0vIgWdx&cm=>2 z`~+~BN~rIy?kns0^UYh+KkWiq@gLn6Q>b@o!=s<7}Zv}$e2|>hZBufbqbfUeOU zuV1{salw!6ce)pz9y})vn_pj9U!TtGym|TIX7lqK5S|=9BONxk8&G3*I)RApkc2

mIt%xaOn0yf8RS7SFo*!MS=drFQIoh&k0uQ+Q=Txz#ExRJ1X`p+ zF#qaqBq513q#*>$L52|aB<`gcm#LNLZpIi)tHP4mZU=h@hX?GPT^!B)WBujrOpER9 z0uh$!Zk#mbLWu3y0^%Xfz&0|B-jWthgCs&Akc5Xw0tE@CS|Nl%xIhx3IRAV+^MLjB z=}bfd!gK~x2$Dff!XpF_OPT~sU|AN@;^WoH%zvC;9?v02qB~fIWi&~6EXyoCunJGB n!X-XkpUgbc*~QUZh7f)O7nRrgqkQD`00000NkvXXu0mjf^L)CE diff --git a/homedecor/textures/homedecor_curtain_open_white.png b/homedecor/textures/homedecor_curtain_open_white.png deleted file mode 100644 index acfecbd4212a22afc7cd96652ad7539476adf2c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 429 zcmV;e0aE^nP)h-$SYBeiSsZ^}pZktPz#HQ1!4y)CwZ8jTQuh%Ll389FIra@Aq#6wB-A~(GCt! zR|_bXEf69WA$%pkKB}~gYwFd)<#N&JI7Ef#!{P8ofIC*6=g%pO$76F8qe_5Sg4ull z0@Tt5&mw@4O*XJe2A>E#&(kHN1uhz)D@0bW*ORUPM);S2JAx<^d5*CRkxlmnWJJir z;ZT#4gQ6&8NsM2>6c{sNxYmzCkP75SkQ0IHB9SQ9Qi1#k9H6fM1vc9F_2Ux!Oc2}v XM|u)=D4VIL00000NkvXXu0mjf2uQ!K diff --git a/homedecor/textures/homedecor_curtain_pink.png b/homedecor/textures/homedecor_curtain_pink.png deleted file mode 100644 index 0b2b67d2261851b94e717277344bb1f78f765e9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 672 zcmV;R0$=@!P)giC=x|M{Dg5^9FfYh?)JQaF1$+0ts4AsZ zw6un*;*2Ga#x*3Sm?#4(9q$dtvGFuLv6h3@8qb$2dpOYV8Otb*+Rw+zW(aM`Og@s!$=Msnd9vpN z=Nusf6fmPB1Gdiv<19v$ecezW10TyLy*9)c+Omv*j}tyGfZMzlb9Jhqpc^2BH`khF^O}I zB);#ft!?eD&Vb+~rmbM_tG%{Ydv(|M`!$Iqv}VT4NbA6iIp;`10!|`{+X4uJU~pUi zy)V0-wtl@|ZT2(4qhU002ovPDHLkV1hXG&GrBQ diff --git a/homedecor/textures/homedecor_curtain_violet.png b/homedecor/textures/homedecor_curtain_violet.png deleted file mode 100644 index 3b3cfc7987225d7e7e9141e1a083fb2e18370cef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 461 zcmV;;0W$uHP)6a~OK_v^>Z4@Cr1F(!lB$P7Xd8N}V!eUDZ7!@70L4w!aP5M%p*dQ1*wW+Y>`CP#+Mt-TFV zWX9v|oXff5%#n%rkGFcj-mA-;app3P3)0c2Y;>ze%f44nRPC-LlIYT=IbzRP)BPp}&@&5jp8I!TQrd?-_i1+Hv2HUX!@Y0am@Y|FDQy*92xwPC5>g4*d5O4)IV8b=fKU?dyPkc-&}fOV zy-igTvg$E2GGm7IfPfMxc)GTX@;r}jw5we~t;sM5$&e*fC9zvqhUZ>wHSB{F0ZCQ0 zb>;$-@$7AK%=J3vgjv@)048Ji!DuUD`)F6Y&QSF~VuB$>6j_HH00000NkvXXu0mjf DNX^_d diff --git a/homedecor/textures/homedecor_curtain_white.png b/homedecor/textures/homedecor_curtain_white.png deleted file mode 100644 index b9e251c6f2f28a339bdd19a2b8bba7b94ab501ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 486 zcmV@P)5JWo;I|70Pf*b$;HJs&1G#j@RoI z^Z7iU&u1JChsd%l+U<7mzS(S|uIpGV7QtGrR(flESDer1csw2gq?Dr7YUz7Aokq9Y zjraQvP_pn@zo8c0xMu*XuPdmrEq1@yI2NlgUI(0Ih=J zqV9A$shBw9L+YvlK}ZD#9tpsX!HyD>5Y%@{VK$pdHgW*D1_b5aDH4otr^Okf2J*N- zA_XINz(r9gnDV6Be`duPiV}|M=l78_H6VY^fMGlykIL8cf+N9cXMznCmIjy^V0mx= zql|@Y3_O+qQy6wnoabS`-^+0{8tG0BU#0BeAXXaz&>|0thlb8zWmzg9Bu-V%)P)Dq zpnxtAyQk1>9$lQR0(FU&ZMWP1TqzVx?u>g+Kz5Yjg8~Al@pvo;9Nlx$;S7j2dZ4HY cME)aLzd})NsZVv+7XSbN07*qoM6N<$g5R*(82|tP diff --git a/homedecor/window_treatments.lua b/homedecor/window_treatments.lua index e2adbc99..9130b03c 100644 --- a/homedecor/window_treatments.lua +++ b/homedecor/window_treatments.lua @@ -99,23 +99,24 @@ homedecor.register("blinds_thin", { }) local curtaincolors = { - "red", - "green", - "blue", - "white", - "pink", - "violet" + { "red", "#ad2323e0:175" }, + { "green", "#27a927e0:175" }, + { "blue", "#2626c6e0:175" }, + { "white", "#ffffffe0:175" }, + { "pink", "#ff8fb7e0:175" }, + { "violet", "#7f29d7e0:175" }, } for c in ipairs(curtaincolors) do - local color = curtaincolors[c] - local color_d = S(curtaincolors[c]) + local color = curtaincolors[c][1] + local hue = curtaincolors[c][2] + local color_d = S(curtaincolors[c][1]) homedecor.register("curtain_"..color, { description = S("Curtains (%s)"):format(color_d), - tiles = { "homedecor_curtain_"..color..".png" }, - inventory_image = "homedecor_curtain_"..color..".png", - wield_image = "homedecor_curtain_"..color..".png", + tiles = { "homedecor_curtain.png^[colorize:"..hue }, + inventory_image = "homedecor_curtain.png^[colorize:"..hue, + wield_image = "homedecor_curtain.png^[colorize:"..hue, drawtype = 'signlike', use_texture_alpha = true, walkable = false, @@ -135,9 +136,9 @@ for c in ipairs(curtaincolors) do homedecor.register("curtain_open_"..color, { description = S("Curtains (%s)"):format(color_d), - tiles = { "homedecor_curtain_open_"..color..".png" }, - inventory_image = "homedecor_curtain_open_"..color..".png", - wield_image = "homedecor_curtain_open_"..color..".png", + tiles = { "homedecor_curtain_open.png^[colorize:"..hue }, + inventory_image = "homedecor_curtain_open.png^[colorize:"..hue, + wield_image = "homedecor_curtain_open.png^[colorize:"..hue, drawtype = 'signlike', use_texture_alpha = true, walkable = false,