Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2024-11-24 03:21:05 +01:00
Code Issues Projects Releases Packages Wiki Activity

Change main spawning look to use adaptive delay based on last run with maximum period of 2.5 seconds, put some logging behind a flag, remove unused constants

Browse source
This commit is contained in:
teknomunk 2024-07-07 19:57:13 -05:00
parent 6581757b88
commit e34862d100
1 changed files with 28 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
mods/ENTITIES/mcl_mobs/spawning.lua
View file

@ -52,9 +52,8 @@ local dbg_spawn_counts = {}
local remove_far = true
local WAIT_FOR_SPAWN_ATTEMPT = 0.25
local MAX_SPAWN_CYCLE_TIME = 2.5
local FIND_SPAWN_POS_RETRIES = 1
local FIND_SPAWN_POS_RETRIES_SUCCESS_RESPIN = 8
local MOB_SPAWN_ZONE_INNER = 24
local MOB_SPAWN_ZONE_INNER_SQ = MOB_SPAWN_ZONE_INNER^2 -- squared
@ -1019,7 +1018,7 @@ if mobs_spawn then
local spawning_position = find_spawning_position(pos, FIND_SPAWN_POS_RETRIES)
if not spawning_position then
fail_count = fail_count + 1
if fail_count > 16 then
if logging and fail_count > 16 then
minetest.log("action", "[Mobs spawn] Cannot find a valid spawn position in last 16 attemtps")
end
return
@ -1095,15 +1094,7 @@ if mobs_spawn then
return mcl_mobs.spawn(spawning_position, mob_def.name)
end
--MAIN LOOP
local timer = 0
minetest.register_globalstep(function(dtime)
timer = timer + dtime
if timer < WAIT_FOR_SPAWN_ATTEMPT then return end
timer = 0
local start_time_us = minetest.get_us_time()
local function attempt_spawn()
local players = get_connected_players()
local total_mobs, total_non_hostile, total_hostile = count_mobs_total_cap()
@ -1114,10 +1105,6 @@ if mobs_spawn then
if total_mobs > mob_cap.total or total_mobs > #players * mob_cap.player then
minetest.log("action","[mcl_mobs] global mob cap reached. no cycle spawning.")
local took = (minetest.get_us_time() - start_time_us)
if took > debug_time_threshold then
minetest.log("action","[mcl_mobs] took "..took.." us")
end
return
end --mob cap per player
@ -1129,10 +1116,34 @@ if mobs_spawn then
spawn_a_mob(pos, cap_space_hostile, cap_space_non_hostile)
end
end
end
local function fixed_timeslice(timer, dtime, timeslice_us, handler)
timer = timer - dtime
if timer > 0 then return timer, 0 end
-- Time the function
local start_time_us = minetest.get_us_time()
handler()
local stop_time_us = minetest.get_us_time()
-- Measure how long this took and calculate the time until the next call
local took = stop_time_us - start_time_us
timer = took / timeslice_us
return timer, took
end
--MAIN LOOP
local timer = 0
minetest.register_globalstep(function(dtime)
local next_spawn, took = fixed_timeslice(timer, dtime, 1000, attempt_spawn)
timer = next_spawn
if timer > MAX_SPAWN_CYCLE_TIME then timer = MAX_SPAWN_CYCLE_TIME end
local took = (minetest.get_us_time() - start_time_us)
if took > debug_time_threshold then
minetest.log("action","[mcl_mobs] took "..took.." us")
minetest.log("Next spawn attempt in "..tostring(timer))
end
end)
end