[homedecor] Update

mods/homedecor_modpack/lrfurn/armchairs.lua

@@ -1,14 +1,3 @@
-local armchairs_list = {
-	{ "Red Armchair", "red"},
-	{ "Orange Armchair", "orange"},
-	{ "Yellow Armchair", "yellow"},
-	{ "Green Armchair", "green"},
-	{ "Blue Armchair", "blue"},
-	{ "Violet Armchair", "violet"},
-	{ "Black Armchair", "black"},
-	{ "Grey Armchair", "grey"},
-	{ "White Armchair", "white"},
-}
 
 local armchair_cbox = {
 	type = "fixed",
@@ -18,16 +7,16 @@ local armchair_cbox = {
 	}
 }
 
-for i in ipairs(armchairs_list) do
-	local armchairdesc = armchairs_list[i][1]
-	local colour = armchairs_list[i][2]
+for i in ipairs(lrfurn.colors) do
+	local colour = lrfurn.colors[i][1]
+	local hue = lrfurn.colors[i][2]
 
 	minetest.register_node("lrfurn:armchair_"..colour, {
-		description = armchairdesc,
+		description = "Armchair ("..colour..")",
 		drawtype = "mesh",
 		mesh = "lrfurn_armchair.obj",
 		tiles = {
-			"lrfurn_sofa_"..colour..".png",
+			"lrfurn_bg_white.png^[colorize:"..hue.."^lrfurn_sofa_overlay.png",
 			"lrfurn_sofa_bottom.png"
 		},
 		paramtype = "light",

mods/homedecor_modpack/lrfurn/init.lua

@@ -8,6 +8,24 @@ lrfurn.fdir_to_fwd = {
 	{ -1,  0 },
 }
 
+lrfurn.colors = { -- mod changed to use colorize feature of minetest engine (cg72)
+	{ "black",       "#000000:230" }, 
+	{ "brown",       "#251005:225" },
+	{ "blue",        "#0000d0:225" },
+	{ "cyan",        "#009fa7:250" }, 
+	{ "dark_grey",   "#101010:175" },
+	{ "dark_green",  "#007000:230" },
+	{ "green",       "#00d000:250" },
+	{ "grey",        "#101010:100" },
+	{ "magenta",     "#e0048b:250" },
+	{ "orange",      "#ee9000:240" },
+	{ "pink",        "#ff90b0:250" },	
+	{ "red",         "#800000:240" },
+	{ "violet",      "#9000d0:250" },
+	{ "white",       "#000000:000" },
+	{ "yellow",      "#dde000:240" }
+}
+
 function lrfurn.check_forward(pos, fdir, long, placer)
 	if not fdir or fdir > 3 then fdir = 0 end
 

mods/homedecor_modpack/lrfurn/longsofas.lua

@@ -1,14 +1,3 @@
-local longsofas_list = {
-	{ "Red Long Sofa", "red"},
-	{ "Orange Long Sofa", "orange"},
-	{ "Yellow Long Sofa", "yellow"},
-	{ "Green Long Sofa", "green"},
-	{ "Blue Long Sofa", "blue"},
-	{ "Violet Long Sofa", "violet"},
-	{ "Black Long Sofa", "black"},
-	{ "Grey Long Sofa", "grey"},
-	{ "White Long Sofa", "white"},
-}
 
 local longsofa_sbox = {
 	type = "fixed",
@@ -17,22 +6,22 @@ local longsofa_sbox = {
 
 local longsofa_cbox = {
 	type = "fixed",
-	fixed = {
+	fixed = { 
 		{-0.5, -0.5, -0.5, 0.5, 0, 2.5 },
 		{-0.5, -0.5, 0.5, -0.4, 0.5, 2.5 }
 	}
 }
 
-for i in ipairs(longsofas_list) do
-	local longsofadesc = longsofas_list[i][1]
-	local colour = longsofas_list[i][2]
+for i in ipairs(lrfurn.colors) do
+	local colour = lrfurn.colors[i][1]
+	local hue = lrfurn.colors[i][2]
 
 	minetest.register_node("lrfurn:longsofa_"..colour, {
-		description = longsofadesc,
+		description = "Long Sofa ("..colour..")",
 		drawtype = "mesh",
 		mesh = "lrfurn_sofa_long.obj",
 		tiles = {
-			"lrfurn_sofa_"..colour..".png",
+			"lrfurn_bg_white.png^[colorize:"..hue.."^lrfurn_sofa_overlay.png",
 			"lrfurn_sofa_bottom.png"
 		},
 		paramtype = "light",
@@ -63,7 +52,6 @@ for i in ipairs(longsofas_list) do
 			end
 			pos.y = pos.y-0.5
 			clicker:setpos(pos)
-			clicker:set_hp(20)
 		end
 	})
 

mods/homedecor_modpack/lrfurn/sofas.lua

@@ -1,14 +1,4 @@
-local sofas_list = {
-	{ "Red Sofa", "red"},
-	{ "Orange Sofa", "orange"},
-	{ "Yellow Sofa", "yellow"},
-	{ "Green Sofa", "green"},
-	{ "Blue Sofa", "blue"},
-	{ "Violet Sofa", "violet"},
-	{ "Black Sofa", "black"},
-	{ "Grey Sofa", "grey"},
-	{ "White Sofa", "white"},
-}
+
 
 local sofa_sbox = {
 	type = "fixed",
@@ -17,22 +7,22 @@ local sofa_sbox = {
 
 local sofa_cbox = {
 	type = "fixed",
-	fixed = {
+	fixed = { 
 		{-0.5, -0.5, -0.5, 0.5, 0, 1.5 },
 		{-0.5, -0.5, 0.5, -0.4, 0.5, 1.5 }
 	}
 }
 
-for i in ipairs(sofas_list) do
-	local sofadesc = sofas_list[i][1]
-	local colour = sofas_list[i][2]
+for i in ipairs(lrfurn.colors) do
+	local colour = lrfurn.colors[i][1]
+	local hue = lrfurn.colors[i][2]
 
 	minetest.register_node("lrfurn:sofa_"..colour, {
-		description = sofadesc,
+		description = "Sofa ("..colour..")",
 		drawtype = "mesh",
 		mesh = "lrfurn_sofa_short.obj",
 		tiles = {
-			"lrfurn_sofa_"..colour..".png",
+			"lrfurn_bg_white.png^[colorize:"..hue.."^lrfurn_sofa_overlay.png",
 			"lrfurn_sofa_bottom.png"
 		},
 		paramtype = "light",