Merge recent changes to bas080's branch

This commit is contained in:
FaceDeer 2017-01-29 11:13:17 -07:00
parent 0483566b72
commit dbce703209
2 changed files with 6 additions and 7 deletions

@ -32,7 +32,7 @@ vines.register_vine = function( name, defs, biome )
sunlight_propagates = true, sunlight_propagates = true,
paramtype = "light", paramtype = "light",
paramtype2 = "wallmounted", paramtype2 = "wallmounted",
buildable_to = true, buildable_to = false,
tiles = { vine_image_end }, tiles = { vine_image_end },
drawtype = drawtype, drawtype = drawtype,
inventory_image = vine_image_end, inventory_image = vine_image_end,
@ -61,7 +61,6 @@ vines.register_vine = function( name, defs, biome )
end end
}) })
minetest.register_node( vine_name_middle, { minetest.register_node( vine_name_middle, {
description = "Matured "..defs.description, description = "Matured "..defs.description,
walkable = false, walkable = false,
@ -70,7 +69,7 @@ vines.register_vine = function( name, defs, biome )
sunlight_propagates = true, sunlight_propagates = true,
paramtype = "light", paramtype = "light",
paramtype2 = "wallmounted", paramtype2 = "wallmounted",
buildable_to = true, buildable_to = false,
tiles = { vine_image_middle }, tiles = { vine_image_middle },
wield_image = vine_image_middle, wield_image = vine_image_middle,
drawtype = drawtype, drawtype = drawtype,
@ -83,7 +82,7 @@ vines.register_vine = function( name, defs, biome )
local bottom = {x=pos.x, y=pos.y-1, z=pos.z} local bottom = {x=pos.x, y=pos.y-1, z=pos.z}
local bottom_node = minetest.get_node( bottom ) local bottom_node = minetest.get_node( bottom )
if minetest.get_item_group( bottom_node.name, "vines") then if minetest.get_item_group( bottom_node.name, "vines") then
minetest.remove_node( bottom ) minetest.after( 0, minetest.remove_node, bottom )
end end
end, end,
after_dig_node = function( pos, node, oldmetadata, user ) after_dig_node = function( pos, node, oldmetadata, user )
@ -94,7 +93,7 @@ vines.register_vine = function( name, defs, biome )
biome_lib:spawn_on_surfaces( biome ) biome_lib:spawn_on_surfaces( biome )
local override_nodes = function( nodes, defs ) local override_nodes = function( nodes, defs )
local function override( index, registered ) local function override( index, registered )
local node = nodes[ index ] local node = nodes[ index ]
if index > #nodes then return registered end if index > #nodes then return registered end
if minetest.registered_nodes[node] then if minetest.registered_nodes[node] then

@ -10,8 +10,8 @@ minetest.register_tool("vines:shears", {
full_punch_interval = 1.0, full_punch_interval = 1.0,
max_drop_level=0, max_drop_level=0,
groupcaps={ groupcaps={
snappy={times={[3]=0.2}, uses=1/0.05, maxlevel=3}, snappy={times={[3]=0.2}, uses=60, maxlevel=3},
wool={times={[3]=0.2}, uses=1/0.05, maxlevel=3} wool={times={[3]=0.2}, uses=60, maxlevel=3}
} }
}, },