From 7d1306f78c74a72c0dc079539d8a9e966b132566 Mon Sep 17 00:00:00 2001 From: Taavi <97351942+Taavi-AU@users.noreply.github.com> Date: Thu, 22 Sep 2022 20:25:11 +0800 Subject: [PATCH 1/6] Update config.lua --- [esx_addons]/esx_basicneeds/config.lua | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/[esx_addons]/esx_basicneeds/config.lua b/[esx_addons]/esx_basicneeds/config.lua index ce211543..321f472d 100644 --- a/[esx_addons]/esx_basicneeds/config.lua +++ b/[esx_addons]/esx_basicneeds/config.lua @@ -1,3 +1,17 @@ Config = {} Config.Locale = 'en' Config.Visible = true + +Config.Food = { + ["bread"] = { + status = 10000, + remove = false -- want the item to remove on use + } +} + +Config.Drinks = { + ["water"] = { + status = 10000, + remove = true -- want the item to remove on use + } +} From 5b7b0c89fa3e74d054825021c5571a59942384ff Mon Sep 17 00:00:00 2001 From: Taavi <97351942+Taavi-AU@users.noreply.github.com> Date: Thu, 22 Sep 2022 20:25:23 +0800 Subject: [PATCH 2/6] Update main.lua --- [esx_addons]/esx_basicneeds/server/main.lua | 40 +++++++++++++-------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/[esx_addons]/esx_basicneeds/server/main.lua b/[esx_addons]/esx_basicneeds/server/main.lua index b0de7997..5d420fa7 100644 --- a/[esx_addons]/esx_basicneeds/server/main.lua +++ b/[esx_addons]/esx_basicneeds/server/main.lua @@ -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.Drink) 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:onEat',source) + xPlayer.showNotification(_U('used_eat', 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) \ No newline at end of file +end) From 665376aeb9812b09329e8dc519f2770ce8c06fe7 Mon Sep 17 00:00:00 2001 From: Taavi <97351942+Taavi-AU@users.noreply.github.com> Date: Fri, 23 Sep 2022 00:06:52 +0800 Subject: [PATCH 3/6] Update main.lua --- [esx_addons]/esx_basicneeds/server/main.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/[esx_addons]/esx_basicneeds/server/main.lua b/[esx_addons]/esx_basicneeds/server/main.lua index 5d420fa7..5fed3e92 100644 --- a/[esx_addons]/esx_basicneeds/server/main.lua +++ b/[esx_addons]/esx_basicneeds/server/main.lua @@ -13,15 +13,15 @@ CreateThread(function() end) CreateThread(function() - for k,v in pairs(Config.Drink) do + 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:onEat',source) - xPlayer.showNotification(_U('used_eat', ESX.GetItemLabel(k))) + TriggerClientEvent('esx_basicneeds:onDrink',source) + xPlayer.showNotification(_U('used_drink', ESX.GetItemLabel(k))) end) end end) From b13caf9e2af362adf65fe6beaf0c918d3ef3acbf Mon Sep 17 00:00:00 2001 From: Taavi <97351942+Taavi-AU@users.noreply.github.com> Date: Fri, 23 Sep 2022 00:07:14 +0800 Subject: [PATCH 4/6] Update config.lua --- [esx_addons]/esx_basicneeds/config.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/[esx_addons]/esx_basicneeds/config.lua b/[esx_addons]/esx_basicneeds/config.lua index 321f472d..a0b9fb0e 100644 --- a/[esx_addons]/esx_basicneeds/config.lua +++ b/[esx_addons]/esx_basicneeds/config.lua @@ -4,14 +4,14 @@ Config.Visible = true Config.Food = { ["bread"] = { - status = 10000, - remove = false -- want the item to remove on use + status = 200000, + remove = false } } Config.Drinks = { ["water"] = { - status = 10000, - remove = true -- want the item to remove on use + status = 100000, + remove = true } } From b7eb31df056a7b32ccaf5d0c9b2b0e7dce3151f8 Mon Sep 17 00:00:00 2001 From: Taavi <97351942+Taavi-AU@users.noreply.github.com> Date: Fri, 23 Sep 2022 00:09:21 +0800 Subject: [PATCH 5/6] Update en.lua --- [esx_addons]/esx_basicneeds/locales/en.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/[esx_addons]/esx_basicneeds/locales/en.lua b/[esx_addons]/esx_basicneeds/locales/en.lua index 3d03856d..a84b4c38 100644 --- a/[esx_addons]/esx_basicneeds/locales/en.lua +++ b/[esx_addons]/esx_basicneeds/locales/en.lua @@ -1,4 +1,4 @@ Locales['en'] = { - ['used_bread'] = 'you have used 1x bread', - ['used_water'] = 'you have used 1x water', -} \ No newline at end of file + ['used_eat'] = 'you have used 1x %s', + ['used_drink'] = 'you have used 1x %s', +} From 3cc4c198b98e90178609e87c525d503a1fbd5206 Mon Sep 17 00:00:00 2001 From: Taavi <97351942+Taavi-AU@users.noreply.github.com> Date: Fri, 23 Sep 2022 00:09:50 +0800 Subject: [PATCH 6/6] Update br.lua --- [esx_addons]/esx_basicneeds/locales/br.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/[esx_addons]/esx_basicneeds/locales/br.lua b/[esx_addons]/esx_basicneeds/locales/br.lua index e263e11a..2f023c30 100644 --- a/[esx_addons]/esx_basicneeds/locales/br.lua +++ b/[esx_addons]/esx_basicneeds/locales/br.lua @@ -1,4 +1,4 @@ Locales['br'] = { - ['used_bread'] = 'você comeu 1x pão', - ['used_water'] = 'você tomou 1x água', -} \ No newline at end of file + ['used_eat'] = 'você comeu 1x %s', + ['used_drink'] = 'você tomou 1x %s', +}