wood: update wood blocks names, add timber textures, add log branch

This commit is contained in:
Van
2026-04-11 22:48:04 +03:00
parent b0aad2823a
commit 0189b29257
2 changed files with 54 additions and 31 deletions

View File

@@ -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',

Binary file not shown.

Before

Width:  |  Height:  |  Size: 133 KiB

After

Width:  |  Height:  |  Size: 133 KiB