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 65e20b2..527acba 100644 Binary files a/mods/GAME/ITEMS/soils/textures/sheets/soils_sheet.png and b/mods/GAME/ITEMS/soils/textures/sheets/soils_sheet.png differ