From 88735597954a2f29d11d38ed2bcd9853378d07cc Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Sun, 3 May 2015 23:12:30 -0400 Subject: [PATCH] phase out separate colored bathroom tiles textures use entirely new, better-looking separate fg and bg images, colorized as needed. --- homedecor/bathroom_furniture.lua | 39 +++++++++++------- .../textures/homedecor_bathroom_tiles_1.png | Bin 261 -> 0 bytes .../textures/homedecor_bathroom_tiles_2.png | Bin 359 -> 0 bytes .../textures/homedecor_bathroom_tiles_3.png | Bin 337 -> 0 bytes .../textures/homedecor_bathroom_tiles_4.png | Bin 387 -> 0 bytes .../textures/homedecor_bathroom_tiles_bg.png | Bin 0 -> 340 bytes .../homedecor_bathroom_tiles_blue.png | Bin 312 -> 0 bytes .../textures/homedecor_bathroom_tiles_fg.png | Bin 0 -> 482 bytes .../homedecor_bathroom_tiles_green.png | Bin 309 -> 0 bytes .../textures/homedecor_bathroom_tiles_red.png | Bin 284 -> 0 bytes .../textures/homedecor_bathroom_tiles_tan.png | Bin 295 -> 0 bytes .../homedecor_bathroom_tiles_yellow.png | Bin 306 -> 0 bytes 12 files changed, 24 insertions(+), 15 deletions(-) delete mode 100644 homedecor/textures/homedecor_bathroom_tiles_1.png delete mode 100644 homedecor/textures/homedecor_bathroom_tiles_2.png delete mode 100644 homedecor/textures/homedecor_bathroom_tiles_3.png delete mode 100644 homedecor/textures/homedecor_bathroom_tiles_4.png create mode 100644 homedecor/textures/homedecor_bathroom_tiles_bg.png delete mode 100644 homedecor/textures/homedecor_bathroom_tiles_blue.png create mode 100644 homedecor/textures/homedecor_bathroom_tiles_fg.png delete mode 100644 homedecor/textures/homedecor_bathroom_tiles_green.png delete mode 100644 homedecor/textures/homedecor_bathroom_tiles_red.png delete mode 100644 homedecor/textures/homedecor_bathroom_tiles_tan.png delete mode 100644 homedecor/textures/homedecor_bathroom_tiles_yellow.png diff --git a/homedecor/bathroom_furniture.lua b/homedecor/bathroom_furniture.lua index 4676685b..842d1395 100644 --- a/homedecor/bathroom_furniture.lua +++ b/homedecor/bathroom_furniture.lua @@ -1,29 +1,38 @@ local S = homedecor.gettext local bathroom_tile_colors = { - { "1", "white/grey" }, - { "2", "white/dark grey" }, - { "3", "white/black" }, - { "4", "black/dark grey" }, - { "red", "white/red" }, - { "green", "white/green" }, - { "blue", "white/blue" }, - { "yellow", "white/yellow" }, - { "tan", "white/tan" }, + { "1", "white/grey", "#c0c0c0:200" }, + { "2", "white/dark grey", "#404040:150" }, + { "3", "white/black", "#000000:200" }, + { "4", "black/dark grey", "" }, + { "red", "white/red", "#d00000:150" }, + { "green", "white/green", "#00d000:150" }, + { "blue", "white/blue", "#0000d0:150" }, + { "yellow", "white/yellow", "#ffff00:150" }, + { "tan", "white/tan", "#ceaf42:150" } } for i in ipairs(bathroom_tile_colors) do local color = bathroom_tile_colors[i][1] local shade = bathroom_tile_colors[i][2] + local hue = bathroom_tile_colors[i][3] + + local coloredtile = "homedecor_bathroom_tiles_bg.png^(homedecor_bathroom_tiles_fg.png^[colorize:"..hue..")" + + if color == "4" then + coloredtile = "(homedecor_bathroom_tiles_bg.png^[colorize:#000000:75)".. + "^(homedecor_bathroom_tiles_fg.png^[colorize:#000000:200)" + end + minetest.register_node("homedecor:tiles_"..color, { description = "Bathroom/kitchen tiles ("..shade..")", tiles = { - "homedecor_bathroom_tiles_"..color..".png", - "homedecor_bathroom_tiles_"..color..".png", - "homedecor_bathroom_tiles_"..color..".png", - "homedecor_bathroom_tiles_"..color..".png", - "homedecor_bathroom_tiles_"..color..".png^[transformR90", - "homedecor_bathroom_tiles_"..color..".png^[transformR90" + coloredtile, + coloredtile, + coloredtile, + coloredtile, + "("..coloredtile..")^[transformR90", + "("..coloredtile..")^[transformR90" }, groups = {cracky=3}, sounds = default.node_sound_stone_defaults(), diff --git a/homedecor/textures/homedecor_bathroom_tiles_1.png b/homedecor/textures/homedecor_bathroom_tiles_1.png deleted file mode 100644 index 2bb992bfbc9e783e87ffa3ef6e11b6baba0db28d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 261 zcmV+g0s8)lP)K6~$1tEySOy0s>%VQ}~N&-AHkpC%e_-ax%auity?$IOfe z)YJe_#yiW0GTvD}l=05;p^SHy4`sZwd?@3cAOG diff --git a/homedecor/textures/homedecor_bathroom_tiles_2.png b/homedecor/textures/homedecor_bathroom_tiles_2.png deleted file mode 100644 index 2268be8c305b52640b4387f7d0214a2d131c0073..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 359 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rIkMVAS(;aSYKoUpg^AzsW%0*!#o& z(;FO86L>TJ*fUP|EyKO z%RL?6H@3X1da5`7w|5V_W5W5E1J2X9E*t#k_BvO4wdZ{KZQuIWs=NDs8%Z(FHri>J z`)XNg#EIV_N7|cP_Pq{Y9XhM)^wazd&C|y1))g;~o4MU5LnzM)E}xQQ!9ftc~A4 zlEos`LITM0WtOMWAks?z=MZuvWXOTljeNbW5y2P@mN(~zNklz6+aMV$)cf>CjEDPpl$lH^E8>v+)T~^vB}UH zCd>3xDFEK%Bw%6FG@j@AzF+Ao5)lA8ri?LFDs)wx&&B1^_51y?ZCe09Z=TM%;MAMY zk;{2>F3t#8$YWvK1i(tBGEOOVt%0>WZi6uFBC1N2f7#c%KIXaO5CDgLwvcN|M*#Bt zDBeW3GYeNS(c5*E`YDk_I9fQ^!k0RuUgmm{g3mA zqlbRK_cEP|Bz}JK0VH$57y~eJU75<_RQw#6c$@sd$lK({#M|V@$lK%xM&1TLF!46} hG4VF}G4eL~`3BM3?_q~|)yDt;002ovPDHLkV1hLcyM+J% diff --git a/homedecor/textures/homedecor_bathroom_tiles_bg.png b/homedecor/textures/homedecor_bathroom_tiles_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..ad3f2bf39906b76822a5e9a853a7403b62f76af7 GIT binary patch literal 340 zcmV-a0jvIrP)e4 z+pfbP3=0ut-K1&S{{Jgm?tyR~qSG?Q0|G~h9ovjC;Qz!JiKy1f%&*t$#J%^3C?d61 zgy~po_0d|JaYO`wF~-_}h&ku8ZN_`=&N=7YS1rbvQVJo=Iu#d@5Q4SV9LKS3TWc+) z^nSk=-H6D{&*$@EBchyhYi*gT!bGH$@`a0t?o?}?3nHTTVt^Hqecy@5Ik)V}%*=ed z-Dc1%IRJn$W{mN8JWf343;^4<9mj#o)ZV)>X5aT;XTA3!gs%o;j0#xf>5_=J=8$vl zy(`I#mr_Cq&N)Ohr)%E(&*wAeaKGP~S=C=`tu=LU$$^McO3bWI%<@p3UUJayNpj_& mW|vZkXbCRHSW21o0Kgv-9M!1bzRLjs0000L&OZtl0dyl({r-UYakZdu8SKs;ckR)!%Drz1PzZx| zvq|d$dAmL36LdH5Z+hSV=C|_ie<$|YBQfhAT$0|HzNl;p&>0M#u6{1-oD!Ml%5S(IBEHUE2KjTRgFaCEA9*ji6cz_5A5Cs$pE%Y5;{PMJZd3)?kraQB{BnSeP z=Q%9PLKucvE|&!VlF80%R<|>m`okD==&b@<%tl2^ZBfK-tYHn zFc`qLZ5$2z{x=>y?LTnkdUs4>gJ+ z#BmJMG$EzLZ}g9&EQ;3XbETC<<`S zalhZc-iB$K2!a5|<53sjoI@!Er4+iZ(*(-0gp?Aq*$k9YUEsC*LWr+>kY(A=)iTEL Y2N_re@dMZ+LI3~&07*qoM6N<$f<3&_Q2+n{ literal 0 HcmV?d00001 diff --git a/homedecor/textures/homedecor_bathroom_tiles_green.png b/homedecor/textures/homedecor_bathroom_tiles_green.png deleted file mode 100644 index ad7c15be9ae22173717582f785f56c0c78983e41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}X@F0Nt3Z{2P?L~Qn~-p)u<&$Y zkuDLD2_mA?MaAZci7gQmTP7yHTwHvuxWont$(@o?hoq#BO3R#*k+~ovds$ZYrmWlp zImL&HDi2h&A8PAA)Hi)-YWdL8_OY$q6FZk@F78j=J)e38JPU|;5%K)@^EZFq{P_3d z-@ktW(>^f)9Z>D*;us5}tDnm{r-UW|Pu_6H diff --git a/homedecor/textures/homedecor_bathroom_tiles_tan.png b/homedecor/textures/homedecor_bathroom_tiles_tan.png deleted file mode 100644 index 8c48522795df7a62f4a86227f51fef8cbce727c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}W`IwK>zb*a8)x}!o)fTjUeMP0 zA=?*5>{=4HcSXv+Rhj!&XB}9Rb8ub3;SEK{wpO3q(R6BO^O-%J=MVH zV=iz+beeUEWZql_sR*_c%3FfG0?Y+i^**}x%PA>{O9*ki65FP{#rTV-!CCox>MOz| pq;7t9|MqucZGFmpc?5I5J%hG{X-y2zDxf16JYD@<);T3K0RXprh(-Va diff --git a/homedecor/textures/homedecor_bathroom_tiles_yellow.png b/homedecor/textures/homedecor_bathroom_tiles_yellow.png deleted file mode 100644 index b49948dca46f4457a1c893c22be904c1b3d00ac4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}QGic~>y|B?d-rl3JjiwYIM>OO zT<6boUAe-2?Hc!k2i(t}^Spe?^ZGT<`}aJbKJkD4EdBYj+UL(&U%u#n`C|Fyi}ly9 z4qv}|ef{e5^{d~vZ=v75g@5}N{q0-qw{OYczNLQup7H&A&iC&HKYmpI{rl|Szc>H> zeg60Fd-Cz+_kp%od%8G=NQ9f7yUEyOz~FK)ltV#)-+`y7a__(BFWK5N0;Lq+ZP@!@ z&z}nm8A>O7-LO`{BYejD0QVhNn=}vHaeA|0(kY=&3@;g{zwDmJyM(2%WgCNI+`+1r ztcGO*Uk