From b8810393686aebcbe34e4599c4174ba293a04dde Mon Sep 17 00:00:00 2001 From: Vanic Date: Wed, 22 Apr 2026 22:09:52 +0300 Subject: [PATCH] `soils`: Creation of a soil registration function. Registration of humus and meadow turf --- mods/GAME/ITEMS/soils/init.lua | 73 +++++++++++------- .../soils/textures/sheets/soils_sheet.png | Bin 7365 -> 21757 bytes 2 files changed, 45 insertions(+), 28 deletions(-) diff --git a/mods/GAME/ITEMS/soils/init.lua b/mods/GAME/ITEMS/soils/init.lua index 8dacbdd..b4e8d27 100644 --- a/mods/GAME/ITEMS/soils/init.lua +++ b/mods/GAME/ITEMS/soils/init.lua @@ -1,27 +1,50 @@ local Node, TileSheet = Smc.requireNode(), Smc.requireTileSheet() ----@type Node.NodeDefinition -local defaultSoilDef = { - settings = { - name = "", - _description = "A soil", - tiles = {}, - groups = { - dig_immediate = 2, - soil = 1, - soil_fertiliry = 100, -- Soil fertility for agriculture - } - }, -} - ----@type Node -local defaultSoil = Node:getExtended(defaultSoilDef) - -local soilFactory = defaultSoil:getFactory() - ---@type TileSheet -local ts = TileSheet:new("soils_sheet.png", 16, 16) +local soilTileSheet = TileSheet:new("soils_sheet.png", 16, 16) +---@class SoilDef +---@field rarity Item.Rarity? +---@field maxFertility integer + +---@param name string +---@param x number +---@param def SoilDef +---@param turfs table? +local function registerSoil(name, x, def, turfs) + local defaultSoil = Node:getExtended({ + settings = { + name = '', + groups = { + dig_immediate = 2, + soil = 1, + soil_fertility = def.maxFertility, + }, + }, + }) + + local soilTexture = soilTileSheet:t(x, 0) + + defaultSoil:new({ + settings = { + name = name, + tiles = {soilTexture} + }, + }) + + if turfs ~= nil then + for turfName, turfX in pairs(turfs) do + defaultSoil:new({ + settings = { + name = turfName, + tiles = {soilTileSheet:t(turfX,1), soilTexture, soilTexture..'^'..soilTileSheet:t(turfX,2)}, + }, + }) + end + end +end + +--[[ local clayTiles = { ts:t(0,0) } @@ -237,15 +260,9 @@ soilFactory:registerItems({ }, }, -}) +})--]] ---@type TileSheet local tsT = TileSheet:new("soils_turfs_sheet.png", 16, 16) -defaultSoil:new({ - settings = { - name = 'turf_swamp', - tiles = {tsT:t(0,0), ts:t(6, 0), ts:t(6,0)..'^'..tsT:t(0,1)}, - _rarity = 'unique' - } -}) \ No newline at end of file +registerSoil('humus', 0, {maxFertility = 100, rarity = 'uncommon'}, {turf_meadow=0}) diff --git a/mods/GAME/ITEMS/soils/textures/sheets/soils_sheet.png b/mods/GAME/ITEMS/soils/textures/sheets/soils_sheet.png index 65e20b248c4eb646cdcf497fbf1123bb9334401c..527acba677c12571c1477a2bbb7c460182672faa 100644 GIT binary patch literal 21757 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