diff --git a/mods/CORE/MapGen/src/MapGen.lua b/mods/CORE/MapGen/src/MapGen.lua index 4bb13ad..7467a4b 100644 --- a/mods/CORE/MapGen/src/MapGen.lua +++ b/mods/CORE/MapGen/src/MapGen.lua @@ -188,18 +188,15 @@ function MapGen:register2DPeaks(layerName, multinoise, peakPoses, groups) end ---TODO: описание ----@param layerName string ----@param biomeName string ----@param tempPoint number ----@param humidityPoint number ----@param groundNodes MapGen.Biome.GroundNodes ----@param soilHeight number -function MapGen:registerBiome(layerName, biomeName, tempPoint, humidityPoint, groundNodes, soilHeight) +---@param layerName string +---@param biomeName string +---@param def MapGen.Layer.BiomeDef +function MapGen:registerBiome(layerName, biomeName, def) local layer = self.layersByName[layerName] assert(layer ~= nil, ('There is no layer named `%s` registered.'):format(layerName)) assert(layer.biomesByName[biomeName] == nil, ('A biome named `%s` already exists in the `%s` layer.'):format(biomeName, layerName)) - local biome = Biome:new(biomeName, tempPoint, humidityPoint, groundNodes, soilHeight) + local biome = Biome:new(biomeName, def) layer.biomesByName[biomeName] = biome table.insert(layer.biomesList, biome) diff --git a/mods/CORE/MapGen/src/MapGen/Layer/Biome.lua b/mods/CORE/MapGen/src/MapGen/Layer/Biome.lua index f5d28a6..b36818f 100644 --- a/mods/CORE/MapGen/src/MapGen/Layer/Biome.lua +++ b/mods/CORE/MapGen/src/MapGen/Layer/Biome.lua @@ -6,20 +6,23 @@ ---@field soilHeight number local Biome = {} ----@param name string ----@param tempPoint number ----@param humidityPoint number ----@param groundNodes MapGen.Biome.GroundNodes ----@param soilHeight number ----@return MapGen.Layer.Biome -function Biome:new(name, tempPoint, humidityPoint, groundNodes, soilHeight) +---@class MapGen.Layer.BiomeDef +---@field tempPoint number +---@field humidityPoint number +---@field groundNodes MapGen.Biome.GroundNodes +---@field soilHeight number + +---@param name string +---@param def MapGen.Layer.BiomeDef +---@return MapGen.Layer.Biome +function Biome:new(name, def) ---@type MapGen.Layer.Biome local instance = setmetatable({ name = name, - tempPoint = tempPoint, - humidityPoint = humidityPoint, - groundNodes = groundNodes, - soilHeight = soilHeight, + tempPoint = def.tempPoint, + humidityPoint = def.humidityPoint, + groundNodes = def.groundNodes, + soilHeight = def.soilHeight, }, {__index = self}) return instance diff --git a/mods/ENVIRONMENT/MapGenerator/MapGenerator.lua b/mods/ENVIRONMENT/MapGenerator/MapGenerator.lua index e9568de..821adb2 100644 --- a/mods/ENVIRONMENT/MapGenerator/MapGenerator.lua +++ b/mods/ENVIRONMENT/MapGenerator/MapGenerator.lua @@ -159,14 +159,24 @@ mapGenerator:registerCavern('world', 'cavern1', { }, }) -mapGenerator:registerBiome('world', "biome1", 0, 0, { - soil = "soils:clay_soil_baren", - turf = "soils:clay_soil_baren", -}, 1) +mapGenerator:registerBiome('world', "biome1", { + tempPoint = 0, + humidityPoint = 0, + groundNodes = { + soil = "soils:clay_soil_baren", + turf = "soils:clay_soil_baren", + }, + soilHeight = 1 +}) -mapGenerator:registerBiome('world', "biome2", 100, 100, { - soil = "soils:rocky_soil_baren", - turf = "soils:rocky_soil_baren", -}, 1) +mapGenerator:registerBiome('world', "biome2", { + tempPoint = 100, + humidityPoint = 100, + groundNodes = { + soil = "soils:rocky_soil_baren", + turf = "soils:rocky_soil_baren", + }, + soilHeight = 1 +}) mapGenerator:run() \ No newline at end of file