Version Bump

`2.0.11` - `2.0.12`

fxmanifest.lua

@@ -1,6 +1,6 @@
 name "Jim_Bridge"
 author "Jimathy"
-version "2.0.11"
+version "2.0.12"
 description "Framework Bridge By Jimathy"
 fx_version "cerulean"
 rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.'

shared/_loaders.lua

@@ -110,7 +110,7 @@ function onResourceStart(func, thisScript)
     AddEventHandler('onResourceStart', function(resourceName)
         if getScript() == resourceName and (thisScript or true) then
             if waitForSharedLoad() then
-                print("^6Bridge^7: ^2Shared Load Detected^7.")
+                debugPrint("^6Bridge^7: ^2Shared Load Detected^7.")
                 if isStarted(ESXExport) then Wait(10000) end
                 func()
             end

shared/coreloader.lua

@@ -195,10 +195,8 @@ end
 if vehResource == nil then
     print("^4ERROR^7: ^2No Vehicle info detected ^7- ^2Check ^3starter^1.^2lua^7")
 else
-    CreateThread(function()
+    while not Vehicles do Wait(1000) end
-        while not Vehicles do Wait(1000) end
+    debugPrint("^6Bridge^7: ^2Loading ^6"..countTable(Vehicles).." ^3Vehicles^2 from ^7"..vehResource)
-        debugPrint("^6Bridge^7: ^2Loading ^6"..countTable(Vehicles).." ^3Vehicles^2 from ^7"..vehResource)
-    end)
 end
 
 -------------------------------------------------------------
@@ -252,15 +250,37 @@ elseif isStarted(ESXExport) then
         end)
         -- Populate jobs table with ESX.GetJobs()
         Jobs = ESX.GetJobs()
+        --jsonPrint(Jobs)
         --If retreived jobs is empty, wait for ESX to load
         while countTable(Jobs) == 0 do
             Jobs = ESX.GetJobs()
             Wait(100)
         end
         -- Organise into a table the script can use
-        for k, v in pairs(Jobs) do
+        for Role, Grades in pairs(Jobs) do
-            local count = countTable(Jobs[k].grades) - 1
+
-            Jobs[k].grades[tostring(count)].isBoss = true
+            -- Check for "Boss" in name of grades
+            for grade, info in pairs(Grades.grades) do
+                --print(grade)
+                --jsonPrint(info)
+
+                if info.label then
+                    --print(info)
+                    if info.label:find("boss") or info.label:find("Boss") then
+                        --print("Found Boss label for:", Grades.label)
+                        Jobs[Role].grades[grade].isBoss = true
+                        goto continue
+                    end
+                end
+            end
+
+            -- If no roles with "boss" in the name, revert to max grade
+
+            -- Count grades
+            local count = countTable(Grades.grades)
+            Jobs[Role].grades[tostring(count-1)].isBoss = true
+            --print(Grades.label.." Grade: "..count.." is Boss")
+            ::continue::
         end
         -- ESX Default doesn't have gangs, so copy jobs to gangs
         Gangs = Jobs

shared/jobfunctions.lua

@@ -46,7 +46,7 @@ function makeBossRoles(role)
     local data = (Jobs and Jobs[role]) or (Gangs and Gangs[role])
     if data then
         for grade, info in pairs(data.grades) do
-            if info.isboss or info.bankAuth then
+            if info.isboss or info.bankAuth or info.isBoss then
                 boss[role] = boss[role] and math.min(boss[role], tonumber(grade)) or tonumber(grade)
             end
         end

shared/stashcontrol.lua

@@ -161,7 +161,10 @@ function openStash(data)
             })
         else
             TriggerEvent("inventory:client:SetCurrentStash", data.stash)
-            TriggerServerEvent("inventory:server:OpenInventory", "stash", data.stash, data.stashOptions)
+            TriggerServerEvent("inventory:server:OpenInventory", "stash", data.stash, {
+                slots = data.slots or 50,
+                maxWeight = data.maxWeight or 600000
+            })
         end
 
     elseif isStarted(PSInv) then
@@ -174,7 +177,10 @@ function openStash(data)
             })
         else
             TriggerEvent("inventory:client:SetCurrentStash", data.stash)
-            TriggerServerEvent("inventory:server:OpenInventory", "stash", data.stash, data.stashOptions)
+            TriggerServerEvent("inventory:server:OpenInventory", "stash", data.stash, {
+                slots = data.slots or 50,
+                maxWeight = data.maxWeight or 600000
+            })
         end
 
     elseif isStarted(RSGInv) then
@@ -188,7 +194,10 @@ function openStash(data)
     else
         --Fallback to these commands
         TriggerEvent("inventory:client:SetCurrentStash", data.stash)
-        TriggerServerEvent("inventory:server:OpenInventory", "stash", data.stash, data.stashOptions)
+            TriggerServerEvent("inventory:server:OpenInventory", "stash", data.stash, {
+                slots = data.slots or 50,
+                maxWeight = data.maxWeight or 600000
+            })
     end
 
     lookEnt(data.coords)
@@ -578,6 +587,5 @@ RegisterNetEvent(getScript()..":openGrabBox", function(data)
 	end
 	openStash({
 		stash = id,
-		coords = GetEntityCoords(PlayerPedId())
 	})
 end)

starter.lua

@@ -86,10 +86,12 @@ for Type, ScriptTable in pairs(filesToLoad) do
                     files = { files }
                 end
                 for _, file in pairs(files) do
-                    --print("^5CoreLoader^7: '"..k.."/"..file.."' ^2into ^7'"..GetCurrentResourceName().."' ...")
+                    --print("^5CoreLoader^7: '"..scriptName.."/"..file.."' ^2into ^7'"..GetCurrentResourceName().."' ...")
                     local fileLoader = assert(load(LoadResourceFile(scriptName, (file)), ('@@'..scriptName..'/'..file)))
                     fileLoader()
-                    print("^5CoreLoader^7: ^2loaded ^1Core ^2file^7: ^3"..scriptName.."^7/^3"..(file):gsub("/", "^7/^3"):gsub("%.lua", "^7.lua").." ^2into ^7'"..GetCurrentResourceName().."'")
+                    if debugMode then
+                        print("^5CoreLoader^7: ^2loaded ^1Core ^2file^7: ^3"..scriptName.."^7/^3"..(file):gsub("/", "^7/^3"):gsub("%.lua", "^7.lua").." ^2into ^7'"..GetCurrentResourceName().."'")
+                    end
                 end
             end
 
@@ -118,7 +120,7 @@ for _, v in pairs({ -- This is a specific load order
 
     '_eventDebug.lua',
     'callback.lua',
-    'coreloader.lua',   -- needs to be second to load all core related stuff before everything else
+    'coreloader.lua',
 
     'duifunctions.lua',
 

version.txt

@@ -1 +1 @@
-2.0.11
+2.0.12