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 2bb992bf..00000000 Binary files a/homedecor/textures/homedecor_bathroom_tiles_1.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bathroom_tiles_2.png b/homedecor/textures/homedecor_bathroom_tiles_2.png deleted file mode 100644 index 2268be8c..00000000 Binary files a/homedecor/textures/homedecor_bathroom_tiles_2.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bathroom_tiles_3.png b/homedecor/textures/homedecor_bathroom_tiles_3.png deleted file mode 100644 index c57533b6..00000000 Binary files a/homedecor/textures/homedecor_bathroom_tiles_3.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bathroom_tiles_4.png b/homedecor/textures/homedecor_bathroom_tiles_4.png deleted file mode 100644 index f70fa657..00000000 Binary files a/homedecor/textures/homedecor_bathroom_tiles_4.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bathroom_tiles_bg.png b/homedecor/textures/homedecor_bathroom_tiles_bg.png new file mode 100644 index 00000000..ad3f2bf3 Binary files /dev/null and b/homedecor/textures/homedecor_bathroom_tiles_bg.png differ diff --git a/homedecor/textures/homedecor_bathroom_tiles_blue.png b/homedecor/textures/homedecor_bathroom_tiles_blue.png deleted file mode 100644 index e4785006..00000000 Binary files a/homedecor/textures/homedecor_bathroom_tiles_blue.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bathroom_tiles_fg.png b/homedecor/textures/homedecor_bathroom_tiles_fg.png new file mode 100644 index 00000000..903eaec4 Binary files /dev/null and b/homedecor/textures/homedecor_bathroom_tiles_fg.png differ diff --git a/homedecor/textures/homedecor_bathroom_tiles_green.png b/homedecor/textures/homedecor_bathroom_tiles_green.png deleted file mode 100644 index ad7c15be..00000000 Binary files a/homedecor/textures/homedecor_bathroom_tiles_green.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bathroom_tiles_red.png b/homedecor/textures/homedecor_bathroom_tiles_red.png deleted file mode 100644 index 69b17538..00000000 Binary files a/homedecor/textures/homedecor_bathroom_tiles_red.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bathroom_tiles_tan.png b/homedecor/textures/homedecor_bathroom_tiles_tan.png deleted file mode 100644 index 8c485227..00000000 Binary files a/homedecor/textures/homedecor_bathroom_tiles_tan.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bathroom_tiles_yellow.png b/homedecor/textures/homedecor_bathroom_tiles_yellow.png deleted file mode 100644 index b49948dc..00000000 Binary files a/homedecor/textures/homedecor_bathroom_tiles_yellow.png and /dev/null differ