diff --git a/modules/framework/es_extended/client.lua b/modules/framework/es_extended/client.lua index a37df82..e8f1d34 100644 --- a/modules/framework/es_extended/client.lua +++ b/modules/framework/es_extended/client.lua @@ -124,6 +124,34 @@ Framework.GetPlayerJobData = function() } end +--This is an internal function to get status data +--- @param search string +Framework.GetStatusData = function(search) + local playerData = Framework.GetPlayerData() + if not playerData then return 0 end + local status = playerData.variables.status + for _, entry in ipairs(status) do + if entry.name == search then + return entry.percent or 0 + end + end + return 0 +end + +---This will get the hunger of a player +---@return number +Framework.GetHunger = function() + local status = Framework.GetStatusData("hunger") + return math.floor((status) + 0.5) or 0 +end + +---This will get the thirst of a player +---@return number +Framework.GetThirst = function() + local status = Framework.GetStatusData("thirst") + return math.floor((status) + 0.5) or 0 +end + --- @description This will return if the player has the specified 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 f4a68a6..e1abfc0 100644 --- a/modules/framework/es_extended/server.lua +++ b/modules/framework/es_extended/server.lua @@ -253,11 +253,11 @@ end --- @return number | nil Framework.GetHunger = function(src) local status = Framework.GetStatus(src, "status") - if not status then return nil end - + if not status then return end + if type(status) ~= "table" then return end for _, entry in ipairs(status) do if entry.name == "hunger" then - return math.floor(entry.percent) + return math.floor((entry.percent) + 0.5) or 0 end end end @@ -268,10 +268,10 @@ end Framework.GetThirst = function(src) local status = Framework.GetStatus(src, "status") if not status then return nil end - + if type(status) ~= "table" then return end for _, entry in ipairs(status) do if entry.name == "thirst" then - return math.floor(entry.percent) + return math.floor((entry.percent) + 0.5) or 0 end end end diff --git a/modules/framework/qb-core/client.lua b/modules/framework/qb-core/client.lua index f734482..b85410b 100644 --- a/modules/framework/qb-core/client.lua +++ b/modules/framework/qb-core/client.lua @@ -109,6 +109,20 @@ Framework.GetItemInfo = function(item) return repackedTable end +---This will get the hunger of a player +---@return number +Framework.GetHunger = function() + local hunger = Framework.GetPlayerMetaData("hunger") or 0 + return math.floor((hunger) + 0.5) or 0 +end + +---This will get the thirst of a player +---@return number +Framework.GetThirst = function() + local thirst = Framework.GetPlayerMetaData("thirst") or 0 + return math.floor((thirst) + 0.5) or 0 +end + ---This will get the players identifier (citizenid) etc. ---@return string Framework.GetPlayerIdentifier = function() diff --git a/modules/framework/qb-core/server.lua b/modules/framework/qb-core/server.lua index 1ba3d10..f346988 100644 --- a/modules/framework/qb-core/server.lua +++ b/modules/framework/qb-core/server.lua @@ -303,7 +303,7 @@ Framework.GetHunger = function(src) if not player then return end local playerData = player.PlayerData local newHunger = (playerData.metadata.hunger or 0) - return newHunger + return math.floor((newHunger) + 0.5) or 0 end ---This will return a boolean if the player is dead or in last stand. @@ -335,7 +335,7 @@ Framework.GetThirst = function(src) if not player then return end local playerData = player.PlayerData local newThirst = (playerData.metadata.thirst or 0) - return newThirst + return math.floor((newThirst) + 0.5) or 0 end -- Framework.GetPlayerPhone(src) diff --git a/modules/framework/qbx_core/client.lua b/modules/framework/qbx_core/client.lua index 7ba21b9..5f90b59 100644 --- a/modules/framework/qbx_core/client.lua +++ b/modules/framework/qbx_core/client.lua @@ -68,6 +68,20 @@ Framework.Notify = function(message, type, time) return QBox:Notify("Notification", type, time, message) end +---This will get the hunger of a player +---@return number +Framework.GetHunger = function() + local hunger = Framework.GetPlayerMetaData("hunger") or 0 + return math.floor((hunger) + 0.5) or 0 +end + +---This will get the thirst of a player +---@return number +Framework.GetThirst = function() + local thirst = Framework.GetPlayerMetaData("thirst") or 0 + return math.floor((thirst) + 0.5) or 0 +end + ---This will get the players identifier (citizenid) etc. ---@return string Framework.GetPlayerIdentifier = function() diff --git a/modules/framework/qbx_core/server.lua b/modules/framework/qbx_core/server.lua index de994dd..e20c2c5 100644 --- a/modules/framework/qbx_core/server.lua +++ b/modules/framework/qbx_core/server.lua @@ -234,7 +234,7 @@ Framework.GetHunger = function(src) if not player then return end local playerData = player.PlayerData local newHunger = (playerData.metadata.hunger or 0) - return newHunger + return math.floor((newHunger) + 0.5) or 0 end ---This will return a boolean if the player is dead or in last stand. @@ -265,7 +265,7 @@ Framework.GetThirst = function(src) if not player then return end local playerData = player.PlayerData local newThirst = (playerData.metadata.thirst or 0) - return newThirst + return math.floor((newThirst) + 0.5) or 0 end ---Returns the phone number of the player.