FumeNodes/jim_bridge
1
0
Fork 0
mirror of https://github.com/jimathy/jim_bridge.git synced 2026-08-19 06:46:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes for jim-crafting changes

Browse Source
This commit is contained in:
Jim Shield
2025-03-07 13:30:17 +00:00
committed by GitHub
parent daa9dca142
commit 1cb2bdb525
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
shared/crafting.lua
View File

@@ -54,20 +54,24 @@ function craftingMenu(data)
end end
-- Normalize stash name: if stashTable is provided, assign it to stashName. -- Normalize stash name: if stashTable is provided, assign it to stashName.
if data.stashTable then data.stashName = data.stashTable end data.stashName = data.stashTable or data.stashName
-- Initialize an empty menu table and a flag for job verification. -- Initialize an empty menu table and a flag for job verification.
local Menu, hasjob = {}, false local Menu, hasjob = {}, false
-- Get the list of recipes from the provided data. -- Get the list of recipes from the provided data.
local Recipes = data.craftable.Recipes local Recipes = data.craftable.Recipes
local craftingLevel = data.craftable.craftingLevel
local craftedItems = data.craftable.craftedItems local craftedItems = {}
-- Create a temporary table to collect required item amounts for each recipe. -- Create a temporary table to collect required item amounts for each recipe.
local tempCarryTable = {} local tempCarryTable = {}
for i = 1, #Recipes do for i = 1, #Recipes do
-- Iterate over each key in the current recipe. -- Iterate over each key in the current recipe.
for k in pairs(Recipes[i]) do for k in pairs(Recipes[i]) do
if k == "hasCrafted" and not data.craftable.craftedItems then
craftedItems = GetMetadata(nil, "craftedItems") or {}
data.craftable.craftedItems = craftedItems
end
-- Ignore meta keys: "amount", "metadata", "job", and "gang". -- Ignore meta keys: "amount", "metadata", "job", and "gang".
if k ~= "amount" and k ~= "metadata" and k ~= "job" and k ~= "gang" then if k ~= "amount" and k ~= "metadata" and k ~= "job" and k ~= "gang" then
-- Record the required amount for this ingredient (default to 1 if not specified). -- Record the required amount for this ingredient (default to 1 if not specified).
@@ -100,6 +104,7 @@ function craftingMenu(data)
craftingLevel = true, craftingLevel = true,
craftedItems = true, craftedItems = true,
hasCrafted = true, hasCrafted = true,
exp = true,
} }
if not excludeKeys[k] then if not excludeKeys[k] then
@@ -346,6 +351,7 @@ function makeItem(data)
craftingLevel = true, craftingLevel = true,
craftedItems = true, craftedItems = true,
hasCrafted = true, hasCrafted = true,
exp = true,
} }
if not excludeKeys[k] then if not excludeKeys[k] then
@@ -384,13 +390,22 @@ function makeItem(data)
icon = data.item, icon = data.item,
}) then }) then
TriggerServerEvent(getScript()..":Crafting:GetItem", data.item, data.craft, data.stashName, metadata) TriggerServerEvent(getScript()..":Crafting:GetItem", data.item, data.craft, data.stashName, metadata)
CreateThread(function()
if data.craft["hasCrafted"] ~= nil then if data.craft["hasCrafted"] ~= nil then
debugPrint("hasCrafted Found, marking '"..data.item.."' as crafted for player") debugPrint("hasCrafted Found, marking '"..data.item.."' as crafted for player")
data.craftable.craftedItems[data.item] = true data.craftable.craftedItems[data.item] = true
triggerCallback(getScript()..":server:SetMetadata", "craftedItems", data.craftable.craftedItems ) triggerCallback(getScript()..":server:SetMetadata", "craftedItems", data.craftable.craftedItems )
--SetMetadata(nil, "craftedItems", data.craftable.craftedItems)
end end
Wait(100)
if data.craft["exp"] ~= nil then
craftingLevel += data.craft["exp"].give
jsonPrint(data.craft["exp"])
debugPrint("exp Found, giving exp for '"..data.item.."'")
triggerCallback(getScript()..":server:SetMetadata", "craftingLevel", craftingLevel)
end
end)
if data.craftable.Recipes[1].oneUse == true then if data.craftable.Recipes[1].oneUse == true then
removeItem("craftrecipe", 1, nil, data.craftable.Recipes[1].slot) removeItem("craftrecipe", 1, nil, data.craftable.Recipes[1].slot)
local breakId = GetSoundId() local breakId = GetSoundId()