From e4f8bc0d614c4c50bc3dc7531c8ba78f697f0fc4 Mon Sep 17 00:00:00 2001 From: Vanic Date: Thu, 20 Nov 2025 16:17:13 +0300 Subject: [PATCH] Mapgen: write SuperUltraSigmaMapgen part 6.4 --- mods/CORE/MapGen/src/MapGen.lua | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/mods/CORE/MapGen/src/MapGen.lua b/mods/CORE/MapGen/src/MapGen.lua index d45d757..2f8a1c8 100644 --- a/mods/CORE/MapGen/src/MapGen.lua +++ b/mods/CORE/MapGen/src/MapGen.lua @@ -111,10 +111,11 @@ end ---@param minY number ---@param maxY number function MapGen:RegisterLayer(name, minY, maxY) - ---Checking if layers overlap - if self:getLayerByHeight(minY) ~= nil and self:getLayerByHeight(maxY) ~= nil then - error('Registered layers must not overlap!') - end + -- Layers with the same name cannot exist. + assert(self.layersByName[name] == nil, ('A layer named `%s` is already registered.'):format(name)) + + -- Layers cannot overlap. + assert(self:getLayerByHeight(minY) == nil and self:getLayerByHeight(maxY) == nil, 'Registered layers must not overlap!') ---@type MapGen.Layer local layer = Layer:new(name, minY, maxY) @@ -140,6 +141,8 @@ function MapGen:registerPeak(layerName, peakPos, multinoise, groups) ---@type MapGen.Layer local layer = self.layersByName[layerName] + assert(layer ~= nil, ('There is no layer named `%s` registered.'):format(layerName)) + if not layer then error('Invalid layer: ' .. layerName) end @@ -193,6 +196,7 @@ end ---@param soilHeight number function MapGen:registerBiome(layerName, biomeName, tempPoint, humidityPoint, groundNodes, soilHeight) 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) @@ -211,6 +215,7 @@ end ---@param groups? table function MapGen:registerCavern(layerName, cavernName, minY, maxY, smoothDistance, noiseParams, groups) local layer = self.layersByName[layerName] + assert(layer ~= nil, ('There is no layer named `%s` registered.'):format(layerName)) assert(layer.cavernsByName[cavernName] == nil, ('A cavern named `%s` already exists in the `%s` layer.'):format(cavernName, layerName)) local cavern = Cavern:new(cavernName, minY, maxY, smoothDistance, noiseParams, groups)