ExpandingDev
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Generate clay more MC-like 

* Diamond shape
* Flat
* Close to water surface
This commit is contained in:
Wuzzy 2017-09-11 03:54:38 +02:00
parent 33e8d1dd99
commit e7db6f3c89
1 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -968,38 +968,46 @@ end
-- Perlin noise objects -- Perlin noise objects
local perlin_structures local perlin_structures
local perlin_vines, perlin_vines_fine, perlin_vines_upwards, perlin_vines_length, perlin_vines_density local perlin_vines, perlin_vines_fine, perlin_vines_upwards, perlin_vines_length, perlin_vines_density
local perlin_clay
-- TODO: Try to use more efficient clay generating code
local function generate_clay(minp, maxp, seed) local function generate_clay(minp, maxp, seed)
if maxp.y >= 2 and minp.y <= 0 then -- TODO: Try to use more efficient clay generating code.
-- Generate clay -- TODO: Make clay generation reproducible for same seed
if maxp.y < -5 or minp.y > 0 then
return
end
perlin_clay = perlin_clay or minetest.get_perlin({
offset = 0.5,
scale = 0.2,
spread = {x = 5, y = 5, z = 5},
seed = -316,
octaves = 1,
persist = 0.0
})
for y=math.max(minp.y, 0), math.min(maxp.y, -8), -1 do
-- Assume X and Z lengths are equal -- Assume X and Z lengths are equal
local divlen = 4 local divlen = 4
local divs = (maxp.x-minp.x)/divlen+1; local divs = (maxp.x-minp.x)/divlen+1;
for divx=0+1,divs-1-1 do for divx=0+1,divs-2 do
for divz=0+1,divs-1-1 do for divz=0+1,divs-2 do
local cx = minp.x + math.floor((divx+0.5)*divlen) -- Get position and shift it a bit randomly so the clay do not obviously appear in a grid
local cz = minp.z + math.floor((divz+0.5)*divlen) local cx = minp.x + math.floor((divx+0.5)*divlen) + math.random(-1,1)
if minetest.get_node({x=cx,y=1,z=cz}).name == "mcl_core:water_source" and local cz = minp.z + math.floor((divz+0.5)*divlen) + math.random(-1,1)
minetest.get_item_group(minetest.get_node({x=cx,y=0,z=cz}).name, "sand") == 1 then local waternode = minetest.get_node({x=cx,y=y+1,z=cz}).name
local is_shallow = true local surfacepos = {x=cx,y=y,z=cz}
local num_water_around = 0 local surfacenode = minetest.get_node(surfacepos).name
if minetest.get_node({x=cx-divlen*2,y=1,z=cz+0}).name == "mcl_core:water_source" then local genrnd = math.random(1, 20)
num_water_around = num_water_around + 1 end if genrnd == 1 and perlin_clay:get3d(surfacepos) > 0 and waternode == "mcl_core:water_source" and
if minetest.get_node({x=cx+divlen*2,y=1,z=cz+0}).name == "mcl_core:water_source" then (surfacenode == "mcl_core:dirt" or minetest.get_item_group(surfacenode, "sand") == 1) then
num_water_around = num_water_around + 1 end local diamondsize = math.random(1, 3)
if minetest.get_node({x=cx+0,y=1,z=cz-divlen*2}).name == "mcl_core:water_source" then for x1 = -diamondsize, diamondsize do
num_water_around = num_water_around + 1 end for z1 = -(diamondsize - math.abs(x1)), diamondsize - math.abs(x1) do
if minetest.get_node({x=cx+0,y=1,z=cz+divlen*2}).name == "mcl_core:water_source" then local ccpos = {x=cx+x1,y=y,z=cz+z1}
num_water_around = num_water_around + 1 end local claycandidate = minetest.get_node(ccpos)
if num_water_around >= 2 then if claycandidate.name == "mcl_core:dirt" or minetest.get_item_group(claycandidate.name, "sand") == 1 then
is_shallow = false minetest.set_node(ccpos, {name="mcl_core:clay"})
end
if is_shallow then
for x1=-divlen,divlen do
for z1=-divlen,divlen do
if minetest.get_item_group(minetest.get_node({x=cx+x1,y=0,z=cz+z1}).name, "sand") == 1 then
minetest.set_node({x=cx+x1,y=0,z=cz+z1}, {name="mcl_core:clay"})
end end
end end
end end
@ -1007,8 +1015,6 @@ local function generate_clay(minp, maxp, seed)
end end
end end
end end
end
end end
-- TODO: Try to use more efficient structure generating code -- TODO: Try to use more efficient structure generating code