From 600c83ea045a5886896b2b0adcccf953090d3119 Mon Sep 17 00:00:00 2001 From: varttist Date: Fri, 2 Oct 2026 21:30:53 +0300 Subject: [PATCH] `wood`: change braches registration --- mods/GAME/ITEMS/wood/init.lua | 125 ++++++++++++++-------------------- 1 file changed, 50 insertions(+), 75 deletions(-) diff --git a/mods/GAME/ITEMS/wood/init.lua b/mods/GAME/ITEMS/wood/init.lua index f902896..44510ec 100644 --- a/mods/GAME/ITEMS/wood/init.lua +++ b/mods/GAME/ITEMS/wood/init.lua @@ -83,6 +83,7 @@ local function registerWood(name, x, def) def = {} end + -- Tree log with cut annual rings defaultLog:new({ settings = { name = name..'_log', @@ -96,6 +97,7 @@ local function registerWood(name, x, def) } }) + -- Stripped Log defaultLog:new({ settings = { name = name..'_log_stripped', @@ -108,25 +110,11 @@ local function registerWood(name, x, def) } }) + -- Tree trunk completely covered in bark defaultLog:new({ settings = { - name = name..'_timber', - tiles = { - woodTileSheet:t(x, 8)..'^[transformR90', woodTileSheet:t(x, 8)..'^[transformR90', - woodTileSheet:t(x, 8), woodTileSheet:t(x, 8), - woodTileSheet:t(x, 7), woodTileSheet:t(x, 7) - }, - paramtype2 = 'facedir', - _rarity = def.rarity, - groups = {segments = 1} - }, - }) - - defaultLog:new({ - settings = { - name = name..'_trunk_6_sides', + name = name..'_trunk', tiles = {woodTileSheet:t(x, 3)}, - inventory_overlay = 'wood_trunk_overlay.png', drop = 'wood:'..name..'_log', paramtype2 = 'facedir', _rarity = def.rarity, @@ -136,24 +124,13 @@ local function registerWood(name, x, def) } }) + -- --- Tree branches --- + + -- Branch completely covered in bark defaultLog:new({ - settings = { - name = name..'_trunk_4_sides', - tiles = getLogTiles(x, 2), - inventory_overlay = 'wood_trunk_overlay.png', - drop = 'wood:'..name..'_log', - paramtype2 = 'facedir', - _rarity = def.rarity, - }, - callbacks = { - on_place = core.rotate_node - } - }) - - local defaultBranch6Sides = defaultLog:getExtended({ settings = { drawtype = 'nodebox', - name = '', + name = name..'_log_branch_6_sides', tiles = {woodTileSheet:t(x, 3)}, paramtype = 'light', node_box = { @@ -171,24 +148,11 @@ local function registerWood(name, x, def) }, }) - local node = defaultBranch6Sides:new({ - settings = { - name = name..'_log_branch_6_sides', - } - }) - - defaultBranch6Sides:new({ - settings = { - name = name..'_trunk_branch_6_sides', - inventory_overlay = 'wood_trunk_overlay.png', - drop = name..'_log_branch_6_sides', - } - }) - - local defaultBranch4Sides = defaultLog:getExtended({ + -- Branch with cut annual rings + defaultLog:new({ settings = { drawtype = 'nodebox', - name = '', + name = name..'_log_branch_4_sides', tiles = getLogTiles(x, 2), drop = 'wood:'..name..'_log', paramtype = 'light', @@ -203,20 +167,43 @@ local function registerWood(name, x, def) }, }) - defaultBranch4Sides:new({ + -- Tree leafs + defaultLeafs:new({ settings = { - name = name..'_log_branch_4_sides', - } - }) - - defaultBranch4Sides:new({ - settings = { - name = name..'_trunk_branch_4_sides', - inventory_overlay = 'wood_trunk_overlay.png', - drop = name..'_log_branch_4_sides', + name = name..'_leafs', + tiles = { woodTileSheet:t(x, 1) }, + _rarity = def.rarity, + }, + }) + + + -- --- Tree lumber --- + + -- Timber (block) + defaultLog:new({ + settings = { + name = name..'_timber', + tiles = { + woodTileSheet:t(x, 8)..'^[transformR90', + woodTileSheet:t(x, 8)..'^[transformR90', + woodTileSheet:t(x, 8), woodTileSheet:t(x, 8), + woodTileSheet:t(x, 7), woodTileSheet:t(x, 7) + }, + paramtype2 = 'facedir', + _rarity = def.rarity, + groups = {segments = 1} + }, + }) + + -- Bar (item) + defaultStick:new({ + settings = { + name = name..'_bar', + inventory_image = woodTileSheet:t(x, 11) } }) + -- Planks (block) defaultPlanks:new({ settings = { name = name..'_planks', @@ -226,21 +213,7 @@ local function registerWood(name, x, def) }, }) - defaultLeafs:new({ - settings = { - name = name..'_leafs', - tiles = { woodTileSheet:t(x, 1) }, - _rarity = def.rarity, - }, - }) - - defaultStick:new({ - settings = { - name = name..'_stick', - inventory_image = woodTileSheet:t(x, 9) - } - }) - + -- Plank (item) defaultStick:new({ settings = { name = name..'_plank', @@ -248,13 +221,15 @@ local function registerWood(name, x, def) } }) - defaultStick:new({ + -- Stick + defaultStick:new({ settings = { - name = name..'_bar', - inventory_image = woodTileSheet:t(x, 11) + name = name..'_stick', + inventory_image = woodTileSheet:t(x, 9) } }) + -- --- Crafts --- InventoryCraftHandler:registerCraft('wood:'..name..'_planks', { recipe = { 'wood:'..name..'_log'