From e62f067613390a333843f2245dd14b4c9ae9589a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 12 Aug 2017 11:40:24 +0200 Subject: [PATCH 01/46] Initial commit --- README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..9e02bc6d --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# fxserver-esx_basicneeds +FXServer ESX Basic Needs From 5152584799c3b1c9f579b359f6b27e77be7bfbcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 12 Aug 2017 11:41:01 +0200 Subject: [PATCH 02/46] Update README.md --- README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/README.md b/README.md index 9e02bc6d..df45e168 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,16 @@ # fxserver-esx_basicneeds FXServer ESX Basic Needs + +[INSTALLATION] + +1) CD in your resources/[esx] folder +2) Clone the repository +``` +git clone https://github.com/FXServer-ESX/fxserver-esx_basicneeds esx_basicneeds +``` +3) Import esx_basicneeds.sql in your database +4) Add this in your server.cfg : + +``` +start esx_basicneeds +``` From b0481a87f9c0f3196fdfc4f028eea05e41ba906e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 12 Aug 2017 11:46:03 +0200 Subject: [PATCH 03/46] Add files --- __resource.lua | 13 ++++++ client/main.lua | 113 +++++++++++++++++++++++++++++++++++++++++++++ config.lua | 4 ++ esx_basicneeds.sql | 6 +++ server/main.lua | 74 +++++++++++++++++++++++++++++ 5 files changed, 210 insertions(+) create mode 100644 __resource.lua create mode 100644 client/main.lua create mode 100644 config.lua create mode 100644 esx_basicneeds.sql create mode 100644 server/main.lua diff --git a/__resource.lua b/__resource.lua new file mode 100644 index 00000000..70b8e086 --- /dev/null +++ b/__resource.lua @@ -0,0 +1,13 @@ +resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' + +description 'ESX Basic Needs' + +server_scripts { + 'config.lua', + 'server/main.lua' +} + +client_scripts { + 'config.lua', + 'client/main.lua' +} diff --git a/client/main.lua b/client/main.lua new file mode 100644 index 00000000..1ea6d25e --- /dev/null +++ b/client/main.lua @@ -0,0 +1,113 @@ +ESX = nil +local IsDead = false + +Citizen.CreateThread(function() + while ESX == nil do + TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + Citizen.Wait(0) + end +end) + +AddEventHandler('playerSpawned', function() + + if IsDead then + TriggerServerEvent('esx_basicneeds:resetStatus') + end + + IsDead = false +end) + +AddEventHandler('esx_status:loaded', function(status) + + Citizen.CreateThread(function() + + while true do + + Wait(1000) + + local playerPed = GetPlayerPed(-1) + local prevHealth = GetEntityHealth(playerPed) + local health = prevHealth + + TriggerEvent('esx_status:getStatus', 'hunger', function(status) + + if status.val == 0 then + + if prevHealth <= 150 then + health = health - 5 + else + health = health - 1 + end + + end + + end) + + TriggerEvent('esx_status:getStatus', 'thirst', function(status) + + if status.val == 0 then + + if prevHealth <= 150 then + health = health - 5 + else + health = health - 1 + end + + end + + end) + + if health ~= prevHealth then + SetEntityHealth(playerPed, health) + end + + end + + end) + + Citizen.CreateThread(function() + + while true do + + Wait(0) + + local playerPed = GetPlayerPed(-1) + + if IsEntityDead(playerPed) and not IsDead then + IsDead = true + end + + end + + end) + +end) + +RegisterNetEvent('esx_basicneeds:onEat') +AddEventHandler('esx_basicneeds:onEat', function() + + local pid = PlayerPedId() + + RequestAnimDict("mp_player_inteat@burger") + + while not HasAnimDictLoaded("mp_player_inteat@burger") do + Wait(0) + end + + TaskPlayAnim(pid, 'mp_player_inteat@burger', 'mp_player_int_eat_burger', 1.0, -1.0, 2000, 0, 1, true, true, true) +end) + +RegisterNetEvent('esx_basicneeds:onDrink') +AddEventHandler('esx_basicneeds:onDrink', function() + + local pid = PlayerPedId() + + RequestAnimDict("amb@world_human_drinking@coffee@male@idle_a") + + while not HasAnimDictLoaded("amb@world_human_drinking@coffee@male@idle_a") do + Wait(0) + end + + TaskPlayAnim(pid, 'amb@world_human_drinking@coffee@male@idle_a', 'idle_a', 1.0, -1.0, 2000, 0, 1, true, true, true) + +end) diff --git a/config.lua b/config.lua new file mode 100644 index 00000000..db3c2fca --- /dev/null +++ b/config.lua @@ -0,0 +1,4 @@ +Config = {} + +Config.TickTime = 100 +Config.UpdateClientTime = 5000 \ No newline at end of file diff --git a/esx_basicneeds.sql b/esx_basicneeds.sql new file mode 100644 index 00000000..fa844f57 --- /dev/null +++ b/esx_basicneeds.sql @@ -0,0 +1,6 @@ +USE `essentialmode`; + +INSERT INTO `items` (name, label) VALUES + ('bread', 'Pain') + ('water', 'Eau') +; \ No newline at end of file diff --git a/server/main.lua b/server/main.lua new file mode 100644 index 00000000..ec61b623 --- /dev/null +++ b/server/main.lua @@ -0,0 +1,74 @@ +TriggerEvent('esx_status:registerStatus', 'hunger', 1000000, '#CFAD0F', + function(status) + return true + end, + function(status) + status.remove(200) + end, + {remove = 200} +) + +TriggerEvent('esx_status:registerStatus', 'thirst', 1000000, '#0C98F1', + function(status) + return true + end, + function(status) + status.remove(250) + end, + {remove = 250} +) + +RegisterServerEvent('esx_basicneeds:resetStatus') +AddEventHandler('esx_basicneeds:resetStatus', function() + + local _source = source + + TriggerEvent('esx_status:getStatus', _source, 'hunger', function(status) + status.set(500000) + status.updateClient() + end) + + TriggerEvent('esx_status:getStatus', _source, 'thirst', function(status) + status.set(500000) + status.updateClient() + end) + +end) + +TriggerEvent('esx:registerUsableItem', 'bread', function(source) + + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) + + xPlayer.removeInventoryItem('bread', 1) + + TriggerEvent('esx_status:getStatus', _source, 'hunger', function(status) + + status.add(200000) + status.updateClient() + + TriggerClientEvent('esx_basicneeds:onEat', _source) + TriggerClientEvent('esx:showNotification', _source, 'Vous avez utilisé 1x pain') + + end) + +end) + +TriggerEvent('esx:registerUsableItem', 'water', function(source) + + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) + + xPlayer.removeInventoryItem('water', 1) + + TriggerEvent('esx_status:getStatus', _source, 'thirst', function(status) + + status.add(200000) + status.updateClient() + + TriggerClientEvent('esx_basicneeds:onDrink', _source) + TriggerClientEvent('esx:showNotification', _source, 'Vous avez utilisé 1x Eau') + + end) + +end) \ No newline at end of file From 753bca76e74a9017e3e3d1aa0e7ddf38ebb80641 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 12 Aug 2017 11:47:13 +0200 Subject: [PATCH 04/46] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index df45e168..030c4346 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,10 @@ # fxserver-esx_basicneeds FXServer ESX Basic Needs +[INFO] + +This plugin add hunger and thirst status, they can be increased when eating bread or drinking water + [INSTALLATION] 1) CD in your resources/[esx] folder From aafec3d4f98af6bd9816cb8a086de16fc9d4992f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 12 Aug 2017 12:50:37 +0200 Subject: [PATCH 05/46] Add missing coma --- esx_basicneeds.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esx_basicneeds.sql b/esx_basicneeds.sql index fa844f57..6b9d3098 100644 --- a/esx_basicneeds.sql +++ b/esx_basicneeds.sql @@ -1,6 +1,6 @@ USE `essentialmode`; INSERT INTO `items` (name, label) VALUES - ('bread', 'Pain') + ('bread', 'Pain'), ('water', 'Eau') -; \ No newline at end of file +; From ce467b7ba7bf03732c4e4611af27beee8f708d79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 12 Aug 2017 13:01:46 +0200 Subject: [PATCH 06/46] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 030c4346..58a49a4f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,10 @@ # fxserver-esx_basicneeds FXServer ESX Basic Needs +[REQUIREMENTS] + +- esx_status => https://github.com/FXServer-ESX/fxserver-esx_status + [INFO] This plugin add hunger and thirst status, they can be increased when eating bread or drinking water From f4d131b6a9303e599f62dfac3d55faad2274739a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 12 Aug 2017 13:13:36 +0200 Subject: [PATCH 07/46] Fix ESX.RegisterUsableItem --- server/main.lua | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/server/main.lua b/server/main.lua index ec61b623..ac790c30 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,3 +1,7 @@ +ESX = nil + +TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + TriggerEvent('esx_status:registerStatus', 'hunger', 1000000, '#CFAD0F', function(status) return true @@ -35,7 +39,7 @@ AddEventHandler('esx_basicneeds:resetStatus', function() end) -TriggerEvent('esx:registerUsableItem', 'bread', function(source) +ESX.RegisterUsableItem('bread', function(source) local _source = source local xPlayer = ESX.GetPlayerFromId(_source) @@ -54,7 +58,7 @@ TriggerEvent('esx:registerUsableItem', 'bread', function(source) end) -TriggerEvent('esx:registerUsableItem', 'water', function(source) +ESX.RegisterUsableItem('water', function(source) local _source = source local xPlayer = ESX.GetPlayerFromId(_source) From 9bb32684e2d0ee546ba80372f9b103fb81ad92d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 12 Aug 2017 22:51:39 +0200 Subject: [PATCH 08/46] Add LICENSE.txt --- LICENSE.txt | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..30ace6a8 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. \ No newline at end of file From 8b8fcb532f377bb7e1e5ce8560020221b4829145 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Tue, 15 Aug 2017 21:22:19 -0400 Subject: [PATCH 09/46] Multi-language support --- __resource.lua | 6 ++++++ config.lua | 3 ++- locales/en.lua | 6 ++++++ locales/fr.lua | 6 ++++++ server/main.lua | 12 ++++++------ 5 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 locales/en.lua create mode 100644 locales/fr.lua diff --git a/__resource.lua b/__resource.lua index 70b8e086..c5f72096 100644 --- a/__resource.lua +++ b/__resource.lua @@ -3,11 +3,17 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Basic Needs' server_scripts { + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/fr.lua', 'config.lua', 'server/main.lua' } client_scripts { + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/fr.lua', 'config.lua', 'client/main.lua' } diff --git a/config.lua b/config.lua index db3c2fca..673e6276 100644 --- a/config.lua +++ b/config.lua @@ -1,4 +1,5 @@ Config = {} +Config.Locale = 'fr' Config.TickTime = 100 -Config.UpdateClientTime = 5000 \ No newline at end of file +Config.UpdateClientTime = 5000 diff --git a/locales/en.lua b/locales/en.lua new file mode 100644 index 00000000..f5e83c22 --- /dev/null +++ b/locales/en.lua @@ -0,0 +1,6 @@ +Locales['en'] = { + + ['used_bread'] = 'you have used 1x bread', + ['used_water'] = 'you have used 1x water', + +} diff --git a/locales/fr.lua b/locales/fr.lua new file mode 100644 index 00000000..3cdfd767 --- /dev/null +++ b/locales/fr.lua @@ -0,0 +1,6 @@ +Locales['fr'] = { + + ['used_bread'] = 'vous avez utilisé 1x pain', + ['used_water'] = 'vous avez utilisé 1x eau', + +} diff --git a/server/main.lua b/server/main.lua index ac790c30..09655337 100644 --- a/server/main.lua +++ b/server/main.lua @@ -2,7 +2,7 @@ ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) -TriggerEvent('esx_status:registerStatus', 'hunger', 1000000, '#CFAD0F', +TriggerEvent('esx_status:registerStatus', 'hunger', 1000000, '#CFAD0F', function(status) return true end, @@ -12,7 +12,7 @@ TriggerEvent('esx_status:registerStatus', 'hunger', 1000000, '#CFAD0F', {remove = 200} ) -TriggerEvent('esx_status:registerStatus', 'thirst', 1000000, '#0C98F1', +TriggerEvent('esx_status:registerStatus', 'thirst', 1000000, '#0C98F1', function(status) return true end, @@ -50,9 +50,9 @@ ESX.RegisterUsableItem('bread', function(source) status.add(200000) status.updateClient() - + TriggerClientEvent('esx_basicneeds:onEat', _source) - TriggerClientEvent('esx:showNotification', _source, 'Vous avez utilisé 1x pain') + TriggerClientEvent('esx:showNotification', _source, _U('used_bread')) end) @@ -71,8 +71,8 @@ ESX.RegisterUsableItem('water', function(source) status.updateClient() TriggerClientEvent('esx_basicneeds:onDrink', _source) - TriggerClientEvent('esx:showNotification', _source, 'Vous avez utilisé 1x Eau') + TriggerClientEvent('esx:showNotification', _source, _U('used_water')) end) -end) \ No newline at end of file +end) From dd16aafa4b543164a0ba00d18f6d21ffc9b173c8 Mon Sep 17 00:00:00 2001 From: TakumiBR <31086346+TakumiBR@users.noreply.github.com> Date: Thu, 17 Aug 2017 08:57:45 -0700 Subject: [PATCH 10/46] Multi-language support Brazilian Portuguese translation. --- __resource.lua | 2 ++ locales/br.lua | 6 ++++++ 2 files changed, 8 insertions(+) create mode 100644 locales/br.lua diff --git a/__resource.lua b/__resource.lua index c5f72096..f0e0b5b1 100644 --- a/__resource.lua +++ b/__resource.lua @@ -4,6 +4,7 @@ description 'ESX Basic Needs' server_scripts { '@es_extended/locale.lua', + 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', 'config.lua', @@ -12,6 +13,7 @@ server_scripts { client_scripts { '@es_extended/locale.lua', + 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', 'config.lua', diff --git a/locales/br.lua b/locales/br.lua new file mode 100644 index 00000000..22625651 --- /dev/null +++ b/locales/br.lua @@ -0,0 +1,6 @@ +Locales['br'] = { + + ['used_bread'] = 'Você comeu 1x pão', + ['used_water'] = 'Você tomou 1x água', + +} From b64e1f2e8526316ee4d717adaff216683421dc3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Wed, 23 Aug 2017 10:18:40 +0200 Subject: [PATCH 11/46] Change vals because of esx_status update --- server/main.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/main.lua b/server/main.lua index 09655337..626cb07e 100644 --- a/server/main.lua +++ b/server/main.lua @@ -7,9 +7,9 @@ TriggerEvent('esx_status:registerStatus', 'hunger', 1000000, '#CFAD0F', return true end, function(status) - status.remove(200) + status.remove(6000) end, - {remove = 200} + {remove = 6000} ) TriggerEvent('esx_status:registerStatus', 'thirst', 1000000, '#0C98F1', @@ -17,9 +17,9 @@ TriggerEvent('esx_status:registerStatus', 'thirst', 1000000, '#0C98F1', return true end, function(status) - status.remove(250) + status.remove(7500) end, - {remove = 250} + {remove = 7500} ) RegisterServerEvent('esx_basicneeds:resetStatus') From 73ad0269a1389d2ff5dba03836d8af3f136c0d71 Mon Sep 17 00:00:00 2001 From: ultratm Date: Sat, 26 Aug 2017 12:36:15 +0200 Subject: [PATCH 12/46] Add German Language --- __resource.lua | 2 ++ de_esx_basicneeds.sql | 6 ++++++ locales/de.lua | 6 ++++++ 3 files changed, 14 insertions(+) create mode 100644 de_esx_basicneeds.sql create mode 100644 locales/de.lua diff --git a/__resource.lua b/__resource.lua index f0e0b5b1..fa44d3e9 100644 --- a/__resource.lua +++ b/__resource.lua @@ -4,6 +4,7 @@ description 'ESX Basic Needs' server_scripts { '@es_extended/locale.lua', + 'locales/de.lua', 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', @@ -13,6 +14,7 @@ server_scripts { client_scripts { '@es_extended/locale.lua', + 'locales/de.lua', 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', diff --git a/de_esx_basicneeds.sql b/de_esx_basicneeds.sql new file mode 100644 index 00000000..2863dde8 --- /dev/null +++ b/de_esx_basicneeds.sql @@ -0,0 +1,6 @@ +USE `essentialmode`; + +INSERT INTO `items` (name, label) VALUES + ('bread', 'Brot'), + ('water', 'Wasser') +; diff --git a/locales/de.lua b/locales/de.lua new file mode 100644 index 00000000..9ee67348 --- /dev/null +++ b/locales/de.lua @@ -0,0 +1,6 @@ +Locales['de'] = { + + ['used_bread'] = 'Du hast 1x Brot gegessen', + ['used_water'] = 'Du hast 1x Wasser getrunken', + +} From c0c5fbba0002f901776391046b891385400426d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 2 Sep 2017 12:15:59 +0200 Subject: [PATCH 13/46] Use new esx_status --- client/main.lua | 26 ++++++++++++++++++- server/main.lua | 67 ++++++------------------------------------------- 2 files changed, 33 insertions(+), 60 deletions(-) diff --git a/client/main.lua b/client/main.lua index 1ea6d25e..18eea3ff 100644 --- a/client/main.lua +++ b/client/main.lua @@ -8,10 +8,16 @@ Citizen.CreateThread(function() end end) +AddEventHandler('esx_basicneeds:resetStatus', function() + TriggerEvent('esx_status:set', 'hunger', 500000) + TriggerEvent('esx_status:set', 'thirst', 500000) + +end) + AddEventHandler('playerSpawned', function() if IsDead then - TriggerServerEvent('esx_basicneeds:resetStatus') + TriggerEvent('esx_basicneeds:resetStatus') end IsDead = false @@ -19,6 +25,24 @@ end) AddEventHandler('esx_status:loaded', function(status) + TriggerEvent('esx_status:registerStatus', 'hunger', 1000000, '#CFAD0F', + function(status) + return true + end, + function(status) + status.remove(200) + end + ) + + TriggerEvent('esx_status:registerStatus', 'thirst', 1000000, '#0C98F1', + function(status) + return true + end, + function(status) + status.remove(250) + end + ) + Citizen.CreateThread(function() while true do diff --git a/server/main.lua b/server/main.lua index 626cb07e..ced6dbf9 100644 --- a/server/main.lua +++ b/server/main.lua @@ -2,77 +2,26 @@ ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) -TriggerEvent('esx_status:registerStatus', 'hunger', 1000000, '#CFAD0F', - function(status) - return true - end, - function(status) - status.remove(6000) - end, - {remove = 6000} -) - -TriggerEvent('esx_status:registerStatus', 'thirst', 1000000, '#0C98F1', - function(status) - return true - end, - function(status) - status.remove(7500) - end, - {remove = 7500} -) - -RegisterServerEvent('esx_basicneeds:resetStatus') -AddEventHandler('esx_basicneeds:resetStatus', function() - - local _source = source - - TriggerEvent('esx_status:getStatus', _source, 'hunger', function(status) - status.set(500000) - status.updateClient() - end) - - TriggerEvent('esx_status:getStatus', _source, 'thirst', function(status) - status.set(500000) - status.updateClient() - end) - -end) - ESX.RegisterUsableItem('bread', function(source) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local xPlayer = ESX.GetPlayerFromId(source) xPlayer.removeInventoryItem('bread', 1) - TriggerEvent('esx_status:getStatus', _source, 'hunger', function(status) - - status.add(200000) - status.updateClient() - - TriggerClientEvent('esx_basicneeds:onEat', _source) - TriggerClientEvent('esx:showNotification', _source, _U('used_bread')) - - end) + TriggerClientEvent('esx_status:add', source, 'hunger', 200000) + TriggerClientEvent('esx_basicneeds:onEat', source) + TriggerClientEvent('esx:showNotification', source, _U('used_bread')) end) ESX.RegisterUsableItem('water', function(source) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local xPlayer = ESX.GetPlayerFromId(source) xPlayer.removeInventoryItem('water', 1) - TriggerEvent('esx_status:getStatus', _source, 'thirst', function(status) - - status.add(200000) - status.updateClient() - - TriggerClientEvent('esx_basicneeds:onDrink', _source) - TriggerClientEvent('esx:showNotification', _source, _U('used_water')) - - end) + TriggerClientEvent('esx_status:add', source, 'thirst', 200000) + TriggerClientEvent('esx_basicneeds:onDrink', source) + TriggerClientEvent('esx:showNotification', source, _U('used_water')) end) From 859a96f27a62cd08cdb6a0ca42efadffd56f2be0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 9 Sep 2017 17:10:29 +0200 Subject: [PATCH 14/46] Clean up repo --- de_esx_basicneeds.sql => localization/de_esx_basicneeds.sql | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename de_esx_basicneeds.sql => localization/de_esx_basicneeds.sql (100%) diff --git a/de_esx_basicneeds.sql b/localization/de_esx_basicneeds.sql similarity index 100% rename from de_esx_basicneeds.sql rename to localization/de_esx_basicneeds.sql From b077670d543d3505b044870c10a2261b82f6edc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Thu, 14 Sep 2017 23:16:53 +0200 Subject: [PATCH 15/46] Update LICENSE.txt --- LICENSE.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 30ace6a8..1d210279 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} + fxserver-esx_basicneeds + Copyright (C) 2015 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - {project} Copyright (C) {year} {fullname} + fxserver-esx_basicneeds Copyright (C) 2015 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. From 86ad9afe893bc176fbe91788f72fc0a16fa12451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Fri, 15 Sep 2017 15:37:01 +0200 Subject: [PATCH 16/46] chore(resource): Add version --- __resource.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/__resource.lua b/__resource.lua index fa44d3e9..326bbb58 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,6 +2,8 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Basic Needs' +version '1.0.0' + server_scripts { '@es_extended/locale.lua', 'locales/de.lua', From ac3975105af565b0938999fc67f4e91e5980aa61 Mon Sep 17 00:00:00 2001 From: renaiku Date: Sun, 17 Sep 2017 19:58:14 +0200 Subject: [PATCH 17/46] added isEating callback fixed animation issues you can now use a personnalized prop by calling onEat or onDrink. --- __resource.lua | 2 +- client/main.lua | 68 ++++++++++++++++++++++++++++++++----------------- 2 files changed, 46 insertions(+), 24 deletions(-) diff --git a/__resource.lua b/__resource.lua index 326bbb58..b3d53561 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,7 +2,7 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Basic Needs' -version '1.0.0' +version '1.0.1' server_scripts { '@es_extended/locale.lua', diff --git a/client/main.lua b/client/main.lua index 18eea3ff..87407b06 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,5 +1,6 @@ ESX = nil local IsDead = false +local IsAnimated = false Citizen.CreateThread(function() while ESX == nil do @@ -107,31 +108,52 @@ AddEventHandler('esx_status:loaded', function(status) end) -RegisterNetEvent('esx_basicneeds:onEat') -AddEventHandler('esx_basicneeds:onEat', function() - - local pid = PlayerPedId() - - RequestAnimDict("mp_player_inteat@burger") - - while not HasAnimDictLoaded("mp_player_inteat@burger") do - Wait(0) - end +AddEventHandler('esx_basicneeds:isEating', function(cb) + cb(IsAnimated) +end) - TaskPlayAnim(pid, 'mp_player_inteat@burger', 'mp_player_int_eat_burger', 1.0, -1.0, 2000, 0, 1, true, true, true) +RegisterNetEvent('esx_basicneeds:onEat') +AddEventHandler('esx_basicneeds:onEat', function(prop_name) + if not IsAnimated then + local prop_name = prop_name or 'prop_cs_burger_01' + IsAnimated = true + local playerPed = GetPlayerPed(-1) + Citizen.CreateThread(function() + local x,y,z = table.unpack(GetEntityCoords(playerPed)) + prop = CreateObject(GetHashKey(prop_name), x, y, z+0.2, true, true, true) + AttachEntityToEntity(prop, playerPed, GetPedBoneIndex(playerPed, 18905), 0.12, 0.028, 0.001, 10.0, 175.0, 0.0, true, true, false, true, 1, true) + RequestAnimDict('mp_player_inteat@burger') + while not HasAnimDictLoaded('mp_player_inteat@burger') do + Wait(0) + end + TaskPlayAnim(playerPed, 'mp_player_inteat@burger', 'mp_player_int_eat_burger_fp', 8.0, -8, -1, 49, 0, 0, 0, 0) + Wait(3000) + IsAnimated = false + ClearPedSecondaryTask(playerPed) + DeleteObject(prop) + end) + end end) RegisterNetEvent('esx_basicneeds:onDrink') -AddEventHandler('esx_basicneeds:onDrink', function() - - local pid = PlayerPedId() - - RequestAnimDict("amb@world_human_drinking@coffee@male@idle_a") - - while not HasAnimDictLoaded("amb@world_human_drinking@coffee@male@idle_a") do - Wait(0) - end - - TaskPlayAnim(pid, 'amb@world_human_drinking@coffee@male@idle_a', 'idle_a', 1.0, -1.0, 2000, 0, 1, true, true, true) - +AddEventHandler('esx_basicneeds:onDrink', function(prop_name) + if not IsAnimated then + local prop_name = prop_name or 'prop_ld_flow_bottle' + IsAnimated = true + local playerPed = GetPlayerPed(-1) + Citizen.CreateThread(function() + local x,y,z = table.unpack(GetEntityCoords(playerPed)) + prop = CreateObject(GetHashKey(prop_name), x, y, z+0.2, true, true, true) + AttachEntityToEntity(prop, playerPed, GetPedBoneIndex(playerPed, 18905), 0.12, 0.028, 0.001, 10.0, 175.0, 0.0, true, true, false, true, 1, true) + RequestAnimDict('mp_player_intdrink') + while not HasAnimDictLoaded('mp_player_intdrink') do + Wait(0) + end + TaskPlayAnim(playerPed, 'mp_player_intdrink', 'loop_bottle', 1.0, -1.0, 2000, 0, 1, true, true, true) + Wait(3000) + IsAnimated = false + ClearPedSecondaryTask(playerPed) + DeleteObject(prop) + end) + end end) From f46cf06dcd285fac84e2c4f8aecc74b1920ac629 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 22 Feb 2018 01:51:32 +0100 Subject: [PATCH 18/46] Fix message pack Error --- server/main.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/main.lua b/server/main.lua index ced6dbf9..422a86f2 100644 --- a/server/main.lua +++ b/server/main.lua @@ -4,7 +4,8 @@ TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) ESX.RegisterUsableItem('bread', function(source) - local xPlayer = ESX.GetPlayerFromId(source) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) xPlayer.removeInventoryItem('bread', 1) @@ -16,7 +17,8 @@ end) ESX.RegisterUsableItem('water', function(source) - local xPlayer = ESX.GetPlayerFromId(source) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) xPlayer.removeInventoryItem('water', 1) From dcde5433221e8ea7a69e59345acbd18ca1304c24 Mon Sep 17 00:00:00 2001 From: AdrineX Date: Tue, 12 Jun 2018 23:55:31 +0300 Subject: [PATCH 19/46] Add Finnish lang... --- __resource.lua | 2 ++ locales/fi.lua | 6 ++++++ localization/fi_esx_basicneeds.sql | 6 ++++++ 3 files changed, 14 insertions(+) create mode 100644 locales/fi.lua create mode 100644 localization/fi_esx_basicneeds.sql diff --git a/__resource.lua b/__resource.lua index b3d53561..e92f41dc 100644 --- a/__resource.lua +++ b/__resource.lua @@ -9,6 +9,7 @@ server_scripts { 'locales/de.lua', 'locales/br.lua', 'locales/en.lua', + 'locales/fi.lua', 'locales/fr.lua', 'config.lua', 'server/main.lua' @@ -19,6 +20,7 @@ client_scripts { 'locales/de.lua', 'locales/br.lua', 'locales/en.lua', + 'locales/fi.lua', 'locales/fr.lua', 'config.lua', 'client/main.lua' diff --git a/locales/fi.lua b/locales/fi.lua new file mode 100644 index 00000000..b8db6433 --- /dev/null +++ b/locales/fi.lua @@ -0,0 +1,6 @@ +Locales['fi'] = { + + ['used_bread'] = 'sinä söit 1x Leipä', + ['used_water'] = 'sinä joit 1x Vesi', + +} diff --git a/localization/fi_esx_basicneeds.sql b/localization/fi_esx_basicneeds.sql new file mode 100644 index 00000000..9f469e46 --- /dev/null +++ b/localization/fi_esx_basicneeds.sql @@ -0,0 +1,6 @@ +USE `essentialmode`; + +INSERT INTO `items` (name, label) VALUES + ('bread', 'Leipä'), + ('water', 'Vesi') +; From e4056aa7d701103698dd468574867acde5e30243 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 1 Jul 2018 11:47:57 +0200 Subject: [PATCH 20/46] Major cleanup, /heal, fixed #12, sv locale --- README.md | 49 +++++++++----- __resource.lua | 5 ++ client/main.lua | 103 ++++++++++++----------------- config.lua | 5 +- esx_basicneeds.sql | 8 +-- locales/br.lua | 8 +-- locales/de.lua | 8 +-- locales/en.lua | 8 +-- locales/fi.lua | 8 +-- locales/fr.lua | 8 +-- locales/sv.lua | 4 ++ localization/de_esx_basicneeds.sql | 8 +-- localization/fi_esx_basicneeds.sql | 8 +-- localization/sv_esx_basicneeds.sql | 6 ++ server/main.lua | 38 ++++++++--- 15 files changed, 151 insertions(+), 123 deletions(-) create mode 100644 locales/sv.lua create mode 100644 localization/sv_esx_basicneeds.sql diff --git a/README.md b/README.md index 58a49a4f..6e4a7189 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,43 @@ -# fxserver-esx_basicneeds -FXServer ESX Basic Needs +# esx_basicneeds +This script implements hunger and thirst status, they can be increased when eating bread or drinking water. -[REQUIREMENTS] +## Requirements +- [esx_status](https://github.com/ESX-Org/esx_status) -- esx_status => https://github.com/FXServer-ESX/fxserver-esx_status +## Download & Installation -[INFO] - -This plugin add hunger and thirst status, they can be increased when eating bread or drinking water - -[INSTALLATION] - -1) CD in your resources/[esx] folder -2) Clone the repository +### Using [fvm](https://github.com/qlaffont/fvm-installer) ``` -git clone https://github.com/FXServer-ESX/fxserver-esx_basicneeds esx_basicneeds +fvm install --save --folder=esx esx-org/esx_basicneeds ``` -3) Import esx_basicneeds.sql in your database -4) Add this in your server.cfg : + +### Using Git +``` +cd resources +git clone https://github.com/ESX-Org/esx_basicneeds [esx]/esx_basicneeds +``` + +### Manually +- Download https://github.com/ESX-Org/esx_basicneeds/archive/master.zip +- Put it in the `[esx]` directory + + +## Installation +- Import `esx_basicneeds.sql` in your database +- Add this in your server.cfg : ``` start esx_basicneeds ``` + +# Legal +### License +esx_basicneeds - thirst and hunger system + +Copyright (C) 2015-2018 Jérémie N'gadi + +This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. + +This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details. + +You should have received a copy Of the GNU General Public License along with this program. If Not, see http://www.gnu.org/licenses/. \ No newline at end of file diff --git a/__resource.lua b/__resource.lua index e92f41dc..ef18c23b 100644 --- a/__resource.lua +++ b/__resource.lua @@ -25,3 +25,8 @@ client_scripts { 'config.lua', 'client/main.lua' } + +dependencies { + 'es_extended', + 'esx_status' +} diff --git a/client/main.lua b/client/main.lua index 87407b06..0cb1debd 100644 --- a/client/main.lua +++ b/client/main.lua @@ -12,11 +12,24 @@ end) AddEventHandler('esx_basicneeds:resetStatus', function() TriggerEvent('esx_status:set', 'hunger', 500000) TriggerEvent('esx_status:set', 'thirst', 500000) - end) -AddEventHandler('playerSpawned', function() +RegisterNetEvent('esx_basicneeds:healPlayer') +AddEventHandler('esx_basicneeds:healPlayer', function() + -- restore hunger & thirst + TriggerEvent('esx_status:set', 'hunger', 1000000) + TriggerEvent('esx_status:set', 'thirst', 1000000) + -- restore hp + local sourcePed = GetPlayerPed(-1) + SetEntityHealth(sourcePed, GetEntityMaxHealth(sourcePed)) +end) + +AddEventHandler('esx:onPlayerDeath', function() + IsDead = true +end) + +AddEventHandler('playerSpawned', function(spawn) if IsDead then TriggerEvent('esx_basicneeds:resetStatus') end @@ -29,33 +42,29 @@ AddEventHandler('esx_status:loaded', function(status) TriggerEvent('esx_status:registerStatus', 'hunger', 1000000, '#CFAD0F', function(status) return true - end, - function(status) - status.remove(200) + end, function(status) + status.remove(100) end ) TriggerEvent('esx_status:registerStatus', 'thirst', 1000000, '#0C98F1', function(status) return true - end, - function(status) - status.remove(250) + end, function(status) + status.remove(75) end ) Citizen.CreateThread(function() while true do - - Wait(1000) + Citizen.Wait(1000) local playerPed = GetPlayerPed(-1) local prevHealth = GetEntityHealth(playerPed) local health = prevHealth TriggerEvent('esx_status:getStatus', 'hunger', function(status) - if status.val == 0 then if prevHealth <= 150 then @@ -63,13 +72,10 @@ AddEventHandler('esx_status:loaded', function(status) else health = health - 1 end - end - end) TriggerEvent('esx_status:getStatus', 'thirst', function(status) - if status.val == 0 then if prevHealth <= 150 then @@ -77,35 +83,14 @@ AddEventHandler('esx_status:loaded', function(status) else health = health - 1 end - end - end) if health ~= prevHealth then SetEntityHealth(playerPed, health) end - end - end) - - Citizen.CreateThread(function() - - while true do - - Wait(0) - - local playerPed = GetPlayerPed(-1) - - if IsEntityDead(playerPed) and not IsDead then - IsDead = true - end - - end - - end) - end) AddEventHandler('esx_basicneeds:isEating', function(cb) @@ -114,24 +99,24 @@ end) RegisterNetEvent('esx_basicneeds:onEat') AddEventHandler('esx_basicneeds:onEat', function(prop_name) - if not IsAnimated then + if not IsAnimated then local prop_name = prop_name or 'prop_cs_burger_01' - IsAnimated = true - local playerPed = GetPlayerPed(-1) - Citizen.CreateThread(function() - local x,y,z = table.unpack(GetEntityCoords(playerPed)) - prop = CreateObject(GetHashKey(prop_name), x, y, z+0.2, true, true, true) - AttachEntityToEntity(prop, playerPed, GetPedBoneIndex(playerPed, 18905), 0.12, 0.028, 0.001, 10.0, 175.0, 0.0, true, true, false, true, 1, true) - RequestAnimDict('mp_player_inteat@burger') - while not HasAnimDictLoaded('mp_player_inteat@burger') do - Wait(0) - end - TaskPlayAnim(playerPed, 'mp_player_inteat@burger', 'mp_player_int_eat_burger_fp', 8.0, -8, -1, 49, 0, 0, 0, 0) - Wait(3000) - IsAnimated = false - ClearPedSecondaryTask(playerPed) - DeleteObject(prop) - end) + IsAnimated = true + local playerPed = GetPlayerPed(-1) + Citizen.CreateThread(function() + local x,y,z = table.unpack(GetEntityCoords(playerPed)) + prop = CreateObject(GetHashKey(prop_name), x, y, z+0.2, true, true, true) + AttachEntityToEntity(prop, playerPed, GetPedBoneIndex(playerPed, 18905), 0.12, 0.028, 0.001, 10.0, 175.0, 0.0, true, true, false, true, 1, true) + RequestAnimDict('mp_player_inteat@burger') + while not HasAnimDictLoaded('mp_player_inteat@burger') do + Citizen.Wait(10) + end + TaskPlayAnim(playerPed, 'mp_player_inteat@burger', 'mp_player_int_eat_burger_fp', 8.0, -8, -1, 49, 0, 0, 0, 0) + Citizen.Wait(3000) + IsAnimated = false + ClearPedSecondaryTask(playerPed) + DeleteObject(prop) + end) end end) @@ -143,17 +128,17 @@ AddEventHandler('esx_basicneeds:onDrink', function(prop_name) local playerPed = GetPlayerPed(-1) Citizen.CreateThread(function() local x,y,z = table.unpack(GetEntityCoords(playerPed)) - prop = CreateObject(GetHashKey(prop_name), x, y, z+0.2, true, true, true) - AttachEntityToEntity(prop, playerPed, GetPedBoneIndex(playerPed, 18905), 0.12, 0.028, 0.001, 10.0, 175.0, 0.0, true, true, false, true, 1, true) + prop = CreateObject(GetHashKey(prop_name), x, y, z+0.2, true, true, true) + AttachEntityToEntity(prop, playerPed, GetPedBoneIndex(playerPed, 18905), 0.12, 0.028, 0.001, 10.0, 175.0, 0.0, true, true, false, true, 1, true) RequestAnimDict('mp_player_intdrink') while not HasAnimDictLoaded('mp_player_intdrink') do - Wait(0) + Citizen.Wait(10) end TaskPlayAnim(playerPed, 'mp_player_intdrink', 'loop_bottle', 1.0, -1.0, 2000, 0, 1, true, true, true) - Wait(3000) - IsAnimated = false - ClearPedSecondaryTask(playerPed) + Citizen.Wait(3000) + IsAnimated = false + ClearPedSecondaryTask(playerPed) DeleteObject(prop) end) end -end) +end) \ No newline at end of file diff --git a/config.lua b/config.lua index 673e6276..741114de 100644 --- a/config.lua +++ b/config.lua @@ -1,5 +1,2 @@ Config = {} -Config.Locale = 'fr' - -Config.TickTime = 100 -Config.UpdateClientTime = 5000 +Config.Locale = 'fr' \ No newline at end of file diff --git a/esx_basicneeds.sql b/esx_basicneeds.sql index 6b9d3098..02d24aa6 100644 --- a/esx_basicneeds.sql +++ b/esx_basicneeds.sql @@ -1,6 +1,6 @@ USE `essentialmode`; -INSERT INTO `items` (name, label) VALUES - ('bread', 'Pain'), - ('water', 'Eau') -; +INSERT INTO `items` (`name`, `label`, `limit`) VALUES + ('bread', 'Pain', 10), + ('water', 'Eau', 5) +; \ No newline at end of file diff --git a/locales/br.lua b/locales/br.lua index 22625651..fbb6a826 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,6 +1,4 @@ Locales['br'] = { - - ['used_bread'] = 'Você comeu 1x pão', - ['used_water'] = 'Você tomou 1x água', - -} + ['used_bread'] = 'você comeu ~y~1x~s~ ~b~pão~s~', + ['used_water'] = 'você tomou ~y~1x~s~ ~b~água~s~', +} \ No newline at end of file diff --git a/locales/de.lua b/locales/de.lua index 9ee67348..53d6d981 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -1,6 +1,4 @@ Locales['de'] = { - - ['used_bread'] = 'Du hast 1x Brot gegessen', - ['used_water'] = 'Du hast 1x Wasser getrunken', - -} + ['used_bread'] = 'du hast ~y~1x~s~ ~b~Brot gegessen~s~', + ['used_water'] = 'du hast ~y~1x~s~ ~b~Wasser getrunken~s~', +} \ No newline at end of file diff --git a/locales/en.lua b/locales/en.lua index f5e83c22..14931fd6 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,6 +1,4 @@ Locales['en'] = { - - ['used_bread'] = 'you have used 1x bread', - ['used_water'] = 'you have used 1x water', - -} + ['used_bread'] = 'you have used ~y~1x~s~ ~b~bread~s~', + ['used_water'] = 'you have used ~y~1x~s~ ~b~water~s~', +} \ No newline at end of file diff --git a/locales/fi.lua b/locales/fi.lua index b8db6433..ec29041d 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -1,6 +1,4 @@ Locales['fi'] = { - - ['used_bread'] = 'sinä söit 1x Leipä', - ['used_water'] = 'sinä joit 1x Vesi', - -} + ['used_bread'] = 'sinä söit ~y~1x~s~ ~b~leipä~s~', + ['used_water'] = 'sinä joit ~y~1x~s~ ~b~vesi~s~', +} \ No newline at end of file diff --git a/locales/fr.lua b/locales/fr.lua index 3cdfd767..c388f04c 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,6 +1,4 @@ Locales['fr'] = { - - ['used_bread'] = 'vous avez utilisé 1x pain', - ['used_water'] = 'vous avez utilisé 1x eau', - -} + ['used_bread'] = 'vous avez utilisé ~y~1x~s~ ~b~pain~s~', + ['used_water'] = 'vous avez utilisé ~y~1x~s~ ~b~eau~s~', +} \ No newline at end of file diff --git a/locales/sv.lua b/locales/sv.lua new file mode 100644 index 00000000..29c4f001 --- /dev/null +++ b/locales/sv.lua @@ -0,0 +1,4 @@ +Locales['sv'] = { + ['used_bread'] = 'du käkade upp ~y~1x~s~ ~b~bröd~s~', + ['used_water'] = 'du drack ~y~1x~s~ ~b~vatten~s~', +} \ No newline at end of file diff --git a/localization/de_esx_basicneeds.sql b/localization/de_esx_basicneeds.sql index 2863dde8..0e097e34 100644 --- a/localization/de_esx_basicneeds.sql +++ b/localization/de_esx_basicneeds.sql @@ -1,6 +1,6 @@ USE `essentialmode`; -INSERT INTO `items` (name, label) VALUES - ('bread', 'Brot'), - ('water', 'Wasser') -; +INSERT INTO `items` (`name`, `label`, `limit`) VALUES + ('bread', 'Brot', 10), + ('water', 'Wasser', 5) +; \ No newline at end of file diff --git a/localization/fi_esx_basicneeds.sql b/localization/fi_esx_basicneeds.sql index 9f469e46..222cd54b 100644 --- a/localization/fi_esx_basicneeds.sql +++ b/localization/fi_esx_basicneeds.sql @@ -1,6 +1,6 @@ USE `essentialmode`; -INSERT INTO `items` (name, label) VALUES - ('bread', 'Leipä'), - ('water', 'Vesi') -; +INSERT INTO `items` (`name`, `label`, `limit`) VALUES + ('bread', 'Leipä', 10), + ('water', 'Vesi', 5) +; \ No newline at end of file diff --git a/localization/sv_esx_basicneeds.sql b/localization/sv_esx_basicneeds.sql new file mode 100644 index 00000000..a22ab46b --- /dev/null +++ b/localization/sv_esx_basicneeds.sql @@ -0,0 +1,6 @@ +USE `essentialmode`; + +INSERT INTO `items` (`name`, `label`, `limit`) VALUES + ('bread', 'Bröd', 10), + ('water', 'Vatten', 5) +; \ No newline at end of file diff --git a/server/main.lua b/server/main.lua index 422a86f2..4d27c6cd 100644 --- a/server/main.lua +++ b/server/main.lua @@ -3,27 +3,49 @@ ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) ESX.RegisterUsableItem('bread', function(source) - - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local xPlayer = ESX.GetPlayerFromId(source) xPlayer.removeInventoryItem('bread', 1) TriggerClientEvent('esx_status:add', source, 'hunger', 200000) TriggerClientEvent('esx_basicneeds:onEat', source) TriggerClientEvent('esx:showNotification', source, _U('used_bread')) - end) ESX.RegisterUsableItem('water', function(source) - - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local xPlayer = ESX.GetPlayerFromId(source) xPlayer.removeInventoryItem('water', 1) TriggerClientEvent('esx_status:add', source, 'thirst', 200000) TriggerClientEvent('esx_basicneeds:onDrink', source) TriggerClientEvent('esx:showNotification', source, _U('used_water')) - end) + +TriggerEvent('es:addGroupCommand', 'heal', 'admin', function(source, args, user) + -- heal another player - don't heal source + if args[1] then + local target = tonumber(args[1]) + + -- is the argument a number? + if target ~= nil then + + -- is the number a valid player? + if GetPlayerName(target) then + print('esx_basicneeds: ' .. GetPlayerName(source) .. ' is healing a player!') + TriggerClientEvent('esx_basicneeds:healPlayer', target) + TriggerClientEvent('chatMessage', target, "HEAL", {223, 66, 244}, "You have been healed!") + else + TriggerClientEvent('chatMessage', source, "HEAL", {255, 0, 0}, "Player not found!") + end + else + TriggerClientEvent('chatMessage', source, "HEAL", {255, 0, 0}, "Incorrect syntax! You must provide a valid player ID") + end + else + -- heal source + print('esx_basicneeds: ' .. GetPlayerName(source) .. ' is healing!') + TriggerClientEvent('esx_basicneeds:healPlayer', source) + end +end, function(source, args, user) + TriggerClientEvent('chatMessage', source, "HEAL", {255, 0, 0}, "Insufficient Permissions.") +end, {help = "Heal a player, or yourself - restores thirst, hunger and health."}) \ No newline at end of file From d6d7e1fad5a817ff85a323dd1e46e1d0efa2da00 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 1 Jul 2018 11:50:58 +0200 Subject: [PATCH 21/46] Forgotten locale in manifest --- __resource.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/__resource.lua b/__resource.lua index ef18c23b..87d08362 100644 --- a/__resource.lua +++ b/__resource.lua @@ -11,6 +11,7 @@ server_scripts { 'locales/en.lua', 'locales/fi.lua', 'locales/fr.lua', + 'locales/sv.lua', 'config.lua', 'server/main.lua' } @@ -22,6 +23,7 @@ client_scripts { 'locales/en.lua', 'locales/fi.lua', 'locales/fr.lua', + 'locales/sv.lua', 'config.lua', 'client/main.lua' } From d5a0a91def73d54a628da04e57600690881301c4 Mon Sep 17 00:00:00 2001 From: deviljin112 <39461646+deviljin112@users.noreply.github.com> Date: Mon, 23 Jul 2018 22:26:44 +0100 Subject: [PATCH 22/46] Polish Translation --- __resource.lua | 2 ++ locales/pl.lua | 4 ++++ localization/pl_esx_basicneeds.sql | 6 ++++++ 3 files changed, 12 insertions(+) create mode 100644 locales/pl.lua create mode 100644 localization/pl_esx_basicneeds.sql diff --git a/__resource.lua b/__resource.lua index 87d08362..7f6be01c 100644 --- a/__resource.lua +++ b/__resource.lua @@ -12,6 +12,7 @@ server_scripts { 'locales/fi.lua', 'locales/fr.lua', 'locales/sv.lua', + 'locales/pl.lua', 'config.lua', 'server/main.lua' } @@ -24,6 +25,7 @@ client_scripts { 'locales/fi.lua', 'locales/fr.lua', 'locales/sv.lua', + 'locales/pl.lua', 'config.lua', 'client/main.lua' } diff --git a/locales/pl.lua b/locales/pl.lua new file mode 100644 index 00000000..2ff3fa3d --- /dev/null +++ b/locales/pl.lua @@ -0,0 +1,4 @@ +Locales['pl'] = { + ['used_bread'] = 'zjadłeś/aś ~y~1x~s~ ~b~chleb~s~', + ['used_water'] = 'wypiłeś/aś ~y~1x~s~ ~b~woda~s~', +} \ No newline at end of file diff --git a/localization/pl_esx_basicneeds.sql b/localization/pl_esx_basicneeds.sql new file mode 100644 index 00000000..dab8eeb7 --- /dev/null +++ b/localization/pl_esx_basicneeds.sql @@ -0,0 +1,6 @@ +USE `essentialmode`; + +INSERT INTO `items` (`name`, `label`, `limit`) VALUES + ('bread', 'Chleb', 10), + ('water', 'Woda', 5) +; \ No newline at end of file From a2cf2c0e579229699ef697b52c152e6f392e01c4 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Fri, 10 Aug 2018 00:50:42 -0400 Subject: [PATCH 23/46] Repo Update --- .editorconfig | 9 +++++++++ LICENSE.txt => LICENSE | 0 2 files changed, 9 insertions(+) create mode 100644 .editorconfig rename LICENSE.txt => LICENSE (100%) diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..9b425256 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +indent_size = 4 +indent_style = tab +end_of_line = crlf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE similarity index 100% rename from LICENSE.txt rename to LICENSE From 49dc255546ac67c2037dd6480d7fd8ce87c9ae43 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 16 Sep 2018 10:59:33 +0200 Subject: [PATCH 24/46] Minor improvements --- client/main.lua | 93 ++++++++++++++++++++++++------------------------- locales/sv.lua | 4 +-- 2 files changed, 48 insertions(+), 49 deletions(-) diff --git a/client/main.lua b/client/main.lua index 0cb1debd..dbb79b32 100644 --- a/client/main.lua +++ b/client/main.lua @@ -21,8 +21,8 @@ AddEventHandler('esx_basicneeds:healPlayer', function() TriggerEvent('esx_status:set', 'thirst', 1000000) -- restore hp - local sourcePed = GetPlayerPed(-1) - SetEntityHealth(sourcePed, GetEntityMaxHealth(sourcePed)) + local playerPed = PlayerPedId() + SetEntityHealth(playerPed, GetEntityMaxHealth(playerPed)) end) AddEventHandler('esx:onPlayerDeath', function() @@ -39,34 +39,28 @@ end) AddEventHandler('esx_status:loaded', function(status) - TriggerEvent('esx_status:registerStatus', 'hunger', 1000000, '#CFAD0F', - function(status) - return true - end, function(status) - status.remove(100) - end - ) + TriggerEvent('esx_status:registerStatus', 'hunger', 1000000, '#CFAD0F', function(status) + return true + end, function(status) + status.remove(100) + end) - TriggerEvent('esx_status:registerStatus', 'thirst', 1000000, '#0C98F1', - function(status) - return true - end, function(status) - status.remove(75) - end - ) + TriggerEvent('esx_status:registerStatus', 'thirst', 1000000, '#0C98F1', function(status) + return true + end, function(status) + status.remove(75) + end) Citizen.CreateThread(function() - while true do Citizen.Wait(1000) - local playerPed = GetPlayerPed(-1) + local playerPed = PlayerPedId() local prevHealth = GetEntityHealth(playerPed) local health = prevHealth TriggerEvent('esx_status:getStatus', 'hunger', function(status) if status.val == 0 then - if prevHealth <= 150 then health = health - 5 else @@ -77,7 +71,6 @@ AddEventHandler('esx_status:loaded', function(status) TriggerEvent('esx_status:getStatus', 'thirst', function(status) if status.val == 0 then - if prevHealth <= 150 then health = health - 5 else @@ -87,7 +80,7 @@ AddEventHandler('esx_status:loaded', function(status) end) if health ~= prevHealth then - SetEntityHealth(playerPed, health) + SetEntityHealth(playerPed, health) end end end) @@ -100,45 +93,51 @@ end) RegisterNetEvent('esx_basicneeds:onEat') AddEventHandler('esx_basicneeds:onEat', function(prop_name) if not IsAnimated then - local prop_name = prop_name or 'prop_cs_burger_01' + prop_name = prop_name or 'prop_cs_burger_01' IsAnimated = true - local playerPed = GetPlayerPed(-1) + Citizen.CreateThread(function() + local playerPed = PlayerPedId() local x,y,z = table.unpack(GetEntityCoords(playerPed)) - prop = CreateObject(GetHashKey(prop_name), x, y, z+0.2, true, true, true) - AttachEntityToEntity(prop, playerPed, GetPedBoneIndex(playerPed, 18905), 0.12, 0.028, 0.001, 10.0, 175.0, 0.0, true, true, false, true, 1, true) - RequestAnimDict('mp_player_inteat@burger') - while not HasAnimDictLoaded('mp_player_inteat@burger') do - Citizen.Wait(10) - end - TaskPlayAnim(playerPed, 'mp_player_inteat@burger', 'mp_player_int_eat_burger_fp', 8.0, -8, -1, 49, 0, 0, 0, 0) - Citizen.Wait(3000) - IsAnimated = false - ClearPedSecondaryTask(playerPed) - DeleteObject(prop) + local prop = CreateObject(GetHashKey(prop_name), x, y, z + 0.2, true, true, true) + local boneIndex = GetPedBoneIndex(playerPed, 18905) + AttachEntityToEntity(prop, playerPed, boneIndex, 0.12, 0.028, 0.001, 10.0, 175.0, 0.0, true, true, false, true, 1, true) + + ESX.Streaming.RequestAnimDict('mp_player_inteat@burger', function() + TaskPlayAnim(playerPed, 'mp_player_inteat@burger', 'mp_player_int_eat_burger_fp', 8.0, -8, -1, 49, 0, 0, 0, 0) + + Citizen.Wait(3000) + IsAnimated = false + ClearPedSecondaryTask(playerPed) + DeleteObject(prop) + end) end) + end end) RegisterNetEvent('esx_basicneeds:onDrink') AddEventHandler('esx_basicneeds:onDrink', function(prop_name) if not IsAnimated then - local prop_name = prop_name or 'prop_ld_flow_bottle' + prop_name = prop_name or 'prop_ld_flow_bottle' IsAnimated = true - local playerPed = GetPlayerPed(-1) + Citizen.CreateThread(function() + local playerPed = PlayerPedId() local x,y,z = table.unpack(GetEntityCoords(playerPed)) - prop = CreateObject(GetHashKey(prop_name), x, y, z+0.2, true, true, true) - AttachEntityToEntity(prop, playerPed, GetPedBoneIndex(playerPed, 18905), 0.12, 0.028, 0.001, 10.0, 175.0, 0.0, true, true, false, true, 1, true) - RequestAnimDict('mp_player_intdrink') - while not HasAnimDictLoaded('mp_player_intdrink') do - Citizen.Wait(10) - end - TaskPlayAnim(playerPed, 'mp_player_intdrink', 'loop_bottle', 1.0, -1.0, 2000, 0, 1, true, true, true) - Citizen.Wait(3000) - IsAnimated = false - ClearPedSecondaryTask(playerPed) - DeleteObject(prop) + local prop = CreateObject(GetHashKey(prop_name), x, y, z + 0.2, true, true, true) + local boneIndex = GetPedBoneIndex(playerPed, 18905) + AttachEntityToEntity(prop, playerPed, boneIndex, 0.12, 0.028, 0.001, 10.0, 175.0, 0.0, true, true, false, true, 1, true) + + ESX.Streaming.RequestAnimDict('mp_player_intdrink', function() + TaskPlayAnim(playerPed, 'mp_player_intdrink', 'loop_bottle', 1.0, -1.0, 2000, 0, 1, true, true, true) + + Citizen.Wait(3000) + IsAnimated = false + ClearPedSecondaryTask(playerPed) + DeleteObject(prop) + end) end) + end end) \ No newline at end of file diff --git a/locales/sv.lua b/locales/sv.lua index 29c4f001..b0f9d316 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -1,4 +1,4 @@ Locales['sv'] = { - ['used_bread'] = 'du käkade upp ~y~1x~s~ ~b~bröd~s~', - ['used_water'] = 'du drack ~y~1x~s~ ~b~vatten~s~', + ['used_bread'] = 'du käkade upp en bit ~b~bröd~s~', + ['used_water'] = 'du drack upp en ~b~vattenflaska~s~', } \ No newline at end of file From 3714e5e268f9d30532a83a4f6b0db1ec380d04ec Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Fri, 15 Mar 2019 13:12:37 +0100 Subject: [PATCH 25/46] 2 space indent --- locales/br.lua | 4 ++-- locales/de.lua | 4 ++-- locales/en.lua | 4 ++-- locales/fi.lua | 4 ++-- locales/fr.lua | 4 ++-- locales/pl.lua | 4 ++-- locales/sv.lua | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/locales/br.lua b/locales/br.lua index fbb6a826..5f24ee58 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,4 +1,4 @@ Locales['br'] = { - ['used_bread'] = 'você comeu ~y~1x~s~ ~b~pão~s~', - ['used_water'] = 'você tomou ~y~1x~s~ ~b~água~s~', + ['used_bread'] = 'você comeu ~y~1x~s~ ~b~pão~s~', + ['used_water'] = 'você tomou ~y~1x~s~ ~b~água~s~', } \ No newline at end of file diff --git a/locales/de.lua b/locales/de.lua index 53d6d981..52da2604 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -1,4 +1,4 @@ Locales['de'] = { - ['used_bread'] = 'du hast ~y~1x~s~ ~b~Brot gegessen~s~', - ['used_water'] = 'du hast ~y~1x~s~ ~b~Wasser getrunken~s~', + ['used_bread'] = 'du hast ~y~1x~s~ ~b~Brot gegessen~s~', + ['used_water'] = 'du hast ~y~1x~s~ ~b~Wasser getrunken~s~', } \ No newline at end of file diff --git a/locales/en.lua b/locales/en.lua index 14931fd6..52102ace 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,4 +1,4 @@ Locales['en'] = { - ['used_bread'] = 'you have used ~y~1x~s~ ~b~bread~s~', - ['used_water'] = 'you have used ~y~1x~s~ ~b~water~s~', + ['used_bread'] = 'you have used ~y~1x~s~ ~b~bread~s~', + ['used_water'] = 'you have used ~y~1x~s~ ~b~water~s~', } \ No newline at end of file diff --git a/locales/fi.lua b/locales/fi.lua index ec29041d..aed8ec53 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -1,4 +1,4 @@ Locales['fi'] = { - ['used_bread'] = 'sinä söit ~y~1x~s~ ~b~leipä~s~', - ['used_water'] = 'sinä joit ~y~1x~s~ ~b~vesi~s~', + ['used_bread'] = 'sinä söit ~y~1x~s~ ~b~leipä~s~', + ['used_water'] = 'sinä joit ~y~1x~s~ ~b~vesi~s~', } \ No newline at end of file diff --git a/locales/fr.lua b/locales/fr.lua index c388f04c..5cabcc3f 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,4 +1,4 @@ Locales['fr'] = { - ['used_bread'] = 'vous avez utilisé ~y~1x~s~ ~b~pain~s~', - ['used_water'] = 'vous avez utilisé ~y~1x~s~ ~b~eau~s~', + ['used_bread'] = 'vous avez utilisé ~y~1x~s~ ~b~pain~s~', + ['used_water'] = 'vous avez utilisé ~y~1x~s~ ~b~eau~s~', } \ No newline at end of file diff --git a/locales/pl.lua b/locales/pl.lua index 2ff3fa3d..33f28d83 100644 --- a/locales/pl.lua +++ b/locales/pl.lua @@ -1,4 +1,4 @@ Locales['pl'] = { - ['used_bread'] = 'zjadłeś/aś ~y~1x~s~ ~b~chleb~s~', - ['used_water'] = 'wypiłeś/aś ~y~1x~s~ ~b~woda~s~', + ['used_bread'] = 'zjadłeś/aś ~y~1x~s~ ~b~chleb~s~', + ['used_water'] = 'wypiłeś/aś ~y~1x~s~ ~b~woda~s~', } \ No newline at end of file diff --git a/locales/sv.lua b/locales/sv.lua index b0f9d316..a62e9f6d 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -1,4 +1,4 @@ Locales['sv'] = { - ['used_bread'] = 'du käkade upp en bit ~b~bröd~s~', - ['used_water'] = 'du drack upp en ~b~vattenflaska~s~', + ['used_bread'] = 'du käkade upp en bit ~b~bröd~s~', + ['used_water'] = 'du drack upp en ~b~vattenflaska~s~', } \ No newline at end of file From 65b4b0bc588e9bbf8a0395bb98c732b81749fcd5 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 5 May 2019 09:59:36 +0200 Subject: [PATCH 26/46] Updated chat events usage --- server/main.lua | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/server/main.lua b/server/main.lua index 4d27c6cd..4d4b4425 100644 --- a/server/main.lua +++ b/server/main.lua @@ -25,27 +25,25 @@ end) TriggerEvent('es:addGroupCommand', 'heal', 'admin', function(source, args, user) -- heal another player - don't heal source if args[1] then - local target = tonumber(args[1]) - + local playerId = tonumber(args[1]) + -- is the argument a number? - if target ~= nil then - + if playerId then -- is the number a valid player? - if GetPlayerName(target) then - print('esx_basicneeds: ' .. GetPlayerName(source) .. ' is healing a player!') - TriggerClientEvent('esx_basicneeds:healPlayer', target) - TriggerClientEvent('chatMessage', target, "HEAL", {223, 66, 244}, "You have been healed!") + if GetPlayerName(playerId) then + print(('esx_basicneeds: %s healed %s'):format(GetPlayerIdentifier(source, 0), GetPlayerIdentifier(playerId, 0))) + TriggerClientEvent('esx_basicneeds:healPlayer', playerId) + TriggerClientEvent('chat:addMessage', source, { args = { '^5HEAL', 'You have been healed.' } }) else - TriggerClientEvent('chatMessage', source, "HEAL", {255, 0, 0}, "Player not found!") + TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Player not online.' } }) end else - TriggerClientEvent('chatMessage', source, "HEAL", {255, 0, 0}, "Incorrect syntax! You must provide a valid player ID") + TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Invalid player id.' } }) end else - -- heal source - print('esx_basicneeds: ' .. GetPlayerName(source) .. ' is healing!') + print(('esx_basicneeds: %s healed self'):format(GetPlayerIdentifier(source, 0))) TriggerClientEvent('esx_basicneeds:healPlayer', source) end end, function(source, args, user) - TriggerClientEvent('chatMessage', source, "HEAL", {255, 0, 0}, "Insufficient Permissions.") -end, {help = "Heal a player, or yourself - restores thirst, hunger and health."}) \ No newline at end of file + TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Insufficient Permissions.' } }) +end, {help = 'Heal a player, or yourself - restores thirst, hunger and health.', params = {{name = 'playerId', help = '(optional) player id'}}}) \ No newline at end of file From f51d8cb281aa158b3bc544efc036b62d453c38c3 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sat, 4 Jan 2020 15:16:16 +0100 Subject: [PATCH 27/46] Updated SQL to weight --- esx_basicneeds.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esx_basicneeds.sql b/esx_basicneeds.sql index 02d24aa6..d7c94296 100644 --- a/esx_basicneeds.sql +++ b/esx_basicneeds.sql @@ -1,6 +1,6 @@ USE `essentialmode`; -INSERT INTO `items` (`name`, `label`, `limit`) VALUES +INSERT INTO `items` (`name`, `label`, `weight`) VALUES ('bread', 'Pain', 10), ('water', 'Eau', 5) -; \ No newline at end of file +; From 79762b6b44b054d30a733f24d007b4f650559550 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Mon, 6 Jan 2020 15:51:35 +0100 Subject: [PATCH 28/46] Updated SQL --- esx_basicneeds.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esx_basicneeds.sql b/esx_basicneeds.sql index d7c94296..2bf6df1f 100644 --- a/esx_basicneeds.sql +++ b/esx_basicneeds.sql @@ -1,6 +1,6 @@ USE `essentialmode`; INSERT INTO `items` (`name`, `label`, `weight`) VALUES - ('bread', 'Pain', 10), - ('water', 'Eau', 5) + ('bread', 'Pain', 1), + ('water', 'Eau', 1) ; From 208a362a5c68cc98787a1ae5abe771d7945165db Mon Sep 17 00:00:00 2001 From: rex2630 Date: Mon, 6 Jan 2020 15:52:04 +0100 Subject: [PATCH 29/46] SQL weight --- localization/de_esx_basicneeds.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/localization/de_esx_basicneeds.sql b/localization/de_esx_basicneeds.sql index 0e097e34..6dcf8319 100644 --- a/localization/de_esx_basicneeds.sql +++ b/localization/de_esx_basicneeds.sql @@ -1,6 +1,6 @@ USE `essentialmode`; -INSERT INTO `items` (`name`, `label`, `limit`) VALUES - ('bread', 'Brot', 10), - ('water', 'Wasser', 5) -; \ No newline at end of file +INSERT INTO `items` (`name`, `label`, `weight`) VALUES + ('bread', 'Brot', 1), + ('water', 'Wasser', 1) +; From 68e2fc52bf8f7a2f0a370b914ca35fe30b241837 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Mon, 6 Jan 2020 15:52:24 +0100 Subject: [PATCH 30/46] SQL weight --- localization/fi_esx_basicneeds.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/localization/fi_esx_basicneeds.sql b/localization/fi_esx_basicneeds.sql index 222cd54b..96a7a19d 100644 --- a/localization/fi_esx_basicneeds.sql +++ b/localization/fi_esx_basicneeds.sql @@ -1,6 +1,6 @@ USE `essentialmode`; -INSERT INTO `items` (`name`, `label`, `limit`) VALUES - ('bread', 'Leipä', 10), - ('water', 'Vesi', 5) -; \ No newline at end of file +INSERT INTO `items` (`name`, `label`, `weight`) VALUES + ('bread', 'Leipä', 1), + ('water', 'Vesi', 1) +; From bde5d69c1a303e2a1ff5eca9533bb374b7ce7283 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Mon, 6 Jan 2020 15:52:45 +0100 Subject: [PATCH 31/46] SQL weight --- localization/pl_esx_basicneeds.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/localization/pl_esx_basicneeds.sql b/localization/pl_esx_basicneeds.sql index dab8eeb7..3510f9cd 100644 --- a/localization/pl_esx_basicneeds.sql +++ b/localization/pl_esx_basicneeds.sql @@ -1,6 +1,6 @@ USE `essentialmode`; -INSERT INTO `items` (`name`, `label`, `limit`) VALUES - ('bread', 'Chleb', 10), - ('water', 'Woda', 5) -; \ No newline at end of file +INSERT INTO `items` (`name`, `label`, `weight`) VALUES + ('bread', 'Chleb', 1), + ('water', 'Woda', 1) +; From 37474d5d755b32cab395f6c3de876bc7c1f8bfd5 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Mon, 6 Jan 2020 15:53:05 +0100 Subject: [PATCH 32/46] SQL weight --- localization/sv_esx_basicneeds.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/localization/sv_esx_basicneeds.sql b/localization/sv_esx_basicneeds.sql index a22ab46b..be91ddc8 100644 --- a/localization/sv_esx_basicneeds.sql +++ b/localization/sv_esx_basicneeds.sql @@ -1,6 +1,6 @@ USE `essentialmode`; -INSERT INTO `items` (`name`, `label`, `limit`) VALUES - ('bread', 'Bröd', 10), - ('water', 'Vatten', 5) -; \ No newline at end of file +INSERT INTO `items` (`name`, `label`, `weight`) VALUES + ('bread', 'Bröd', 1), + ('water', 'Vatten', 1) +; From 04d3a6162fef4666c4079a524a8fa60d8361825b Mon Sep 17 00:00:00 2001 From: rex2630 Date: Mon, 6 Jan 2020 15:56:35 +0100 Subject: [PATCH 33/46] Updated to newest ESX --- server/main.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/main.lua b/server/main.lua index 4d4b4425..bddea2ca 100644 --- a/server/main.lua +++ b/server/main.lua @@ -9,7 +9,7 @@ ESX.RegisterUsableItem('bread', function(source) TriggerClientEvent('esx_status:add', source, 'hunger', 200000) TriggerClientEvent('esx_basicneeds:onEat', source) - TriggerClientEvent('esx:showNotification', source, _U('used_bread')) + xPlayer.showNotification(_U('used_bread')) end) ESX.RegisterUsableItem('water', function(source) @@ -19,7 +19,7 @@ ESX.RegisterUsableItem('water', function(source) TriggerClientEvent('esx_status:add', source, 'thirst', 200000) TriggerClientEvent('esx_basicneeds:onDrink', source) - TriggerClientEvent('esx:showNotification', source, _U('used_water')) + xPlayer.showNotification(_U('used_water')) end) TriggerEvent('es:addGroupCommand', 'heal', 'admin', function(source, args, user) @@ -46,4 +46,4 @@ TriggerEvent('es:addGroupCommand', 'heal', 'admin', function(source, args, user) end end, function(source, args, user) TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Insufficient Permissions.' } }) -end, {help = 'Heal a player, or yourself - restores thirst, hunger and health.', params = {{name = 'playerId', help = '(optional) player id'}}}) \ No newline at end of file +end, {help = 'Heal a player, or yourself - restores thirst, hunger and health.', params = {{name = 'playerId', help = '(optional) player id'}}}) From e3ce8299aa17c8695e067b8c0ab0d8c2b8d8e346 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sun, 19 Jan 2020 17:09:08 +0100 Subject: [PATCH 34/46] Replace __resource.lua with fxmanifest.lua --- __resource.lua => fxmanifest.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename __resource.lua => fxmanifest.lua (89%) diff --git a/__resource.lua b/fxmanifest.lua similarity index 89% rename from __resource.lua rename to fxmanifest.lua index 7f6be01c..dc2a4794 100644 --- a/__resource.lua +++ b/fxmanifest.lua @@ -1,4 +1,6 @@ -resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' +fx_version 'adamant' + +game 'gta5' description 'ESX Basic Needs' From ceef639a134919cc40d86eaa4235a2c6721c287a Mon Sep 17 00:00:00 2001 From: Dione Batista Date: Thu, 23 Jan 2020 11:57:12 -0300 Subject: [PATCH 35/46] Create br_esx_basicneeds.sql (#26) --- localization/br_esx_basicneeds.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 localization/br_esx_basicneeds.sql diff --git a/localization/br_esx_basicneeds.sql b/localization/br_esx_basicneeds.sql new file mode 100644 index 00000000..f7b5b6ca --- /dev/null +++ b/localization/br_esx_basicneeds.sql @@ -0,0 +1,6 @@ +USE `essentialmode`; + +INSERT INTO `items` (`name`, `label`, `weight`) VALUES + ('bread', 'Pao', 1), + ('water', 'Agua', 1) +; From e1eb0aea2c8ea020f7b67c6779cf80c0d586279d Mon Sep 17 00:00:00 2001 From: rex2630 Date: Thu, 23 Jan 2020 16:54:32 +0100 Subject: [PATCH 36/46] Create cs_esx_basicneeds.sql --- localization/cs_esx_basicneeds.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 localization/cs_esx_basicneeds.sql diff --git a/localization/cs_esx_basicneeds.sql b/localization/cs_esx_basicneeds.sql new file mode 100644 index 00000000..cca74355 --- /dev/null +++ b/localization/cs_esx_basicneeds.sql @@ -0,0 +1,6 @@ +USE `essentialmode`; + +INSERT INTO `items` (`name`, `label`, `weight`) VALUES + ('bread', 'Chleba', 1), + ('water', 'Voda', 1) +; From 7a4968a6e0b0104f424591b6772730c6e7c72581 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 17 Feb 2020 21:53:39 +0100 Subject: [PATCH 37/46] Fix for latest ESX --- README.md | 2 +- server/main.lua | 33 ++++++--------------------------- 2 files changed, 7 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 6e4a7189..d1d13813 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ start esx_basicneeds ### License esx_basicneeds - thirst and hunger system -Copyright (C) 2015-2018 Jérémie N'gadi +Copyright (C) 2015-2020 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/server/main.lua b/server/main.lua index bddea2ca..a3fa31e0 100644 --- a/server/main.lua +++ b/server/main.lua @@ -4,7 +4,6 @@ TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) ESX.RegisterUsableItem('bread', function(source) local xPlayer = ESX.GetPlayerFromId(source) - xPlayer.removeInventoryItem('bread', 1) TriggerClientEvent('esx_status:add', source, 'hunger', 200000) @@ -14,7 +13,6 @@ end) ESX.RegisterUsableItem('water', function(source) local xPlayer = ESX.GetPlayerFromId(source) - xPlayer.removeInventoryItem('water', 1) TriggerClientEvent('esx_status:add', source, 'thirst', 200000) @@ -22,28 +20,9 @@ ESX.RegisterUsableItem('water', function(source) xPlayer.showNotification(_U('used_water')) end) -TriggerEvent('es:addGroupCommand', 'heal', 'admin', function(source, args, user) - -- heal another player - don't heal source - if args[1] then - local playerId = tonumber(args[1]) - - -- is the argument a number? - if playerId then - -- is the number a valid player? - if GetPlayerName(playerId) then - print(('esx_basicneeds: %s healed %s'):format(GetPlayerIdentifier(source, 0), GetPlayerIdentifier(playerId, 0))) - TriggerClientEvent('esx_basicneeds:healPlayer', playerId) - TriggerClientEvent('chat:addMessage', source, { args = { '^5HEAL', 'You have been healed.' } }) - else - TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Player not online.' } }) - end - else - TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Invalid player id.' } }) - end - else - print(('esx_basicneeds: %s healed self'):format(GetPlayerIdentifier(source, 0))) - TriggerClientEvent('esx_basicneeds:healPlayer', source) - end -end, function(source, args, user) - TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Insufficient Permissions.' } }) -end, {help = 'Heal a player, or yourself - restores thirst, hunger and health.', params = {{name = 'playerId', help = '(optional) player id'}}}) +ESX.RegisterCommand('heal', 'admin', function(xPlayer, args, showError) + args.playerId.triggerEvent('esx_basicneeds:healPlayer') + args.playerId.triggerEvent('chat:addMessage', {args = {'^5HEAL', 'You have been healed.'}}) +end, true, {help = 'Heal a player, or yourself - restores thirst, hunger and health.', validate = true, arguments = { + {name = 'playerId', help = 'the player id', type = 'player'} +}}) From 94031d40a0b66dcbe75b64a3aeb957337323defd Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 14 Apr 2020 16:48:30 +0200 Subject: [PATCH 38/46] Latest ESX code --- client/main.lua | 2 +- esx_basicneeds.sql | 2 +- localization/br_esx_basicneeds.sql | 2 +- localization/cs_esx_basicneeds.sql | 2 +- localization/de_esx_basicneeds.sql | 2 +- localization/fi_esx_basicneeds.sql | 2 +- localization/pl_esx_basicneeds.sql | 2 +- localization/sv_esx_basicneeds.sql | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client/main.lua b/client/main.lua index dbb79b32..c4a981e0 100644 --- a/client/main.lua +++ b/client/main.lua @@ -29,7 +29,7 @@ AddEventHandler('esx:onPlayerDeath', function() IsDead = true end) -AddEventHandler('playerSpawned', function(spawn) +AddEventHandler('esx:onPlayerSpawn', function(spawn) if IsDead then TriggerEvent('esx_basicneeds:resetStatus') end diff --git a/esx_basicneeds.sql b/esx_basicneeds.sql index 2bf6df1f..13256c59 100644 --- a/esx_basicneeds.sql +++ b/esx_basicneeds.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; INSERT INTO `items` (`name`, `label`, `weight`) VALUES ('bread', 'Pain', 1), diff --git a/localization/br_esx_basicneeds.sql b/localization/br_esx_basicneeds.sql index f7b5b6ca..01ffb90f 100644 --- a/localization/br_esx_basicneeds.sql +++ b/localization/br_esx_basicneeds.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; INSERT INTO `items` (`name`, `label`, `weight`) VALUES ('bread', 'Pao', 1), diff --git a/localization/cs_esx_basicneeds.sql b/localization/cs_esx_basicneeds.sql index cca74355..5e71921e 100644 --- a/localization/cs_esx_basicneeds.sql +++ b/localization/cs_esx_basicneeds.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; INSERT INTO `items` (`name`, `label`, `weight`) VALUES ('bread', 'Chleba', 1), diff --git a/localization/de_esx_basicneeds.sql b/localization/de_esx_basicneeds.sql index 6dcf8319..bf1fcf23 100644 --- a/localization/de_esx_basicneeds.sql +++ b/localization/de_esx_basicneeds.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; INSERT INTO `items` (`name`, `label`, `weight`) VALUES ('bread', 'Brot', 1), diff --git a/localization/fi_esx_basicneeds.sql b/localization/fi_esx_basicneeds.sql index 96a7a19d..b29b37b3 100644 --- a/localization/fi_esx_basicneeds.sql +++ b/localization/fi_esx_basicneeds.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; INSERT INTO `items` (`name`, `label`, `weight`) VALUES ('bread', 'Leipä', 1), diff --git a/localization/pl_esx_basicneeds.sql b/localization/pl_esx_basicneeds.sql index 3510f9cd..96edfe34 100644 --- a/localization/pl_esx_basicneeds.sql +++ b/localization/pl_esx_basicneeds.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; INSERT INTO `items` (`name`, `label`, `weight`) VALUES ('bread', 'Chleb', 1), diff --git a/localization/sv_esx_basicneeds.sql b/localization/sv_esx_basicneeds.sql index be91ddc8..27b0a4ee 100644 --- a/localization/sv_esx_basicneeds.sql +++ b/localization/sv_esx_basicneeds.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; INSERT INTO `items` (`name`, `label`, `weight`) VALUES ('bread', 'Bröd', 1), From dea210983f406936de368b89595519d0e013e1b5 Mon Sep 17 00:00:00 2001 From: akbaig <57063370+akbaig@users.noreply.github.com> Date: Fri, 3 Jul 2020 21:38:38 +0500 Subject: [PATCH 39/46] Ability to make the display hud enable or disable in config file (#37) * Update config.lua Adds the option to make the bars visible/invisible in case you're using some other resource like trew_hud_ui * Update main.lua Adds the option to make the bars visible/invisible in case you're using some other resource like trew_hud_ui --- client/main.lua | 6 +++--- config.lua | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/client/main.lua b/client/main.lua index c4a981e0..0a0aa8cb 100644 --- a/client/main.lua +++ b/client/main.lua @@ -40,13 +40,13 @@ end) AddEventHandler('esx_status:loaded', function(status) TriggerEvent('esx_status:registerStatus', 'hunger', 1000000, '#CFAD0F', function(status) - return true + return Config.Visible end, function(status) status.remove(100) end) TriggerEvent('esx_status:registerStatus', 'thirst', 1000000, '#0C98F1', function(status) - return true + return Config.Visible end, function(status) status.remove(75) end) @@ -140,4 +140,4 @@ AddEventHandler('esx_basicneeds:onDrink', function(prop_name) end) end -end) \ No newline at end of file +end) diff --git a/config.lua b/config.lua index 741114de..a0e7967c 100644 --- a/config.lua +++ b/config.lua @@ -1,2 +1,3 @@ Config = {} -Config.Locale = 'fr' \ No newline at end of file +Config.Locale = 'fr' +Config.Visible = true From 4bd2b1b5ca7f971472e0f78f4437c9b64dd633d5 Mon Sep 17 00:00:00 2001 From: Jougito - Kheros Date: Sun, 19 Jul 2020 12:54:38 +0200 Subject: [PATCH 40/46] Spanish translation implemented (#39) * Create es_esx_basicneeds.sql * Spanish translation implemented --- fxmanifest.lua | 46 ++++++++++++++++-------------- locales/es.lua | 4 +++ localization/es_esx_basicneeds.sql | 6 ++++ 3 files changed, 34 insertions(+), 22 deletions(-) create mode 100644 locales/es.lua create mode 100644 localization/es_esx_basicneeds.sql diff --git a/fxmanifest.lua b/fxmanifest.lua index dc2a4794..bcc49501 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -7,32 +7,34 @@ description 'ESX Basic Needs' version '1.0.1' server_scripts { - '@es_extended/locale.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/sv.lua', - 'locales/pl.lua', - 'config.lua', - 'server/main.lua' + '@es_extended/locale.lua', + 'locales/de.lua', + 'locales/br.lua', + 'locales/en.lua', + 'locales/es.lua', + 'locales/fi.lua', + 'locales/fr.lua', + 'locales/sv.lua', + 'locales/pl.lua', + 'config.lua', + 'server/main.lua' } client_scripts { - '@es_extended/locale.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/sv.lua', - 'locales/pl.lua', - 'config.lua', - 'client/main.lua' + '@es_extended/locale.lua', + 'locales/de.lua', + 'locales/br.lua', + 'locales/en.lua', + 'locales/es.lua', + 'locales/fi.lua', + 'locales/fr.lua', + 'locales/sv.lua', + 'locales/pl.lua', + 'config.lua', + 'client/main.lua' } dependencies { - 'es_extended', - 'esx_status' + 'es_extended', + 'esx_status' } diff --git a/locales/es.lua b/locales/es.lua new file mode 100644 index 00000000..90a3942e --- /dev/null +++ b/locales/es.lua @@ -0,0 +1,4 @@ +Locales['es'] = { + ['used_bread'] = 'Has usado ~y~1x~s~ ~b~pan~s~', + ['used_water'] = 'Has usado ~y~1x~s~ ~b~agua~s~', +} \ No newline at end of file diff --git a/localization/es_esx_basicneeds.sql b/localization/es_esx_basicneeds.sql new file mode 100644 index 00000000..f4c59fb7 --- /dev/null +++ b/localization/es_esx_basicneeds.sql @@ -0,0 +1,6 @@ +USE `es_extended`; + +INSERT INTO `items` (`name`, `label`, `weight`) VALUES + ('bread', 'Pan', 1), + ('water', 'Agua', 1) +; From 4f7653abe7a615cd7b027476c72959f5d050255d Mon Sep 17 00:00:00 2001 From: HypeLevels <61633775+HypeLevels@users.noreply.github.com> Date: Sat, 28 Nov 2020 22:25:52 +0000 Subject: [PATCH 41/46] Update config.lua Changed the default language to be English it is the universal language. --- config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.lua b/config.lua index a0e7967c..ce211543 100644 --- a/config.lua +++ b/config.lua @@ -1,3 +1,3 @@ Config = {} -Config.Locale = 'fr' +Config.Locale = 'en' Config.Visible = true From e485868bc8fd986d088138f81b5215e9fd6c6007 Mon Sep 17 00:00:00 2001 From: tabarra Date: Tue, 1 Dec 2020 10:54:20 -0300 Subject: [PATCH 42/46] Update esx_basicneeds.sql --- esx_basicneeds.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esx_basicneeds.sql b/esx_basicneeds.sql index 13256c59..dc053c4c 100644 --- a/esx_basicneeds.sql +++ b/esx_basicneeds.sql @@ -1,6 +1,6 @@ USE `es_extended`; INSERT INTO `items` (`name`, `label`, `weight`) VALUES - ('bread', 'Pain', 1), - ('water', 'Eau', 1) + ('bread', 'Bread', 1), + ('water', 'Water', 1) ; From b12ca873e1e2df052cf107a53d471bf68973b8d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=BCrkay=20Tanr=C4=B1kulu?= Date: Sun, 20 Dec 2020 06:35:59 +0300 Subject: [PATCH 43/46] Turkish translation implemented --- fxmanifest.lua | 2 ++ locales/tr.lua | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 locales/tr.lua diff --git a/fxmanifest.lua b/fxmanifest.lua index bcc49501..c130b420 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -16,6 +16,7 @@ server_scripts { 'locales/fr.lua', 'locales/sv.lua', 'locales/pl.lua', + 'locales/tr.lua', 'config.lua', 'server/main.lua' } @@ -30,6 +31,7 @@ client_scripts { 'locales/fr.lua', 'locales/sv.lua', 'locales/pl.lua', + 'locales/tr.lua', 'config.lua', 'client/main.lua' } diff --git a/locales/tr.lua b/locales/tr.lua new file mode 100644 index 00000000..128c22c4 --- /dev/null +++ b/locales/tr.lua @@ -0,0 +1,4 @@ +Locales['tr'] = { + ['used_bread'] = '~y~1x~s~ ~b~ekmek~s~ kullandın', + ['used_water'] = '~y~1x~s~ ~b~su~s~ kullandın', + } From cdf74f0347a1dbd3167c93de198bd59ecde77a2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=BCrkay=20Tanr=C4=B1kulu?= Date: Sun, 20 Dec 2020 06:37:00 +0300 Subject: [PATCH 44/46] Update tr.lua --- locales/tr.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/tr.lua b/locales/tr.lua index 128c22c4..153122e0 100644 --- a/locales/tr.lua +++ b/locales/tr.lua @@ -1,4 +1,4 @@ Locales['tr'] = { ['used_bread'] = '~y~1x~s~ ~b~ekmek~s~ kullandın', ['used_water'] = '~y~1x~s~ ~b~su~s~ kullandın', - } +} From 5aa50f5ac7867491a8929fd0f93e437a4450d268 Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Wed, 9 Jun 2021 12:37:33 +1000 Subject: [PATCH 45/46] improvement(client/main): Minor optimisation - use the esx_status:onTick event The event was added to esx_status late 2018 but never utilised anywhere; using it here drops ms to 0.0 at all times. #### Note: This event can and should also be used in various HUDs to improve performance. Many of them use 500ms threaded loops, despite status only updating every 1s by default. They also use individual event callbacks to retrieve each status value, while each value is already being sent in the event. --- client/main.lua | 51 ++++++++++++++++++++----------------------------- 1 file changed, 21 insertions(+), 30 deletions(-) diff --git a/client/main.lua b/client/main.lua index 0a0aa8cb..2d142f92 100644 --- a/client/main.lua +++ b/client/main.lua @@ -51,39 +51,30 @@ AddEventHandler('esx_status:loaded', function(status) status.remove(75) end) - Citizen.CreateThread(function() - while true do - Citizen.Wait(1000) +end) - local playerPed = PlayerPedId() - local prevHealth = GetEntityHealth(playerPed) - local health = prevHealth - - TriggerEvent('esx_status:getStatus', 'hunger', function(status) - if status.val == 0 then - if prevHealth <= 150 then - health = health - 5 - else - health = health - 1 - end - end - end) - - TriggerEvent('esx_status:getStatus', 'thirst', function(status) - if status.val == 0 then - if prevHealth <= 150 then - health = health - 5 - else - health = health - 1 - end - end - end) - - if health ~= prevHealth then - SetEntityHealth(playerPed, health) +AddEventHandler('esx_status:onTick', function(data) + local playerPed = PlayerPedId() + local prevHealth = GetEntityHealth(playerPed) + local health = prevHealth + + for i=1, #data do + if data[i].name == 'hunger' and data[i].percent == 0 then + if prevHealth <= 150 then + health = health - 5 + else + health = health - 1 + end + elseif data[i].name == 'thirst' and data[i].percent == 0 then + if prevHealth <= 150 then + health = health - 5 + else + health = health - 1 end end - end) + end + + if health ~= prevHealth then SetEntityHealth(playerPed, health) end end) AddEventHandler('esx_basicneeds:isEating', function(cb) From 0087ace5348b92116bda2fcb66c93d649ea3bc5a Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Sun, 13 Jun 2021 09:04:56 +1000 Subject: [PATCH 46/46] refactor(client/main): Use pairs loop --- client/main.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/main.lua b/client/main.lua index 2d142f92..07502a5c 100644 --- a/client/main.lua +++ b/client/main.lua @@ -58,14 +58,14 @@ AddEventHandler('esx_status:onTick', function(data) local prevHealth = GetEntityHealth(playerPed) local health = prevHealth - for i=1, #data do - if data[i].name == 'hunger' and data[i].percent == 0 then + for k, v in pairs(data) do + if v.name == 'hunger' and v.percent == 0 then if prevHealth <= 150 then health = health - 5 else health = health - 1 end - elseif data[i].name == 'thirst' and data[i].percent == 0 then + elseif v.name == 'thirst' and v.percent == 0 then if prevHealth <= 150 then health = health - 5 else