diff --git a/mods/GAME/ITEMS/wood/init.lua b/mods/GAME/ITEMS/wood/init.lua index f79f5d5..0d4b9d5 100644 --- a/mods/GAME/ITEMS/wood/init.lua +++ b/mods/GAME/ITEMS/wood/init.lua @@ -1,4 +1,4 @@ -local Node, TileSheet = Smc.requireNode(), Smc.requireTileSheet() +local Item, Node, TileSheet = Smc.requireItem(), Smc.requireNode(), Smc.requireTileSheet() local PrimitiveCraftHandler = Smc.requireCraftSystemPrimitiveCraftHandler() @@ -42,25 +42,33 @@ local defaultLeafsDef = { }, } +---@type Item.ItemDefinition +local defaultStickDef = { + settings = { + name = '', + }, +} + local defaultLog = Node:getExtended(defaultLogDef) local defaultPlanks = Node:getExtended(defaultPlanksDef) local defaultLeafs = Node:getExtended(defaultLeafsDef) +local defaultStick = Item:getExtended(defaultStickDef) local logFactory = defaultLog:getFactory() local planksFactory = defaultPlanks:getFactory() ---@type TileSheet -local logTileSheet = TileSheet:new('wood_sheet.png', 16, 16) +local woodTileSheet = TileSheet:new('wood_sheet.png', 16, 16) local function getLogTiles(x, y) return { - logTileSheet:t(x, y), - logTileSheet:t(x, y), - logTileSheet:t(x, y+1), + woodTileSheet:t(x, y), + woodTileSheet:t(x, y), + woodTileSheet:t(x, y+1), } end -local t = logTileSheet +local t = woodTileSheet ---@class WoodDef @@ -101,9 +109,9 @@ local function registerWood(name, x, def) defaultLog:new({ settings = { name = name..'_timber', - tiles = {logTileSheet:t(x, 8), logTileSheet:t(x, 8), - logTileSheet:t(x, 7), logTileSheet:t(x, 7), - logTileSheet:t(x, 8), logTileSheet:t(x, 8),}, + tiles = {woodTileSheet:t(x, 8), woodTileSheet:t(x, 8), + woodTileSheet:t(x, 7), woodTileSheet:t(x, 7), + woodTileSheet:t(x, 8), woodTileSheet:t(x, 8),}, paramtype2 = 'facedir', _rarity = def.rarity, }, @@ -115,7 +123,7 @@ local function registerWood(name, x, def) defaultLog:new({ settings = { name = name..'_trunk', - tiles = {logTileSheet:t(x, 3)}, + tiles = {woodTileSheet:t(x, 3)}, inventory_overlay = 'wood_trunk_overlay.png', drop = 'wood:'..name..'_log', paramtype2 = 'facedir', @@ -144,7 +152,7 @@ local function registerWood(name, x, def) settings = { drawtype = 'nodebox', name = name..'_trunk_branch', - tiles = {logTileSheet:t(x, 3)}, + tiles = {woodTileSheet:t(x, 3)}, inventory_overlay = 'wood_trunk_overlay.png', drop = 'wood:'..name..'_log', paramtype = 'light', @@ -185,7 +193,7 @@ local function registerWood(name, x, def) defaultPlanks:new({ settings = { name = name..'_planks', - tiles = { logTileSheet:t(x, 6) }, + tiles = { woodTileSheet:t(x, 6) }, _rarity = def.rarity, }, }) @@ -193,11 +201,32 @@ local function registerWood(name, x, def) defaultLeafs:new({ settings = { name = name..'_leafs', - tiles = { logTileSheet:t(x, 1) }, + tiles = { woodTileSheet:t(x, 1) }, _rarity = def.rarity, }, }) + defaultStick:new({ + settings = { + name = name..'_stick', + inventory_image = woodTileSheet:t(x, 9) + } + }) + + defaultStick:new({ + settings = { + name = name..'_plank', + inventory_image = woodTileSheet:t(x, 10) + } + }) + + defaultStick:new({ + settings = { + name = name..'_bar', + inventory_image = woodTileSheet:t(x, 11) + } + }) + PrimitiveCraftHandler:registerCraft('wood:'..name..'_planks', { recipe = { 'wood:'..name..'_log' @@ -208,11 +237,35 @@ local function registerWood(name, x, def) PrimitiveCraftHandler:registerCraft('wood:'..name..'_log_stripped', { recipe = { - 'wood:'..name..'_log 2' + 'wood:'..name..'_log' }, output = 'wood:'..name..'_log_stripped', group = 'test' }) + + PrimitiveCraftHandler:registerCraft('wood:'..name..'_bar', { + recipe = { + 'wood:'..name..'_log' + }, + output = 'wood:'..name..'_bar 4', + group = 'test' + }) + + PrimitiveCraftHandler:registerCraft('wood:'..name..'_plank', { + recipe = { + 'wood:'..name..'_bar' + }, + output = 'wood:'..name..'_plank 2', + group = 'test' + }) + + PrimitiveCraftHandler:registerCraft('wood:'..name..'_stick', { + recipe = { + 'wood:'..name..'_bar' + }, + output = 'wood:'..name..'_stick 4', + group = 'test' + }) end registerWood('marentine', 0) diff --git a/mods/GAME/ITEMS/wood/textures/sheets/wood_sheet.png b/mods/GAME/ITEMS/wood/textures/sheets/wood_sheet.png index f72a450..362045e 100644 Binary files a/mods/GAME/ITEMS/wood/textures/sheets/wood_sheet.png and b/mods/GAME/ITEMS/wood/textures/sheets/wood_sheet.png differ