Version MFF.

lrfurn/sofas.lua

@@ -1,126 +1,85 @@
 
-local S = homedecor_i18n.gettext
 
-local sofa_cbox = {
-	type = "wallmounted",
-	wall_side = {-0.5, -0.5, -0.5, 0.5, 0.5, 1.5}
+local sofa_sbox = {
+	type = "fixed",
+	fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 1.5}
 }
 
-minetest.register_node("lrfurn:sofa", {
-	description = S("Sofa"),
-	drawtype = "mesh",
-	mesh = "lrfurn_sofa_short.obj",
-	tiles = {
-		"lrfurn_upholstery.png",
-		{ name = "lrfurn_sofa_bottom.png", color = 0xffffffff }
-	},
-	paramtype = "light",
-	paramtype2 = "colorwallmounted",
-	palette = "unifieddyes_palette_colorwallmounted.png",
-	inventory_image = "lrfurn_sofa_inv.png",
-	wield_scale = { x = 0.6, y = 0.6, z = 0.6 },
-	groups = {snappy=3, ud_param2_colorable = 1},
-	sounds = default.node_sound_wood_defaults(),
-	selection_box = sofa_cbox,
-	node_box = sofa_cbox,
-	on_rotate = screwdriver.disallow,
-	after_place_node = function(pos, placer, itemstack, pointed_thing)
-		lrfurn.fix_sofa_rotation_nsew(pos, placer, itemstack, pointed_thing)
-		local playername = placer:get_player_name()
-		if minetest.is_protected(pos, placer:get_player_name()) then return true end
+local sofa_cbox = {
+	type = "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 }
+	}
+}
 
-		local fdir = minetest.dir_to_facedir(placer:get_look_dir(), false)
+for i in ipairs(lrfurn.colors) do
+	local colour = lrfurn.colors[i][1]
+	local hue = lrfurn.colors[i][2]
 
-		if lrfurn.check_right(pos, fdir, false, placer) then
-			if not creative.is_enabled_for(playername) then
+	minetest.register_node("lrfurn:sofa_"..colour, {
+		description = "Sofa ("..colour..")",
+		drawtype = "mesh",
+		mesh = "lrfurn_sofa_short.obj",
+		tiles = {
+			"lrfurn_bg_white.png^[colorize:"..hue.."^lrfurn_sofa_overlay.png",
+			"lrfurn_sofa_bottom.png"
+		},
+		paramtype = "light",
+		paramtype2 = "facedir",
+		groups = {snappy=3},
+		sounds = default.node_sound_wood_defaults(),
+		selection_box = sofa_sbox,
+		node_box = sofa_cbox,
+		on_rotate = screwdriver.disallow,
+
+		after_place_node = function(pos, placer, itemstack, pointed_thing)
+			if minetest.is_protected(pos, placer:get_player_name()) then return true end
+
+			local fdir = minetest.dir_to_facedir(placer:get_look_dir(), false)
+
+			if lrfurn.check_forward(pos, fdir, false, placer) then
+				minetest.set_node(pos, {name = "lrfurn:sofa_"..colour, param2 = fdir})
 				itemstack:take_item()
+			else
+				minetest.chat_send_player(placer:get_player_name(), "No room to place the sofa!")
+				minetest.set_node(pos, { name = "air" })
+
 			end
-		else
-			minetest.chat_send_player(placer:get_player_name(), S("No room to place the sofa!"))
-			minetest.set_node(pos, { name = "air" })
-		end
-		return itemstack
-	end,
-	after_dig_node = unifieddyes.after_dig_node,
-	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
-		if not clicker:is_player() then
 			return itemstack
+		end,
+		on_rightclick = function(pos, node, clicker)
+			if not clicker:is_player() then
+				return
+			end
+			pos.y = pos.y-0.5
+			clicker:setpos(pos)
 		end
-		pos.y = pos.y-0.5
-		clicker:setpos(pos)
-		clicker:set_hp(20)
-		return itemstack
-	end
-})
+	})
 
-minetest.register_craft({
-	output = "lrfurn:sofa",
-	recipe = {
-		{"wool:white", "wool:white", "", },
-		{"stairs:slab_wood", "stairs:slab_wood", "", },
-		{"group:stick", "group:stick", "", }
-	}
-})
+	minetest.register_alias("lrfurn:sofa_left_"..colour, "air")
+	minetest.register_alias("lrfurn:sofa_right_"..colour, "lrfurn:sofa_"..colour)
 
-minetest.register_craft({
-	output = "lrfurn:sofa",
-	recipe = {
-		{"wool:white", "wool:white", "", },
-		{"moreblocks:slab_wood", "moreblocks:slab_wood", "", },
-		{"group:stick", "group:stick", "", }
-	}
-})
+	minetest.register_craft({
+		output = "lrfurn:sofa_"..colour,
+		recipe = {
+			{"wool:"..colour, "wool:"..colour, "", },
+			{"stairs:slab_wood", "stairs:slab_wood", "", },
+			{"group:stick", "group:stick", "", }
+		}
+	})
 
--- convert old static nodes to param2 color
+	minetest.register_craft({
+		output = "lrfurn:sofa_"..colour,
+		recipe = {
+			{"wool:"..colour, "wool:"..colour, "", },
+			{"moreblocks:slab_wood", "moreblocks:slab_wood", "", },
+			{"group:stick", "group:stick", "", }
+		}
+	})
 
-lrfurn.old_static_sofas = {}
-
-for _, color in ipairs(lrfurn.colors) do
-	table.insert(lrfurn.old_static_sofas, "lrfurn:sofa_"..color)
 end
 
-minetest.register_lbm({
-	name = "lrfurn:convert_sofas",
-	label = "Convert lrfurn short sofas to use param2 color",
-	run_at_every_load = false,
-	nodenames = lrfurn.old_static_sofas,
-	action = function(pos, node)
-		local name = node.name
-		local color = string.sub(name, string.find(name, "_")+1)
-
-		if color == "red" then
-			color = "medium_red"
-		elseif color == "dark_green" then
-			color = "medium_green"
-		elseif color == "magenta" then
-			color = "medium_magenta"
-		elseif color == "cyan" then
-			color = "medium_cyan"
-		end
-
-		local paletteidx, _ = unifieddyes.getpaletteidx("unifieddyes:"..color, "wallmounted")
-		local old_fdir = math.floor(node.param2 % 32)
-		local new_fdir = 3
-
-		if old_fdir == 0 then
-			new_fdir = 3
-		elseif old_fdir == 1 then
-			new_fdir = 4
-		elseif old_fdir == 2 then
-			new_fdir = 2
-		elseif old_fdir == 3 then
-			new_fdir = 5
-		end
-
-		local param2 = paletteidx + new_fdir
-
-		minetest.set_node(pos, { name = "lrfurn:sofa", param2 = param2 })
-		local meta = minetest.get_meta(pos)
-		meta:set_string("dye", "unifieddyes:"..color)
-
-	end
-})
-
 if minetest.setting_get("log_mods") then
-	minetest.log("action", "[lrfurn/sofas] "..S("Loaded!"))
+	minetest.log("action", "sofas loaded")
 end