diff --git a/homedecor/shutters.lua b/homedecor/shutters.lua index 64b6c9cc..05a359fc 100644 --- a/homedecor/shutters.lua +++ b/homedecor/shutters.lua @@ -3,36 +3,40 @@ local S = homedecor.gettext local shutters = { - {"oak", "Unpainted oak"}, - {"mahogany", "Mahogany"}, - {"red", "Red"}, - {"yellow", "Yellow"}, - {"forest_green", "Forest green"}, - {"light_blue", "Light blue"}, - {"violet", "Violet"}, - {"black", "Black"}, - {"dark_grey", "Dark grey"}, - {"grey", "Grey"}, - {"white", "White"}, + {"oak", "Unpainted oak", "#bf8a51:200" }, + {"mahogany", "Mahogany", "#822606:200" }, + {"red", "Red", "#d00000:150" }, + {"yellow", "Yellow", "#ffff00:150" }, + {"forest_green", "Forest green", "#006000:150" }, + {"light_blue", "Light blue", "#1963c7:150" }, + {"violet", "Violet", "#6000ff:150" }, + {"black", "Black", "#000000:200" }, + {"dark_grey", "Dark grey", "#202020:200" }, + {"grey", "Grey", "#c0c0c0:150" }, + {"white", "White", "#ffffff:150" }, } local shutter_cbox = { type = "wallmounted", wall_top = { -0.5, 0.4375, -0.5, 0.5, 0.5, 0.5 }, wall_bottom = { -0.5, -0.5, -0.5, 0.5, -0.4375, 0.5 }, - wall_side = { -0.5, -0.5, -0.5, -0.4375, 0.5, 0.5 }, + wall_side = { -0.5, -0.5, -0.5, -0.4375, 0.5, 0.5 } } for i in ipairs(shutters) do local name = shutters[i][1] local desc = shutters[i][2] + local hue = shutters[i][3] + + local tile = "homedecor_window_shutter.png^[colorize:"..hue + local inv = "homedecor_window_shutter_inv.png^[colorize:"..hue homedecor.register("shutter_"..name, { mesh = "homedecor_window_shutter.obj", - tiles = { "homedecor_window_shutter_"..name..".png" }, + tiles = { tile }, description = S("Wooden Shutter ("..desc..")"), - inventory_image = "homedecor_window_shutter_"..name.."_inv.png", - wield_image = "homedecor_window_shutter_"..name.."_inv.png", + inventory_image = inv, + wield_image = inv, paramtype2 = "wallmounted", groups = { snappy = 3 }, sounds = default.node_sound_wood_defaults(), @@ -45,3 +49,4 @@ for i in ipairs(shutters) do end minetest.register_alias("homedecor:shutter_purple", "homedecor:shutter_violet") + diff --git a/homedecor/textures/homedecor_window_shutter.png b/homedecor/textures/homedecor_window_shutter.png new file mode 100644 index 00000000..5d2ae9ea Binary files /dev/null and b/homedecor/textures/homedecor_window_shutter.png differ diff --git a/homedecor/textures/homedecor_window_shutter_black.png b/homedecor/textures/homedecor_window_shutter_black.png deleted file mode 100644 index 896ccb99..00000000 Binary files a/homedecor/textures/homedecor_window_shutter_black.png and /dev/null differ diff --git a/homedecor/textures/homedecor_window_shutter_black_inv.png b/homedecor/textures/homedecor_window_shutter_black_inv.png deleted file mode 100644 index cc29ebcd..00000000 Binary files a/homedecor/textures/homedecor_window_shutter_black_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_window_shutter_dark_grey.png b/homedecor/textures/homedecor_window_shutter_dark_grey.png deleted file mode 100644 index 82b0e9d7..00000000 Binary files a/homedecor/textures/homedecor_window_shutter_dark_grey.png and /dev/null differ diff --git a/homedecor/textures/homedecor_window_shutter_dark_grey_inv.png b/homedecor/textures/homedecor_window_shutter_dark_grey_inv.png deleted file mode 100644 index 52c4c784..00000000 Binary files a/homedecor/textures/homedecor_window_shutter_dark_grey_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_window_shutter_forest_green.png b/homedecor/textures/homedecor_window_shutter_forest_green.png deleted file mode 100644 index 6a21eee1..00000000 Binary files a/homedecor/textures/homedecor_window_shutter_forest_green.png and /dev/null differ diff --git a/homedecor/textures/homedecor_window_shutter_forest_green_inv.png b/homedecor/textures/homedecor_window_shutter_forest_green_inv.png deleted file mode 100644 index 51a261e8..00000000 Binary files a/homedecor/textures/homedecor_window_shutter_forest_green_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_window_shutter_grey.png b/homedecor/textures/homedecor_window_shutter_grey.png deleted file mode 100644 index e31677fe..00000000 Binary files a/homedecor/textures/homedecor_window_shutter_grey.png and /dev/null differ diff --git a/homedecor/textures/homedecor_window_shutter_grey_inv.png b/homedecor/textures/homedecor_window_shutter_grey_inv.png deleted file mode 100644 index 7c20faef..00000000 Binary files a/homedecor/textures/homedecor_window_shutter_grey_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_window_shutter_inv.png b/homedecor/textures/homedecor_window_shutter_inv.png new file mode 100644 index 00000000..ec3e2aa9 Binary files /dev/null and b/homedecor/textures/homedecor_window_shutter_inv.png differ diff --git a/homedecor/textures/homedecor_window_shutter_light_blue.png b/homedecor/textures/homedecor_window_shutter_light_blue.png deleted file mode 100644 index 83f1d10a..00000000 Binary files a/homedecor/textures/homedecor_window_shutter_light_blue.png and /dev/null differ diff --git a/homedecor/textures/homedecor_window_shutter_light_blue_inv.png b/homedecor/textures/homedecor_window_shutter_light_blue_inv.png deleted file mode 100644 index 9e2a87f3..00000000 Binary files a/homedecor/textures/homedecor_window_shutter_light_blue_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_window_shutter_mahogany.png b/homedecor/textures/homedecor_window_shutter_mahogany.png deleted file mode 100644 index 835be18b..00000000 Binary files a/homedecor/textures/homedecor_window_shutter_mahogany.png and /dev/null differ diff --git a/homedecor/textures/homedecor_window_shutter_mahogany_inv.png b/homedecor/textures/homedecor_window_shutter_mahogany_inv.png deleted file mode 100644 index a31a97e7..00000000 Binary files a/homedecor/textures/homedecor_window_shutter_mahogany_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_window_shutter_oak.png b/homedecor/textures/homedecor_window_shutter_oak.png deleted file mode 100644 index 9559daf5..00000000 Binary files a/homedecor/textures/homedecor_window_shutter_oak.png and /dev/null differ diff --git a/homedecor/textures/homedecor_window_shutter_oak_inv.png b/homedecor/textures/homedecor_window_shutter_oak_inv.png deleted file mode 100644 index 952fb40a..00000000 Binary files a/homedecor/textures/homedecor_window_shutter_oak_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_window_shutter_red.png b/homedecor/textures/homedecor_window_shutter_red.png deleted file mode 100644 index 9d9e47de..00000000 Binary files a/homedecor/textures/homedecor_window_shutter_red.png and /dev/null differ diff --git a/homedecor/textures/homedecor_window_shutter_red_inv.png b/homedecor/textures/homedecor_window_shutter_red_inv.png deleted file mode 100644 index 9d731a7a..00000000 Binary files a/homedecor/textures/homedecor_window_shutter_red_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_window_shutter_violet.png b/homedecor/textures/homedecor_window_shutter_violet.png deleted file mode 100644 index abe15e80..00000000 Binary files a/homedecor/textures/homedecor_window_shutter_violet.png and /dev/null differ diff --git a/homedecor/textures/homedecor_window_shutter_violet_inv.png b/homedecor/textures/homedecor_window_shutter_violet_inv.png deleted file mode 100644 index 2323c848..00000000 Binary files a/homedecor/textures/homedecor_window_shutter_violet_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_window_shutter_white.png b/homedecor/textures/homedecor_window_shutter_white.png deleted file mode 100644 index 3d73b812..00000000 Binary files a/homedecor/textures/homedecor_window_shutter_white.png and /dev/null differ diff --git a/homedecor/textures/homedecor_window_shutter_white_inv.png b/homedecor/textures/homedecor_window_shutter_white_inv.png deleted file mode 100644 index c58d834b..00000000 Binary files a/homedecor/textures/homedecor_window_shutter_white_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_window_shutter_yellow.png b/homedecor/textures/homedecor_window_shutter_yellow.png deleted file mode 100644 index ab332a41..00000000 Binary files a/homedecor/textures/homedecor_window_shutter_yellow.png and /dev/null differ diff --git a/homedecor/textures/homedecor_window_shutter_yellow_inv.png b/homedecor/textures/homedecor_window_shutter_yellow_inv.png deleted file mode 100644 index 5ed128fb..00000000 Binary files a/homedecor/textures/homedecor_window_shutter_yellow_inv.png and /dev/null differ