5 Commits

10 changed files with 84 additions and 21 deletions

View File

@@ -1,6 +1,7 @@
---Abstract class for craft. ---Abstract class for craft.
---@class CraftSystem.BaseCraft ---@class CraftSystem.BaseCraft
---@field name string ---@field name string
---@field output ItemStackString
---@field group CraftSystem.CraftGroup ---@field group CraftSystem.CraftGroup
local BaseCraft = {} local BaseCraft = {}
@@ -8,6 +9,7 @@ local BaseCraft = {}
--- ---
---**Only for EmmyLua.** ---**Only for EmmyLua.**
---@class CraftSystem.BaseCraftDef ---@class CraftSystem.BaseCraftDef
---@field output ItemStackString
---@field group CraftSystem.CraftGroup? ---@field group CraftSystem.CraftGroup?
return BaseCraft return BaseCraft

View File

@@ -1,3 +1,6 @@
local tableInsert = table.insert
local stringMatch = string.match
local PLAYERS_KNOW_ALL_RECIPES = true local PLAYERS_KNOW_ALL_RECIPES = true
---Abstract class for handling crafting. ---Abstract class for handling crafting.
@@ -6,13 +9,15 @@ local PLAYERS_KNOW_ALL_RECIPES = true
---@field craftsByGroup table<CraftSystem.CraftGroup, CraftSystem.BaseCraft[]> ---@field craftsByGroup table<CraftSystem.CraftGroup, CraftSystem.BaseCraft[]>
---@field craftsList CraftSystem.BaseCraft[] ---@field craftsList CraftSystem.BaseCraft[]
---@field groupedCrafts (CraftSystem.BaseCraft[]|CraftSystem.BaseCraft)[] ---@field groupedCrafts (CraftSystem.BaseCraft[]|CraftSystem.BaseCraft)[]
---@field learnedCrafts table<string, (CraftSystem.BaseCraft[]|CraftSystem.BaseCraft)[]> ---@field learnedCrafts table<string, CraftSystem.BaseCraft[]>
---@field learnedGroupedCrafts table<string, (CraftSystem.BaseCraft[]|CraftSystem.BaseCraft)[]>
local BaseCraftHandler = { local BaseCraftHandler = {
craftsByName = {}, craftsByName = {},
craftsByGroup = {}, craftsByGroup = {},
craftsList = {}, craftsList = {},
groupedCrafts = {}, groupedCrafts = {},
learnedCrafts = {}, learnedCrafts = {},
learnedGroupedCrafts = {},
} }
---@param craftName string ---@param craftName string
@@ -44,6 +49,46 @@ function BaseCraftHandler:getLearnedCrafts(playerName)
return self.groupedCrafts return self.groupedCrafts
end end
local crafts = self.learnedGroupedCrafts[playerName]
if crafts == nil then
crafts = {}
self.learnedGroupedCrafts[playerName] = crafts
end
return crafts
end
---@param crafts CraftSystem.BaseCraft[]
---@param pattern string
---@return CraftSystem.BaseCraft[]
local function getMathedCrafts(crafts, pattern)
local matchedCrafts = {}
for _, craft in ipairs(crafts) do
local outputItem = ItemStack(craft.output)
local itemSettings = Smc.getItemDefinition(outputItem).settings
local ruName = core.get_translated_string('ru', itemSettings._title)
local enName = core.get_translated_string('en', itemSettings._title)
if stringMatch(outputItem:get_name(), pattern) or
stringMatch(ruName, pattern) or
stringMatch(enName, pattern) then
tableInsert(matchedCrafts, craft)
end
end
return matchedCrafts
end
---@param playerName string
---@param pattern string
---@return CraftSystem.BaseCraft[]
function BaseCraftHandler:getLearnedCraftsMatch(playerName, pattern)
if PLAYERS_KNOW_ALL_RECIPES then
return getMathedCrafts(self.craftsList, pattern)
end
local crafts = self.learnedCrafts[playerName] local crafts = self.learnedCrafts[playerName]
if crafts == nil then if crafts == nil then
@@ -54,4 +99,6 @@ function BaseCraftHandler:getLearnedCrafts(playerName)
return crafts return crafts
end end
--TODO: сохранять выученные крафты игроков в сторадже
return BaseCraftHandler return BaseCraftHandler

View File

@@ -19,7 +19,6 @@ local stageTypes = {
---@class CraftSystem.ImmersiveCraft : CraftSystem.BaseCraft ---@class CraftSystem.ImmersiveCraft : CraftSystem.BaseCraft
---@field startStageName string ---@field startStageName string
---@field triggerItem ItemStackString ---@field triggerItem ItemStackString
---@field output ItemStackString
---@field stagesByName table<string, CraftSystem.ImmersiveCraftStage> ---@field stagesByName table<string, CraftSystem.ImmersiveCraftStage>
local ImmersiveCraft = extend(BaseCraft, {}) local ImmersiveCraft = extend(BaseCraft, {})
@@ -29,7 +28,6 @@ local ImmersiveCraft = extend(BaseCraft, {})
---@class CraftSystem.ImmersiveCraftDef : CraftSystem.BaseCraftDef ---@class CraftSystem.ImmersiveCraftDef : CraftSystem.BaseCraftDef
---@field startStageName string ---@field startStageName string
---@field triggerItem ItemStackString ---@field triggerItem ItemStackString
---@field output ItemStackString
---@field stages CraftSystem.ImmersiveCraftStageDef[] ---@field stages CraftSystem.ImmersiveCraftStageDef[]
---@param name string ---@param name string

View File

@@ -7,7 +7,6 @@ local require = modInfo.require
local BaseCraft = require('CraftSystem.BaseCraft') local BaseCraft = require('CraftSystem.BaseCraft')
---@class CraftSystem.PrimitiveCraft : CraftSystem.BaseCraft ---@class CraftSystem.PrimitiveCraft : CraftSystem.BaseCraft
---@field output ItemStackString
---@field recipe CraftSystem.CraftRecipe ---@field recipe CraftSystem.CraftRecipe
---@field returnItems ItemStackString[] ---@field returnItems ItemStackString[]
local PrimitiveCraft = extend(BaseCraft, {}) local PrimitiveCraft = extend(BaseCraft, {})
@@ -16,7 +15,6 @@ local PrimitiveCraft = extend(BaseCraft, {})
--- ---
---**Only for EmmyLua.** ---**Only for EmmyLua.**
---@class CraftSystem.PrimitiveCraftDef : CraftSystem.BaseCraftDef ---@class CraftSystem.PrimitiveCraftDef : CraftSystem.BaseCraftDef
---@field output ItemStackString
---@field recipe CraftSystem.CraftRecipe ---@field recipe CraftSystem.CraftRecipe
---@field returnItems ItemStackString[]? ---@field returnItems ItemStackString[]?

View File

@@ -563,7 +563,7 @@ end
--- Defaults to true when not specified (i.e. no tag for a field). --- Defaults to true when not specified (i.e. no tag for a field).
---@return Formspec ---@return Formspec
function Formspec:fieldCloseOnEnter(name, closeOnEnter) function Formspec:fieldCloseOnEnter(name, closeOnEnter)
local element = ('field_enter_after_edit[%s;%s]'):format( local element = ('field_close_on_enter[%s;%s]'):format(
name, closeOnEnter or false) name, closeOnEnter or false)
self:addElement(element) self:addElement(element)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

View File

@@ -12,11 +12,10 @@ function Smc.addRegisteredItem(shortModName, item)
if modItems == nil then if modItems == nil then
registeredItemsByMod[shortModName] = {[itemName]=item} registeredItemsByMod[shortModName] = {[itemName]=item}
registeredItems[itemName] = item
return return
end end
assert(modItems[itemName] == nil)
registeredItems[itemName] = item registeredItems[itemName] = item
modItems[itemName] = item modItems[itemName] = item
end end
@@ -44,7 +43,6 @@ function Smc.getItemDefinition(itemName)
if type(itemName) == 'table' or type(itemName) == 'userdata' then if type(itemName) == 'table' or type(itemName) == 'userdata' then
itemName = itemName:get_name() itemName = itemName:get_name()
end end
print('ItemName:', itemName)
local item = Smc.getRegisteredItemByName(itemName) local item = Smc.getRegisteredItemByName(itemName)
assert(item ~= nil) assert(item ~= nil)

View File

@@ -199,15 +199,14 @@ end
--- 'left_tab_is_block'| --- 'left_tab_is_block'|
--- 'right_tab_is_block'| --- 'right_tab_is_block'|
--- ---
--- 'left_tab_craft_search_field_value'|
--- 'right_tab_craft_search_field_value'|
--- 'left_tab_craft_selected_craft'| --- 'left_tab_craft_selected_craft'|
--- 'right_tab_craft_selected_craft'| --- 'right_tab_craft_selected_craft'|
--- 'left_tab_craft_selected_group'| --- 'left_tab_craft_selected_group'|
--- 'right_tab_craft_selected_group'| --- 'right_tab_craft_selected_group'|
--- 'group_image_number'|
--- 'left_tab_craft_page_number'| --- 'left_tab_craft_page_number'|
--- 'right_tab_craft_page_number'| --- 'right_tab_craft_page_number'
--- 'left_tab_craft_scroll'|
--- 'right_tab_craft_scroll'
---@class PlayerInventoryUI : BaseUI ---@class PlayerInventoryUI : BaseUI
---@field getFormSpecString fun(self:PlayerInventoryUI,playerName:string):string ---@field getFormSpecString fun(self:PlayerInventoryUI,playerName:string):string
@@ -268,6 +267,17 @@ PlayerInventoryUI:registerOnFormFieldActionMatch('select_right_%S+', function(pl
PlayerInventoryUI:showForm(playerName) PlayerInventoryUI:showForm(playerName)
end) end)
-- Hadling input in the crafting search bar.
PlayerInventoryUI:registerOnFormFieldActionMatch('%S+::craft_search_field', function(player, fieldName, fieldValue)
local tabType = stringMatch(fieldName, '(%S+)::craft_search_field')
assert(tabType == 'left' or tabType == 'right')
local playerName = player:get_player_name()
PlayerInventoryUI:setContex(playerName, tabType..'_tab_craft_search_field_value', fieldValue)
PlayerInventoryUI:showForm(playerName)
end)
-- Handling the click of the button to turning back through the crafting menu pages. -- Handling the click of the button to turning back through the crafting menu pages.
PlayerInventoryUI:registerOnFormFieldActionMatch('%S+::page_back', function(player, fieldName, fieldValue) PlayerInventoryUI:registerOnFormFieldActionMatch('%S+::page_back', function(player, fieldName, fieldValue)
local tabType = stringMatch(fieldName, '(%S+)::page_back') local tabType = stringMatch(fieldName, '(%S+)::page_back')

View File

@@ -1,7 +1,7 @@
local mathFloor = math.floor local mathFloor = math.floor
---Number of crafting recipes on one menu page. ---Number of crafting recipes on one menu page.
local PAGE_NUMBER_ITEMS = 24 local PAGE_NUMBER_ITEMS = 20
local PrimitiveCraftHandler = Smc.requireCraftSystemPrimitiveCraftHandler() local PrimitiveCraftHandler = Smc.requireCraftSystemPrimitiveCraftHandler()
@@ -22,10 +22,14 @@ local function getCraftTab(self, playerName, tabType)
local selectedCraft = self:getContex(playerName, tabType..'_tab_craft_selected_craft') or '' local selectedCraft = self:getContex(playerName, tabType..'_tab_craft_selected_craft') or ''
---@type CraftSystem.CraftGroup? ---@type CraftSystem.CraftGroup?
local selectedGroup = self:getContex(playerName, tabType..'_tab_craft_selected_group') local selectedGroup = self:getContex(playerName, tabType..'_tab_craft_selected_group')
local searchFieldValue = self:getContex(playerName, tabType..'_tab_craft_search_field_value')
local pageNumber = self:getContex(playerName, tabType..'_tab_craft_page_number') or 1 local pageNumber = self:getContex(playerName, tabType..'_tab_craft_page_number') or 1
local crafts local crafts
if selectedGroup == nil then if searchFieldValue ~= '' and searchFieldValue ~= nil then
---@type CraftSystem.PrimitiveCraft[]
crafts = PrimitiveCraftHandler:getLearnedCraftsMatch(playerName, searchFieldValue)
elseif selectedGroup == nil then
---@type (CraftSystem.PrimitiveCraft[]|CraftSystem.PrimitiveCraft)[] ---@type (CraftSystem.PrimitiveCraft[]|CraftSystem.PrimitiveCraft)[]
crafts = PrimitiveCraftHandler:getLearnedCrafts(playerName) crafts = PrimitiveCraftHandler:getLearnedCrafts(playerName)
else else
@@ -39,6 +43,10 @@ local function getCraftTab(self, playerName, tabType)
---@type integer ---@type integer
local pagesMax = math.ceil(#crafts/PAGE_NUMBER_ITEMS) local pagesMax = math.ceil(#crafts/PAGE_NUMBER_ITEMS)
if pagesMax == 0 then
pagesMax = 1
end
if pageNumber > pagesMax then if pageNumber > pagesMax then
pageNumber = pagesMax pageNumber = pagesMax
self:setContex(playerName, tabType..'_tab_craft_page_number', pageNumber) self:setContex(playerName, tabType..'_tab_craft_page_number', pageNumber)
@@ -91,7 +99,9 @@ local function getCraftTab(self, playerName, tabType)
CraftTab CraftTab
:background(0, 0, 11, 9, 'player_inventory_craft_tab_background.png') :background(0, 0, 11, 9, 'player_inventory_craft_tab_background.png')
:container(craftsListForm, 0.5, 0.5) :field(0.25, 0.5, 5, 0.75, tabType..'::craft_search_field', nil, searchFieldValue)
:fieldCloseOnEnter(tabType..'::craft_search_field', false)
:container(craftsListForm, 0.5, 1.5)
:button(1.75, 7.75, 1, 0.5, tabType..'::page_back', '<') :button(1.75, 7.75, 1, 0.5, tabType..'::page_back', '<')
:button(2.75, 7.75, 1, 0.5, tabType..'::page_forward', '>') :button(2.75, 7.75, 1, 0.5, tabType..'::page_forward', '>')
:label(2.5,8.5, ('%s/%s'):format(pageNumber, pagesMax)) :label(2.5,8.5, ('%s/%s'):format(pageNumber, pagesMax))

Binary file not shown.

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 100 KiB