From f9eccced09b8a7239460d9fbbe88ff50ab0f0142 Mon Sep 17 00:00:00 2001 From: Vanic Date: Fri, 28 Nov 2025 20:23:51 +0300 Subject: [PATCH] Mapgen: write SuperUltraSigmaMapgen part 9 (FINAL) --- mods/CORE/MapGen/src/MapGen.lua | 95 +++++++++--- mods/CORE/MapGen/src/MapGen/Biome.lua | 139 +++++++++++++----- .../src/MapGen/Biome/GroundNodesIds.lua | 2 +- .../ENVIRONMENT/MapGenerator/MapGenerator.lua | 39 ++--- 4 files changed, 193 insertions(+), 82 deletions(-) diff --git a/mods/CORE/MapGen/src/MapGen.lua b/mods/CORE/MapGen/src/MapGen.lua index ebe69e5..c9f1e5e 100644 --- a/mods/CORE/MapGen/src/MapGen.lua +++ b/mods/CORE/MapGen/src/MapGen.lua @@ -1,5 +1,5 @@ -local mathAbs, mathRound, mathMin, mathMax - = math.abs, math.round, math.min, math.max +local mathAbs, mathRound, mathMin, mathMax, id + = math.abs, math.round, math.min, math.max, core.get_content_id local pastNoise2DCalc = { ---@type MapGen.Triangle? @@ -44,6 +44,7 @@ local Cavern = require('MapGen.Cavern') ---@field isRunning boolean A static field that guarantees that only one instance of the `MapGen` class will work. ---@field nodeIDs table ---@field waterLevel number +---@field biomesBorderScattering number local MapGen = { layersByName = {}, layersList = {}, @@ -52,14 +53,26 @@ local MapGen = { isRunning = false, } ----@param nodeIDs table ----@param waterLevel number +---@class MapGenDef +---@field nodes table +---@field waterLevel number? +---@field biomesBorderScattering number? + +---@param def MapGenDef ---@return MapGen -function MapGen:new(nodeIDs, waterLevel) +function MapGen:new(def) + local nodesIDs = {} + -- Converting node names to IDs + for k, v in pairs(def.nodes) do + nodesIDs[k] = id(v) + end + ---@type MapGen local instance = setmetatable({ - nodeIDs = nodeIDs, - waterLevel = waterLevel or 0, + nodes = def.nodes, + nodeIDs = nodesIDs, + waterLevel = def.waterLevel or 0, + biomesBorderScattering = def.biomesBorderScattering or 0 }, {__index = self}) return instance @@ -285,34 +298,70 @@ end ---@param y number ---@param z number local function generateNode(mapGenerator, layer, height, temp, humidity, data, index, x, y, z) - height, temp, humidity = mathRound(height), mathRound(temp), mathRound(humidity) - local ids = mapGenerator.nodeIDs local waterLevel = mapGenerator.waterLevel - -- TODO: оформить это по-нормальному - local m = math.random(-5, 5) + local scattering = mapGenerator.biomesBorderScattering - temp = mathMin(100, mathMax(0, temp + m)) - humidity = mathMin(100, mathMax(0, humidity + m)) - --_height = mathMin(layer.maxY, mathMax(layer.minY, y + m)) + if scattering ~= 0 then + ---@diagnostic disable-next-line: param-type-not-match + scattering = math.random(scattering * -1, scattering) + temp = temp + scattering + humidity = humidity + scattering + --scatteringY = y + scattering + end + + temp = mathMin(layer.maxTemp, mathMax(layer.minTemp, temp)) + humidity = mathMin(layer.maxHumidity, mathMax(layer.minHumidity, humidity)) + --scatteringY = mathMin(layer.maxY, mathMax(layer.minY, scatteringY + scattering)) + + height, temp, humidity = mathRound(height), mathRound(temp), mathRound(humidity) ---@type MapGen.Biome local biome = layer.biomesDiagram[y][temp][humidity] + -- If the block is above surface height and above water level... if y > height and y > waterLevel then - data[index] = ids.air + -- ... then airspace is generated. + biome.generateAir(mapGenerator, biome, data, index, x, y, z) + + -- If the block is above the surface height BUT below the water level... elseif y > height and y <= waterLevel then - data[index] = ids.water + -- ... then underwater space is generated. + biome.generateWater(mapGenerator, biome, data, index, x, y, z) + + -- If the block is below the surface height... elseif y <= height then + -- ... and a cavern is generated in the block... if isCavern(layer, x, y, z) then - data[index] = ids.air - elseif y == height and y >= waterLevel then - biome.generateSoil(mapGenerator, biome, data, index, x, y, z) - elseif y == height and y < waterLevel then - biome.generateBottom(mapGenerator, biome, data, index, x, y, z) - else - biome.generateRock(mapGenerator, biome, data, index, x, y, z) + -- ... then airspace is generated. + biome.generateCavernAir(mapGenerator, biome, data, index, x, y, z) + + -- ... or if the surface height is above the water level... + elseif height > waterLevel then + --- ... and the height of the block is equal to the height of the surface... + if y == height then + -- ... then turf is generated. + biome.generateTurf(mapGenerator, biome, data, index, x, y, z) + -- ... or if the height of the block falls within the thickness of the soil layer... + elseif y > height - biome.soilHeight then + -- ... then soil is generated. + biome.generateSoil(mapGenerator, biome, data, index, x, y, z) + else + -- ... else e a stone is generated. + biome.generateRock(mapGenerator, biome, data, index, x, y, z) + end + + -- ... or if the surface height is below the water level... + elseif height <= waterLevel then + -- ... and if the height of the block falls within the thickness of the soil layer... + if y > height - biome.soilHeight then + -- ... then the river/ocean bottom is generated. + biome.generateBottom(mapGenerator, biome, data, index, x, y, z) + else + -- ... else a stone is generated. + biome.generateRock(mapGenerator, biome, data, index, x, y, z) + end end else data[index] = ids.air diff --git a/mods/CORE/MapGen/src/MapGen/Biome.lua b/mods/CORE/MapGen/src/MapGen/Biome.lua index f4047f4..9753774 100644 --- a/mods/CORE/MapGen/src/MapGen/Biome.lua +++ b/mods/CORE/MapGen/src/MapGen/Biome.lua @@ -1,38 +1,79 @@ local id = core.get_content_id ---@class MapGen.Biome ----@field name string ----@field tempPoint number ----@field humidityPoint number ----@field minY number ----@field maxY number ----@field groundNodes MapGen.Biome.GroundNodes ----@field groundNodesIds MapGen.Biome.GroundNodesIds ----@field soilHeight number ----@field generateRock fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number) ----@field generateTurf fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number) ----@field generateSoil fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number) ----@field generateBottom fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number) +---@field name string +---@field tempPoint number +---@field humidityPoint number +---@field minY number +---@field maxY number +---@field groundNodes MapGen.Biome.GroundNodes +---@field groundNodesIDs MapGen.Biome.GroundNodesIDs +---@field soilHeight number +---@field generateAir generateFunc +---@field generateCavernAir generateFunc +---@field generateWater generateFunc +---@field generateRock generateFunc +---@field generateTurf generateFunc +---@field generateSoil generateFunc +---@field generateBottom generateFunc local Biome = {} +---@alias generateFunc fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number) + ---Definition table for the `MapGen.Biome`. --- ---**Only for EmmyLua.** ---@class MapGen.BiomeDef ----@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.Biome, data:number[], index:number, x:number, y:number, z:number)? ----@field generateTurf fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number)? ----@field generateSoil fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number)? ----@field generateBottom fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number)? +---@field tempPoint number +---@field humidityPoint number +---@field minY number +---@field maxY number +---@field groundNodes MapGen.Biome.GroundNodes +---@field soilHeight number +---@field generateAir generateFunc? +---@field generateCavernAir generateFunc? +---@field generateWater generateFunc? +---@field generateRock generateFunc? +---@field generateTurf generateFunc? +---@field generateSoil generateFunc? +---@field generateBottom generateFunc? -- Default generate functions +---@param mapGenerator MapGen +---@param biome MapGen.Biome +---@param data number[] +---@param index number +---@param x number +---@param y number +---@param z number +local defaultGenerateAir = function(mapGenerator, biome, data, index, x, y, z) + data[index] = mapGenerator.nodeIDs.air +end + +---@param mapGenerator MapGen +---@param biome MapGen.Biome +---@param data number[] +---@param index number +---@param x number +---@param y number +---@param z number +local defaultGenerateCavernAir = function(mapGenerator, biome, data, index, x, y, z) + biome.generateAir(mapGenerator, biome, data, index, x, y, z) +end + +---@param mapGenerator MapGen +---@param biome MapGen.Biome +---@param data number[] +---@param index number +---@param x number +---@param y number +---@param z number +local defaultGenerateWater = function(mapGenerator, biome, data, index, x, y, z) + data[index] = mapGenerator.nodeIDs.water +end + ---@param mapGenerator MapGen ---@param biome MapGen.Biome ---@param data number[] @@ -41,7 +82,7 @@ local Biome = {} ---@param y number ---@param z number local defaultGenerateRock = function(mapGenerator, biome, data, index, x, y, z) - data[index] = biome.groundNodesIds.rock + data[index] = biome.groundNodesIDs.rock end ---@param mapGenerator MapGen @@ -52,7 +93,7 @@ end ---@param y number ---@param z number local defaultGenerateTurf = function(mapGenerator, biome, data, index, x, y, z) - data[index] = biome.groundNodesIds.turf + data[index] = biome.groundNodesIDs.turf end ---@param mapGenerator MapGen @@ -63,7 +104,7 @@ end ---@param y number ---@param z number local defaultGenerateSoil = function(mapGenerator, biome, data, index, x, y, z) - data[index] = biome.groundNodesIds.soil + data[index] = biome.groundNodesIDs.soil end ---@param mapGenerator MapGen @@ -74,7 +115,7 @@ end ---@param y number ---@param z number local defaultGenerateBottom = function(mapGenerator, biome, data, index, x, y, z) - data[index] = biome.groundNodesIds.bottom + data[index] = biome.groundNodesIDs.bottom end @@ -82,6 +123,21 @@ end ---@param def MapGen.BiomeDef ---@return MapGen.Biome function Biome:new(name, def) + if def.generateAir == nil then + Logger.infoLog('MapGen.Biome: The `%s` biome does not have a specified `generateAir()` function. The default function is used.', name) + def.generateAir = defaultGenerateAir + end + + if def.generateCavernAir == nil then + Logger.infoLog('MapGen.Biome: The `%s` biome does not have a specified `generateCavernAir()` function. The default function is used.', name) + def.generateCavernAir = defaultGenerateCavernAir + end + + if def.generateWater == nil then + Logger.infoLog('MapGen.Biome: The `%s` biome does not have a specified `generateWater()` function. The default function is used.', name) + def.generateWater = defaultGenerateWater + end + if def.generateRock == nil then Logger.infoLog('MapGen.Biome: The `%s` biome does not have a specified `generateRock()` function. The default function is used.', name) def.generateRock = defaultGenerateRock @@ -102,26 +158,29 @@ function Biome:new(name, def) def.generateBottom = defaultGenerateBottom end - local groundNodesIds = {} + local groundNodesIDs = {} -- Converting node names to IDs for k, v in pairs(def.groundNodes) do - groundNodesIds[k] = id(v) + groundNodesIDs[k] = id(v) end ---@type MapGen.Biome local instance = setmetatable({ - name = name, - tempPoint = def.tempPoint, - humidityPoint = def.humidityPoint, - minY = def.minY, - maxY = def.maxY, - groundNodes = def.groundNodes, - groundNodesIds = groundNodesIds, - soilHeight = def.soilHeight, - generateRock = def.generateRock, - generateSoil = def.generateSoil, - generateTurf = def.generateTurf, - generateBottom = def.generateBottom, + name = name, + tempPoint = def.tempPoint, + humidityPoint = def.humidityPoint, + minY = def.minY, + maxY = def.maxY, + groundNodes = def.groundNodes, + groundNodesIDs = groundNodesIDs, + soilHeight = def.soilHeight, + generateAir = def.generateAir, + generateCavernAir = def.generateCavernAir, + generateWater = def.generateWater, + generateRock = def.generateRock, + generateSoil = def.generateSoil, + generateTurf = def.generateTurf, + generateBottom = def.generateBottom, }, {__index = self}) return instance diff --git a/mods/CORE/MapGen/src/MapGen/Biome/GroundNodesIds.lua b/mods/CORE/MapGen/src/MapGen/Biome/GroundNodesIds.lua index d2ae64c..c2e0801 100644 --- a/mods/CORE/MapGen/src/MapGen/Biome/GroundNodesIds.lua +++ b/mods/CORE/MapGen/src/MapGen/Biome/GroundNodesIds.lua @@ -1,7 +1,7 @@ --- Only for EmmyLua ---**Only for EmmyLua.** ----@class MapGen.Biome.GroundNodesIds +---@class MapGen.Biome.GroundNodesIDs ---@field turf number The soil covering the surface of the biome ---@field soil number The soil beneath the turf. The height of this layer depends on `Biome.soilHeight` ---@field rock number The rock found beneath the soil of a biome. diff --git a/mods/ENVIRONMENT/MapGenerator/MapGenerator.lua b/mods/ENVIRONMENT/MapGenerator/MapGenerator.lua index f3ac382..a4b3e9a 100644 --- a/mods/ENVIRONMENT/MapGenerator/MapGenerator.lua +++ b/mods/ENVIRONMENT/MapGenerator/MapGenerator.lua @@ -44,24 +44,27 @@ local mapGenRequire = Mod.getInfo('smc__core__map_gen').require local MapGen = mapGenRequire('MapGen') ---@type MapGen -local mapGenerator = MapGen:new({ - -- Special nodes - air = id("air"), + local mapGenerator = MapGen:new({ + nodes = { + -- Special nodes + air = "air", - -- Rocks - sylite = id("rocks:sylite"), - tauitite = id("rocks:tauitite"), - iyellite = id("rocks:iyellite"), - falmyte = id("rocks:falmyte"), - hapcoryte = id("rocks:hapcoryte"), - burcite = id("rocks:burcite"), - felhor = id("rocks:felhor"), - malachite = id("rocks:malachite"), + -- Rocks + sylite = "rocks:sylite", + tauitite = "rocks:tauitite", + iyellite = "rocks:iyellite", + falmyte = "rocks:falmyte", + hapcoryte = "rocks:hapcoryte", + burcite = "rocks:burcite", + felhor = "rocks:felhor", + malachite = "rocks:malachite", - -- Liquids - water = id("liquids:water_source"), -}, 10 -) + -- Liquids + water = "liquids:water_source", + }, + waterLevel = 10, + biomesBorderScattering = 5, +}) local function calcTemp(layer, value, height) return value @@ -240,7 +243,7 @@ mapGenerator:registerBiome('world', "biome1", { rock = "rocks:sylite", bottom = "soils:rocky_soil_baren", }, - soilHeight = 1, + soilHeight = 5, --generateRock = generateRock, --generateSoil = generateSoil, }) @@ -256,7 +259,7 @@ mapGenerator:registerBiome('world', "biome2", { rock = "rocks:felhor", bottom = "soils:clay_soil_baren", }, - soilHeight = 1, + soilHeight = 3, --generateRock = generateRock, --generateSoil = generateSoil, })