X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=nodes.lua;h=53537c4256036d0f7c76d0e8239c4668ea57de3c;hb=720cdff72ce39d5511854d5b942a05dd3c6a201c;hp=1637e9e2ade9cc6b3c34a52c30e41fb0bcd72d00;hpb=6062c3f5e0a4670d2164a4264756fe525fb7b40f;p=xdecor.git

diff --git a/nodes.lua b/nodes.lua
index 1637e9e..53537c4 100644
--- a/nodes.lua
+++ b/nodes.lua
@@ -1,37 +1,4 @@
 screwdriver = screwdriver or {}
-local xbg = default.gui_bg..default.gui_bg_img..default.gui_slots
-
-local function sit(pos, node, clicker)
-	local player = clicker:get_player_name()
-	if default.player_attached[player] == true then
-		pos.y = pos.y - 0.5
-		clicker:setpos(pos)
-		clicker:set_eye_offset({x=0, y=0, z=0}, {x=0, y=0, z=0})
-		clicker:set_physics_override(1, 1, 1)
-		default.player_attached[player] = false
-		default.player_set_animation(clicker, "stand", 30)
-	elseif default.player_attached[player] ~= true and
-		clicker:get_player_velocity().x == 0 and
-		clicker:get_player_velocity().y == 0 and
-		clicker:get_player_velocity().z == 0 and node.param2 <= 3 then
-
-		clicker:set_eye_offset({x=0, y=-7, z=2}, {x=0, y=0, z=0})
-		clicker:set_physics_override(0, 0, 0)
-		clicker:setpos(pos)
-		default.player_attached[player] = true
-		default.player_set_animation(clicker, "sit", 30)
-
-		if node.param2 == 0 then
-			clicker:set_look_yaw(3.15)
-		elseif node.param2 == 1 then
-			clicker:set_look_yaw(7.9)
-		elseif node.param2 == 2 then
-			clicker:set_look_yaw(6.28)
-		elseif node.param2 == 3 then
-			clicker:set_look_yaw(4.75)
-		end
-	end
-end
 
 xpanes.register_pane("bamboo_frame", {
 	description = "Bamboo Frame",
@@ -123,38 +90,6 @@ xdecor.register("candle", {
 	}
 })
 
-xdecor.register("cauldron", {
-	description = "Cauldron",
-	groups = {cracky=2, oddly_breakable_by_hand=1},
-	on_rotate = screwdriver.rotate_simple,
-	tiles = {
-		{ name = "xdecor_cauldron_top_anim.png",
-			animation = {type="vertical_frames", length=3.0} },
-		"xdecor_cauldron_sides.png"
-	}
-})
-
-if minetest.get_modpath("bucket") then
-	local original_bucket_on_use = minetest.registered_items["bucket:bucket_empty"].on_use
-	minetest.override_item("bucket:bucket_empty", {
-		on_use = function(itemstack, user, pointed_thing)
-			local inv = user:get_inventory()
-			if pointed_thing.type == "node" and minetest.get_node(pointed_thing.under).name == "xdecor:cauldron" then
-				if inv:room_for_item("main", "bucket:bucket_water 1") then
-					itemstack:take_item()
-					inv:add_item("main", "bucket:bucket_water 1")
-				else
-					minetest.chat_send_player(user:get_player_name(), "No room in your inventory to add a filled bucket!")
-				end
-				return itemstack
-			else if original_bucket_on_use then
-				return original_bucket_on_use(itemstack, user, pointed_thing)
-			end
-		end
-	end
-	})
-end
-
 xpanes.register_pane("chainlink", {
 	description = "Chain Link",
 	tiles = {"xdecor_chainlink.png"},
@@ -171,44 +106,8 @@ xpanes.register_pane("chainlink", {
 	}
 })
 
-xdecor.register("chair", {
-	description = "Chair",
-	tiles = {"xdecor_wood.png"},
-	sounds = default.node_sound_wood_defaults(),
-	groups = {choppy=3, oddly_breakable_by_hand=2, flammable=3},
-	on_rotate = screwdriver.rotate_simple,
-	node_box = {
-		type = "fixed",
-		fixed = {{-0.3125, -0.5, 0.1875, -0.1875, 0.5, 0.3125},
-			{0.1875, -0.5, 0.1875, 0.3125, 0.5, 0.3125},
-			{-0.1875, 0.025, 0.22, 0.1875, 0.45, 0.28},
-			{-0.3125, -0.5, -0.3125, -0.1875, -0.125, -0.1875},
-			{0.1875, -0.5, -0.3125, 0.3125, -0.125, -0.1875},
-			{-0.3125, -0.125, -0.3125, 0.3125, 0, 0.1875}}
-	},
-	on_rightclick = function(pos, node, clicker)
-		local objs = minetest.get_objects_inside_radius(pos, 0.5)
-		for _, p in pairs(objs) do
-			if p:get_player_name() ~= clicker:get_player_name() then return end
-		end
-		pos.y = pos.y + 0
-		sit(pos, node, clicker)
-	end,
-	can_dig = function(pos, player)
-		local pname = player:get_player_name()
-		local objs = minetest.get_objects_inside_radius(pos, 0.5)
-
-		for _, p in pairs(objs) do
-			if p:get_player_name() ~= nil or
-				default.player_attached[pname] == true or not
-				player or not player:is_player() then 
-				return false
-			end
-		end
-		return true
-	end
-})
-
+-- The following nodedef is licensed under WTFPL for granting a possible re-use
+-- in Minetest Game (https://github.com/minetest/minetest_game). 
 xdecor.register("cobweb", {
 	description = "Cobweb",
 	drawtype = "plantlike",
@@ -226,9 +125,7 @@ xdecor.register("cobweb", {
 	sounds = default.node_sound_leaves_defaults()
 })
 
-local colors = {"red"} -- Add more curtains colors simply here.
-
-for _, c in pairs(colors) do
+for _, c in pairs({"red"}) do  -- Add more curtains colors simply here.
 	xdecor.register("curtain_"..c, {
 		description = c:gsub("^%l", string.upper).." Curtain",
 		walkable = false,
@@ -239,7 +136,7 @@ for _, c in pairs(colors) do
 		paramtype2 = "wallmounted",
 		groups = {dig_immediate=3, flammable=3},
 		selection_box = {type="wallmounted"},
-		on_rightclick = function(pos, node, _, _)
+		on_rightclick = function(pos, node)
 			minetest.set_node(pos, {name="xdecor:curtain_open_"..c, param2=node.param2})
 		end
 	})
@@ -252,7 +149,7 @@ for _, c in pairs(colors) do
 		groups = {dig_immediate=3, flammable=3, not_in_creative_inventory=1},
 		selection_box = {type="wallmounted"},
 		drop = "xdecor:curtain_"..c,
-		on_rightclick = function(pos, node, _, _)
+		on_rightclick = function(pos, node)
 			minetest.set_node(pos, {name="xdecor:curtain_"..c, param2=node.param2})
 		end
 	})
@@ -275,33 +172,10 @@ xdecor.register("crate", {
 	sounds = default.node_sound_wood_defaults()
 })
 
-xdecor.register("cushion", {
-	description = "Cushion",
+xdecor.register("cushion_block", {
 	tiles = {"xdecor_cushion.png"},
-	groups = {snappy=3, flammable=3, fall_damage_add_percent=-50},
-	on_place = minetest.rotate_node,
-	node_box = xdecor.nodebox.slab_y(-0.5, 0.5),
-	on_rightclick = function(pos, node, clicker)
-		local objs = minetest.get_objects_inside_radius(pos, 0.5)
-		for _, p in pairs(objs) do
-			if p:get_player_name() ~= clicker:get_player_name() then return end
-		end
-		pos.y = pos.y + 0
-		sit(pos, node, clicker)
-	end,
-	can_dig = function(pos, player)
-		local pname = player:get_player_name()
-		local objs = minetest.get_objects_inside_radius(pos, 0.5)
-
-		for _, p in pairs(objs) do
-			if p:get_player_name() ~= nil or
-				default.player_attached[pname] == true or not
-				player or not player:is_player() then 
-				return false
-			end
-		end
-		return true
-	end
+	groups = {snappy=3, flammable=3, fall_damage_add_percent=-75, not_in_creative_inventory=1},
+	drop = "xdecor:cushion 2"
 })
 
 local function door_access(door)
@@ -315,7 +189,7 @@ local door_types = {
 
 for _, d in pairs(door_types) do
 	doors.register_door("xdecor:"..d[1].."_door", {
-		description = string.gsub(d[1]:gsub("^%l", string.upper), "_r", " R").." Door",
+		description = string.gsub(" "..d[1], "%W%l", string.upper):sub(2):gsub("_", " ").." Door",
 		inventory_image = "xdecor_"..d[1].."_door_inv.png",
 		groups = {choppy=3, cracky=3, oddly_breakable_by_hand=1, flammable=2, door=1},
 		tiles_bottom = {"xdecor_"..d[1].."_door_b.png", "xdecor_"..d[2]..".png"},
@@ -348,11 +222,12 @@ xdecor.register("enderchest", {
 	on_rotate = screwdriver.rotate_simple,
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
-		meta:set_string("formspec", "size[8,9]"..xbg..default.get_hotbar_bg(0,5)..
-				"list[current_player;enderchest;0,0;8,4;]"..
-				"list[current_player;main;0,5;8,4;]"..
-				"listring[current_player;enderchest]"..
-				"listring[current_player;main]")
+		meta:set_string("formspec", [[ size[8,9]
+				list[current_player;enderchest;0,0;8,4;]
+				list[current_player;main;0,5;8,4;]
+				listring[current_player;enderchest]
+				listring[current_player;main] ]]
+				..xbg..default.get_hotbar_bg(0,5))
 		meta:set_string("infotext", "Ender Chest")
 	end
 })
@@ -371,7 +246,7 @@ xdecor.register("fire", {
 		{ name = "xdecor_fire_anim.png",
 		animation = {type="vertical_frames", length=1.5} }
 	},
-	damage_per_second = 2,
+	damage_per_second = 4,
 	drop = "",
 	selection_box = {
 		type = "fixed", fixed = {-0.3, -0.5, -0.3, 0.3, -0.3, 0.3}
@@ -379,35 +254,6 @@ xdecor.register("fire", {
 	groups = {dig_immediate=3, hot=3, not_in_creative_inventory=1}
 })
 
-minetest.register_tool("xdecor:flint_steel", {
-	description = "Flint & Steel",
-	inventory_image = "xdecor_flint_steel.png",
-	tool_capabilities = {
-		groupcaps = { igniter = {uses=10, maxlevel=1} }
-	},
-	on_use = function(itemstack, user, pointed_thing)
-		local player = user:get_player_name()
-		if pointed_thing.type == "node" and
-				minetest.get_node(pointed_thing.above).name == "air" then
-			if not minetest.is_protected(pointed_thing.above, player) then
-				minetest.set_node(pointed_thing.above, {name="xdecor:fire"})
-			else
-				minetest.chat_send_player(player, "This area is protected.")
-			end
-		end
-
-		itemstack:add_wear(1000)
-		return itemstack
-	end
-})
-
-minetest.register_tool("xdecor:hammer", {
-	description = "Hammer",
-	inventory_image = "xdecor_hammer.png",
-	wield_image = "xdecor_hammer.png",
-	on_use = function(...) do return end end
-})
-
 xdecor.register("ivy", {
 	description = "Ivy",
 	drawtype = "signlike",
@@ -443,13 +289,17 @@ xdecor.register("lantern", {
 	}
 })
 
-xdecor.register("lightbox", {
-	description = "Light Box",
-	tiles = {"xdecor_lightbox.png"},
-	groups = {cracky=3, choppy=3, oddly_breakable_by_hand=2},
-	light_source = 13,
-	sounds = default.node_sound_glass_defaults()
-})
+for _, l in pairs({"iron", "wooden"}) do
+	xdecor.register(l.."_lightbox", {
+		description = l:gsub("^%l", string.upper).." Light Box",
+		tiles = {"xdecor_"..l.."_lightbox.png"},
+		groups = {cracky=3, choppy=3, oddly_breakable_by_hand=2},
+		light_source = 13,
+		sounds = default.node_sound_glass_defaults()
+	})
+end
+
+minetest.register_alias("xdecor:lightbox", "xdecor:wooden_lightbox")
 
 xdecor.register("packed_ice", {
 	drawtype = "normal",
@@ -459,8 +309,8 @@ xdecor.register("packed_ice", {
 	sounds = default.node_sound_glass_defaults()
 })
 
-local flowers = {"dandelion_white", "dandelion_yellow", "geranium",
-		"rose", "tulip", "viola"}
+local flowers = {"dandelion_white", "dandelion_yellow", "geranium", "rose",
+		"tulip", "viola"}
 
 for _, f in pairs(flowers) do
 	xdecor.register("potted_"..f, {
@@ -485,35 +335,44 @@ end
 
 xdecor.register("painting_1", {
 	description = "Painting",
-	drawtype = "signlike",
 	tiles = {"xdecor_painting_1.png"},
-	inventory_image = "xdecor_painting_1.png",
+	inventory_image = "xdecor_painting_empty.png",
+	wield_image = "xdecor_painting_empty.png",
 	paramtype2 = "wallmounted",
 	legacy_wallmounted = true,
-	walkable = false,
-	on_rotate = screwdriver.rotate_simple,
-	wield_image = "xdecor_painting_1.png",
-	selection_box = {type="wallmounted"},
-	groups = {dig_immediate=3, flammable=3, attached_node=1},
-	after_place_node = function(pos, _, _, _)
+	wield_image = "xdecor_painting_empty.png",
+	sunlight_propagates = true,
+	groups = {choppy=3, oddly_breakable_by_hand=2, flammable=3, attached_node=1},
+	sounds = default.node_sound_wood_defaults(),
+	node_box = {
+		type = "wallmounted",
+		wall_top = {-0.4375, 0.4375, -0.3125, 0.4375, 0.5, 0.3125},
+		wall_bottom = {-0.4375, -0.5, -0.3125, 0.4375, -0.4375, 0.3125},
+		wall_side = {-0.5, -0.3125, -0.4375, -0.4375, 0.3125, 0.4375}
+	},
+	on_construct = function(pos)
 		local node = minetest.get_node(pos)
-		minetest.set_node(pos, {name = "xdecor:painting_"..math.random(1,4), param2 = node.param2})
+		local random = math.random(4)
+		if random == 1 then return end
+		minetest.set_node(pos, {name="xdecor:painting_"..random, param2=node.param2})
 	end
 })
 
-minetest.register_alias("xdecor:painting", "xdecor:painting_1")
-
 for i = 2, 4 do
 	xdecor.register("painting_"..i, {
-		drawtype = "signlike",
 		tiles = {"xdecor_painting_"..i..".png"},
 		paramtype2 = "wallmounted",
 		legacy_wallmounted = true,
-		walkable = false,
-		on_rotate = screwdriver.rotate_simple,
 		drop = "xdecor:painting_1",
-		selection_box = {type="wallmounted"},
-		groups = {dig_immediate=3, flammable=3, attached_node=1, not_in_creative_inventory=1}
+		sunlight_propagates = true,
+		groups = {choppy=3, oddly_breakable_by_hand=2, flammable=3, attached_node=1, not_in_creative_inventory=1},
+		sounds = default.node_sound_wood_defaults(),
+		node_box = {
+			type = "wallmounted",
+			wall_top = {-0.4375, 0.4375, -0.3125, 0.4375, 0.5, 0.3125},
+			wall_bottom = {-0.4375, -0.5, -0.3125, 0.4375, -0.4375, 0.3125},
+			wall_side = {-0.5, -0.3125, -0.4375, -0.4375, 0.3125, 0.4375}
+		}
 	})
 end
 
@@ -567,13 +426,12 @@ xdecor.register("stonepath", {
 	on_rotate = screwdriver.rotate_simple,
 	sounds = default.node_sound_stone_defaults(),
 	sunlight_propagates = true,
-	node_box = {
-		type = "fixed",
-		fixed = {{0, -0.5, 0, 0.375, -0.47, 0.375},
-			{-0.4375, -0.5, -0.4375, -0.0625, -0.47, -0.0625},
-			{-0.4375, -0.5, 0.125, -0.125, -0.47, 0.4375},
-			{0.125, -0.5, -0.375, 0.375, -0.47, -0.125}}
-	},
+	node_box = xdecor.pixelbox(16, {
+		{8,  0,  8, 6, .5, 6},
+		{1,  0,  1, 6, .5, 6},
+		{1,  0, 10, 5, .5, 5},
+		{10, 0,  2, 4, .5, 4}
+	}),
 	selection_box = xdecor.nodebox.slab_y(0.05)
 })
 
@@ -583,8 +441,7 @@ local stonish = {"desertstone_tile", "stone_tile", "stone_rune",
 for _, t in pairs(stonish) do
 	xdecor.register(t, {
 		drawtype = "normal",
-		description = string.sub(t:gsub("^%l", string.upper), 1, -6)
-				.." "..t:sub(-4):gsub("^%l", string.upper),
+		description = string.gsub(" "..t, "%W%l", string.upper):sub(2):gsub("_", " "),
 		tiles = {"xdecor_"..t..".png"},
 		groups = {cracky=1},
 		sounds = default.node_sound_stone_defaults()
@@ -596,11 +453,9 @@ xdecor.register("table", {
 	tiles = {"xdecor_wood.png"},
 	groups = {choppy=3, oddly_breakable_by_hand=2, flammable=3},
 	sounds = default.node_sound_wood_defaults(),
-	node_box = {
-		type = "fixed",
-		fixed = {{-0.5, 0.4, -0.5, 0.5, 0.5, 0.5},
-			{-0.15, -0.5, -0.15, 0.15, 0.4, 0.15}}
-	}
+	node_box = xdecor.pixelbox(16, {
+		{0, 14, 0, 16, 2, 16}, {5.5, 0, 5.5, 5, 14, 6}
+	})
 })
 
 xdecor.register("tatami", {
@@ -608,9 +463,7 @@ xdecor.register("tatami", {
 	tiles = {"xdecor_tatami.png"},
 	wield_image = "xdecor_tatami.png",
 	groups = {snappy=3, flammable=3},
-	node_box = {
-		type = "fixed", fixed = {{-0.5, -0.5, -0.5, 0.5, -0.4375, 0.5}}
-	}
+	node_box = xdecor.nodebox.slab_y(0.0625)
 })
 
 xdecor.register("tv", {