diff --git a/homedecor/beds.lua b/homedecor/beds.lua index 2f1ca9de..73d51201 100644 --- a/homedecor/beds.lua +++ b/homedecor/beds.lua @@ -1,15 +1,15 @@ local S = homedecor.gettext local bedcolors = { - "red", - "green", - "blue", - "violet", - "brown", - "darkgrey", - "orange", - "yellow", - "pink", + { "red", "#d00000:150" }, + { "green", "#00d000:150" }, + { "blue", "#0000d0:150" }, + { "violet", "#7000e0:150" }, + { "brown", "#603010:175" }, + { "darkgrey", "#101010:150" }, + { "orange", "#ff3000:150" }, + { "yellow", "#ffe000:150" }, + { "pink", "#ff80b0:150" } } local bed_sbox = { @@ -40,8 +40,11 @@ local kbed_cbox = { } } -for _, color in ipairs(bedcolors) do +for i in ipairs(bedcolors) do + local color = bedcolors[i][1] local color2=color + local hue = bedcolors[i][2] + if color == "darkgrey" then color2 = "dark_grey" end @@ -55,7 +58,7 @@ for _, color in ipairs(bedcolors) do "homedecor_bed_bottom.png", "wool_"..color2..".png^[brighten", -- pillow }, - inventory_image = "homedecor_bed_"..color.."_inv.png", + inventory_image = "homedecor_bed_inv.png^(homedecor_bed_overlay_inv.png^[colorize:"..hue..")", description = S("Bed (%s)"):format(color), groups = {snappy=3}, selection_box = bed_sbox, @@ -86,7 +89,6 @@ for _, color in ipairs(bedcolors) do "homedecor_bed_bottom.png", "wool_"..color2..".png^[brighten", }, - groups = {snappy=3, not_in_creative_inventory=1}, selection_box = bed_sbox, collision_box = bed_cbox, sounds = default.node_sound_wood_defaults(), @@ -112,7 +114,8 @@ for _, color in ipairs(bedcolors) do "homedecor_bed_bottom.png", "wool_"..color2..".png^[brighten", }, - inventory_image = "homedecor_bed_kingsize_"..color.."_inv.png", + inventory_image = "homedecor_bed_kingsize_inv.png^(homedecor_bed_kingsize_overlay_inv.png^[colorize:"..hue..")", + groups = {snappy=3, not_in_creative_inventory=1}, description = S("Bed (%s, king sized)"):format(color), groups = {snappy=3, not_in_creative_inventory=1}, selection_box = kbed_sbox, diff --git a/homedecor/textures/homedecor_bed_blue_inv.png b/homedecor/textures/homedecor_bed_blue_inv.png deleted file mode 100644 index 33d61df7..00000000 Binary files a/homedecor/textures/homedecor_bed_blue_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bed_brown_inv.png b/homedecor/textures/homedecor_bed_brown_inv.png deleted file mode 100644 index 5a7da3c6..00000000 Binary files a/homedecor/textures/homedecor_bed_brown_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bed_darkgrey_inv.png b/homedecor/textures/homedecor_bed_darkgrey_inv.png deleted file mode 100644 index db27f736..00000000 Binary files a/homedecor/textures/homedecor_bed_darkgrey_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bed_green_inv.png b/homedecor/textures/homedecor_bed_green_inv.png deleted file mode 100644 index e3c19af2..00000000 Binary files a/homedecor/textures/homedecor_bed_green_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bed_inv.png b/homedecor/textures/homedecor_bed_inv.png new file mode 100644 index 00000000..20cf34f5 Binary files /dev/null and b/homedecor/textures/homedecor_bed_inv.png differ diff --git a/homedecor/textures/homedecor_bed_kingsize_blue_inv.png b/homedecor/textures/homedecor_bed_kingsize_blue_inv.png deleted file mode 100644 index 981c5999..00000000 Binary files a/homedecor/textures/homedecor_bed_kingsize_blue_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bed_kingsize_brown_inv.png b/homedecor/textures/homedecor_bed_kingsize_brown_inv.png deleted file mode 100644 index 0e976a29..00000000 Binary files a/homedecor/textures/homedecor_bed_kingsize_brown_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bed_kingsize_darkgrey_inv.png b/homedecor/textures/homedecor_bed_kingsize_darkgrey_inv.png deleted file mode 100644 index d3f80486..00000000 Binary files a/homedecor/textures/homedecor_bed_kingsize_darkgrey_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bed_kingsize_green_inv.png b/homedecor/textures/homedecor_bed_kingsize_green_inv.png deleted file mode 100644 index c87713dd..00000000 Binary files a/homedecor/textures/homedecor_bed_kingsize_green_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bed_kingsize_inv.png b/homedecor/textures/homedecor_bed_kingsize_inv.png new file mode 100644 index 00000000..9a91c5c9 Binary files /dev/null and b/homedecor/textures/homedecor_bed_kingsize_inv.png differ diff --git a/homedecor/textures/homedecor_bed_kingsize_orange_inv.png b/homedecor/textures/homedecor_bed_kingsize_orange_inv.png deleted file mode 100644 index 86f1aaf2..00000000 Binary files a/homedecor/textures/homedecor_bed_kingsize_orange_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bed_kingsize_overlay_inv.png b/homedecor/textures/homedecor_bed_kingsize_overlay_inv.png new file mode 100644 index 00000000..60802a6b Binary files /dev/null and b/homedecor/textures/homedecor_bed_kingsize_overlay_inv.png differ diff --git a/homedecor/textures/homedecor_bed_kingsize_pink_inv.png b/homedecor/textures/homedecor_bed_kingsize_pink_inv.png deleted file mode 100644 index b045c262..00000000 Binary files a/homedecor/textures/homedecor_bed_kingsize_pink_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bed_kingsize_red_inv.png b/homedecor/textures/homedecor_bed_kingsize_red_inv.png deleted file mode 100644 index 6ae61d06..00000000 Binary files a/homedecor/textures/homedecor_bed_kingsize_red_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bed_kingsize_violet_inv.png b/homedecor/textures/homedecor_bed_kingsize_violet_inv.png deleted file mode 100644 index cddbc702..00000000 Binary files a/homedecor/textures/homedecor_bed_kingsize_violet_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bed_kingsize_yellow_inv.png b/homedecor/textures/homedecor_bed_kingsize_yellow_inv.png deleted file mode 100644 index f62ea75f..00000000 Binary files a/homedecor/textures/homedecor_bed_kingsize_yellow_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bed_orange_inv.png b/homedecor/textures/homedecor_bed_orange_inv.png deleted file mode 100644 index bf2dff81..00000000 Binary files a/homedecor/textures/homedecor_bed_orange_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bed_overlay_inv.png b/homedecor/textures/homedecor_bed_overlay_inv.png new file mode 100644 index 00000000..a31fd0fa Binary files /dev/null and b/homedecor/textures/homedecor_bed_overlay_inv.png differ diff --git a/homedecor/textures/homedecor_bed_pink_inv.png b/homedecor/textures/homedecor_bed_pink_inv.png deleted file mode 100644 index d261a724..00000000 Binary files a/homedecor/textures/homedecor_bed_pink_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bed_red_inv.png b/homedecor/textures/homedecor_bed_red_inv.png deleted file mode 100644 index 166bf4ee..00000000 Binary files a/homedecor/textures/homedecor_bed_red_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bed_violet_inv.png b/homedecor/textures/homedecor_bed_violet_inv.png deleted file mode 100644 index 9e4f963b..00000000 Binary files a/homedecor/textures/homedecor_bed_violet_inv.png and /dev/null differ diff --git a/homedecor/textures/homedecor_bed_yellow_inv.png b/homedecor/textures/homedecor_bed_yellow_inv.png deleted file mode 100644 index 8ab16537..00000000 Binary files a/homedecor/textures/homedecor_bed_yellow_inv.png and /dev/null differ