Added gold and metal chandeliers, armchair and sofa

decor_api/lighting.lua

@@ -6,7 +6,7 @@ local default_on_rightclick = function(pos)
 		return
 	end
 
-	minetest.set_node(pos, {name="multidecor:" .. add_props.swap_light.name})
+	minetest.set_node(pos, {name="multidecor:" .. add_props.swap_light.name, param2=node.param2})
 end
 
 

decor_api/register.lua

@@ -166,7 +166,7 @@ function register.register_furniture_unit(name, def, craft_def)
 		elseif def.material == "metal" then
 			f_def.sounds = default.node_sound_metal_defaults()
 		elseif def.material == "plastic" then
-			f_def.sounds = default.node_sound_leaves_defaults()
+			f_def.sounds = default.node_sound_wood_defaults({dig={name="default_dig_snappy", gain=0.5}})
 		elseif def.material == "stone" then
 			f_def.sounds = default.node_sound_stone_defaults()
 		end

modern/chairs.lua

@@ -151,3 +151,72 @@ register.register_seat("round_modern_metallic_stool", {
 		{"multidecor:metal_bar", "multidecor:metal_bar", ""}
 	}
 })
+
+register.register_seat("armchair_with_wooden_legs", {
+	style = "modern",
+	material = "wood",
+	description = "Armchair with wooden legs",
+	inventory_image = "multidecor_armchair_with_wooden_legs_inv.png",
+	visual_scale = 0.5,
+	mesh = "multidecor_armchair_with_wooden_legs.b3d",
+	tiles = {"multidecor_pine_wood2.png", "multidecor_wool_material.png", "multidecor_wool_material.png"},
+	bounding_boxes = {
+		{-0.3, -0.5, -0.45, 0.3, 0.15, 0.3},
+		{-0.5, -0.5, -0.45, -0.3, 0.375, 0.3},
+		{0.3, -0.5, -0.45, 0.5, 0.375, 0.3},
+		{-0.5, -0.5, 0.3, 0.5, 0.85, 0.5}
+	}
+},
+{
+	seat_data = {
+		pos = {x=0.0, y=0.2, z=0.0},
+		rot = {x=0, y=0, z=0},
+		models = {
+			{
+				mesh = "multidecor_character_sitting.b3d",
+				anim = {range = {x=1, y=80}, speed = 15}
+			}
+		}
+	}
+},
+{
+	recipe = {
+		{"wool:white", "stairs:slab_pine_wood", "multidecor:pine_plank"},
+		{"wool:white", "multidecor:pine_plank", ""},
+		{"", "", ""}
+	}
+})
+
+register.register_seat("sofa", {
+	style = "modern",
+	material = "plastic",
+	description = "Sofa",
+	visual_scale = 0.5,
+	mesh = "multidecor_modern_sofa.b3d",
+	tiles = {"multidecor_modern_sofa.png", "multidecor_cloth.png"},
+	bounding_boxes = {
+		{-0.4, -0.5, -0.325, 0.4, 0, 0.225},
+		{-0.5, -0.5, -0.325, -0.4, 0.2, 0.225},
+		{0.4, -0.5, -0.325, 0.5, 0.2, 0.225},
+		{-0.5, -0.5, 0.225, 0.5, 0.6, 0.5}
+	}
+},
+{
+	seat_data = {
+		pos = {x=0.0, y=0.1, z=0.0},
+		rot = {x=0, y=0, z=0},
+		models = {
+			{
+				mesh = "multidecor_character_sitting.b3d",
+				anim = {range = {x=1, y=80}, speed = 15}
+			}
+		}
+	}
+},
+{
+	recipe = {
+		{"wool:white", "wool:white", "wool:white"},
+		{"multidecor:plastic_sheet", "multidecor:plastic_sheet", ""},
+		{"multidecor:plastic_sheet", "", ""}
+	}
+})

modern/lamps.lua

@@ -1,4 +1,5 @@
 local silvered_lamp_recipe
+local gold_chandelier_recipe
 
 if minetest.get_modpath("moreores") then
 	silvered_lamp_recipe = {
@@ -71,3 +72,53 @@ register.register_light("plastic_desk_lamp_off", {
 		{"", "multidecor:plastic_sheet", ""}
 	}
 })
+
+register.register_light("gold_chandelier_with_glass_candles_off", {
+	style = "modern",
+	material = "metal",
+	description = "Gold Chandelier With Glass Candles",
+	visual_scale = 0.5,
+	wield_scale = {x=0.3, y=0.3, z=0.3},
+	use_texture_alpha = "blend",
+	mesh = "multidecor_gold_chandelier_with_glass_candles.b3d",
+	tiles = {
+		"multidecor_gold_material.png",
+		"multidecor_gloss.png",
+		"multidecor_silver_material.png",
+		"multidecor_bulb_surf.png"
+	},
+	bounding_boxes = {
+		{-0.15, 0, -0.15, 0.15, 0.5, 0.15},
+		{-0.5, -0.5, -0.5, 0.5, 0, 0.5}
+	},
+},
+{
+	swap_light = {
+		name = "gold_chandelier_with_glass_candles_on",
+		light_level = 13
+	}
+})
+
+register.register_light("metal_chandelier_with_plastic_plafonds_off", {
+	style = "modern",
+	material = "metal",
+	description = "Metal Chandelier With Plastic Plafonds",
+	inventory_image = "multidecor_metal_chandelier_inv.png",
+	use_texture_alpha = "blend",
+	mesh = "multidecor_metal_chandelier_with_plastic_plafonds.b3d",
+	tiles = {
+		"multidecor_metal_material.png",
+		"multidecor_plastic_material.png",
+		"multidecor_bulb_surf.png"
+	},
+	bounding_boxes = {
+		{-0.2, -0.1, -0.2, 0.2, 0.5, 0.2},
+		{-0.5, -0.5, -0.5, 0.5, -0.1, 0.5}
+	},
+},
+{
+	swap_light = {
+		name = "metal_chandelier_with_plastic_plafonds_on",
+		light_level = 12
+	}
+})

modern/models/multidecor_bedside_table.mtl

@@ -1,24 +0,0 @@
-# Blender MTL File: 'multidecor_bedside_table.blend'
-# Material Count: 2
-
-newmtl Material
-Ns 323.999994
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 2
-map_Kd /home/andrey/minetests/minetest-5.6.0-dev/mods/multidecor/modern/textures/multidecor_pine_wood2.png
-
-newmtl Material.003
-Ns 225.000000
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 2
-map_Kd /home/andrey/minetests/minetest-5.6.0-dev/mods/multidecor/modern/textures/multidecor_hardboard.png

modern/models/multidecor_jungle_bed.mtl

@@ -1,13 +0,0 @@
-# Blender MTL File: 'multidecor_jungle_bed.blend'
-# Material Count: 1
-
-newmtl Material
-Ns 323.999994
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.450000
-d 1.000000
-illum 2
-map_Kd /home/andrey/minetests/minetest-5.6.0-dev/mods/multidecor/modern/textures/multidecor_modern_jungle_bed.png