More cleanup

[xdecor.git] / nodes.lua

diff --git a/nodes.lua b/nodes.lua
index c34ece38aaeedc6a8c91e08f3b35beb068732604..aa3cc4b0b52ea2a984782c360474f926c94f46e0 100644 (file)
--- a/nodes.lua
+++ b/nodes.lua
@@ -106,6 +106,8 @@ xpanes.register_pane("chainlink", {
        }
 })
 
+-- 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",
@@ -170,6 +172,12 @@ xdecor.register("crate", {
        sounds = default.node_sound_wood_defaults()
 })
 
+xdecor.register("cushion_block", {
+       tiles = {"xdecor_cushion.png"},
+       groups = {snappy=3, flammable=3, fall_damage_add_percent=-75, not_in_creative_inventory=1},
+       drop = "xdecor:cushion 2"
+})
+
 local function door_access(door)
        return door:find("prison")
 end
@@ -181,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"},
@@ -246,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",
@@ -310,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",
@@ -369,12 +352,12 @@ xdecor.register("painting_1", {
        },
        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") -- legacy code
-
 for i = 2, 4 do
        xdecor.register("painting_"..i, {
                tiles = {"xdecor_painting_"..i..".png"},
@@ -443,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.pixelnodebox(16, {
+               {8,  0,  8, 6, 0.5, 6},
+               {1,  0,  1, 6, 0.5, 6},
+               {1,  0, 10, 5, 0.5, 5},
+               {10, 0,  2, 4, 0.5, 4}
+       }),
        selection_box = xdecor.nodebox.slab_y(0.05)
 })
 
@@ -471,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.pixelnodebox(16, {
+               {0, 14, 0, 16, 2, 16}, {5.5, 0, 5.5, 5, 14, 6}
+       })
 })
 
 xdecor.register("tatami", {
@@ -483,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", {