Mapgen: write SuperUltraSigmaMapgen part 9 (FINAL)
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
local mathAbs, mathRound, mathMin, mathMax
|
local mathAbs, mathRound, mathMin, mathMax, id
|
||||||
= math.abs, math.round, math.min, math.max
|
= math.abs, math.round, math.min, math.max, core.get_content_id
|
||||||
|
|
||||||
local pastNoise2DCalc = {
|
local pastNoise2DCalc = {
|
||||||
---@type MapGen.Triangle?
|
---@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 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
|
---@field waterLevel number
|
||||||
|
---@field biomesBorderScattering number
|
||||||
local MapGen = {
|
local MapGen = {
|
||||||
layersByName = {},
|
layersByName = {},
|
||||||
layersList = {},
|
layersList = {},
|
||||||
@@ -52,14 +53,26 @@ local MapGen = {
|
|||||||
isRunning = false,
|
isRunning = false,
|
||||||
}
|
}
|
||||||
|
|
||||||
---@param nodeIDs table<string, number>
|
---@class MapGenDef
|
||||||
---@param waterLevel number
|
---@field nodes table<string, string>
|
||||||
|
---@field waterLevel number?
|
||||||
|
---@field biomesBorderScattering number?
|
||||||
|
|
||||||
|
---@param def MapGenDef
|
||||||
---@return MapGen
|
---@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
|
---@type MapGen
|
||||||
local instance = setmetatable({
|
local instance = setmetatable({
|
||||||
nodeIDs = nodeIDs,
|
nodes = def.nodes,
|
||||||
waterLevel = waterLevel or 0,
|
nodeIDs = nodesIDs,
|
||||||
|
waterLevel = def.waterLevel or 0,
|
||||||
|
biomesBorderScattering = def.biomesBorderScattering or 0
|
||||||
}, {__index = self})
|
}, {__index = self})
|
||||||
|
|
||||||
return instance
|
return instance
|
||||||
@@ -285,35 +298,71 @@ end
|
|||||||
---@param y number
|
---@param y number
|
||||||
---@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)
|
||||||
height, temp, humidity = mathRound(height), mathRound(temp), mathRound(humidity)
|
|
||||||
|
|
||||||
local ids = mapGenerator.nodeIDs
|
local ids = mapGenerator.nodeIDs
|
||||||
local waterLevel = mapGenerator.waterLevel
|
local waterLevel = mapGenerator.waterLevel
|
||||||
|
|
||||||
-- TODO: оформить это по-нормальному
|
local scattering = mapGenerator.biomesBorderScattering
|
||||||
local m = math.random(-5, 5)
|
|
||||||
|
|
||||||
temp = mathMin(100, mathMax(0, temp + m))
|
if scattering ~= 0 then
|
||||||
humidity = mathMin(100, mathMax(0, humidity + m))
|
---@diagnostic disable-next-line: param-type-not-match
|
||||||
--_height = mathMin(layer.maxY, mathMax(layer.minY, y + m))
|
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
|
---@type MapGen.Biome
|
||||||
local biome = layer.biomesDiagram[y][temp][humidity]
|
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
|
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
|
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
|
elseif y <= height then
|
||||||
|
-- ... and a cavern is generated in the block...
|
||||||
if isCavern(layer, x, y, z) then
|
if isCavern(layer, x, y, z) then
|
||||||
data[index] = ids.air
|
-- ... then airspace is generated.
|
||||||
elseif y == height and y >= waterLevel then
|
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)
|
biome.generateSoil(mapGenerator, biome, data, index, x, y, z)
|
||||||
elseif y == height and y < waterLevel then
|
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)
|
biome.generateBottom(mapGenerator, biome, data, index, x, y, z)
|
||||||
else
|
else
|
||||||
|
-- ... else a stone is generated.
|
||||||
biome.generateRock(mapGenerator, biome, data, index, x, y, z)
|
biome.generateRock(mapGenerator, biome, data, index, x, y, z)
|
||||||
end
|
end
|
||||||
|
end
|
||||||
else
|
else
|
||||||
data[index] = ids.air
|
data[index] = ids.air
|
||||||
|
|
||||||
|
|||||||
@@ -7,14 +7,19 @@ local id = core.get_content_id
|
|||||||
---@field minY number
|
---@field minY number
|
||||||
---@field maxY number
|
---@field maxY number
|
||||||
---@field groundNodes MapGen.Biome.GroundNodes
|
---@field groundNodes MapGen.Biome.GroundNodes
|
||||||
---@field groundNodesIds MapGen.Biome.GroundNodesIds
|
---@field groundNodesIDs MapGen.Biome.GroundNodesIDs
|
||||||
---@field soilHeight number
|
---@field soilHeight number
|
||||||
---@field generateRock fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number)
|
---@field generateAir generateFunc
|
||||||
---@field generateTurf fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number)
|
---@field generateCavernAir generateFunc
|
||||||
---@field generateSoil fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number)
|
---@field generateWater generateFunc
|
||||||
---@field generateBottom fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number)
|
---@field generateRock generateFunc
|
||||||
|
---@field generateTurf generateFunc
|
||||||
|
---@field generateSoil generateFunc
|
||||||
|
---@field generateBottom generateFunc
|
||||||
local Biome = {}
|
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`.
|
---Definition table for the `MapGen.Biome`.
|
||||||
---
|
---
|
||||||
---**Only for EmmyLua.**
|
---**Only for EmmyLua.**
|
||||||
@@ -25,14 +30,50 @@ local Biome = {}
|
|||||||
---@field maxY number
|
---@field maxY number
|
||||||
---@field groundNodes MapGen.Biome.GroundNodes
|
---@field groundNodes MapGen.Biome.GroundNodes
|
||||||
---@field soilHeight number
|
---@field soilHeight number
|
||||||
---@field generateRock fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number)?
|
---@field generateAir generateFunc?
|
||||||
---@field generateTurf fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number)?
|
---@field generateCavernAir generateFunc?
|
||||||
---@field generateSoil fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number)?
|
---@field generateWater generateFunc?
|
||||||
---@field generateBottom fun(mapGenerator:MapGen, biome:MapGen.Biome, data:number[], index:number, x:number, y:number, z:number)?
|
---@field generateRock generateFunc?
|
||||||
|
---@field generateTurf generateFunc?
|
||||||
|
---@field generateSoil generateFunc?
|
||||||
|
---@field generateBottom generateFunc?
|
||||||
|
|
||||||
|
|
||||||
-- Default generate functions
|
-- 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 mapGenerator MapGen
|
||||||
---@param biome MapGen.Biome
|
---@param biome MapGen.Biome
|
||||||
---@param data number[]
|
---@param data number[]
|
||||||
@@ -41,7 +82,7 @@ local Biome = {}
|
|||||||
---@param y number
|
---@param y number
|
||||||
---@param z number
|
---@param z number
|
||||||
local defaultGenerateRock = function(mapGenerator, biome, data, index, x, y, z)
|
local defaultGenerateRock = function(mapGenerator, biome, data, index, x, y, z)
|
||||||
data[index] = biome.groundNodesIds.rock
|
data[index] = biome.groundNodesIDs.rock
|
||||||
end
|
end
|
||||||
|
|
||||||
---@param mapGenerator MapGen
|
---@param mapGenerator MapGen
|
||||||
@@ -52,7 +93,7 @@ end
|
|||||||
---@param y number
|
---@param y number
|
||||||
---@param z number
|
---@param z number
|
||||||
local defaultGenerateTurf = function(mapGenerator, biome, data, index, x, y, z)
|
local defaultGenerateTurf = function(mapGenerator, biome, data, index, x, y, z)
|
||||||
data[index] = biome.groundNodesIds.turf
|
data[index] = biome.groundNodesIDs.turf
|
||||||
end
|
end
|
||||||
|
|
||||||
---@param mapGenerator MapGen
|
---@param mapGenerator MapGen
|
||||||
@@ -63,7 +104,7 @@ end
|
|||||||
---@param y number
|
---@param y number
|
||||||
---@param z number
|
---@param z number
|
||||||
local defaultGenerateSoil = function(mapGenerator, biome, data, index, x, y, z)
|
local defaultGenerateSoil = function(mapGenerator, biome, data, index, x, y, z)
|
||||||
data[index] = biome.groundNodesIds.soil
|
data[index] = biome.groundNodesIDs.soil
|
||||||
end
|
end
|
||||||
|
|
||||||
---@param mapGenerator MapGen
|
---@param mapGenerator MapGen
|
||||||
@@ -74,7 +115,7 @@ end
|
|||||||
---@param y number
|
---@param y number
|
||||||
---@param z number
|
---@param z number
|
||||||
local defaultGenerateBottom = function(mapGenerator, biome, data, index, x, y, z)
|
local defaultGenerateBottom = function(mapGenerator, biome, data, index, x, y, z)
|
||||||
data[index] = biome.groundNodesIds.bottom
|
data[index] = biome.groundNodesIDs.bottom
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
@@ -82,6 +123,21 @@ end
|
|||||||
---@param def MapGen.BiomeDef
|
---@param def MapGen.BiomeDef
|
||||||
---@return MapGen.Biome
|
---@return MapGen.Biome
|
||||||
function Biome:new(name, def)
|
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
|
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)
|
Logger.infoLog('MapGen.Biome: The `%s` biome does not have a specified `generateRock()` function. The default function is used.', name)
|
||||||
def.generateRock = defaultGenerateRock
|
def.generateRock = defaultGenerateRock
|
||||||
@@ -102,10 +158,10 @@ function Biome:new(name, def)
|
|||||||
def.generateBottom = defaultGenerateBottom
|
def.generateBottom = defaultGenerateBottom
|
||||||
end
|
end
|
||||||
|
|
||||||
local groundNodesIds = {}
|
local groundNodesIDs = {}
|
||||||
-- Converting node names to IDs
|
-- Converting node names to IDs
|
||||||
for k, v in pairs(def.groundNodes) do
|
for k, v in pairs(def.groundNodes) do
|
||||||
groundNodesIds[k] = id(v)
|
groundNodesIDs[k] = id(v)
|
||||||
end
|
end
|
||||||
|
|
||||||
---@type MapGen.Biome
|
---@type MapGen.Biome
|
||||||
@@ -116,8 +172,11 @@ function Biome:new(name, def)
|
|||||||
minY = def.minY,
|
minY = def.minY,
|
||||||
maxY = def.maxY,
|
maxY = def.maxY,
|
||||||
groundNodes = def.groundNodes,
|
groundNodes = def.groundNodes,
|
||||||
groundNodesIds = groundNodesIds,
|
groundNodesIDs = groundNodesIDs,
|
||||||
soilHeight = def.soilHeight,
|
soilHeight = def.soilHeight,
|
||||||
|
generateAir = def.generateAir,
|
||||||
|
generateCavernAir = def.generateCavernAir,
|
||||||
|
generateWater = def.generateWater,
|
||||||
generateRock = def.generateRock,
|
generateRock = def.generateRock,
|
||||||
generateSoil = def.generateSoil,
|
generateSoil = def.generateSoil,
|
||||||
generateTurf = def.generateTurf,
|
generateTurf = def.generateTurf,
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
--- Only for EmmyLua
|
--- Only for EmmyLua
|
||||||
|
|
||||||
---**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 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 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.
|
---@field rock number The rock found beneath the soil of a biome.
|
||||||
|
|||||||
@@ -44,24 +44,27 @@ local mapGenRequire = Mod.getInfo('smc__core__map_gen').require
|
|||||||
local MapGen = mapGenRequire('MapGen')
|
local MapGen = mapGenRequire('MapGen')
|
||||||
|
|
||||||
---@type MapGen
|
---@type MapGen
|
||||||
local mapGenerator = MapGen:new({
|
local mapGenerator = MapGen:new({
|
||||||
|
nodes = {
|
||||||
-- Special nodes
|
-- Special nodes
|
||||||
air = id("air"),
|
air = "air",
|
||||||
|
|
||||||
-- Rocks
|
-- Rocks
|
||||||
sylite = id("rocks:sylite"),
|
sylite = "rocks:sylite",
|
||||||
tauitite = id("rocks:tauitite"),
|
tauitite = "rocks:tauitite",
|
||||||
iyellite = id("rocks:iyellite"),
|
iyellite = "rocks:iyellite",
|
||||||
falmyte = id("rocks:falmyte"),
|
falmyte = "rocks:falmyte",
|
||||||
hapcoryte = id("rocks:hapcoryte"),
|
hapcoryte = "rocks:hapcoryte",
|
||||||
burcite = id("rocks:burcite"),
|
burcite = "rocks:burcite",
|
||||||
felhor = id("rocks:felhor"),
|
felhor = "rocks:felhor",
|
||||||
malachite = id("rocks:malachite"),
|
malachite = "rocks:malachite",
|
||||||
|
|
||||||
-- Liquids
|
-- Liquids
|
||||||
water = id("liquids:water_source"),
|
water = "liquids:water_source",
|
||||||
}, 10
|
},
|
||||||
)
|
waterLevel = 10,
|
||||||
|
biomesBorderScattering = 5,
|
||||||
|
})
|
||||||
|
|
||||||
local function calcTemp(layer, value, height)
|
local function calcTemp(layer, value, height)
|
||||||
return value
|
return value
|
||||||
@@ -240,7 +243,7 @@ mapGenerator:registerBiome('world', "biome1", {
|
|||||||
rock = "rocks:sylite",
|
rock = "rocks:sylite",
|
||||||
bottom = "soils:rocky_soil_baren",
|
bottom = "soils:rocky_soil_baren",
|
||||||
},
|
},
|
||||||
soilHeight = 1,
|
soilHeight = 5,
|
||||||
--generateRock = generateRock,
|
--generateRock = generateRock,
|
||||||
--generateSoil = generateSoil,
|
--generateSoil = generateSoil,
|
||||||
})
|
})
|
||||||
@@ -256,7 +259,7 @@ mapGenerator:registerBiome('world', "biome2", {
|
|||||||
rock = "rocks:felhor",
|
rock = "rocks:felhor",
|
||||||
bottom = "soils:clay_soil_baren",
|
bottom = "soils:clay_soil_baren",
|
||||||
},
|
},
|
||||||
soilHeight = 1,
|
soilHeight = 3,
|
||||||
--generateRock = generateRock,
|
--generateRock = generateRock,
|
||||||
--generateSoil = generateSoil,
|
--generateSoil = generateSoil,
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user