Merge branch 'master' into mineclone5

This commit is contained in:
Lizzy Fleckenstein 2021-04-12 15:45:16 +02:00
commit d3d9351bac
1 changed files with 7 additions and 8 deletions

View File

@ -12,7 +12,7 @@ local vector_distance = vector.distance
-- range for mob count -- range for mob count
local aoc_range = 32 local aoc_range = 32
--[[ --[[
THIS IS THE BIG LIST OF ALL BIOMES - used for programming/updating mobs THIS IS THE BIG LIST OF ALL BIOMES - used for programming/updating mobs
@ -158,7 +158,6 @@ local mobs_spawn = minetest.settings:get_bool("mobs_spawn", true) ~= false
-- count how many mobs of one type are inside an area -- count how many mobs of one type are inside an area
local count_mobs = function(pos,mobtype) local count_mobs = function(pos,mobtype)
print(mobtype)
local num = 0 local num = 0
local objs = get_objects_inside_radius(pos, aoc_range) local objs = get_objects_inside_radius(pos, aoc_range)
for n = 1, #objs do for n = 1, #objs do
@ -170,12 +169,12 @@ local count_mobs = function(pos,mobtype)
num = num + 1 num = num + 1
end end
-- count passive mobs only -- count passive mobs only
else else
num = num + 1 num = num + 1
end end
end end
end end
return num return num
end end
@ -194,7 +193,7 @@ end
name: name:
the mobs name the mobs name
dimension: dimension:
"overworld" "overworld"
"nether" "nether"
"end" "end"
@ -531,7 +530,7 @@ local function biome_check(biome_list, biome_goal)
return false return false
end end
--todo mob limiting --todo mob limiting
--MAIN LOOP --MAIN LOOP
@ -552,11 +551,11 @@ if mobs_spawn then
if dimension == "void" or dimension == "default" then if dimension == "void" or dimension == "default" then
break -- ignore void and unloaded area break -- ignore void and unloaded area
end end
local min,max = decypher_limits(player_pos.y) local min,max = decypher_limits(player_pos.y)
local goal_pos = position_calculation(player_pos) local goal_pos = position_calculation(player_pos)
local spawning_position_list = find_nodes_in_area_under_air(new_vector(goal_pos.x,min,goal_pos.z), vector.new(goal_pos.x,max,goal_pos.z), {"group:solid", "group:water", "group:lava"}) local spawning_position_list = find_nodes_in_area_under_air(new_vector(goal_pos.x,min,goal_pos.z), vector.new(goal_pos.x,max,goal_pos.z), {"group:solid", "group:water", "group:lava"})
--couldn't find node --couldn't find node