2 Commits

Author SHA1 Message Date
0189b29257 wood: update wood blocks names, add timber textures, add log branch 2026-04-11 22:48:04 +03:00
b0aad2823a Fix merge items settings 2026-04-11 21:54:49 +03:00
5 changed files with 59 additions and 36 deletions

View File

@@ -129,7 +129,7 @@ local function itemDefToLuantiDef(itemDef)
s._description = description s._description = description
s.description = luantiDescription..core.get_background_escape_sequence('#110F13') s.description = luantiDescription..core.get_background_escape_sequence('#110F13')
local luantiDef = defMerge(s, c) local luantiDef = defMerge(s, c, true)
return luantiDef return luantiDef
end end

View File

@@ -29,7 +29,7 @@ end
---@param defaultDef Node.NodeDefinition ---@param defaultDef Node.NodeDefinition
---@return Node ---@return Node
function Node:getExtended(defaultDef) function Node:getExtended(defaultDef)
defaultDef = defMerge(defaultDef, self.defaultDef) defaultDef = defMerge(defaultDef, self.defaultDef, true)
---@type Node ---@type Node
local ChildClass = Class.extend(self, { local ChildClass = Class.extend(self, {
@@ -46,7 +46,7 @@ function Node:getFactory(defaultDef)
if defaultDef == nil then if defaultDef == nil then
defaultDef = self.defaultDef defaultDef = self.defaultDef
else else
defaultDef = defMerge(self.defaultDef, defaultDef) defaultDef = defMerge(self.defaultDef, defaultDef, true)
end end
---@type ItemFactory ---@type ItemFactory

View File

@@ -29,7 +29,7 @@ end
---@param defaultDef Item.ItemDefinition ---@param defaultDef Item.ItemDefinition
---@return Tool ---@return Tool
function Tool:getExtended(defaultDef) function Tool:getExtended(defaultDef)
defaultDef = defMerge(defaultDef, self.defaultDef) defaultDef = defMerge(defaultDef, self.defaultDef, true)
---@type Tool ---@type Tool
local ChildClass = Class.extend(self, { local ChildClass = Class.extend(self, {
@@ -46,7 +46,7 @@ function Tool:getFactory(defaultDef)
if defaultDef == nil then if defaultDef == nil then
defaultDef = self.defaultDef defaultDef = self.defaultDef
else else
defaultDef = defMerge(self.defaultDef, defaultDef) defaultDef = defMerge(self.defaultDef, defaultDef, true)
end end
---@type ItemFactory ---@type ItemFactory

View File

@@ -8,7 +8,7 @@ local defaultLogDef = {
name = '', name = '',
tiles = {}, tiles = {},
groups = { groups = {
dig_immediate = 2, dig_immediate = 3,
wood = 1 wood = 1
}, },
} }
@@ -20,7 +20,7 @@ local defaultPlanksDef = {
name = '', name = '',
tiles = {}, tiles = {},
groups = { groups = {
dig_immediate = 2, dig_immediate = 3,
}, },
paramtype2 = 'facedir', paramtype2 = 'facedir',
}, },
@@ -33,7 +33,7 @@ local defaultLeafsDef = {
name = '', name = '',
tiles = {}, tiles = {},
groups = { groups = {
dig_immediate = 2, dig_immediate = 3,
}, },
--paramtype = 'light', --paramtype = 'light',
paramtype2 = 'facedir', paramtype2 = 'facedir',
@@ -70,7 +70,6 @@ end
local t = woodTileSheet local t = woodTileSheet
---@class WoodDef ---@class WoodDef
---@field rarity Item.Rarity? ---@field rarity Item.Rarity?
@@ -110,20 +109,19 @@ local function registerWood(name, x, def)
defaultLog:new({ defaultLog:new({
settings = { settings = {
name = name..'_timber', name = name..'_timber',
tiles = {woodTileSheet:t(x, 8), woodTileSheet:t(x, 8), tiles = {
woodTileSheet:t(x, 7), woodTileSheet:t(x, 7), woodTileSheet:t(x, 8)..'^[transformR90', woodTileSheet:t(x, 8)..'^[transformR90',
woodTileSheet:t(x, 8), woodTileSheet:t(x, 8),}, woodTileSheet:t(x, 8), woodTileSheet:t(x, 8),
woodTileSheet:t(x, 7), woodTileSheet:t(x, 7)
},
paramtype2 = 'facedir', paramtype2 = 'facedir',
_rarity = def.rarity, _rarity = def.rarity,
}, },
callbacks = {
on_place = core.rotate_node
}
}) })
defaultLog:new({ defaultLog:new({
settings = { settings = {
name = name..'_trunk', name = name..'_trunk_6_sides',
tiles = {woodTileSheet:t(x, 3)}, tiles = {woodTileSheet:t(x, 3)},
inventory_overlay = 'wood_trunk_overlay.png', inventory_overlay = 'wood_trunk_overlay.png',
drop = 'wood:'..name..'_log', drop = 'wood:'..name..'_log',
@@ -137,7 +135,7 @@ local function registerWood(name, x, def)
defaultLog:new({ defaultLog:new({
settings = { settings = {
name = name..'_trunk_vertical', name = name..'_trunk_4_sides',
tiles = getLogTiles(x, 2), tiles = getLogTiles(x, 2),
inventory_overlay = 'wood_trunk_overlay.png', inventory_overlay = 'wood_trunk_overlay.png',
drop = 'wood:'..name..'_log', drop = 'wood:'..name..'_log',
@@ -149,17 +147,15 @@ local function registerWood(name, x, def)
} }
}) })
defaultLog:new({ local defaultBranch6Sides = defaultLog:getExtended({
settings = { settings = {
drawtype = 'nodebox', drawtype = 'nodebox',
name = name..'_trunk_branch', name = '',
tiles = {woodTileSheet:t(x, 3)}, tiles = {woodTileSheet:t(x, 3)},
inventory_overlay = 'wood_trunk_overlay.png',
drop = 'wood:'..name..'_log',
paramtype = 'light', paramtype = 'light',
node_box = { node_box = {
type = 'connected', type = 'connected',
fixed = {-.25,-.25,-.25, .25,.25,.25}, fixed = {-.25,-.25,-.25, .25,.25,.25},
connect_top = {-.25,-.25,-.25, .25,.5,.25}, connect_top = {-.25,-.25,-.25, .25,.5,.25},
connect_bottom = {-.25,-.5,-.25, .25,.25,.25}, connect_bottom = {-.25,-.5,-.25, .25,.25,.25},
connect_front = {-.25,-.25,-.5, .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}, connect_right = {-.25,-.25,-.25, .5,.25,.25},
}, },
connects_to = {'group:wood', 'group:soil'}, connects_to = {'group:wood', 'group:soil'},
_rarity = def.rarity, _rarity = def.rarity,
}, },
}) })
defaultLog:new({ local node = defaultBranch6Sides:new({
settings = { settings = {
drawtype = 'nodebox', name = name..'_log_branch_6_sides',
name = name..'_trunk_branch_vertical', }
tiles = getLogTiles(x, 2), })
defaultBranch6Sides:new({
settings = {
name = name..'_trunk_branch_6_sides',
inventory_overlay = 'wood_trunk_overlay.png', 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', paramtype = 'light',
node_box = { node_box = {
type = 'connected', type = 'connected',
fixed = {-.25,-.25,-.25, .25,.25,.25}, fixed = {-.25,-.25,-.25, .25,.25,.25},
connect_top = {-.25,-.25,-.25, .25,.5,.25}, connect_top = {-.25,-.25,-.25, .25,.5,.25},
connect_bottom = {-.25,-.5,-.25, .25,.25,.25}, connect_bottom = {-.25,-.5,-.25, .25,.25,.25},
}, },
connects_to = {'group:wood', 'group:soil'}, 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({ defaultPlanks:new({
settings = { settings = {
name = name..'_planks', name = name..'_planks',

Binary file not shown.

Before

Width:  |  Height:  |  Size: 133 KiB

After

Width:  |  Height:  |  Size: 133 KiB