MapGen: move waterLevel MapGenDef -> LayerDef
This commit is contained in:
@@ -48,7 +48,6 @@ local Cavern = require('MapGen.Cavern')
|
|||||||
---@field cavernsNoiseInitialized boolean Is the fractal noise of the caverns initialized? This is necessary for a one-time noise initialization.
|
---@field cavernsNoiseInitialized boolean Is the fractal noise of the caverns initialized? This is necessary for a one-time noise initialization.
|
||||||
---@field isRunning boolean A static field that guarantees that only one instance of the `MapGen` class will work.
|
---@field isRunning boolean A static field that guarantees that only one instance of the `MapGen` class will work.
|
||||||
---@field nodeIDs table<string, number>
|
---@field nodeIDs table<string, number>
|
||||||
---@field waterLevel number
|
|
||||||
local MapGen = {
|
local MapGen = {
|
||||||
layersByName = {},
|
layersByName = {},
|
||||||
layersList = {},
|
layersList = {},
|
||||||
@@ -59,9 +58,11 @@ local MapGen = {
|
|||||||
isRunning = false,
|
isRunning = false,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
---Definition table for the `MapGen`.
|
||||||
|
---
|
||||||
|
---**Only for EmmyLua.**
|
||||||
---@class MapGenDef
|
---@class MapGenDef
|
||||||
---@field nodes table<string, string>
|
---@field nodes table<string, string>
|
||||||
---@field waterLevel number?
|
|
||||||
|
|
||||||
---@param def MapGenDef
|
---@param def MapGenDef
|
||||||
---@return MapGen
|
---@return MapGen
|
||||||
@@ -76,7 +77,6 @@ function MapGen:new(def)
|
|||||||
local instance = setmetatable({
|
local instance = setmetatable({
|
||||||
nodes = def.nodes,
|
nodes = def.nodes,
|
||||||
nodeIDs = nodesIDs,
|
nodeIDs = nodesIDs,
|
||||||
waterLevel = def.waterLevel or 0,
|
|
||||||
}, {__index = self})
|
}, {__index = self})
|
||||||
|
|
||||||
return instance
|
return instance
|
||||||
@@ -346,7 +346,7 @@ end
|
|||||||
---@param z number
|
---@param z number
|
||||||
local function generateNode(mapGenerator, layer, height, temp, humidity, data, index, x, y, z)
|
local function generateNode(mapGenerator, layer, height, temp, humidity, data, index, x, y, z)
|
||||||
local ids = mapGenerator.nodeIDs
|
local ids = mapGenerator.nodeIDs
|
||||||
local waterLevel = mapGenerator.waterLevel
|
local waterLevel = layer.waterLevel
|
||||||
|
|
||||||
-- Creating a rougher biome boundary.
|
-- Creating a rougher biome boundary.
|
||||||
local scatteringGorizontal = layer.biomesGorizontalScattering or 0
|
local scatteringGorizontal = layer.biomesGorizontalScattering or 0
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
---@field maxTemp number
|
---@field maxTemp number
|
||||||
---@field minHumidity number
|
---@field minHumidity number
|
||||||
---@field maxHumidity number
|
---@field maxHumidity number
|
||||||
|
---@field waterLevel number
|
||||||
---@field calcTemp fun(self:MapGen.Layer, value:number, height:number):number
|
---@field calcTemp fun(self:MapGen.Layer, value:number, height:number):number
|
||||||
---@field calcHumidity fun(self:MapGen.Layer, value:number, height:number):number
|
---@field calcHumidity fun(self:MapGen.Layer, value:number, height:number):number
|
||||||
---@field peaksList MapGen.Peak[]
|
---@field peaksList MapGen.Peak[]
|
||||||
@@ -39,6 +40,7 @@ local Layer = {
|
|||||||
---@field maxTemp number
|
---@field maxTemp number
|
||||||
---@field minHumidity number
|
---@field minHumidity number
|
||||||
---@field maxHumidity number
|
---@field maxHumidity number
|
||||||
|
---@field waterLevel? number
|
||||||
---@field calcTemp (fun(self:MapGen.Layer, value:number, height:number):number)?
|
---@field calcTemp (fun(self:MapGen.Layer, value:number, height:number):number)?
|
||||||
---@field calcHumidity (fun(self:MapGen.Layer, value:number, height:number):number)?
|
---@field calcHumidity (fun(self:MapGen.Layer, value:number, height:number):number)?
|
||||||
---@field biomesGorizontalScattering number?
|
---@field biomesGorizontalScattering number?
|
||||||
@@ -75,6 +77,7 @@ function Layer:new(name, def)
|
|||||||
maxTemp = def.maxTemp,
|
maxTemp = def.maxTemp,
|
||||||
minHumidity = def.minHumidity,
|
minHumidity = def.minHumidity,
|
||||||
maxHumidity = def.maxHumidity,
|
maxHumidity = def.maxHumidity,
|
||||||
|
waterLevel = def.waterLevel or 0,
|
||||||
calcTemp = def.calcTemp,
|
calcTemp = def.calcTemp,
|
||||||
calcHumidity = def.calcHumidity,
|
calcHumidity = def.calcHumidity,
|
||||||
biomesGorizontalScattering = def.biomesGorizontalScattering or 0,
|
biomesGorizontalScattering = def.biomesGorizontalScattering or 0,
|
||||||
|
|||||||
@@ -27,7 +27,6 @@ local MapGen = mapGenRequire('MapGen')
|
|||||||
-- Liquids
|
-- Liquids
|
||||||
water = "liquids:water_source",
|
water = "liquids:water_source",
|
||||||
},
|
},
|
||||||
waterLevel = 10,
|
|
||||||
})
|
})
|
||||||
|
|
||||||
local function calcTemp(layer, value, height)
|
local function calcTemp(layer, value, height)
|
||||||
|
|||||||
Reference in New Issue
Block a user