FumeNodes/jim_bridge
1
0
Fork 0
mirror of https://github.com/jimathy/jim_bridge.git synced 2026-08-17 05:56:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix grade crafting

Browse Source
This commit is contained in:
Jim Shield
2024-01-17 21:05:38 +00:00
committed by GitHub
parent d693a99852
commit 6c38f90b9a
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crafting.lua
View File

@@ -40,8 +40,9 @@ function craftingMenu(data) local hasjob = false
for k, v in pairs(Recipes[i]) do for k, v in pairs(Recipes[i]) do
if k ~= "amount" and k ~= "job" and k ~= "gang" then if k ~= "amount" and k ~= "job" and k ~= "gang" then
if Recipes[i].job then hasjob = false if Recipes[i].job then hasjob = false
for l, b in pairs(data.craftable.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
end end
end end
local setheader, settext = "", "" local setheader, settext = "", ""

22
wrapper.lua
View File

@@ -982,23 +982,23 @@ function hasJob(job, src, grade) local hasJob = false
local jobinfo = exports[QBXExport]:GetPlayer(src).PlayerData.job local jobinfo = exports[QBXExport]:GetPlayer(src).PlayerData.job
if jobinfo.name == job then if jobinfo.name == job then
hasJob = true hasJob = true
if grade and not jobinfo.grade.level then hasJob = false end if grade and not (grade <= jobinfo.grade.level) then hasJob = false end
end end
local ganginfo = exports[QBXExport]:GetPlayer(src).PlayerData.gang local ganginfo = exports[QBXExport]:GetPlayer(src).PlayerData.gang
if ganginfo.name == job then if ganginfo.name == job then
hasJob = true hasJob = true
if grade and not ganginfo.grade.level then hasJob = false end if grade and not (grade <= ganginfo.grade.level) then hasJob = false end
end end
else else
local jobinfo = exports[QBExport]:GetPlayer(src).PlayerData.job local jobinfo = exports[QBExport]:GetPlayer(src).PlayerData.job
if jobinfo.name == job then if jobinfo.name == job then
hasJob = true hasJob = true
if grade and not jobinfo.grade.level then hasJob = false end if grade and not (grade <= jobinfo.grade.level) then hasJob = false end
end end
local ganginfo = exports[QBExport]:GetPlayer(src).PlayerData.gang local ganginfo = exports[QBExport]:GetPlayer(src).PlayerData.gang
if ganginfo.name == job then if ganginfo.name == job then
hasJob = true hasJob = true
if grade and not ganginfo.grade.level then hasJob = false end if grade and not (grade <= ganginfo.grade.level) then hasJob = false end
end end
end end
else else
@@ -1018,14 +1018,12 @@ function hasJob(job, src, grade) local hasJob = false
elseif GetResourceState(QBXExport):find("start") then elseif GetResourceState(QBXExport):find("start") then
local jobinfo = QBX.PlayerData.job local jobinfo = QBX.PlayerData.job
if jobinfo.name == job then if jobinfo.name == job then hasJob = true
hasJob = true if grade and not (grade <= jobinfo.grade.level) then hasJob = false end
if grade and not jobinfo.grade.level then hasJob = false end
end end
local ganginfo = QBX.PlayerData.gang local ganginfo = QBX.PlayerData.gang
if ganginfo.name == job then if ganginfo.name == job then hasJob = true
hasJob = true if grade and not (grade <= ganginfo.grade.level) then hasJob = false end
if grade and not ganginfo.grade.level then hasJob = false end
end end
else else
local info = nil local info = nil
@@ -1035,12 +1033,12 @@ function hasJob(job, src, grade) local hasJob = false
local jobinfo = info.job local jobinfo = info.job
if jobinfo.name == job then if jobinfo.name == job then
hasJob = true hasJob = true
if grade and not jobinfo.grade.level then hasJob = false end if grade and not (grade <= jobinfo.grade.level) then hasJob = false end
end end
local ganginfo = info.gang local ganginfo = info.gang
if ganginfo.name == job then if ganginfo.name == job then
hasJob = true hasJob = true
if grade and not ganginfo.grade.level then hasJob = false end if grade and not (grade <= ganginfo.grade.level) then hasJob = false end
end end
end end
end end