Item, Node, Factory: minor fixes for launch game

This commit is contained in:
Van
2025-09-22 18:30:13 +00:00
parent 37064dad5e
commit c3cde1fc63
6 changed files with 14 additions and 9 deletions

View File

@@ -1 +1,2 @@
name = smc__core__factory name = smc__core__factory
depends = smc__api__system

View File

@@ -19,7 +19,7 @@ end
---The aleas `table.merge` for EmmyLua ---The aleas `table.merge` for EmmyLua
---@type fun(...):(Item.ItemDefinition) ---@type fun(...):(Item.ItemDefinition)
local defMerge = function(...) local defMerge = function(...)
return table.merge(..., true) return table.merge(...)
end end
---@param itemDefs Item.ItemDefinition[] | Node.NodeDefinition[] List of nodes with parameters unique to them. ---@param itemDefs Item.ItemDefinition[] | Node.NodeDefinition[] List of nodes with parameters unique to them.
@@ -28,7 +28,7 @@ function Factory:registerItems(itemDefs)
for _, nodeDef in ipairs(itemDefs) do for _, nodeDef in ipairs(itemDefs) do
---@type Item.ItemDefinition ---@type Item.ItemDefinition
local nodeDef = defMerge(nodeDef, self.defaultDef) local nodeDef = defMerge(nodeDef, self.defaultDef, true)
self.itemClass:new(nodeDef) self.itemClass:new(nodeDef)

View File

@@ -1,2 +1,2 @@
name = smc__core__item name = smc__core__item
depends = smc__api__system, smc__core__enum depends = smc__api__system, smc__core__enum, smc__core__factory

View File

@@ -11,8 +11,11 @@ local VisualEnum = require('Item.VisualEnum')
local Item = { local Item = {
defaultDef = { defaultDef = {
settings = { settings = {
name = "" name = "",
} title = "",
description = "",
},
callbacks = {}
} }
} }
@@ -48,14 +51,14 @@ end
---The aleas `table.merge` for EmmyLua ---The aleas `table.merge` for EmmyLua
---@type fun(...):(Item.ItemDefinition) ---@type fun(...):(Item.ItemDefinition)
local defMerge = function(...) local defMerge = function(...)
return table.merge(..., true) return table.merge(...)
end end
---@param itemDef Item.ItemDefinition ---@param itemDef Item.ItemDefinition
---@return Item ---@return Item
function Item:new(itemDef) function Item:new(itemDef)
---Adding default parameters ---Adding default parameters
itemDef = defMerge(itemDef, self.defaultDef) itemDef = defMerge(itemDef, self.defaultDef, true)
---@type Item ---@type Item
local instance = setmetatable({}, {__index = self}) local instance = setmetatable({}, {__index = self})

View File

@@ -1,2 +1,2 @@
name = smc__core__node name = smc__core__node
depends = smc__core__item depends = smc__core__item, smc__core__factory

View File

@@ -38,7 +38,8 @@ function Node:getFactory(defaultDef)
defaultDef = self.defaultDef defaultDef = self.defaultDef
end end
local instance = Core.Factory():new(self, defaultDef) ---@type Factory
local instance = Core.Factory:getModClassInstance(self, defaultDef)
return instance return instance
end end