diff --git a/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraft.lua b/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraft.lua index 9611420..8de5a38 100644 --- a/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraft.lua +++ b/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraft.lua @@ -1,27 +1,48 @@ local getInstance = Class.getInstance +local tableInsert = table.insert + +local modInfo = Mod.getInfo('smc__core__craft_system') +local require = modInfo.require + +---@type CraftSystem.ImmersiveCraftStage +local ImmersiveCraftStage = require('CraftSystem.CraftSystem.ImmersiveCraftStage') + ---@class CraftSystem.ImmersiveCraft ----@field name string ----@field group CraftSystem.CraftGroup ----@field startStage string ----@field triggerItem string +---@field name string +---@field group CraftSystem.CraftGroup +---@field startStageName string +---@field triggerItem string +---@field stagesByName table local ImmersiveCraft = {} ---Definition table for the `CraftSystem.ImmersiveCraft`. --- ---**Only for EmmyLua.** ---@class CraftSystem.ImmersiveCraftDef ----@field startStage string ----@field triggerItem string +---@field group CraftSystem.CraftGroup +---@field startStageName string +---@field triggerItem string +---@field stages CraftSystem.ImmersiveCraftStageDef[] ---@param name string ---@param def CraftSystem.ImmersiveCraftDef ---@return CraftSystem.ImmersiveCraft function ImmersiveCraft:new(name, def) + local stagesByName = {} + + for _, stageDef in ipairs(def.stages) do + local stage = ImmersiveCraftStage:new(stageDef) + + stagesByName[stageDef.name] = stage + end + local instance = getInstance(self, { - name = name, - startNode = def.startStage, - triggerItem = def.triggerItem + name = name, + group = def.group, + startStageName = def.startStageName, + triggerItem = def.triggerItem, + stagesByName = stagesByName, }) return instance diff --git a/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraftStage.lua b/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraftStage.lua index cef8f44..8bfef46 100644 --- a/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraftStage.lua +++ b/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraftStage.lua @@ -1,20 +1,34 @@ local getInstance = Class.getInstance +---@alias CraftSystem.ImmersiveCraftStage.HandlerFunc fun(self, Player) + ---@class CraftSystem.ImmersiveCraftStage ----@field name string -local ImmersiveCraftStage = {} +---@field name string +---@field startHandler CraftSystem.ImmersiveCraftStage.HandlerFunc +---@field processHandler CraftSystem.ImmersiveCraftStage.HandlerFunc +---@field endHandler CraftSystem.ImmersiveCraftStage.HandlerFunc +---@field data table +local ImmersiveCraftStage = { + data = {} +} ---Definition table for the `CraftSystem.ImmersiveCraft`. --- ---**Only for EmmyLua.** ---@class CraftSystem.ImmersiveCraftStageDef +---@field name string +---@field startHandler CraftSystem.ImmersiveCraftStage.HandlerFunc +---@field processHandler CraftSystem.ImmersiveCraftStage.HandlerFunc +---@field endHandler CraftSystem.ImmersiveCraftStage.HandlerFunc ----@param name string ---@param def CraftSystem.ImmersiveCraftStageDef ---@return CraftSystem.ImmersiveCraftStage -function ImmersiveCraftStage:new(name, def) +function ImmersiveCraftStage:new(def) local instance = getInstance(self, { - name = name, + name = def.name, + startHandler = def.startHandler, + processHandler = def.processHandler, + endHandler = def.endHandler }) return instance