From 0189b29257b1381b8d1374012e87efbeb5b82d5e Mon Sep 17 00:00:00 2001 From: Vanic Date: Sat, 11 Apr 2026 22:48:04 +0300 Subject: [PATCH] `wood`: update wood blocks names, add timber textures, add log branch --- mods/GAME/ITEMS/wood/init.lua | 85 +++++++++++------- .../ITEMS/wood/textures/sheets/wood_sheet.png | Bin 135753 -> 135753 bytes 2 files changed, 54 insertions(+), 31 deletions(-) diff --git a/mods/GAME/ITEMS/wood/init.lua b/mods/GAME/ITEMS/wood/init.lua index 4c5db5b..b4c6cd9 100644 --- a/mods/GAME/ITEMS/wood/init.lua +++ b/mods/GAME/ITEMS/wood/init.lua @@ -8,7 +8,7 @@ local defaultLogDef = { name = '', tiles = {}, groups = { - dig_immediate = 2, + dig_immediate = 3, wood = 1 }, } @@ -20,7 +20,7 @@ local defaultPlanksDef = { name = '', tiles = {}, groups = { - dig_immediate = 2, + dig_immediate = 3, }, paramtype2 = 'facedir', }, @@ -33,7 +33,7 @@ local defaultLeafsDef = { name = '', tiles = {}, groups = { - dig_immediate = 2, + dig_immediate = 3, }, --paramtype = 'light', paramtype2 = 'facedir', @@ -70,7 +70,6 @@ end local t = woodTileSheet - ---@class WoodDef ---@field rarity Item.Rarity? @@ -110,20 +109,19 @@ local function registerWood(name, x, def) defaultLog:new({ settings = { name = name..'_timber', - 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),}, + 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, }, - callbacks = { - on_place = core.rotate_node - } }) defaultLog:new({ settings = { - name = name..'_trunk', + name = name..'_trunk_6_sides', tiles = {woodTileSheet:t(x, 3)}, inventory_overlay = 'wood_trunk_overlay.png', drop = 'wood:'..name..'_log', @@ -137,7 +135,7 @@ local function registerWood(name, x, def) defaultLog:new({ settings = { - name = name..'_trunk_vertical', + name = name..'_trunk_4_sides', tiles = getLogTiles(x, 2), inventory_overlay = 'wood_trunk_overlay.png', drop = 'wood:'..name..'_log', @@ -149,17 +147,15 @@ local function registerWood(name, x, def) } }) - defaultLog:new({ + local defaultBranch6Sides = defaultLog:getExtended({ settings = { - drawtype = 'nodebox', - name = name..'_trunk_branch', - tiles = {woodTileSheet:t(x, 3)}, - inventory_overlay = 'wood_trunk_overlay.png', - drop = 'wood:'..name..'_log', + drawtype = 'nodebox', + name = '', + tiles = {woodTileSheet:t(x, 3)}, paramtype = 'light', - node_box = { - type = 'connected', - fixed = {-.25,-.25,-.25, .25,.25,.25}, + node_box = { + type = 'connected', + fixed = {-.25,-.25,-.25, .25,.25,.25}, connect_top = {-.25,-.25,-.25, .25,.5,.25}, connect_bottom = {-.25,-.5,-.25, .25,.25,.25}, connect_front = {-.25,-.25,-.5, .25,.25,.25}, @@ -168,29 +164,56 @@ local function registerWood(name, x, def) connect_right = {-.25,-.25,-.25, .5,.25,.25}, }, connects_to = {'group:wood', 'group:soil'}, - _rarity = def.rarity, + _rarity = def.rarity, }, }) - defaultLog:new({ + local node = defaultBranch6Sides:new({ settings = { - drawtype = 'nodebox', - name = name..'_trunk_branch_vertical', - tiles = getLogTiles(x, 2), + name = name..'_log_branch_6_sides', + } + }) + + defaultBranch6Sides:new({ + settings = { + name = name..'_trunk_branch_6_sides', inventory_overlay = 'wood_trunk_overlay.png', - drop = 'wood:'..name..'_log', + drop = name..'_log_branch_6_sides', + } + }) + + local defaultBranch4Sides = defaultLog:getExtended({ + settings = { + drawtype = 'nodebox', + name = '', + tiles = getLogTiles(x, 2), + drop = 'wood:'..name..'_log', paramtype = 'light', - node_box = { - type = 'connected', - fixed = {-.25,-.25,-.25, .25,.25,.25}, + node_box = { + type = 'connected', + fixed = {-.25,-.25,-.25, .25,.25,.25}, connect_top = {-.25,-.25,-.25, .25,.5,.25}, connect_bottom = {-.25,-.5,-.25, .25,.25,.25}, }, connects_to = {'group:wood', 'group:soil'}, - _rarity = def.rarity, + _rarity = def.rarity, }, }) + defaultBranch4Sides: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', + } + }) + defaultPlanks:new({ settings = { name = name..'_planks', diff --git a/mods/GAME/ITEMS/wood/textures/sheets/wood_sheet.png b/mods/GAME/ITEMS/wood/textures/sheets/wood_sheet.png index d04e64708f435849629488f9320e17bea7e02be3..9c8b268e4c2b236b7f09b8fa017e4a20fbb2d831 100644 GIT binary patch delta 9215 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 ag3k_(ymRKekDlkj)jqVgCQ-fh&3^%&Uw!KU