Michieal
/
MineClone2
mirror of https://git.minetest.land/MineClone2/MineClone2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Terrain feature fixes

This commit is contained in:
cora 2022-06-24 14:02:29 +02:00
parent 063e17bc0a
commit dfbb832f96
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mods/MAPGEN/mcl_mapgen_core/init.lua
View File

@ -2193,7 +2193,7 @@ mcl_mapgen_core.register_generator("structures",nil, function(minp, maxp, blocks
for _, pos in pairs(gennotify["decoration#"..struct.deco_id] or {}) do for _, pos in pairs(gennotify["decoration#"..struct.deco_id] or {}) do
local realpos = vector.offset(pos,0,1,0) local realpos = vector.offset(pos,0,1,0)
minetest.remove_node(realpos) minetest.remove_node(realpos)
if struct.chunk_probability ~= nil and not has and pr:next(1,struct.chunk_probability) ~= 1 then if struct.chunk_probability == nil or (not has and pr:next(1,struct.chunk_probability) == 1 ) then
mcl_structures.place_structure(realpos,struct,pr) mcl_structures.place_structure(realpos,struct,pr)
has=true has=true
end end

16
mods/MAPGEN/mcl_structures/api.lua
View File

@ -16,6 +16,22 @@ local function generate_loot(pos, def, pr)
end end
end end
function mcl_structures.find_lowest_y(pp)
local y = 31000
for _,p in pairs(pp) do
if p.y < y then y = p.y end
end
return y
end
function mcl_structures.find_highest_y(pp)
local y = -31000
for _,p in pairs(pp) do
if p.y > y then y = p.y end
end
return y
end
function mcl_structures.place_structure(pos, def, pr) function mcl_structures.place_structure(pos, def, pr)
if not def then return end if not def then return end
local logging = not def.terrain_feature local logging = not def.terrain_feature

16
mods/MAPGEN/mcl_terrain_features/init.lua
View File

@ -30,7 +30,7 @@ local function airtower(pos,tbl,h)
end end
local function makelake(pos,size,liquid,placein,border,pr) local function makelake(pos,size,liquid,placein,border,pr)
local node_under = minetest.get_node(vector.offset(pos,0,1,0)) local node_under = minetest.get_node(vector.offset(pos,0,-1,0))
local p1 = vector.offset(pos,-size,-size,-size) local p1 = vector.offset(pos,-size,-size,-size)
local p2 = vector.offset(pos,size,size,size) local p2 = vector.offset(pos,size,size,size)
local nn = minetest.find_nodes_in_area(p1,p2,placein) local nn = minetest.find_nodes_in_area(p1,p2,placein)
@ -38,7 +38,7 @@ local function makelake(pos,size,liquid,placein,border,pr)
return vector.distance(vector.new(pos.x,0,pos.z), a) < vector.distance(vector.new(pos.x,0,pos.z), b) return vector.distance(vector.new(pos.x,0,pos.z), a) < vector.distance(vector.new(pos.x,0,pos.z), b)
end) end)
if not nn[1] then return end if not nn[1] then return end
local y = pos.y - 1 local y = mcl_structures.find_highest_y(nn)
local lq = {} local lq = {}
local air = {} local air = {}
for i=1,pr:next(1,#nn) do for i=1,pr:next(1,#nn) do
@ -59,11 +59,11 @@ local function makelake(pos,size,liquid,placein,border,pr)
if minetest.get_item_group(an.name,"solid") > 0 then if minetest.get_item_group(an.name,"solid") > 0 then
border = an.name border = an.name
elseif minetest.get_item_group(minetest.get_node(nn[1]).name,"solid") > 0 then elseif minetest.get_item_group(minetest.get_node(nn[1]).name,"solid") > 0 then
border = minetest.get_node(nn[1]).name border = minetest.get_node_or_nil(nn[1]).name
else else
border = "mcl_core:stone" border = "mcl_core:stone"
end end
if border == "mcl_core:dirt" then border = "mcl_core:dirt_with_grass" end if border == nil or border == "mcl_core:dirt" then border = "mcl_core:dirt_with_grass" end
end end
if an.name ~= liquid then if an.name ~= liquid then
table.insert(br,pp) table.insert(br,pp)
@ -94,7 +94,7 @@ mcl_structures.register_structure("lavapool",{
y_max = mcl_vars.mg_overworld_max, y_max = mcl_vars.mg_overworld_max,
y_min = minetest.get_mapgen_setting("water_level"), y_min = minetest.get_mapgen_setting("water_level"),
place_func = function(pos,def,pr) place_func = function(pos,def,pr)
return makelake(pos,5,"mcl_core:lava_source","mcl_core:stone",{"group:material_stone", "group:sand", "group:dirt"},pr) return makelake(pos,5,"mcl_core:lava_source",{"group:material_stone", "group:sand", "group:dirt"},"mcl_core:stone",pr)
end end
}) })
@ -114,7 +114,7 @@ mcl_structures.register_structure("water_lake",{
y_max = mcl_vars.mg_overworld_max, y_max = mcl_vars.mg_overworld_max,
y_min = minetest.get_mapgen_setting("water_level"), y_min = minetest.get_mapgen_setting("water_level"),
place_func = function(pos,def,pr) place_func = function(pos,def,pr)
return makelake(pos,5,"mcl_core:water_source",{"group:material_stone", "group:sand", "group:dirt"},nil,pr) return makelake(pos,5,"mcl_core:water_source",{"group:material_stone", "group:sand", "group:dirt","group:grass_block"},nil,pr)
end end
}) })
@ -219,7 +219,7 @@ mcl_structures.register_structure("lavadelta",{
terrain_feature = true, terrain_feature = true,
noise_params = { noise_params = {
offset = 0, offset = 0,
scale = 0.01, scale = 0.005,
spread = {x = 250, y = 250, z = 250}, spread = {x = 250, y = 250, z = 250},
seed = 78375213, seed = 78375213,
octaves = 5, octaves = 5,
@ -231,7 +231,7 @@ mcl_structures.register_structure("lavadelta",{
y_min = mcl_vars.mg_lava_nether_max + 1, y_min = mcl_vars.mg_lava_nether_max + 1,
biomes = { "BasaltDelta" }, biomes = { "BasaltDelta" },
place_func = function(pos,def,pr) place_func = function(pos,def,pr)
local nn = minetest.find_nodes_in_area_under_air(vector.offset(pos,-10,-1,-10),vector.offset(pos,10,-1,10),{"mcl_blackstone:basalt","mcl_blackstone:blackstone"}) local nn = minetest.find_nodes_in_area_under_air(vector.offset(pos,-10,-1,-10),vector.offset(pos,10,-2,10),{"mcl_blackstone:basalt","mcl_blackstone:blackstone","mcl_nether:netherrack"})
table.sort(nn,function(a, b) table.sort(nn,function(a, b)
return vector.distance(vector.new(pos.x,0,pos.z), a) < vector.distance(vector.new(pos.x,0,pos.z), b) return vector.distance(vector.new(pos.x,0,pos.z), a) < vector.distance(vector.new(pos.x,0,pos.z), b)
end) end)