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

Merge pull request #12 from solareon/patch-1

Browse Source 
fix: job crafting restrictions
This commit is contained in:
Jim Shield
2024-01-23 00:34:15 +00:00
committed by GitHub
parent 3e067c8492 e541201a08
commit 5f6720d37b
1 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
crafting.lua
View File

@@ -43,7 +43,7 @@ function craftingMenu(data) local hasjob = false
if Recipes[i].job then hasjob = false if Recipes[i].job then hasjob = false
for l, b in pairs(Recipes[i].job) do for l, b in pairs(Recipes[i].job) do
hasjob = hasJob(l, nil, b) hasjob = hasJob(l, nil, b)
if hasJob == true then break end if hasjob == true then break end
end end
end end
local setheader, settext = "", "" local setheader, settext = "", ""
@@ -139,40 +139,42 @@ function makeItem(data)
startTempCam(cam) startTempCam(cam)
for i = 1, amount do for i = 1, amount do
for _, v in pairs(data.craft) do for k, v in pairs(data.craft) do
if type(v) == "table" then if k ~= "amount" and k ~= "job" then
for l, b in pairs(v) do if type(v) == "table" then
if crafting and progressBar({ for l, b in pairs(v) do
label = "Using "..b.." "..Items[l].label, if crafting and progressBar({
time = 1000, label = "Using "..b.." "..Items[l].label,
cancel = true, time = 1000,
dict = 'pickup_object', cancel = true,
anim = "putdown_low", dict = 'pickup_object',
flag = 48, anim = "putdown_low",
icon = l, flag = 48,
}) then icon = l,
--TriggerEvent('inventory:client:ItemBox', Items[l], "use", b) -- Show item box for each item }) then
else --TriggerEvent('inventory:client:ItemBox', Items[l], "use", b) -- Show item box for each item
crafted = false else
crafting = false crafted = false
break crafting = false
break
end
Wait(200)
end end
Wait(200) if crafted then
end if crafting and progressBar({
if crafted then label = bartext..Items[data.item].label,
if crafting and progressBar({ time = bartime,
label = bartext..Items[data.item].label, cancel = true,
time = bartime, dict = animDict,
cancel = true, anim = anim,
dict = animDict, flag = 8,
anim = anim, icon = data.item,
flag = 8, }) then
icon = data.item, TriggerServerEvent(GetCurrentResourceName()..":Crafting:GetItem", data.item, data.craft, data.stashName)
}) then else
TriggerServerEvent(GetCurrentResourceName()..":Crafting:GetItem", data.item, data.craft, data.stashName) crafting = false
else break
crafting = false end
break
end end
end end
end end
@@ -434,4 +436,4 @@ function stashhasItem(stashItems, items, amount)
end end
for k, v in pairs(hasTable) do if v.hasItem == false then return false, hasTable end end for k, v in pairs(hasTable) do if v.hasItem == false then return false, hasTable end end
return true, hasTable return true, hasTable
end end