From 2e1df31399fe00016598e7b4be386c2cc0400d6d Mon Sep 17 00:00:00 2001 From: kno10 Date: Thu, 4 Jul 2024 12:37:12 +0200 Subject: [PATCH] Refactor and clean up spawn checks, optimize. --- mods/ENTITIES/mcl_mobs/spawning.lua | 118 +++++++++++++--------------- 1 file changed, 54 insertions(+), 64 deletions(-) diff --git a/mods/ENTITIES/mcl_mobs/spawning.lua b/mods/ENTITIES/mcl_mobs/spawning.lua index 9a5e77f9d..282c186fd 100644 --- a/mods/ENTITIES/mcl_mobs/spawning.lua +++ b/mods/ENTITIES/mcl_mobs/spawning.lua @@ -753,80 +753,74 @@ end local function spawn_check(pos, spawn_def) if not spawn_def or not pos then return end - dbg_spawn_attempts = dbg_spawn_attempts + 1 + local dimension = mcl_worlds.pos_to_dimension(pos) - local mob_def = minetest.registered_entities[spawn_def.name] - local mob_type = mob_def.type + if spawn_def.dimension ~= dimension then return end -- wrong dimension + -- find ground node below spawn position local gotten_node = get_node(pos).name if not gotten_node then return end - - local is_ground = minetest.get_item_group(gotten_node,"solid") ~= 0 - if not is_ground then + local is_ground = get_item_group(gotten_node,"solid") ~= 0 + if not is_ground then -- try node one below instead pos.y = pos.y - 1 gotten_node = get_node(pos).name - is_ground = minetest.get_item_group(gotten_node,"solid") ~= 0 + is_ground = get_item_group(gotten_node,"solid") ~= 0 end pos.y = pos.y + 1 - local is_water = get_item_group(gotten_node, "water") ~= 0 - local is_lava = get_item_group(gotten_node, "lava") ~= 0 - local is_leaf = get_item_group(gotten_node, "leaves") ~= 0 - local is_bedrock = gotten_node == "mcl_core:bedrock" - local is_grass = minetest.get_item_group(gotten_node,"grass_block") ~= 0 + -- check spawn height + if pos.y < spawn_def.min_height or pos.y > spawn_def.max_height then return end + mcl_log("spawn_check#1 position checks passed") - if pos.y >= spawn_def.min_height - and pos.y <= spawn_def.max_height - and spawn_def.dimension == dimension - and biome_check(spawn_def.biomes, get_biome_name(pos)) then + -- do not spawn on bedrock + if gotten_node == "mcl_core:bedrock" then return end + -- do not spawn ground mobs on leaves + if spawn_def.type_of_spawning == "ground" and (not is_ground or get_item_group(gotten_node, "leaves") ~= 0) then return end + -- farm animals on grass only + if is_farm_animal(spawn_def.name) and get_item_group(gotten_node, "grass_block") == 0 then return end + -- water mobs only on water + if spawn_def.type_of_spawning == "water" and get_item_group(gotten_node, "water") == 0 then return end + -- lava mobs only on lava + if spawn_def.type_of_spawning == "lava" and get_item_group(gotten_node, "lava") == 0 then return end - mcl_log("Spawn level 1 check - Passed") - if (is_ground or spawn_def.type_of_spawning ~= "ground") - and (spawn_def.type_of_spawning ~= "ground" or not is_leaf) - and (not is_farm_animal(spawn_def.name) or is_grass) - and (spawn_def.type_of_spawning ~= "water" or is_water) - and not is_bedrock - and has_room(mob_def,pos) - and (spawn_def.check_position and spawn_def.check_position(pos) or spawn_def.check_position == nil) - and ( not spawn_protected or not minetest.is_protected(pos, "") ) then + ---- More expensive calls: + -- check the biome + if not biome_check(spawn_def.biomes, get_biome_name(pos)) then return end + -- check if there is enough room + local mob_def = minetest.registered_entities[spawn_def.name] + if not has_room(mob_def,pos) then return end + -- additional checks (slime etc.) + if spawn_def.check_position and not spawn_def.check_position(pos) then return end + if spawn_protected and minetest.is_protected(pos, "") then return end + mcl_log("spawn_check#2 advanced checks passed") - mcl_log("Spawn level 2 check - Passed") - local gotten_light = get_node_light(pos) + -- check light thresholds + local gotten_light = get_node_light(pos) + -- old lighting + if not modern_lighting then return gotten_light >= spawn_def.min_light and gotten_light <= spawn_def.max_light end - if modern_lighting then - local my_node = get_node(pos) - local sky_light = minetest.get_natural_light(pos) - local art_light = minetest.get_artificial_light(my_node.param1) - - if mob_def.spawn_check then - return mob_def.spawn_check(pos, gotten_light, art_light, sky_light) - elseif mob_type == "monster" then - if dimension == "nether" then - if art_light <= nether_threshold then - return true - end - elseif dimension == "end" then - if art_light <= end_threshold then - return true - end - elseif dimension == "overworld" then - if art_light <= overworld_threshold and sky_light <= overworld_sky_threshold then - return true - end - end - else - -- passive threshold is apparently the same in all dimensions ... - if gotten_light > overworld_passive_threshold then - return true - end - end - else - if gotten_light >= spawn_def.min_light and gotten_light <= spawn_def.max_light then - return true - end + local sky_light = minetest.get_natural_light(pos) + local art_light = minetest.get_artificial_light(get_node(pos).param1) + if mob_def.spawn_check then + return mob_def.spawn_check(pos, gotten_light, art_light, sky_light) + end + if mob_def.type == "monster" then + if dimension == "nether" then + if art_light <= nether_threshold then + return true + end + elseif dimension == "end" then + if art_light <= end_threshold then + return true + end + elseif dimension == "overworld" then + if art_light <= overworld_threshold and sky_light <= overworld_sky_threshold then + return true end end + return false end - return false + -- passive threshold is apparently the same in all dimensions ... + return gotten_light > overworld_passive_threshold end function mcl_mobs.spawn(pos,id) @@ -834,11 +828,7 @@ function mcl_mobs.spawn(pos,id) if not def or (def.can_spawn and not def.can_spawn(pos)) or not def.is_mob then return false end - if not dbg_spawn_counts[def.name] then - dbg_spawn_counts[def.name] = 1 - else - dbg_spawn_counts[def.name] = dbg_spawn_counts[def.name] + 1 - end + dbg_spawn_counts[def.name] = (dbg_spawn_counts[def.name] or 0) + 1 return minetest.add_entity(pos, def.name) end