]> git.lizzy.rs Git - xdecor.git/blobdiff - nodes.lua
xwalls : don't connect to every nodes (looks bad)
[xdecor.git] / nodes.lua
index 8ff848d4b14b881ba8885dfc6d550abc491d7989..7f07d2498254783f7194c50e565206e5fa0d2f08 100644 (file)
--- a/nodes.lua
+++ b/nodes.lua
@@ -3,7 +3,6 @@ xpanes.register_pane("bamboo_frame", {
        tiles = {"xdecor_bamboo_frame.png"},
        drawtype = "airlike",
        paramtype = "light",
-       sunlight_propagates = true,
        textures = {"xdecor_bamboo_frame.png", "xdecor_bamboo_frame.png", 
                        "xpanes_space.png"},
        inventory_image = "xdecor_bamboo_frame.png",
@@ -23,7 +22,8 @@ xdecor.register("baricade", {
        inventory_image = "xdecor_baricade.png",
        tiles = {"xdecor_baricade.png"},
        groups = {snappy=3, flammable=2},
-       damage_per_second = 4
+       damage_per_second = 4,
+       selection_box = xdecor.nodebox.slab_y(0.5, 0)
 })
 
 xdecor.register("barrel", {
@@ -31,7 +31,7 @@ xdecor.register("barrel", {
        inventory = {size=24},
        infotext = "Barrel",
        tiles = {"xdecor_barrel_top.png", "xdecor_barrel_sides.png"},
-       groups = {snappy=2, choppy=3, flammable=2},
+       groups = {choppy=3, flammable=2},
        sounds = xdecor.wood
 })
 
@@ -39,7 +39,7 @@ xdecor.register("cabinet", {
        description = "Cabinet",
        inventory = {size=24},
        infotext = "Cabinet",
-       groups = {snappy=2, choppy=3},
+       groups = {choppy=3, flammable=2},
        sounds = xdecor.wood,
        tiles = {
                "default_wood.png", "default_wood.png",
@@ -52,7 +52,7 @@ xdecor.register("cabinet_half", {
        description = "Half Cabinet",
        inventory = {size=8},
        infotext = "Half Cabinet",
-       groups = {snappy=3, choppy=3, flammable=2},
+       groups = {choppy=3, flammable=3},
        sounds = xdecor.wood,
        node_box = xdecor.nodebox.slab_y(0.5, 0.5),
        tiles = {
@@ -89,6 +89,7 @@ xdecor.register("cardboard_box", {
        description = "Cardboard Box",
        inventory = {size=8},
        infotext = "Cardboard Box",
+       sunlight_propagates = true,
        groups = {snappy=3, flammable=3},
        tiles = {"xdecor_cardbox_top.png", "xdecor_cardbox_top.png", 
                "xdecor_cardbox_sides.png"},
@@ -105,7 +106,7 @@ xdecor.register("cauldron", {
        groups = {cracky=1},
        tiles = {
                { name = "xdecor_cauldron_top_anim.png",
-               animation = {type="vertical_frames", length=3.0} },
+                       animation = {type="vertical_frames", length=3.0} },
                "xdecor_cauldron_sides.png"
        }
 })
@@ -115,14 +116,15 @@ if minetest.get_modpath("bucket") then
        minetest.override_item("bucket:bucket_empty", {
                on_use = function(itemstack, user, pointed_thing)
                        local inv = user:get_inventory()
+                       local player = user:get_player_name()
+
                        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!")
+                                       minetest.chat_send_player(player, "No enough room in your inventory.")
                                end
                                return itemstack
                        else if original_bucket_on_use then
@@ -137,7 +139,8 @@ xdecor.register("chair", {
        description = "Chair",
        tiles = {"xdecor_wood.png"},
        sounds = xdecor.wood,
-       groups = {snappy=2, choppy=3, flammable=2},
+       groups = {choppy=3, flammable=2},
+       sunlight_propagates = true,
        node_box = {
                type = "fixed",
                fixed = {
@@ -158,7 +161,8 @@ xdecor.register("chandelier", {
        inventory_image = "xdecor_chandelier.png",
        tiles = {"xdecor_chandelier.png"},
        groups = {dig_immediate=3},
-       light_source = 14
+       light_source = 14,
+       selection_box = xdecor.nodebox.slab_y(0.5, 0.5)
 })
 
 xdecor.register("coalstone_tile", {
@@ -188,7 +192,7 @@ xdecor.register("cobweb", {
 
 local colors = {"red"} -- Add more curtains colors simply here.
 
-for _, c in ipairs(colors) do
+for _, c in pairs(colors) do
        xdecor.register("curtain_"..c, {
                description = "Curtain ("..c..")",
                use_texture_alpha = true,
@@ -240,10 +244,9 @@ local door_types = {"woodglass", "japanese"}
 
 for _, d in pairs(door_types) do
        doors.register_door("xdecor:"..d.."_door", {
-               description = string.sub(string.upper(d), 0, 1)..
-                               string.sub(d, 2).." Door",
+               description = d:gsub("%l", string.upper, 1).." Door",
                inventory_image = "xdecor_"..d.."_door_inv.png",
-               groups = {snappy=2, choppy=3, flammable=2, door=1},
+               groups = {choppy=3, flammable=2, door=1},
                tiles_bottom = {"xdecor_"..d.."_door_b.png", "xdecor_brown.png"},
                tiles_top = {"xdecor_"..d.."_door_a.png", "xdecor_brown.png"},
                sounds = xdecor.wood
@@ -255,7 +258,7 @@ xdecor.register("empty_shelf", {
        inventory = {size=24},
        infotext = "Empty Shelf",
        tiles = {"default_wood.png", "xdecor_empty_shelf.png"},
-       groups = {snappy=2, choppy=3, flammable=2},
+       groups = {choppy=3, flammable=2},
        sounds = xdecor.wood
 })
 
@@ -270,6 +273,7 @@ xdecor.register("enderchest", {
                "xdecor_enderchest_front.png"
        },
        groups = {cracky=2},
+       sounds = xdecor.stone,
        on_construct = function(pos)
                local meta = minetest.get_meta(pos)
                meta:set_string("formspec",
@@ -285,31 +289,33 @@ minetest.register_on_joinplayer(function(player)
        inv:set_size("enderchest", 8*4)
 end)
 
-local fence_sbox = {
-       type = "fixed",
-       fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}
-}
-
 xdecor.register("fence_wrought_iron", {
        description = "Wrought Iron Fence",
        drawtype = "fencelike",
        groups = {cracky=2},
        tiles = {"xdecor_wrought_iron.png"},
-       selection_box = fence_sbox,
+       selection_box = {
+               type = "fixed",
+               fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}
+       },
        inventory_image = "default_fence_overlay.png^xdecor_wrought_iron.png^default_fence_overlay.png^[makealpha:255,126,126"
 })
 
 xdecor.register("fire", {
        description = "Fancy Fire",
+       drawtype = "plantlike",
        light_source = 14,
        walkable = false,
        tiles = {
                { name = "xdecor_fire_anim.png",
                animation = {type="vertical_frames", length=1.5} }
        },
-       drawtype = "plantlike",
        damage_per_second = 2,
        drop = "",
+       selection_box = {
+               type = "fixed",
+               fixed = {-1/3.5, -1/2, -1/3.5, 1/3.5, -1/2+2/16, 1/3.5}
+       },
        groups = {dig_immediate=3, hot=3, not_in_creative_inventory=1}
 })
 
@@ -317,36 +323,27 @@ minetest.register_tool("xdecor:flint_steel", {
        description = "Flint & Steel",
        inventory_image = "xdecor_flint_steel.png",
        tool_capabilities = {
-               groupcaps = { flamable = {uses=65, maxlevel=1} }
+               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,
-                                       user:get_player_name()) 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(user:get_player_name(),
-                                               "This area is protected!")
+                               minetest.chat_send_player(player, "This area is protected.")
                        end
-               else
-                       return
-               end
+               else return end
 
-               itemstack:add_wear(65535/65)
+               itemstack:add_wear(1000)
                return itemstack
        end
 })
 
 minetest.register_tool("xdecor:hammer", {
        description = "Hammer",
-       inventory_image = "xdecor_hammer.png",
-       tool_capabilities = {
-               groupcaps = { snappy = {uses=20, maxlevel=2} }
-       },
-       on_use = function(itemstack, user, pointed_thing)
-               if pointed_thing.type == "node" then return end -- The hammer ain't meant for digging but for repairing.
-       end
+       inventory_image = "xdecor_hammer.png"
 })
 
 xdecor.register("ivy", {
@@ -384,10 +381,18 @@ xdecor.register("lantern", {
        }
 })
 
+xdecor.register("lightbox", {
+       description = "Light Box",
+       tiles = {"xdecor_lightbox.png"},
+       groups = {cracky=3},
+       light_source = 13,
+       sounds = xdecor.glass
+})
+
 local flowerstype = { "dandelion_white", "dandelion_yellow", "geranium",
                "rose", "tulip", "viola" }
 
-for _, f in ipairs(flowerstype) do
+for _, f in pairs(flowerstype) do
        xdecor.register("potted_"..f, {
                description = "Potted Flowers ("..f..")",
                walkable = false,
@@ -395,7 +400,8 @@ for _, f in ipairs(flowerstype) do
                tiles = {"xdecor_"..f.."_pot.png"},
                inventory_image = "xdecor_"..f.."_pot.png",
                drawtype = "plantlike",
-               sounds = xdecor.leaves
+               sounds = xdecor.leaves,
+               selection_box = xdecor.nodebox.slab_y(0.5, 0)
        })
 
        minetest.register_craft({
@@ -421,7 +427,7 @@ xdecor.register("painting", {
 
 xdecor.register("plant_pot", {
        description = "Plant Pot",
-       groups = {snappy=3, cracky=3},
+       groups = {snappy=3},
        tiles = {"xdecor_plant_pot_top.png", "xdecor_plant_pot_bottom.png",
                "xdecor_plant_pot_sides.png"}
 })
@@ -429,7 +435,7 @@ xdecor.register("plant_pot", {
 xdecor.register("metal_cabinet", {
        description = "Metal Cabinet",
        inventory = {size=24},
-       groups = {snappy=1, cracky=2},
+       groups = {cracky=2},
        infotext = "Metal Cabinet",
        tiles = {
                "xdecor_metal_cabinet_sides.png", "xdecor_metal_cabinet_sides.png",
@@ -451,7 +457,7 @@ xdecor.register("multishelf", {
        inventory = {size=24},
        infotext = "Multi Shelf",
        tiles = {"default_wood.png", "xdecor_multishelf.png"},
-       groups = {snappy=2, choppy=3, flammable=2},
+       groups = {choppy=3, flammable=2},
        sounds = xdecor.wood
 })
 
@@ -460,7 +466,6 @@ xpanes.register_pane("rust_bar", {
        tiles = {"xdecor_rust_bars.png"},
        drawtype = "airlike",
        paramtype = "light",
-       sunlight_propagates = true,
        textures = {"xdecor_rust_bars.png", "xdecor_rust_bars.png", 
                        "xpanes_space.png"},
        inventory_image = "xdecor_rust_bars.png",
@@ -494,6 +499,7 @@ xdecor.register("stonepath", {
        tiles = {"default_stone.png"},
        groups = {snappy=3, stone=1},
        sounds = xdecor.stone,
+       sunlight_propagates = true,
        node_box = {
                type = "fixed",
                fixed = {
@@ -524,7 +530,7 @@ xdecor.register("stone_tile", {
 xdecor.register("table", {
        description = "Table",
        tiles = {"xdecor_wood.png"},
-       groups = {snappy=2, choppy=3, flammable=2},
+       groups = {choppy=3, flammable=2},
        sounds = xdecor.wood,
        node_box = {
                type = "fixed",
@@ -538,6 +544,7 @@ xdecor.register("table", {
 xdecor.register("tatami", {
        description = "Tatami",
        tiles = {"xdecor_tatami.png"},
+       wield_image = "xdecor_tatami.png",
        groups = {snappy=3, flammable=2},
        node_box = {
                type = "fixed",
@@ -550,7 +557,8 @@ xdecor.register("tatami", {
 xdecor.register("trash_can", {
        description = "Trash Can",
        tiles = {"xdecor_wood.png"},
-       groups = {snappy=2, choppy=3, flammable=2},
+       groups = {choppy=3, flammable=2},
+       sunlight_propagates = true,
        sounds = xdecor.wood,
        node_box = {
                type = "fixed",
@@ -565,16 +573,12 @@ xdecor.register("trash_can", {
        collision_box = {
                type = "fixed",
                fixed = {
-                       {-0.375, -0.5, 0.375, 0.375, 0.25, 0.375},
-                       {0.375, -0.5, -0.375, 0.375, 0.25, 0.375},
-                       {-0.375, -0.5, -0.375, 0.375, 0.25, -0.375},
-                       {-0.375, -0.5, -0.375, -0.375, 0.25, 0.375},
-                       {-0.375, -0.5, -0.375, 0.375, -0.4375, 0.375}
+                       {-0.375, -0.5, -0.375, 0.375, 0.19, 0.375}
                }
        },
        on_construct = function(pos)
                local meta = minetest.get_meta(pos)
-               meta:set_string("infotext", "Trash Can - throw your waste here!")
+               meta:set_string("infotext", "Trash Can - throw your waste here.")
        end
 })
 
@@ -606,7 +610,7 @@ xdecor.register("woodframed_glass", {
        description = "Wood Framed Glass",
        drawtype = "glasslike_framed",
        tiles = {"xdecor_framed_glass.png", "xdecor_framed_glass_detail.png"},
-       groups = {snappy=2, cracky=3},
+       groups = {cracky=3},
        sounds = xdecor.glass
 })
 
@@ -614,6 +618,6 @@ xdecor.register("wood_tile", {
        description = "Wood Tile",
        tiles = {"xdecor_wood_tile.png"},
        drawtype = "normal",
-       groups = {snappy=1, choppy=2, wood=1, flammable=2},
+       groups = {choppy=2, wood=1, flammable=2},
        sounds = xdecor.wood
 })