CraftSystem: return alt recipes, add player crafts cache, support learned recipes
This commit is contained in:
@@ -1,2 +1,2 @@
|
||||
name = smc__core__craft_system
|
||||
depends = smc__system__system_loader, smc__core__creature
|
||||
depends = smc__system__system_loader, smc__core__creature, smc__core__progression_system
|
||||
|
||||
@@ -3,17 +3,18 @@
|
||||
local CHECK = {YES = '[x]', NO = '[ ]', EMPTY = '-'}
|
||||
|
||||
---@class CraftSystem.BaseCraft : Class
|
||||
---@field name string
|
||||
---@field recipe ItemStackString[]
|
||||
---@field output ItemStackString
|
||||
---@field group CraftSystem.CraftGroup
|
||||
---@field name string
|
||||
---@field hidden boolean?
|
||||
---@field recipe ItemStackString[]
|
||||
---@field output ItemStackString
|
||||
---@field group CraftSystem.CraftGroup
|
||||
local BaseCraft = Class:extend({})
|
||||
|
||||
---Definition table for the `CraftSystem.BaseCraft`.
|
||||
---@class CraftSystem.BaseCraftDef
|
||||
---@field recipe ItemStackString[]
|
||||
---@field output ItemStackString
|
||||
---@field group CraftSystem.CraftGroup?
|
||||
---@field recipe ItemStackString[]
|
||||
---@field output ItemStackString
|
||||
---@field group CraftSystem.CraftGroup?
|
||||
|
||||
---@param name string
|
||||
---@param def CraftSystem.BaseCraftDef
|
||||
|
||||
@@ -1,27 +1,35 @@
|
||||
local tableInsert = table.insert
|
||||
local stringMatch = string.match
|
||||
|
||||
local require = Mod.getInfo('smc__core__craft_system').require
|
||||
|
||||
---@type CraftSystem.BaseCraftHandler.PlayerCraftsCache
|
||||
local PlayerCraftsCache = require('CraftSystem.BaseCraftHandler.PlayerCraftsCache')
|
||||
|
||||
local PLAYERS_KNOW_ALL_RECIPES = true
|
||||
|
||||
|
||||
---Abstract class for handling crafting.
|
||||
---@class CraftSystem.BaseCraftHandler : Class
|
||||
---@field baseType CraftSystem.BaseCraftType
|
||||
---@field type CraftSystem.CraftType
|
||||
---@field defaultCraftDef CraftSystem.BaseCraftDef
|
||||
---
|
||||
---@field craftsByName table<string, CraftSystem.BaseCraft>
|
||||
---@field craftsByGroup table<CraftSystem.CraftGroup, CraftSystem.BaseCraft[]>
|
||||
---@field craftsList CraftSystem.BaseCraft[]
|
||||
---@field groupedCrafts (CraftSystem.BaseCraft[]|CraftSystem.BaseCraft)[]
|
||||
---@field learnedCrafts table<string, CraftSystem.BaseCraft[]>
|
||||
---@field learnedGroupedCrafts table<string, (CraftSystem.BaseCraft[]|CraftSystem.BaseCraft)[]>
|
||||
---@field craftsByName table<string, CraftSystem.BaseCraft>
|
||||
---@field craftsByGroup table<CraftSystem.CraftGroup, CraftSystem.BaseCraft[]>
|
||||
---@field craftsByOutput table<ItemStackString, CraftSystem.BaseCraft[]>
|
||||
---@field craftsList CraftSystem.BaseCraft[]
|
||||
---@field groupedCrafts (CraftSystem.BaseCraft[]|CraftSystem.BaseCraft)[]
|
||||
---
|
||||
---@field playersCraftsCache table<string, CraftSystem.BaseCraftHandler.PlayerCraftsCache>
|
||||
local BaseCraftHandler = Class:extend({
|
||||
craftsByName = {},
|
||||
craftsByGroup = {},
|
||||
craftsList = {},
|
||||
groupedCrafts = {},
|
||||
learnedCrafts = {},
|
||||
learnedGroupedCrafts = {},
|
||||
craftsByName = {},
|
||||
craftsByGroup = {},
|
||||
craftsByOutput = {},
|
||||
craftsList = {},
|
||||
groupedCrafts = {},
|
||||
|
||||
playersCraftsCache = {}
|
||||
})
|
||||
|
||||
---@class CraftSystem.BaseCraftHandlerDef
|
||||
@@ -38,16 +46,50 @@ function BaseCraftHandler:new(baseType, type, def)
|
||||
instance.type = type
|
||||
instance.defaultCraftDef = def.defaultCraftDef or {}
|
||||
|
||||
core.register_on_joinplayer(function (player, last_login)
|
||||
local playerName = player:get_player_name()
|
||||
local cache = PlayerCraftsCache:new(playerName)
|
||||
|
||||
self.playersCraftsCache[playerName] = cache
|
||||
end)
|
||||
|
||||
core.register_on_leaveplayer(function (player, timed_out)
|
||||
local playerName = player:get_player_name()
|
||||
|
||||
self.playersCraftsCache[playerName] = nil
|
||||
end)
|
||||
|
||||
return instance
|
||||
end
|
||||
|
||||
---@param playerName string
|
||||
---@return CraftSystem.BaseCraftHandler.PlayerCraftsCache
|
||||
function BaseCraftHandler:getPlayerCraftsCache(playerName)
|
||||
local cache = self.playersCraftsCache[playerName]
|
||||
assert(cache ~= nil)
|
||||
|
||||
return cache
|
||||
end
|
||||
|
||||
---@param craftName string
|
||||
---@return CraftSystem.BaseCraft
|
||||
function BaseCraftHandler:getCraftByName(craftName)
|
||||
local craft = self.craftsByName[craftName]
|
||||
|
||||
assert(craft ~= nil, ('A craft `%s` not exists.'):format(
|
||||
craftName))
|
||||
assert(craft ~= nil, ('A craft `%s` not exists.'):format(craftName))
|
||||
|
||||
return craft
|
||||
end
|
||||
|
||||
---@param craftName string
|
||||
---@return CraftSystem.BaseCraft?
|
||||
function BaseCraftHandler:getLearnedCraftByName(playerName, craftName)
|
||||
if PLAYERS_KNOW_ALL_RECIPES then
|
||||
return self.craftsByName[craftName]
|
||||
end
|
||||
|
||||
local cache = self:getPlayerCraftsCache(playerName)
|
||||
local craft = cache.craftsByName[craftName]
|
||||
|
||||
return craft
|
||||
end
|
||||
@@ -57,25 +99,64 @@ end
|
||||
function BaseCraftHandler:getCraftsByGroup(craftGroup)
|
||||
local crafts = self.craftsByGroup[craftGroup]
|
||||
|
||||
assert(crafts ~= nil, ('A craft with group `%s` not exists.'):format(
|
||||
craftGroup))
|
||||
assert(crafts ~= nil, ('A craft with group `%s` not exists.'):format(craftGroup))
|
||||
|
||||
return crafts
|
||||
end
|
||||
|
||||
---@param craftGroup CraftSystem.CraftGroup
|
||||
---@return CraftSystem.BaseCraft[]?
|
||||
function BaseCraftHandler:getLearnedCraftsByGroup(playerName, craftGroup)
|
||||
if PLAYERS_KNOW_ALL_RECIPES then
|
||||
return self.craftsByGroup[craftGroup]
|
||||
end
|
||||
|
||||
local cache = self:getPlayerCraftsCache(playerName)
|
||||
local crafts = cache.craftsByGroup[craftGroup]
|
||||
|
||||
return crafts
|
||||
end
|
||||
|
||||
---@return (CraftSystem.BaseCraft[]|CraftSystem.BaseCraft)[]
|
||||
function BaseCraftHandler:getGroupedCrafts()
|
||||
return self.groupedCrafts
|
||||
end
|
||||
|
||||
---@param playerName string
|
||||
---@return (CraftSystem.BaseCraft[]|CraftSystem.BaseCraft)[]
|
||||
function BaseCraftHandler:getLearnedGroupedCrafts(playerName)
|
||||
if PLAYERS_KNOW_ALL_RECIPES then
|
||||
return self.groupedCrafts
|
||||
end
|
||||
|
||||
local cache = self:getPlayerCraftsCache(playerName)
|
||||
local crafts = cache.groupedCrafts
|
||||
|
||||
return crafts
|
||||
end
|
||||
|
||||
---@param output ItemStackString
|
||||
---@return CraftSystem.BaseCraft[]?
|
||||
function BaseCraftHandler:getCraftsByOutput(output)
|
||||
output = ItemStack(output):get_name()
|
||||
|
||||
local crafts = self.craftsByOutput[output]
|
||||
|
||||
return crafts
|
||||
end
|
||||
|
||||
---@param playerName string
|
||||
---@return (CraftSystem.BaseCraft[]|CraftSystem.BaseCraft)[]
|
||||
function BaseCraftHandler:getLearnedCrafts(playerName)
|
||||
---@param output ItemStackString
|
||||
---@return CraftSystem.BaseCraft[]?
|
||||
function BaseCraftHandler:getLearnedCraftsByOutput(playerName, output)
|
||||
output = ItemStack(output):get_name()
|
||||
|
||||
if PLAYERS_KNOW_ALL_RECIPES then
|
||||
return self.groupedCrafts
|
||||
return self.craftsByOutput[output]
|
||||
end
|
||||
|
||||
local crafts = self.learnedGroupedCrafts[playerName]
|
||||
|
||||
if crafts == nil then
|
||||
crafts = {}
|
||||
self.learnedGroupedCrafts[playerName] = crafts
|
||||
end
|
||||
local cache = self:getPlayerCraftsCache(playerName)
|
||||
local crafts = cache.craftsByOutput[output]
|
||||
|
||||
return crafts
|
||||
end
|
||||
@@ -103,6 +184,12 @@ local function getMathedCrafts(crafts, pattern)
|
||||
return matchedCrafts
|
||||
end
|
||||
|
||||
---@param pattern string
|
||||
---@return CraftSystem.BaseCraft[]
|
||||
function BaseCraftHandler:getCraftsMatch(pattern)
|
||||
return getMathedCrafts(self.craftsList, pattern)
|
||||
end
|
||||
|
||||
---@param playerName string
|
||||
---@param pattern string
|
||||
---@return CraftSystem.BaseCraft[]
|
||||
@@ -111,16 +198,10 @@ function BaseCraftHandler:getLearnedCraftsMatch(playerName, pattern)
|
||||
return getMathedCrafts(self.craftsList, pattern)
|
||||
end
|
||||
|
||||
local crafts = self.learnedCrafts[playerName]
|
||||
|
||||
if crafts == nil then
|
||||
crafts = {}
|
||||
self.learnedCrafts[playerName] = crafts
|
||||
end
|
||||
local cache = self:getPlayerCraftsCache(playerName)
|
||||
local crafts = getMathedCrafts(cache.craftsList, pattern)
|
||||
|
||||
return crafts
|
||||
end
|
||||
|
||||
--TODO: сохранять выученные крафты игроков в сторадже
|
||||
|
||||
return BaseCraftHandler
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
local ProgressionSystem = Smc.requireProgressionSystem()
|
||||
|
||||
---@class CraftSystem.BaseCraftHandler.PlayerCraftsCache : Class
|
||||
---@field playerName string
|
||||
---
|
||||
---@field craftsByName table<string, CraftSystem.BaseCraft>
|
||||
---@field craftsByGroup table<CraftSystem.CraftGroup, CraftSystem.BaseCraft[]>
|
||||
---@field craftsByOutput table<ItemStackString, CraftSystem.BaseCraft[]>
|
||||
---@field craftsList CraftSystem.BaseCraft[]
|
||||
---@field groupedCrafts (CraftSystem.BaseCraft[]|CraftSystem.BaseCraft)[]
|
||||
local PlayerCraftsCache = Class:extend({
|
||||
craftsByName = {},
|
||||
craftsByGroup = {},
|
||||
craftsByOutput = {},
|
||||
craftsList = {},
|
||||
groupedCrafts = {},
|
||||
})
|
||||
|
||||
---@param playerName string
|
||||
---@return CraftSystem.BaseCraftHandler.PlayerCraftsCache
|
||||
function PlayerCraftsCache:new(playerName)
|
||||
local instance = self:getInstance({})
|
||||
instance.playerName = playerName
|
||||
|
||||
instance:update()
|
||||
|
||||
return instance
|
||||
end
|
||||
|
||||
-- TODO
|
||||
function PlayerCraftsCache:update()
|
||||
-- ProgressionSystem:
|
||||
end
|
||||
|
||||
return PlayerCraftsCache
|
||||
@@ -13,10 +13,7 @@ local ImmersiveCraft = require('CraftSystem.ImmersiveCraft')
|
||||
---@class CraftSystem.ImmersiveCraftHandler : CraftSystem.BaseCraftHandler
|
||||
---@field defaultCraftDef CraftSystem.BaseCraftDef
|
||||
---
|
||||
---@field new fun(self:CraftSystem.ImmersiveCraftHandler, baseType:CraftSystem.BaseCraftType, type:CraftSystem.ImmersiveCraftType, def:CraftSystem.ImmersiveCraftHandlerDef):CraftSystem.ImmersiveCraftHandler
|
||||
---@field getCraftByName fun(self, craftName:string):CraftSystem.ImmersiveCraft
|
||||
---@field getCraftsByGroup fun(self, craftGroup):CraftSystem.ImmersiveCraft[]
|
||||
---@field getLearnedCrafts fun(self, playerName):table<string, CraftSystem.ImmersiveCraft>
|
||||
---@field new fun(self:CraftSystem.ImmersiveCraftHandler, baseType:CraftSystem.BaseCraftType, type:CraftSystem.ImmersiveCraftType, def:CraftSystem.ImmersiveCraftHandlerDef):CraftSystem.ImmersiveCraftHandler
|
||||
local ImmersiveCraftHandler = BaseCraftHandler:extend({})
|
||||
|
||||
---@class CraftSystem.ImmersiveCraftHandlerDef : CraftSystem.BaseCraftHandlerDef
|
||||
|
||||
@@ -16,13 +16,11 @@ local PrimitiveCraft = require('CraftSystem.PrimitiveCraft')
|
||||
---@class CraftSystem.PrimitiveCraftHandler : CraftSystem.BaseCraftHandler
|
||||
---@field defaultCraftDef CraftSystem.PrimitiveCraftDef
|
||||
---
|
||||
---@field craftsByGroup table<CraftSystem.CraftGroup, CraftSystem.PrimitiveCraft[]>
|
||||
---@field groupedCrafts (CraftSystem.PrimitiveCraft[]|CraftSystem.PrimitiveCraft)[]
|
||||
---@field craftsByGroup table<CraftSystem.CraftGroup, CraftSystem.PrimitiveCraft[]>
|
||||
---@field craftsByOutput table<ItemStackString, CraftSystem.BaseCraft[]>
|
||||
---@field groupedCrafts (CraftSystem.PrimitiveCraft[]|CraftSystem.PrimitiveCraft)[]
|
||||
---
|
||||
---@field new fun(self:CraftSystem.PrimitiveCraftHandler, baseType:CraftSystem.BaseCraftType, type:CraftSystem.PrimitiveCraftType, def:CraftSystem.PrimitiveCraftHandlerDef):CraftSystem.PrimitiveCraftHandler
|
||||
---@field getCraftByName fun(self, craftName:string):CraftSystem.PrimitiveCraft
|
||||
---@field getCraftsByGroup fun(self, craftGroup:string):CraftSystem.PrimitiveCraft[]
|
||||
---@field getLearnedCrafts fun(self, playerName:string):(CraftSystem.PrimitiveCraft[]|CraftSystem.PrimitiveCraft)[]
|
||||
---@field new fun(self:CraftSystem.PrimitiveCraftHandler, baseType:CraftSystem.BaseCraftType, type:CraftSystem.PrimitiveCraftType, def:CraftSystem.PrimitiveCraftHandlerDef):CraftSystem.PrimitiveCraftHandler
|
||||
local PrimitiveCraftHandler = BaseCraftHandler:extend({})
|
||||
|
||||
---@class CraftSystem.PrimitiveCraftHandlerDef : CraftSystem.BaseCraftHandlerDef
|
||||
@@ -46,8 +44,18 @@ function PrimitiveCraftHandler:registerCraft(craftName, def)
|
||||
self.craftsByGroup[group] = {}
|
||||
end
|
||||
|
||||
local output = ItemStack(craft.output):get_name()
|
||||
if self.craftsByOutput[output] == nil then
|
||||
self.craftsByOutput[output] = {}
|
||||
elseif craft.hidden == nil then
|
||||
craft.hidden = true
|
||||
end
|
||||
|
||||
self.craftsByName[craftName] = craft
|
||||
tableInsert(self.craftsByGroup[group], craft)
|
||||
if craft.hidden ~= true then
|
||||
tableInsert(self.craftsByGroup[group], craft)
|
||||
end
|
||||
tableInsert(self.craftsByOutput[output], craft)
|
||||
tableInsert(self.craftsList, craft)
|
||||
end
|
||||
|
||||
|
||||
@@ -18,10 +18,7 @@ local ProcessingCraft = require('CraftSystem.ProcessingCraft')
|
||||
---
|
||||
---@field craftsByHash table<string, CraftSystem.ProcessingCraft>
|
||||
---
|
||||
---@field new fun(self:CraftSystem.ProcessingCraftHandler, baseType:CraftSystem.BaseCraftType, type:CraftSystem.ProcessingCraftType, def:CraftSystem.ProcessingCraftHandlerDef):CraftSystem.ProcessingCraftHandler
|
||||
---@field getCraftByName fun(self, craftName:string):CraftSystem.ProcessingCraft
|
||||
---@field getCraftsByGroup fun(self, craftGroup:string):CraftSystem.ProcessingCraft[]
|
||||
---@field getLearnedCrafts fun(self, playerName:string):(CraftSystem.ProcessingCraft[]|CraftSystem.ProcessingCraft)[]
|
||||
---@field new fun(self:CraftSystem.ProcessingCraftHandler, baseType:CraftSystem.BaseCraftType, type:CraftSystem.ProcessingCraftType, def:CraftSystem.ProcessingCraftHandlerDef):CraftSystem.ProcessingCraftHandler
|
||||
local ProcessingCraftHandler = BaseCraftHandler:extend({
|
||||
craftsByHash = {}
|
||||
})
|
||||
|
||||
@@ -170,7 +170,7 @@ function ImmersiveWorkStation:abortCraft(pos)
|
||||
return
|
||||
end
|
||||
|
||||
local craft = self.handler:getCraftByName(craftName)
|
||||
local craft = self.handler:getCraftByName(craftName) --[[@as CraftSystem.ImmersiveCraft]]
|
||||
craft:abortCraft(pos)
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user