From fc17c89f441d0f19ca0d18b4dc938b1d5b0081d8 Mon Sep 17 00:00:00 2001 From: Vanic Date: Mon, 17 Nov 2025 20:28:22 +0300 Subject: [PATCH] Mapgen: write SuperUltraSigmaMapgen part 5.4 --- mods/CORE/MapGen/src/MapGen.lua | 100 +++++++++++++++++++++---- mods/ENVIRONMENT/MapGenerator/init.lua | 82 +++++++++----------- 2 files changed, 122 insertions(+), 60 deletions(-) diff --git a/mods/CORE/MapGen/src/MapGen.lua b/mods/CORE/MapGen/src/MapGen.lua index 577c650..51af3aa 100644 --- a/mods/CORE/MapGen/src/MapGen.lua +++ b/mods/CORE/MapGen/src/MapGen.lua @@ -138,8 +138,8 @@ end ---@param layerName string The name of the layer in which the new peak will be included. ---@param peakPos vector ---@param multinoise MapGen.Peak.MultinoiseParams Noise that will be assigned to the peak and that will influence map generation ----@param groups table TODO: описание -function MapGen:RegisterPeak(layerName, peakPos, multinoise, groups) +---@param groups table? TODO: описание +function MapGen:registerPeak(layerName, peakPos, multinoise, groups) ---@type MapGen.Layer local layer = self.layersByName[layerName] @@ -158,6 +158,35 @@ function MapGen:RegisterPeak(layerName, peakPos, multinoise, groups) return peak --TODO: временно? end +---TODO: описание +---@param layerName string The name of the layer in which the new peak will be included. +---@param peakPos vector +---@param multinoise MapGen.Peak.MultinoiseParams Noise that will be assigned to the peak and that will influence map generation +---@param groups table? TODO: описание +function MapGen:register2DPeak(layerName, peakPos, multinoise, groups) + local _peakPos = table.copy_with_metatables(peakPos) + _peakPos.y = 0 + + if groups == nil then + groups = {is2d = 1} + else + groups.is2d = 1 + end + + self:registerPeak(layerName, _peakPos, multinoise, groups) +end + +---TODO: описание +---@param layerName string The name of the layer in which the new peak will be included. +---@param multinoise MapGen.Peak.MultinoiseParams Noise that will be assigned to the peak and that will influence map generation +---@param peakPoses vector[] +---@param groups table? TODO: описание +function MapGen:register2DPeaks(layerName, multinoise, peakPoses, groups) + for _, peakPos in ipairs(peakPoses) do + self:register2DPeak(layerName, peakPos, multinoise, groups) + end +end + ---Initialize peak noise. This should be called after the map object is loaded. function MapGen:initPeaksMultinoise() ---@param layer MapGen.Layer @@ -245,7 +274,42 @@ local function generateRock(ids, data, index, x, y, z) end end +---DEV noises +---@type NoiseParams +local caveNoiseParams1 = { + offset = 0, + scale = 1, + spread = {x = 25, y = 25, z = 25}, + seed = 5934, + octaves = 3, + persistence = 0.5, + lacunarity = 2.0 +} + +---@type NoiseParams +local caveNoiseParams2 = { + offset = 0, + scale = 1, + spread = {x = 50, y = 10, z = 50}, -- Y меньше для горизонтального вытягивания + seed = -1034, + octaves = 2, + persistence = 0.6, + lacunarity = 2.0 +} + +---@type ValueNoise, ValueNoise +local caveNoise1, caveNoise2 +local function isCave(layer, x, y, z) + if caveNoise1 == nil or caveNoise2 == nil then + caveNoise1 = core.get_value_noise(caveNoiseParams1) + caveNoise2 = core.get_value_noise(caveNoiseParams2) + end + + return caveNoise1:get_3d({x = x, y = y, z = z}) * caveNoise2:get_3d({x = x, y = y, z = z}) * 0.3 > 0.05 +end + ---@param mapGenerator MapGen +---@param layer MapGen.Layer ---@param hight number ---@param temp number ---@param humidity number @@ -254,22 +318,31 @@ end ---@param x number ---@param y number ---@param z number -local function generateNode(mapGenerator, hight, temp, humidity, data, index, x, y, z) +local function generateNode(mapGenerator, layer, hight, temp, humidity, data, index, x, y, z) local ids = mapGenerator.nodeIDs - temp = mathMin(100, mathMax(0, temp)) - humidity = mathMin(100, mathMax(0, humidity)) + local m = math.random(-10, 10) + + temp = mathMin(100, mathMax(0, temp + m)) + humidity = mathMin(100, mathMax(0, humidity + m)) local biome = mapGenerator.biomesDiagram[mathRound(temp)][mathRound(humidity)] if y > hight and y > 0 then data[index] = ids.air - elseif y == hight and y > 0 then - generateSoil(biome, data, index, x, y, z) - elseif y < hight then - generateRock(ids, data, index, x, y, z) - else + elseif y > hight and y <= 0 then data[index] = ids.water + elseif y <= hight then + if isCave(layer, x, y, z) then + data[index] = ids.air + elseif y == hight then + generateSoil(biome, data, index, x, y, z) + else + generateRock(ids, data, index, x, y, z) + end + else + data[index] = ids.air + -- TODO: добавить error end end @@ -538,7 +611,7 @@ local function generatorHandler(mapGenerator, data, index, x, y, z) end ---@diagnostic disable-next-line: param-type-not-match - generateNode(mapGenerator, noiseHeightValue, noiseTempValue, noiseHumidityValue, data, index, x, y, z) + generateNode(mapGenerator, layer, noiseHeightValue, noiseTempValue, noiseHumidityValue, data, index, x, y, z) end ---@param minPos table @@ -570,9 +643,10 @@ function MapGen:onMapGenerated(minPos, maxPos, blockseed) -- We make changes back to LVM and recalculate light & liquids voxelManip:set_data(data) - -- voxelManip:set_param2_data(param2_data) - voxelManip:update_liquids() + --voxelManip:set_param2_data() + voxelManip:set_lighting({ day = 0, night = 0}) voxelManip:calc_lighting() + voxelManip:update_liquids() voxelManip:write_to_map() end diff --git a/mods/ENVIRONMENT/MapGenerator/init.lua b/mods/ENVIRONMENT/MapGenerator/init.lua index 63a6bdc..2f16d4e 100644 --- a/mods/ENVIRONMENT/MapGenerator/init.lua +++ b/mods/ENVIRONMENT/MapGenerator/init.lua @@ -22,21 +22,21 @@ local mapGenerator = Core.MapGen.Class:new({ mapGenerator:RegisterLayer("world", -1000, 500) local land1 = { - offset = -10, - scale = 2, + offset = -20, + scale = 5, spread = {x = 10, y = 10, z = 10}, seed = 47, - octaves = 8, + octaves = 3, persistence = 0.4, lacunarity = 2, } local land2 = { offset = 20, - scale = 2, + scale = 5, spread = {x = 10, y = 10, z = 10}, seed = 47, - octaves = 8, + octaves = 3, persistence = 0.4, lacunarity = 2, } @@ -71,51 +71,39 @@ local climat0 = { lacunarity = 2, } ----LAND -mapGenerator:RegisterPeak("world", - vector.new(0,0,0), - { - landscapeNoise = land2, - tempNoise = climat2, - humidityNoise = climat2, - }, - {is2d = 1, is3d = 1}) +local v = vector.new -mapGenerator:RegisterPeak("world", - vector.new(25,0,25), - { - landscapeNoise = land2, - tempNoise = climat1, - humidityNoise = climat1, - }, - {is2d = 1, is3d = 1}) +mapGenerator:register2DPeaks("world", +{ + landscapeNoise = land1, + tempNoise = climat2, + humidityNoise = climat2, +},{ + v(500, 0, 500), + v(-500, 0, -500), + v(-500, 0, 500), + v(500, 0, -500), +}) -mapGenerator:RegisterPeak("world", - vector.new(-25,0,-25), - { - landscapeNoise = land2, - tempNoise = climat2, - humidityNoise = climat2, - }, - {is2d = 1, is3d = 1}) +mapGenerator:register2DPeaks("world", +{ + landscapeNoise = land2, + tempNoise = climat1, + humidityNoise = climat1, +},{ + v(-300, 0, 300), + v(200, 0, -400), +}) -mapGenerator:RegisterPeak("world", - vector.new(25,0, -25), - { - landscapeNoise = land2, - tempNoise = climat1, - humidityNoise = climat1, - }, - {is2d = 1, is3d = 1}) - -mapGenerator:RegisterPeak("world", - vector.new(-25,0,25), - { - landscapeNoise = land2, - tempNoise = climat1, - humidityNoise = climat1, - }, - {is2d = 1, is3d = 1}) +mapGenerator:register2DPeaks("world", +{ + landscapeNoise = land2, + tempNoise = climat2, + humidityNoise = climat2, +},{ + v(200, 0, 100), + v(-300, 0, -200), +}) mapGenerator:RegisterBiome("biome1", 0, 0, { soil = "soils:clay_soil_baren",