mirror of
https://github.com/jimathy/jim_bridge.git
synced 2026-08-17 05:56:02 +01:00
Fix hunger and thirst events
Missed out the math part when adding hunger and thirst to a player when eating items when I reworked the functions should fix for all frameworks
This commit is contained in:
@@ -16,14 +16,18 @@ local hungerThirstFunc = {
|
|||||||
setThirst =
|
setThirst =
|
||||||
function(src, thirst)
|
function(src, thirst)
|
||||||
local Player = Core.Functions.GetPlayer(src)
|
local Player = Core.Functions.GetPlayer(src)
|
||||||
Player.Functions.SetMetaData('thirst', thirst)
|
local newThirst = Player.PlayerData.metadata.thirst + thirst
|
||||||
TriggerClientEvent("hud:client:UpdateNeeds", src, Player.PlayerData.metadata.hunger, thirst)
|
newThirst = (newThirst >= 100.0 and 100.0) or (newThirst <= 0 and 0) or newThirst
|
||||||
|
Player.Functions.SetMetaData('thirst', newThirst)
|
||||||
|
TriggerClientEvent("hud:client:UpdateNeeds", src, Player.PlayerData.metadata.hunger, newThirst)
|
||||||
end,
|
end,
|
||||||
setHunger =
|
setHunger =
|
||||||
function(src, hunger)
|
function(src, hunger)
|
||||||
local Player = Core.Functions.GetPlayer(src)
|
local Player = Core.Functions.GetPlayer(src)
|
||||||
Player.Functions.SetMetaData('hunger', hunger)
|
local newHunger = Player.PlayerData.metadata.hunger + hunger
|
||||||
TriggerClientEvent("hud:client:UpdateNeeds", src, hunger, Player.PlayerData.metadata.thirst)
|
newHunger = (newHunger >= 100.0 and 100.0) or (newHunger <= 0 and 0) or newHunger
|
||||||
|
Player.Functions.SetMetaData('hunger', newHunger)
|
||||||
|
TriggerClientEvent("hud:client:UpdateNeeds", src, newHunger, Player.PlayerData.metadata.thirst)
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -31,14 +35,18 @@ local hungerThirstFunc = {
|
|||||||
setThirst =
|
setThirst =
|
||||||
function(src, thirst)
|
function(src, thirst)
|
||||||
local Player = Core.Functions.GetPlayer(src)
|
local Player = Core.Functions.GetPlayer(src)
|
||||||
Player.Functions.SetMetaData('thirst', thirst)
|
local newThirst = Player.PlayerData.metadata.thirst + thirst
|
||||||
TriggerClientEvent("hud:client:UpdateNeeds", src, Player.PlayerData.metadata.hunger, thirst)
|
newThirst = (newThirst >= 100.0 and 100.0) or (newThirst <= 0 and 0) or newThirst
|
||||||
|
Player.Functions.SetMetaData('thirst', newThirst)
|
||||||
|
TriggerClientEvent("hud:client:UpdateNeeds", src, Player.PlayerData.metadata.hunger, newThirst)
|
||||||
end,
|
end,
|
||||||
setHunger =
|
setHunger =
|
||||||
function(src, hunger)
|
function(src, hunger)
|
||||||
local Player = Core.Functions.GetPlayer(src)
|
local Player = Core.Functions.GetPlayer(src)
|
||||||
Player.Functions.SetMetaData('hunger', hunger)
|
local newHunger = Player.PlayerData.metadata.hunger + hunger
|
||||||
TriggerClientEvent("hud:client:UpdateNeeds", src, hunger, Player.PlayerData.metadata.thirst)
|
newHunger = (newHunger >= 100.0 and 100.0) or (newHunger <= 0 and 0) or newHunger
|
||||||
|
Player.Functions.SetMetaData('hunger', newHunger)
|
||||||
|
TriggerClientEvent("hud:client:UpdateNeeds", src, newHunger, Player.PlayerData.metadata.thirst)
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -46,25 +54,29 @@ local hungerThirstFunc = {
|
|||||||
setThirst =
|
setThirst =
|
||||||
function(src, thirst)
|
function(src, thirst)
|
||||||
local Player = Core.Functions.GetPlayer(src)
|
local Player = Core.Functions.GetPlayer(src)
|
||||||
Player.Functions.SetMetaData('thirst', thirst)
|
local newThirst = Player.PlayerData.metadata.thirst + thirst
|
||||||
TriggerClientEvent("hud:client:UpdateNeeds", src, Player.PlayerData.metadata.hunger, thirst)
|
newThirst = (newThirst >= 100.0 and 100.0) or (newThirst <= 0 and 0) or newThirst
|
||||||
|
Player.Functions.SetMetaData('thirst', newThirst)
|
||||||
|
TriggerClientEvent("hud:client:UpdateNeeds", src, Player.PlayerData.metadata.hunger, newThirst)
|
||||||
end,
|
end,
|
||||||
setHunger =
|
setHunger =
|
||||||
function(src, hunger)
|
function(src, hunger)
|
||||||
local Player = Core.Functions.GetPlayer(src)
|
local Player = Core.Functions.GetPlayer(src)
|
||||||
Player.Functions.SetMetaData('hunger', hunger)
|
local newHunger = Player.PlayerData.metadata.hunger + hunger
|
||||||
TriggerClientEvent("hud:client:UpdateNeeds", src, hunger, Player.PlayerData.metadata.thirst)
|
newHunger = (newHunger >= 100.0 and 100.0) or (newHunger <= 0 and 0) or newHunger
|
||||||
|
Player.Functions.SetMetaData('hunger', newHunger)
|
||||||
|
TriggerClientEvent("hud:client:UpdateNeeds", src, newHunger, Player.PlayerData.metadata.thirst)
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
|
||||||
{ framework = ESXExport,
|
{ framework = ESXExport,
|
||||||
setThirst =
|
setThirst =
|
||||||
function(src, thirst)
|
function(src, thirst)
|
||||||
TriggerClientEvent('esx_status:add', src, 'thirst', thirst)
|
TriggerClientEvent('esx_status:add', src, 'thirst', tonumber(thirst) * 10000)
|
||||||
end,
|
end,
|
||||||
setHunger =
|
setHunger =
|
||||||
function(src, hunger)
|
function(src, hunger)
|
||||||
TriggerClientEvent('esx_status:add', src, 'hunger', hunger)
|
TriggerClientEvent('esx_status:add', src, 'hunger', tonumber(hunger) * 10000)
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user