nalc/minetest-mod-snow
1
0
Fork 0
forked from mtcontrib/minetest-mod-snow
Code Issues Pull Requests Releases Wiki Activity

Add a luacheckrc and fix errors reported by luacheck

Browse Source 
* stairs is now added to depends.txt
* The mapgen perlin noise functions use a buffer now
This commit is contained in:
HybridDog
2021-01-30 17:33:59 +01:00
parent 76981af958
commit e8a15bf467
10 changed files with 90 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/mapgen_v6.lua
View File

@ -14,11 +14,11 @@ local np_default = {
-- 2D noise for coldness
local mg = snow.mapgen
local scale = mg.perlin_scale
local scale_coldness = mg.perlin_scale
local np_cold = {
offset = 0,
scale = 1,
spread = {x=scale, y=scale, z=scale},
spread = {x=scale_coldness, y=scale_coldness, z=scale_coldness},
seed = 112,
octaves = 3,
persist = 0.5
@ -186,7 +186,9 @@ local function get_perlins(sidelen)
}
end
local nbuf_default, nbuf_cold, nbuf_ice
local nbuf_default = {}
local nbuf_cold = {}
local nbuf_ice = {}
minetest.register_on_generated(function(minp, maxp, seed)
local t1 = os.clock()
@ -229,7 +231,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
local nodes_added
-- Loop through columns in chunk
local smooth = smooth and not snowy
local is_smooth = smooth and not snowy
local write_to_map = false
local ni = 1
for z = z0, z1 do
@ -239,7 +241,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
if nvals_default[ni] < 0.35 then
nvals_cold = nvals_cold or perlin_objs.cold:get2dMap_flat({x=x0, y=z0}, nbuf_cold)
test = math.min(nvals_cold[ni], 1)
if smooth then
if is_smooth then
if test >= smooth_rarity_max
or (
test > smooth_rarity_min
@ -255,7 +257,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
if not in_biome then
if alpine
and test
and test > (smooth and smooth_rarity_min or nosmooth_rarity) then
and test > (is_smooth and smooth_rarity_min or nosmooth_rarity) then
-- remove trees near alpine
local ground_y
if data[area:index(x, maxp.y, z)] == c.air then
@ -345,7 +347,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
data[area:index(x, ground_y+1, z)] = c.dry_shrub
else
if snowy
or test > (smooth and smooth_rarity_max or
or test > (is_smooth and smooth_rarity_max or
nosmooth_rarity) then
-- more, deeper snow
data[node] = c.snow_block
@ -388,13 +390,13 @@ minetest.register_on_generated(function(minp, maxp, seed)
and (cool or icebergs)
and pr:next(1,4) == 1 then
local vi = node + 1
local vi_ice = node + 1
for i = 1,6 do
if data[vi] == c.ice then
if data[vi_ice] == c.ice then
ice = true
break
end
vi = vi + ndia[i]
vi_ice = vi_ice + ndia[i]
end
end
end
@ -505,8 +507,8 @@ minetest.register_on_generated(function(minp, maxp, seed)
-- set snow
data[area:index(i[3], i[1]+1, i[2])] = c.snow
end
for i = 1, num-1 do
i = snow_tab[i]
for k = 1, num-1 do
local i = snow_tab[k]
local y,z,x,test = unpack(i)
test = (test-nosmooth_rarity)/(1-nosmooth_rarity) -- /(1-0.53)
if test > 0 then
@ -516,8 +518,8 @@ minetest.register_on_generated(function(minp, maxp, seed)
if h ~= 1 then
-- search for nearby snow
y = y+1
for i = -1,1,2 do
for _,cord in pairs({{x+i,z}, {x,z+i}}) do
for off = -1,1,2 do
for _,cord in pairs({{x+off,z}, {x,z+off}}) do
local nd = data[area:index(cord[1], y, cord[2])]
if nd == c.air
or is_plantlike(nd) then