nalc/plantlife_modpack
1
0
Fork 0
forked from mtcontrib/plantlife_modpack
Code Issues Pull Requests Releases Wiki Activity

Dont use dump() hack

Browse Source
This commit is contained in:
PilzAdam 2013-06-16 13:34:35 +00:00 committed by Vanessa Ezekowitz
parent ac45e91879
commit bd1300409d
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plants_lib/init.lua
View File

@ -36,7 +36,9 @@ plantslib.perlin_humidity = PerlinNoise(humidity_seeddiff, humidity_octaves, hum
-- Local functions -- Local functions
math.randomseed(os.time()) local function dump_pos(pos)
return "{x="..pos.x..",y="..pos.y..",z="..pos.z.."}"
end
function plantslib:is_node_loaded(node_pos) function plantslib:is_node_loaded(node_pos)
n = minetest.env:get_node_or_nil(node_pos) n = minetest.env:get_node_or_nil(node_pos)
@ -169,9 +171,9 @@ function plantslib:search_for_surfaces(minp, maxp, biomedef, node_or_function_or
elseif type(node_or_function_or_model) == "string" then elseif type(node_or_function_or_model) == "string" then
if not minetest.registered_nodes[node_or_function_or_model] then if not minetest.registered_nodes[node_or_function_or_model] then
plantslib:dbg("Call function: "..node_or_function_or_model.."("..dump(pos)..")") plantslib:dbg("Call function: "..node_or_function_or_model.."("..dump_pos(pos)..")")
local t2=os.clock() local t2=os.clock()
assert(loadstring(node_or_function_or_model.."("..dump(pos)..")"))() assert(loadstring(node_or_function_or_model.."("..dump_pos(pos)..")"))()
plantslib:dbg("Executed that function in ".. (os.clock()-t2)*1000 .."ms") plantslib:dbg("Executed that function in ".. (os.clock()-t2)*1000 .."ms")
else else
plantslib:dbg("Add node: "..node_or_function_or_model.." at ("..dump(p_top)..")") plantslib:dbg("Add node: "..node_or_function_or_model.." at ("..dump(p_top)..")")
@ -264,8 +266,8 @@ function plantslib:spawn_on_surfaces(sd,sp,sr,sc,ss,sa)
plantslib:dbg("Gave it a random facedir: "..fdir) plantslib:dbg("Gave it a random facedir: "..fdir)
end end
if type(spawn_plants) == "string" then if type(spawn_plants) == "string" then
plantslib:dbg("Call function: "..spawn_plants.."("..dump(pos)..")") plantslib:dbg("Call function: "..spawn_plants.."("..dump_pos(pos)..")")
assert(loadstring(spawn_plants.."("..dump(pos)..")"))() assert(loadstring(spawn_plants.."("..dump_pos(pos)..")"))()
elseif not biome.spawn_on_side and not biome.spawn_on_bottom and not biome.spawn_replace_node then elseif not biome.spawn_on_side and not biome.spawn_on_bottom and not biome.spawn_replace_node then
if n_top.name == "air" then if n_top.name == "air" then
plantslib:dbg("Spawn: "..plant_to_spawn.." on top of ("..dump(pos).."); facedir="..fdir) plantslib:dbg("Spawn: "..plant_to_spawn.." on top of ("..dump(pos).."); facedir="..fdir)
@ -365,8 +367,8 @@ function plantslib:replace_object(pos, replacement, grow_function, walldir, seed
local perlin1 = minetest.env:get_perlin(seeddiff, perlin_octaves, perlin_persistence, perlin_scale) local perlin1 = minetest.env:get_perlin(seeddiff, perlin_octaves, perlin_persistence, perlin_scale)
local noise1 = perlin1:get2d({x=pos.x, y=pos.z}) local noise1 = perlin1:get2d({x=pos.x, y=pos.z})
local noise2 = plantslib.perlin_temperature:get2d({x=pos.x, y=pos.z}) local noise2 = plantslib.perlin_temperature:get2d({x=pos.x, y=pos.z})
plantslib:dbg("Grow: call function "..grow_function.."("..dump(pos)..","..noise1..","..noise2..","..dump(walldir)..")") plantslib:dbg("Grow: call function "..grow_function.."("..dump_pos(pos)..","..noise1..","..noise2..","..dump(walldir)..")")
assert(loadstring(grow_function.."("..dump(pos)..","..noise1..","..noise2..","..dump(walldir)..")"))() assert(loadstring(grow_function.."("..dump_pos(pos)..","..noise1..","..noise2..","..dump(walldir)..")"))()
return return
elseif growtype == "nil" then elseif growtype == "nil" then
plantslib:dbg("Grow: place "..replacement.." at ("..dump(pos)..") on wall "..dump(walldir)) plantslib:dbg("Grow: place "..replacement.." at ("..dump(pos)..") on wall "..dump(walldir))