starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-29 09:18:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #493 from Taavi-AU/main

Browse Source 
better esx_basicneeds
This commit is contained in:
Benzo
2022-09-25 18:32:35 +02:00
committed by GitHub
parent 12c5ee46ef 3cc4c198b9
commit dc7e29a171
4 changed files with 45 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[esx_addons]/esx_basicneeds/config.lua
+14
View File
@@ -1,3 +1,17 @@
Config = {}
Config.Locale = 'en'
Config.Visible = true
Config.Food = {
["bread"] = {
status = 200000,
remove = false
}
}
Config.Drinks = {
["water"] = {
status = 100000,
remove = true
}
}
[esx_addons]/esx_basicneeds/locales/br.lua
+3 -3
View File
@@ -1,4 +1,4 @@
Locales['br'] = {
['used_bread'] = 'você comeu 1x pão',
['used_water'] = 'você tomou 1x água',
}
['used_eat'] = 'você comeu 1x %s',
['used_drink'] = 'você tomou 1x %s',
}
[esx_addons]/esx_basicneeds/locales/en.lua
+3 -3
View File
@@ -1,4 +1,4 @@
Locales['en'] = {
['used_bread'] = 'you have used 1x bread',
['used_water'] = 'you have used 1x water',
}
['used_eat'] = 'you have used 1x %s',
['used_drink'] = 'you have used 1x %s',
}
[esx_addons]/esx_basicneeds/server/main.lua
+25 -15
View File
@@ -1,19 +1,29 @@
ESX.RegisterUsableItem('bread', function(source)
local xPlayer = ESX.GetPlayerFromId(source)
xPlayer.removeInventoryItem('bread', 1)
TriggerClientEvent('esx_status:add', source, 'hunger', 200000)
TriggerClientEvent('esx_basicneeds:onEat', source)
xPlayer.showNotification(_U('used_bread'))
CreateThread(function()
for k,v in pairs(Config.Food) do
ESX.RegisterUsableItem(k, function(source)
local xPlayer = ESX.GetPlayerFromId(source)
if v.remove then
xPlayer.removeInventoryItem(k,1)
end
TriggerClientEvent("esx_status:add",source,"hunger",v.status)
TriggerClientEvent('esx_basicneeds:onEat',source)
xPlayer.showNotification(_U('used_eat', ESX.GetItemLabel(k)))
end)
end
end)
ESX.RegisterUsableItem('water', function(source)
local xPlayer = ESX.GetPlayerFromId(source)
xPlayer.removeInventoryItem('water', 1)
TriggerClientEvent('esx_status:add', source, 'thirst', 200000)
TriggerClientEvent('esx_basicneeds:onDrink', source)
xPlayer.showNotification(_U('used_water'))
CreateThread(function()
for k,v in pairs(Config.Drinks) do
ESX.RegisterUsableItem(k, function(source)
local xPlayer = ESX.GetPlayerFromId(source)
if v.remove then
xPlayer.removeInventoryItem(k,1)
end
TriggerClientEvent("esx_status:add",source,"thirst",v.status)
TriggerClientEvent('esx_basicneeds:onDrink',source)
xPlayer.showNotification(_U('used_drink', ESX.GetItemLabel(k)))
end)
end
end)
ESX.RegisterCommand('heal', 'admin', function(xPlayer, args, showError)
@@ -29,4 +39,4 @@ AddEventHandler('txAdmin:events:healedPlayer', function(eventData)
end
TriggerClientEvent('esx_basicneeds:healPlayer', eventData.id)
end)
end)