PowerOlive/mobf_core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix invalid use of on_mapgen functions in deep_large_caves spawner

Browse Source
This commit is contained in:
sapier 2013-08-19 23:32:30 +02:00
parent 59fadf8905
commit 645f64f871
1 changed files with 59 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
mobf/spawn_algorithms/deep_large_caves.lua
View File

@ -208,67 +208,69 @@ function mobf_spawn_in_deep_large_caves_entity(mob_name,mob_transform,spawning_d
self.spawner_last_result = "dlc: mob around" self.spawner_last_result = "dlc: mob around"
end end
end) end)
--add mob spawner on map generation local spawnfunc = function(name,pos,min_y,max_y,spawning_data)
minetest.register_on_generated(function(minp, maxp, seed) if max_y > spawning_data.min_depth then
local spawnfunc = function(name,pos,min_y,max_y,spawning_data)
if max_y > spawning_data.min_depth then
return false
end
dbg_mobf.spawning_lvl3("MOBF: trying to create a spawner for " .. name .. " at " ..printpos(pos))
local surface = mobf_get_surface(pos.x,pos.z,min_y,max_y)
if surface then
pos.y= surface -1
local node = minetest.get_node(pos)
if not mobf_contains({ "default:stone","default:gravel","default:dirt","default:sand" },node.name) then
dbg_mobf.spawning_lvl3("MOBF: node ain't of correct type: " .. node.name)
return false
end
local pos_above = {x=pos.x,y=pos.y+1,z=pos.z}
local node_above = minetest.get_node(pos_above)
if not mobf_contains({"air"},node_above.name) then
dbg_mobf.spawning_lvl3("MOBF: node above ain't air but: " .. node_above.name)
return false
end
spawning.spawn_and_check(name,"_spawner",pos_above,"deep_large_caves_spawner")
return true
else
dbg_mobf.spawning_lvl3("MOBF: didn't find surface for " .. name .. " spawner at " ..printpos(pos))
end
return false return false
end end
if minetest.world_setting_get("mobf_delayed_spawning") then dbg_mobf.spawning_lvl3("MOBF: trying to create a spawner for " .. name .. " at " ..printpos(pos))
minetest.register_on_generated(function(minp, maxp, seed) local surface = mobf_get_surface(pos.x,pos.z,min_y,max_y)
local job = { if surface then
pos.y= surface -1
callback = spawning.divide_mapgen_entity_jobfunc,
data = { local node = minetest.get_node(pos)
minp = minp,
maxp = maxp, if not mobf_contains({ "default:stone","default:gravel","default:dirt","default:sand" },node.name) then
spawning_data = spawning_data, dbg_mobf.spawning_lvl3("MOBF: node ain't of correct type: " .. node.name)
mob_name = mob_name, return false
spawnfunc = spawnfunc, end
maxtries = 30,
spawned = 0, local pos_above = {x=pos.x,y=pos.y+1,z=pos.z}
func = spawning.divide_mapgen_entity_jobfunc local node_above = minetest.get_node(pos_above)
} if not mobf_contains({"air"},node_above.name) then
} dbg_mobf.spawning_lvl3("MOBF: node above ain't air but: " .. node_above.name)
mobf_job_queue.add_job(job) return false
end) end
else
spawning.divide_mapgen_entity(minp,maxp,spawning_data,mob_name,spawnfunc) spawning.spawn_and_check(name,"_spawner",pos_above,"deep_large_caves_spawner")
return true
else
dbg_mobf.spawning_lvl3("MOBF: didn't find surface for " .. name .. " spawner at " ..printpos(pos))
end
return false
end end
end) --register mapgen
if minetest.world_setting_get("mobf_delayed_spawning") then
minetest.register_on_generated(function(minp, maxp, seed)
local job = {
callback = spawning.divide_mapgen_entity_jobfunc,
data = {
minp = minp,
maxp = maxp,
spawning_data = spawning_data,
mob_name = mob_name,
spawnfunc = spawnfunc,
maxtries = 30,
spawned = 0,
func = spawning.divide_mapgen_entity_jobfunc
}
}
mobf_job_queue.add_job(job)
end)
else
--add mob spawner on map generation
minetest.register_on_generated(function(minp, maxp, seed)
local starttime = mobf_get_time_ms()
spawning.divide_mapgen_entity(minp,maxp,spawning_data,mob_name,spawnfunc)
mobf_warn_long_fct(starttime,"on_mapgen " .. mob_name,"mapgen")
end) --register mapgen
end
end end
--!@} --!@}