diff --git a/mods/CORE/Item/src/Item/Settings.lua b/mods/CORE/Item/src/Item/Settings.lua index 97c67cc..fb3dabe 100644 --- a/mods/CORE/Item/src/Item/Settings.lua +++ b/mods/CORE/Item/src/Item/Settings.lua @@ -1,8 +1,6 @@ ---@class Item.Settings local Settings = {} --- TODO: Разобраться с дубликатами аннотаций полей. Приоритетно брать аннотации из util/ide-helper - ---Technical name of the item. Must be unique and have the format `mod_name:item_name` ---@type string Settings.name = "" diff --git a/mods/CORE/MapGen/src/MapGen.lua b/mods/CORE/MapGen/src/MapGen.lua index aee856f..2a8e44c 100644 --- a/mods/CORE/MapGen/src/MapGen.lua +++ b/mods/CORE/MapGen/src/MapGen.lua @@ -326,32 +326,6 @@ local function generateRock(ids, data, index, x, y, z) end end ----DEV noises ----@type NoiseParams -local caveNoiseParams1 = { - offset = 0, - scale = 1, - spread = {x = 25, y = 25, z = 25}, - seed = 5934, - octaves = 3, - persistence = 0.5, - lacunarity = 2.0 -} - ----@type NoiseParams -local caveNoiseParams2 = { - offset = 0, - scale = 1, - spread = {x = 50, y = 10, z = 50}, -- Y меньше для горизонтального вытягивания - seed = -1034, - octaves = 2, - persistence = 0.6, - lacunarity = 2.0 -} - ----@type ValueNoise, ValueNoise -local caveNoise1, caveNoise2 - ---@param layer MapGen.Layer ---@param x number ---@param y number @@ -523,15 +497,6 @@ function MapGen:getNoises2dValues(layer, x, y, z) ---@param triangle MapGen.Triangle for _, triangle in ipairs(layer.trianglesList) do - local peak1 = triangle.p1 - local peak2 = triangle.p2 - local peak3 = triangle.p3 - - local pos1 = peak1:getPeakPos() - local pos2 = peak2:getPeakPos() - local pos3 = peak3:getPeakPos() - - -- If the point is in the triangle defined by the `MapGen.Peak`... if pointInTriangle(x, z,triangle) then local noiseHeightValue, noiseTempValue, noiseHumidityValue = calcNoises2dValues(triangle, x, y, z) diff --git a/mods/CORE/MapGen/src/MapGen/Layer.lua b/mods/CORE/MapGen/src/MapGen/Layer.lua index 9b6e047..d512ad2 100644 --- a/mods/CORE/MapGen/src/MapGen/Layer.lua +++ b/mods/CORE/MapGen/src/MapGen/Layer.lua @@ -35,8 +35,6 @@ end ---@param peak MapGen.Peak function Layer:addPeak(peak) table.insert(self.peaksList, peak) - -- TODO: добавить сортировку массива для оптимизации. - -- Вероятно будет лучше в отдельной фунции и засунуть её в MapGen.run end ---Returns a list of tables of the form `{peak, weight}`. diff --git a/mods/CORE/MapGen/src/MapGen/Layer/Cavern.lua b/mods/CORE/MapGen/src/MapGen/Layer/Cavern.lua index c6b89a5..5f42e20 100644 --- a/mods/CORE/MapGen/src/MapGen/Layer/Cavern.lua +++ b/mods/CORE/MapGen/src/MapGen/Layer/Cavern.lua @@ -70,10 +70,6 @@ end ---@param smoothDistance number ---@return number local function calcCavernWeight(y, smoothDistance, minY, maxY) - if y > maxY or y < minY then - return 0 - end - local maxDist = maxY - y local minDist = y - minY @@ -86,12 +82,18 @@ end ---@param threshold number? ---@return boolean function Cavern:isCavern(x, y, z, threshold) + local minY, maxY = self.minY, self.maxY + + if y > maxY or y < minY then + return false + end + if threshold == nil then threshold = 0 end local noise = self:getNoise() - local weight = calcCavernWeight(y, self.smoothDistance, self.minY, self.maxY) + local weight = calcCavernWeight(y, self.smoothDistance, minY, maxY) if y == -15 then print('is', weight) diff --git a/mods/CORE/Node/src/Node/Callbacks.lua b/mods/CORE/Node/src/Node/Callbacks.lua index 2526385..4f98d57 100644 --- a/mods/CORE/Node/src/Node/Callbacks.lua +++ b/mods/CORE/Node/src/Node/Callbacks.lua @@ -91,7 +91,7 @@ Callbacks.after_dig_node = nil --- ---default: nil ---* `pos`: node position ----* player: ObjectRef of digger TODO: в API было написано [player], это типо необязательный параметр? Я не понял +---* player: ObjectRef of digger ---@type fun(pos:Position, player:Player|ObjectRef|nil)? Callbacks.can_dig = nil diff --git a/mods/CORE/Node/src/Node/Settings.lua b/mods/CORE/Node/src/Node/Settings.lua index 4ba0d09..d49dac9 100644 --- a/mods/CORE/Node/src/Node/Settings.lua +++ b/mods/CORE/Node/src/Node/Settings.lua @@ -1,8 +1,6 @@ ---@type Item.Settings local ItemSettings = Core.Item.require('Item.Settings') --- TODO: Разобраться с дубликатами аннотаций полей. Приоритетно брать аннотации из util/ide-helper - ---@class Node.Settings : Item.Settings local Settings = Mod:getClassExtended(ItemSettings, {})