Junglegrass: Prevent seeding of dirt_with_grass
[oweals/minetest_game.git] / mods / default / nodes.lua
index a81f4ed79b9872c3cbec68ea2a04070586a2469f..c20a3a887061e2cc48ea9bf73e69d3fa0e4d2ffc 100644 (file)
@@ -30,6 +30,12 @@ default:desert_stone_block
 default:sandstone
 default:sandstonebrick
 default:sandstone_block
+default:desert_sandstone
+default:desert_sandstone_brick
+default:desert_sandstone_block
+default:silver_sandstone
+default:silver_sandstone_brick
+default:silver_sandstone_block
 
 default:obsidian
 default:obsidianbrick
@@ -44,6 +50,7 @@ default:dirt_with_grass
 default:dirt_with_grass_footsteps
 default:dirt_with_dry_grass
 default:dirt_with_snow
+default:dirt_with_rainforest_litter
 
 default:sand
 default:desert_sand
@@ -182,6 +189,7 @@ default:obsidian_glass
 default:brick
 
 default:meselamp
+default:mese_post_light
 
 Misc
 ----
@@ -273,7 +281,6 @@ minetest.register_node("default:desert_stone_block", {
        sounds = default.node_sound_stone_defaults(),
 })
 
-
 minetest.register_node("default:sandstone", {
        description = "Sandstone",
        tiles = {"default_sandstone.png"},
@@ -299,6 +306,55 @@ minetest.register_node("default:sandstone_block", {
        sounds = default.node_sound_stone_defaults(),
 })
 
+minetest.register_node("default:desert_sandstone", {
+       description = "Desert Sandstone",
+       tiles = {"default_desert_sandstone.png"},
+       groups = {crumbly = 1, cracky = 3},
+       sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:desert_sandstone_brick", {
+       description = "Desert Sandstone Brick",
+       paramtype2 = "facedir",
+       place_param2 = 0,
+       tiles = {"default_desert_sandstone_brick.png"},
+       is_ground_content = false,
+       groups = {cracky = 2},
+       sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:desert_sandstone_block", {
+       description = "Desert Sandstone Block",
+       tiles = {"default_desert_sandstone_block.png"},
+       is_ground_content = false,
+       groups = {cracky = 2},
+       sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:silver_sandstone", {
+       description = "Silver Sandstone",
+       tiles = {"default_silver_sandstone.png"},
+       groups = {crumbly = 1, cracky = 3},
+       sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:silver_sandstone_brick", {
+       description = "Silver Sandstone Brick",
+       paramtype2 = "facedir",
+       place_param2 = 0,
+       tiles = {"default_silver_sandstone_brick.png"},
+       is_ground_content = false,
+       groups = {cracky = 2},
+       sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:silver_sandstone_block", {
+       description = "Silver Sandstone Block",
+       tiles = {"default_silver_sandstone_block.png"},
+       is_ground_content = false,
+       groups = {cracky = 2},
+       sounds = default.node_sound_stone_defaults(),
+})
 
 minetest.register_node("default:obsidian", {
        description = "Obsidian",
@@ -378,13 +434,28 @@ 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, spreading_dirt_type = 1},
+       groups = {crumbly = 3, soil = 1, spreading_dirt_type = 1, snowy = 1},
        drop = 'default:dirt',
        sounds = default.node_sound_dirt_defaults({
                footstep = {name = "default_snow_footstep", gain = 0.15},
        }),
 })
 
+minetest.register_node("default:dirt_with_rainforest_litter", {
+       description = "Dirt with Rainforest Litter",
+       tiles = {
+               "default_rainforest_litter.png",
+               "default_dirt.png",
+               {name = "default_dirt.png^default_rainforest_litter_side.png",
+                       tileable_vertical = false}
+       },
+       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},
+       }),
+})
+
 minetest.register_node("default:sand", {
        description = "Sand",
        tiles = {"default_sand.png"},
@@ -445,7 +516,7 @@ minetest.register_node("default:snow", {
                        {-0.5, -0.5, -0.5, 0.5, -0.25, 0.5},
                },
        },
-       groups = {crumbly = 3, falling_node = 1, puts_out_fire = 1},
+       groups = {crumbly = 3, falling_node = 1, puts_out_fire = 1, snowy = 1},
        sounds = default.node_sound_dirt_defaults({
                footstep = {name = "default_snow_footstep", gain = 0.15},
                dug = {name = "default_snow_footstep", gain = 0.2},
@@ -463,7 +534,7 @@ minetest.register_node("default:snow", {
 minetest.register_node("default:snowblock", {
        description = "Snow Block",
        tiles = {"default_snow.png"},
-       groups = {crumbly = 3, puts_out_fire = 1, cools_lava = 1},
+       groups = {crumbly = 3, puts_out_fire = 1, cools_lava = 1, snowy = 1},
        sounds = default.node_sound_dirt_defaults({
                footstep = {name = "default_snow_footstep", gain = 0.15},
                dug = {name = "default_snow_footstep", gain = 0.2},
@@ -515,7 +586,6 @@ minetest.register_node("default:wood", {
 minetest.register_node("default:sapling", {
        description = "Sapling",
        drawtype = "plantlike",
-       visual_scale = 1.0,
        tiles = {"default_sapling.png"},
        inventory_image = "default_sapling.png",
        wield_image = "default_sapling.png",
@@ -581,7 +651,6 @@ minetest.register_node("default:leaves", {
 minetest.register_node("default:apple", {
        description = "Apple",
        drawtype = "plantlike",
-       visual_scale = 1.0,
        tiles = {"default_apple.png"},
        inventory_image = "default_apple.png",
        paramtype = "light",
@@ -651,7 +720,6 @@ minetest.register_node("default:jungleleaves", {
 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",
@@ -731,7 +799,6 @@ minetest.register_node("default:pine_needles",{
 minetest.register_node("default:pine_sapling", {
        description = "Pine Sapling",
        drawtype = "plantlike",
-       visual_scale = 1.0,
        tiles = {"default_pine_sapling.png"},
        inventory_image = "default_pine_sapling.png",
        wield_image = "default_pine_sapling.png",
@@ -812,7 +879,6 @@ minetest.register_node("default:acacia_leaves", {
 minetest.register_node("default:acacia_sapling", {
        description = "Acacia Tree Sapling",
        drawtype = "plantlike",
-       visual_scale = 1.0,
        tiles = {"default_acacia_sapling.png"},
        inventory_image = "default_acacia_sapling.png",
        wield_image = "default_acacia_sapling.png",
@@ -891,7 +957,6 @@ minetest.register_node("default:aspen_leaves", {
 minetest.register_node("default:aspen_sapling", {
        description = "Aspen Tree Sapling",
        drawtype = "plantlike",
-       visual_scale = 1.0,
        tiles = {"default_aspen_sapling.png"},
        inventory_image = "default_aspen_sapling.png",
        wield_image = "default_aspen_sapling.png",
@@ -1048,7 +1113,7 @@ 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},
+       groups = {choppy = 3},
        sounds = default.node_sound_wood_defaults(),
        on_place = minetest.rotate_node,
 })
@@ -1078,7 +1143,6 @@ minetest.register_node("default:dry_shrub", {
        description = "Dry Shrub",
        drawtype = "plantlike",
        waving = 1,
-       visual_scale = 1.0,
        tiles = {"default_dry_shrub.png"},
        inventory_image = "default_dry_shrub.png",
        wield_image = "default_dry_shrub.png",
@@ -1098,7 +1162,7 @@ minetest.register_node("default:junglegrass", {
        description = "Jungle Grass",
        drawtype = "plantlike",
        waving = 1,
-       visual_scale = 1.3,
+       visual_scale = 1.69,
        tiles = {"default_junglegrass.png"},
        inventory_image = "default_junglegrass.png",
        wield_image = "default_junglegrass.png",
@@ -1106,7 +1170,7 @@ minetest.register_node("default:junglegrass", {
        sunlight_propagates = true,
        walkable = false,
        buildable_to = true,
-       groups = {snappy = 3, flora = 1, attached_node = 1, grass = 1, flammable = 1},
+       groups = {snappy = 3, flora = 1, attached_node = 1, flammable = 1},
        sounds = default.node_sound_leaves_defaults(),
        selection_box = {
                type = "fixed",
@@ -1222,7 +1286,7 @@ end
 minetest.register_node("default:bush_stem", {
        description = "Bush Stem",
        drawtype = "plantlike",
-       visual_scale = 1.18,
+       visual_scale = 1.41,
        tiles = {"default_bush_stem.png"},
        inventory_image = "default_bush_stem.png",
        wield_image = "default_bush_stem.png",
@@ -1244,12 +1308,14 @@ minetest.register_node("default:bush_leaves", {
        paramtype = "light",
        groups = {snappy = 3, flammable = 2, leaves = 1},
        sounds = default.node_sound_leaves_defaults(),
+
+       after_place_node = default.after_place_leaves,
 })
 
 minetest.register_node("default:acacia_bush_stem", {
        description = "Acacia Bush Stem",
        drawtype = "plantlike",
-       visual_scale = 1.18,
+       visual_scale = 1.41,
        tiles = {"default_acacia_bush_stem.png"},
        inventory_image = "default_acacia_bush_stem.png",
        wield_image = "default_acacia_bush_stem.png",
@@ -1271,6 +1337,8 @@ minetest.register_node("default:acacia_bush_leaves", {
        paramtype = "light",
        groups = {snappy = 3, flammable = 2, leaves = 1},
        sounds = default.node_sound_leaves_defaults(),
+
+       after_place_node = default.after_place_leaves,
 })
 
 
@@ -1618,34 +1686,6 @@ local function get_locked_chest_formspec(pos)
  return formspec
 end
 
-local function has_locked_chest_privilege(meta, player)
-       if player then
-               if minetest.check_player_privs(player, "protection_bypass") then
-                       return true
-               end
-       else
-               return false
-       end
-
-       -- is player wielding the right key?
-       local item = player:get_wielded_item()
-       if item:get_name() == "default:key" then
-               local key_meta = minetest.parse_json(item:get_metadata())
-               local secret = meta:get_string("key_lock_secret")
-               if secret ~= key_meta.secret then
-                       return false
-               end
-
-               return true
-       end
-
-       if player:get_player_name() ~= meta:get_string("owner") then
-               return false
-       end
-
-       return true
-end
-
 minetest.register_node("default:chest", {
        description = "Chest",
        tiles = {"default_chest_top.png", "default_chest_top.png", "default_chest_side.png",
@@ -1716,26 +1756,23 @@ minetest.register_node("default:chest_locked", {
        can_dig = function(pos,player)
                local meta = minetest.get_meta(pos);
                local inv = meta:get_inventory()
-               return inv:is_empty("main") and has_locked_chest_privilege(meta, player)
+               return inv:is_empty("main") and default.can_interact_with_node(player, pos)
        end,
        allow_metadata_inventory_move = function(pos, from_list, from_index,
                        to_list, to_index, count, player)
-               local meta = minetest.get_meta(pos)
-               if not has_locked_chest_privilege(meta, player) then
+               if not default.can_interact_with_node(player, pos) then
                        return 0
                end
                return count
        end,
     allow_metadata_inventory_put = function(pos, listname, index, stack, player)
-               local meta = minetest.get_meta(pos)
-               if not has_locked_chest_privilege(meta, player) then
+               if not default.can_interact_with_node(player, pos) then
                        return 0
                end
                return stack:get_count()
        end,
     allow_metadata_inventory_take = function(pos, listname, index, stack, player)
-               local meta = minetest.get_meta(pos)
-               if not has_locked_chest_privilege(meta, player) then
+               if not default.can_interact_with_node(player, pos) then
                        return 0
                end
                return stack:get_count()
@@ -1751,8 +1788,7 @@ minetest.register_node("default:chest_locked", {
                        " from locked chest at " .. minetest.pos_to_string(pos))
        end,
        on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
-               local meta = minetest.get_meta(pos)
-               if has_locked_chest_privilege(meta, clicker) then
+               if default.can_interact_with_node(clicker, pos) then
                        minetest.show_formspec(
                                clicker:get_player_name(),
                                "default:chest_locked",
@@ -1765,9 +1801,14 @@ minetest.register_node("default:chest_locked", {
        on_key_use = function(pos, player)
                local secret = minetest.get_meta(pos):get_string("key_lock_secret")
                local itemstack = player:get_wielded_item()
-               local key_meta = minetest.parse_json(itemstack:get_metadata())
+               local key_meta = itemstack:get_meta()
+
+               if key_meta:get_string("secret") == "" then
+                       key_meta:set_string("secret", minetest.parse_json(itemstack:get_metadata()).secret)
+                       itemstack:set_metadata("")
+               end
 
-               if secret ~= key_meta.secret then
+               if secret ~= key_meta:get_string("secret") then
                        return
                end
 
@@ -2078,6 +2119,27 @@ minetest.register_node("default:meselamp", {
        light_source = default.LIGHT_MAX,
 })
 
+minetest.register_node("default:mese_post_light", {
+       description = "Mese Post Light",
+       tiles = {"default_mese_post_light_top.png", "default_mese_post_light_top.png",
+               "default_mese_post_light_side_dark.png", "default_mese_post_light_side_dark.png",
+               "default_mese_post_light_side.png", "default_mese_post_light_side.png"},
+       wield_image = "default_mese_post_light_side.png",
+       drawtype = "nodebox",
+       node_box = {
+               type = "fixed",
+               fixed = {
+                       {-2 / 16, -8 / 16, -2 / 16, 2 / 16, 8 / 16, 2 / 16},
+               },
+       },
+       paramtype = "light",
+       light_source = default.LIGHT_MAX,
+       sunlight_propagates = true,
+       is_ground_content = false,
+       groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
+       sounds = default.node_sound_wood_defaults(),
+})
+
 --
 -- Misc
 --
@@ -2089,3 +2151,69 @@ minetest.register_node("default:cloud", {
        sounds = default.node_sound_defaults(),
        groups = {not_in_creative_inventory = 1},
 })
+
+--
+-- register trees for leafdecay
+--
+
+if minetest.get_mapgen_setting("mg_name") == "v6" then
+       default.register_leafdecay({
+               trunks = {"default:tree"},
+               leaves = {"default:apple", "default:leaves"},
+               radius = 2,
+       })
+
+       default.register_leafdecay({
+               trunks = {"default:jungletree"},
+               leaves = {"default:jungleleaves"},
+               radius = 3,
+       })
+
+       default.register_leafdecay({
+               trunks = {"default:pine_tree"},
+               leaves = {"default:pine_needles"},
+               radius = 3,
+       })
+else
+       default.register_leafdecay({
+               trunks = {"default:tree"},
+               leaves = {"default:apple", "default:leaves"},
+               radius = 3,
+       })
+
+       default.register_leafdecay({
+               trunks = {"default:jungletree"},
+               leaves = {"default:jungleleaves"},
+               radius = 2,
+       })
+
+       default.register_leafdecay({
+               trunks = {"default:pine_tree"},
+               leaves = {"default:pine_needles"},
+               radius = 2,
+       })
+end
+
+default.register_leafdecay({
+       trunks = {"default:acacia_tree"},
+       leaves = {"default:acacia_leaves"},
+       radius = 2,
+})
+
+default.register_leafdecay({
+       trunks = {"default:aspen_tree"},
+       leaves = {"default:aspen_leaves"},
+       radius = 2,
+})
+
+default.register_leafdecay({
+       trunks = {"default:bush_stem"},
+       leaves = {"default:bush_leaves"},
+       radius = 1,
+})
+
+default.register_leafdecay({
+       trunks = {"default:acacia_bush_stem"},
+       leaves = {"default:acacia_bush_leaves"},
+       radius = 1,
+})