Sokomine/trees_lib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

corrected parameter list for tree_abm_called; select_how_to_grow can now return a number instead of a table; the ground found is passed on as a parameter to all subsequent growth functions

Browse Source
This commit is contained in:
Sokomine 2015-10-13 17:36:35 +02:00
parent 6ab2a64665
commit e09fa0e964
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
init.lua
View File

@ -302,7 +302,7 @@ end
-- called by the abm running on the saplings; -- called by the abm running on the saplings;
-- if force is set, the tree will grow even if it usually wouldn't in that -- if force is set, the tree will grow even if it usually wouldn't in that
-- environment -- environment
trees_lib.tree_abm_called = function( pos, node, force_grow ) trees_lib.tree_abm_called = function( pos, node, active_object_count, active_object_count_wider, force_grow)
-- if we don't have further information about that sapling, then abort -- if we don't have further information about that sapling, then abort
if( not( node ) if( not( node )
or not( node.name ) or not( node.name )
@ -316,6 +316,8 @@ trees_lib.tree_abm_called = function( pos, node, force_grow )
-- get information about what we're supposed to do with that sapling -- get information about what we're supposed to do with that sapling
local sapling_data = trees_lib.is_sapling[ node.name ]; local sapling_data = trees_lib.is_sapling[ node.name ];
-- the type of ground might be of intrest for further functions (i.e. can_grow, select_how_to_grow)
local ground_found = nil;
-- a quick check of the ground; sapling_data.grows_on has to be a list of all -- a quick check of the ground; sapling_data.grows_on has to be a list of all
-- ground types acceptable for the tree -- ground types acceptable for the tree
if( not(force_grow) and sapling_data.grows_on and type( sapling_data.grows_on )=="table") then if( not(force_grow) and sapling_data.grows_on and type( sapling_data.grows_on )=="table") then
@ -324,19 +326,18 @@ trees_lib.tree_abm_called = function( pos, node, force_grow )
if( not(node_under) or node_under.name=="ignore") then if( not(node_under) or node_under.name=="ignore") then
return; return;
end end
local found = false;
-- search all acceptable ground names -- search all acceptable ground names
for _,g in ipairs( sapling_data.grows_on ) do for _,g in ipairs( sapling_data.grows_on ) do
if( g==node_under.name ) then if( g==node_under.name ) then
found = g; ground_found = g;
elseif( not( found) elseif( not( ground_found)
and string.sub(g,1,6)=="group:" and string.sub(g,1,6)=="group:"
and minetest.get_item_group( node_under.name, string.sub(g,7))~=0 ) then and minetest.get_item_group( node_under.name, string.sub(g,7))~=0 ) then
found = g; ground_found = g;
end end
end end
-- abort if the tree does not like this type of ground -- abort if the tree does not like this type of ground
if( not( found )) then if( not( ground_found )) then
-- trun into dry shrub -- trun into dry shrub
trees_lib.failed_to_grow( pos, node ); trees_lib.failed_to_grow( pos, node );
return; return;
@ -345,9 +346,10 @@ trees_lib.tree_abm_called = function( pos, node, force_grow )
-- the tree may come with a more complex function that checks if it can grow there -- the tree may come with a more complex function that checks if it can grow there
if( not(force_grow) and sapling_data.can_grow and type( sapling_data.can_grow)=="function" ) then if( not(force_grow) and sapling_data.can_grow and type( sapling_data.can_grow)=="function" ) then
if( not( sapling_data.can_grow( pos, node ))) then -- the parameter ground_found is nil if the tree did not specify any demands for a particular ground
if( not( sapling_data.can_grow( pos, node, ground_found ))) then
-- trun into dry shrub -- trun into dry shrub
trees_lib.failed_to_grow( pos, node ); trees_lib.failed_to_grow( pos, node, ground_found );
return; return;
end end
end end
@ -357,7 +359,13 @@ trees_lib.tree_abm_called = function( pos, node, force_grow )
-- the sapling may - depending on the circumstances - choose a specific growth function -- the sapling may - depending on the circumstances - choose a specific growth function
-- instead of a random one -- instead of a random one
if( sapling_data.select_how_to_grow and type( sapling_data.select_how_to_grow)=="function") then if( sapling_data.select_how_to_grow and type( sapling_data.select_how_to_grow)=="function") then
how_to_grow = sapling_data.select_how_to_grow( pos, node, sapling_data.how_to_grow ); -- ground_found is nil if the tree did not specify any demands for a particular ground
how_to_grow = sapling_data.select_how_to_grow( pos, node, sapling_data.how_to_grow, ground_found );
-- the select_how_to_grow function may either return a table or a number indicating which
-- growth method to select
if( how_to_grow and type(how_to_grow)=="number" and sapling_data.how_to_grow[ how_to_grow ]) then
how_to_grow = sapling_data.how_to_grow[ how_to_grow ];
end
else -- else select a random one else -- else select a random one
how_to_grow = sapling_data.how_to_grow[ math.random( 1, #sapling_data.how_to_grow )]; how_to_grow = sapling_data.how_to_grow[ math.random( 1, #sapling_data.how_to_grow )];
end end
@ -453,12 +461,15 @@ trees_lib.register_tree = function( tree_name, mod_prefix, nodes, growing_method
nodes = nodes, nodes = nodes,
-- list of node names (can contain groups, i.e. "group:soil") -- list of node names (can contain groups, i.e. "group:soil")
-- on which the sapling will grow -- on which the sapling will grow;
-- note: the parameter ground_found to the functions below can only be
-- passed on if grows_on has been specified (else the sapling does
-- not do any ground checks on its own)
grows_on = grows_on_node_type_list, grows_on = grows_on_node_type_list,
-- are all the requirements met for growing at pos? -- are all the requirements met for growing at pos?
-- sapling will only grow if -- sapling will only grow if
-- growing.can_grow( pos, node ) -- growing.can_grow( pos, node, ground_found )
-- returns true -- returns true
-- (usful for i.e. requiring water nearby, or other -- (usful for i.e. requiring water nearby, or other
-- more complex requirements) -- more complex requirements)
@ -467,7 +478,7 @@ trees_lib.register_tree = function( tree_name, mod_prefix, nodes, growing_method
-- has to be either nil (for selecting a random way) -- has to be either nil (for selecting a random way)
-- or return a specific growth function like the ones in -- or return a specific growth function like the ones in
-- the list how_to_grow (see below) when called with -- the list how_to_grow (see below) when called with
-- growing.select_how_to_grow( pos, node, growing.how_to_grow ) -- growing.select_how_to_grow( pos, node, growing.how_to_grow, ground_found )
select_how_to_grow = select_how_to_grow_function, select_how_to_grow = select_how_to_grow_function,
-- list of all methods that can turn the sapling into a -- list of all methods that can turn the sapling into a
@ -680,8 +691,8 @@ trees_lib.register_tree( "silly", "trees_lib",
} }
}, },
}, },
-- no grows_on_node_type_list - the tree grows everywhere -- grows_on_node_type_list - the tree only grows on nodes of this type
nil, {"default:cobble", "group:soil"},
-- no limits as to where the tree can grow (no can_grow_function) -- no limits as to where the tree can grow (no can_grow_function)
nil, nil,
-- no select_how_to_grow_function - the tree uses the same method everywhere -- no select_how_to_grow_function - the tree uses the same method everywhere