Default: Add coral nodes and death ABM
[oweals/minetest_game.git] / mods / default / nodes.lua
index 62d0ec93ddb18a1c715d5dee589afe62c6ea780c..b575704ae879a100301e4cba46be3d760aafc2f5 100644 (file)
@@ -14,26 +14,30 @@ language (for example pinewood and pine wood) the underscore form should be used
 
 Stone
 -----
-(1. Material 2. Cobble variant 3. Brick variant [4. Modified forms])
+(1. Material 2. Cobble variant 3. Brick variant 4. Modified forms)
 
 default:stone
 default:cobble
 default:stonebrick
+default:stone_block
 default:mossycobble
 
 default:desert_stone
 default:desert_cobble
 default:desert_stonebrick
+default:desert_stone_block
 
 default:sandstone
 default:sandstonebrick
+default:sandstone_block
 
 default:obsidian
 default:obsidianbrick
+default:obsidian_block
 
 Soft / Non-Stone
 ----------------
-(1. Material [2. Modified forms])
+(1. Material 2. Modified forms)
 
 default:dirt
 default:dirt_with_grass
@@ -43,6 +47,7 @@ default:dirt_with_snow
 
 default:sand
 default:desert_sand
+default:silver_sand
 
 default:gravel
 
@@ -55,7 +60,7 @@ default:ice
 
 Trees
 -----
-(1. Trunk 2. Fabricated trunk 3. Leaves 4. Sapling [5. Fruits])
+(1. Trunk 2. Fabricated trunk 3. Leaves 4. Sapling 5. Fruits)
 
 default:tree
 default:wood
@@ -82,9 +87,10 @@ default:aspen_tree
 default:aspen_wood
 default:aspen_leaves
 default:aspen_sapling
+
 Ores
 ----
-(1. In stone 2. Block)
+(1. In stone 2. Blocks)
 
 default:stone_with_coal
 default:coalblock
@@ -105,8 +111,9 @@ default:mese
 default:stone_with_diamond
 default:diamondblock
 
-Plantlife (non-cubic)
----------------------
+Plantlife
+---------
+
 default:cactus
 default:papyrus
 default:dry_shrub
@@ -124,6 +131,13 @@ default:dry_grass_3
 default:dry_grass_4
 default:dry_grass_5
 
+Corals
+------
+
+default:coral_brown
+default:coral_orange
+default:coral_skeleton
+
 Liquids
 -------
 (1. Source 2. Flowing)
@@ -139,6 +153,7 @@ default:lava_flowing
 
 Tools / "Advanced" crafting / Non-"natural"
 -------------------------------------------
+
 default:torch
 
 default:chest
@@ -146,11 +161,17 @@ default:chest_locked
 
 default:bookshelf
 
-default:sign_wall
+default:sign_wall_wood
+default:sign_wall_steel
 
-default:ladder
+default:ladder_wood
+default:ladder_steel
 
 default:fence_wood
+default:fence_acacia_wood
+default:fence_junglewood
+default:fence_pine_wood
+default:fence_aspen_wood
 
 default:glass
 default:obsidian_glass
@@ -163,9 +184,8 @@ default:meselamp
 
 Misc
 ----
+
 default:cloud
-default:nyancat
-default:nyancat_rainbow
 
 --]]
 
@@ -192,12 +212,22 @@ minetest.register_node("default:cobble", {
 
 minetest.register_node("default:stonebrick", {
        description = "Stone Brick",
+       paramtype2 = "facedir",
+       place_param2 = 0,
        tiles = {"default_stone_brick.png"},
        is_ground_content = false,
        groups = {cracky = 2, stone = 1},
        sounds = default.node_sound_stone_defaults(),
 })
 
+minetest.register_node("default:stone_block", {
+       description = "Stone Block",
+       tiles = {"default_stone_block.png"},
+       is_ground_content = false,
+       groups = {cracky = 2, stone = 1},
+       sounds = default.node_sound_stone_defaults(),
+})
+
 minetest.register_node("default:mossycobble", {
        description = "Mossy Cobblestone",
        tiles = {"default_mossycobble.png"},
@@ -226,28 +256,48 @@ minetest.register_node("default:desert_cobble", {
 
 minetest.register_node("default:desert_stonebrick", {
        description = "Desert Stone Brick",
+       paramtype2 = "facedir",
+       place_param2 = 0,
        tiles = {"default_desert_stone_brick.png"},
        is_ground_content = false,
        groups = {cracky = 2, stone = 1},
        sounds = default.node_sound_stone_defaults(),
 })
 
+minetest.register_node("default:desert_stone_block", {
+       description = "Desert Stone Block",
+       tiles = {"default_desert_stone_block.png"},
+       is_ground_content = false,
+       groups = {cracky = 2, stone = 1},
+       sounds = default.node_sound_stone_defaults(),
+})
+
 
 minetest.register_node("default:sandstone", {
        description = "Sandstone",
        tiles = {"default_sandstone.png"},
-       groups = {crumbly = 2, cracky = 3},
+       groups = {crumbly = 1, cracky = 3},
        sounds = default.node_sound_stone_defaults(),
 })
 
 minetest.register_node("default:sandstonebrick", {
        description = "Sandstone Brick",
+       paramtype2 = "facedir",
+       place_param2 = 0,
        tiles = {"default_sandstone_brick.png"},
        is_ground_content = false,
        groups = {cracky = 2},
        sounds = default.node_sound_stone_defaults(),
 })
 
+minetest.register_node("default:sandstone_block", {
+       description = "Sandstone Block",
+       tiles = {"default_sandstone_block.png"},
+       is_ground_content = false,
+       groups = {cracky = 2},
+       sounds = default.node_sound_stone_defaults(),
+})
+
 
 minetest.register_node("default:obsidian", {
        description = "Obsidian",
@@ -258,12 +308,22 @@ minetest.register_node("default:obsidian", {
 
 minetest.register_node("default:obsidianbrick", {
        description = "Obsidian Brick",
+       paramtype2 = "facedir",
+       place_param2 = 0,
        tiles = {"default_obsidian_brick.png"},
        is_ground_content = false,
        sounds = default.node_sound_stone_defaults(),
        groups = {cracky = 1, level = 2},
 })
 
+minetest.register_node("default:obsidian_block", {
+       description = "Obsidian Block",
+       tiles = {"default_obsidian_block.png"},
+       is_ground_content = false,
+       sounds = default.node_sound_stone_defaults(),
+       groups = {cracky = 1, level = 2},
+})
+
 --
 -- Soft / Non-Stone
 --
@@ -280,7 +340,7 @@ minetest.register_node("default:dirt_with_grass", {
        tiles = {"default_grass.png", "default_dirt.png",
                {name = "default_dirt.png^default_grass_side.png",
                        tileable_vertical = false}},
-       groups = {crumbly = 3, soil = 1},
+       groups = {crumbly = 3, soil = 1, spreading_dirt_type = 1},
        drop = 'default:dirt',
        sounds = default.node_sound_dirt_defaults({
                footstep = {name = "default_grass_footstep", gain = 0.25},
@@ -305,7 +365,7 @@ minetest.register_node("default:dirt_with_dry_grass", {
                "default_dirt.png",
                {name = "default_dirt.png^default_dry_grass_side.png",
                        tileable_vertical = false}},
-       groups = {crumbly = 3, soil = 1},
+       groups = {crumbly = 3, soil = 1, spreading_dirt_type = 1},
        drop = 'default:dirt',
        sounds = default.node_sound_dirt_defaults({
                footstep = {name = "default_grass_footstep", gain = 0.4},
@@ -317,14 +377,13 @@ minetest.register_node("default:dirt_with_snow", {
        tiles = {"default_snow.png", "default_dirt.png",
                {name = "default_dirt.png^default_snow_side.png",
                        tileable_vertical = false}},
-       groups = {crumbly = 3, soil = 1},
+       groups = {crumbly = 3, soil = 1, spreading_dirt_type = 1},
        drop = 'default:dirt',
        sounds = default.node_sound_dirt_defaults({
-               footstep = {name = "default_snow_footstep", gain = 0.25},
+               footstep = {name = "default_snow_footstep", gain = 0.15},
        }),
 })
 
-
 minetest.register_node("default:sand", {
        description = "Sand",
        tiles = {"default_sand.png"},
@@ -339,18 +398,28 @@ minetest.register_node("default:desert_sand", {
        sounds = default.node_sound_sand_defaults(),
 })
 
+minetest.register_node("default:silver_sand", {
+       description = "Silver Sand",
+       tiles = {"default_silver_sand.png"},
+       groups = {crumbly = 3, falling_node = 1, sand = 1},
+       sounds = default.node_sound_sand_defaults(),
+})
+
 
 minetest.register_node("default:gravel", {
        description = "Gravel",
        tiles = {"default_gravel.png"},
        groups = {crumbly = 2, falling_node = 1},
-       sounds = default.node_sound_dirt_defaults({
-               footstep = {name = "default_gravel_footstep", gain = 0.5},
-               dug = {name = "default_gravel_footstep", gain = 1.0},
-       }),
+       sounds = default.node_sound_gravel_defaults(),
+       drop = {
+               max_items = 1,
+               items = {
+                       {items = {'default:flint'}, rarity = 16},
+                       {items = {'default:gravel'}}
+               }
+       }
 })
 
-
 minetest.register_node("default:clay", {
        description = "Clay",
        tiles = {"default_clay.png"},
@@ -367,6 +436,8 @@ minetest.register_node("default:snow", {
        wield_image = "default_snowball.png",
        paramtype = "light",
        buildable_to = true,
+       floodable = true,
+       walkable = false,
        drawtype = "nodebox",
        node_box = {
                type = "fixed",
@@ -376,8 +447,9 @@ minetest.register_node("default:snow", {
        },
        groups = {crumbly = 3, falling_node = 1, puts_out_fire = 1},
        sounds = default.node_sound_dirt_defaults({
-               footstep = {name = "default_snow_footstep", gain = 0.25},
-               dug = {name = "default_snow_footstep", gain = 0.75},
+               footstep = {name = "default_snow_footstep", gain = 0.15},
+               dug = {name = "default_snow_footstep", gain = 0.2},
+               dig = {name = "default_snow_footstep", gain = 0.2}
        }),
 
        on_construct = function(pos)
@@ -393,12 +465,12 @@ minetest.register_node("default:snowblock", {
        tiles = {"default_snow.png"},
        groups = {crumbly = 3, puts_out_fire = 1},
        sounds = default.node_sound_dirt_defaults({
-               footstep = {name = "default_snow_footstep", gain = 0.25},
-               dug = {name = "default_snow_footstep", gain = 0.75},
+               footstep = {name = "default_snow_footstep", gain = 0.15},
+               dug = {name = "default_snow_footstep", gain = 0.2},
+               dig = {name = "default_snow_footstep", gain = 0.2}
        }),
 })
 
-
 minetest.register_node("default:ice", {
        description = "Ice",
        tiles = {"default_ice.png"},
@@ -425,9 +497,11 @@ minetest.register_node("default:tree", {
 
 minetest.register_node("default:wood", {
        description = "Wooden Planks",
+       paramtype2 = "facedir",
+       place_param2 = 0,
        tiles = {"default_wood.png"},
        is_ground_content = false,
-       groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, wood = 1},
+       groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, wood = 1},
        sounds = default.node_sound_wood_defaults(),
 })
 
@@ -441,6 +515,7 @@ minetest.register_node("default:sapling", {
        paramtype = "light",
        sunlight_propagates = true,
        walkable = false,
+       on_timer = default.grow_sapling,
        selection_box = {
                type = "fixed",
                fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3}
@@ -448,6 +523,23 @@ minetest.register_node("default:sapling", {
        groups = {snappy = 2, dig_immediate = 3, flammable = 2,
                attached_node = 1, sapling = 1},
        sounds = default.node_sound_leaves_defaults(),
+
+       on_construct = function(pos)
+               minetest.get_node_timer(pos):start(math.random(2400,4800))
+       end,
+
+       on_place = function(itemstack, placer, pointed_thing)
+               itemstack = default.sapling_on_place(itemstack, placer, pointed_thing,
+                       "default:sapling",
+                       -- minp, maxp to be checked, relative to sapling pos
+                       -- minp_relative.y = 1 because sapling pos has been checked
+                       {x = -2, y = 1, z = -2},
+                       {x = 2, y = 6, z = 2},
+                       -- maximum interval of interior volume check
+                       4)
+
+               return itemstack
+       end,
 })
 
 minetest.register_node("default:leaves", {
@@ -521,9 +613,11 @@ minetest.register_node("default:jungletree", {
 
 minetest.register_node("default:junglewood", {
        description = "Junglewood Planks",
+       paramtype2 = "facedir",
+       place_param2 = 0,
        tiles = {"default_junglewood.png"},
        is_ground_content = false,
-       groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, wood = 1},
+       groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, wood = 1},
        sounds = default.node_sound_wood_defaults(),
 })
 
@@ -559,6 +653,7 @@ minetest.register_node("default:junglesapling", {
        paramtype = "light",
        sunlight_propagates = true,
        walkable = false,
+       on_timer = default.grow_sapling,
        selection_box = {
                type = "fixed",
                fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3}
@@ -566,6 +661,23 @@ minetest.register_node("default:junglesapling", {
        groups = {snappy = 2, dig_immediate = 3, flammable = 2,
                attached_node = 1, sapling = 1},
        sounds = default.node_sound_leaves_defaults(),
+
+       on_construct = function(pos)
+               minetest.get_node_timer(pos):start(math.random(2400,4800))
+       end,
+
+       on_place = function(itemstack, placer, pointed_thing)
+               itemstack = default.sapling_on_place(itemstack, placer, pointed_thing,
+                       "default:junglesapling",
+                       -- minp, maxp to be checked, relative to sapling pos
+                       -- minp_relative.y = 1 because sapling pos has been checked
+                       {x = -2, y = 1, z = -2},
+                       {x = 2, y = 15, z = 2},
+                       -- maximum interval of interior volume check
+                       4)
+
+               return itemstack
+       end,
 })
 
 
@@ -575,7 +687,7 @@ minetest.register_node("default:pine_tree", {
                "default_pine_tree.png"},
        paramtype2 = "facedir",
        is_ground_content = false,
-       groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
+       groups = {tree = 1, choppy = 3, oddly_breakable_by_hand = 1, flammable = 3},
        sounds = default.node_sound_wood_defaults(),
 
        on_place = minetest.rotate_node
@@ -583,9 +695,11 @@ minetest.register_node("default:pine_tree", {
 
 minetest.register_node("default:pine_wood", {
        description = "Pine Wood Planks",
+       paramtype2 = "facedir",
+       place_param2 = 0,
        tiles = {"default_pine_wood.png"},
        is_ground_content = false,
-       groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, wood = 1},
+       groups = {choppy = 3, oddly_breakable_by_hand = 2, flammable = 3, wood = 1},
        sounds = default.node_sound_wood_defaults(),
 })
 
@@ -620,13 +734,31 @@ minetest.register_node("default:pine_sapling", {
        paramtype = "light",
        sunlight_propagates = true,
        walkable = false,
+       on_timer = default.grow_sapling,
        selection_box = {
                type = "fixed",
                fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3}
        },
-       groups = {snappy = 2, dig_immediate = 3, flammable = 2,
+       groups = {snappy = 2, dig_immediate = 3, flammable = 3,
                attached_node = 1, sapling = 1},
        sounds = default.node_sound_leaves_defaults(),
+
+       on_construct = function(pos)
+               minetest.get_node_timer(pos):start(math.random(2400,4800))
+       end,
+
+       on_place = function(itemstack, placer, pointed_thing)
+               itemstack = default.sapling_on_place(itemstack, placer, pointed_thing,
+                       "default:pine_sapling",
+                       -- minp, maxp to be checked, relative to sapling pos
+                       -- minp_relative.y = 1 because sapling pos has been checked
+                       {x = -2, y = 1, z = -2},
+                       {x = 2, y = 12, z = 2},
+                       -- maximum interval of interior volume check
+                       4)
+
+               return itemstack
+       end,
 })
 
 
@@ -644,9 +776,11 @@ minetest.register_node("default:acacia_tree", {
 
 minetest.register_node("default:acacia_wood", {
        description = "Acacia Wood Planks",
+       paramtype2 = "facedir",
+       place_param2 = 0,
        tiles = {"default_acacia_wood.png"},
        is_ground_content = false,
-       groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, wood = 1},
+       groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, wood = 1},
        sounds = default.node_sound_wood_defaults(),
 })
 
@@ -681,6 +815,7 @@ minetest.register_node("default:acacia_sapling", {
        paramtype = "light",
        sunlight_propagates = true,
        walkable = false,
+       on_timer = default.grow_sapling,
        selection_box = {
                type = "fixed",
                fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3}
@@ -688,6 +823,23 @@ minetest.register_node("default:acacia_sapling", {
        groups = {snappy = 2, dig_immediate = 3, flammable = 2,
                attached_node = 1, sapling = 1},
        sounds = default.node_sound_leaves_defaults(),
+
+       on_construct = function(pos)
+               minetest.get_node_timer(pos):start(math.random(2400,4800))
+       end,
+
+       on_place = function(itemstack, placer, pointed_thing)
+               itemstack = default.sapling_on_place(itemstack, placer, pointed_thing,
+                       "default:acacia_sapling",
+                       -- minp, maxp to be checked, relative to sapling pos
+                       -- minp_relative.y = 1 because sapling pos has been checked
+                       {x = -4, y = 1, z = -4},
+                       {x = 4, y = 6, z = 4},
+                       -- maximum interval of interior volume check
+                       4)
+
+               return itemstack
+       end,
 })
 
 minetest.register_node("default:aspen_tree", {
@@ -696,7 +848,7 @@ minetest.register_node("default:aspen_tree", {
                "default_aspen_tree.png"},
        paramtype2 = "facedir",
        is_ground_content = false,
-       groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
+       groups = {tree = 1, choppy = 3, oddly_breakable_by_hand = 1, flammable = 3},
        sounds = default.node_sound_wood_defaults(),
 
        on_place = minetest.rotate_node
@@ -704,9 +856,11 @@ minetest.register_node("default:aspen_tree", {
 
 minetest.register_node("default:aspen_wood", {
        description = "Aspen Wood Planks",
+       paramtype2 = "facedir",
+       place_param2 = 0,
        tiles = {"default_aspen_wood.png"},
        is_ground_content = false,
-       groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, wood = 1},
+       groups = {choppy = 3, oddly_breakable_by_hand = 2, flammable = 3, wood = 1},
        sounds = default.node_sound_wood_defaults(),
 })
 
@@ -741,14 +895,33 @@ minetest.register_node("default:aspen_sapling", {
        paramtype = "light",
        sunlight_propagates = true,
        walkable = false,
+       on_timer = default.grow_sapling,
        selection_box = {
                type = "fixed",
                fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3}
        },
-       groups = {snappy = 2, dig_immediate = 3, flammable = 2,
+       groups = {snappy = 2, dig_immediate = 3, flammable = 3,
                attached_node = 1, sapling = 1},
        sounds = default.node_sound_leaves_defaults(),
+
+       on_construct = function(pos)
+               minetest.get_node_timer(pos):start(math.random(2400,4800))
+       end,
+
+       on_place = function(itemstack, placer, pointed_thing)
+               itemstack = default.sapling_on_place(itemstack, placer, pointed_thing,
+                       "default:aspen_sapling",
+                       -- minp, maxp to be checked, relative to sapling pos
+                       -- minp_relative.y = 1 because sapling pos has been checked
+                       {x = -2, y = 1, z = -2},
+                       {x = 2, y = 12, z = 2},
+                       -- maximum interval of interior volume check
+                       4)
+
+               return itemstack
+       end,
 })
+
 --
 -- Ores
 --
@@ -872,13 +1045,9 @@ minetest.register_node("default:cactus", {
        tiles = {"default_cactus_top.png", "default_cactus_top.png",
                "default_cactus_side.png"},
        paramtype2 = "facedir",
-       groups = {snappy = 1, choppy = 3, flammable = 2},
+       groups = {snappy = 1, choppy = 3},
        sounds = default.node_sound_wood_defaults(),
        on_place = minetest.rotate_node,
-
-       after_dig_node = function(pos, node, metadata, digger)
-               default.dig_up(pos, node, digger)
-       end,
 })
 
 minetest.register_node("default:papyrus", {
@@ -934,7 +1103,7 @@ minetest.register_node("default:junglegrass", {
        sunlight_propagates = true,
        walkable = false,
        buildable_to = true,
-       groups = {snappy = 3, flammable = 2, flora = 1, attached_node = 1},
+       groups = {snappy = 3, flora = 1, attached_node = 1, grass = 1},
        sounds = default.node_sound_leaves_defaults(),
        selection_box = {
                type = "fixed",
@@ -955,7 +1124,7 @@ minetest.register_node("default:grass_1", {
        sunlight_propagates = true,
        walkable = false,
        buildable_to = true,
-       groups = {snappy = 3, flammable = 3, flora = 1, attached_node = 1},
+       groups = {snappy = 3, flora = 1, attached_node = 1, grass = 1},
        sounds = default.node_sound_leaves_defaults(),
        selection_box = {
                type = "fixed",
@@ -984,8 +1153,8 @@ for i = 2, 5 do
                walkable = false,
                buildable_to = true,
                drop = "default:grass_1",
-               groups = {snappy = 3, flammable = 3, flora = 1,
-                       attached_node = 1, not_in_creative_inventory = 1},
+               groups = {snappy = 3, flora = 1, attached_node = 1,
+                       not_in_creative_inventory = 1, grass = 1},
                sounds = default.node_sound_leaves_defaults(),
                selection_box = {
                        type = "fixed",
@@ -1006,7 +1175,8 @@ minetest.register_node("default:dry_grass_1", {
        sunlight_propagates = true,
        walkable = false,
        buildable_to = true,
-       groups = {snappy = 3, flammable = 3, flora = 1, attached_node = 1},
+       groups = {snappy = 3, flammable = 3, flora = 1,
+               attached_node = 1, dry_grass = 1},
        sounds = default.node_sound_leaves_defaults(),
        selection_box = {
                type = "fixed",
@@ -1034,8 +1204,8 @@ for i = 2, 5 do
                sunlight_propagates = true,
                walkable = false,
                buildable_to = true,
-               groups = {snappy = 3, flammable = 3, flora = 1,
-                       attached_node = 1, not_in_creative_inventory=1},
+               groups = {snappy = 3, flammable = 3, flora = 1, attached_node = 1,
+                       not_in_creative_inventory=1, dry_grass = 1},
                drop = "default:dry_grass_1",
                sounds = default.node_sound_leaves_defaults(),
                selection_box = {
@@ -1045,13 +1215,41 @@ for i = 2, 5 do
        })
 end
 
+
+--
+-- Corals
+--
+
+minetest.register_node("default:coral_brown", {
+       description = "Brown Coral",
+       tiles = {"default_coral_brown.png"},
+       groups = {cracky = 3},
+       drop = "default:coral_skeleton",
+       sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:coral_orange", {
+       description = "Orange Coral",
+       tiles = {"default_coral_orange.png"},
+       groups = {cracky = 3},
+       drop = "default:coral_skeleton",
+       sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:coral_skeleton", {
+       description = "Coral Skeleton",
+       tiles = {"default_coral_skeleton.png"},
+       groups = {cracky = 3},
+       sounds = default.node_sound_stone_defaults(),
+})
+
+
 --
 -- Liquids
 --
 
 minetest.register_node("default:water_source", {
        description = "Water Source",
-       inventory_image = minetest.inventorycube("default_water.png"),
        drawtype = "liquid",
        tiles = {
                {
@@ -1096,7 +1294,6 @@ minetest.register_node("default:water_source", {
 
 minetest.register_node("default:water_flowing", {
        description = "Flowing Water",
-       inventory_image = minetest.inventorycube("default_water.png"),
        drawtype = "flowingliquid",
        tiles = {"default_water.png"},
        special_tiles = {
@@ -1143,7 +1340,6 @@ minetest.register_node("default:water_flowing", {
 
 minetest.register_node("default:river_water_source", {
        description = "River Water Source",
-       inventory_image = minetest.inventorycube("default_river_water.png"),
        drawtype = "liquid",
        tiles = {
                {
@@ -1189,7 +1385,6 @@ minetest.register_node("default:river_water_source", {
 
 minetest.register_node("default:river_water_flowing", {
        description = "Flowing River Water",
-       inventory_image = minetest.inventorycube("default_river_water.png"),
        drawtype = "flowingliquid",
        tiles = {"default_river_water.png"},
        special_tiles = {
@@ -1238,7 +1433,6 @@ minetest.register_node("default:river_water_flowing", {
 
 minetest.register_node("default:lava_source", {
        description = "Lava Source",
-       inventory_image = minetest.inventorycube("default_lava.png"),
        drawtype = "liquid",
        tiles = {
                {
@@ -1280,12 +1474,11 @@ minetest.register_node("default:lava_source", {
        liquid_renewable = false,
        damage_per_second = 4 * 2,
        post_effect_color = {a = 191, r = 255, g = 64, b = 0},
-       groups = {lava = 3, liquid = 2, hot = 3, igniter = 1},
+       groups = {lava = 3, liquid = 2, igniter = 1},
 })
 
 minetest.register_node("default:lava_flowing", {
        description = "Flowing Lava",
-       inventory_image = minetest.inventorycube("default_lava.png"),
        drawtype = "flowingliquid",
        tiles = {"default_lava.png"},
        special_tiles = {
@@ -1327,7 +1520,7 @@ minetest.register_node("default:lava_flowing", {
        liquid_renewable = false,
        damage_per_second = 4 * 2,
        post_effect_color = {a = 191, r = 255, g = 64, b = 0},
-       groups = {lava = 3, liquid = 2, hot = 3, igniter = 1,
+       groups = {lava = 3, liquid = 2, igniter = 1,
                not_in_creative_inventory = 1},
 })
 
@@ -1416,7 +1609,14 @@ local function get_locked_chest_formspec(pos)
 end
 
 local function has_locked_chest_privilege(meta, player)
-       if player:get_player_name() ~= meta:get_string("owner") then
+       local name = ""
+       if player then
+               if minetest.check_player_privs(player, "protection_bypass") then
+                       return true
+               end
+               name = player:get_player_name()
+       end
+       if name ~= meta:get_string("owner") then
                return false
        end
        return true
@@ -1435,7 +1635,6 @@ minetest.register_node("default:chest", {
        on_construct = function(pos)
                local meta = minetest.get_meta(pos)
                meta:set_string("formspec", chest_formspec)
-               meta:set_string("infotext", "Chest")
                local inv = meta:get_inventory()
                inv:set_size("main", 8*4)
        end,
@@ -1451,11 +1650,20 @@ minetest.register_node("default:chest", {
        end,
     on_metadata_inventory_put = function(pos, listname, index, stack, player)
                minetest.log("action", player:get_player_name() ..
-                       " moves stuff to chest at " .. minetest.pos_to_string(pos))
+                       " moves " .. stack:get_name() ..
+                       " to chest at " .. minetest.pos_to_string(pos))
        end,
     on_metadata_inventory_take = function(pos, listname, index, stack, player)
                minetest.log("action", player:get_player_name() ..
-                       " takes stuff from chest at " .. minetest.pos_to_string(pos))
+                       " takes " .. stack:get_name() ..
+                       " from chest at " .. minetest.pos_to_string(pos))
+       end,
+       on_blast = function(pos)
+               local drops = {}
+               default.get_inventory_drops(pos, "main", drops)
+               drops[#drops+1] = "default:chest"
+               minetest.remove_node(pos)
+               return drops
        end,
 })
 
@@ -1477,7 +1685,6 @@ minetest.register_node("default:chest_locked", {
        end,
        on_construct = function(pos)
                local meta = minetest.get_meta(pos)
-               meta:set_string("infotext", "Locked Chest")
                meta:set_string("owner", "")
                local inv = meta:get_inventory()
                inv:set_size("main", 8 * 4)
@@ -1511,13 +1718,15 @@ minetest.register_node("default:chest_locked", {
        end,
     on_metadata_inventory_put = function(pos, listname, index, stack, player)
                minetest.log("action", player:get_player_name() ..
-                       " moves stuff to locked chest at " .. minetest.pos_to_string(pos))
+                       " moves " .. stack:get_name() ..
+                       " to locked chest at " .. minetest.pos_to_string(pos))
        end,
     on_metadata_inventory_take = function(pos, listname, index, stack, player)
                minetest.log("action", player:get_player_name() ..
-                       " takes stuff from locked chest at " .. minetest.pos_to_string(pos))
+                       " takes " .. stack:get_name()  ..
+                       " from locked chest at " .. minetest.pos_to_string(pos))
        end,
-       on_rightclick = function(pos, node, clicker)
+       on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
                local meta = minetest.get_meta(pos)
                if has_locked_chest_privilege(meta, clicker) then
                        minetest.show_formspec(
@@ -1526,6 +1735,7 @@ minetest.register_node("default:chest_locked", {
                                get_locked_chest_formspec(pos)
                        )
                end
+               return itemstack
        end,
        on_blast = function() end,
 })
@@ -1545,7 +1755,9 @@ local bookshelf_formspec =
 
 minetest.register_node("default:bookshelf", {
        description = "Bookshelf",
-       tiles = {"default_wood.png", "default_wood.png", "default_bookshelf.png"},
+       tiles = {"default_wood.png", "default_wood.png", "default_wood.png",
+               "default_wood.png", "default_bookshelf.png", "default_bookshelf.png"},
+       paramtype2 = "facedir",
        is_ground_content = false,
        groups = {choppy = 3, oddly_breakable_by_hand = 2, flammable = 3},
        sounds = default.node_sound_wood_defaults(),
@@ -1557,43 +1769,16 @@ minetest.register_node("default:bookshelf", {
                inv:set_size("books", 8 * 2)
        end,
        can_dig = function(pos,player)
-               local meta = minetest.get_meta(pos);
-               local inv = meta:get_inventory()
+               local inv = minetest.get_meta(pos):get_inventory()
                return inv:is_empty("books")
        end,
-
-       allow_metadata_inventory_put = function(pos, listname, index, stack, player)
-               local meta = minetest.get_meta(pos)
-               local inv = meta:get_inventory()
-               local to_stack = inv:get_stack(listname, index)
-               if listname == "books" then
-                       if minetest.get_item_group(stack:get_name(), "book") ~= 0
-                                       and to_stack:is_empty() then
-                               return 1
-                       else
-                               return 0
-                       end
-               end
-       end,
-
-       allow_metadata_inventory_move = function(pos, from_list, from_index,
-                       to_list, to_index, count, player)
-               local meta = minetest.get_meta(pos)
-               local inv = meta:get_inventory()
-               local stack = inv:get_stack(from_list, from_index)
-               local to_stack = inv:get_stack(to_list, to_index)
-               if to_list == "books" then
-                       if minetest.get_item_group(stack:get_name(), "book") ~= 0
-                                       and to_stack:is_empty() then
-                               return 1
-                       else
-                               return 0
-                       end
+       allow_metadata_inventory_put = function(pos, listname, index, stack)
+               if minetest.get_item_group(stack:get_name(), "book") ~= 0 then
+                       return stack:get_count()
                end
+               return 0
        end,
-
-       on_metadata_inventory_move = function(pos, from_list, from_index,
-                       to_list, to_index, count, player)
+       on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
                minetest.log("action", player:get_player_name() ..
                        " moves stuff in bookshelf at " .. minetest.pos_to_string(pos))
        end,
@@ -1605,58 +1790,75 @@ minetest.register_node("default:bookshelf", {
                minetest.log("action", player:get_player_name() ..
                        " takes stuff from bookshelf at " .. minetest.pos_to_string(pos))
        end,
+       on_blast = function(pos)
+               local drops = {}
+               default.get_inventory_drops(pos, "books", drops)
+               drops[#drops+1] = "default:bookshelf"
+               minetest.remove_node(pos)
+               return drops
+       end,
 })
 
+local function register_sign(material, desc, def)
+       minetest.register_node("default:sign_wall_" .. material, {
+               description = desc .. " Sign",
+               drawtype = "nodebox",
+               tiles = {"default_sign_wall_" .. material .. ".png"},
+               inventory_image = "default_sign_" .. material .. ".png",
+               wield_image = "default_sign_" .. material .. ".png",
+               paramtype = "light",
+               paramtype2 = "wallmounted",
+               sunlight_propagates = true,
+               is_ground_content = false,
+               walkable = false,
+               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},
+               },
+               groups = def.groups,
+               legacy_wallmounted = true,
+               sounds = def.sounds,
+
+               on_construct = function(pos)
+                       --local n = minetest.get_node(pos)
+                       local meta = minetest.get_meta(pos)
+                       meta:set_string("formspec", "field[text;;${text}]")
+               end,
+               on_receive_fields = function(pos, formname, fields, sender)
+                       --print("Sign at "..minetest.pos_to_string(pos).." got "..dump(fields))
+                       local player_name = sender:get_player_name()
+                       if minetest.is_protected(pos, player_name) then
+                               minetest.record_protection_violation(pos, player_name)
+                               return
+                       end
+                       local meta = minetest.get_meta(pos)
+                       if not fields.text then return end
+                       minetest.log("action", (player_name or "") .. " wrote \"" ..
+                               fields.text .. "\" to sign at " .. minetest.pos_to_string(pos))
+                       meta:set_string("text", fields.text)
+                       meta:set_string("infotext", '"' .. fields.text .. '"')
+               end,
+       })
+end
 
-minetest.register_node("default:sign_wall", {
-       description = "Sign",
-       drawtype = "nodebox",
-       tiles = {"default_sign.png"},
-       inventory_image = "default_sign_wall.png",
-       wield_image = "default_sign_wall.png",
-       paramtype = "light",
-       paramtype2 = "wallmounted",
-       sunlight_propagates = true,
-       is_ground_content = false,
-       walkable = false,
-       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},
-       },
-       groups = {choppy = 2, dig_immediate = 2, attached_node = 1},
-       legacy_wallmounted = true,
-       sounds = default.node_sound_defaults(),
-
-       on_construct = function(pos)
-               --local n = minetest.get_node(pos)
-               local meta = minetest.get_meta(pos)
-               meta:set_string("formspec", "field[text;;${text}]")
-               meta:set_string("infotext", "\"\"")
-       end,
-       on_receive_fields = function(pos, formname, fields, sender)
-               --print("Sign at "..minetest.pos_to_string(pos).." got "..dump(fields))
-               if minetest.is_protected(pos, sender:get_player_name()) then
-                       minetest.record_protection_violation(pos, sender:get_player_name())
-                       return
-               end
-               local meta = minetest.get_meta(pos)
-               if not fields.text then return end
-               minetest.log("action", (sender:get_player_name() or "") .. " wrote \"" ..
-                       fields.text .. "\" to sign at " .. minetest.pos_to_string(pos))
-               meta:set_string("text", fields.text)
-               meta:set_string("infotext", '"' .. fields.text .. '"')
-       end,
+register_sign("wood", "Wooden", {
+       sounds = default.node_sound_wood_defaults(),
+       groups = {choppy = 2, attached_node = 1, flammable = 2, oddly_breakable_by_hand = 3}
 })
 
+register_sign("steel", "Steel", {
+       sounds = default.node_sound_defaults(),
+       groups = {cracky = 2, attached_node = 1}
+})
 
-minetest.register_node("default:ladder", {
-       description = "Ladder",
+minetest.register_node("default:ladder_wood", {
+       description = "Wooden Ladder",
        drawtype = "signlike",
-       tiles = {"default_ladder.png"},
-       inventory_image = "default_ladder.png",
-       wield_image = "default_ladder.png",
+       tiles = {"default_ladder_wood.png"},
+       inventory_image = "default_ladder_wood.png",
+       wield_image = "default_ladder_wood.png",
        paramtype = "light",
        paramtype2 = "wallmounted",
        sunlight_propagates = true,
@@ -1674,32 +1876,82 @@ minetest.register_node("default:ladder", {
        sounds = default.node_sound_wood_defaults(),
 })
 
-
-local fence_texture =
-       "default_fence_overlay.png^default_wood.png^default_fence_overlay.png^[makealpha:255,126,126"
-minetest.register_node("default:fence_wood", {
-       description = "Wooden Fence",
-       drawtype = "fencelike",
-       tiles = {"default_wood.png"},
-       inventory_image = fence_texture,
-       wield_image = fence_texture,
+minetest.register_node("default:ladder_steel", {
+       description = "Steel Ladder",
+       drawtype = "signlike",
+       tiles = {"default_ladder_steel.png"},
+       inventory_image = "default_ladder_steel.png",
+       wield_image = "default_ladder_steel.png",
        paramtype = "light",
+       paramtype2 = "wallmounted",
        sunlight_propagates = true,
+       walkable = false,
+       climbable = true,
        is_ground_content = false,
        selection_box = {
-               type = "fixed",
-               fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7},
+               type = "wallmounted",
+               --wall_top = = <default>
+               --wall_bottom = = <default>
+               --wall_side = = <default>
        },
+       groups = {cracky = 2},
+       sounds = default.node_sound_stone_defaults(),
+})
+
+default.register_fence("default:fence_wood", {
+       description = "Wooden Fence",
+       texture = "default_fence_wood.png",
+       inventory_image = "default_fence_overlay.png^default_wood.png^default_fence_overlay.png^[makealpha:255,126,126",
+       wield_image = "default_fence_overlay.png^default_wood.png^default_fence_overlay.png^[makealpha:255,126,126",
+       material = "default:wood",
        groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
-       sounds = default.node_sound_wood_defaults(),
+       sounds = default.node_sound_wood_defaults()
 })
 
+default.register_fence("default:fence_acacia_wood", {
+       description = "Acacia Fence",
+       texture = "default_fence_acacia_wood.png",
+       inventory_image = "default_fence_overlay.png^default_acacia_wood.png^default_fence_overlay.png^[makealpha:255,126,126",
+       wield_image = "default_fence_overlay.png^default_acacia_wood.png^default_fence_overlay.png^[makealpha:255,126,126",
+       material = "default:acacia_wood",
+       groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
+       sounds = default.node_sound_wood_defaults()
+})
+
+default.register_fence("default:fence_junglewood", {
+       description = "Junglewood Fence",
+       texture = "default_fence_junglewood.png",
+       inventory_image = "default_fence_overlay.png^default_junglewood.png^default_fence_overlay.png^[makealpha:255,126,126",
+       wield_image = "default_fence_overlay.png^default_junglewood.png^default_fence_overlay.png^[makealpha:255,126,126",
+       material = "default:junglewood",
+       groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
+       sounds = default.node_sound_wood_defaults()
+})
+
+default.register_fence("default:fence_pine_wood", {
+       description = "Pine Fence",
+       texture = "default_fence_pine_wood.png",
+       inventory_image = "default_fence_overlay.png^default_pine_wood.png^default_fence_overlay.png^[makealpha:255,126,126",
+       wield_image = "default_fence_overlay.png^default_pine_wood.png^default_fence_overlay.png^[makealpha:255,126,126",
+       material = "default:pine_wood",
+       groups = {choppy = 3, oddly_breakable_by_hand = 2, flammable = 3},
+       sounds = default.node_sound_wood_defaults()
+})
+
+default.register_fence("default:fence_aspen_wood", {
+       description = "Aspen Fence",
+       texture = "default_fence_aspen_wood.png",
+       inventory_image = "default_fence_overlay.png^default_aspen_wood.png^default_fence_overlay.png^[makealpha:255,126,126",
+       wield_image = "default_fence_overlay.png^default_aspen_wood.png^default_fence_overlay.png^[makealpha:255,126,126",
+       material = "default:aspen_wood",
+       groups = {choppy = 3, oddly_breakable_by_hand = 2, flammable = 3},
+       sounds = default.node_sound_wood_defaults()
+})
 
 minetest.register_node("default:glass", {
        description = "Glass",
        drawtype = "glasslike_framed_optional",
        tiles = {"default_glass.png", "default_glass_detail.png"},
-       inventory_image = minetest.inventorycube("default_glass.png"),
        paramtype = "light",
        sunlight_propagates = true,
        is_ground_content = false,
@@ -1711,12 +1963,11 @@ minetest.register_node("default:obsidian_glass", {
        description = "Obsidian Glass",
        drawtype = "glasslike_framed_optional",
        tiles = {"default_obsidian_glass.png", "default_obsidian_glass_detail.png"},
-       inventory_image = minetest.inventorycube("default_obsidian_glass.png"),
        paramtype = "light",
        is_ground_content = false,
        sunlight_propagates = true,
        sounds = default.node_sound_glass_defaults(),
-       groups = {cracky = 3, oddly_breakable_by_hand = 3},
+       groups = {cracky = 3},
 })
 
 
@@ -1736,13 +1987,15 @@ minetest.register_node("default:rail", {
                 -- but how to specify the dimensions for curved and sideways rails?
                 fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
        },
-       groups = {bendy = 2, dig_immediate = 2, attached_node = 1,
+       groups = {dig_immediate = 2, attached_node = 1,
                connect_to_raillike = minetest.raillike_group("rail")},
 })
 
 
 minetest.register_node("default:brick", {
        description = "Brick Block",
+       paramtype2 = "facedir",
+       place_param2 = 0,
        tiles = {"default_brick.png"},
        is_ground_content = false,
        groups = {cracky = 3},
@@ -1773,26 +2026,3 @@ minetest.register_node("default:cloud", {
        sounds = default.node_sound_defaults(),
        groups = {not_in_creative_inventory = 1},
 })
-
-minetest.register_node("default:nyancat", {
-       description = "Nyan Cat",
-       tiles = {"default_nc_side.png", "default_nc_side.png", "default_nc_side.png",
-               "default_nc_side.png", "default_nc_back.png", "default_nc_front.png"},
-       paramtype2 = "facedir",
-       groups = {cracky = 2},
-       is_ground_content = false,
-       legacy_facedir_simple = true,
-       sounds = default.node_sound_defaults(),
-})
-
-minetest.register_node("default:nyancat_rainbow", {
-       description = "Nyan Cat Rainbow",
-       tiles = {
-               "default_nc_rb.png^[transformR90", "default_nc_rb.png^[transformR90",
-               "default_nc_rb.png", "default_nc_rb.png"
-       },
-       paramtype2 = "facedir",
-       groups = {cracky = 2},
-       is_ground_content = false,
-       sounds = default.node_sound_defaults(),
-})