CraftSystem: rewrite system, completion of work on immersive craft
This commit is contained in:
@@ -3,23 +3,26 @@ local require = modInfo.require
|
|||||||
|
|
||||||
---@type CraftSystem.PrimitiveCraftHandler
|
---@type CraftSystem.PrimitiveCraftHandler
|
||||||
local PrimitiveCraftHandler = require('CraftSystem.PrimitiveCraftHandler')
|
local PrimitiveCraftHandler = require('CraftSystem.PrimitiveCraftHandler')
|
||||||
|
---@type CraftSystem.ImmersiveCraftHandler
|
||||||
|
local ImmersiveCraftHandler= require('CraftSystem.ImmersiveCraftHandler')
|
||||||
|
|
||||||
---@alias CraftSystem.CraftGroup string
|
---@alias CraftSystem.CraftGroup string
|
||||||
---@alias CraftSystem.CraftRecipe string[]
|
---@alias CraftSystem.CraftRecipe string[]
|
||||||
---@alias CraftSystem.CraftType 'primitive'
|
---@alias CraftSystem.CraftType 'primitive'|'immersive'
|
||||||
|
|
||||||
---@class CraftSystem
|
---@class CraftSystem
|
||||||
local CraftSystem = {}
|
local CraftSystem = {}
|
||||||
|
|
||||||
---@param craftType CraftSystem.CraftType
|
|
||||||
---@param craftName string
|
---@param craftName string
|
||||||
---@param def CraftSystem.PrimitiveCraftDef
|
---@param def CraftSystem.PrimitiveCraftDef
|
||||||
function CraftSystem.registerCraft(craftType, craftName, def)
|
function CraftSystem.registerPrimitiveCraft(craftName, def)
|
||||||
if craftType == 'primitive' then
|
|
||||||
PrimitiveCraftHandler:addCraft(craftName, def)
|
PrimitiveCraftHandler:addCraft(craftName, def)
|
||||||
else
|
end
|
||||||
error(('Craft type `%s` does not exist'):format(craftType))
|
|
||||||
end
|
---@param craftName string
|
||||||
|
---@param def CraftSystem.ImmersiveCraftDef
|
||||||
|
function CraftSystem.registerImmersiveCraft(craftName, def)
|
||||||
|
ImmersiveCraftHandler:addCraft(craftName, def)
|
||||||
end
|
end
|
||||||
|
|
||||||
return CraftSystem
|
return CraftSystem
|
||||||
|
|||||||
13
mods/CORE/CraftSystem/src/CraftSystem/BaseCraft.lua
Normal file
13
mods/CORE/CraftSystem/src/CraftSystem/BaseCraft.lua
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
---Abstract class for craft.
|
||||||
|
---@class CraftSystem.BaseCraft
|
||||||
|
---@field name string
|
||||||
|
---@field group CraftSystem.CraftGroup
|
||||||
|
local BaseCraft = {}
|
||||||
|
|
||||||
|
---Definition table for the `CraftSystem.BaseCraft`.
|
||||||
|
---
|
||||||
|
---**Only for EmmyLua.**
|
||||||
|
---@class CraftSystem.BaseCraftDef
|
||||||
|
---@field group CraftSystem.CraftGroup
|
||||||
|
|
||||||
|
return BaseCraft
|
||||||
47
mods/CORE/CraftSystem/src/CraftSystem/BaseCraftHandler.lua
Normal file
47
mods/CORE/CraftSystem/src/CraftSystem/BaseCraftHandler.lua
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
---Abstract class for handling crafting.
|
||||||
|
---@class CraftSystem.BaseCraftHandler
|
||||||
|
---@field craftsByName table<string, CraftSystem.BaseCraft>
|
||||||
|
---@field craftsByGroup table<CraftSystem.CraftGroup, CraftSystem.BaseCraft[]>
|
||||||
|
---@field craftsList CraftSystem.BaseCraft[]
|
||||||
|
---@field learnedCrafts table<string, table<string, CraftSystem.BaseCraft>>
|
||||||
|
local BaseCraftHandler = {
|
||||||
|
craftsByName = {},
|
||||||
|
craftsByGroup = {},
|
||||||
|
craftsList = {},
|
||||||
|
learnedCrafts = {},
|
||||||
|
}
|
||||||
|
|
||||||
|
---@param craftName string
|
||||||
|
---@return CraftSystem.BaseCraft
|
||||||
|
function BaseCraftHandler:getCraftByName(craftName)
|
||||||
|
local craft = self.craftsByName[craftName]
|
||||||
|
|
||||||
|
assert(craft ~= nil, ('There is no primitive craft named `%s`.'):format(
|
||||||
|
craftName))
|
||||||
|
|
||||||
|
return craft
|
||||||
|
end
|
||||||
|
|
||||||
|
---@param craftGroup CraftSystem.CraftGroup
|
||||||
|
---@return CraftSystem.BaseCraft[]
|
||||||
|
function BaseCraftHandler:getCraftsByGroup(craftGroup)
|
||||||
|
local crafts = self.craftsByGroup[craftGroup]
|
||||||
|
|
||||||
|
assert(crafts ~= nil, ('There are no primitive crafts with `%s` group'):format(
|
||||||
|
craftGroup))
|
||||||
|
|
||||||
|
return crafts
|
||||||
|
end
|
||||||
|
|
||||||
|
---@param playerName string
|
||||||
|
---@return table<string, CraftSystem.BaseCraft>
|
||||||
|
function BaseCraftHandler:getLearnedCrafts(playerName)
|
||||||
|
local crafts = self.learnedCrafts[playerName]
|
||||||
|
|
||||||
|
assert(crafts ~= nil, ('There is no primitive crafting data for a player named `%s`.'):format(
|
||||||
|
playerName))
|
||||||
|
|
||||||
|
return crafts
|
||||||
|
end
|
||||||
|
|
||||||
|
return BaseCraftHandler
|
||||||
@@ -1,26 +1,23 @@
|
|||||||
local getInstance = Class.getInstance
|
local getInstance, extend = Class.getInstance, Class.extend
|
||||||
|
|
||||||
local tableInsert = table.insert
|
|
||||||
|
|
||||||
local modInfo = Mod.getInfo('smc__core__craft_system')
|
local modInfo = Mod.getInfo('smc__core__craft_system')
|
||||||
local require = modInfo.require
|
local require = modInfo.require
|
||||||
|
|
||||||
|
---@type CraftSystem.BaseCraft
|
||||||
|
local BaseCraft = require('CraftSystem.BaseCraft')
|
||||||
---@type CraftSystem.ImmersiveCraftStage
|
---@type CraftSystem.ImmersiveCraftStage
|
||||||
local ImmersiveCraftStage = require('CraftSystem.CraftSystem.ImmersiveCraftStage')
|
local ImmersiveCraftStage = require('CraftSystem.ImmersiveCraftStage')
|
||||||
|
|
||||||
---@class CraftSystem.ImmersiveCraft
|
---@class CraftSystem.ImmersiveCraft : CraftSystem.BaseCraft
|
||||||
---@field name string
|
|
||||||
---@field group CraftSystem.CraftGroup
|
|
||||||
---@field startStageName string
|
---@field startStageName string
|
||||||
---@field triggerItem string
|
---@field triggerItem string
|
||||||
---@field stagesByName table<string, CraftSystem.ImmersiveCraftStage>
|
---@field stagesByName table<string, CraftSystem.ImmersiveCraftStage>
|
||||||
local ImmersiveCraft = {}
|
local ImmersiveCraft = extend(BaseCraft, {})
|
||||||
|
|
||||||
---Definition table for the `CraftSystem.ImmersiveCraft`.
|
---Definition table for the `CraftSystem.ImmersiveCraft`.
|
||||||
---
|
---
|
||||||
---**Only for EmmyLua.**
|
---**Only for EmmyLua.**
|
||||||
---@class CraftSystem.ImmersiveCraftDef
|
---@class CraftSystem.ImmersiveCraftDef : CraftSystem.BaseCraftDef
|
||||||
---@field group CraftSystem.CraftGroup
|
|
||||||
---@field startStageName string
|
---@field startStageName string
|
||||||
---@field triggerItem string
|
---@field triggerItem string
|
||||||
---@field stages CraftSystem.ImmersiveCraftStageDef[]
|
---@field stages CraftSystem.ImmersiveCraftStageDef[]
|
||||||
|
|||||||
@@ -1,12 +1,56 @@
|
|||||||
|
local extend = Class.extend
|
||||||
|
|
||||||
local tableInsert = table.insert
|
local tableInsert = table.insert
|
||||||
|
|
||||||
local modInfo = Mod.getInfo('smc__core__craft_system')
|
local modInfo = Mod.getInfo('smc__core__craft_system')
|
||||||
local require = modInfo.require
|
local require = modInfo.require
|
||||||
|
|
||||||
|
---@type CraftSystem.BaseCraftHandler
|
||||||
|
local BaseCraftHandler = require('CraftSystem.BaseCraftHandler')
|
||||||
---@type CraftSystem.ImmersiveCraft
|
---@type CraftSystem.ImmersiveCraft
|
||||||
local ImmersiveCraft = require('CraftSystem.ImmersiveCraft')
|
local ImmersiveCraft = require('CraftSystem.ImmersiveCraft')
|
||||||
|
|
||||||
---@class CraftSystem.ImmersiveCraftHandler
|
---@class CraftSystem.ImmersiveCraftHandler : CraftSystem.BaseCraftHandler
|
||||||
local ImmersiveCraftHandler = {}
|
---@field craftsByTriggerItem table<string, CraftSystem.ImmersiveCraft[]>
|
||||||
|
---@field getCraftByName fun(craftName:string):CraftSystem.ImmersiveCraft
|
||||||
|
---@field getCraftsByGroup fun(craftGroup):CraftSystem.ImmersiveCraft[]
|
||||||
|
---@field getLearnedCrafts fun(playerName):table<string, CraftSystem.ImmersiveCraft>
|
||||||
|
local ImmersiveCraftHandler = extend(BaseCraftHandler, {
|
||||||
|
craftsByTriggerItem = {},
|
||||||
|
})
|
||||||
|
|
||||||
|
---@param craftName string
|
||||||
|
---@param def CraftSystem.ImmersiveCraftDef
|
||||||
|
function ImmersiveCraftHandler:addCraft(craftName, def)
|
||||||
|
assert(self.craftsByName[craftName] == nil, ('A craft named `%s` already exists.'):format(
|
||||||
|
craftName))
|
||||||
|
|
||||||
|
local craft = ImmersiveCraft:new(craftName, def)
|
||||||
|
|
||||||
|
local group = def.group
|
||||||
|
|
||||||
|
if self.craftsByGroup[group] == nil then
|
||||||
|
self.craftsByGroup[group] = {}
|
||||||
|
end
|
||||||
|
|
||||||
|
local triggerItem = def.triggerItem
|
||||||
|
|
||||||
|
if self.craftsByTriggerItem[triggerItem] == nil then
|
||||||
|
self.craftsByTriggerItem[triggerItem] = {}
|
||||||
|
end
|
||||||
|
|
||||||
|
self.craftsByName[craftName] = craft
|
||||||
|
tableInsert(self.craftsByGroup[group], craft)
|
||||||
|
tableInsert(self.craftsByTriggerItem[triggerItem], craft)
|
||||||
|
tableInsert(self.craftsList, craft)
|
||||||
|
end
|
||||||
|
|
||||||
|
---@param triggerItem string
|
||||||
|
---@return CraftSystem.ImmersiveCraft[]?
|
||||||
|
function ImmersiveCraftHandler:getCraftsByTriggerItem(triggerItem)
|
||||||
|
local crafts = self.craftsByTriggerItem[triggerItem]
|
||||||
|
|
||||||
|
return crafts
|
||||||
|
end
|
||||||
|
|
||||||
return ImmersiveCraftHandler
|
return ImmersiveCraftHandler
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ local getInstance = Class.getInstance
|
|||||||
---@field processHandler CraftSystem.ImmersiveCraftStage.HandlerFunc
|
---@field processHandler CraftSystem.ImmersiveCraftStage.HandlerFunc
|
||||||
---@field endHandler CraftSystem.ImmersiveCraftStage.HandlerFunc
|
---@field endHandler CraftSystem.ImmersiveCraftStage.HandlerFunc
|
||||||
---@field data table
|
---@field data table
|
||||||
|
---@field returnItems table? TODO: доделать тут тип
|
||||||
local ImmersiveCraftStage = {
|
local ImmersiveCraftStage = {
|
||||||
data = {}
|
data = {}
|
||||||
}
|
}
|
||||||
@@ -20,6 +21,7 @@ local ImmersiveCraftStage = {
|
|||||||
---@field startHandler CraftSystem.ImmersiveCraftStage.HandlerFunc
|
---@field startHandler CraftSystem.ImmersiveCraftStage.HandlerFunc
|
||||||
---@field processHandler CraftSystem.ImmersiveCraftStage.HandlerFunc
|
---@field processHandler CraftSystem.ImmersiveCraftStage.HandlerFunc
|
||||||
---@field endHandler CraftSystem.ImmersiveCraftStage.HandlerFunc
|
---@field endHandler CraftSystem.ImmersiveCraftStage.HandlerFunc
|
||||||
|
---@field returnItems table? TODO: доделать тут тип
|
||||||
|
|
||||||
---@param def CraftSystem.ImmersiveCraftStageDef
|
---@param def CraftSystem.ImmersiveCraftStageDef
|
||||||
---@return CraftSystem.ImmersiveCraftStage
|
---@return CraftSystem.ImmersiveCraftStage
|
||||||
|
|||||||
@@ -1,18 +1,21 @@
|
|||||||
local getInstance = Class.getInstance
|
local getInstance, extend = Class.getInstance, Class.extend
|
||||||
|
|
||||||
---@class CraftSystem.PrimitiveCraft
|
local modInfo = Mod.getInfo('smc__core__craft_system')
|
||||||
---@field name string
|
local require = modInfo.require
|
||||||
---@field group CraftSystem.CraftGroup
|
|
||||||
|
---@type CraftSystem.BaseCraft
|
||||||
|
local BaseCraft = require('CraftSystem.BaseCraft')
|
||||||
|
|
||||||
|
---@class CraftSystem.PrimitiveCraft : CraftSystem.BaseCraft
|
||||||
---@field output string
|
---@field output string
|
||||||
---@field recipe CraftSystem.CraftRecipe
|
---@field recipe CraftSystem.CraftRecipe
|
||||||
---@field returnItems table? TODO: доделать тут тип
|
---@field returnItems table? TODO: доделать тут тип
|
||||||
local PrimitiveCraft = {}
|
local PrimitiveCraft = extend(BaseCraft, {})
|
||||||
|
|
||||||
---Definition table for the `CraftSystem.PrimitiveCraft`.
|
---Definition table for the `CraftSystem.PrimitiveCraft`.
|
||||||
---
|
---
|
||||||
---**Only for EmmyLua.**
|
---**Only for EmmyLua.**
|
||||||
---@class CraftSystem.PrimitiveCraftDef
|
---@class CraftSystem.PrimitiveCraftDef : CraftSystem.BaseCraftDef
|
||||||
---@field group CraftSystem.CraftGroup
|
|
||||||
---@field output string
|
---@field output string
|
||||||
---@field recipe CraftSystem.CraftRecipe
|
---@field recipe CraftSystem.CraftRecipe
|
||||||
---@field returnItems table? TODO: доделать тут тип
|
---@field returnItems table? TODO: доделать тут тип
|
||||||
|
|||||||
@@ -1,22 +1,21 @@
|
|||||||
|
local extend = Class.extend
|
||||||
|
|
||||||
local tableInsert = table.insert
|
local tableInsert = table.insert
|
||||||
|
|
||||||
local modInfo = Mod.getInfo('smc__core__craft_system')
|
local modInfo = Mod.getInfo('smc__core__craft_system')
|
||||||
local require = modInfo.require
|
local require = modInfo.require
|
||||||
|
|
||||||
|
---@type CraftSystem.BaseCraftHandler
|
||||||
|
local BaseCraftHandler = require('CraftSystem.BaseCraftHandler')
|
||||||
|
|
||||||
---@type CraftSystem.PrimitiveCraft
|
---@type CraftSystem.PrimitiveCraft
|
||||||
local PrimitiveCraft = require('CraftSystem.PrimitiveCraft')
|
local PrimitiveCraft = require('CraftSystem.PrimitiveCraft')
|
||||||
|
|
||||||
---@class CraftSystem.PrimitiveCraftHandler
|
---@class CraftSystem.PrimitiveCraftHandler : CraftSystem.BaseCraftHandler
|
||||||
---@field craftsByName table<string, CraftSystem.PrimitiveCraft>
|
---@field getCraftByName fun(craftName:string):CraftSystem.PrimitiveCraft
|
||||||
---@field craftsByGroup table<CraftSystem.CraftGroup, CraftSystem.PrimitiveCraft[]>
|
---@field getCraftsByGroup fun(craftGroup):CraftSystem.PrimitiveCraft[]
|
||||||
---@field craftsList CraftSystem.PrimitiveCraft[]
|
---@field getLearnedCrafts fun(playerName):table<string, CraftSystem.PrimitiveCraft>
|
||||||
---@field learnedCrafts table<string, table<string, CraftSystem.PrimitiveCraft>>
|
local PrimitiveCraftHandler = extend(BaseCraftHandler, {})
|
||||||
local PrimitiveCraftHandler = {
|
|
||||||
craftsByName = {},
|
|
||||||
craftsByGroup = {},
|
|
||||||
craftsList = {},
|
|
||||||
learnedCrafts = {},
|
|
||||||
}
|
|
||||||
|
|
||||||
---@param craftName string
|
---@param craftName string
|
||||||
---@param def CraftSystem.PrimitiveCraftDef
|
---@param def CraftSystem.PrimitiveCraftDef
|
||||||
@@ -26,46 +25,15 @@ function PrimitiveCraftHandler:addCraft(craftName, def)
|
|||||||
|
|
||||||
local craft = PrimitiveCraft:new(craftName, def)
|
local craft = PrimitiveCraft:new(craftName, def)
|
||||||
|
|
||||||
if self.craftsByGroup[craftName] == nil then
|
local group = def.group
|
||||||
self.craftsByGroup[craftName] = {}
|
|
||||||
|
if self.craftsByGroup[group] == nil then
|
||||||
|
self.craftsByGroup[group] = {}
|
||||||
end
|
end
|
||||||
|
|
||||||
self.craftsByName[craftName] = craft
|
self.craftsByName[craftName] = craft
|
||||||
tableInsert(self.craftsByGroup[craftName], craft)
|
tableInsert(self.craftsByGroup[group], craft)
|
||||||
tableInsert(self.craftsList, craft)
|
tableInsert(self.craftsList, craft)
|
||||||
end
|
end
|
||||||
|
|
||||||
---@param craftName string
|
|
||||||
---@return CraftSystem.PrimitiveCraft
|
|
||||||
function PrimitiveCraftHandler:getCraftByName(craftName)
|
|
||||||
local craft = self.craftsByName[craftName]
|
|
||||||
|
|
||||||
assert(craft ~= nil, ('There is no primitive craft named `%s`.'):format(
|
|
||||||
craftName))
|
|
||||||
|
|
||||||
return craft
|
|
||||||
end
|
|
||||||
|
|
||||||
---@param craftGroup CraftSystem.CraftGroup
|
|
||||||
---@return CraftSystem.PrimitiveCraft[]
|
|
||||||
function PrimitiveCraftHandler:getCraftsByGroup(craftGroup)
|
|
||||||
local crafts = self.craftsByGroup[craftGroup]
|
|
||||||
|
|
||||||
assert(crafts ~= nil, ('There are no primitive crafts with `%s` group'):format(
|
|
||||||
craftGroup))
|
|
||||||
|
|
||||||
return crafts
|
|
||||||
end
|
|
||||||
|
|
||||||
---@param playerName string
|
|
||||||
---@return table<string, CraftSystem.PrimitiveCraft>
|
|
||||||
function PrimitiveCraftHandler:getLearnedCrafts(playerName)
|
|
||||||
local crafts = self.learnedCrafts[playerName]
|
|
||||||
|
|
||||||
assert(crafts ~= nil, ('There is no primitive crafting data for a player named `%s`.'):format(
|
|
||||||
playerName))
|
|
||||||
|
|
||||||
return crafts
|
|
||||||
end
|
|
||||||
|
|
||||||
return PrimitiveCraftHandler
|
return PrimitiveCraftHandler
|
||||||
|
|||||||
Reference in New Issue
Block a user