diff --git a/mods/CORE/MapGen/src/MapGen.lua b/mods/CORE/MapGen/src/MapGen.lua index 0833b89..4aec3e8 100644 --- a/mods/CORE/MapGen/src/MapGen.lua +++ b/mods/CORE/MapGen/src/MapGen.lua @@ -1,25 +1,6 @@ local mathAbs, mathRound, mathMin, mathMax = math.abs, math.round, math.min, math.max --- --- MapGen default noises --- - ----@type ValueNoise -local rocksNoise - ----@type NoiseParams -local rocksNoiseParams ={ - offset = 4, - scale = 2, - spread = {x = 30, y = 30, z = 30}, - seed = 47, - octaves = 3, - persistence = 0.5, - lacunarity = 4, -} - --- --- End default noises --- - - local pastNoise2DCalc = { ---@type MapGen.Triangle? triangle = nil, @@ -272,42 +253,6 @@ end -- --- GENERATION METHODS --- -local function generateSoil(biome, data, index, x, y, z) - data[index] = core.get_content_id(biome.groundNodes.turf) -- TODO: убрать тут get_content_id(), переместить его куда-то "выше" -end - ----@param ids table ----@param data number[] ----@param index number ----@param x number ----@param y number ----@param z number -local function generateRock(ids, data, index, x, y, z) - - if rocksNoise == nil then - rocksNoise = core.get_value_noise(rocksNoiseParams) - end - - local noiseRocksValue = mathRound(rocksNoise:get_3d({x = x, y = y, z = z})) - if noiseRocksValue == 1 then - data[index] = ids.malachite - elseif noiseRocksValue == 2 then - data[index] = ids.hapcoryte - elseif noiseRocksValue == 3 then - data[index] = ids.iyellite - elseif noiseRocksValue == 4 then - data[index] = ids.sylite - elseif noiseRocksValue == 5 then - data[index] = ids.tauitite - elseif noiseRocksValue == 6 then - data[index] = ids.falmyte - elseif noiseRocksValue == 7 then - data[index] = ids.burcite - elseif noiseRocksValue == 8 then - data[index] = ids.felhor - end -end - ---@param layer MapGen.Layer ---@param x number ---@param y number @@ -342,6 +287,7 @@ local function generateNode(mapGenerator, layer, height, temp, humidity, data, i humidity = mathMin(100, mathMax(0, humidity + m)) --height = mathMin(layer.maxY, mathMax(layer.minY, y + m)) + ---@type MapGen.Layer.Biome local biome = layer.biomesDiagram[y][mathRound(temp)][mathRound(humidity)] if y > height and y > 0 then @@ -351,10 +297,12 @@ local function generateNode(mapGenerator, layer, height, temp, humidity, data, i elseif y <= height then if isCavern(layer, x, y, z) then data[index] = ids.air - elseif y == height then - generateSoil(biome, data, index, x, y, z) + elseif y == height and y >= 0 then + biome.generateSoil(mapGenerator, biome, data, index, x, y, z) + elseif y == height and y < 0 then + biome.generateBottom(mapGenerator, biome, data, index, x, y, z) else - generateRock(ids, data, index, x, y, z) + biome.generateRock(mapGenerator, biome, data, index, x, y, z) end else data[index] = ids.air diff --git a/mods/CORE/MapGen/src/MapGen/Layer/Biome.lua b/mods/CORE/MapGen/src/MapGen/Layer/Biome.lua index c7b2f86..e2326eb 100644 --- a/mods/CORE/MapGen/src/MapGen/Layer/Biome.lua +++ b/mods/CORE/MapGen/src/MapGen/Layer/Biome.lua @@ -1,34 +1,95 @@ ---@class MapGen.Layer.Biome ----@field name string ----@field tempPoint number ----@field humidityPoint number ----@field minY number ----@field maxY number ----@field groundNodes MapGen.Biome.GroundNodes ----@field soilHeight number +---@field name string +---@field tempPoint number +---@field humidityPoint number +---@field minY number +---@field maxY number +---@field groundNodes MapGen.Biome.GroundNodes +---@field soilHeight number +---@field generateRock fun(mapGenerator:MapGen, biome:MapGen.Layer.Biome, data:number[], index:number, x:number, y:number, z:number) +---@field generateSoil fun(mapGenerator:MapGen, biome:MapGen.Layer.Biome, data:number[], index:number, x:number, y:number, z:number) +---@field generateBottom fun(mapGenerator:MapGen, biome:MapGen.Layer.Biome, data:number[], index:number, x:number, y:number, z:number) local Biome = {} ---@class MapGen.Layer.BiomeDef ----@field tempPoint number ----@field humidityPoint number ----@field minY number ----@field maxY number ----@field groundNodes MapGen.Biome.GroundNodes ----@field soilHeight number +---@field tempPoint number +---@field humidityPoint number +---@field minY number +---@field maxY number +---@field groundNodes MapGen.Biome.GroundNodes +---@field soilHeight number +---@field generateRock fun(mapGenerator:MapGen, biome:MapGen.Layer.Biome, data:number[], index:number, x:number, y:number, z:number)? +---@field generateSoil fun(mapGenerator:MapGen, biome:MapGen.Layer.Biome, data:number[], index:number, x:number, y:number, z:number)? +---@field generateBottom fun(mapGenerator:MapGen, biome:MapGen.Layer.Biome, data:number[], index:number, x:number, y:number, z:number)? + + +-- Default generate functions + +---@param mapGenerator MapGen +---@param biome MapGen.Layer.Biome +---@param data number[] +---@param index number +---@param x number +---@param y number +---@param z number +local defaultGenerateRock = function(mapGenerator, biome, data, index, x, y, z) + --TODO: минимальную логику генерации прописать +end + +---@param mapGenerator MapGen +---@param biome MapGen.Layer.Biome +---@param data number[] +---@param index number +---@param x number +---@param y number +---@param z number +local defaultGenerateSoil = function(mapGenerator, biome, data, index, x, y, z) + --TODO: минимальную логику генерации прописать +end + +---@param mapGenerator MapGen +---@param biome MapGen.Layer.Biome +---@param data number[] +---@param index number +---@param x number +---@param y number +---@param z number +local defaultGenerateBottom = function(mapGenerator, biome, data, index, x, y, z) + --TODO: минимальную логику генерации прописать +end + ---@param name string ---@param def MapGen.Layer.BiomeDef ---@return MapGen.Layer.Biome function Biome:new(name, def) + if def.generateRock == nil then + Logger.warningLog('MapGen.Layer.Biome: The `%s` biome does not have a specified `generateRock()` function. The default function is used.', name) + def.generateRock = defaultGenerateRock + end + + if def.generateSoil == nil then + Logger.warningLog('MapGen.Layer.Biome: The `%s` biome does not have a specified `generateSoil()` function. The default function is used.', name) + def.generateSoil = defaultGenerateSoil + end + + if def.generateBottom == nil then + Logger.warningLog('MapGen.Layer.Biome: The `%s` biome does not have a specified `generateBottom()` function. The default function is used.', name) + def.generateBottom = defaultGenerateBottom + end + ---@type MapGen.Layer.Biome local instance = setmetatable({ - name = name, - tempPoint = def.tempPoint, - humidityPoint = def.humidityPoint, - minY = def.minY, - maxY = def.maxY, - groundNodes = def.groundNodes, - soilHeight = def.soilHeight, + name = name, + tempPoint = def.tempPoint, + humidityPoint = def.humidityPoint, + minY = def.minY, + maxY = def.maxY, + groundNodes = def.groundNodes, + soilHeight = def.soilHeight, + generateRock = def.generateRock or defaultGenerateRock, + generateSoil = def.generateSoil or defaultGenerateSoil, + generateBottom = def.generateBottom or defaultGenerateBottom, }, {__index = self}) return instance diff --git a/mods/ENVIRONMENT/MapGenerator/MapGenerator.lua b/mods/ENVIRONMENT/MapGenerator/MapGenerator.lua index 5263b42..676b936 100644 --- a/mods/ENVIRONMENT/MapGenerator/MapGenerator.lua +++ b/mods/ENVIRONMENT/MapGenerator/MapGenerator.lua @@ -36,6 +36,8 @@ dofile(core.get_modpath('smc__api__table')..'/init.lua') -- --- MapGen definiton --- local id = core.get_content_id +local mathRound = math.round + local mapGenRequire = Mod.getInfo('smc__core__map_gen').require ---@type MapGen @@ -162,6 +164,53 @@ mapGenerator:registerCavern('world', 'cavern1', { }, }) +-- --- Biomes --- + +---@type ValueNoise +local rocksNoise + +---@type NoiseParams +local rocksNoiseParams ={ + offset = 4, + scale = 2, + spread = {x = 30, y = 30, z = 30}, + seed = 47, + octaves = 3, + persistence = 0.5, + lacunarity = 4, +} + +local function generateRock(mapGenerator, biome, data, index, x, y, z) + local ids = mapGenerator.nodeIDs --TODO перенести камни в Biome + + if rocksNoise == nil then + rocksNoise = core.get_value_noise(rocksNoiseParams) + end + + local noiseRocksValue = mathRound(rocksNoise:get_3d({x = x, y = y, z = z})) + if noiseRocksValue == 1 then + data[index] = ids.malachite + elseif noiseRocksValue == 2 then + data[index] = ids.hapcoryte + elseif noiseRocksValue == 3 then + data[index] = ids.iyellite + elseif noiseRocksValue == 4 then + data[index] = ids.sylite + elseif noiseRocksValue == 5 then + data[index] = ids.tauitite + elseif noiseRocksValue == 6 then + data[index] = ids.falmyte + elseif noiseRocksValue == 7 then + data[index] = ids.burcite + elseif noiseRocksValue == 8 then + data[index] = ids.felhor + end +end + +local function generateSoil(mapGenerator, biome, data, index, x, y, z) + data[index] = core.get_content_id(biome.groundNodes.turf) -- TODO: убрать тут get_content_id(), переместить его куда-то "выше" +end + mapGenerator:registerBiome('world', "biome1", { tempPoint = 0, humidityPoint = 0, @@ -171,7 +220,9 @@ mapGenerator:registerBiome('world', "biome1", { soil = "soils:clay_soil_baren", turf = "soils:clay_soil_baren", }, - soilHeight = 1 + soilHeight = 1, + generateRock = generateRock, + generateSoil = generateSoil, }) mapGenerator:registerBiome('world', "biome2", { @@ -183,7 +234,9 @@ mapGenerator:registerBiome('world', "biome2", { soil = "soils:rocky_soil_baren", turf = "soils:rocky_soil_baren", }, - soilHeight = 1 + soilHeight = 1, + generateRock = generateRock, + generateSoil = generateSoil, }) mapGenerator:run() \ No newline at end of file