diff --git a/modules/framework/es_extended/client.lua b/modules/framework/es_extended/client.lua index d57c230..e2838a9 100644 --- a/modules/framework/es_extended/client.lua +++ b/modules/framework/es_extended/client.lua @@ -76,7 +76,7 @@ Framework.GetPlayerName = function() return playerData.firstName, playerData.lastName end ----This will return the players job name, job label, job grade label and job grade level +---Depricated : This will return the players job name, job label, job grade label and job grade level ---@return string ---@return string ---@return string @@ -86,6 +86,23 @@ Framework.GetPlayerJob = function() return playerData.job.name, playerData.job.label, playerData.job.grade_label, playerData.job.grade end +---This will return the players job name, job label, job grade label job grade level, boss status, and duty status in a table +---@return table +Framework.GetPlayerJobData = function() + local playerData = Framework.GetPlayerData() + local jobData = playerData.job + local isBoss = (jobData.grade_name == "boss") + return { + jobName = jobData.name, + jobLabel = jobData.label, + gradeName = jobData.grade_name, + gradeLabel = jobData.grade_label, + gradeRank = jobData.grade, + boss = isBoss, + onDuty = jobData.onduty, + } +end + ---This will return a boolean if the player has the item in their inventory ---@param item string ---@return boolean diff --git a/modules/framework/es_extended/server.lua b/modules/framework/es_extended/server.lua index 83fee38..780b20f 100644 --- a/modules/framework/es_extended/server.lua +++ b/modules/framework/es_extended/server.lua @@ -198,7 +198,7 @@ Framework.GetPlayerPhone = function(src) end ----Returns the job name, label, grade name, and grade level of the player. +---Depricated: Returns the job name, label, grade name, and grade level of the player. ---@param src number ---@return string | nil ---@return string | nil @@ -211,6 +211,25 @@ Framework.GetPlayerJob = function(src) return job.name, job.label, job.grade_label, job.grade end +---This will return the players job name, job label, job grade label job grade level, boss status, and duty status in a table +---@param src number +---@return table | nil +Framework.GetPlayerJobData = function(src) + local xPlayer = Framework.GetPlayer(src) + if not xPlayer then return end + local job = xPlayer.getJob() + local isBoss = (job.grade_name == "boss") + return { + jobName = job.name, + jobLabel = job.label, + gradeName = job.grade_name, + gradeLabel = job.grade_label, + gradeRank = job.grade, + boss = isBoss, + onDuty = job.onduty, + } +end + ---Returns the players duty status. ---@param src number ---@return boolean diff --git a/modules/framework/qb-core/client.lua b/modules/framework/qb-core/client.lua index 1daa075..8686657 100644 --- a/modules/framework/qb-core/client.lua +++ b/modules/framework/qb-core/client.lua @@ -91,7 +91,7 @@ Framework.GetPlayerName = function() return playerData.charinfo.firstname, playerData.charinfo.lastname end ----This will return the players job name, job label, job grade name and job grade level. +---Depricated : This will return the players job name, job label, job grade label and job grade level ---@return string ---@return string ---@return string @@ -101,6 +101,22 @@ Framework.GetPlayerJob = function() return playerData.job.name, playerData.job.label, playerData.job.grade.name, playerData.job.grade.level end +---This will return the players job name, job label, job grade label job grade level, boss status, and duty status in a table +---@return table +Framework.GetPlayerJobData = function() + local playerData = Framework.GetPlayerData() + local jobData = playerData.job + return { + jobName = jobData.name, + jobLabel = jobData.label, + gradeName = jobData.grade.name, + gradeLabel = jobData.grade.name, + gradeRank = jobData.grade.level, + boss = jobData.isboss, + onDuty = jobData.onduty, + } +end + Framework.HasItem = function(item) return QBCore.Functions.HasItem(item) end diff --git a/modules/framework/qb-core/server.lua b/modules/framework/qb-core/server.lua index 1a302da..9885980 100644 --- a/modules/framework/qb-core/server.lua +++ b/modules/framework/qb-core/server.lua @@ -326,12 +326,12 @@ Framework.GetPlayersByJob = function(job) return playerList end ----This will get the players job info +---Depricated: Returns the job name, label, grade name, and grade level of the player. ---@param src number ----@return string ----@return string ----@return string ----@return string +---@return string | string | string | number | nil +---@return string | string | string | number | nil +---@return string | string | string | number | nil +---@return string | string | string | number | nil Framework.GetPlayerJob = function(src) local player = Framework.GetPlayer(src) if not player then return end @@ -339,6 +339,24 @@ Framework.GetPlayerJob = function(src) return playerData.job.name, playerData.job.label, playerData.job.grade.name, playerData.job.grade.level end +---This will return the players job name, job label, job grade label job grade level, boss status, and duty status in a table +---@return table | nil +Framework.GetPlayerJobData = function(src) + local player = Framework.GetPlayer(src) + if not player then return end + local playerData = player.PlayerData + local jobData = playerData.job + return { + jobName = jobData.name, + jobLabel = jobData.label, + gradeName = jobData.grade.name, + gradeLabel = jobData.grade.name, + gradeRank = jobData.grade.level, + boss = jobData.isboss, + onDuty = jobData.onduty, + } +end + ---Returns the players duty status. ---@param src number ---@return boolean | nil diff --git a/modules/framework/qbx_core/client.lua b/modules/framework/qbx_core/client.lua index bf1e9af..ad0b815 100644 --- a/modules/framework/qbx_core/client.lua +++ b/modules/framework/qbx_core/client.lua @@ -50,11 +50,32 @@ Framework.GetPlayerName = function() return playerData.charinfo.firstname, playerData.charinfo.lastname end +---Depricated : This will return the players job name, job label, job grade label and job grade level +---@return string +---@return string +---@return string +---@return string Framework.GetPlayerJob = function() local playerData = Framework.GetPlayerData() return playerData.job.name, playerData.job.label, playerData.job.grade.name, playerData.job.grade.level end +---This will return the players job name, job label, job grade label job grade level, boss status, and duty status in a table +---@return table +Framework.GetPlayerJobData = function() + local playerData = Framework.GetPlayerData() + local jobData = playerData.job + return { + jobName = jobData.name, + jobLabel = jobData.label, + gradeName = jobData.grade.name, + gradeLabel = jobData.grade.name, + gradeRank = jobData.grade.level, + boss = jobData.isboss, + onDuty = jobData.onduty, + } +end + Framework.GetPlayerInventory = function() return Framework.GetPlayerData().items end diff --git a/modules/framework/qbx_core/server.lua b/modules/framework/qbx_core/server.lua index b981b50..a7064b7 100644 --- a/modules/framework/qbx_core/server.lua +++ b/modules/framework/qbx_core/server.lua @@ -285,16 +285,35 @@ Framework.GetPlayersByJob = function(job) return playerList end ----Returns the job name, label, grade name, and grade level of the player. +---Depricated: Returns the job name, label, grade name, and grade level of the player. ---@param src number ---@return string | string | string | number | nil ---@return string | string | string | number | nil ---@return string | string | string | number | nil ---@return string | string | string | number | nil Framework.GetPlayerJob = function(src) - local player = Framework.GetPlayer(src).PlayerData + local player = Framework.GetPlayer(src) if not player then return end - return player.job.name, player.job.label, player.job.grade.name, player.job.grade.level + local playerData = player.PlayerData + return playerData.job.name, playerData.job.label, playerData.job.grade.name, playerData.job.grade.level +end + +---This will return the players job name, job label, job grade label job grade level, boss status, and duty status in a table +---@return table | nil +Framework.GetPlayerJobData = function(src) + local player = Framework.GetPlayer(src) + if not player then return end + local playerData = player.PlayerData + local jobData = playerData.job + return { + jobName = jobData.name, + jobLabel = jobData.label, + gradeName = jobData.grade.name, + gradeLabel = jobData.grade.name, + gradeRank = jobData.grade.level, + boss = jobData.isboss, + onDuty = jobData.onduty, + } end ---Sets the player's job to the specified name and grade.