MapGen: Moving checks for layer object uniqueness from mapgen methods to layer methods

This commit is contained in:
Van
2026-01-21 19:10:27 +03:00
parent fc90ae54c0
commit f3c5beb341
2 changed files with 12 additions and 9 deletions

View File

@@ -407,8 +407,6 @@ end
function MapGen:registerBiome(layerName, biomeName, def) function MapGen:registerBiome(layerName, biomeName, def)
local layer = self.layersByName[layerName] local layer = self.layersByName[layerName]
assert(layer ~= nil, ('There is no layer named `%s` registered.'):format(layerName)) assert(layer ~= nil, ('There is no layer named `%s` registered.'):format(layerName))
---TODO: перенести проверку на уникальность в конструктор
assert(layer.biomesByName[biomeName] == nil, ('A biome named `%s` already exists in the `%s` layer.'):format(biomeName, layerName))
local biome = Biome:new(biomeName, def) local biome = Biome:new(biomeName, def)
@@ -423,8 +421,6 @@ end
function MapGen:registerCavern(layerName, cavernName, def, regionVertices) function MapGen:registerCavern(layerName, cavernName, def, regionVertices)
local layer = self.layersByName[layerName] local layer = self.layersByName[layerName]
assert(layer ~= nil, ('There is no layer named `%s` registered.'):format(layerName)) assert(layer ~= nil, ('There is no layer named `%s` registered.'):format(layerName))
---TODO: перенести проверку на уникальность в конструктор
assert(layer.cavernsByName[cavernName] == nil, ('A cavern named `%s` already exists in the `%s` layer.'):format(cavernName, layerName))
if regionVertices ~= nil then if regionVertices ~= nil then
self:registerRegion(layerName, cavernName, { self:registerRegion(layerName, cavernName, {
@@ -446,8 +442,6 @@ end
function MapGen:registerRegion(layerName, regionName, def) function MapGen:registerRegion(layerName, regionName, def)
local layer = self.layersByName[layerName] local layer = self.layersByName[layerName]
assert(layer ~= nil, ('There is no layer named `%s` registered.'):format(layerName)) assert(layer ~= nil, ('There is no layer named `%s` registered.'):format(layerName))
---TODO: перенести проверку на уникальность в конструктор
assert(layer.regionsByName[regionName] == nil, ('A region named `%s` already exists in the `%s` layer.'):format(regionName, layerName))
local region = Region:new(regionName, def) local region = Region:new(regionName, def)

View File

@@ -179,7 +179,10 @@ end
---@param biomeName string ---@param biomeName string
---@param biome MapGen.Biome ---@param biome MapGen.Biome
function Layer:addBiome(biomeName, biome) function Layer:addBiome(biomeName, biome)
-- TODO: перенести сюда проверку на уникальность assert(self.biomesByName[biomeName] == nil,
('A biome named `%s` already exists in the `%s` layer.'):format(
biomeName, self.name))
self.biomesByName[biomeName] = biome self.biomesByName[biomeName] = biome
table.insert(self.biomesList, biome) table.insert(self.biomesList, biome)
end end
@@ -188,13 +191,19 @@ end
---@param cavernName string ---@param cavernName string
---@param cavern MapGen.Cavern ---@param cavern MapGen.Cavern
function Layer:addCavern(cavernName, cavern) function Layer:addCavern(cavernName, cavern)
-- TODO: перенести сюда проверку на уникальность assert(self.cavernsByName[cavernName] == nil,
('A cavern named `%s` already exists in the `%s` layer.'):format(
cavernName, self.name))
self.cavernsByName[cavernName] = cavern self.cavernsByName[cavernName] = cavern
table.insert(self.cavernsList, cavern) table.insert(self.cavernsList, cavern)
end end
function Layer:addRegion(regionName, region) function Layer:addRegion(regionName, region)
-- TODO: перенести сюда проверку на уникальность assert(self.regionsByName[regionName] == nil,
('A region named `%s` already exists in the `%s` layer.'):format(
regionName, self.name))
self.regionsByName[regionName] = region self.regionsByName[regionName] = region
--table.insert(self.regionsList, region) --table.insert(self.regionsList, region)
end end