forked from Apancore.Studio/simple-makes-complex
Item, Node, Factory: minor fixes for launch game
This commit is contained in:
@@ -1 +1,2 @@
|
||||
name = smc__core__factory
|
||||
depends = smc__api__system
|
||||
|
||||
@@ -19,7 +19,7 @@ end
|
||||
---The aleas `table.merge` for EmmyLua
|
||||
---@type fun(...):(Item.ItemDefinition)
|
||||
local defMerge = function(...)
|
||||
return table.merge(..., true)
|
||||
return table.merge(...)
|
||||
end
|
||||
|
||||
---@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
|
||||
|
||||
---@type Item.ItemDefinition
|
||||
local nodeDef = defMerge(nodeDef, self.defaultDef)
|
||||
local nodeDef = defMerge(nodeDef, self.defaultDef, true)
|
||||
|
||||
self.itemClass:new(nodeDef)
|
||||
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
name = smc__core__item
|
||||
depends = smc__api__system, smc__core__enum
|
||||
depends = smc__api__system, smc__core__enum, smc__core__factory
|
||||
|
||||
@@ -11,8 +11,11 @@ local VisualEnum = require('Item.VisualEnum')
|
||||
local Item = {
|
||||
defaultDef = {
|
||||
settings = {
|
||||
name = ""
|
||||
}
|
||||
name = "",
|
||||
title = "",
|
||||
description = "",
|
||||
},
|
||||
callbacks = {}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -48,14 +51,14 @@ end
|
||||
---The aleas `table.merge` for EmmyLua
|
||||
---@type fun(...):(Item.ItemDefinition)
|
||||
local defMerge = function(...)
|
||||
return table.merge(..., true)
|
||||
return table.merge(...)
|
||||
end
|
||||
|
||||
---@param itemDef Item.ItemDefinition
|
||||
---@return Item
|
||||
function Item:new(itemDef)
|
||||
---Adding default parameters
|
||||
itemDef = defMerge(itemDef, self.defaultDef)
|
||||
itemDef = defMerge(itemDef, self.defaultDef, true)
|
||||
|
||||
---@type Item
|
||||
local instance = setmetatable({}, {__index = self})
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
name = smc__core__node
|
||||
depends = smc__core__item
|
||||
depends = smc__core__item, smc__core__factory
|
||||
|
||||
@@ -38,7 +38,8 @@ function Node:getFactory(defaultDef)
|
||||
defaultDef = self.defaultDef
|
||||
end
|
||||
|
||||
local instance = Core.Factory():new(self, defaultDef)
|
||||
---@type Factory
|
||||
local instance = Core.Factory:getModClassInstance(self, defaultDef)
|
||||
|
||||
return instance
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user