Use animation for new_style_water
[oweals/minetest_game.git] / mods / default / init.lua
index ee11b8fcd68148fdb31b187009b381d772a8a760..b0329413104dea5e391258ef5c1da463c06c072a 100644 (file)
@@ -12,6 +12,7 @@ LIGHT_MAX = 14
 default = {}
 
 -- Load other files
+dofile(minetest.get_modpath("default").."/player.lua")
 dofile(minetest.get_modpath("default").."/mapgen.lua")
 dofile(minetest.get_modpath("default").."/leafdecay.lua")
 
@@ -25,13 +26,13 @@ minetest.register_item(":", {
        wield_image = "wieldhand.png",
        wield_scale = {x=1,y=1,z=2.5},
        tool_capabilities = {
-               full_punch_interval = 1.0,
+               full_punch_interval = 0.9,
                max_drop_level = 0,
                groupcaps = {
-                       fleshy = {times={[2]=2.00, [3]=1.00}, uses=0, maxlevel=1},
+                       fleshy = {times={[2]=0.75, [3]=0.6}, uses=0, maxlevel=1},
                        crumbly = {times={[2]=3.00, [3]=0.70}, uses=0, maxlevel=1},
                        snappy = {times={[3]=0.40}, uses=0, maxlevel=1},
-                       oddly_breakable_by_hand = {times={[1]=7.00,[2]=4.00,[3]=1.40}, uses=0, maxlevel=3},
+                       oddly_breakable_by_hand = {times={[1]=7.00,[2]=4.00,[3]=1.40}, uses=0, maxlevel=3}
                }
        }
 })
@@ -40,9 +41,11 @@ minetest.register_tool("default:pick_wood", {
        description = "Wooden Pickaxe",
        inventory_image = "default_tool_woodpick.png",
        tool_capabilities = {
+               full_punch_interval = 1.2,
                max_drop_level=0,
                groupcaps={
-                       cracky={times={[2]=2.00, [3]=1.20}, uses=10, maxlevel=1}
+                       cracky = {times={[2]=2.00, [3]=1.20}, uses=10, maxlevel=1},
+                       fleshy = {times={[2]=0.95, [3]=0.6}, uses=15, maxlevel=1}
                }
        },
 })
@@ -50,9 +53,11 @@ minetest.register_tool("default:pick_stone", {
        description = "Stone Pickaxe",
        inventory_image = "default_tool_stonepick.png",
        tool_capabilities = {
+               full_punch_interval = 1.3,
                max_drop_level=0,
                groupcaps={
-                       cracky={times={[1]=3.00, [2]=1.20, [3]=0.80}, uses=20, maxlevel=1}
+                       cracky = {times={[1]=3.00, [2]=1.20, [3]=0.80}, uses=20, maxlevel=1},
+                       fleshy = {times={[2]=0.7, [3]=0.5}, uses=25, maxlevel=1}
                }
        },
 })
@@ -60,9 +65,11 @@ minetest.register_tool("default:pick_steel", {
        description = "Steel Pickaxe",
        inventory_image = "default_tool_steelpick.png",
        tool_capabilities = {
+               full_punch_interval = 1.0,
                max_drop_level=1,
                groupcaps={
-                       cracky={times={[1]=4.00, [2]=1.60, [3]=1.00}, uses=30, maxlevel=2}
+                       cracky = {times={[1]=4.00, [2]=1.60, [3]=1.00}, uses=30, maxlevel=2},
+                       fleshy = {times={[2]=0.6, [3]=0.35}, uses=35, maxlevel=1}
                }
        },
 })
@@ -70,42 +77,52 @@ minetest.register_tool("default:pick_mese", {
        description = "Mese Pickaxe",
        inventory_image = "default_tool_mesepick.png",
        tool_capabilities = {
-               full_punch_interval = 1.0,
+               full_punch_interval = 0.65,
                max_drop_level=3,
                groupcaps={
-                       cracky={times={[1]=2.0, [2]=1.0, [3]=0.5}, uses=20, maxlevel=3},
-                       crumbly={times={[1]=2.0, [2]=1.0, [3]=0.5}, uses=20, maxlevel=3},
-                       snappy={times={[1]=2.0, [2]=1.0, [3]=0.5}, uses=20, maxlevel=3}
+                       cracky = {times={[1]=2.0, [2]=1.0, [3]=0.5}, uses=20, maxlevel=3},
+                       crumbly = {times={[1]=2.0, [2]=1.0, [3]=0.5}, uses=20, maxlevel=3},
+                       snappy = {times={[1]=2.0, [2]=1.0, [3]=0.5}, uses=20, maxlevel=3},
+                       fleshy = {times={[2]=0.6, [3]=0.5}, uses=80, maxlevel=1}
                }
        },
 })
 minetest.register_tool("default:shovel_wood", {
        description = "Wooden Shovel",
        inventory_image = "default_tool_woodshovel.png",
+       wield_image = "default_tool_woodshovel.png^[transformR90",
        tool_capabilities = {
+               full_punch_interval = 1.2,
                max_drop_level=0,
                groupcaps={
-                       crumbly={times={[1]=3.00, [2]=0.80, [3]=0.50}, uses=10, maxlevel=1}
+                       crumbly = {times={[1]=3.00, [2]=0.80, [3]=0.50}, uses=10, maxlevel=1},
+                       fleshy = {times={[2]=1.05, [3]=0.70}, uses=25, maxlevel=1}
                }
        },
 })
 minetest.register_tool("default:shovel_stone", {
        description = "Stone Shovel",
        inventory_image = "default_tool_stoneshovel.png",
+       wield_image = "default_tool_stoneshovel.png^[transformR90",
        tool_capabilities = {
+               full_punch_interval = 1.4,
                max_drop_level=0,
                groupcaps={
-                       crumbly={times={[1]=1.50, [2]=0.50, [3]=0.30}, uses=20, maxlevel=1}
+                       crumbly = {times={[1]=1.50, [2]=0.50, [3]=0.30}, uses=20, maxlevel=1},
+                       fleshy = {times={[2]=0.75, [3]=0.50}, uses=40, maxlevel=1}
                }
        },
 })
 minetest.register_tool("default:shovel_steel", {
        description = "Steel Shovel",
        inventory_image = "default_tool_steelshovel.png",
+       wield_image = "default_tool_steelshovel.png^[transformR90",
        tool_capabilities = {
+               full_punch_interval = 1.1,
                max_drop_level=1,
                groupcaps={
-                       crumbly={times={[1]=1.50, [2]=0.70, [3]=0.60}, uses=30, maxlevel=2}
+                       crumbly = {times={[1]=1.50, [2]=0.70, [3]=0.60}, uses=30, maxlevel=2},
+                       fleshy = {times={[2]=0.45, [3]=0.30}, uses=50, maxlevel=1}
                }
        },
 })
@@ -113,10 +130,11 @@ minetest.register_tool("default:axe_wood", {
        description = "Wooden Axe",
        inventory_image = "default_tool_woodaxe.png",
        tool_capabilities = {
+               full_punch_interval = 1.0,
                max_drop_level=0,
                groupcaps={
-                       choppy={times={[2]=1.40, [3]=0.80}, uses=10, maxlevel=1},
-                       fleshy={times={[2]=1.50, [3]=0.80}, uses=10, maxlevel=1}
+                       choppy = {times={[2]=1.60, [3]=1.20}, uses=10, maxlevel=1},
+                       fleshy = {times={[2]=0.70, [3]=0.50}, uses=5, maxlevel=1}
                }
        },
 })
@@ -124,10 +142,11 @@ minetest.register_tool("default:axe_stone", {
        description = "Stone Axe",
        inventory_image = "default_tool_stoneaxe.png",
        tool_capabilities = {
+               full_punch_interval = 1.2,
                max_drop_level=0,
                groupcaps={
-                       choppy={times={[1]=3.00, [2]=1.00, [3]=0.60}, uses=20, maxlevel=1},
-                       fleshy={times={[2]=1.30, [3]=0.70}, uses=20, maxlevel=1}
+                       choppy={times={[1]=3.00, [2]=1.40, [3]=1.00}, uses=20, maxlevel=1},
+                       fleshy={times={[2]=0.60, [3]=0.40}, uses=15, maxlevel=1}
                }
        },
 })
@@ -135,10 +154,11 @@ minetest.register_tool("default:axe_steel", {
        description = "Steel Axe",
        inventory_image = "default_tool_steelaxe.png",
        tool_capabilities = {
+               full_punch_interval = 0.9,
                max_drop_level=1,
                groupcaps={
-                       choppy={times={[1]=3.00, [2]=1.60, [3]=1.00}, uses=30, maxlevel=2},
-                       fleshy={times={[2]=1.10, [3]=0.60}, uses=40, maxlevel=1}
+                       choppy={times={[1]=2.60, [2]=1.00, [3]=0.60}, uses=30, maxlevel=2},
+                       fleshy={times={[2]=0.40, [3]=0.25}, uses=25, maxlevel=1}
                }
        },
 })
@@ -146,12 +166,12 @@ minetest.register_tool("default:sword_wood", {
        description = "Wooden Sword",
        inventory_image = "default_tool_woodsword.png",
        tool_capabilities = {
-               full_punch_interval = 1.0,
+               full_punch_interval = 0.9,
                max_drop_level=0,
                groupcaps={
                        fleshy={times={[2]=1.10, [3]=0.60}, uses=10, maxlevel=1},
-                       snappy={times={[2]=1.00, [3]=0.50}, uses=10, maxlevel=1},
-                       choppy={times={[3]=1.00}, uses=20, maxlevel=0}
+                       snappy={times={[2]=0.9, [3]=0.45}, uses=10, maxlevel=1},
+                       choppy={times={[3]=0.90}, uses=20, maxlevel=0}
                }
        }
 })
@@ -159,12 +179,12 @@ minetest.register_tool("default:sword_stone", {
        description = "Stone Sword",
        inventory_image = "default_tool_stonesword.png",
        tool_capabilities = {
-               full_punch_interval = 1.0,
+               full_punch_interval = 1.1,
                max_drop_level=0,
                groupcaps={
                        fleshy={times={[2]=0.80, [3]=0.40}, uses=20, maxlevel=1},
-                       snappy={times={[2]=0.80, [3]=0.40}, uses=20, maxlevel=1},
-                       choppy={times={[3]=0.90}, uses=20, maxlevel=0}
+                       snappy={times={[2]=0.75, [3]=0.35}, uses=20, maxlevel=1},
+                       choppy={times={[3]=0.70}, uses=20, maxlevel=0}
                }
        }
 })
@@ -172,12 +192,12 @@ minetest.register_tool("default:sword_steel", {
        description = "Steel Sword",
        inventory_image = "default_tool_steelsword.png",
        tool_capabilities = {
-               full_punch_interval = 1.0,
+               full_punch_interval = 0.8,
                max_drop_level=1,
                groupcaps={
                        fleshy={times={[1]=2.00, [2]=0.80, [3]=0.40}, uses=10, maxlevel=2},
                        snappy={times={[2]=0.70, [3]=0.30}, uses=40, maxlevel=1},
-                       choppy={times={[3]=0.70}, uses=40, maxlevel=0}
+                       choppy={times={[3]=0.65}, uses=40, maxlevel=0}
                }
        }
 })
@@ -193,10 +213,17 @@ minetest.register_craft({
        }
 })
 
+minetest.register_craft({
+       output = 'default:junglewood 4',
+       recipe = {
+               {'default:jungletree'},
+       }
+})
+
 minetest.register_craft({
        output = 'default:stick 4',
        recipe = {
-               {'default:wood'},
+               {'group:wood'},
        }
 })
 
@@ -211,8 +238,8 @@ minetest.register_craft({
 minetest.register_craft({
        output = 'default:sign_wall',
        recipe = {
-               {'default:wood', 'default:wood', 'default:wood'},
-               {'default:wood', 'default:wood', 'default:wood'},
+               {'group:wood', 'group:wood', 'group:wood'},
+               {'group:wood', 'group:wood', 'group:wood'},
                {'', 'default:stick', ''},
        }
 })
@@ -228,7 +255,7 @@ minetest.register_craft({
 minetest.register_craft({
        output = 'default:pick_wood',
        recipe = {
-               {'default:wood', 'default:wood', 'default:wood'},
+               {'group:wood', 'group:wood', 'group:wood'},
                {'', 'default:stick', ''},
                {'', 'default:stick', ''},
        }
@@ -237,7 +264,7 @@ minetest.register_craft({
 minetest.register_craft({
        output = 'default:pick_stone',
        recipe = {
-               {'default:cobble', 'default:cobble', 'default:cobble'},
+               {'group:stone', 'group:stone', 'group:stone'},
                {'', 'default:stick', ''},
                {'', 'default:stick', ''},
        }
@@ -255,7 +282,7 @@ minetest.register_craft({
 minetest.register_craft({
        output = 'default:pick_mese',
        recipe = {
-               {'default:mese', 'default:mese', 'default:mese'},
+               {'default:mese_crystal', 'default:mese_crystal', 'default:mese_crystal'},
                {'', 'default:stick', ''},
                {'', 'default:stick', ''},
        }
@@ -264,7 +291,7 @@ minetest.register_craft({
 minetest.register_craft({
        output = 'default:shovel_wood',
        recipe = {
-               {'default:wood'},
+               {'group:wood'},
                {'default:stick'},
                {'default:stick'},
        }
@@ -273,7 +300,7 @@ minetest.register_craft({
 minetest.register_craft({
        output = 'default:shovel_stone',
        recipe = {
-               {'default:cobble'},
+               {'group:stone'},
                {'default:stick'},
                {'default:stick'},
        }
@@ -291,8 +318,8 @@ minetest.register_craft({
 minetest.register_craft({
        output = 'default:axe_wood',
        recipe = {
-               {'default:wood', 'default:wood'},
-               {'default:wood', 'default:stick'},
+               {'group:wood', 'group:wood'},
+               {'group:wood', 'default:stick'},
                {'', 'default:stick'},
        }
 })
@@ -300,8 +327,8 @@ minetest.register_craft({
 minetest.register_craft({
        output = 'default:axe_stone',
        recipe = {
-               {'default:cobble', 'default:cobble'},
-               {'default:cobble', 'default:stick'},
+               {'group:stone', 'group:stone'},
+               {'group:stone', 'default:stick'},
                {'', 'default:stick'},
        }
 })
@@ -318,8 +345,8 @@ minetest.register_craft({
 minetest.register_craft({
        output = 'default:sword_wood',
        recipe = {
-               {'default:wood'},
-               {'default:wood'},
+               {'group:wood'},
+               {'group:wood'},
                {'default:stick'},
        }
 })
@@ -327,8 +354,8 @@ minetest.register_craft({
 minetest.register_craft({
        output = 'default:sword_stone',
        recipe = {
-               {'default:cobble'},
-               {'default:cobble'},
+               {'group:stone'},
+               {'group:stone'},
                {'default:stick'},
        }
 })
@@ -354,27 +381,27 @@ minetest.register_craft({
 minetest.register_craft({
        output = 'default:chest',
        recipe = {
-               {'default:wood', 'default:wood', 'default:wood'},
-               {'default:wood', '', 'default:wood'},
-               {'default:wood', 'default:wood', 'default:wood'},
+               {'group:wood', 'group:wood', 'group:wood'},
+               {'group:wood', '', 'group:wood'},
+               {'group:wood', 'group:wood', 'group:wood'},
        }
 })
 
 minetest.register_craft({
        output = 'default:chest_locked',
        recipe = {
-               {'default:wood', 'default:wood', 'default:wood'},
-               {'default:wood', 'default:steel_ingot', 'default:wood'},
-               {'default:wood', 'default:wood', 'default:wood'},
+               {'group:wood', 'group:wood', 'group:wood'},
+               {'group:wood', 'default:steel_ingot', 'group:wood'},
+               {'group:wood', 'group:wood', 'group:wood'},
        }
 })
 
 minetest.register_craft({
        output = 'default:furnace',
        recipe = {
-               {'default:cobble', 'default:cobble', 'default:cobble'},
-               {'default:cobble', '', 'default:cobble'},
-               {'default:cobble', 'default:cobble', 'default:cobble'},
+               {'group:stone', 'group:stone', 'group:stone'},
+               {'group:stone', '', 'group:stone'},
+               {'group:stone', 'group:stone', 'group:stone'},
        }
 })
 
@@ -387,11 +414,25 @@ minetest.register_craft({
        }
 })
 
+minetest.register_craft({
+       output = 'default:steel_ingot 9',
+       recipe = {
+               {'default:steelblock'},
+       }
+})
+
 minetest.register_craft({
        output = 'default:sandstone',
        recipe = {
-               {'default:sand', 'default:sand'},
-               {'default:sand', 'default:sand'},
+               {'group:sand', 'group:sand'},
+               {'group:sand', 'group:sand'},
+       }
+})
+
+minetest.register_craft({
+       output = 'default:sand 4',
+       recipe = {
+               {'default:sandstone'},
        }
 })
 
@@ -411,6 +452,13 @@ minetest.register_craft({
        }
 })
 
+minetest.register_craft({
+       output = 'default:clay_brick 4',
+       recipe = {
+               {'default:brick'},
+       }
+})
+
 minetest.register_craft({
        output = 'default:paper',
        recipe = {
@@ -430,9 +478,9 @@ minetest.register_craft({
 minetest.register_craft({
        output = 'default:bookshelf',
        recipe = {
-               {'default:wood', 'default:wood', 'default:wood'},
+               {'group:wood', 'group:wood', 'group:wood'},
                {'default:book', 'default:book', 'default:book'},
-               {'default:wood', 'default:wood', 'default:wood'},
+               {'group:wood', 'group:wood', 'group:wood'},
        }
 })
 
@@ -445,6 +493,29 @@ minetest.register_craft({
        }
 })
 
+minetest.register_craft({
+       output = 'default:mese',
+       recipe = {
+               {'default:mese_crystal', 'default:mese_crystal', 'default:mese_crystal'},
+               {'default:mese_crystal', 'default:mese_crystal', 'default:mese_crystal'},
+               {'default:mese_crystal', 'default:mese_crystal', 'default:mese_crystal'},
+       }
+})
+
+minetest.register_craft({
+       output = 'default:mese_crystal 9',
+       recipe = {
+               {'default:mese'},
+       }
+})
+
+minetest.register_craft({
+       output = 'default:mese_crystal_fragment 9',
+       recipe = {
+               {'default:mese_crystal'},
+       }
+})
+
 --
 -- Crafting (tool repair)
 --
@@ -460,13 +531,7 @@ minetest.register_craft({
 minetest.register_craft({
        type = "cooking",
        output = "default:glass",
-       recipe = "default:sand",
-})
-
-minetest.register_craft({
-       type = "cooking",
-       output = "default:glass",
-       recipe = "default:desert_sand",
+       recipe = "group:sand",
 })
 
 minetest.register_craft({
@@ -493,13 +558,7 @@ minetest.register_craft({
 
 minetest.register_craft({
        type = "fuel",
-       recipe = "default:tree",
-       burntime = 30,
-})
-
-minetest.register_craft({
-       type = "fuel",
-       recipe = "default:jungletree",
+       recipe = "group:tree",
        burntime = 30,
 })
 
@@ -511,7 +570,7 @@ minetest.register_craft({
 
 minetest.register_craft({
        type = "fuel",
-       recipe = "default:leaves",
+       recipe = "group:leaves",
        burntime = 1,
 })
 
@@ -547,16 +606,10 @@ minetest.register_craft({
 
 minetest.register_craft({
        type = "fuel",
-       recipe = "default:wood",
+       recipe = "group:wood",
        burntime = 7,
 })
 
-minetest.register_craft({
-       type = "fuel",
-       recipe = "default:mese",
-       burntime = 30,
-})
-
 minetest.register_craft({
        type = "fuel",
        recipe = "default:lava_source",
@@ -617,6 +670,12 @@ minetest.register_craft({
        burntime = 40,
 })
 
+minetest.register_craft({
+       type = "fuel",
+       recipe = "default:junglesapling",
+       burntime = 10,
+})
+
 --
 -- Node definitions
 --
@@ -685,7 +744,7 @@ end
 function default.node_sound_glass_defaults(table)
        table = table or {}
        table.footstep = table.footstep or
-                       {name="default_stone_footstep", gain=0.25}
+                       {name="default_hard_footstep", gain=0.25}
        table.dug = table.dug or
                        {name="default_break_glass", gain=1.0}
        default.node_sound_defaults(table)
@@ -698,7 +757,7 @@ minetest.register_node("default:stone", {
        description = "Stone",
        tiles = {"default_stone.png"},
        is_ground_content = true,
-       groups = {cracky=3},
+       groups = {cracky=3, stone=1},
        drop = 'default:cobble',
        legacy_mineral = true,
        sounds = default.node_sound_stone_defaults(),
@@ -708,7 +767,7 @@ minetest.register_node("default:desert_stone", {
        description = "Desert Stone",
        tiles = {"default_desert_stone.png"},
        is_ground_content = true,
-       groups = {cracky=3},
+       groups = {cracky=3, stone=1},
        drop = 'default:desert_stone',
        legacy_mineral = true,
        sounds = default.node_sound_stone_defaults(),
@@ -732,6 +791,15 @@ minetest.register_node("default:stone_with_iron", {
        sounds = default.node_sound_stone_defaults(),
 })
 
+minetest.register_node("default:stone_with_mese", {
+       description = "Mese Crystals in Stone",
+       tiles = {"default_stone.png^default_mineral_mese.png"},
+       is_ground_content = true,
+       groups = {cracky=1},
+       drop = "default:mese_crystal",
+       sounds = default.node_sound_stone_defaults(),
+})
+
 minetest.register_node("default:dirt_with_grass", {
        description = "Dirt with Grass",
        tiles = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
@@ -766,7 +834,7 @@ minetest.register_node("default:sand", {
        description = "Sand",
        tiles = {"default_sand.png"},
        is_ground_content = true,
-       groups = {crumbly=3, falling_node=1},
+       groups = {crumbly=3, falling_node=1, sand=1},
        sounds = default.node_sound_sand_defaults(),
 })
 
@@ -774,7 +842,7 @@ minetest.register_node("default:desert_sand", {
        description = "Desert Sand",
        tiles = {"default_desert_sand.png"},
        is_ground_content = true,
-       groups = {sand=1, crumbly=3, falling_node=1},
+       groups = {crumbly=3, falling_node=1, sand=1},
        sounds = default.node_sound_sand_defaults(),
 })
 
@@ -793,7 +861,6 @@ minetest.register_node("default:sandstone", {
        tiles = {"default_sandstone.png"},
        is_ground_content = true,
        groups = {crumbly=2,cracky=2},
-       drop = 'default:sand',
        sounds = default.node_sound_stone_defaults(),
 })
 
@@ -813,7 +880,6 @@ minetest.register_node("default:brick", {
        tiles = {"default_brick.png"},
        is_ground_content = true,
        groups = {cracky=3},
-       drop = 'default:clay_brick 4',
        sounds = default.node_sound_stone_defaults(),
 })
 
@@ -833,6 +899,58 @@ minetest.register_node("default:jungletree", {
        sounds = default.node_sound_wood_defaults(),
 })
 
+minetest.register_node("default:junglewood", {
+       description = "Junglewood Planks",
+       tiles = {"default_junglewood.png"},
+       is_ground_content = true,
+       groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
+       sounds = default.node_sound_wood_defaults(),
+})
+
+minetest.register_node("default:jungleleaves", {
+       description = "Jungle Leaves",
+       drawtype = "allfaces_optional",
+       visual_scale = 1.3,
+       tiles = {"default_jungleleaves.png"},
+       paramtype = "light",
+       groups = {snappy=3, leafdecay=3, flammable=2, leaves=1},
+       drop = {
+               max_items = 1,
+               items = {
+                       {
+                               -- player will get sapling with 1/20 chance
+                               items = {'default:junglesapling'},
+                               rarity = 20,
+                       },
+                       {
+                               -- player will get leaves only if he get no saplings,
+                               -- this is because max_items is 1
+                               items = {'default:jungleleaves'},
+                       }
+               }
+       },
+       sounds = default.node_sound_leaves_defaults(),
+})
+
+minetest.register_node("default:junglesapling", {
+       description = "Jungle Sapling",
+       drawtype = "plantlike",
+       visual_scale = 1.0,
+       tiles = {"default_junglesapling.png"},
+       inventory_image = "default_junglesapling.png",
+       wield_image = "default_junglesapling.png",
+       paramtype = "light",
+       walkable = false,
+       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,attached_node=1},
+       sounds = default.node_sound_defaults(),
+})
+-- alias for tree growing abm in content_abm.cpp
+minetest.register_alias("junglesapling", "default:junglesapling")
+
 minetest.register_node("default:junglegrass", {
        description = "Jungle Grass",
        drawtype = "plantlike",
@@ -842,7 +960,7 @@ minetest.register_node("default:junglegrass", {
        wield_image = "default_junglegrass.png",
        paramtype = "light",
        walkable = false,
-       groups = {snappy=3,flammable=2},
+       groups = {snappy=3,flammable=2,attached_node=1},
        sounds = default.node_sound_leaves_defaults(),
 })
 
@@ -852,7 +970,7 @@ minetest.register_node("default:leaves", {
        visual_scale = 1.3,
        tiles = {"default_leaves.png"},
        paramtype = "light",
-       groups = {snappy=3, leafdecay=3, flammable=2},
+       groups = {snappy=3, leafdecay=3, flammable=2, leaves=1},
        drop = {
                max_items = 1,
                items = {
@@ -888,6 +1006,10 @@ minetest.register_node("default:papyrus", {
        paramtype = "light",
        is_ground_content = true,
        walkable = false,
+       selection_box = {
+               type = "fixed",
+               fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3}
+       },
        groups = {snappy=3,flammable=2},
        sounds = default.node_sound_leaves_defaults(),
 })
@@ -942,7 +1064,7 @@ 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,snappy=1,dig_immediate=2},
+       groups = {bendy=2,snappy=1,dig_immediate=2,attached_node=1},
 })
 
 minetest.register_node("default:ladder", {
@@ -971,18 +1093,10 @@ minetest.register_node("default:wood", {
        description = "Wooden Planks",
        tiles = {"default_wood.png"},
        is_ground_content = true,
-       groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3},
+       groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
        sounds = default.node_sound_wood_defaults(),
 })
 
-minetest.register_node("default:mese", {
-       description = "Mese",
-       tiles = {"default_mese.png"},
-       is_ground_content = true,
-       groups = {cracky=1},
-       sounds = default.node_sound_defaults(),
-})
-
 minetest.register_node("default:cloud", {
        description = "Cloud",
        tiles = {"default_cloud.png"},
@@ -997,8 +1111,16 @@ minetest.register_node("default:water_flowing", {
        drawtype = "flowingliquid",
        tiles = {"default_water.png"},
        special_tiles = {
-               {name="default_water.png", backface_culling=false},
-               {name="default_water.png", backface_culling=true},
+               {
+                       image="default_water_flowing_animated.png",
+                       backface_culling=false,
+                       animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=0.8}
+               },
+               {
+                       image="default_water_flowing_animated.png",
+                       backface_culling=true,
+                       animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=0.8}
+               },
        },
        alpha = WATER_ALPHA,
        paramtype = "light",
@@ -1006,6 +1128,7 @@ minetest.register_node("default:water_flowing", {
        pointable = false,
        diggable = false,
        buildable_to = true,
+       drop = "",
        liquidtype = "flowing",
        liquid_alternative_flowing = "default:water_flowing",
        liquid_alternative_source = "default:water_source",
@@ -1018,10 +1141,16 @@ minetest.register_node("default:water_source", {
        description = "Water Source",
        inventory_image = minetest.inventorycube("default_water.png"),
        drawtype = "liquid",
-       tiles = {"default_water.png"},
+       tiles = {
+               {name="default_water_source_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2.0}}
+       },
        special_tiles = {
                -- New-style water source material (mostly unused)
-               {name="default_water.png", backface_culling=false},
+               {
+                       name="default_water_source_animated.png",
+                       animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2.0},
+                       backface_culling = false,
+               }
        },
        alpha = WATER_ALPHA,
        paramtype = "light",
@@ -1029,6 +1158,7 @@ minetest.register_node("default:water_source", {
        pointable = false,
        diggable = false,
        buildable_to = true,
+       drop = "",
        liquidtype = "source",
        liquid_alternative_flowing = "default:water_flowing",
        liquid_alternative_source = "default:water_source",
@@ -1060,6 +1190,7 @@ minetest.register_node("default:lava_flowing", {
        pointable = false,
        diggable = false,
        buildable_to = true,
+       drop = "",
        liquidtype = "flowing",
        liquid_alternative_flowing = "default:lava_flowing",
        liquid_alternative_source = "default:lava_source",
@@ -1078,7 +1209,11 @@ minetest.register_node("default:lava_source", {
        },
        special_tiles = {
                -- New-style lava source material (mostly unused)
-               {name="default_lava.png", backface_culling=false},
+               {
+                       name="default_lava_source_animated.png",
+                       animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0},
+                       backface_culling = false,
+               }
        },
        paramtype = "light",
        light_source = LIGHT_MAX - 1,
@@ -1086,6 +1221,7 @@ minetest.register_node("default:lava_source", {
        pointable = false,
        diggable = false,
        buildable_to = true,
+       drop = "",
        liquidtype = "source",
        liquid_alternative_flowing = "default:lava_flowing",
        liquid_alternative_source = "default:lava_source",
@@ -1117,7 +1253,7 @@ minetest.register_node("default:torch", {
                wall_bottom = {-0.1, -0.5, -0.1, 0.1, -0.5+0.6, 0.1},
                wall_side = {-0.5, -0.3, -0.1, -0.5+0.3, 0.3, 0.1},
        },
-       groups = {choppy=2,dig_immediate=3,flammable=1},
+       groups = {choppy=2,dig_immediate=3,flammable=1,attached_node=1},
        legacy_wallmounted = true,
        sounds = default.node_sound_defaults(),
 })
@@ -1138,7 +1274,7 @@ minetest.register_node("default:sign_wall", {
                --wall_bottom = <default>
                --wall_side = <default>
        },
-       groups = {choppy=2,dig_immediate=2},
+       groups = {choppy=2,dig_immediate=2,attached_node=1},
        legacy_wallmounted = true,
        sounds = default.node_sound_defaults(),
        on_construct = function(pos)
@@ -1218,10 +1354,6 @@ minetest.register_node("default:chest_locked", {
        end,
        on_construct = function(pos)
                local meta = minetest.env:get_meta(pos)
-               meta:set_string("formspec",
-                               "size[8,9]"..
-                               "list[current_name;main;0,0;8,4;]"..
-                               "list[current_player;main;0,5;8,4;]")
                meta:set_string("infotext", "Locked Chest")
                meta:set_string("owner", "")
                local inv = meta:get_inventory()
@@ -1277,6 +1409,16 @@ minetest.register_node("default:chest_locked", {
                minetest.log("action", player:get_player_name()..
                                " takes stuff from locked chest at "..minetest.pos_to_string(pos))
        end,
+       on_rightclick = function(pos, node, clicker)
+               local meta = minetest.env:get_meta(pos)
+               if has_locked_chest_privilege(meta, clicker) then
+                       local pos = pos.x .. "," .. pos.y .. "," ..pos.z
+                       minetest.show_formspec(clicker:get_player_name(), "default:chest_locked",
+                               "size[8,9]"..
+                               "list[nodemeta:".. pos .. ";main;0,0;8,4;]"..
+                               "list[current_player;main;0,5;8,4;]")
+               end
+       end,
 })
 
 default.furnace_inactive_formspec =
@@ -1470,7 +1612,7 @@ minetest.register_node("default:cobble", {
        description = "Cobblestone",
        tiles = {"default_cobble.png"},
        is_ground_content = true,
-       groups = {cracky=3},
+       groups = {cracky=3, stone=2},
        sounds = default.node_sound_stone_defaults(),
 })
 
@@ -1490,11 +1632,19 @@ minetest.register_node("default:steelblock", {
        sounds = default.node_sound_stone_defaults(),
 })
 
+minetest.register_node("default:mese", {
+       description = "Mese Block",
+       tiles = {"default_mese_block.png"},
+       is_ground_content = true,
+       groups = {cracky=1},
+       sounds = default.node_sound_stone_defaults(),
+})
+minetest.register_alias("default:mese_block", "default:mese")
+
 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"},
-       inventory_image = "default_nc_front.png",
        paramtype2 = "facedir",
        groups = {cracky=2},
        legacy_facedir_simple = true,
@@ -1504,7 +1654,6 @@ minetest.register_node("default:nyancat", {
 minetest.register_node("default:nyancat_rainbow", {
        description = "Nyan Cat Rainbow",
        tiles = {"default_nc_rb.png"},
-       inventory_image = "default_nc_rb.png",
        groups = {cracky=2},
        sounds = default.node_sound_defaults(),
 })
@@ -1518,7 +1667,11 @@ minetest.register_node("default:sapling", {
        wield_image = "default_sapling.png",
        paramtype = "light",
        walkable = false,
-       groups = {snappy=2,dig_immediate=3,flammable=2},
+       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,attached_node=1},
        sounds = default.node_sound_defaults(),
 })
 
@@ -1531,6 +1684,10 @@ minetest.register_node("default:apple", {
        paramtype = "light",
        sunlight_propagates = true,
        walkable = false,
+       selection_box = {
+               type = "fixed",
+               fixed = {-0.2, -0.5, -0.2, 0.2, 0, 0.2}
+       },
        groups = {fleshy=3,dig_immediate=3,flammable=2},
        on_use = minetest.item_eat(4),
        sounds = default.node_sound_defaults(),
@@ -1545,7 +1702,7 @@ minetest.register_node("default:dry_shrub", {
        wield_image = "default_dry_shrub.png",
        paramtype = "light",
        walkable = false,
-       groups = {snappy=3,flammable=3},
+       groups = {snappy=3,flammable=3,attached_node=1},
        sounds = default.node_sound_leaves_defaults(),
        selection_box = {
                type = "fixed",
@@ -1582,6 +1739,11 @@ minetest.register_craftitem("default:iron_lump", {
        inventory_image = "default_iron_lump.png",
 })
 
+minetest.register_craftitem("default:mese_crystal", {
+       description = "Mese Crystal",
+       inventory_image = "default_mese_crystal.png",
+})
+
 minetest.register_craftitem("default:clay_lump", {
        description = "Clay Lump",
        inventory_image = "default_clay_lump.png",
@@ -1592,9 +1754,13 @@ minetest.register_craftitem("default:steel_ingot", {
        inventory_image = "default_steel_ingot.png",
 })
 
+minetest.register_craftitem("default:mese_crystal_fragment", {
+       description = "Mese Crystal Fragment",
+       inventory_image = "default_mese_crystal_fragment.png",
+})
+
 minetest.register_craftitem("default:clay_brick", {
        description = "Clay Brick",
-       inventory_image = "default_steel_ingot.png",
        inventory_image = "default_clay_brick.png",
 })
 
@@ -1643,4 +1809,32 @@ function on_punchnode(p, node)
 end
 minetest.register_on_punchnode(on_punchnode)
 
+--
+-- Lavacooling
+--
+
+default.cool_lava_source = function(pos)
+       minetest.env:set_node(pos, {name="default:stone"})
+end
+
+default.cool_lava_flowing = function(pos)
+       minetest.env:set_node(pos, {name="default:cobble"})
+end
+
+minetest.register_abm({
+       nodenames = {"default:lava_flowing"},
+       neighbors = {"group:water"},
+       interval = 1,
+       chance = 1,
+       action = default.cool_lava_flowing,
+})
+
+minetest.register_abm({
+       nodenames = {"default:lava_source"},
+       neighbors = {"group:water"},
+       interval = 1,
+       chance = 1,
+       action = default.cool_lava_source,
+})
+
 -- END