Mapgen: write SuperUltraSigmaMapgen part 6.5

This commit is contained in:
Van
2025-11-23 18:28:59 +03:00
parent e4f8bc0d61
commit 54cc31e14e
3 changed files with 62 additions and 39 deletions

View File

@@ -208,17 +208,13 @@ end
---TODO: описание
---@param layerName string
---@param cavernName string
---@param minY number
---@param maxY number
---@param smoothDistance number
---@param noiseParams NoiseParams
---@param groups? table<string, number>
function MapGen:registerCavern(layerName, cavernName, minY, maxY, smoothDistance, noiseParams, groups)
---@param def MapGen.Layer.CavernDef
function MapGen:registerCavern(layerName, cavernName, def)
local layer = self.layersByName[layerName]
assert(layer ~= nil, ('There is no layer named `%s` registered.'):format(layerName))
assert(layer.cavernsByName[cavernName] == nil, ('A cavern named `%s` already exists in the `%s` layer.'):format(cavernName, layerName))
local cavern = Cavern:new(cavernName, minY, maxY, smoothDistance, noiseParams, groups)
local cavern = Cavern:new(cavernName, def)
layer.cavernsByName[cavernName] = cavern
table.insert(layer.cavernsList, cavern)
@@ -322,7 +318,7 @@ end
---@return boolean
local function isCavern(layer, x, y, z)
for _, cavern in ipairs(layer.cavernsList) do
if cavern:isCavern(x, y, z, 0.2) then
if cavern:isCavern(x, y, z) then
return true
end
end
@@ -646,6 +642,8 @@ function MapGen:onMapGenerated(minPos, maxPos, blockseed)
-- local param2_data = voxelManip:get_param2_data()
local area = VoxelArea:new({MinEdge = eMin, MaxEdge = eMax})
data[area:index(0,50,0)] = core.get_content_id('rocks:malachite')
local index
-- Initial generation: landscape
for z = minPos.z, maxPos.z do
@@ -653,7 +651,9 @@ function MapGen:onMapGenerated(minPos, maxPos, blockseed)
for y = minPos.y, maxPos.y do
index = area:index(x, y, z)
generatorHandler(self, data, index, x, y, z)
if data[index] == core.CONTENT_AIR then
generatorHandler(self, data, index, x, y, z)
end
end
end
end

View File

@@ -6,43 +6,56 @@ local mathMin, mathMax, mathAbs
---@field minY number
---@field maxY number
---@field smoothDistance number
---@field threshold number
---@field getNoise fun():ValueNoise
---@field initNoise fun()
---@field getGroups fun():table<string, number>
local Cavern = {}
---@param name string
---@param minY number
---@param maxY number
---@param smoothDistance number
---@param noiseParams NoiseParams
---@param groups? table<string, number>
---@return MapGen.Layer.Cavern
function Cavern:new(name, minY, maxY, smoothDistance, noiseParams, groups)
assert(maxY > minY, 'maxY there should be more minY')
assert(smoothDistance < mathAbs(maxY - minY)/2, 'The smoothing distance cannot be greater than half the distance between minY and maxY')
---Definition table for the `MapGen.Layer.Cavern`.
---
---**Only for EmmyLua.**
---@class MapGen.Layer.CavernDef
---@field minY number
---@field maxY number
---@field noiseParams NoiseParams
---@field smoothDistance number
---@field threshold number?
---@field groups table<string, number>?
---@param name string
---@param def MapGen.Layer.CavernDef
---@return MapGen.Layer.Cavern
function Cavern:new(name, def)
assert(def.maxY > def.minY, 'maxY there should be more minY')
assert(def.smoothDistance < mathAbs(def.maxY - def.minY)/2, 'The smoothing distance cannot be greater than half the distance between minY and maxY')
---@type NoiseParams
local _noiseParams = noiseParams
local _noiseParams = def.noiseParams
---@diagnostic disable-next-line: missing-fields
---@type ValueNoise
local _noise = {}-- note: must be nil until luanti mapgen objects are loaded.
local _noise = {} -- note: must be nil until luanti mapgen objects are loaded.
if def.threshold == nil then
def.threshold = 0.0
end
local _groups
if groups == nil then
if def.groups == nil then
_groups = {}
else
_groups = groups
_groups = def.groups
end
---@type MapGen.Layer.Cavern
local instance = setmetatable({
name = name,
minY = minY,
maxY = maxY,
smoothDistance = smoothDistance,
name = name,
minY = def.minY,
maxY = def.maxY,
smoothDistance = def.smoothDistance,
threshold = def.threshold,
}, {__index = self})
function instance:getNoise()
@@ -54,7 +67,7 @@ function Cavern:new(name, minY, maxY, smoothDistance, noiseParams, groups)
minetest.log('warning', 'Cavern noise has already been initialized. Re-initialization is not recommended.')
end
_noise = core.get_value_noise(noiseParams)
_noise = core.get_value_noise(_noiseParams)
end
function instance:getGroups()
@@ -79,27 +92,18 @@ end
---@param x number
---@param y number
---@param z number
---@param threshold number?
---@return boolean
function Cavern:isCavern(x, y, z, threshold)
function Cavern:isCavern(x, y, z)
local minY, maxY = self.minY, self.maxY
if y > maxY or y < minY then
return false
end
if threshold == nil then
threshold = 0
end
local noise = self:getNoise()
local weight = calcCavernWeight(y, self.smoothDistance, minY, maxY)
if y == -15 then
print('is', weight)
end
return noise:get_3d({x = x, y = y, z = z}) * weight > threshold
return noise:get_3d({x = x, y = y, z = z}) * weight > self.threshold
end
return Cavern

View File

@@ -126,3 +126,22 @@ mapGenerator:registerBiome('world', "biome2", 100, 100, {
}, 1)
mapGenerator:run()
minetest.register_ore({
ore_type = "blob",
ore = "soils:clay_soil_baren",
wherein = {"rocks:iyellite", "rocks:falmyte"},
clust_scarcity = 16 * 16 * 16,
clust_size = 5,
y_max = 0,
y_min = -3100,
noise_threshold = 0.0,
noise_params = {
offset = 1,
scale = 0.5,
spread = {x = 5, y = 5, z = 5},
seed = 2316,
octaves = 1,
persist = 0.0
},
})