From 6971fd933f6ed0b266e52fe46976ab0a1ce0716c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 1 Aug 2017 14:05:18 +0200 Subject: [PATCH 001/133] 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..d0892968 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# fxserver-cron +FXServer CRON From d9a340918183bd63e8fd5c1652661822eedafc28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 1 Aug 2017 14:12:55 +0200 Subject: [PATCH 002/133] Update README.md --- README.md | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/README.md b/README.md index d0892968..989f4efb 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,40 @@ # fxserver-cron FXServer CRON + +# fxserver-esx_addonaccount +ESX AddonAccount + +[INSTALLATION] + +1) CD in your resources folder +2) Clone the repository +``` +git clone https://github.com/FXServer-ESX/fxserver-cron cron +``` +3) Add this in your server.cfg : + +``` +start cron +``` + +[USAGE] + +``` + +-- Execute task every 5:10 +function CronTask(d, h, m) + print('Task done') +end + +TriggerEvent('cron:runAt', 5, 10, CronTask) + +-- Execute task every monday at 18:30 +function CronTask(d, h, m) + if d == 1 then + print('Task done') + end +end + +TriggerEvent('cron:runAt', 18, 30, CronTask) + +``` From b167997977742fe2b3af655b9282d26588879937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 1 Aug 2017 14:13:51 +0200 Subject: [PATCH 003/133] Add files --- __resource.lua | 1 + server/main.lua | 55 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 __resource.lua create mode 100644 server/main.lua diff --git a/__resource.lua b/__resource.lua new file mode 100644 index 00000000..bb6f3d67 --- /dev/null +++ b/__resource.lua @@ -0,0 +1 @@ +server_script "server/main.lua" diff --git a/server/main.lua b/server/main.lua new file mode 100644 index 00000000..e075105c --- /dev/null +++ b/server/main.lua @@ -0,0 +1,55 @@ +local Jobs = {} +local LastTime = nil + +function RunAt(h, m, cb) + + table.insert(Jobs, { + h = h, + m = m, + cb = cb + }) + +end + +function GetTime() + + local timestamp = os.time() + local d = os.date('*t', timestamp).wday + local h = tonumber(os.date('%H', timestamp)) + local m = tonumber(os.date('%M', timestamp)) + + return {d = d, h = h, m = m} + +end + +function OnTime(d, h, m) + + for i=1, #Jobs, 1 do + if Jobs[i].h == h and Jobs[i].m == m then + Jobs[i].cb(d, h, m) + end + end + +end + +function Tick() + + local time = GetTime() + + if time.h ~= LastTime.h or time.m ~= LastTime.m then + OnTime(time.d, time.h, time.m) + LastTime = time + end + + SetTimeout(1000, Tick) +end + +LastTime = GetTime() + +Tick() + +AddEventHandler('cron:runAt', function(h, m, cb) + RunAt(h, m, cb) +end) + +print('CRON STARTED [' .. os.date('%H:%M', os.time()) .. ']') From 92b67862b9090828148fc6bec7ebedf1b5a312b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Wed, 9 Aug 2017 14:08:30 +0200 Subject: [PATCH 004/133] 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 df9e453bcc9c063799c2e5a2ecb5262e2a6af16a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 12 Aug 2017 11:25:43 +0200 Subject: [PATCH 005/133] 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..b492ab18 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# fxserver-esx_status +FXServer ESX Status From 088364f78d594aa7966d9205bc47e18192808ee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 12 Aug 2017 11:31:53 +0200 Subject: [PATCH 006/133] Update README.md --- README.md | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/README.md b/README.md index b492ab18..c17f0960 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,36 @@ # fxserver-esx_status FXServer ESX Status +[INSTALLATION] + +1) CD in your resources/[esx] folder +2) Clone the repository +``` +git clone https://github.com/FXServer-ESX/fxserver-esx_status esx_status +``` +3) Add this in your server.cfg : + +``` +start esx_status +``` + +[HOWTO] + +server.lua +```lua + +local name = 'hunger' +local default = 1000000 +local color = '#CFAD0F' + +TriggerEvent('esx_status:registerStatus', name, default, color, + function(status) -- Visible calllback, if it return true the status will be visible + return true + end, + function(status) -- Tick callback, what to do at each tick + status.remove(200) + end, + {remove = 200} -- Client action (add / remove) so the client can be in sync with server +) + + +``` From 944de1000dc11a63fff6a847b3de04619412aee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 12 Aug 2017 11:33:15 +0200 Subject: [PATCH 007/133] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c17f0960..476ac2fc 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,8 @@ FXServer ESX Status ``` git clone https://github.com/FXServer-ESX/fxserver-esx_status esx_status ``` -3) Add this in your server.cfg : +3) Import esx_status.sql in your database +4) Add this in your server.cfg : ``` start esx_status From 09d76deef3457761441e8d63fc278e5b9452623d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 12 Aug 2017 11:35:52 +0200 Subject: [PATCH 008/133] Add files --- __resource.lua | 23 +++++ client/main.lua | 97 +++++++++++++++++++ config.lua | 5 + esx_status.sql | 3 + html/css/app.css | 20 ++++ html/scripts/app.js | 57 +++++++++++ html/ui.html | 14 +++ server/classes/status.lua | 52 ++++++++++ server/main.lua | 198 ++++++++++++++++++++++++++++++++++++++ 9 files changed, 469 insertions(+) create mode 100644 __resource.lua create mode 100644 client/main.lua create mode 100644 config.lua create mode 100644 esx_status.sql create mode 100644 html/css/app.css create mode 100644 html/scripts/app.js create mode 100644 html/ui.html create mode 100644 server/classes/status.lua create mode 100644 server/main.lua diff --git a/__resource.lua b/__resource.lua new file mode 100644 index 00000000..f3fe55e6 --- /dev/null +++ b/__resource.lua @@ -0,0 +1,23 @@ +resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' + +description 'ESX Status' + +server_scripts { + '@mysql-async/lib/MySQL.lua', + 'config.lua', + 'server/classes/status.lua', + 'server/main.lua' +} + +client_scripts { + 'config.lua', + 'client/main.lua' +} + +ui_page 'html/ui.html' + +files { + 'html/ui.html', + 'html/css/app.css', + 'html/scripts/app.js' +} \ No newline at end of file diff --git a/client/main.lua b/client/main.lua new file mode 100644 index 00000000..fd69e2e4 --- /dev/null +++ b/client/main.lua @@ -0,0 +1,97 @@ +local Status = {} +local loaded = false + +RegisterNetEvent('esx_status:update') +AddEventHandler('esx_status:update', function(status) + + Status = status + + SendNUIMessage({ + update = true, + status = Status + }) + + if not loaded then + TriggerEvent('esx_status:loaded') + loaded = true + end + +end) + +AddEventHandler('esx_status:getStatus', function(name, cb) + + for i=1, #Status, 1 do + if Status[i].name == name then + cb(Status[i]) + return + end + end + +end) + +AddEventHandler('esx_status:setDisplay', function(val) + + SendNUIMessage({ + setDisplay = true, + display = val + }) + +end) + +-- Calculate status +Citizen.CreateThread(function() + while true do + + for i=1, #Status, 1 do + + if Status[i].clientAction.add ~= nil then + + local val = Status[i].clientAction.add + + if Status[i].val + val > Config.StatusMax then + Status[i].val = StatusMax + else + Status[i].val = Status[i].val + val + end + + end + + if Status[i].clientAction.remove ~= nil then + + local val = Status[i].clientAction.remove + + if Status[i].val - val < 0 then + Status[i].val = 0 + else + Status[i].val = Status[i].val - val + end + + end + + end + + SendNUIMessage({ + update = true, + status = Status + }) + + Citizen.Wait(Config.TickTime) + + end +end) + +-- Pause menu disable hud display +local isPaused = false + +Citizen.CreateThread(function() + while true do + Citizen.Wait(1) + if IsPauseMenuActive() and not isPaused then + isPaused = true + TriggerEvent('esx_status:setDisplay', 0.0) + elseif not IsPauseMenuActive() and isPaused then + isPaused = false + TriggerEvent('esx_status:setDisplay', 0.5) + end + end +end) \ No newline at end of file diff --git a/config.lua b/config.lua new file mode 100644 index 00000000..862ec1bd --- /dev/null +++ b/config.lua @@ -0,0 +1,5 @@ +Config = {} + +Config.StatusMax = 1000000 +Config.TickTime = 1000 +Config.UpdateClientTime = 60000 \ No newline at end of file diff --git a/esx_status.sql b/esx_status.sql new file mode 100644 index 00000000..b62fd8dd --- /dev/null +++ b/esx_status.sql @@ -0,0 +1,3 @@ +USE `essentialmode`; + +ALTER TABLE `users` ADD COLUMN `status` LONGTEXT NULL; diff --git a/html/css/app.css b/html/css/app.css new file mode 100644 index 00000000..d92580fa --- /dev/null +++ b/html/css/app.css @@ -0,0 +1,20 @@ +#status_list { + position: absolute; + left : 23; + bottom : 21%; + width : 14.5%; + opacity: 0.3; +} + +.status { + padding: 1px; + margin: 0.3em; +} + +.status_inner { + padding: 1px; +} + +.status_val { + height : 0.5em; +} \ No newline at end of file diff --git a/html/scripts/app.js b/html/scripts/app.js new file mode 100644 index 00000000..e009ce7e --- /dev/null +++ b/html/scripts/app.js @@ -0,0 +1,57 @@ +(function(){ + + let status = [] + + let renderStatus = function(){ + + $('#status_list').html(''); + + for(let i=0; i' + + '
' + + '
' + + '
' + + ''); + + statusDiv.find('.status_inner') + .css({'border' : '1px solid ' + status[i].color}) + ; + + statusDiv.find('.status_val') + .css({ + 'background-color' : status[i].color, + 'width' : (status[i].val / 10000) + '%' + }) + ; + + $('#status_list').append(statusDiv) + } + + } + + window.onData = function(data){ + + if(data.update){ + + status.length = 0; + + for(let i=0; i + + + + + + +
+ + + + + + \ No newline at end of file diff --git a/server/classes/status.lua b/server/classes/status.lua new file mode 100644 index 00000000..f400eb53 --- /dev/null +++ b/server/classes/status.lua @@ -0,0 +1,52 @@ +function CreateStatus(xPlayer, name, default, color, visible, tickCallback, clientAction) + + local self = {} + + self.val = default + self.xPlayer = xPlayer + self.name = name + self.default = default + self.color = color + self.visible = visible + self.tickCallback = tickCallback + self.clientAction = clientAction + + self._set = function(k, v) + self[k] = v + end + + self._get = function(k) + return self[k] + end + + self.onTick = function() + self.tickCallback(self) + end + + self.set = function(val) + self.val = val + end + + self.add = function(val) + if self.val + val > Config.StatusMax then + self.val = StatusMax + else + self.val = self.val + val + end + end + + self.remove = function(val) + if self.val - val < 0 then + self.val = 0 + else + self.val = self.val - val + end + end + + self.updateClient = function() + TriggerEvent('esx_status:updateClient', self.xPlayer.source) + end + + return self + +end diff --git a/server/main.lua b/server/main.lua new file mode 100644 index 00000000..6358de60 --- /dev/null +++ b/server/main.lua @@ -0,0 +1,198 @@ +ESX = nil +local RegisteredStatus = {} + +TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + +AddEventHandler('esx_status:registerStatus', function(name, default, color, visible, tickCallback, clientAction) + + table.insert(RegisteredStatus, { + name = name, + default = default, + color = color, + visible = visible, + tickCallback = tickCallback, + clientAction = clientAction + }) + +end) + +AddEventHandler('esx:playerLoaded', function(source) + + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) + + MySQL.Async.fetchAll( + 'SELECT * FROM users WHERE identifier = @identifier', + { + ['@identifier'] = xPlayer.identifier + }, + function(result) + + local data = {} + local savedStatus = {} + + if result[1].status ~= nil then + data = json.decode(result[1].status) + end + + for i=1, #data, 1 do + savedStatus[data[i].name] = data[i] + end + + local status = {} + + for i=1, #RegisteredStatus, 1 do + + local s = RegisteredStatus[i] + local default = nil + + if savedStatus[s.name] ~= nil then + default = savedStatus[s.name].val + else + default = s.default + end + + table.insert(status, CreateStatus(xPlayer, s.name, default, s.color, s.visible, s.tickCallback, s.clientAction)) + end + + xPlayer.set('status', status) + + TriggerEvent('esx_status:updateClient', _source) + + end + ) + +end) + +AddEventHandler('esx:playerDropped', function(source) + + local xPlayer = ESX.GetPlayerFromId(source) + + local data = {} + local status = xPlayer.get('status') + + for i=1, #status, 1 do + + local s = status[i] + + table.insert(data, { + name = s._get('name'), + val = s._get('val') + }) + end + + MySQL.Async.execute( + 'UPDATE users SET status = @status WHERE identifier = @identifier', + { + ['@status'] = json.encode(data), + ['@identifier'] = xPlayer.identifier + } + ) + +end) + +AddEventHandler('esx_status:getStatus', function(playerId, statusName, cb) + + local xPlayer = ESX.GetPlayerFromId(playerId) + local status = xPlayer.get('status') + + for i=1, #status, 1 do + if status[i]._get('name') == statusName then + cb(status[i]) + break + end + end + +end) + +AddEventHandler('esx_status:updateClient', function(playerId) + + local xPlayer = ESX.GetPlayerFromId(playerId) + local data = {} + local status = xPlayer.get('status') + + for i=1, #status, 1 do + table.insert(data, { + name = status[i]._get('name'), + val = status[i]._get('val'), + color = status[i]._get('color'), + visible = status[i]._get('visible')(status[i]), + clientAction = status[i]._get('clientAction'), + max = Config.StatusMax + }) + end + + TriggerClientEvent('esx_status:update', playerId, data) + +end) + +function TickStatus() + + local xPlayers = ESX.GetPlayers() + + for k,v in pairs(xPlayers) do + + local status = v.get('status') + + if status ~= nil then + + for i=1, #status, 1 do + status[i]._get('onTick')() + end + + end + + end + + SetTimeout(Config.TickTime, TickStatus) + +end + +function UpdateClients() + + local xPlayers = ESX.GetPlayers() + + for k,v in pairs(xPlayers) do + TriggerEvent('esx_status:updateClient', v.source) + end + + SetTimeout(Config.UpdateClientTime, UpdateClients) + +end + +function SaveData() + + local xPlayers = ESX.GetPlayers() + + for k,v in pairs(xPlayers) do + + local data = {} + local status = v.get('status') + + for i=1, #status, 1 do + + local s = status[i] + + table.insert(data, { + name = s._get('name'), + val = s._get('val') + }) + end + + MySQL.Async.execute( + 'UPDATE users SET status = @status WHERE identifier = @identifier', + { + ['@status'] = json.encode(data), + ['@identifier'] = v.identifier + } + ) + + end + + SetTimeout(60000, SaveData) + +end + +TickStatus() +UpdateClients() +SaveData() \ No newline at end of file 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 009/133] 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 010/133] 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 011/133] 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 012/133] 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 013/133] 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 014/133] 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 6e0a1a31ed70d7c51e9b705d5f4285f89ab5df73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 12 Aug 2017 13:12:59 +0200 Subject: [PATCH 015/133] Fix StatusMax --- server/classes/status.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/classes/status.lua b/server/classes/status.lua index f400eb53..b81969cc 100644 --- a/server/classes/status.lua +++ b/server/classes/status.lua @@ -2,7 +2,7 @@ function CreateStatus(xPlayer, name, default, color, visible, tickCallback, clie local self = {} - self.val = default + self.val = default self.xPlayer = xPlayer self.name = name self.default = default @@ -29,7 +29,7 @@ function CreateStatus(xPlayer, name, default, color, visible, tickCallback, clie self.add = function(val) if self.val + val > Config.StatusMax then - self.val = StatusMax + self.val = Config.StatusMax else self.val = self.val + val end 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 016/133] 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 017/133] 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 ba645e080a346885ea4067acca031018c6ff35d2 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:53 +0200 Subject: [PATCH 018/133] 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 019/133] 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 020/133] 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 6384476016471cafbc5e1a5913510c619e24fa07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 22 Aug 2017 00:58:59 +0200 Subject: [PATCH 021/133] Fix GetPlayers() + add GetPercent() --- server/classes/status.lua | 4 ++++ server/main.lua | 21 +++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/server/classes/status.lua b/server/classes/status.lua index b81969cc..7cf02782 100644 --- a/server/classes/status.lua +++ b/server/classes/status.lua @@ -43,6 +43,10 @@ function CreateStatus(xPlayer, name, default, color, visible, tickCallback, clie end end + self.getPercent = function() + return (self.val / Config.StatusMax) * 100 + end + self.updateClient = function() TriggerEvent('esx_status:updateClient', self.xPlayer.source) end diff --git a/server/main.lua b/server/main.lua index 6358de60..493065cd 100644 --- a/server/main.lua +++ b/server/main.lua @@ -130,16 +130,15 @@ function TickStatus() local xPlayers = ESX.GetPlayers() - for k,v in pairs(xPlayers) do + for i=1, #xPlayers, 1 do - local status = v.get('status') + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + local status = xPlayer.get('status') if status ~= nil then - for i=1, #status, 1 do status[i]._get('onTick')() end - end end @@ -152,8 +151,9 @@ function UpdateClients() local xPlayers = ESX.GetPlayers() - for k,v in pairs(xPlayers) do - TriggerEvent('esx_status:updateClient', v.source) + for i=1, #xPlayers, 1 do + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + TriggerEvent('esx_status:updateClient', xPlayer.source) end SetTimeout(Config.UpdateClientTime, UpdateClients) @@ -164,10 +164,11 @@ function SaveData() local xPlayers = ESX.GetPlayers() - for k,v in pairs(xPlayers) do + for i=1, #xPlayers, 1 do - local data = {} - local status = v.get('status') + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + local data = {} + local status = xPlayer.get('status') for i=1, #status, 1 do @@ -183,7 +184,7 @@ function SaveData() 'UPDATE users SET status = @status WHERE identifier = @identifier', { ['@status'] = json.encode(data), - ['@identifier'] = v.identifier + ['@identifier'] = xPlayer.identifier } ) From 1dfeee2a18272ca30212ffa5e0e38a6242a24232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Wed, 23 Aug 2017 10:17:58 +0200 Subject: [PATCH 022/133] Increase TickTime --- client/main.lua | 6 +++--- config.lua | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/client/main.lua b/client/main.lua index fd69e2e4..4db12de3 100644 --- a/client/main.lua +++ b/client/main.lua @@ -46,7 +46,7 @@ Citizen.CreateThread(function() if Status[i].clientAction.add ~= nil then - local val = Status[i].clientAction.add + local val = math.floor(Status[i].clientAction.add / (Config.TickTime / Config.ClientTickTime)) if Status[i].val + val > Config.StatusMax then Status[i].val = StatusMax @@ -58,7 +58,7 @@ Citizen.CreateThread(function() if Status[i].clientAction.remove ~= nil then - local val = Status[i].clientAction.remove + local val = math.floor(Status[i].clientAction.remove / (Config.TickTime / Config.ClientTickTime)) if Status[i].val - val < 0 then Status[i].val = 0 @@ -75,7 +75,7 @@ Citizen.CreateThread(function() status = Status }) - Citizen.Wait(Config.TickTime) + Citizen.Wait(Config.ClientqTickTime) end end) diff --git a/config.lua b/config.lua index 862ec1bd..1baf3075 100644 --- a/config.lua +++ b/config.lua @@ -1,5 +1,6 @@ Config = {} Config.StatusMax = 1000000 -Config.TickTime = 1000 -Config.UpdateClientTime = 60000 \ No newline at end of file +Config.TickTime = 30000 +Config.ClientTickTime = 1000 +Config.UpdateClientTime = 65000 \ No newline at end of file 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 023/133] 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 024/133] 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 58ab6be31e51320eaa099e54c657356d6736feb8 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:18 +0200 Subject: [PATCH 025/133] Fix lags --- __resource.lua | 2 +- client/classes/status.lua | 50 +++++++++++ client/main.lua | 176 +++++++++++++++++++++++++++----------- config.lua | 7 +- server/main.lua | 129 +++------------------------- 5 files changed, 194 insertions(+), 170 deletions(-) create mode 100644 client/classes/status.lua diff --git a/__resource.lua b/__resource.lua index f3fe55e6..6db3c800 100644 --- a/__resource.lua +++ b/__resource.lua @@ -5,12 +5,12 @@ description 'ESX Status' server_scripts { '@mysql-async/lib/MySQL.lua', 'config.lua', - 'server/classes/status.lua', 'server/main.lua' } client_scripts { 'config.lua', + 'client/classes/status.lua', 'client/main.lua' } diff --git a/client/classes/status.lua b/client/classes/status.lua new file mode 100644 index 00000000..c478a98d --- /dev/null +++ b/client/classes/status.lua @@ -0,0 +1,50 @@ +function CreateStatus(name, default, color, visible, tickCallback) + + local self = {} + + self.val = default + self.name = name + self.default = default + self.color = color + self.visible = visible + self.tickCallback = tickCallback + + self._set = function(k, v) + self[k] = v + end + + self._get = function(k) + return self[k] + end + + self.onTick = function() + self.tickCallback(self) + end + + self.set = function(val) + self.val = val + end + + self.add = function(val) + if self.val + val > Config.StatusMax then + self.val = Config.StatusMax + else + self.val = self.val + val + end + end + + self.remove = function(val) + if self.val - val < 0 then + self.val = 0 + else + self.val = self.val - val + end + end + + self.getPercent = function() + return (self.val / Config.StatusMax) * 100 + end + + return self + +end diff --git a/client/main.lua b/client/main.lua index 4db12de3..140d79ed 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,21 +1,126 @@ local Status = {} -local loaded = false -RegisterNetEvent('esx_status:update') -AddEventHandler('esx_status:update', function(status) +function GetStatusData(minimal) + + local status = {} + + for i=1, #Status, 1 do + + if minimal then + + table.insert(status, { + name = Status[i].name, + val = Status[i].val, + }) + + else + + table.insert(status, { + name = Status[i].name, + val = Status[i].val, + color = Status[i].color, + visible = Status[i].visible(Status[i]), + max = Status[i].max, + }) + + end + + end + + return status + +end + +AddEventHandler('esx_status:registerStatus', function(name, default, color, visible, tickCallback) + local s = CreateStatus(name, default, color, visible, tickCallback) + table.insert(Status, s) +end) + +RegisterNetEvent('esx_status:load') +AddEventHandler('esx_status:load', function(status) + + for i=1, #Status, 1 do + for j=1, #status, 1 do + if Status[i].name == status[j].name then + Status[i].set(status[j].val) + end + end + end + + Citizen.CreateThread(function() + while true do + + for i=1, #Status, 1 do + Status[i].onTick() + end + + SendNUIMessage({ + update = true, + status = GetStatusData() + }) + + Citizen.Wait(Config.TickTime) + + end + end) + +end) + +RegisterNetEvent('esx_status:set') +AddEventHandler('esx_status:set', function(name, val) - Status = status + for i=1, #Status, 1 do + if Status[i].name == name then + Status[i].set(val) + break + end + end SendNUIMessage({ update = true, - status = Status + status = GetStatusData() }) - if not loaded then - TriggerEvent('esx_status:loaded') - loaded = true + TriggerServerEvent('esx_status:update', GetStatusData(true)) + +end) + +RegisterNetEvent('esx_status:add') +AddEventHandler('esx_status:add', function(name, val) + + for i=1, #Status, 1 do + if Status[i].name == name then + Status[i].add(val) + break + end end + SendNUIMessage({ + update = true, + status = GetStatusData() + }) + + TriggerServerEvent('esx_status:update', GetStatusData(true)) + +end) + +RegisterNetEvent('esx_status:remove') +AddEventHandler('esx_status:remove', function(name, val) + + for i=1, #Status, 1 do + if Status[i].name == name then + Status[i].remove(val) + break + end + end + + SendNUIMessage({ + update = true, + status = GetStatusData() + }) + + TriggerServerEvent('esx_status:update', GetStatusData(true)) + end) AddEventHandler('esx_status:getStatus', function(name, cb) @@ -38,48 +143,6 @@ AddEventHandler('esx_status:setDisplay', function(val) end) --- Calculate status -Citizen.CreateThread(function() - while true do - - for i=1, #Status, 1 do - - if Status[i].clientAction.add ~= nil then - - local val = math.floor(Status[i].clientAction.add / (Config.TickTime / Config.ClientTickTime)) - - if Status[i].val + val > Config.StatusMax then - Status[i].val = StatusMax - else - Status[i].val = Status[i].val + val - end - - end - - if Status[i].clientAction.remove ~= nil then - - local val = math.floor(Status[i].clientAction.remove / (Config.TickTime / Config.ClientTickTime)) - - if Status[i].val - val < 0 then - Status[i].val = 0 - else - Status[i].val = Status[i].val - val - end - - end - - end - - SendNUIMessage({ - update = true, - status = Status - }) - - Citizen.Wait(Config.ClientqTickTime) - - end -end) - -- Pause menu disable hud display local isPaused = false @@ -94,4 +157,17 @@ Citizen.CreateThread(function() TriggerEvent('esx_status:setDisplay', 0.5) end end +end) + +-- Loaded event +Citizen.CreateThread(function() + TriggerEvent('esx_status:loaded') +end) + +-- Update server +Citizen.CreateThread(function() + while true do + Citizen.Wait(Config.UpdateInterval) + TriggerServerEvent('esx_status:update', GetStatusData(true)) + end end) \ No newline at end of file diff --git a/config.lua b/config.lua index 1baf3075..3b444340 100644 --- a/config.lua +++ b/config.lua @@ -1,6 +1,5 @@ Config = {} -Config.StatusMax = 1000000 -Config.TickTime = 30000 -Config.ClientTickTime = 1000 -Config.UpdateClientTime = 65000 \ No newline at end of file +Config.StatusMax = 1000000 +Config.TickTime = 1000 +Config.UpdateInterval = 10000 \ No newline at end of file diff --git a/server/main.lua b/server/main.lua index 493065cd..29d75b17 100644 --- a/server/main.lua +++ b/server/main.lua @@ -3,19 +3,6 @@ local RegisteredStatus = {} TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) -AddEventHandler('esx_status:registerStatus', function(name, default, color, visible, tickCallback, clientAction) - - table.insert(RegisteredStatus, { - name = name, - default = default, - color = color, - visible = visible, - tickCallback = tickCallback, - clientAction = clientAction - }) - -end) - AddEventHandler('esx:playerLoaded', function(source) local _source = source @@ -28,36 +15,15 @@ AddEventHandler('esx:playerLoaded', function(source) }, function(result) - local data = {} - local savedStatus = {} + local data = {} if result[1].status ~= nil then data = json.decode(result[1].status) end - for i=1, #data, 1 do - savedStatus[data[i].name] = data[i] - end + xPlayer.set('status', data) - local status = {} - - for i=1, #RegisteredStatus, 1 do - - local s = RegisteredStatus[i] - local default = nil - - if savedStatus[s.name] ~= nil then - default = savedStatus[s.name].val - else - default = s.default - end - - table.insert(status, CreateStatus(xPlayer, s.name, default, s.color, s.visible, s.tickCallback, s.clientAction)) - end - - xPlayer.set('status', status) - - TriggerEvent('esx_status:updateClient', _source) + TriggerClientEvent('esx_status:load', _source, data) end ) @@ -71,20 +37,10 @@ AddEventHandler('esx:playerDropped', function(source) local data = {} local status = xPlayer.get('status') - for i=1, #status, 1 do - - local s = status[i] - - table.insert(data, { - name = s._get('name'), - val = s._get('val') - }) - end - MySQL.Async.execute( 'UPDATE users SET status = @status WHERE identifier = @identifier', { - ['@status'] = json.encode(data), + ['@status'] = json.encode(status), ['@identifier'] = xPlayer.identifier } ) @@ -97,7 +53,7 @@ AddEventHandler('esx_status:getStatus', function(playerId, statusName, cb) local status = xPlayer.get('status') for i=1, #status, 1 do - if status[i]._get('name') == statusName then + if status[i].name == statusName then cb(status[i]) break end @@ -105,61 +61,16 @@ AddEventHandler('esx_status:getStatus', function(playerId, statusName, cb) end) -AddEventHandler('esx_status:updateClient', function(playerId) - - local xPlayer = ESX.GetPlayerFromId(playerId) - local data = {} - local status = xPlayer.get('status') - - for i=1, #status, 1 do - table.insert(data, { - name = status[i]._get('name'), - val = status[i]._get('val'), - color = status[i]._get('color'), - visible = status[i]._get('visible')(status[i]), - clientAction = status[i]._get('clientAction'), - max = Config.StatusMax - }) - end - - TriggerClientEvent('esx_status:update', playerId, data) +RegisterServerEvent('esx_status:update') +AddEventHandler('esx_status:update', function(status) + + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) + + xPlayer.set('status', status) end) -function TickStatus() - - local xPlayers = ESX.GetPlayers() - - for i=1, #xPlayers, 1 do - - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - local status = xPlayer.get('status') - - if status ~= nil then - for i=1, #status, 1 do - status[i]._get('onTick')() - end - end - - end - - SetTimeout(Config.TickTime, TickStatus) - -end - -function UpdateClients() - - local xPlayers = ESX.GetPlayers() - - for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - TriggerEvent('esx_status:updateClient', xPlayer.source) - end - - SetTimeout(Config.UpdateClientTime, UpdateClients) - -end - function SaveData() local xPlayers = ESX.GetPlayers() @@ -170,30 +81,18 @@ function SaveData() local data = {} local status = xPlayer.get('status') - for i=1, #status, 1 do - - local s = status[i] - - table.insert(data, { - name = s._get('name'), - val = s._get('val') - }) - end - MySQL.Async.execute( 'UPDATE users SET status = @status WHERE identifier = @identifier', { - ['@status'] = json.encode(data), + ['@status'] = json.encode(status), ['@identifier'] = xPlayer.identifier } ) end - SetTimeout(60000, SaveData) + SetTimeout(10 * 60 * 1000, SaveData) end -TickStatus() -UpdateClients() SaveData() \ No newline at end of file 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 026/133] 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 027/133] 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 a6e54c9aa2628e1cd318d8c9d8283469f517f7f7 Mon Sep 17 00:00:00 2001 From: renaiku Date: Mon, 11 Sep 2017 03:18:00 +0200 Subject: [PATCH 028/133] fixed source at playerdrop --- server/main.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/main.lua b/server/main.lua index 29d75b17..5cc9ef69 100644 --- a/server/main.lua +++ b/server/main.lua @@ -32,7 +32,8 @@ end) AddEventHandler('esx:playerDropped', function(source) - local xPlayer = ESX.GetPlayerFromId(source) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) local data = {} local status = xPlayer.get('status') From d39a9605523c8ec7d034fa9623b8982482afdf40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 12 Sep 2017 11:11:14 +0200 Subject: [PATCH 029/133] Add status percent --- client/main.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/client/main.lua b/client/main.lua index 140d79ed..089c7de0 100644 --- a/client/main.lua +++ b/client/main.lua @@ -9,8 +9,9 @@ function GetStatusData(minimal) if minimal then table.insert(status, { - name = Status[i].name, - val = Status[i].val, + name = Status[i].name, + val = Status[i].val, + percent = (Status[i].val / Config.StatusMax) * 100, }) else @@ -21,6 +22,7 @@ function GetStatusData(minimal) color = Status[i].color, visible = Status[i].visible(Status[i]), max = Status[i].max, + percent = (Status[i].val / Config.StatusMax) * 100, }) end From 7432279e9245321bab76326b8b58dd0db0fcba1c 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:07 +0200 Subject: [PATCH 030/133] Update LICENSE.txt --- LICENSE.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 30ace6a8..d25a9795 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-cron + 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-cron 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 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 031/133] 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 90dd6bc967fd47a8414ea26d51712506252ab070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Thu, 14 Sep 2017 23:18:45 +0200 Subject: [PATCH 032/133] Update LICENSE.txt --- LICENSE.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 30ace6a8..f1e87985 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_status + 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_status 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 033/133] 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 3cfe679ef27dc967850feff1425c2cfcc7664b82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Fri, 15 Sep 2017 15:43:25 +0200 Subject: [PATCH 034/133] chore(resource): Add version --- __resource.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/__resource.lua b/__resource.lua index 6db3c800..57b90da0 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,6 +2,8 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Status' +version '1.0.0' + server_scripts { '@mysql-async/lib/MySQL.lua', 'config.lua', From ac3975105af565b0938999fc67f4e91e5980aa61 Mon Sep 17 00:00:00 2001 From: renaiku Date: Sun, 17 Sep 2017 19:58:14 +0200 Subject: [PATCH 035/133] 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 ae849284941719c494a5511dda8357ea3b791fe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Sat, 18 Nov 2017 11:34:13 +0100 Subject: [PATCH 036/133] fix(perf): Increase tick time --- server/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/main.lua b/server/main.lua index e075105c..a3c87e85 100644 --- a/server/main.lua +++ b/server/main.lua @@ -41,7 +41,7 @@ function Tick() LastTime = time end - SetTimeout(1000, Tick) + SetTimeout(60000, Tick) end LastTime = GetTime() From 918577f9a3bd9c78d1c1ccac1fbcffb3a13903e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9n?= Date: Sun, 19 Nov 2017 21:17:48 +0100 Subject: [PATCH 037/133] Initial commit --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..f81e7ca2 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# esx_accessories \ No newline at end of file From 061bd7522b7997b0fddd9cd145b4e94354ede38f Mon Sep 17 00:00:00 2001 From: renaiku Date: Sun, 19 Nov 2017 21:25:31 +0100 Subject: [PATCH 038/133] Upload files --- README.md | 23 +++- __resource.lua | 21 ++++ client/main.lua | 280 ++++++++++++++++++++++++++++++++++++++++++++ config.lua | 105 +++++++++++++++++ esx_accessories.sql | 7 ++ locales/en.lua | 21 ++++ locales/fr.lua | 21 ++++ server/main.lua | 62 ++++++++++ 8 files changed, 539 insertions(+), 1 deletion(-) create mode 100644 __resource.lua create mode 100644 client/main.lua create mode 100644 config.lua create mode 100644 esx_accessories.sql create mode 100644 locales/en.lua create mode 100644 locales/fr.lua create mode 100644 server/main.lua diff --git a/README.md b/README.md index f81e7ca2..c3696694 100644 --- a/README.md +++ b/README.md @@ -1 +1,22 @@ -# esx_accessories \ No newline at end of file +# fxserver-esx_accessories +FXServer ESX Accessories + +[REQUIREMENTS] + +- esx_skin => https://github.com/FXServer-ESX/fxserver-esx_skin +- esx_datastore => https://github.com/FXServer-ESX/fxserver-esx_datastore + +[INSTALLATION] + +1) CD in your resources/[esx] folder +2) Clone the repository +``` +git clone https://github.com/FXServer-ESX/fxserver-esx_accessories esx_accessories +``` +3) Import esx_accessories.sql in your database +4) Add this in your server.cfg : + +``` +start baseevents +start esx_accessories +``` diff --git a/__resource.lua b/__resource.lua new file mode 100644 index 00000000..179878e9 --- /dev/null +++ b/__resource.lua @@ -0,0 +1,21 @@ +resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' + +description 'ESX Accessories' + +version '1.0.0' + +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/client/main.lua b/client/main.lua new file mode 100644 index 00000000..fb40f0f0 --- /dev/null +++ b/client/main.lua @@ -0,0 +1,280 @@ +local Keys = { + ["ESC"] = 322, ["F1"] = 288, ["F2"] = 289, ["F3"] = 170, ["F5"] = 166, ["F6"] = 167, ["F7"] = 168, ["F8"] = 169, ["F9"] = 56, ["F10"] = 57, + ["~"] = 243, ["1"] = 157, ["2"] = 158, ["3"] = 160, ["4"] = 164, ["5"] = 165, ["6"] = 159, ["7"] = 161, ["8"] = 162, ["9"] = 163, ["-"] = 84, ["="] = 83, ["BACKSPACE"] = 177, + ["TAB"] = 37, ["Q"] = 44, ["W"] = 32, ["E"] = 38, ["R"] = 45, ["T"] = 245, ["Y"] = 246, ["U"] = 303, ["P"] = 199, ["["] = 39, ["]"] = 40, ["ENTER"] = 18, + ["CAPS"] = 137, ["A"] = 34, ["S"] = 8, ["D"] = 9, ["F"] = 23, ["G"] = 47, ["H"] = 74, ["K"] = 311, ["L"] = 182, + ["LEFTSHIFT"] = 21, ["Z"] = 20, ["X"] = 73, ["C"] = 26, ["V"] = 0, ["B"] = 29, ["N"] = 249, ["M"] = 244, [","] = 82, ["."] = 81, + ["LEFTCTRL"] = 36, ["LEFTALT"] = 19, ["SPACE"] = 22, ["RIGHTCTRL"] = 70, + ["HOME"] = 213, ["PAGEUP"] = 10, ["PAGEDOWN"] = 11, ["DELETE"] = 178, + ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173, + ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 +} + +ESX = nil +local HasAlreadyEnteredMarker = false +local LastZone = nil +local CurrentAction = nil +local CurrentActionMsg = '' +local CurrentActionData = {} +local IsDead = false + +Citizen.CreateThread(function() + while ESX == nil do + TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + Citizen.Wait(0) + end +end) + +function OpenAccessoryMenu() + + ESX.UI.Menu.Open( + 'default', GetCurrentResourceName(), 'set_unset_accessory', + { + title = _U('set_unset'), + align = 'top-left', + elements = { + {label = _U('helmet'), value = 'Helmet'}, + {label = _U('ears'), value = 'Ears'}, + {label = _U('mask'), value = 'Mask'}, + {label = _U('glasses'), value = 'Glasses'}, + } + }, + function(data, menu) + menu.close() + SetUnsetAccessory(data.current.value) + + end, + function(data, menu) + menu.close() + end + ) +end + +function SetUnsetAccessory(accessory) + + ESX.TriggerServerCallback('esx_accessories:get', function(hasAccessory, accessorySkin) + local _accessory = string.lower(accessory) + + if hasAccessory then + TriggerEvent('skinchanger:getSkin', function(skin) + local mAccessory = -1 + local mColor = 0 + if _accessory == "mask" then + mAccessory = 0 + end + if skin[_accessory .. '_1'] == mAccessory then + mAccessory = accessorySkin[_accessory .. '_1'] + mColor = accessorySkin[_accessory .. '_2'] + end + local accessorySkin = {} + accessorySkin[_accessory .. '_1'] = mAccessory + accessorySkin[_accessory .. '_2'] = mColor + TriggerEvent('skinchanger:loadClothes', skin, accessorySkin) + end) + else + ESX.ShowNotification(_U('no_' .. _accessory)) + end + + end, accessory) + +end + +function OpenShopMenu(accessory) + + local restrict = {} + + restrict = { string.lower(accessory) .. '_1', string.lower(accessory) .. '_2' } + + TriggerEvent('esx_skin:openRestrictedMenu', function(data, menu) + + menu.close() + + ESX.UI.Menu.Open( + 'default', GetCurrentResourceName(), 'shop_confirm', + { + title = _U('valid_purchase'), + align = 'top-left', + elements = { + {label = _U('yes'), value = 'yes'}, + {label = _U('no'), value = 'no'}, + } + }, + function(data, menu) + menu.close() + if data.current.value == 'yes' then + ESX.TriggerServerCallback('esx_accessories:checkMoney', function(hasEnoughMoney) + if hasEnoughMoney then + TriggerServerEvent('esx_accessories:pay') + TriggerEvent('skinchanger:getSkin', function(skin) + TriggerServerEvent('esx_accessories:save', skin, accessory) + end) + else + TriggerEvent('esx_skin:getLastSkin', function(skin) + TriggerEvent('skinchanger:loadSkin', skin) + end) + ESX.ShowNotification(_U('not_enough_money')) + end + end) + end + + if data.current.value == 'no' then + local player = GetPlayerPed(-1) + TriggerEvent('esx_skin:getLastSkin', function(skin) + TriggerEvent('skinchanger:loadSkin', skin) + end) + if accessory == "Ears" then + ClearPedProp(Player, 2) + elseif accessory == "Mask" then + SetPedComponentVariation(player, 1, 0 ,0 ,2) + elseif accessory == "Helmet" then + ClearPedProp(Player, 0) + elseif accessory == "Glasses" then + SetPedPropIndex(player, 1, -1, 0, 0) + end + end + CurrentAction = 'shop_menu' + CurrentActionMsg = _U('press_access') + CurrentActionData = {} + end, + function(data, menu) + menu.close() + CurrentAction = 'shop_menu' + CurrentActionMsg = _U('press_access') + CurrentActionData = {} + + end + ) + + end, + function(data, menu) + menu.close() + CurrentAction = 'shop_menu' + CurrentActionMsg = _U('press_access') + CurrentActionData = {} + end, restrict) + +end + +AddEventHandler('playerSpawned', function() + IsDead = false +end) + +AddEventHandler('baseevents:onPlayerDied', function(killerType, coords) + TriggerEvent('esx_ambulancejob:onPlayerDeath') +end) + +AddEventHandler('baseevents:onPlayerKilled', function(killerId, data) + TriggerEvent('esx_ambulancejob:onPlayerDeath') +end) + +AddEventHandler('esx_ambulancejob:onPlayerDeath', function() + IsDead = true +end) + +AddEventHandler('esx_accessories:hasEnteredMarker', function(zone) + + CurrentAction = 'shop_menu' + CurrentActionMsg = _U('press_access') + CurrentActionData = { accessory = zone } + +end) + +AddEventHandler('esx_accessories:hasExitedMarker', function(zone) + ESX.UI.Menu.CloseAll() + CurrentAction = nil +end) + +-- Create Blips -- +Citizen.CreateThread(function() + for k,v in pairs(Config.ShopsBlips) do + if v.Pos ~= nil then + for i=1, #v.Pos, 1 do + local blip = AddBlipForCoord(v.Pos[i].x, v.Pos[i].y, v.Pos[i].z) + + SetBlipSprite (blip, v.Blip.sprite) + SetBlipDisplay(blip, 4) + SetBlipScale (blip, 1.0) + SetBlipColour (blip, v.Blip.color) + SetBlipAsShortRange(blip, true) + + BeginTextCommandSetBlipName("STRING") + AddTextComponentString(_U('store') .. ' ' .. _U(string.lower(k))) + EndTextCommandSetBlipName(blip) + end + end + end +end) + +-- Display markers +Citizen.CreateThread(function() + while true do + Wait(0) + local coords = GetEntityCoords(GetPlayerPed(-1)) + for k,v in pairs(Config.Zones) do + for i = 1, #v.Pos, 1 do + if(Config.Type ~= -1 and GetDistanceBetweenCoords(coords, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, true) < Config.DrawDistance) then + DrawMarker(Config.Type, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.Size.x, Config.Size.y, Config.Size.z, Config.Color.r, Config.Color.g, Config.Color.b, 100, false, true, 2, false, false, false, false) + end + end + end + end +end) + + +Citizen.CreateThread(function() + while true do + + Wait(0) + + local coords = GetEntityCoords(GetPlayerPed(-1)) + local isInMarker = false + local currentZone = nil + for k,v in pairs(Config.Zones) do + for i = 1, #v.Pos, 1 do + if(GetDistanceBetweenCoords(coords, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, true) < Config.Size.x) then + isInMarker = true + currentZone = k + end + end + end + + if (isInMarker and not HasAlreadyEnteredMarker) or (isInMarker and LastZone ~= currentZone) then + HasAlreadyEnteredMarker = true + LastZone = currentZone + TriggerEvent('esx_accessories:hasEnteredMarker', currentZone) + end + + if not isInMarker and HasAlreadyEnteredMarker then + HasAlreadyEnteredMarker = false + TriggerEvent('esx_accessories:hasExitedMarker', LastZone) + end + + end +end) + + +-- Key controls +Citizen.CreateThread(function() + while true do + + Citizen.Wait(0) + + if CurrentAction ~= nil then + SetTextComponentFormat('STRING') + AddTextComponentString(CurrentActionMsg) + DisplayHelpTextFromStringLabel(0, 0, 1, -1) + + if IsControlJustReleased(0, 38) then + OpenShopMenu(CurrentActionData.accessory) + CurrentAction = nil + end + end + + if Config.EnableControls then + if IsControlJustReleased(0, Keys['K']) and not IsDead then + OpenAccessoryMenu() + end + end + + end +end) diff --git a/config.lua b/config.lua new file mode 100644 index 00000000..3b721a9b --- /dev/null +++ b/config.lua @@ -0,0 +1,105 @@ +Config = {} + +Config.Locale = 'fr' + +Config.Price = 100 + +Config.EnableControls = true + + +Config.DrawDistance = 100.0 +Config.Size = {x = 1.5, y = 1.5, z = 1.0} +Config.Color = {r = 102, g = 102, b = 204} +Config.Type = 1 + + +-- Fill this if you want to see the blips, +-- If you have esx_clothesshop you should not fill this +-- more than it's already filled. +Config.ShopsBlips = { + Ears = { + Pos = nil, + Blip = nil + }, + Mask = { + Pos = { + { x = -1338.129, y = -1278.200, z = 3.872 }, + }, + Blip = { sprite = 362, color = 2 } + }, + Helmet = { + Pos = nil, + Blip = nil + }, + Glasses = { + Pos = nil, + Blip = nil + } +} + +Config.Zones = { + Ears = { + Pos = { + {x= 80.374, y= -1389.493, z= 28.406}, + {x= -709.426, y= -153.829, z= 36.535}, + {x= -163.093, y= -302.038, z= 38.853}, + {x= 420.787, y= -809.654, z= 28.611}, + {x= -817.070, y= -1075.965, z= 10.448}, + {x= -1451.300, y= -238.254, z= 48.929}, + {x= -0.756, y= 6513.685, z= 30.997}, + {x= 123.431, y= -208.060, z= 53.677}, + {x= 1687.318, y= 4827.685, z= 41.183}, + {x= 622.806, y= 2749.221, z= 41.208}, + {x= 1200.085, y= 2705.428, z= 37.342}, + {x= -1199.959, y= -782.534, z= 16.452}, + {x= -3171.867, y= 1059.632, z= 19.983}, + {x= -1095.670, y= 2709.245, z= 18.227}, + } + + }, + + Mask = { + Pos = { + {x = -1338.129, y = -1278.200, z = 3.872}, + } + }, + + Helmet = { + Pos = { + {x= 81.576, y= -1400.602, z= 28.406}, + {x= -705.845, y= -159.015, z= 36.535}, + {x= -161.349, y= -295.774, z= 38.853}, + {x= 419.319, y= -800.647, z= 28.611}, + {x= -824.362, y= -1081.741, z= 10.448}, + {x= -1454.888, y= -242.911, z= 48.931}, + {x= 4.770, y= 6520.935, z= 30.997}, + {x= 121.071, y= -223.266, z= 53.377}, + {x= 1689.648, y= 4818.805, z= 41.183}, + {x= 613.971, y= 2749.978, z= 41.208}, + {x= 1189.513, y= 2703.947, z= 37.342}, + {x= -1204.025, y= -774.439, z= 16.452}, + {x= -3164.280, y= 1054.705, z= 19.983}, + {x= -1103.125, y= 2700.599, z= 18.227}, + } + }, + + Glasses = { + Pos = { + {x= 75.287, y= -1391.131, z= 28.406}, + {x= -713.102, y= -160.116, z= 36.535}, + {x= -156.171, y= -300.547, z= 38.853}, + {x= 425.478, y= -807.866, z= 28.611}, + {x= -820.853, y= -1072.940, z= 10.448}, + {x= -1458.052, y= -236.783, z= 48.918}, + {x= 3.587, y= 6511.585, z= 30.997}, + {x= 131.335, y= -212.336, z= 53.677}, + {x= 1694.936, y= 4820.837, z= 41.183}, + {x= 613.972, y= 2768.814, z= 41.208}, + {x= 1198.678, y= 2711.011, z= 37.342}, + {x= -1188.227, y= -764.594, z= 16.452}, + {x= -3173.192, y= 1038.228, z= 19.983}, + {x= -1100.494, y= 2712.481, z= 18.227}, + } + } + +} diff --git a/esx_accessories.sql b/esx_accessories.sql new file mode 100644 index 00000000..92c65768 --- /dev/null +++ b/esx_accessories.sql @@ -0,0 +1,7 @@ + +INSERT INTO `datastore` (name, label, shared) VALUES + ('user_ears','Ears',0), + ('user_glasses','Glasses',0), + ('user_helmet','Helmet',0), + ('user_mask','Mask',0) +; diff --git a/locales/en.lua b/locales/en.lua new file mode 100644 index 00000000..d83a0b26 --- /dev/null +++ b/locales/en.lua @@ -0,0 +1,21 @@ +Locales ['en'] = { + + ['valid_purchase'] = 'validate this purchase?', + ['yes'] = 'yes', + ['no'] = 'no', + ['helmet'] = 'Helmet / Hat', + ['glasses'] = 'glasses', + ['mask'] = 'mask', + ['ears'] = 'ears accessories', + ['shop'] = 'shop', + ['set_unset'] = 'put on / Take off', + ['not_enough_money'] = 'you do not have enough money', + ['press_access'] = 'press ~INPUT_CONTEXT~ to access the menu', + ['accessories_blip'] = 'accessories', + ['no_ears'] = 'you do not have ears accessories', + ['no_glasses'] = 'you do not have glasses', + ['no_helmet'] = 'you do not have a helmet', + ['no_mask'] = 'you do not have a mask', + ['you_paid'] = 'you paid ', + +} diff --git a/locales/fr.lua b/locales/fr.lua new file mode 100644 index 00000000..ec20317c --- /dev/null +++ b/locales/fr.lua @@ -0,0 +1,21 @@ +Locales ['fr'] = { + + ['valid_purchase'] = 'valider cet achat ?', + ['yes'] = 'oui', + ['no'] = 'non', + ['helmet'] = 'Casque / Chapeau', + ['glasses'] = 'lunettes', + ['mask'] = 'masque', + ['ears'] = 'accessoires d\'oreilles', + ['shop'] = 'magasin', + ['set_unset'] = 'mettre / Enlever', + ['not_enough_money'] = 'vous n\'avez pas assez d\'argent', + ['press_access'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder au menu', + ['accessories_blip'] = 'accessoires', + ['no_ears'] = 'vous n\'avez pas d\'accessoires d\'oreilles', + ['no_glasses'] = 'vous n\'avez pas de lunettes', + ['no_helmet'] = 'vous n\'avez pas de casque / chapeau', + ['no_mask'] = 'vous n\'avez pas de masque', + ['you_paid'] = 'vous avez payé ', + +} diff --git a/server/main.lua b/server/main.lua new file mode 100644 index 00000000..1e496a79 --- /dev/null +++ b/server/main.lua @@ -0,0 +1,62 @@ +ESX = nil + +TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + +RegisterServerEvent('esx_accessories:pay') +AddEventHandler('esx_accessories:pay', function() + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) + xPlayer.removeMoney(Config.Price) + TriggerClientEvent('esx:showNotification', _source, _U('you_paid') .. '$' .. Config.Price) + +end) + +RegisterServerEvent('esx_accessories:save') +AddEventHandler('esx_accessories:save', function(skin, accessory) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) + + TriggerEvent('esx_datastore:getDataStore', 'user_' .. string.lower(accessory), xPlayer.identifier, function(store) + + store.set('has' .. accessory, true) + + local itemSkin = {} + local item1 = string.lower(accessory) .. '_1' + local item2 = string.lower(accessory) .. '_2' + itemSkin[item1] = skin[item1] + itemSkin[item2] = skin[item2] + store.set('skin', itemSkin) + + end) + +end) + +ESX.RegisterServerCallback('esx_accessories:get', function(source, cb, accessory) + + local xPlayer = ESX.GetPlayerFromId(source) + + TriggerEvent('esx_datastore:getDataStore', 'user_' .. string.lower(accessory), xPlayer.identifier, function(store) + + local hasAccessory = (store.get('has' .. accessory) and store.get('has' .. accessory) or false) + local skin = (store.get('skin') and store.get('skin') or {}) + + cb(hasAccessory, skin) + + end) + +end) + +--=================================================================== +--=================================================================== + +ESX.RegisterServerCallback('esx_accessories:checkMoney', function(source, cb) + + local xPlayer = ESX.GetPlayerFromId(source) + + if xPlayer.get('money') >= Config.Price then + cb(true) + else + cb(false) + end + +end) From b8ef1abd8aaf497277a3aa88902244cc125d9efb Mon Sep 17 00:00:00 2001 From: LuaDeldu Date: Tue, 21 Nov 2017 18:21:45 +0100 Subject: [PATCH 039/133] Add fixes --- .gitattributes | 2 + LICENSE.txt | 674 ++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 17 +- client/main.lua | 9 +- locales/en.lua | 4 +- locales/fr.lua | 4 +- 6 files changed, 694 insertions(+), 16 deletions(-) create mode 100644 .gitattributes create mode 100644 LICENSE.txt diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..eba1110b --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Auto detect text files and perform LF normalization +* text=auto \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..e7d94eab --- /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. + + fxserver-esx_mask + 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 + 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: + + fxserver-esx_mask 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. + +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 diff --git a/README.md b/README.md index c3696694..84a349d2 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,23 @@ # fxserver-esx_accessories FXServer ESX Accessories -[REQUIREMENTS] +Shops with accessories (hat/helmet, glasses, masks, ears accessories). You can put on or take off the accessories with a menu. Accessories saved in database. -- esx_skin => https://github.com/FXServer-ESX/fxserver-esx_skin -- esx_datastore => https://github.com/FXServer-ESX/fxserver-esx_datastore +/!\ Works only with accessories purchased in the special areas of the clothing store, not via the esx_clotheshop script. -[INSTALLATION] + +## REQUIREMENTS + +- esx_skin => https://github.com/ESX-Org/esx_skin +- esx_datastore => https://github.com/ESX-Org/esx_datastore + +## INSTALLATION 1) CD in your resources/[esx] folder 2) Clone the repository -``` -git clone https://github.com/FXServer-ESX/fxserver-esx_accessories esx_accessories -``` 3) Import esx_accessories.sql in your database 4) Add this in your server.cfg : ``` -start baseevents start esx_accessories ``` diff --git a/client/main.lua b/client/main.lua index fb40f0f0..d6fa1bc7 100644 --- a/client/main.lua +++ b/client/main.lua @@ -81,9 +81,10 @@ end function OpenShopMenu(accessory) + local _accessory = string.lower(accessory) local restrict = {} - restrict = { string.lower(accessory) .. '_1', string.lower(accessory) .. '_2' } + restrict = { _accessory .. '_1', _accessory .. '_2' } TriggerEvent('esx_skin:openRestrictedMenu', function(data, menu) @@ -123,11 +124,11 @@ function OpenShopMenu(accessory) TriggerEvent('skinchanger:loadSkin', skin) end) if accessory == "Ears" then - ClearPedProp(Player, 2) + ClearPedProp(player, 2) elseif accessory == "Mask" then SetPedComponentVariation(player, 1, 0 ,0 ,2) elseif accessory == "Helmet" then - ClearPedProp(Player, 0) + ClearPedProp(player, 0) elseif accessory == "Glasses" then SetPedPropIndex(player, 1, -1, 0, 0) end @@ -198,7 +199,7 @@ Citizen.CreateThread(function() SetBlipAsShortRange(blip, true) BeginTextCommandSetBlipName("STRING") - AddTextComponentString(_U('store') .. ' ' .. _U(string.lower(k))) + AddTextComponentString(_U('shop') .. ' ' .. _U(string.lower(k))) EndTextCommandSetBlipName(blip) end end diff --git a/locales/en.lua b/locales/en.lua index d83a0b26..b4c886f7 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -3,11 +3,11 @@ Locales ['en'] = { ['valid_purchase'] = 'validate this purchase?', ['yes'] = 'yes', ['no'] = 'no', - ['helmet'] = 'Helmet / Hat', + ['helmet'] = 'helmet / Hat', ['glasses'] = 'glasses', ['mask'] = 'mask', ['ears'] = 'ears accessories', - ['shop'] = 'shop', + ['shop'] = 'shop of', ['set_unset'] = 'put on / Take off', ['not_enough_money'] = 'you do not have enough money', ['press_access'] = 'press ~INPUT_CONTEXT~ to access the menu', diff --git a/locales/fr.lua b/locales/fr.lua index ec20317c..c486909c 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -3,11 +3,11 @@ Locales ['fr'] = { ['valid_purchase'] = 'valider cet achat ?', ['yes'] = 'oui', ['no'] = 'non', - ['helmet'] = 'Casque / Chapeau', + ['helmet'] = 'casque / Chapeau', ['glasses'] = 'lunettes', ['mask'] = 'masque', ['ears'] = 'accessoires d\'oreilles', - ['shop'] = 'magasin', + ['shop'] = 'magasin de', ['set_unset'] = 'mettre / Enlever', ['not_enough_money'] = 'vous n\'avez pas assez d\'argent', ['press_access'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder au menu', From 14d4b2cedcb9f5d431e68cba8545e53445f02117 Mon Sep 17 00:00:00 2001 From: LuaDeldu Date: Tue, 21 Nov 2017 18:25:27 +0100 Subject: [PATCH 040/133] Bump version --- __resource.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__resource.lua b/__resource.lua index 179878e9..6320ae0a 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,7 +2,7 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Accessories' -version '1.0.0' +version '1.0.1' server_scripts { '@es_extended/locale.lua', From 16d99e12f3a261ba124615de4baa7d1d48bdd767 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 22 Feb 2018 01:44:13 +0100 Subject: [PATCH 041/133] Fix message pack Errors --- server/main.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/main.lua b/server/main.lua index 1e496a79..cf4f22de 100644 --- a/server/main.lua +++ b/server/main.lua @@ -32,8 +32,8 @@ AddEventHandler('esx_accessories:save', function(skin, accessory) end) ESX.RegisterServerCallback('esx_accessories:get', function(source, cb, accessory) - - local xPlayer = ESX.GetPlayerFromId(source) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) TriggerEvent('esx_datastore:getDataStore', 'user_' .. string.lower(accessory), xPlayer.identifier, function(store) @@ -50,8 +50,8 @@ end) --=================================================================== ESX.RegisterServerCallback('esx_accessories:checkMoney', function(source, cb) - - local xPlayer = ESX.GetPlayerFromId(source) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) if xPlayer.get('money') >= Config.Price then cb(true) From f46cf06dcd285fac84e2c4f8aecc74b1920ac629 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 22 Feb 2018 01:51:32 +0100 Subject: [PATCH 042/133] 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 94fa8619f3670584daa48861ef07bf434d8aacdc Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 9 Apr 2018 01:49:11 +0200 Subject: [PATCH 043/133] Fixed error setting status on a unknown player --- client/main.lua | 2 +- server/main.lua | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/client/main.lua b/client/main.lua index 089c7de0..17a7aac7 100644 --- a/client/main.lua +++ b/client/main.lua @@ -150,7 +150,7 @@ local isPaused = false Citizen.CreateThread(function() while true do - Citizen.Wait(1) + Citizen.Wait(10) if IsPauseMenuActive() and not isPaused then isPaused = true TriggerEvent('esx_status:setDisplay', 0.0) diff --git a/server/main.lua b/server/main.lua index 5cc9ef69..b0f8c46a 100644 --- a/server/main.lua +++ b/server/main.lua @@ -4,7 +4,6 @@ local RegisteredStatus = {} TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) AddEventHandler('esx:playerLoaded', function(source) - local _source = source local xPlayer = ESX.GetPlayerFromId(_source) @@ -31,7 +30,6 @@ AddEventHandler('esx:playerLoaded', function(source) end) AddEventHandler('esx:playerDropped', function(source) - local _source = source local xPlayer = ESX.GetPlayerFromId(_source) @@ -49,7 +47,6 @@ AddEventHandler('esx:playerDropped', function(source) end) AddEventHandler('esx_status:getStatus', function(playerId, statusName, cb) - local xPlayer = ESX.GetPlayerFromId(playerId) local status = xPlayer.get('status') @@ -64,18 +61,17 @@ end) RegisterServerEvent('esx_status:update') AddEventHandler('esx_status:update', function(status) - local _source = source local xPlayer = ESX.GetPlayerFromId(_source) - xPlayer.set('status', status) - + if xPlayer ~= nil then + xPlayer.set('status', status) + end end) function SaveData() - local xPlayers = ESX.GetPlayers() - + for i=1, #xPlayers, 1 do local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) @@ -93,7 +89,6 @@ function SaveData() end SetTimeout(10 * 60 * 1000, SaveData) - end SaveData() \ No newline at end of file From 066bce056131266afd9c073d7a5f6c4a0223f851 Mon Sep 17 00:00:00 2001 From: LuaDeldu Date: Sun, 15 Apr 2018 02:06:35 +0200 Subject: [PATCH 044/133] Code cleanup + Tabs indents (new try), + Correct Citizen.Wait(), + esx:onPlayerDeath used, + Fix nil value when player press E again without leaving the marker. --- __resource.lua | 20 +-- client/main.lua | 420 ++++++++++++++++++++++++------------------------ config.lua | 162 +++++++++---------- locales/en.lua | 34 ++-- locales/fr.lua | 34 ++-- server/main.lua | 58 +++---- 6 files changed, 360 insertions(+), 368 deletions(-) diff --git a/__resource.lua b/__resource.lua index 6320ae0a..2dd1af28 100644 --- a/__resource.lua +++ b/__resource.lua @@ -5,17 +5,17 @@ description 'ESX Accessories' version '1.0.1' server_scripts { - '@es_extended/locale.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'config.lua', - 'server/main.lua' + '@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' + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/fr.lua', + 'config.lua', + 'client/main.lua' } diff --git a/client/main.lua b/client/main.lua index d6fa1bc7..fc3500a7 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,281 +1,273 @@ local Keys = { - ["ESC"] = 322, ["F1"] = 288, ["F2"] = 289, ["F3"] = 170, ["F5"] = 166, ["F6"] = 167, ["F7"] = 168, ["F8"] = 169, ["F9"] = 56, ["F10"] = 57, - ["~"] = 243, ["1"] = 157, ["2"] = 158, ["3"] = 160, ["4"] = 164, ["5"] = 165, ["6"] = 159, ["7"] = 161, ["8"] = 162, ["9"] = 163, ["-"] = 84, ["="] = 83, ["BACKSPACE"] = 177, - ["TAB"] = 37, ["Q"] = 44, ["W"] = 32, ["E"] = 38, ["R"] = 45, ["T"] = 245, ["Y"] = 246, ["U"] = 303, ["P"] = 199, ["["] = 39, ["]"] = 40, ["ENTER"] = 18, - ["CAPS"] = 137, ["A"] = 34, ["S"] = 8, ["D"] = 9, ["F"] = 23, ["G"] = 47, ["H"] = 74, ["K"] = 311, ["L"] = 182, - ["LEFTSHIFT"] = 21, ["Z"] = 20, ["X"] = 73, ["C"] = 26, ["V"] = 0, ["B"] = 29, ["N"] = 249, ["M"] = 244, [","] = 82, ["."] = 81, - ["LEFTCTRL"] = 36, ["LEFTALT"] = 19, ["SPACE"] = 22, ["RIGHTCTRL"] = 70, - ["HOME"] = 213, ["PAGEUP"] = 10, ["PAGEDOWN"] = 11, ["DELETE"] = 178, - ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173, - ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 + ["ESC"] = 322, ["F1"] = 288, ["F2"] = 289, ["F3"] = 170, ["F5"] = 166, ["F6"] = 167, ["F7"] = 168, ["F8"] = 169, ["F9"] = 56, ["F10"] = 57, + ["~"] = 243, ["1"] = 157, ["2"] = 158, ["3"] = 160, ["4"] = 164, ["5"] = 165, ["6"] = 159, ["7"] = 161, ["8"] = 162, ["9"] = 163, ["-"] = 84, ["="] = 83, ["BACKSPACE"] = 177, + ["TAB"] = 37, ["Q"] = 44, ["W"] = 32, ["E"] = 38, ["R"] = 45, ["T"] = 245, ["Y"] = 246, ["U"] = 303, ["P"] = 199, ["["] = 39, ["]"] = 40, ["ENTER"] = 18, + ["CAPS"] = 137, ["A"] = 34, ["S"] = 8, ["D"] = 9, ["F"] = 23, ["G"] = 47, ["H"] = 74, ["K"] = 311, ["L"] = 182, + ["LEFTSHIFT"] = 21, ["Z"] = 20, ["X"] = 73, ["C"] = 26, ["V"] = 0, ["B"] = 29, ["N"] = 249, ["M"] = 244, [","] = 82, ["."] = 81, + ["LEFTCTRL"] = 36, ["LEFTALT"] = 19, ["SPACE"] = 22, ["RIGHTCTRL"] = 70, + ["HOME"] = 213, ["PAGEUP"] = 10, ["PAGEDOWN"] = 11, ["DELETE"] = 178, + ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173, + ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 } - -ESX = nil + +ESX = nil local HasAlreadyEnteredMarker = false -local LastZone = nil -local CurrentAction = nil -local CurrentActionMsg = '' -local CurrentActionData = {} -local IsDead = false +local LastZone = nil +local CurrentAction = nil +local CurrentActionMsg = '' +local CurrentActionData = {} +local isDead = false Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end + while ESX == nil do + TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + Citizen.Wait(0) + end end) function OpenAccessoryMenu() - ESX.UI.Menu.Open( - 'default', GetCurrentResourceName(), 'set_unset_accessory', - { - title = _U('set_unset'), - align = 'top-left', - elements = { - {label = _U('helmet'), value = 'Helmet'}, - {label = _U('ears'), value = 'Ears'}, - {label = _U('mask'), value = 'Mask'}, - {label = _U('glasses'), value = 'Glasses'}, - } - }, - function(data, menu) - menu.close() - SetUnsetAccessory(data.current.value) + ESX.UI.Menu.Open( + 'default', GetCurrentResourceName(), 'set_unset_accessory', + { + title = _U('set_unset'), + align = 'top-left', + elements = { + {label = _U('helmet'), value = 'Helmet'}, + {label = _U('ears'), value = 'Ears'}, + {label = _U('mask'), value = 'Mask'}, + {label = _U('glasses'), value = 'Glasses'}, + } + }, + function(data, menu) + menu.close() + SetUnsetAccessory(data.current.value) - end, - function(data, menu) - menu.close() - end - ) + end, + function(data, menu) + menu.close() + end + ) end function SetUnsetAccessory(accessory) - - ESX.TriggerServerCallback('esx_accessories:get', function(hasAccessory, accessorySkin) - local _accessory = string.lower(accessory) + + ESX.TriggerServerCallback('esx_accessories:get', function(hasAccessory, accessorySkin) + local _accessory = string.lower(accessory) - if hasAccessory then - TriggerEvent('skinchanger:getSkin', function(skin) - local mAccessory = -1 - local mColor = 0 - if _accessory == "mask" then - mAccessory = 0 - end - if skin[_accessory .. '_1'] == mAccessory then - mAccessory = accessorySkin[_accessory .. '_1'] - mColor = accessorySkin[_accessory .. '_2'] - end - local accessorySkin = {} - accessorySkin[_accessory .. '_1'] = mAccessory - accessorySkin[_accessory .. '_2'] = mColor - TriggerEvent('skinchanger:loadClothes', skin, accessorySkin) - end) - else - ESX.ShowNotification(_U('no_' .. _accessory)) - end + if hasAccessory then + TriggerEvent('skinchanger:getSkin', function(skin) + local mAccessory = -1 + local mColor = 0 + if _accessory == "mask" then + mAccessory = 0 + end + if skin[_accessory .. '_1'] == mAccessory then + mAccessory = accessorySkin[_accessory .. '_1'] + mColor = accessorySkin[_accessory .. '_2'] + end + local accessorySkin = {} + accessorySkin[_accessory .. '_1'] = mAccessory + accessorySkin[_accessory .. '_2'] = mColor + TriggerEvent('skinchanger:loadClothes', skin, accessorySkin) + end) + else + ESX.ShowNotification(_U('no_' .. _accessory)) + end - end, accessory) - + end, accessory) + end function OpenShopMenu(accessory) - local _accessory = string.lower(accessory) - local restrict = {} + local _accessory = string.lower(accessory) + local restrict = {} - restrict = { _accessory .. '_1', _accessory .. '_2' } - - TriggerEvent('esx_skin:openRestrictedMenu', function(data, menu) + restrict = { _accessory .. '_1', _accessory .. '_2' } + + TriggerEvent('esx_skin:openRestrictedMenu', function(data, menu) - menu.close() + menu.close() - ESX.UI.Menu.Open( - 'default', GetCurrentResourceName(), 'shop_confirm', - { - title = _U('valid_purchase'), - align = 'top-left', - elements = { - {label = _U('yes'), value = 'yes'}, - {label = _U('no'), value = 'no'}, - } - }, - function(data, menu) - menu.close() - if data.current.value == 'yes' then - ESX.TriggerServerCallback('esx_accessories:checkMoney', function(hasEnoughMoney) - if hasEnoughMoney then - TriggerServerEvent('esx_accessories:pay') - TriggerEvent('skinchanger:getSkin', function(skin) - TriggerServerEvent('esx_accessories:save', skin, accessory) - end) - else - TriggerEvent('esx_skin:getLastSkin', function(skin) - TriggerEvent('skinchanger:loadSkin', skin) - end) - ESX.ShowNotification(_U('not_enough_money')) - end - end) - end + ESX.UI.Menu.Open( + 'default', GetCurrentResourceName(), 'shop_confirm', + { + title = _U('valid_purchase'), + align = 'top-left', + elements = { + {label = _U('yes'), value = 'yes'}, + {label = _U('no'), value = 'no'}, + } + }, + function(data, menu) + menu.close() + if data.current.value == 'yes' then + ESX.TriggerServerCallback('esx_accessories:checkMoney', function(hasEnoughMoney) + if hasEnoughMoney then + TriggerServerEvent('esx_accessories:pay') + TriggerEvent('skinchanger:getSkin', function(skin) + TriggerServerEvent('esx_accessories:save', skin, accessory) + end) + else + TriggerEvent('esx_skin:getLastSkin', function(skin) + TriggerEvent('skinchanger:loadSkin', skin) + end) + ESX.ShowNotification(_U('not_enough_money')) + end + end) + end - if data.current.value == 'no' then - local player = GetPlayerPed(-1) - TriggerEvent('esx_skin:getLastSkin', function(skin) - TriggerEvent('skinchanger:loadSkin', skin) - end) - if accessory == "Ears" then - ClearPedProp(player, 2) - elseif accessory == "Mask" then - SetPedComponentVariation(player, 1, 0 ,0 ,2) - elseif accessory == "Helmet" then - ClearPedProp(player, 0) - elseif accessory == "Glasses" then - SetPedPropIndex(player, 1, -1, 0, 0) - end - end - CurrentAction = 'shop_menu' - CurrentActionMsg = _U('press_access') - CurrentActionData = {} - end, - function(data, menu) - menu.close() - CurrentAction = 'shop_menu' - CurrentActionMsg = _U('press_access') - CurrentActionData = {} + if data.current.value == 'no' then + local player = GetPlayerPed(-1) + TriggerEvent('esx_skin:getLastSkin', function(skin) + TriggerEvent('skinchanger:loadSkin', skin) + end) + if accessory == "Ears" then + ClearPedProp(player, 2) + elseif accessory == "Mask" then + SetPedComponentVariation(player, 1, 0 ,0 ,2) + elseif accessory == "Helmet" then + ClearPedProp(player, 0) + elseif accessory == "Glasses" then + SetPedPropIndex(player, 1, -1, 0, 0) + end + end + CurrentAction = 'shop_menu' + CurrentActionMsg = _U('press_access') + CurrentActionData = {} + end, + function(data, menu) + menu.close() + CurrentAction = 'shop_menu' + CurrentActionMsg = _U('press_access') + CurrentActionData = {} - end - ) + end + ) - end, - function(data, menu) - menu.close() - CurrentAction = 'shop_menu' - CurrentActionMsg = _U('press_access') - CurrentActionData = {} - end, restrict) + end, + function(data, menu) + menu.close() + CurrentAction = 'shop_menu' + CurrentActionMsg = _U('press_access') + CurrentActionData = {} + end, restrict) end AddEventHandler('playerSpawned', function() - IsDead = false + isDead = false end) -AddEventHandler('baseevents:onPlayerDied', function(killerType, coords) - TriggerEvent('esx_ambulancejob:onPlayerDeath') -end) - -AddEventHandler('baseevents:onPlayerKilled', function(killerId, data) - TriggerEvent('esx_ambulancejob:onPlayerDeath') -end) - -AddEventHandler('esx_ambulancejob:onPlayerDeath', function() - IsDead = true +AddEventHandler('esx:onPlayerDeath', function() + isDead = true end) AddEventHandler('esx_accessories:hasEnteredMarker', function(zone) - CurrentAction = 'shop_menu' - CurrentActionMsg = _U('press_access') - CurrentActionData = { accessory = zone } + CurrentAction = 'shop_menu' + CurrentActionMsg = _U('press_access') + CurrentActionData = { accessory = zone } end) AddEventHandler('esx_accessories:hasExitedMarker', function(zone) - ESX.UI.Menu.CloseAll() - CurrentAction = nil + ESX.UI.Menu.CloseAll() + CurrentAction = nil end) -- Create Blips -- Citizen.CreateThread(function() - for k,v in pairs(Config.ShopsBlips) do - if v.Pos ~= nil then - for i=1, #v.Pos, 1 do - local blip = AddBlipForCoord(v.Pos[i].x, v.Pos[i].y, v.Pos[i].z) + for k,v in pairs(Config.ShopsBlips) do + if v.Pos ~= nil then + for i=1, #v.Pos, 1 do + local blip = AddBlipForCoord(v.Pos[i].x, v.Pos[i].y, v.Pos[i].z) - SetBlipSprite (blip, v.Blip.sprite) - SetBlipDisplay(blip, 4) - SetBlipScale (blip, 1.0) - SetBlipColour (blip, v.Blip.color) - SetBlipAsShortRange(blip, true) + SetBlipSprite (blip, v.Blip.sprite) + SetBlipDisplay(blip, 4) + SetBlipScale (blip, 1.0) + SetBlipColour (blip, v.Blip.color) + SetBlipAsShortRange(blip, true) - BeginTextCommandSetBlipName("STRING") - AddTextComponentString(_U('shop') .. ' ' .. _U(string.lower(k))) - EndTextCommandSetBlipName(blip) - end - end - end + BeginTextCommandSetBlipName("STRING") + AddTextComponentString(_U('shop') .. ' ' .. _U(string.lower(k))) + EndTextCommandSetBlipName(blip) + end + end + end end) -- Display markers Citizen.CreateThread(function() - while true do - Wait(0) - local coords = GetEntityCoords(GetPlayerPed(-1)) - for k,v in pairs(Config.Zones) do - for i = 1, #v.Pos, 1 do - if(Config.Type ~= -1 and GetDistanceBetweenCoords(coords, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, true) < Config.DrawDistance) then - DrawMarker(Config.Type, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.Size.x, Config.Size.y, Config.Size.z, Config.Color.r, Config.Color.g, Config.Color.b, 100, false, true, 2, false, false, false, false) - end - end - end - end + while true do + Citizen.Wait(0) + local coords = GetEntityCoords(GetPlayerPed(-1)) + for k,v in pairs(Config.Zones) do + for i = 1, #v.Pos, 1 do + if(Config.Type ~= -1 and GetDistanceBetweenCoords(coords, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, true) < Config.DrawDistance) then + DrawMarker(Config.Type, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.Size.x, Config.Size.y, Config.Size.z, Config.Color.r, Config.Color.g, Config.Color.b, 100, false, true, 2, false, false, false, false) + end + end + end + end end) Citizen.CreateThread(function() - while true do - - Wait(0) - - local coords = GetEntityCoords(GetPlayerPed(-1)) - local isInMarker = false - local currentZone = nil - for k,v in pairs(Config.Zones) do - for i = 1, #v.Pos, 1 do - if(GetDistanceBetweenCoords(coords, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, true) < Config.Size.x) then - isInMarker = true - currentZone = k - end - end - end + while true do + + Citizen.Wait(10) + + local coords = GetEntityCoords(GetPlayerPed(-1)) + local isInMarker = false + local currentZone = nil + for k,v in pairs(Config.Zones) do + for i = 1, #v.Pos, 1 do + if(GetDistanceBetweenCoords(coords, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, true) < Config.Size.x) then + isInMarker = true + currentZone = k + end + end + end - if (isInMarker and not HasAlreadyEnteredMarker) or (isInMarker and LastZone ~= currentZone) then - HasAlreadyEnteredMarker = true - LastZone = currentZone - TriggerEvent('esx_accessories:hasEnteredMarker', currentZone) - end + if (isInMarker and not HasAlreadyEnteredMarker) or (isInMarker and LastZone ~= currentZone) then + HasAlreadyEnteredMarker = true + LastZone = currentZone + TriggerEvent('esx_accessories:hasEnteredMarker', currentZone) + end - if not isInMarker and HasAlreadyEnteredMarker then - HasAlreadyEnteredMarker = false - TriggerEvent('esx_accessories:hasExitedMarker', LastZone) - end + if not isInMarker and HasAlreadyEnteredMarker then + HasAlreadyEnteredMarker = false + TriggerEvent('esx_accessories:hasExitedMarker', LastZone) + end - end + end end) -- Key controls Citizen.CreateThread(function() - while true do + while true do - Citizen.Wait(0) + Citizen.Wait(10) - if CurrentAction ~= nil then - SetTextComponentFormat('STRING') - AddTextComponentString(CurrentActionMsg) - DisplayHelpTextFromStringLabel(0, 0, 1, -1) + if CurrentAction ~= nil then + SetTextComponentFormat('STRING') + AddTextComponentString(CurrentActionMsg) + DisplayHelpTextFromStringLabel(0, 0, 1, -1) - if IsControlJustReleased(0, 38) then - OpenShopMenu(CurrentActionData.accessory) - CurrentAction = nil - end - end + if IsControlJustReleased(0, 38) and CurrentActionData.accessory ~= nil then + OpenShopMenu(CurrentActionData.accessory) + CurrentAction = nil + end + end - if Config.EnableControls then - if IsControlJustReleased(0, Keys['K']) and not IsDead then - OpenAccessoryMenu() - end - end + if Config.EnableControls then + if IsControlJustReleased(0, Keys['K']) and not isDead then + OpenAccessoryMenu() + end + end - end + end end) diff --git a/config.lua b/config.lua index 3b721a9b..58c0b852 100644 --- a/config.lua +++ b/config.lua @@ -17,89 +17,89 @@ Config.Type = 1 -- If you have esx_clothesshop you should not fill this -- more than it's already filled. Config.ShopsBlips = { - Ears = { - Pos = nil, - Blip = nil - }, - Mask = { - Pos = { - { x = -1338.129, y = -1278.200, z = 3.872 }, - }, - Blip = { sprite = 362, color = 2 } - }, - Helmet = { - Pos = nil, - Blip = nil - }, - Glasses = { - Pos = nil, - Blip = nil - } + Ears = { + Pos = nil, + Blip = nil + }, + Mask = { + Pos = { + { x = -1338.129, y = -1278.200, z = 3.872 }, + }, + Blip = { sprite = 362, color = 2 } + }, + Helmet = { + Pos = nil, + Blip = nil + }, + Glasses = { + Pos = nil, + Blip = nil + } } Config.Zones = { - Ears = { - Pos = { - {x= 80.374, y= -1389.493, z= 28.406}, - {x= -709.426, y= -153.829, z= 36.535}, - {x= -163.093, y= -302.038, z= 38.853}, - {x= 420.787, y= -809.654, z= 28.611}, - {x= -817.070, y= -1075.965, z= 10.448}, - {x= -1451.300, y= -238.254, z= 48.929}, - {x= -0.756, y= 6513.685, z= 30.997}, - {x= 123.431, y= -208.060, z= 53.677}, - {x= 1687.318, y= 4827.685, z= 41.183}, - {x= 622.806, y= 2749.221, z= 41.208}, - {x= 1200.085, y= 2705.428, z= 37.342}, - {x= -1199.959, y= -782.534, z= 16.452}, - {x= -3171.867, y= 1059.632, z= 19.983}, - {x= -1095.670, y= 2709.245, z= 18.227}, - } - - }, - - Mask = { - Pos = { - {x = -1338.129, y = -1278.200, z = 3.872}, - } - }, - - Helmet = { - Pos = { - {x= 81.576, y= -1400.602, z= 28.406}, - {x= -705.845, y= -159.015, z= 36.535}, - {x= -161.349, y= -295.774, z= 38.853}, - {x= 419.319, y= -800.647, z= 28.611}, - {x= -824.362, y= -1081.741, z= 10.448}, - {x= -1454.888, y= -242.911, z= 48.931}, - {x= 4.770, y= 6520.935, z= 30.997}, - {x= 121.071, y= -223.266, z= 53.377}, - {x= 1689.648, y= 4818.805, z= 41.183}, - {x= 613.971, y= 2749.978, z= 41.208}, - {x= 1189.513, y= 2703.947, z= 37.342}, - {x= -1204.025, y= -774.439, z= 16.452}, - {x= -3164.280, y= 1054.705, z= 19.983}, - {x= -1103.125, y= 2700.599, z= 18.227}, - } - }, - - Glasses = { - Pos = { - {x= 75.287, y= -1391.131, z= 28.406}, - {x= -713.102, y= -160.116, z= 36.535}, - {x= -156.171, y= -300.547, z= 38.853}, - {x= 425.478, y= -807.866, z= 28.611}, - {x= -820.853, y= -1072.940, z= 10.448}, - {x= -1458.052, y= -236.783, z= 48.918}, - {x= 3.587, y= 6511.585, z= 30.997}, - {x= 131.335, y= -212.336, z= 53.677}, - {x= 1694.936, y= 4820.837, z= 41.183}, - {x= 613.972, y= 2768.814, z= 41.208}, - {x= 1198.678, y= 2711.011, z= 37.342}, - {x= -1188.227, y= -764.594, z= 16.452}, - {x= -3173.192, y= 1038.228, z= 19.983}, - {x= -1100.494, y= 2712.481, z= 18.227}, - } - } + Ears = { + Pos = { + {x= 80.374, y= -1389.493, z= 28.406}, + {x= -709.426, y= -153.829, z= 36.535}, + {x= -163.093, y= -302.038, z= 38.853}, + {x= 420.787, y= -809.654, z= 28.611}, + {x= -817.070, y= -1075.965, z= 10.448}, + {x= -1451.300, y= -238.254, z= 48.929}, + {x= -0.756, y= 6513.685, z= 30.997}, + {x= 123.431, y= -208.060, z= 53.677}, + {x= 1687.318, y= 4827.685, z= 41.183}, + {x= 622.806, y= 2749.221, z= 41.208}, + {x= 1200.085, y= 2705.428, z= 37.342}, + {x= -1199.959, y= -782.534, z= 16.452}, + {x= -3171.867, y= 1059.632, z= 19.983}, + {x= -1095.670, y= 2709.245, z= 18.227}, + } + + }, + + Mask = { + Pos = { + {x = -1338.129, y = -1278.200, z = 3.872}, + } + }, + + Helmet = { + Pos = { + {x= 81.576, y= -1400.602, z= 28.406}, + {x= -705.845, y= -159.015, z= 36.535}, + {x= -161.349, y= -295.774, z= 38.853}, + {x= 419.319, y= -800.647, z= 28.611}, + {x= -824.362, y= -1081.741, z= 10.448}, + {x= -1454.888, y= -242.911, z= 48.931}, + {x= 4.770, y= 6520.935, z= 30.997}, + {x= 121.071, y= -223.266, z= 53.377}, + {x= 1689.648, y= 4818.805, z= 41.183}, + {x= 613.971, y= 2749.978, z= 41.208}, + {x= 1189.513, y= 2703.947, z= 37.342}, + {x= -1204.025, y= -774.439, z= 16.452}, + {x= -3164.280, y= 1054.705, z= 19.983}, + {x= -1103.125, y= 2700.599, z= 18.227}, + } + }, + + Glasses = { + Pos = { + {x= 75.287, y= -1391.131, z= 28.406}, + {x= -713.102, y= -160.116, z= 36.535}, + {x= -156.171, y= -300.547, z= 38.853}, + {x= 425.478, y= -807.866, z= 28.611}, + {x= -820.853, y= -1072.940, z= 10.448}, + {x= -1458.052, y= -236.783, z= 48.918}, + {x= 3.587, y= 6511.585, z= 30.997}, + {x= 131.335, y= -212.336, z= 53.677}, + {x= 1694.936, y= 4820.837, z= 41.183}, + {x= 613.972, y= 2768.814, z= 41.208}, + {x= 1198.678, y= 2711.011, z= 37.342}, + {x= -1188.227, y= -764.594, z= 16.452}, + {x= -3173.192, y= 1038.228, z= 19.983}, + {x= -1100.494, y= 2712.481, z= 18.227}, + } + } } diff --git a/locales/en.lua b/locales/en.lua index b4c886f7..b85a3473 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,21 +1,21 @@ Locales ['en'] = { - ['valid_purchase'] = 'validate this purchase?', - ['yes'] = 'yes', - ['no'] = 'no', - ['helmet'] = 'helmet / Hat', - ['glasses'] = 'glasses', - ['mask'] = 'mask', - ['ears'] = 'ears accessories', - ['shop'] = 'shop of', - ['set_unset'] = 'put on / Take off', - ['not_enough_money'] = 'you do not have enough money', - ['press_access'] = 'press ~INPUT_CONTEXT~ to access the menu', - ['accessories_blip'] = 'accessories', - ['no_ears'] = 'you do not have ears accessories', - ['no_glasses'] = 'you do not have glasses', - ['no_helmet'] = 'you do not have a helmet', - ['no_mask'] = 'you do not have a mask', - ['you_paid'] = 'you paid ', + ['valid_purchase'] = 'validate this purchase?', + ['yes'] = 'yes', + ['no'] = 'no', + ['helmet'] = 'helmet / Hat', + ['glasses'] = 'glasses', + ['mask'] = 'mask', + ['ears'] = 'ears accessories', + ['shop'] = 'shop of', + ['set_unset'] = 'put on / Take off', + ['not_enough_money'] = 'you do not have enough money', + ['press_access'] = 'press ~INPUT_CONTEXT~ to access the menu', + ['accessories_blip'] = 'accessories', + ['no_ears'] = 'you do not have ears accessories', + ['no_glasses'] = 'you do not have glasses', + ['no_helmet'] = 'you do not have a helmet', + ['no_mask'] = 'you do not have a mask', + ['you_paid'] = 'you paid ', } diff --git a/locales/fr.lua b/locales/fr.lua index c486909c..665c4eed 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,21 +1,21 @@ Locales ['fr'] = { - ['valid_purchase'] = 'valider cet achat ?', - ['yes'] = 'oui', - ['no'] = 'non', - ['helmet'] = 'casque / Chapeau', - ['glasses'] = 'lunettes', - ['mask'] = 'masque', - ['ears'] = 'accessoires d\'oreilles', - ['shop'] = 'magasin de', - ['set_unset'] = 'mettre / Enlever', - ['not_enough_money'] = 'vous n\'avez pas assez d\'argent', - ['press_access'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder au menu', - ['accessories_blip'] = 'accessoires', - ['no_ears'] = 'vous n\'avez pas d\'accessoires d\'oreilles', - ['no_glasses'] = 'vous n\'avez pas de lunettes', - ['no_helmet'] = 'vous n\'avez pas de casque / chapeau', - ['no_mask'] = 'vous n\'avez pas de masque', - ['you_paid'] = 'vous avez payé ', + ['valid_purchase'] = 'valider cet achat ?', + ['yes'] = 'oui', + ['no'] = 'non', + ['helmet'] = 'casque / Chapeau', + ['glasses'] = 'lunettes', + ['mask'] = 'masque', + ['ears'] = 'accessoires d\'oreilles', + ['shop'] = 'magasin de', + ['set_unset'] = 'mettre / Enlever', + ['not_enough_money'] = 'vous n\'avez pas assez d\'argent', + ['press_access'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder au menu', + ['accessories_blip'] = 'accessoires', + ['no_ears'] = 'vous n\'avez pas d\'accessoires d\'oreilles', + ['no_glasses'] = 'vous n\'avez pas de lunettes', + ['no_helmet'] = 'vous n\'avez pas de casque / chapeau', + ['no_mask'] = 'vous n\'avez pas de masque', + ['you_paid'] = 'vous avez payé ', } diff --git a/server/main.lua b/server/main.lua index cf4f22de..b2d0887c 100644 --- a/server/main.lua +++ b/server/main.lua @@ -4,45 +4,45 @@ TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) RegisterServerEvent('esx_accessories:pay') AddEventHandler('esx_accessories:pay', function() - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) - xPlayer.removeMoney(Config.Price) - TriggerClientEvent('esx:showNotification', _source, _U('you_paid') .. '$' .. Config.Price) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) + xPlayer.removeMoney(Config.Price) + TriggerClientEvent('esx:showNotification', _source, _U('you_paid') .. '$' .. Config.Price) end) RegisterServerEvent('esx_accessories:save') AddEventHandler('esx_accessories:save', function(skin, accessory) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) - TriggerEvent('esx_datastore:getDataStore', 'user_' .. string.lower(accessory), xPlayer.identifier, function(store) - - store.set('has' .. accessory, true) + TriggerEvent('esx_datastore:getDataStore', 'user_' .. string.lower(accessory), xPlayer.identifier, function(store) + + store.set('has' .. accessory, true) - local itemSkin = {} - local item1 = string.lower(accessory) .. '_1' - local item2 = string.lower(accessory) .. '_2' - itemSkin[item1] = skin[item1] - itemSkin[item2] = skin[item2] - store.set('skin', itemSkin) + local itemSkin = {} + local item1 = string.lower(accessory) .. '_1' + local item2 = string.lower(accessory) .. '_2' + itemSkin[item1] = skin[item1] + itemSkin[item2] = skin[item2] + store.set('skin', itemSkin) - end) + end) end) ESX.RegisterServerCallback('esx_accessories:get', function(source, cb, accessory) local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local xPlayer = ESX.GetPlayerFromId(_source) - TriggerEvent('esx_datastore:getDataStore', 'user_' .. string.lower(accessory), xPlayer.identifier, function(store) - - local hasAccessory = (store.get('has' .. accessory) and store.get('has' .. accessory) or false) - local skin = (store.get('skin') and store.get('skin') or {}) + TriggerEvent('esx_datastore:getDataStore', 'user_' .. string.lower(accessory), xPlayer.identifier, function(store) + + local hasAccessory = (store.get('has' .. accessory) and store.get('has' .. accessory) or false) + local skin = (store.get('skin') and store.get('skin') or {}) - cb(hasAccessory, skin) + cb(hasAccessory, skin) - end) + end) end) @@ -51,12 +51,12 @@ end) ESX.RegisterServerCallback('esx_accessories:checkMoney', function(source, cb) local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local xPlayer = ESX.GetPlayerFromId(_source) - if xPlayer.get('money') >= Config.Price then - cb(true) - else - cb(false) - end + if xPlayer.get('money') >= Config.Price then + cb(true) + else + cb(false) + end end) From e0baebf083377c59c755ec0384d619fcf065a622 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 15 Apr 2018 11:20:10 +0200 Subject: [PATCH 045/133] Only keyboard input, minor fixes --- README.md | 7 +++---- client/main.lua | 28 +++++++++++----------------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 84a349d2..8bef861b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ -# fxserver-esx_accessories -FXServer ESX Accessories +# esx_accessories Shops with accessories (hat/helmet, glasses, masks, ears accessories). You can put on or take off the accessories with a menu. Accessories saved in database. @@ -8,8 +7,8 @@ Shops with accessories (hat/helmet, glasses, masks, ears accessories). You can p ## REQUIREMENTS -- esx_skin => https://github.com/ESX-Org/esx_skin -- esx_datastore => https://github.com/ESX-Org/esx_datastore +- [esx_skin](https://github.com/ESX-Org/esx_skin) +- [esx_datastore](https://github.com/ESX-Org/esx_datastore) ## INSTALLATION diff --git a/client/main.lua b/client/main.lua index fc3500a7..ea1b2813 100644 --- a/client/main.lua +++ b/client/main.lua @@ -10,13 +10,13 @@ local Keys = { ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 } -ESX = nil -local HasAlreadyEnteredMarker = false -local LastZone = nil -local CurrentAction = nil +ESX = nil +local HasAlreadyEnteredMarker = false +local LastZone = nil +local CurrentAction = nil local CurrentActionMsg = '' local CurrentActionData = {} -local isDead = false +local isDead = false Citizen.CreateThread(function() while ESX == nil do @@ -76,7 +76,6 @@ function SetUnsetAccessory(accessory) end end, accessory) - end function OpenShopMenu(accessory) @@ -149,7 +148,7 @@ function OpenShopMenu(accessory) end, function(data, menu) menu.close() - CurrentAction = 'shop_menu' + CurrentAction = 'shop_menu' CurrentActionMsg = _U('press_access') CurrentActionData = {} end, restrict) @@ -165,11 +164,9 @@ AddEventHandler('esx:onPlayerDeath', function() end) AddEventHandler('esx_accessories:hasEnteredMarker', function(zone) - - CurrentAction = 'shop_menu' + CurrentAction = 'shop_menu' CurrentActionMsg = _U('press_access') CurrentActionData = { accessory = zone } - end) AddEventHandler('esx_accessories:hasExitedMarker', function(zone) @@ -216,10 +213,8 @@ end) Citizen.CreateThread(function() while true do - Citizen.Wait(10) - - local coords = GetEntityCoords(GetPlayerPed(-1)) + local coords = GetEntityCoords(GetPlayerPed(-1)) local isInMarker = false local currentZone = nil for k,v in pairs(Config.Zones) do @@ -233,7 +228,7 @@ Citizen.CreateThread(function() if (isInMarker and not HasAlreadyEnteredMarker) or (isInMarker and LastZone ~= currentZone) then HasAlreadyEnteredMarker = true - LastZone = currentZone + LastZone = currentZone TriggerEvent('esx_accessories:hasEnteredMarker', currentZone) end @@ -249,9 +244,8 @@ end) -- Key controls Citizen.CreateThread(function() while true do - Citizen.Wait(10) - + if CurrentAction ~= nil then SetTextComponentFormat('STRING') AddTextComponentString(CurrentActionMsg) @@ -264,7 +258,7 @@ Citizen.CreateThread(function() end if Config.EnableControls then - if IsControlJustReleased(0, Keys['K']) and not isDead then + if IsControlJustReleased(0, Keys['K']) and GetLastInputMethod(2) and not isDead then OpenAccessoryMenu() end end From 7cd66abf07a22428617fed5329e2d2f9a038fc02 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 7 May 2018 22:39:37 +0200 Subject: [PATCH 046/133] Improved README and resource manifest, removed startup message --- README.md | 46 +++++++++++++++++++++++++++++----------------- __resource.lua | 8 +++++++- server/main.lua | 2 -- 3 files changed, 36 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 989f4efb..a6d49ac0 100644 --- a/README.md +++ b/README.md @@ -1,27 +1,27 @@ -# fxserver-cron -FXServer CRON +# cron -# fxserver-esx_addonaccount -ESX AddonAccount +## Download & Installation -[INSTALLATION] - -1) CD in your resources folder -2) Clone the repository +### Using [fvm](https://github.com/qlaffont/fvm-installer) ``` -git clone https://github.com/FXServer-ESX/fxserver-cron cron -``` -3) Add this in your server.cfg : - -``` -start cron +fvm install --save --folder=esx esx-org/cron ``` -[USAGE] - +### Using Git +``` +cd resources +git clone https://github.com/ESX-Org/cron cron ``` --- Execute task every 5:10 +### Manually +- Download https://github.com/ESX-Org/cron/archive/master.zip +- Put it in your resource directory + + +## Usage +```lua + +-- Execute task 5:10, every day function CronTask(d, h, m) print('Task done') end @@ -38,3 +38,15 @@ end TriggerEvent('cron:runAt', 18, 30, CronTask) ``` + +# Legal +### License +cron - do stuff in a specified time + +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/. diff --git a/__resource.lua b/__resource.lua index bb6f3d67..65f46367 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1 +1,7 @@ -server_script "server/main.lua" +resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' + +description 'cron' + +version '1.0.0' + +server_script 'server/main.lua' diff --git a/server/main.lua b/server/main.lua index a3c87e85..2896732e 100644 --- a/server/main.lua +++ b/server/main.lua @@ -51,5 +51,3 @@ Tick() AddEventHandler('cron:runAt', function(h, m, cb) RunAt(h, m, cb) end) - -print('CRON STARTED [' .. os.date('%H:%M', os.time()) .. ']') From dcde5433221e8ea7a69e59345acbd18ca1304c24 Mon Sep 17 00:00:00 2001 From: AdrineX Date: Tue, 12 Jun 2018 23:55:31 +0300 Subject: [PATCH 047/133] 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 990800d7fd45e1c351dfd609bbe28dc5fd16b4c8 Mon Sep 17 00:00:00 2001 From: AdrineX Date: Wed, 13 Jun 2018 00:15:18 +0300 Subject: [PATCH 048/133] Add Finnish lang... --- __resource.lua | 2 ++ locales/fi.lua | 21 +++++++++++++++++++++ localization/esx_accessories_fi.sql | 7 +++++++ 3 files changed, 30 insertions(+) create mode 100644 locales/fi.lua create mode 100644 localization/esx_accessories_fi.sql diff --git a/__resource.lua b/__resource.lua index 2dd1af28..503cad78 100644 --- a/__resource.lua +++ b/__resource.lua @@ -7,6 +7,7 @@ version '1.0.1' server_scripts { '@es_extended/locale.lua', 'locales/en.lua', + 'locales/fi.lua', 'locales/fr.lua', 'config.lua', 'server/main.lua' @@ -15,6 +16,7 @@ server_scripts { client_scripts { '@es_extended/locale.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..55b84afb --- /dev/null +++ b/locales/fi.lua @@ -0,0 +1,21 @@ +Locales ['fi'] = { + + ['valid_purchase'] = 'varmista ostos?', + ['yes'] = 'kyllä', + ['no'] = 'ei', + ['helmet'] = 'kypärä / Hattu', + ['glasses'] = 'lasit', + ['mask'] = 'maskit', + ['ears'] = 'korva asusteet', + ['shop'] = 'asustekauppa', + ['set_unset'] = 'laita päälle / Ota pois', + ['not_enough_money'] = 'sinulla ei ole tarpeeksi rahaa', + ['press_access'] = 'paina ~INPUT_CONTEXT~ avataksesi menu', + ['accessories_blip'] = 'asusteet', + ['no_ears'] = 'sinulla ei ole korva asusteita', + ['no_glasses'] = 'sinulla ei ole laseja', + ['no_helmet'] = 'sinulla ei ole kypäriä', + ['no_mask'] = 'sinulla ei ole maskeja', + ['you_paid'] = 'sinä maksoit ', + +} diff --git a/localization/esx_accessories_fi.sql b/localization/esx_accessories_fi.sql new file mode 100644 index 00000000..74b2dd57 --- /dev/null +++ b/localization/esx_accessories_fi.sql @@ -0,0 +1,7 @@ + +INSERT INTO `datastore` (name, label, shared) VALUES + ('user_ears','Korvat',0), + ('user_glasses','Lasit',0), + ('user_helmet','Kypärät',0), + ('user_mask','Maskit',0) +; From e4056aa7d701103698dd468574867acde5e30243 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 1 Jul 2018 11:47:57 +0200 Subject: [PATCH 049/133] 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 050/133] 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 051/133] 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 69b43baab7d1e265ed04daaffa5949e432868698 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Wed, 8 Aug 2018 20:24:14 -0400 Subject: [PATCH 052/133] Fixed File Name --- localization/{esx_accessories_fi.sql => fi_esx_accessories.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename localization/{esx_accessories_fi.sql => fi_esx_accessories.sql} (100%) diff --git a/localization/esx_accessories_fi.sql b/localization/fi_esx_accessories.sql similarity index 100% rename from localization/esx_accessories_fi.sql rename to localization/fi_esx_accessories.sql From 952c5dff067c745a4da709c92efc52987b47c7a3 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Fri, 10 Aug 2018 00:47:22 -0400 Subject: [PATCH 053/133] 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 a00fc831c579ab8acb5ba4bbea3d7261bbb0cc38 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Fri, 10 Aug 2018 00:49:31 -0400 Subject: [PATCH 054/133] 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 a2cf2c0e579229699ef697b52c152e6f392e01c4 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Fri, 10 Aug 2018 00:50:42 -0400 Subject: [PATCH 055/133] 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 043d406461e7126aaa70c0a2baf3da027fac7d34 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Fri, 10 Aug 2018 00:56:03 -0400 Subject: [PATCH 056/133] 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 ad2a4d6b7ca4a6471596a0eb5ae26892efa853f8 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 14 Aug 2018 13:01:43 +0200 Subject: [PATCH 057/133] Locale improvements, Swedish locale --- README.md | 40 +++++-- __resource.lua | 10 +- client/main.lua | 177 +++++++++++++--------------- config.lua | 38 +++--- esx_accessories.sql | 9 +- locales/en.lua | 8 +- locales/fi.lua | 8 +- locales/fr.lua | 10 +- locales/sv.lua | 19 +++ localization/fi_esx_accessories.sql | 9 +- localization/sv_esx_accessories.sql | 8 ++ server/main.lua | 11 +- 12 files changed, 191 insertions(+), 156 deletions(-) create mode 100644 locales/sv.lua create mode 100644 localization/sv_esx_accessories.sql diff --git a/README.md b/README.md index 8bef861b..6af3efba 100644 --- a/README.md +++ b/README.md @@ -4,19 +4,43 @@ Shops with accessories (hat/helmet, glasses, masks, ears accessories). You can p /!\ Works only with accessories purchased in the special areas of the clothing store, not via the esx_clotheshop script. - -## REQUIREMENTS - +## Requirements - [esx_skin](https://github.com/ESX-Org/esx_skin) - [esx_datastore](https://github.com/ESX-Org/esx_datastore) -## INSTALLATION +## Download & Installation -1) CD in your resources/[esx] folder -2) Clone the repository -3) Import esx_accessories.sql in your database -4) Add this in your server.cfg : +### Using [fvm](https://github.com/qlaffont/fvm-installer) +``` +fvm install --save --folder=esx esx-org/esx_accessories +``` + +### Using Git +``` +cd resources +git clone https://github.com/ESX-Org/esx_accessories [esx]/esx_accessories +``` + +### Manually +- Download https://github.com/ESX-Org/esx_accessories/archive/master.zip +- Put it in the `[esx]` directory + +## Installation +- Import `esx_accessories.sql` in your database +- Add this in your `server.cfg`: ``` start esx_accessories ``` + +# Legal +### License +esx_accessories - buy some shiny stuff! + +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/. diff --git a/__resource.lua b/__resource.lua index 503cad78..8e0c1769 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,13 +2,14 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Accessories' -version '1.0.1' +version '1.1.0' server_scripts { '@es_extended/locale.lua', 'locales/en.lua', 'locales/fi.lua', 'locales/fr.lua', + 'locales/sv.lua', 'config.lua', 'server/main.lua' } @@ -18,6 +19,13 @@ client_scripts { 'locales/en.lua', 'locales/fi.lua', 'locales/fr.lua', + 'locales/sv.lua', 'config.lua', 'client/main.lua' } + +dependencies { + 'es_extended', + 'esx_skin', + 'esx_datastore' +} \ No newline at end of file diff --git a/client/main.lua b/client/main.lua index ea1b2813..03901014 100644 --- a/client/main.lua +++ b/client/main.lua @@ -9,14 +9,14 @@ local Keys = { ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173, ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 } - -ESX = nil -local HasAlreadyEnteredMarker = false -local LastZone = nil -local CurrentAction = nil -local CurrentActionMsg = '' -local CurrentActionData = {} -local isDead = false + +ESX = nil +local HasAlreadyEnteredMarker = false +local LastZone = nil +local CurrentAction = nil +local CurrentActionMsg = '' +local CurrentActionData = {} +local isDead = false Citizen.CreateThread(function() while ESX == nil do @@ -26,39 +26,33 @@ Citizen.CreateThread(function() end) function OpenAccessoryMenu() + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'set_unset_accessory', + { + title = _U('set_unset'), + align = 'top-left', + elements = { + {label = _U('helmet'), value = 'Helmet'}, + {label = _U('ears'), value = 'Ears'}, + {label = _U('mask'), value = 'Mask'}, + {label = _U('glasses'), value = 'Glasses'}, + } + }, function(data, menu) + menu.close() + SetUnsetAccessory(data.current.value) - ESX.UI.Menu.Open( - 'default', GetCurrentResourceName(), 'set_unset_accessory', - { - title = _U('set_unset'), - align = 'top-left', - elements = { - {label = _U('helmet'), value = 'Helmet'}, - {label = _U('ears'), value = 'Ears'}, - {label = _U('mask'), value = 'Mask'}, - {label = _U('glasses'), value = 'Glasses'}, - } - }, - function(data, menu) - menu.close() - SetUnsetAccessory(data.current.value) - - end, - function(data, menu) - menu.close() - end - ) + end, function(data, menu) + menu.close() + end) end function SetUnsetAccessory(accessory) - ESX.TriggerServerCallback('esx_accessories:get', function(hasAccessory, accessorySkin) local _accessory = string.lower(accessory) if hasAccessory then TriggerEvent('skinchanger:getSkin', function(skin) local mAccessory = -1 - local mColor = 0 + local mColor = 0 if _accessory == "mask" then mAccessory = 0 end @@ -79,7 +73,6 @@ function SetUnsetAccessory(accessory) end function OpenShopMenu(accessory) - local _accessory = string.lower(accessory) local restrict = {} @@ -89,70 +82,63 @@ function OpenShopMenu(accessory) menu.close() - ESX.UI.Menu.Open( - 'default', GetCurrentResourceName(), 'shop_confirm', - { - title = _U('valid_purchase'), - align = 'top-left', - elements = { - {label = _U('yes'), value = 'yes'}, - {label = _U('no'), value = 'no'}, - } - }, - function(data, menu) - menu.close() - if data.current.value == 'yes' then - ESX.TriggerServerCallback('esx_accessories:checkMoney', function(hasEnoughMoney) - if hasEnoughMoney then - TriggerServerEvent('esx_accessories:pay') - TriggerEvent('skinchanger:getSkin', function(skin) - TriggerServerEvent('esx_accessories:save', skin, accessory) - end) - else - TriggerEvent('esx_skin:getLastSkin', function(skin) - TriggerEvent('skinchanger:loadSkin', skin) - end) - ESX.ShowNotification(_U('not_enough_money')) - end - end) - end - - if data.current.value == 'no' then - local player = GetPlayerPed(-1) - TriggerEvent('esx_skin:getLastSkin', function(skin) - TriggerEvent('skinchanger:loadSkin', skin) - end) - if accessory == "Ears" then - ClearPedProp(player, 2) - elseif accessory == "Mask" then - SetPedComponentVariation(player, 1, 0 ,0 ,2) - elseif accessory == "Helmet" then - ClearPedProp(player, 0) - elseif accessory == "Glasses" then - SetPedPropIndex(player, 1, -1, 0, 0) + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'shop_confirm', + { + title = _U('valid_purchase'), + align = 'top-left', + elements = { + {label = _U('no'), value = 'no'}, + {label = _U('yes', Config.Price), value = 'yes'} + } + }, function(data, menu) + menu.close() + if data.current.value == 'yes' then + ESX.TriggerServerCallback('esx_accessories:checkMoney', function(hasEnoughMoney) + if hasEnoughMoney then + TriggerServerEvent('esx_accessories:pay') + TriggerEvent('skinchanger:getSkin', function(skin) + TriggerServerEvent('esx_accessories:save', skin, accessory) + end) + else + TriggerEvent('esx_skin:getLastSkin', function(skin) + TriggerEvent('skinchanger:loadSkin', skin) + end) + ESX.ShowNotification(_U('not_enough_money')) end - end - CurrentAction = 'shop_menu' - CurrentActionMsg = _U('press_access') - CurrentActionData = {} - end, - function(data, menu) - menu.close() - CurrentAction = 'shop_menu' - CurrentActionMsg = _U('press_access') - CurrentActionData = {} - + end) end - ) - end, - function(data, menu) + if data.current.value == 'no' then + local player = GetPlayerPed(-1) + TriggerEvent('esx_skin:getLastSkin', function(skin) + TriggerEvent('skinchanger:loadSkin', skin) + end) + if accessory == "Ears" then + ClearPedProp(player, 2) + elseif accessory == "Mask" then + SetPedComponentVariation(player, 1, 0 ,0 ,2) + elseif accessory == "Helmet" then + ClearPedProp(player, 0) + elseif accessory == "Glasses" then + SetPedPropIndex(player, 1, -1, 0, 0) + end + end + CurrentAction = 'shop_menu' + CurrentActionMsg = _U('press_access') + CurrentActionData = {} + end, function(data, menu) + menu.close() + CurrentAction = 'shop_menu' + CurrentActionMsg = _U('press_access') + CurrentActionData = {} + + end) + end, function(data, menu) menu.close() CurrentAction = 'shop_menu' CurrentActionMsg = _U('press_access') CurrentActionData = {} end, restrict) - end AddEventHandler('playerSpawned', function() @@ -188,7 +174,7 @@ Citizen.CreateThread(function() SetBlipAsShortRange(blip, true) BeginTextCommandSetBlipName("STRING") - AddTextComponentString(_U('shop') .. ' ' .. _U(string.lower(k))) + AddTextComponentString(_U('shop', _U(string.lower(k)))) EndTextCommandSetBlipName(blip) end end @@ -240,21 +226,22 @@ Citizen.CreateThread(function() end end) - -- Key controls Citizen.CreateThread(function() while true do Citizen.Wait(10) if CurrentAction ~= nil then - SetTextComponentFormat('STRING') - AddTextComponentString(CurrentActionMsg) - DisplayHelpTextFromStringLabel(0, 0, 1, -1) - if IsControlJustReleased(0, 38) and CurrentActionData.accessory ~= nil then + ESX.ShowHelpNotification(CurrentActionMsg) + + if IsControlJustReleased(0, Keys['E']) and CurrentActionData.accessory then OpenShopMenu(CurrentActionData.accessory) CurrentAction = nil end + + elseif CurrentAction == nil and not Config.EnableControls then + Citizen.Wait(500) end if Config.EnableControls then @@ -264,4 +251,4 @@ Citizen.CreateThread(function() end end -end) +end) \ No newline at end of file diff --git a/config.lua b/config.lua index 58c0b852..ea21f3af 100644 --- a/config.lua +++ b/config.lua @@ -6,13 +6,11 @@ Config.Price = 100 Config.EnableControls = true - Config.DrawDistance = 100.0 Config.Size = {x = 1.5, y = 1.5, z = 1.0} Config.Color = {r = 102, g = 102, b = 204} Config.Type = 1 - -- Fill this if you want to see the blips, -- If you have esx_clothesshop you should not fill this -- more than it's already filled. @@ -40,20 +38,20 @@ Config.ShopsBlips = { Config.Zones = { Ears = { Pos = { - {x= 80.374, y= -1389.493, z= 28.406}, - {x= -709.426, y= -153.829, z= 36.535}, - {x= -163.093, y= -302.038, z= 38.853}, - {x= 420.787, y= -809.654, z= 28.611}, - {x= -817.070, y= -1075.965, z= 10.448}, - {x= -1451.300, y= -238.254, z= 48.929}, - {x= -0.756, y= 6513.685, z= 30.997}, - {x= 123.431, y= -208.060, z= 53.677}, - {x= 1687.318, y= 4827.685, z= 41.183}, - {x= 622.806, y= 2749.221, z= 41.208}, - {x= 1200.085, y= 2705.428, z= 37.342}, - {x= -1199.959, y= -782.534, z= 16.452}, - {x= -3171.867, y= 1059.632, z= 19.983}, - {x= -1095.670, y= 2709.245, z= 18.227}, + {x= 80.374, y= -1389.493, z= 28.406}, + {x= -709.426, y= -153.829, z= 36.535}, + {x= -163.093, y= -302.038, z= 38.853}, + {x= 420.787, y= -809.654, z= 28.611}, + {x= -817.070, y= -1075.96, z= 10.448}, + {x= -1451.300, y= -238.254, z= 48.929}, + {x= -0.756, y= 6513.685, z= 30.997}, + {x= 123.431, y= -208.060, z= 53.677}, + {x= 1687.318, y= 4827.685, z= 41.183}, + {x= 622.806, y= 2749.221, z= 41.208}, + {x= 1200.085, y= 2705.428, z= 37.342}, + {x= -1199.959, y= -782.534, z= 16.452}, + {x= -3171.867, y= 1059.632, z= 19.983}, + {x= -1095.670, y= 2709.245, z= 18.227}, } }, @@ -66,13 +64,13 @@ Config.Zones = { Helmet = { Pos = { - {x= 81.576, y= -1400.602, z= 28.406}, + {x= 81.576, y= -1400.602, z= 28.406}, {x= -705.845, y= -159.015, z= 36.535}, {x= -161.349, y= -295.774, z= 38.853}, {x= 419.319, y= -800.647, z= 28.611}, {x= -824.362, y= -1081.741, z= 10.448}, {x= -1454.888, y= -242.911, z= 48.931}, - {x= 4.770, y= 6520.935, z= 30.997}, + {x= 4.770, y= 6520.935, z= 30.997}, {x= 121.071, y= -223.266, z= 53.377}, {x= 1689.648, y= 4818.805, z= 41.183}, {x= 613.971, y= 2749.978, z= 41.208}, @@ -85,13 +83,13 @@ Config.Zones = { Glasses = { Pos = { - {x= 75.287, y= -1391.131, z= 28.406}, + {x= 75.287, y= -1391.131, z= 28.406}, {x= -713.102, y= -160.116, z= 36.535}, {x= -156.171, y= -300.547, z= 38.853}, {x= 425.478, y= -807.866, z= 28.611}, {x= -820.853, y= -1072.940, z= 10.448}, {x= -1458.052, y= -236.783, z= 48.918}, - {x= 3.587, y= 6511.585, z= 30.997}, + {x= 3.587, y= 6511.585, z= 30.997}, {x= 131.335, y= -212.336, z= 53.677}, {x= 1694.936, y= 4820.837, z= 41.183}, {x= 613.972, y= 2768.814, z= 41.208}, diff --git a/esx_accessories.sql b/esx_accessories.sql index 92c65768..d10b2e1b 100644 --- a/esx_accessories.sql +++ b/esx_accessories.sql @@ -1,7 +1,8 @@ +USE `essentialmode`; INSERT INTO `datastore` (name, label, shared) VALUES - ('user_ears','Ears',0), - ('user_glasses','Glasses',0), - ('user_helmet','Helmet',0), - ('user_mask','Mask',0) + ('user_ears', 'Ears', 0), + ('user_glasses', 'Glasses', 0), + ('user_helmet', 'Helmet', 0), + ('user_mask', 'Mask', 0) ; diff --git a/locales/en.lua b/locales/en.lua index b85a3473..2cb77f7d 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,13 +1,12 @@ Locales ['en'] = { - ['valid_purchase'] = 'validate this purchase?', - ['yes'] = 'yes', + ['yes'] = 'yes ($%s)', ['no'] = 'no', ['helmet'] = 'helmet / Hat', ['glasses'] = 'glasses', ['mask'] = 'mask', ['ears'] = 'ears accessories', - ['shop'] = 'shop of', + ['shop'] = '%s shop', ['set_unset'] = 'put on / Take off', ['not_enough_money'] = 'you do not have enough money', ['press_access'] = 'press ~INPUT_CONTEXT~ to access the menu', @@ -16,6 +15,5 @@ Locales ['en'] = { ['no_glasses'] = 'you do not have glasses', ['no_helmet'] = 'you do not have a helmet', ['no_mask'] = 'you do not have a mask', - ['you_paid'] = 'you paid ', - + ['you_paid'] = 'you paid ~g~$%s~s~', } diff --git a/locales/fi.lua b/locales/fi.lua index 55b84afb..4b8748bc 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -1,13 +1,12 @@ Locales ['fi'] = { - ['valid_purchase'] = 'varmista ostos?', - ['yes'] = 'kyllä', + ['yes'] = 'kyllä ($%s)', ['no'] = 'ei', ['helmet'] = 'kypärä / Hattu', ['glasses'] = 'lasit', ['mask'] = 'maskit', ['ears'] = 'korva asusteet', - ['shop'] = 'asustekauppa', + ['shop'] = '%s asustekauppa', ['set_unset'] = 'laita päälle / Ota pois', ['not_enough_money'] = 'sinulla ei ole tarpeeksi rahaa', ['press_access'] = 'paina ~INPUT_CONTEXT~ avataksesi menu', @@ -16,6 +15,5 @@ Locales ['fi'] = { ['no_glasses'] = 'sinulla ei ole laseja', ['no_helmet'] = 'sinulla ei ole kypäriä', ['no_mask'] = 'sinulla ei ole maskeja', - ['you_paid'] = 'sinä maksoit ', - + ['you_paid'] = 'sinä maksoit ~g~$%s~s~', } diff --git a/locales/fr.lua b/locales/fr.lua index 665c4eed..c6a02037 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,13 +1,12 @@ Locales ['fr'] = { - - ['valid_purchase'] = 'valider cet achat ?', - ['yes'] = 'oui', + ['valid_purchase'] = 'valider cet achat?', + ['yes'] = 'oui ($%s)', ['no'] = 'non', ['helmet'] = 'casque / Chapeau', ['glasses'] = 'lunettes', ['mask'] = 'masque', ['ears'] = 'accessoires d\'oreilles', - ['shop'] = 'magasin de', + ['shop'] = '%s magasin de', ['set_unset'] = 'mettre / Enlever', ['not_enough_money'] = 'vous n\'avez pas assez d\'argent', ['press_access'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder au menu', @@ -16,6 +15,5 @@ Locales ['fr'] = { ['no_glasses'] = 'vous n\'avez pas de lunettes', ['no_helmet'] = 'vous n\'avez pas de casque / chapeau', ['no_mask'] = 'vous n\'avez pas de masque', - ['you_paid'] = 'vous avez payé ', - + ['you_paid'] = 'vous avez payé ~g~$%s~s~', } diff --git a/locales/sv.lua b/locales/sv.lua new file mode 100644 index 00000000..54f99179 --- /dev/null +++ b/locales/sv.lua @@ -0,0 +1,19 @@ +Locales ['sv'] = { + ['valid_purchase'] = 'bekräfta köp?', + ['yes'] = 'ja (%s SEK)', + ['no'] = 'nej', + ['helmet'] = 'hjälm / hat', + ['glasses'] = 'glasögon', + ['mask'] = 'ansiktsmask', + ['ears'] = 'örontillbehör', + ['shop'] = '%s affär', + ['set_unset'] = 'ta på / av', + ['not_enough_money'] = 'du har inte råd!', + ['press_access'] = 'tryck ~INPUT_CONTEXT~ för att öppna menyn.', + ['accessories_blip'] = 'extrautröstning', + ['no_ears'] = 'du har inga öron tillbehör', + ['no_glasses'] = 'du har inga glasögon', + ['no_helmet'] = 'du har ingen hjälm', + ['no_mask'] = 'du har inte någon mask', + ['you_paid'] = 'du har betalat ~g~%s SEK~s~', +} diff --git a/localization/fi_esx_accessories.sql b/localization/fi_esx_accessories.sql index 74b2dd57..81defba5 100644 --- a/localization/fi_esx_accessories.sql +++ b/localization/fi_esx_accessories.sql @@ -1,7 +1,8 @@ +USE `essentialmode`; INSERT INTO `datastore` (name, label, shared) VALUES - ('user_ears','Korvat',0), - ('user_glasses','Lasit',0), - ('user_helmet','Kypärät',0), - ('user_mask','Maskit',0) + ('user_ears', 'Örontilbb', 0), + ('user_glasses', 'Lasit', 0), + ('user_helmet', 'Kypärät', 0), + ('user_mask', 'Maskit', 0) ; diff --git a/localization/sv_esx_accessories.sql b/localization/sv_esx_accessories.sql new file mode 100644 index 00000000..b947b632 --- /dev/null +++ b/localization/sv_esx_accessories.sql @@ -0,0 +1,8 @@ +USE `essentialmode`; + +INSERT INTO `datastore` (name, label, shared) VALUES + ('user_ears', 'Örontillbehör', 0), + ('user_glasses', 'Glasögon', 0), + ('user_helmet', 'Hjälm', 0), + ('user_mask', 'Mask', 0) +; diff --git a/server/main.lua b/server/main.lua index b2d0887c..1b614f92 100644 --- a/server/main.lua +++ b/server/main.lua @@ -7,7 +7,7 @@ AddEventHandler('esx_accessories:pay', function() local _source = source local xPlayer = ESX.GetPlayerFromId(_source) xPlayer.removeMoney(Config.Price) - TriggerClientEvent('esx:showNotification', _source, _U('you_paid') .. '$' .. Config.Price) + TriggerClientEvent('esx:showNotification', _source, _U('you_paid', Config.Price)) end) @@ -32,8 +32,7 @@ AddEventHandler('esx_accessories:save', function(skin, accessory) end) ESX.RegisterServerCallback('esx_accessories:get', function(source, cb, accessory) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local xPlayer = ESX.GetPlayerFromId(source) TriggerEvent('esx_datastore:getDataStore', 'user_' .. string.lower(accessory), xPlayer.identifier, function(store) @@ -46,12 +45,8 @@ ESX.RegisterServerCallback('esx_accessories:get', function(source, cb, accessory end) ---=================================================================== ---=================================================================== - ESX.RegisterServerCallback('esx_accessories:checkMoney', function(source, cb) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local xPlayer = ESX.GetPlayerFromId(source) if xPlayer.get('money') >= Config.Price then cb(true) From 49dc255546ac67c2037dd6480d7fd8ce87c9ae43 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 16 Sep 2018 10:59:33 +0200 Subject: [PATCH 058/133] 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 74653246b0d2fc7731699fa4546a0a4635b6d05e Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 3 Nov 2018 21:53:44 +0100 Subject: [PATCH 059/133] Performance, respect EnableHud from ESX --- client/main.lua | 73 +++++++++++++++------------------------ html/scripts/app.js | 54 +++++++++++++++-------------- html/ui.html | 24 +++++++------ server/classes/status.lua | 2 +- server/main.lua | 60 +++++++++++--------------------- 5 files changed, 89 insertions(+), 124 deletions(-) diff --git a/client/main.lua b/client/main.lua index 17a7aac7..4a4dbb1c 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,46 +1,38 @@ local Status = {} +local isPaused = false function GetStatusData(minimal) - local status = {} for i=1, #Status, 1 do - if minimal then - table.insert(status, { name = Status[i].name, val = Status[i].val, - percent = (Status[i].val / Config.StatusMax) * 100, + percent = (Status[i].val / Config.StatusMax) * 100 }) - else - table.insert(status, { name = Status[i].name, val = Status[i].val, color = Status[i].color, visible = Status[i].visible(Status[i]), max = Status[i].max, - percent = (Status[i].val / Config.StatusMax) * 100, + percent = (Status[i].val / Config.StatusMax) * 100 }) - end - end return status - end AddEventHandler('esx_status:registerStatus', function(name, default, color, visible, tickCallback) - local s = CreateStatus(name, default, color, visible, tickCallback) - table.insert(Status, s) + local status = CreateStatus(name, default, color, visible, tickCallback) + table.insert(Status, status) end) RegisterNetEvent('esx_status:load') AddEventHandler('esx_status:load', function(status) - for i=1, #Status, 1 do for j=1, #status, 1 do if Status[i].name == status[j].name then @@ -50,27 +42,23 @@ AddEventHandler('esx_status:load', function(status) end Citizen.CreateThread(function() - while true do - - for i=1, #Status, 1 do - Status[i].onTick() - end + while true do + for i=1, #Status, 1 do + Status[i].onTick() + end SendNUIMessage({ update = true, status = GetStatusData() }) - Citizen.Wait(Config.TickTime) - - end + Citizen.Wait(Config.TickTime) + end end) - end) RegisterNetEvent('esx_status:set') AddEventHandler('esx_status:set', function(name, val) - for i=1, #Status, 1 do if Status[i].name == name then Status[i].set(val) @@ -84,12 +72,10 @@ AddEventHandler('esx_status:set', function(name, val) }) TriggerServerEvent('esx_status:update', GetStatusData(true)) - end) RegisterNetEvent('esx_status:add') AddEventHandler('esx_status:add', function(name, val) - for i=1, #Status, 1 do if Status[i].name == name then Status[i].add(val) @@ -103,12 +89,10 @@ AddEventHandler('esx_status:add', function(name, val) }) TriggerServerEvent('esx_status:update', GetStatusData(true)) - end) RegisterNetEvent('esx_status:remove') AddEventHandler('esx_status:remove', function(name, val) - for i=1, #Status, 1 do if Status[i].name == name then Status[i].remove(val) @@ -122,44 +106,40 @@ AddEventHandler('esx_status:remove', function(name, val) }) TriggerServerEvent('esx_status:update', GetStatusData(true)) - end) AddEventHandler('esx_status:getStatus', function(name, cb) - for i=1, #Status, 1 do if Status[i].name == name then cb(Status[i]) return end end - end) AddEventHandler('esx_status:setDisplay', function(val) - SendNUIMessage({ setDisplay = true, display = val }) - end) -- Pause menu disable hud display -local isPaused = false +if ESX.GetConfig().EnableHud then + Citizen.CreateThread(function() + while true do + Citizen.Wait(300) -Citizen.CreateThread(function() - while true do - Citizen.Wait(10) - if IsPauseMenuActive() and not isPaused then - isPaused = true - TriggerEvent('esx_status:setDisplay', 0.0) - elseif not IsPauseMenuActive() and isPaused then - isPaused = false - TriggerEvent('esx_status:setDisplay', 0.5) - end - end -end) + if IsPauseMenuActive() and not isPaused then + isPaused = true + TriggerEvent('esx_status:setDisplay', 0.0) + elseif not IsPauseMenuActive() and isPaused then + isPaused = false + TriggerEvent('esx_status:setDisplay', 0.5) + end + end + end) +end -- Loaded event Citizen.CreateThread(function() @@ -170,6 +150,7 @@ end) Citizen.CreateThread(function() while true do Citizen.Wait(Config.UpdateInterval) + TriggerServerEvent('esx_status:update', GetStatusData(true)) end -end) \ No newline at end of file +end) diff --git a/html/scripts/app.js b/html/scripts/app.js index e009ce7e..8e01f20c 100644 --- a/html/scripts/app.js +++ b/html/scripts/app.js @@ -1,15 +1,15 @@ -(function(){ +(function () { + let status = []; - let status = [] - - let renderStatus = function(){ + let renderStatus = function () { $('#status_list').html(''); - for(let i=0; i' + @@ -17,41 +17,43 @@ '
' + '' + ''); - + statusDiv.find('.status_inner') - .css({'border' : '1px solid ' + status[i].color}) - ; + .css({ 'border': '1px solid ' + status[i].color }) + ; statusDiv.find('.status_val') .css({ - 'background-color' : status[i].color, - 'width' : (status[i].val / 10000) + '%' + 'background-color': status[i].color, + 'width': (status[i].val / 10000) + '%' }) - ; + ; - $('#status_list').append(statusDiv) + $('#status_list').append(statusDiv); } - } + }; - window.onData = function(data){ - - if(data.update){ - + window.onData = function (data) { + if (data.update) { status.length = 0; - for(let i=0; i - - - - - - -
- - - - + + + + + + + +
+ + + + + \ No newline at end of file diff --git a/server/classes/status.lua b/server/classes/status.lua index 7cf02782..226daa60 100644 --- a/server/classes/status.lua +++ b/server/classes/status.lua @@ -1,5 +1,5 @@ function CreateStatus(xPlayer, name, default, color, visible, tickCallback, clientAction) - + local self = {} self.val = default diff --git a/server/main.lua b/server/main.lua index b0f8c46a..eed4d956 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,5 +1,4 @@ -ESX = nil -local RegisteredStatus = {} +ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) @@ -7,43 +6,30 @@ AddEventHandler('esx:playerLoaded', function(source) local _source = source local xPlayer = ESX.GetPlayerFromId(_source) - MySQL.Async.fetchAll( - 'SELECT * FROM users WHERE identifier = @identifier', - { + MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { ['@identifier'] = xPlayer.identifier - }, - function(result) - - local data = {} - - if result[1].status ~= nil then - data = json.decode(result[1].status) - end - - xPlayer.set('status', data) - - TriggerClientEvent('esx_status:load', _source, data) + }, function(result) + local data = {} + if result[1].status ~= nil then + data = json.decode(result[1].status) end - ) + xPlayer.set('status', data) + TriggerClientEvent('esx_status:load', _source, data) + end) end) AddEventHandler('esx:playerDropped', function(source) local _source = source local xPlayer = ESX.GetPlayerFromId(_source) - local data = {} local status = xPlayer.get('status') - MySQL.Async.execute( - 'UPDATE users SET status = @status WHERE identifier = @identifier', - { - ['@status'] = json.encode(status), - ['@identifier'] = xPlayer.identifier - } - ) - + MySQL.Async.execute('UPDATE users SET status = @status WHERE identifier = @identifier', { + ['@status'] = json.encode(status), + ['@identifier'] = xPlayer.identifier + }) end) AddEventHandler('esx_status:getStatus', function(playerId, statusName, cb) @@ -56,14 +42,13 @@ AddEventHandler('esx_status:getStatus', function(playerId, statusName, cb) break end end - end) RegisterServerEvent('esx_status:update') AddEventHandler('esx_status:update', function(status) local _source = source local xPlayer = ESX.GetPlayerFromId(_source) - + if xPlayer ~= nil then xPlayer.set('status', status) end @@ -71,24 +56,19 @@ end) function SaveData() local xPlayers = ESX.GetPlayers() - - for i=1, #xPlayers, 1 do + for i=1, #xPlayers, 1 do local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) local data = {} local status = xPlayer.get('status') - MySQL.Async.execute( - 'UPDATE users SET status = @status WHERE identifier = @identifier', - { - ['@status'] = json.encode(status), - ['@identifier'] = xPlayer.identifier - } - ) - + MySQL.Async.execute('UPDATE users SET status = @status WHERE identifier = @identifier', { + ['@status'] = json.encode(status), + ['@identifier'] = xPlayer.identifier + }) end SetTimeout(10 * 60 * 1000, SaveData) end -SaveData() \ No newline at end of file +SaveData() From d70d4af99606219e83d5d7356ddf030dd3389df4 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 4 Nov 2018 22:50:01 +0100 Subject: [PATCH 060/133] Minor changes --- client/main.lua | 3 +++ server/main.lua | 20 +++++--------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/client/main.lua b/client/main.lua index 03901014..2d9b5f9f 100644 --- a/client/main.lua +++ b/client/main.lua @@ -53,13 +53,16 @@ function SetUnsetAccessory(accessory) TriggerEvent('skinchanger:getSkin', function(skin) local mAccessory = -1 local mColor = 0 + if _accessory == "mask" then mAccessory = 0 end + if skin[_accessory .. '_1'] == mAccessory then mAccessory = accessorySkin[_accessory .. '_1'] mColor = accessorySkin[_accessory .. '_2'] end + local accessorySkin = {} accessorySkin[_accessory .. '_1'] = mAccessory accessorySkin[_accessory .. '_2'] = mColor diff --git a/server/main.lua b/server/main.lua index 1b614f92..6c674ae2 100644 --- a/server/main.lua +++ b/server/main.lua @@ -4,11 +4,10 @@ TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) RegisterServerEvent('esx_accessories:pay') AddEventHandler('esx_accessories:pay', function() - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) - xPlayer.removeMoney(Config.Price) - TriggerClientEvent('esx:showNotification', _source, _U('you_paid', Config.Price)) + local xPlayer = ESX.GetPlayerFromId(source) + xPlayer.removeMoney(Config.Price) + TriggerClientEvent('esx:showNotification', source, _U('you_paid', Config.Price)) end) RegisterServerEvent('esx_accessories:save') @@ -17,7 +16,6 @@ AddEventHandler('esx_accessories:save', function(skin, accessory) local xPlayer = ESX.GetPlayerFromId(_source) TriggerEvent('esx_datastore:getDataStore', 'user_' .. string.lower(accessory), xPlayer.identifier, function(store) - store.set('has' .. accessory, true) local itemSkin = {} @@ -25,22 +23,19 @@ AddEventHandler('esx_accessories:save', function(skin, accessory) local item2 = string.lower(accessory) .. '_2' itemSkin[item1] = skin[item1] itemSkin[item2] = skin[item2] + store.set('skin', itemSkin) - end) - end) ESX.RegisterServerCallback('esx_accessories:get', function(source, cb, accessory) local xPlayer = ESX.GetPlayerFromId(source) TriggerEvent('esx_datastore:getDataStore', 'user_' .. string.lower(accessory), xPlayer.identifier, function(store) - local hasAccessory = (store.get('has' .. accessory) and store.get('has' .. accessory) or false) local skin = (store.get('skin') and store.get('skin') or {}) cb(hasAccessory, skin) - end) end) @@ -48,10 +43,5 @@ end) ESX.RegisterServerCallback('esx_accessories:checkMoney', function(source, cb) local xPlayer = ESX.GetPlayerFromId(source) - if xPlayer.get('money') >= Config.Price then - cb(true) - else - cb(false) - end - + cb(xPlayer.get('money') >= Config.Price) end) From 2028350a9593c7b7acea1ace34653d6301691b25 Mon Sep 17 00:00:00 2001 From: April <39036878+aprilkae@users.noreply.github.com> Date: Sun, 4 Nov 2018 16:52:17 -0500 Subject: [PATCH 061/133] fix for removing glasses (#11) * fixed issue where you couldn't remove glasses (or incorrect glasses were put on) --- client/main.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/main.lua b/client/main.lua index 2d9b5f9f..8530f9ea 100644 --- a/client/main.lua +++ b/client/main.lua @@ -56,6 +56,8 @@ function SetUnsetAccessory(accessory) if _accessory == "mask" then mAccessory = 0 + elseif _accessory == "glasses" then + mAccessory = 5 end if skin[_accessory .. '_1'] == mAccessory then From bef16c09b680937712e414040c68dc92b349fd59 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 4 Nov 2018 22:56:19 +0100 Subject: [PATCH 062/133] Enforce 2 space indent on locale files --- client/main.lua | 16 +++++++--------- locales/en.lua | 34 +++++++++++++++++----------------- locales/fi.lua | 34 +++++++++++++++++----------------- locales/fr.lua | 34 +++++++++++++++++----------------- locales/sv.lua | 34 +++++++++++++++++----------------- server/main.lua | 2 +- 6 files changed, 76 insertions(+), 78 deletions(-) diff --git a/client/main.lua b/client/main.lua index 2d9b5f9f..aa0ff237 100644 --- a/client/main.lua +++ b/client/main.lua @@ -34,7 +34,7 @@ function OpenAccessoryMenu() {label = _U('helmet'), value = 'Helmet'}, {label = _U('ears'), value = 'Ears'}, {label = _U('mask'), value = 'Mask'}, - {label = _U('glasses'), value = 'Glasses'}, + {label = _U('glasses'), value = 'Glasses'} } }, function(data, menu) menu.close() @@ -91,7 +91,7 @@ function OpenShopMenu(accessory) align = 'top-left', elements = { {label = _U('no'), value = 'no'}, - {label = _U('yes', Config.Price), value = 'yes'} + {label = _U('yes', ESX.Math.GroupDigits(Config.Price)), value = 'yes'} } }, function(data, menu) menu.close() @@ -112,14 +112,14 @@ function OpenShopMenu(accessory) end if data.current.value == 'no' then - local player = GetPlayerPed(-1) + local player = PlayerPedId() TriggerEvent('esx_skin:getLastSkin', function(skin) TriggerEvent('skinchanger:loadSkin', skin) end) if accessory == "Ears" then ClearPedProp(player, 2) elseif accessory == "Mask" then - SetPedComponentVariation(player, 1, 0 ,0 ,2) + SetPedComponentVariation(player, 1, 0 ,0, 2) elseif accessory == "Helmet" then ClearPedProp(player, 0) elseif accessory == "Glasses" then @@ -188,7 +188,7 @@ end) Citizen.CreateThread(function() while true do Citizen.Wait(0) - local coords = GetEntityCoords(GetPlayerPed(-1)) + local coords = GetEntityCoords(PlayerPedId()) for k,v in pairs(Config.Zones) do for i = 1, #v.Pos, 1 do if(Config.Type ~= -1 and GetDistanceBetweenCoords(coords, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, true) < Config.DrawDistance) then @@ -203,12 +203,12 @@ end) Citizen.CreateThread(function() while true do Citizen.Wait(10) - local coords = GetEntityCoords(GetPlayerPed(-1)) + local coords = GetEntityCoords(PlayerPedId()) local isInMarker = false local currentZone = nil for k,v in pairs(Config.Zones) do for i = 1, #v.Pos, 1 do - if(GetDistanceBetweenCoords(coords, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, true) < Config.Size.x) then + if GetDistanceBetweenCoords(coords, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, true) < Config.Size.x then isInMarker = true currentZone = k end @@ -235,14 +235,12 @@ Citizen.CreateThread(function() Citizen.Wait(10) if CurrentAction ~= nil then - ESX.ShowHelpNotification(CurrentActionMsg) if IsControlJustReleased(0, Keys['E']) and CurrentActionData.accessory then OpenShopMenu(CurrentActionData.accessory) CurrentAction = nil end - elseif CurrentAction == nil and not Config.EnableControls then Citizen.Wait(500) end diff --git a/locales/en.lua b/locales/en.lua index 2cb77f7d..0ea2f75f 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,19 +1,19 @@ Locales ['en'] = { - ['valid_purchase'] = 'validate this purchase?', - ['yes'] = 'yes ($%s)', - ['no'] = 'no', - ['helmet'] = 'helmet / Hat', - ['glasses'] = 'glasses', - ['mask'] = 'mask', - ['ears'] = 'ears accessories', - ['shop'] = '%s shop', - ['set_unset'] = 'put on / Take off', - ['not_enough_money'] = 'you do not have enough money', - ['press_access'] = 'press ~INPUT_CONTEXT~ to access the menu', - ['accessories_blip'] = 'accessories', - ['no_ears'] = 'you do not have ears accessories', - ['no_glasses'] = 'you do not have glasses', - ['no_helmet'] = 'you do not have a helmet', - ['no_mask'] = 'you do not have a mask', - ['you_paid'] = 'you paid ~g~$%s~s~', + ['valid_purchase'] = 'validate this purchase?', + ['yes'] = 'yes ($%s)', + ['no'] = 'no', + ['helmet'] = 'helmet / Hat', + ['glasses'] = 'glasses', + ['mask'] = 'mask', + ['ears'] = 'ears accessories', + ['shop'] = '%s shop', + ['set_unset'] = 'put on / Take off', + ['not_enough_money'] = 'you do not have enough money', + ['press_access'] = 'press ~INPUT_CONTEXT~ to access the menu', + ['accessories_blip'] = 'accessories', + ['no_ears'] = 'you do not have ears accessories', + ['no_glasses'] = 'you do not have glasses', + ['no_helmet'] = 'you do not have a helmet', + ['no_mask'] = 'you do not have a mask', + ['you_paid'] = 'you paid ~g~$%s~s~', } diff --git a/locales/fi.lua b/locales/fi.lua index 4b8748bc..d5c5cfe9 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -1,19 +1,19 @@ Locales ['fi'] = { - ['valid_purchase'] = 'varmista ostos?', - ['yes'] = 'kyllä ($%s)', - ['no'] = 'ei', - ['helmet'] = 'kypärä / Hattu', - ['glasses'] = 'lasit', - ['mask'] = 'maskit', - ['ears'] = 'korva asusteet', - ['shop'] = '%s asustekauppa', - ['set_unset'] = 'laita päälle / Ota pois', - ['not_enough_money'] = 'sinulla ei ole tarpeeksi rahaa', - ['press_access'] = 'paina ~INPUT_CONTEXT~ avataksesi menu', - ['accessories_blip'] = 'asusteet', - ['no_ears'] = 'sinulla ei ole korva asusteita', - ['no_glasses'] = 'sinulla ei ole laseja', - ['no_helmet'] = 'sinulla ei ole kypäriä', - ['no_mask'] = 'sinulla ei ole maskeja', - ['you_paid'] = 'sinä maksoit ~g~$%s~s~', + ['valid_purchase'] = 'varmista ostos?', + ['yes'] = 'kyllä ($%s)', + ['no'] = 'ei', + ['helmet'] = 'kypärä / Hattu', + ['glasses'] = 'lasit', + ['mask'] = 'maskit', + ['ears'] = 'korva asusteet', + ['shop'] = '%s asustekauppa', + ['set_unset'] = 'laita päälle / Ota pois', + ['not_enough_money'] = 'sinulla ei ole tarpeeksi rahaa', + ['press_access'] = 'paina ~INPUT_CONTEXT~ avataksesi menu', + ['accessories_blip'] = 'asusteet', + ['no_ears'] = 'sinulla ei ole korva asusteita', + ['no_glasses'] = 'sinulla ei ole laseja', + ['no_helmet'] = 'sinulla ei ole kypäriä', + ['no_mask'] = 'sinulla ei ole maskeja', + ['you_paid'] = 'sinä maksoit ~g~$%s~s~', } diff --git a/locales/fr.lua b/locales/fr.lua index c6a02037..4e324f2c 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,19 +1,19 @@ Locales ['fr'] = { - ['valid_purchase'] = 'valider cet achat?', - ['yes'] = 'oui ($%s)', - ['no'] = 'non', - ['helmet'] = 'casque / Chapeau', - ['glasses'] = 'lunettes', - ['mask'] = 'masque', - ['ears'] = 'accessoires d\'oreilles', - ['shop'] = '%s magasin de', - ['set_unset'] = 'mettre / Enlever', - ['not_enough_money'] = 'vous n\'avez pas assez d\'argent', - ['press_access'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder au menu', - ['accessories_blip'] = 'accessoires', - ['no_ears'] = 'vous n\'avez pas d\'accessoires d\'oreilles', - ['no_glasses'] = 'vous n\'avez pas de lunettes', - ['no_helmet'] = 'vous n\'avez pas de casque / chapeau', - ['no_mask'] = 'vous n\'avez pas de masque', - ['you_paid'] = 'vous avez payé ~g~$%s~s~', + ['valid_purchase'] = 'valider cet achat?', + ['yes'] = 'oui ($%s)', + ['no'] = 'non', + ['helmet'] = 'casque / Chapeau', + ['glasses'] = 'lunettes', + ['mask'] = 'masque', + ['ears'] = 'accessoires d\'oreilles', + ['shop'] = '%s magasin de', + ['set_unset'] = 'mettre / Enlever', + ['not_enough_money'] = 'vous n\'avez pas assez d\'argent', + ['press_access'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder au menu', + ['accessories_blip'] = 'accessoires', + ['no_ears'] = 'vous n\'avez pas d\'accessoires d\'oreilles', + ['no_glasses'] = 'vous n\'avez pas de lunettes', + ['no_helmet'] = 'vous n\'avez pas de casque / chapeau', + ['no_mask'] = 'vous n\'avez pas de masque', + ['you_paid'] = 'vous avez payé ~g~$%s~s~', } diff --git a/locales/sv.lua b/locales/sv.lua index 54f99179..7d033564 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -1,19 +1,19 @@ Locales ['sv'] = { - ['valid_purchase'] = 'bekräfta köp?', - ['yes'] = 'ja (%s SEK)', - ['no'] = 'nej', - ['helmet'] = 'hjälm / hat', - ['glasses'] = 'glasögon', - ['mask'] = 'ansiktsmask', - ['ears'] = 'örontillbehör', - ['shop'] = '%s affär', - ['set_unset'] = 'ta på / av', - ['not_enough_money'] = 'du har inte råd!', - ['press_access'] = 'tryck ~INPUT_CONTEXT~ för att öppna menyn.', - ['accessories_blip'] = 'extrautröstning', - ['no_ears'] = 'du har inga öron tillbehör', - ['no_glasses'] = 'du har inga glasögon', - ['no_helmet'] = 'du har ingen hjälm', - ['no_mask'] = 'du har inte någon mask', - ['you_paid'] = 'du har betalat ~g~%s SEK~s~', + ['valid_purchase'] = 'bekräfta köp?', + ['yes'] = 'ja (%s SEK)', + ['no'] = 'nej', + ['helmet'] = 'hjälm / hat', + ['glasses'] = 'glasögon', + ['mask'] = 'ansiktsmask', + ['ears'] = 'örontillbehör', + ['shop'] = '%s affär', + ['set_unset'] = 'ta på / av', + ['not_enough_money'] = 'du har inte råd!', + ['press_access'] = 'tryck ~INPUT_CONTEXT~ för att öppna menyn.', + ['accessories_blip'] = 'extrautröstning', + ['no_ears'] = 'du har inga öron tillbehör', + ['no_glasses'] = 'du har inga glasögon', + ['no_helmet'] = 'du har ingen hjälm', + ['no_mask'] = 'du har inte någon mask', + ['you_paid'] = 'du har betalat ~g~%s SEK~s~', } diff --git a/server/main.lua b/server/main.lua index 6c674ae2..83d1d255 100644 --- a/server/main.lua +++ b/server/main.lua @@ -7,7 +7,7 @@ AddEventHandler('esx_accessories:pay', function() local xPlayer = ESX.GetPlayerFromId(source) xPlayer.removeMoney(Config.Price) - TriggerClientEvent('esx:showNotification', source, _U('you_paid', Config.Price)) + TriggerClientEvent('esx:showNotification', source, _U('you_paid', ESX.Math.GroupDigits(Config.Price))) end) RegisterServerEvent('esx_accessories:save') From c54723289adc5b9aecc240992da4fef6ecd5a692 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 5 Nov 2018 13:57:04 +0100 Subject: [PATCH 063/133] Revert "fix for removing glasses (#11)" This reverts commit 2028350a9593c7b7acea1ace34653d6301691b25. --- client/main.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/client/main.lua b/client/main.lua index a2cd0716..aa0ff237 100644 --- a/client/main.lua +++ b/client/main.lua @@ -56,8 +56,6 @@ function SetUnsetAccessory(accessory) if _accessory == "mask" then mAccessory = 0 - elseif _accessory == "glasses" then - mAccessory = 5 end if skin[_accessory .. '_1'] == mAccessory then From e56d700df44517713632e1060e4585963be12d36 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 11 Nov 2018 14:10:57 +0100 Subject: [PATCH 064/133] Revert respect ESX config --- client/main.lua | 24 +++++++++++------------- server/main.lua | 5 ++--- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/client/main.lua b/client/main.lua index 4a4dbb1c..ae8e51ad 100644 --- a/client/main.lua +++ b/client/main.lua @@ -125,21 +125,19 @@ AddEventHandler('esx_status:setDisplay', function(val) end) -- Pause menu disable hud display -if ESX.GetConfig().EnableHud then - Citizen.CreateThread(function() - while true do - Citizen.Wait(300) +Citizen.CreateThread(function() + while true do + Citizen.Wait(300) - if IsPauseMenuActive() and not isPaused then - isPaused = true - TriggerEvent('esx_status:setDisplay', 0.0) - elseif not IsPauseMenuActive() and isPaused then - isPaused = false - TriggerEvent('esx_status:setDisplay', 0.5) - end + if IsPauseMenuActive() and not isPaused then + isPaused = true + TriggerEvent('esx_status:setDisplay', 0.0) + elseif not IsPauseMenuActive() and isPaused then + isPaused = false + TriggerEvent('esx_status:setDisplay', 0.5) end - end) -end + end +end) -- Loaded event Citizen.CreateThread(function() diff --git a/server/main.lua b/server/main.lua index eed4d956..ab6b18c5 100644 --- a/server/main.lua +++ b/server/main.lua @@ -46,10 +46,9 @@ end) RegisterServerEvent('esx_status:update') AddEventHandler('esx_status:update', function(status) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local xPlayer = ESX.GetPlayerFromId(source) - if xPlayer ~= nil then + if xPlayer then xPlayer.set('status', status) end end) From 23653f0cc9dc2fdcc1c16e940aef544c45afc5cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rychl=C3=BD?= Date: Sat, 1 Dec 2018 12:19:16 +0100 Subject: [PATCH 065/133] Add of Czech translate (#13) * Add of Czech translate * Czech translate 2 space intent fix Fixed intent to 2 spaces to match the source repository style --- __resource.lua | 2 ++ locales/cs.lua | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 locales/cs.lua diff --git a/__resource.lua b/__resource.lua index 8e0c1769..d09b6d2b 100644 --- a/__resource.lua +++ b/__resource.lua @@ -10,6 +10,7 @@ server_scripts { 'locales/fi.lua', 'locales/fr.lua', 'locales/sv.lua', + 'locales/cs.lua', 'config.lua', 'server/main.lua' } @@ -20,6 +21,7 @@ client_scripts { 'locales/fi.lua', 'locales/fr.lua', 'locales/sv.lua', + 'locales/cs.lua', 'config.lua', 'client/main.lua' } diff --git a/locales/cs.lua b/locales/cs.lua new file mode 100644 index 00000000..a44eb670 --- /dev/null +++ b/locales/cs.lua @@ -0,0 +1,19 @@ +Locales ['cs'] = { + ['valid_purchase'] = 'ověřit nákup?', + ['yes'] = 'ano ($%s)', + ['no'] = 'ne', + ['helmet'] = 'helma / Čepice', + ['glasses'] = 'brýle', + ['mask'] = 'maska', + ['ears'] = 'doplňky na uši', + ['shop'] = '%s obchod', + ['set_unset'] = 'nasadit / Sundat', + ['not_enough_money'] = 'nemáte dostatek peněz', + ['press_access'] = 'zmáčkněte ~INPUT_CONTEXT~ pro otevření menu', + ['accessories_blip'] = 'doplňky', + ['no_ears'] = 'nemáte doplňky na uši', + ['no_glasses'] = 'nemáte brýle', + ['no_helmet'] = 'nemáte helmu', + ['no_mask'] = 'nemáte masku', + ['you_paid'] = 'zaplatili jste ~g~$%s~s~', +} From 4b46663c965478511c58c54fb863f11d4e2b4efa Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 2 Dec 2018 20:30:20 +0100 Subject: [PATCH 066/133] Trigger esx_status:onTick on tick --- client/main.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/client/main.lua b/client/main.lua index ae8e51ad..3376614b 100644 --- a/client/main.lua +++ b/client/main.lua @@ -52,6 +52,7 @@ AddEventHandler('esx_status:load', function(status) status = GetStatusData() }) + TriggerEvent('esx_status:onTick', GetStatusData(true)) Citizen.Wait(Config.TickTime) end end) From c42a6824c70eb4fe17d7230c00f058d3b27fa5e9 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 30 Dec 2018 21:52:30 +0100 Subject: [PATCH 067/133] Check IsControlJustReleased() every frame --- client/main.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/client/main.lua b/client/main.lua index aa0ff237..828521f7 100644 --- a/client/main.lua +++ b/client/main.lua @@ -202,7 +202,8 @@ end) Citizen.CreateThread(function() while true do - Citizen.Wait(10) + Citizen.Wait(200) + local coords = GetEntityCoords(PlayerPedId()) local isInMarker = false local currentZone = nil @@ -232,7 +233,7 @@ end) -- Key controls Citizen.CreateThread(function() while true do - Citizen.Wait(10) + Citizen.Wait(0) if CurrentAction ~= nil then ESX.ShowHelpNotification(CurrentActionMsg) From 5c8bd984b9ded960222e2bcd886aba6911f5e4f6 Mon Sep 17 00:00:00 2001 From: MajorMarcin Date: Mon, 7 Jan 2019 12:17:41 +0100 Subject: [PATCH 068/133] add pl the missing Polish translation was added --- __resource.lua | 2 ++ locales/pl.lua | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 locales/pl.lua diff --git a/__resource.lua b/__resource.lua index d09b6d2b..d2f35714 100644 --- a/__resource.lua +++ b/__resource.lua @@ -11,6 +11,7 @@ server_scripts { 'locales/fr.lua', 'locales/sv.lua', 'locales/cs.lua', + 'locales/pl.lua', 'config.lua', 'server/main.lua' } @@ -22,6 +23,7 @@ client_scripts { 'locales/fr.lua', 'locales/sv.lua', 'locales/cs.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..facf48aa --- /dev/null +++ b/locales/pl.lua @@ -0,0 +1,19 @@ +Locales ['pl'] = { + ['valid_purchase'] = 'czy napewno chcesz to zakupić?', + ['yes'] = 'tak (%s $)', + ['no'] = 'nie', + ['helmet'] = 'hełm / Czapka', + ['glasses'] = 'okulary', + ['mask'] = 'maska', + ['ears'] = 'akcesoria uszu', + ['shop'] = 'sklep %s ', + ['set_unset'] = 'załóż / Zdejmij', + ['not_enough_money'] = 'nie masz wystarczająco pieniędzy', + ['press_access'] = 'wciśnij ~INPUT_CONTEXT~ aby otworzyć menu', + ['accessories_blip'] = 'akcesoria', + ['no_ears'] = 'nie posiadasz akcesorii uszu', + ['no_glasses'] = 'nie posiadasz okularów', + ['no_helmet'] = 'nie posiadasz nakrycia głowy', + ['no_mask'] = 'nie posiadasz maski', + ['you_paid'] = 'płacisz ~g~%s $~s~', +} From f36be997c631532a93f96dc521f4d42c1229e1a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Wed, 13 Feb 2019 14:10:14 +0100 Subject: [PATCH 069/133] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6af3efba..fe41849e 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ start esx_accessories ### License esx_accessories - buy some shiny stuff! -Copyright (C) 2015-2018 Jérémie N'gadi +Copyright (C) 2015-2018 Lenaic Corbeau 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. From f8039eff14e5e9441eb80ec99bb9d4cc6ef8591a Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Fri, 15 Mar 2019 12:30:05 +0100 Subject: [PATCH 070/133] Updated native name --- client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index 828521f7..a10c2e4a 100644 --- a/client/main.lua +++ b/client/main.lua @@ -247,7 +247,7 @@ Citizen.CreateThread(function() end if Config.EnableControls then - if IsControlJustReleased(0, Keys['K']) and GetLastInputMethod(2) and not isDead then + if IsControlJustReleased(0, Keys['K']) and IsInputDisabled(0) and not isDead then OpenAccessoryMenu() end end From 3714e5e268f9d30532a83a4f6b0db1ec380d04ec Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Fri, 15 Mar 2019 13:12:37 +0100 Subject: [PATCH 071/133] 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 072/133] 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 77a7080e38c01274aa1fd76bc3d891759eb17659 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 8 Jun 2019 13:11:28 +0200 Subject: [PATCH 073/133] Implemented unregisterStatus and fixed restarting script midgame --- client/classes/status.lua | 2 +- client/main.lua | 20 ++++++++++++++++++-- server/main.lua | 38 +++++++++++++++++++++++++++----------- 3 files changed, 46 insertions(+), 14 deletions(-) diff --git a/client/classes/status.lua b/client/classes/status.lua index c478a98d..b71f6889 100644 --- a/client/classes/status.lua +++ b/client/classes/status.lua @@ -1,5 +1,5 @@ function CreateStatus(name, default, color, visible, tickCallback) - + local self = {} self.val = default diff --git a/client/main.lua b/client/main.lua index 3376614b..c97b61db 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,5 +1,12 @@ -local Status = {} -local isPaused = false +ESX = nil +local Status, isPaused = {}, false + +Citizen.CreateThread(function() + while ESX == nil do + TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + Citizen.Wait(0) + end +end) function GetStatusData(minimal) local status = {} @@ -31,6 +38,15 @@ AddEventHandler('esx_status:registerStatus', function(name, default, color, visi table.insert(Status, status) end) +AddEventHandler('esx_status:unregisterStatus', function(name) + for k,v in ipairs(Status) do + if v.name == name then + table.remove(Status, k) + break + end + end +end) + RegisterNetEvent('esx_status:load') AddEventHandler('esx_status:load', function(status) for i=1, #Status, 1 do diff --git a/server/main.lua b/server/main.lua index ab6b18c5..246800dc 100644 --- a/server/main.lua +++ b/server/main.lua @@ -2,28 +2,45 @@ ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) -AddEventHandler('esx:playerLoaded', function(source) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) +Citizen.CreateThread(function() + Citizen.Wait(1000) + local players = ESX.GetPlayers() - MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { + for _,playerId in ipairs(players) do + local xPlayer = ESX.GetPlayerFromId(playerId) + + MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { ['@identifier'] = xPlayer.identifier + }, function(result) + local data = {} + + if result[1].status then + data = json.decode(result[1].status) + end + + xPlayer.set('status', data) + TriggerClientEvent('esx_status:load', playerId, data) + end) + end +end) + +AddEventHandler('esx:playerLoaded', function(playerId, xPlayer) + MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { + ['@identifier'] = xPlayer.identifier }, function(result) local data = {} - if result[1].status ~= nil then + if result[1].status then data = json.decode(result[1].status) end xPlayer.set('status', data) - TriggerClientEvent('esx_status:load', _source, data) + TriggerClientEvent('esx_status:load', playerId, data) end) end) -AddEventHandler('esx:playerDropped', function(source) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) - local data = {} +AddEventHandler('esx:playerDropped', function(playerId, reason) + local xPlayer = ESX.GetPlayerFromId(playerId) local status = xPlayer.get('status') MySQL.Async.execute('UPDATE users SET status = @status WHERE identifier = @identifier', { @@ -58,7 +75,6 @@ function SaveData() for i=1, #xPlayers, 1 do local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - local data = {} local status = xPlayer.get('status') MySQL.Async.execute('UPDATE users SET status = @status WHERE identifier = @identifier', { From 134d24aea1faf448d150e5c5b3b2d3f4c2baae79 Mon Sep 17 00:00:00 2001 From: RikoDEV <18230443+RikoDEV@users.noreply.github.com> Date: Sat, 20 Jul 2019 14:32:40 +0200 Subject: [PATCH 074/133] Remove keys table --- client/main.lua | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/client/main.lua b/client/main.lua index a10c2e4a..93a982c4 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,15 +1,3 @@ -local Keys = { - ["ESC"] = 322, ["F1"] = 288, ["F2"] = 289, ["F3"] = 170, ["F5"] = 166, ["F6"] = 167, ["F7"] = 168, ["F8"] = 169, ["F9"] = 56, ["F10"] = 57, - ["~"] = 243, ["1"] = 157, ["2"] = 158, ["3"] = 160, ["4"] = 164, ["5"] = 165, ["6"] = 159, ["7"] = 161, ["8"] = 162, ["9"] = 163, ["-"] = 84, ["="] = 83, ["BACKSPACE"] = 177, - ["TAB"] = 37, ["Q"] = 44, ["W"] = 32, ["E"] = 38, ["R"] = 45, ["T"] = 245, ["Y"] = 246, ["U"] = 303, ["P"] = 199, ["["] = 39, ["]"] = 40, ["ENTER"] = 18, - ["CAPS"] = 137, ["A"] = 34, ["S"] = 8, ["D"] = 9, ["F"] = 23, ["G"] = 47, ["H"] = 74, ["K"] = 311, ["L"] = 182, - ["LEFTSHIFT"] = 21, ["Z"] = 20, ["X"] = 73, ["C"] = 26, ["V"] = 0, ["B"] = 29, ["N"] = 249, ["M"] = 244, [","] = 82, ["."] = 81, - ["LEFTCTRL"] = 36, ["LEFTALT"] = 19, ["SPACE"] = 22, ["RIGHTCTRL"] = 70, - ["HOME"] = 213, ["PAGEUP"] = 10, ["PAGEDOWN"] = 11, ["DELETE"] = 178, - ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173, - ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 -} - ESX = nil local HasAlreadyEnteredMarker = false local LastZone = nil @@ -238,7 +226,7 @@ Citizen.CreateThread(function() if CurrentAction ~= nil then ESX.ShowHelpNotification(CurrentActionMsg) - if IsControlJustReleased(0, Keys['E']) and CurrentActionData.accessory then + if IsControlJustReleased(0, 38) and CurrentActionData.accessory then OpenShopMenu(CurrentActionData.accessory) CurrentAction = nil end @@ -247,10 +235,10 @@ Citizen.CreateThread(function() end if Config.EnableControls then - if IsControlJustReleased(0, Keys['K']) and IsInputDisabled(0) and not isDead then + if IsControlJustReleased(0, 311) and IsInputDisabled(0) and not isDead then OpenAccessoryMenu() end end end -end) \ No newline at end of file +end) From ee007077a9c98d41250ac211793218036590fce9 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 3 Aug 2019 10:28:05 +0200 Subject: [PATCH 075/133] Enforced 2 space locale indent --- locales/pl.lua | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/locales/pl.lua b/locales/pl.lua index facf48aa..db81b639 100644 --- a/locales/pl.lua +++ b/locales/pl.lua @@ -1,19 +1,19 @@ Locales ['pl'] = { - ['valid_purchase'] = 'czy napewno chcesz to zakupić?', - ['yes'] = 'tak (%s $)', - ['no'] = 'nie', - ['helmet'] = 'hełm / Czapka', - ['glasses'] = 'okulary', - ['mask'] = 'maska', - ['ears'] = 'akcesoria uszu', - ['shop'] = 'sklep %s ', - ['set_unset'] = 'załóż / Zdejmij', - ['not_enough_money'] = 'nie masz wystarczająco pieniędzy', - ['press_access'] = 'wciśnij ~INPUT_CONTEXT~ aby otworzyć menu', - ['accessories_blip'] = 'akcesoria', - ['no_ears'] = 'nie posiadasz akcesorii uszu', - ['no_glasses'] = 'nie posiadasz okularów', - ['no_helmet'] = 'nie posiadasz nakrycia głowy', - ['no_mask'] = 'nie posiadasz maski', - ['you_paid'] = 'płacisz ~g~%s $~s~', + ['valid_purchase'] = 'czy napewno chcesz to zakupić?', + ['yes'] = 'tak (%s $)', + ['no'] = 'nie', + ['helmet'] = 'hełm / Czapka', + ['glasses'] = 'okulary', + ['mask'] = 'maska', + ['ears'] = 'akcesoria uszu', + ['shop'] = 'sklep %s ', + ['set_unset'] = 'załóż / Zdejmij', + ['not_enough_money'] = 'nie masz wystarczająco pieniędzy', + ['press_access'] = 'wciśnij ~INPUT_CONTEXT~ aby otworzyć menu', + ['accessories_blip'] = 'akcesoria', + ['no_ears'] = 'nie posiadasz akcesorii uszu', + ['no_glasses'] = 'nie posiadasz okularów', + ['no_helmet'] = 'nie posiadasz nakrycia głowy', + ['no_mask'] = 'nie posiadasz maski', + ['you_paid'] = 'płacisz ~g~%s $~s~', } From f51d8cb281aa158b3bc544efc036b62d453c38c3 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sat, 4 Jan 2020 15:16:16 +0100 Subject: [PATCH 076/133] 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 077/133] 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 078/133] 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 079/133] 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 080/133] 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 081/133] 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 082/133] 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 b73f9502279c04ea7840ab6da4757acf50c69915 Mon Sep 17 00:00:00 2001 From: criminalist Date: Sun, 19 Jan 2020 22:18:03 +0700 Subject: [PATCH 083/133] Added Russian translation (#23) * RU local * Add RU local * add RU local --- __resource.lua | 4 +++- locales/ru.lua | 19 +++++++++++++++++++ localization/ru_esx_accessories.sql | 8 ++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 locales/ru.lua create mode 100644 localization/ru_esx_accessories.sql diff --git a/__resource.lua b/__resource.lua index d2f35714..e5b31921 100644 --- a/__resource.lua +++ b/__resource.lua @@ -7,6 +7,7 @@ version '1.1.0' server_scripts { '@es_extended/locale.lua', 'locales/en.lua', + 'locales/ru.lua', 'locales/fi.lua', 'locales/fr.lua', 'locales/sv.lua', @@ -19,6 +20,7 @@ server_scripts { client_scripts { '@es_extended/locale.lua', 'locales/en.lua', + 'locales/ru.lua', 'locales/fi.lua', 'locales/fr.lua', 'locales/sv.lua', @@ -32,4 +34,4 @@ dependencies { 'es_extended', 'esx_skin', 'esx_datastore' -} \ No newline at end of file +} diff --git a/locales/ru.lua b/locales/ru.lua new file mode 100644 index 00000000..125bd36c --- /dev/null +++ b/locales/ru.lua @@ -0,0 +1,19 @@ +Locales ['ru'] = { + ['valid_purchase'] = 'Подтверждаете покупку', + ['yes'] = 'Да ($%s)', + ['no'] = 'Нет', + ['helmet'] = 'Шлем / Шапка', + ['glasses'] = 'Очки', + ['mask'] = 'Маска', + ['ears'] = 'Аксессуары для ушей', + ['shop'] = 'Магазин %s', + ['set_unset'] = 'Положить / Снять', + ['not_enough_money'] = 'У вас не достаточно денег', + ['press_access'] = 'Нажмите ~INPUT_CONTEXT~ для доступа к меню', + ['accessories_blip'] = 'Аксессуары', + ['no_ears'] = 'У вас нет аксессуаров для ушей', + ['no_glasses'] = 'У вас нет очков', + ['no_helmet'] = 'У вас нет шлема', + ['no_mask'] = 'У вас нет маски', + ['you_paid'] = 'Вы заплатили ~g~$%s~s~', +} diff --git a/localization/ru_esx_accessories.sql b/localization/ru_esx_accessories.sql new file mode 100644 index 00000000..cd2139f5 --- /dev/null +++ b/localization/ru_esx_accessories.sql @@ -0,0 +1,8 @@ +USE `essentialmode`; + +INSERT INTO `datastore` (name, label, shared) VALUES + ('user_ears', 'Аксессуары для ушей', 0), + ('user_glasses', 'Очки', 0), + ('user_helmet', 'Шлем', 0), + ('user_mask', 'Маски', 0) +; From 29714df92a36ea79a4e3e19db6349adf4a212b47 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sun, 19 Jan 2020 16:51:07 +0100 Subject: [PATCH 084/133] 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 e5b31921..bf837fae 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 Accessories' From e3ce8299aa17c8695e067b8c0ab0d8c2b8d8e346 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sun, 19 Jan 2020 17:09:08 +0100 Subject: [PATCH 085/133] 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 bb13bd9092e56d3261ee00fd5a9b1acd33867dc4 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sun, 19 Jan 2020 17:27:54 +0100 Subject: [PATCH 086/133] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 476ac2fc..b678dc87 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -# fxserver-esx_status -FXServer ESX Status +# esx_status +ESX Status [INSTALLATION] 1) CD in your resources/[esx] folder 2) Clone the repository ``` -git clone https://github.com/FXServer-ESX/fxserver-esx_status esx_status +git clone https://github.com/ESX-Org/esx_status esx_status ``` 3) Import esx_status.sql in your database 4) Add this in your server.cfg : From e98ad1f1a57d076cf588ed2cd66262fad28503e8 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sun, 19 Jan 2020 17:28:35 +0100 Subject: [PATCH 087/133] Replace __resource.lua with fxmanifest.lua --- __resource.lua => fxmanifest.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) rename __resource.lua => fxmanifest.lua (82%) diff --git a/__resource.lua b/fxmanifest.lua similarity index 82% rename from __resource.lua rename to fxmanifest.lua index 57b90da0..fa08f8d4 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 Status' @@ -22,4 +24,4 @@ files { 'html/ui.html', 'html/css/app.css', 'html/scripts/app.js' -} \ No newline at end of file +} From 9803279a3992bb2db9d20e7704705691a92f2600 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sun, 19 Jan 2020 17:53:08 +0100 Subject: [PATCH 088/133] Replace __resource.lua with fxmanifest.lua --- __resource.lua => fxmanifest.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename __resource.lua => fxmanifest.lua (52%) diff --git a/__resource.lua b/fxmanifest.lua similarity index 52% rename from __resource.lua rename to fxmanifest.lua index 65f46367..1797c90e 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 'cron' From ceef639a134919cc40d86eaa4235a2c6721c287a Mon Sep 17 00:00:00 2001 From: Dione Batista Date: Thu, 23 Jan 2020 11:57:12 -0300 Subject: [PATCH 089/133] 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 3e52e7ece0fbc1b9c756371f26d0138bbe89bc7c Mon Sep 17 00:00:00 2001 From: rex2630 Date: Thu, 23 Jan 2020 16:51:34 +0100 Subject: [PATCH 090/133] Create cs_esx_accessories.sql --- localization/cs_esx_accessories.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 localization/cs_esx_accessories.sql diff --git a/localization/cs_esx_accessories.sql b/localization/cs_esx_accessories.sql new file mode 100644 index 00000000..d3319986 --- /dev/null +++ b/localization/cs_esx_accessories.sql @@ -0,0 +1,8 @@ +USE `essentialmode`; + +INSERT INTO `datastore` (name, label, shared) VALUES + ('user_ears', 'Usi', 0), + ('user_glasses', 'Bryle', 0), + ('user_helmet', 'Helma', 0), + ('user_mask', 'Maska', 0) +; From e1eb0aea2c8ea020f7b67c6779cf80c0d586279d Mon Sep 17 00:00:00 2001 From: rex2630 Date: Thu, 23 Jan 2020 16:54:32 +0100 Subject: [PATCH 091/133] 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 092/133] 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 6a0e69e9a1708174f4e66566cdfc5c7098018cb2 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Wed, 26 Feb 2020 13:46:39 +0100 Subject: [PATCH 093/133] Support for newest ESX + Minor cleanup (#29) * Support for newest ESX * Minor cleanup * Moved all coords to vector3 types * Moved all coords to vector3 types --- client/main.lua | 47 ++++++++-------------- config.lua | 104 +++++++++++++++++++++++------------------------- server/main.lua | 2 +- 3 files changed, 67 insertions(+), 86 deletions(-) diff --git a/client/main.lua b/client/main.lua index 93a982c4..46759861 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,10 +1,7 @@ -ESX = nil -local HasAlreadyEnteredMarker = false -local LastZone = nil -local CurrentAction = nil -local CurrentActionMsg = '' -local CurrentActionData = {} -local isDead = false +ESX = nil +local HasAlreadyEnteredMarker, isDead = false, false +local LastZone, CurrentAction, CurrentActionMsg +local CurrentActionData = {} Citizen.CreateThread(function() while ESX == nil do @@ -14,8 +11,7 @@ Citizen.CreateThread(function() end) function OpenAccessoryMenu() - ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'set_unset_accessory', - { + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'set_unset_accessory', { title = _U('set_unset'), align = 'top-left', elements = { @@ -23,11 +19,9 @@ function OpenAccessoryMenu() {label = _U('ears'), value = 'Ears'}, {label = _U('mask'), value = 'Mask'}, {label = _U('glasses'), value = 'Glasses'} - } - }, function(data, menu) + }}, function(data, menu) menu.close() SetUnsetAccessory(data.current.value) - end, function(data, menu) menu.close() end) @@ -59,7 +53,6 @@ function SetUnsetAccessory(accessory) else ESX.ShowNotification(_U('no_' .. _accessory)) end - end, accessory) end @@ -68,20 +61,18 @@ function OpenShopMenu(accessory) local restrict = {} restrict = { _accessory .. '_1', _accessory .. '_2' } - + TriggerEvent('esx_skin:openRestrictedMenu', function(data, menu) menu.close() - ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'shop_confirm', - { + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'shop_confirm', { title = _U('valid_purchase'), align = 'top-left', elements = { {label = _U('no'), value = 'no'}, {label = _U('yes', ESX.Math.GroupDigits(Config.Price)), value = 'yes'} - } - }, function(data, menu) + }}, function(data, menu) menu.close() if data.current.value == 'yes' then ESX.TriggerServerCallback('esx_accessories:checkMoney', function(hasEnoughMoney) @@ -122,7 +113,6 @@ function OpenShopMenu(accessory) CurrentAction = 'shop_menu' CurrentActionMsg = _U('press_access') CurrentActionData = {} - end) end, function(data, menu) menu.close() @@ -156,7 +146,7 @@ Citizen.CreateThread(function() for k,v in pairs(Config.ShopsBlips) do if v.Pos ~= nil then for i=1, #v.Pos, 1 do - local blip = AddBlipForCoord(v.Pos[i].x, v.Pos[i].y, v.Pos[i].z) + local blip = AddBlipForCoord(v.Pos[i]) SetBlipSprite (blip, v.Blip.sprite) SetBlipDisplay(blip, 4) @@ -179,25 +169,24 @@ Citizen.CreateThread(function() local coords = GetEntityCoords(PlayerPedId()) for k,v in pairs(Config.Zones) do for i = 1, #v.Pos, 1 do - if(Config.Type ~= -1 and GetDistanceBetweenCoords(coords, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, true) < Config.DrawDistance) then - DrawMarker(Config.Type, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.Size.x, Config.Size.y, Config.Size.z, Config.Color.r, Config.Color.g, Config.Color.b, 100, false, true, 2, false, false, false, false) + if(Config.Type ~= -1 and GetDistanceBetweenCoords(coords, v.Pos[i], true) < Config.DrawDistance) then + DrawMarker(Config.Type, v.Pos[i], 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.Size.x, Config.Size.y, Config.Size.z, Config.Color.r, Config.Color.g, Config.Color.b, 100, false, true, 2, false, false, false, false) end end end end end) - Citizen.CreateThread(function() while true do Citizen.Wait(200) - local coords = GetEntityCoords(PlayerPedId()) - local isInMarker = false + local coords = GetEntityCoords(PlayerPedId()) + local isInMarker = false local currentZone = nil for k,v in pairs(Config.Zones) do for i = 1, #v.Pos, 1 do - if GetDistanceBetweenCoords(coords, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, true) < Config.Size.x then + if GetDistanceBetweenCoords(coords, v.Pos[i], true) < Config.Size.x then isInMarker = true currentZone = k end @@ -214,7 +203,6 @@ Citizen.CreateThread(function() HasAlreadyEnteredMarker = false TriggerEvent('esx_accessories:hasExitedMarker', LastZone) end - end end) @@ -223,14 +211,14 @@ Citizen.CreateThread(function() while true do Citizen.Wait(0) - if CurrentAction ~= nil then + if CurrentAction then ESX.ShowHelpNotification(CurrentActionMsg) if IsControlJustReleased(0, 38) and CurrentActionData.accessory then OpenShopMenu(CurrentActionData.accessory) CurrentAction = nil end - elseif CurrentAction == nil and not Config.EnableControls then + elseif CurrentAction and not Config.EnableControls then Citizen.Wait(500) end @@ -239,6 +227,5 @@ Citizen.CreateThread(function() OpenAccessoryMenu() end end - end end) diff --git a/config.lua b/config.lua index ea21f3af..3a9ecdd3 100644 --- a/config.lua +++ b/config.lua @@ -21,9 +21,9 @@ Config.ShopsBlips = { }, Mask = { Pos = { - { x = -1338.129, y = -1278.200, z = 3.872 }, + vector3(-1338.1, -1278.2, 3.8), }, - Blip = { sprite = 362, color = 2 } + Blip = {sprite = 362, color = 2} }, Helmet = { Pos = nil, @@ -38,66 +38,60 @@ Config.ShopsBlips = { Config.Zones = { Ears = { Pos = { - {x= 80.374, y= -1389.493, z= 28.406}, - {x= -709.426, y= -153.829, z= 36.535}, - {x= -163.093, y= -302.038, z= 38.853}, - {x= 420.787, y= -809.654, z= 28.611}, - {x= -817.070, y= -1075.96, z= 10.448}, - {x= -1451.300, y= -238.254, z= 48.929}, - {x= -0.756, y= 6513.685, z= 30.997}, - {x= 123.431, y= -208.060, z= 53.677}, - {x= 1687.318, y= 4827.685, z= 41.183}, - {x= 622.806, y= 2749.221, z= 41.208}, - {x= 1200.085, y= 2705.428, z= 37.342}, - {x= -1199.959, y= -782.534, z= 16.452}, - {x= -3171.867, y= 1059.632, z= 19.983}, - {x= -1095.670, y= 2709.245, z= 18.227}, - } - - }, + vector3(80.3, -1389.4, 28.4), + vector3(-163.0, -302.0, 38.8), + vector3(-163.0,-302.0, 38.8), + vector3(420.7, -809.6, 28.6), + vector3(-817.0, -1075.9, 10.4), + vector3(-1451.3, -238.2, 48.9), + vector3(-0.7, 6513.6, 30.9), + vector3(123.4, -208.0, 53.6), + vector3(1687.3, 4827.6, 41.1), + vector3(622.8, 2749.2, 41.2), + vector3(1200.0, 2705.4, 37.3), + vector3(-1199.9, -782.5, 16.4), + vector3(-3171.8, 1059.6, 19.9), + vector3(-1095.6, 2709.2, 18.2), + }}, Mask = { Pos = { - {x = -1338.129, y = -1278.200, z = 3.872}, - } - }, + vector3(-1338.1, -1278.2, 3.8), + }}, Helmet = { Pos = { - {x= 81.576, y= -1400.602, z= 28.406}, - {x= -705.845, y= -159.015, z= 36.535}, - {x= -161.349, y= -295.774, z= 38.853}, - {x= 419.319, y= -800.647, z= 28.611}, - {x= -824.362, y= -1081.741, z= 10.448}, - {x= -1454.888, y= -242.911, z= 48.931}, - {x= 4.770, y= 6520.935, z= 30.997}, - {x= 121.071, y= -223.266, z= 53.377}, - {x= 1689.648, y= 4818.805, z= 41.183}, - {x= 613.971, y= 2749.978, z= 41.208}, - {x= 1189.513, y= 2703.947, z= 37.342}, - {x= -1204.025, y= -774.439, z= 16.452}, - {x= -3164.280, y= 1054.705, z= 19.983}, - {x= -1103.125, y= 2700.599, z= 18.227}, - } - }, + vector3(81.5, -1400.6, 28.4), + vector3(-705.8, -159.0, 36.5), + vector3(-161.3, -295.7, 38.8), + vector3(419.3, -800.6, 28.6), + vector3(-824.3, -1081.7, 10.4), + vector3(-1454.8, -242.9, 48.9), + vector3(4.7, 6520.9, 30.9), + vector3(121.0, -223.2, 53.3), + vector3(1689.6, 4818.8, 41.1), + vector3(613.9, 2749.9, 41.2), + vector3(1189.5, 2703.9, 37.3), + vector3(-1204.0, -774.4, 16.4), + vector3(-3164.2, 1054.7, 19.9), + vector3(-1103.1, 2700.5, 18.2), + }}, Glasses = { Pos = { - {x= 75.287, y= -1391.131, z= 28.406}, - {x= -713.102, y= -160.116, z= 36.535}, - {x= -156.171, y= -300.547, z= 38.853}, - {x= 425.478, y= -807.866, z= 28.611}, - {x= -820.853, y= -1072.940, z= 10.448}, - {x= -1458.052, y= -236.783, z= 48.918}, - {x= 3.587, y= 6511.585, z= 30.997}, - {x= 131.335, y= -212.336, z= 53.677}, - {x= 1694.936, y= 4820.837, z= 41.183}, - {x= 613.972, y= 2768.814, z= 41.208}, - {x= 1198.678, y= 2711.011, z= 37.342}, - {x= -1188.227, y= -764.594, z= 16.452}, - {x= -3173.192, y= 1038.228, z= 19.983}, - {x= -1100.494, y= 2712.481, z= 18.227}, - } - } - + vector3(75.2, -1391.1, 28.4), + vector3(-713.1, -160.1, 36.5), + vector3(-156.1, -300.5, 38.8), + vector3(425.4, -807.8, 28.6), + vector3(-820.8, -1072.9, 10.4), + vector3(-1458.0, -236.7, 48.9), + vector3(3.5, 6511.5, 30.9), + vector3(131.3, -212.3, 53.6), + vector3(1694.9, 4820.8, 41.1), + vector3(613.9, 2768.8, 41.2), + vector3(1198.6, 2711.0, 37.3), + vector3(-1188.2, -764.5, 16.4), + vector3(-3173.1, 1038.2, 19.9), + vector3(-1100.4, 2712.4, 18.2), + }} } diff --git a/server/main.lua b/server/main.lua index 83d1d255..74446a04 100644 --- a/server/main.lua +++ b/server/main.lua @@ -43,5 +43,5 @@ end) ESX.RegisterServerCallback('esx_accessories:checkMoney', function(source, cb) local xPlayer = ESX.GetPlayerFromId(source) - cb(xPlayer.get('money') >= Config.Price) + cb(xPlayer.getMoney() >= Config.Price) end) From 1049049579c09d60c1fc34fd7c7b7ae37c0abd8e Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 14 Apr 2020 16:46:56 +0200 Subject: [PATCH 094/133] Latest ESX code --- client/main.lua | 9 ++------- esx_accessories.sql | 2 +- localization/cs_esx_accessories.sql | 2 +- localization/fi_esx_accessories.sql | 2 +- localization/ru_esx_accessories.sql | 2 +- localization/sv_esx_accessories.sql | 2 +- 6 files changed, 7 insertions(+), 12 deletions(-) diff --git a/client/main.lua b/client/main.lua index 46759861..7e8d71e9 100644 --- a/client/main.lua +++ b/client/main.lua @@ -122,13 +122,8 @@ function OpenShopMenu(accessory) end, restrict) end -AddEventHandler('playerSpawned', function() - isDead = false -end) - -AddEventHandler('esx:onPlayerDeath', function() - isDead = true -end) +AddEventHandler('esx:onPlayerSpawn', function() isDead = false end) +AddEventHandler('esx:onPlayerDeath', function() isDead = true end) AddEventHandler('esx_accessories:hasEnteredMarker', function(zone) CurrentAction = 'shop_menu' diff --git a/esx_accessories.sql b/esx_accessories.sql index d10b2e1b..01567e98 100644 --- a/esx_accessories.sql +++ b/esx_accessories.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; INSERT INTO `datastore` (name, label, shared) VALUES ('user_ears', 'Ears', 0), diff --git a/localization/cs_esx_accessories.sql b/localization/cs_esx_accessories.sql index d3319986..33d99a31 100644 --- a/localization/cs_esx_accessories.sql +++ b/localization/cs_esx_accessories.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; INSERT INTO `datastore` (name, label, shared) VALUES ('user_ears', 'Usi', 0), diff --git a/localization/fi_esx_accessories.sql b/localization/fi_esx_accessories.sql index 81defba5..6a145374 100644 --- a/localization/fi_esx_accessories.sql +++ b/localization/fi_esx_accessories.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; INSERT INTO `datastore` (name, label, shared) VALUES ('user_ears', 'Örontilbb', 0), diff --git a/localization/ru_esx_accessories.sql b/localization/ru_esx_accessories.sql index cd2139f5..106d4ff1 100644 --- a/localization/ru_esx_accessories.sql +++ b/localization/ru_esx_accessories.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; INSERT INTO `datastore` (name, label, shared) VALUES ('user_ears', 'Аксессуары для ушей', 0), diff --git a/localization/sv_esx_accessories.sql b/localization/sv_esx_accessories.sql index b947b632..245e0028 100644 --- a/localization/sv_esx_accessories.sql +++ b/localization/sv_esx_accessories.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; INSERT INTO `datastore` (name, label, shared) VALUES ('user_ears', 'Örontillbehör', 0), From 94031d40a0b66dcbe75b64a3aeb957337323defd Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 14 Apr 2020 16:48:30 +0200 Subject: [PATCH 095/133] 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 59c51e6daf425fa76a7922c8cbc65586af821463 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 14 Apr 2020 16:53:17 +0200 Subject: [PATCH 096/133] Update esx_status.sql --- esx_status.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esx_status.sql b/esx_status.sql index b62fd8dd..beabf83d 100644 --- a/esx_status.sql +++ b/esx_status.sql @@ -1,3 +1,3 @@ -USE `essentialmode`; +USE `es_extended`; ALTER TABLE `users` ADD COLUMN `status` LONGTEXT NULL; From 6e072d6f83c01bbff3af73c5dfafa0a4cfa5fdf9 Mon Sep 17 00:00:00 2001 From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com> Date: Fri, 15 May 2020 17:21:49 -0500 Subject: [PATCH 097/133] Update esx_status Edited to not show UI until loading screen is off --- client/main.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/main.lua b/client/main.lua index c97b61db..f903674e 100644 --- a/client/main.lua +++ b/client/main.lua @@ -156,8 +156,8 @@ Citizen.CreateThread(function() end end) --- Loaded event -Citizen.CreateThread(function() +-- Loading screen off event +AddEventHandler('esx:loadingScreenOff', function() TriggerEvent('esx_status:loaded') end) 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 098/133] 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 ecebbc74e560569dae88ff7d0f140c3e3a5ac3df Mon Sep 17 00:00:00 2001 From: Jougito - Kheros Date: Fri, 17 Jul 2020 18:36:00 +0200 Subject: [PATCH 099/133] Create es_esx_accessories.sql --- localization/es_esx_accessories.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 localization/es_esx_accessories.sql diff --git a/localization/es_esx_accessories.sql b/localization/es_esx_accessories.sql new file mode 100644 index 00000000..0df9535f --- /dev/null +++ b/localization/es_esx_accessories.sql @@ -0,0 +1,8 @@ +USE `es_extended`; + +INSERT INTO `datastore` (name, label, shared) VALUES + ('user_ears', 'Accesorio de oreja', 0), + ('user_glasses', 'Gafas', 0), + ('user_helmet', 'Casco', 0), + ('user_mask', 'Máscara', 0) +; From ef3a1990fd0bd32f2cdab8c68556608e6d0cef40 Mon Sep 17 00:00:00 2001 From: Jougito - Kheros Date: Fri, 17 Jul 2020 18:43:08 +0200 Subject: [PATCH 100/133] Spanish translation implemented --- fxmanifest.lua | 48 +++++++++++++++++++++++++----------------------- locales/es.lua | 19 +++++++++++++++++++ 2 files changed, 44 insertions(+), 23 deletions(-) create mode 100644 locales/es.lua diff --git a/fxmanifest.lua b/fxmanifest.lua index bf837fae..bdd4121b 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -7,33 +7,35 @@ description 'ESX Accessories' version '1.1.0' server_scripts { - '@es_extended/locale.lua', - 'locales/en.lua', - 'locales/ru.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/sv.lua', - 'locales/cs.lua', - 'locales/pl.lua', - 'config.lua', - 'server/main.lua' + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/es.lua', + 'locales/ru.lua', + 'locales/fi.lua', + 'locales/fr.lua', + 'locales/sv.lua', + 'locales/cs.lua', + 'locales/pl.lua', + 'config.lua', + 'server/main.lua' } client_scripts { - '@es_extended/locale.lua', - 'locales/en.lua', - 'locales/ru.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/sv.lua', - 'locales/cs.lua', - 'locales/pl.lua', - 'config.lua', - 'client/main.lua' + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/es.lua', + 'locales/ru.lua', + 'locales/fi.lua', + 'locales/fr.lua', + 'locales/sv.lua', + 'locales/cs.lua', + 'locales/pl.lua', + 'config.lua', + 'client/main.lua' } dependencies { - 'es_extended', - 'esx_skin', - 'esx_datastore' + 'es_extended', + 'esx_skin', + 'esx_datastore' } diff --git a/locales/es.lua b/locales/es.lua new file mode 100644 index 00000000..510a485e --- /dev/null +++ b/locales/es.lua @@ -0,0 +1,19 @@ +Locales ['es'] = { + ['valid_purchase'] = '¿Validar la compra?', + ['yes'] = 'Si (%s$)', + ['no'] = 'No', + ['helmet'] = 'Casco / Gorra', + ['glasses'] = 'Gafas', + ['mask'] = 'Máscara', + ['ears'] = 'Accesorio de oreja', + ['shop'] = 'Tienda %s', + ['set_unset'] = 'Ponerse / Quitarse', + ['not_enough_money'] = '~r~No tienes~s~ suficiente dinero', + ['press_access'] = 'Pulsa ~INPUT_CONTEXT~ para acceder al menú', + ['accessories_blip'] = 'Accesorios', + ['no_ears'] = 'No tienes ningún accesorio de oreja', + ['no_glasses'] = 'No tienes ningunas gafas', + ['no_helmet'] = 'No tienes ningún casco', + ['no_mask'] = 'No tienes ninguna máscara', + ['you_paid'] = 'Pagaste ~g~%s$~s~', +} From 4bd2b1b5ca7f971472e0f78f4437c9b64dd633d5 Mon Sep 17 00:00:00 2001 From: Jougito - Kheros Date: Sun, 19 Jul 2020 12:54:38 +0200 Subject: [PATCH 101/133] 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 89914888d7dd801fb8430aeb386fd423e0f86f46 Mon Sep 17 00:00:00 2001 From: Yagiz ALP Date: Mon, 20 Jul 2020 17:21:46 +0300 Subject: [PATCH 102/133] Code cleanup (#2) --- server/main.lua | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/server/main.lua b/server/main.lua index 2896732e..6dc7f8ed 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,25 +1,21 @@ -local Jobs = {} +local Jobs = {} local LastTime = nil function RunAt(h, m, cb) - table.insert(Jobs, { h = h, m = m, cb = cb }) - end function GetTime() - local timestamp = os.time() - local d = os.date('*t', timestamp).wday - local h = tonumber(os.date('%H', timestamp)) - local m = tonumber(os.date('%M', timestamp)) + local d = os.date('*t', timestamp).wday + local h = tonumber(os.date('%H', timestamp)) + local m = tonumber(os.date('%M', timestamp)) return {d = d, h = h, m = m} - end function OnTime(d, h, m) @@ -29,11 +25,9 @@ function OnTime(d, h, m) Jobs[i].cb(d, h, m) end end - end function Tick() - local time = GetTime() if time.h ~= LastTime.h or time.m ~= LastTime.m then From a101f4d3ddac77941a246319c9115e386e5f0a21 Mon Sep 17 00:00:00 2001 From: PainedPsyche Date: Wed, 4 Nov 2020 20:03:50 +0100 Subject: [PATCH 103/133] fix for a bug where satus values were not properly loading database data client side resulting in the values resetting to default on login --- client/main.lua | 5 ++++- html/css/app.css | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/client/main.lua b/client/main.lua index f903674e..178073de 100644 --- a/client/main.lua +++ b/client/main.lua @@ -49,6 +49,7 @@ end) RegisterNetEvent('esx_status:load') AddEventHandler('esx_status:load', function(status) + TriggerEvent('esx_status:loaded') for i=1, #Status, 1 do for j=1, #status, 1 do if Status[i].name == status[j].name then @@ -158,7 +159,9 @@ end) -- Loading screen off event AddEventHandler('esx:loadingScreenOff', function() - TriggerEvent('esx_status:loaded') + if not isPaused then + TriggerEvent('esx_status:setDisplay', 0.3) + end end) -- Update server diff --git a/html/css/app.css b/html/css/app.css index d92580fa..8b2aacf5 100644 --- a/html/css/app.css +++ b/html/css/app.css @@ -3,7 +3,7 @@ left : 23; bottom : 21%; width : 14.5%; - opacity: 0.3; + opacity: 0.0; } .status { 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 104/133] 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 105/133] 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 59bb6e93e34340cb8c3991bd1f06b833fd8ad506 Mon Sep 17 00:00:00 2001 From: HypeLevels <61633775+HypeLevels@users.noreply.github.com> Date: Tue, 1 Dec 2020 21:40:00 +0000 Subject: [PATCH 106/133] Update config.lua Changed default language to english as its the universal language --- config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.lua b/config.lua index 3a9ecdd3..1a65f153 100644 --- a/config.lua +++ b/config.lua @@ -1,6 +1,6 @@ Config = {} -Config.Locale = 'fr' +Config.Locale = 'en' Config.Price = 100 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 107/133] 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 108/133] 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 925bd4559e2b318cb83bb05102ffad6fdeadd4fb Mon Sep 17 00:00:00 2001 From: Stephen York Date: Mon, 4 Jan 2021 12:53:56 +1100 Subject: [PATCH 109/133] Update main.lua Replace recursive call to saveData with CreateThread and a timer. Loop now builds when and where clauses for a set operation update against multiple records with a single mysql execute rather than a single update PER player. --- server/main.lua | 45 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/server/main.lua b/server/main.lua index 246800dc..c1252f0f 100644 --- a/server/main.lua +++ b/server/main.lua @@ -70,20 +70,51 @@ AddEventHandler('esx_status:update', function(status) end end) +Citizen.CreateThread(function() + while(true) do + Citizen.Wait(10 * 60 * 1000) + + SaveData() + + end + +end) + function SaveData() local xPlayers = ESX.GetPlayers() + -- Example of a bulk update statement that we are building below + --[[ + UPDATE users + SET status = (case when identifier = 'license:123' then '{hunger:45, thirst:23}' + when identifier = 'license:456' then '{hunger:1000, thirst:1000}' + when identifier = 'license:789' then '{hunger:1000, thirst:1000}' + end) + WHERE identifier in ('license:123', 'license:456', 'license:789') + + ]] + local updateStatement = 'UPDATE users SET status = (case %s end) where identifier in (%s)' + local whenList = '' + local whereList = '' + local firstItem = true + for i=1, #xPlayers, 1 do local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) local status = xPlayer.get('status') - MySQL.Async.execute('UPDATE users SET status = @status WHERE identifier = @identifier', { - ['@status'] = json.encode(status), - ['@identifier'] = xPlayer.identifier - }) + whenList = whenList .. string.format('when identifier = \'%s\' then \'%s\' ', xPlayer.identifier, json.encode(status)) + + if firstItem == false then + whereList = whereList .. ', ' + end + whereList = whereList .. string.format('\'%s\'', xPlayer.identifier) + + firstItem = false + end - SetTimeout(10 * 60 * 1000, SaveData) -end + local sql = string.format(updateStatement, whenList, whereList) -SaveData() + MySQL.Async.execute(sql) + +end From a12046120c2c3101bfa67a4e5df74e00f920e435 Mon Sep 17 00:00:00 2001 From: Stephen York Date: Thu, 7 Jan 2021 10:29:05 +1100 Subject: [PATCH 110/133] Update main.lua Added player count to avoid running script when no players are on --- server/main.lua | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/server/main.lua b/server/main.lua index c1252f0f..469fd5dd 100644 --- a/server/main.lua +++ b/server/main.lua @@ -97,6 +97,7 @@ function SaveData() local whenList = '' local whereList = '' local firstItem = true + local playerCount = 0 for i=1, #xPlayers, 1 do local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) @@ -110,11 +111,14 @@ function SaveData() whereList = whereList .. string.format('\'%s\'', xPlayer.identifier) firstItem = false + playerCount = playerCount + 1 + end + + if playerCount > 0 then + local sql = string.format(updateStatement, whenList, whereList) + + MySQL.Async.execute(sql) end - local sql = string.format(updateStatement, whenList, whereList) - - MySQL.Async.execute(sql) - end From 49f1668b0a231bdda0a4b5ddfadb6830220e28a5 Mon Sep 17 00:00:00 2001 From: Tinky <48660658+Tinky124@users.noreply.github.com> Date: Sat, 23 Jan 2021 21:19:32 +0100 Subject: [PATCH 111/133] Fix server hitch warning --- server/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/main.lua b/server/main.lua index 469fd5dd..fd1c5b94 100644 --- a/server/main.lua +++ b/server/main.lua @@ -3,7 +3,7 @@ ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) Citizen.CreateThread(function() - Citizen.Wait(1000) + Citizen.Wait(5000) local players = ESX.GetPlayers() for _,playerId in ipairs(players) do From ea844e81da2daab0dfb974206009181f81d3a5ac Mon Sep 17 00:00:00 2001 From: Tinky <48660658+Tinky124@users.noreply.github.com> Date: Sun, 24 Jan 2021 21:17:01 +0100 Subject: [PATCH 112/133] Better just to remove this... Too many hitch --- server/main.lua | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/server/main.lua b/server/main.lua index fd1c5b94..138b0c57 100644 --- a/server/main.lua +++ b/server/main.lua @@ -2,28 +2,6 @@ ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) -Citizen.CreateThread(function() - Citizen.Wait(5000) - local players = ESX.GetPlayers() - - for _,playerId in ipairs(players) do - local xPlayer = ESX.GetPlayerFromId(playerId) - - MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { - ['@identifier'] = xPlayer.identifier - }, function(result) - local data = {} - - if result[1].status then - data = json.decode(result[1].status) - end - - xPlayer.set('status', data) - TriggerClientEvent('esx_status:load', playerId, data) - end) - end -end) - AddEventHandler('esx:playerLoaded', function(playerId, xPlayer) MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { ['@identifier'] = xPlayer.identifier From 74335672ea232d47b7fc48412ce14205516c55f2 Mon Sep 17 00:00:00 2001 From: Tinky <48660658+Tinky124@users.noreply.github.com> Date: Tue, 2 Feb 2021 19:28:48 -0100 Subject: [PATCH 113/133] Fixed losing functionality when restarting script --- server/main.lua | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/server/main.lua b/server/main.lua index 138b0c57..57b5b6f4 100644 --- a/server/main.lua +++ b/server/main.lua @@ -2,6 +2,31 @@ ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) +AddEventHandler('onResourceStart', function(resourceName) + if (GetCurrentResourceName() ~= resourceName) then + return + end + + local players = ESX.GetPlayers() + + for _,playerId in ipairs(players) do + local xPlayer = ESX.GetPlayerFromId(playerId) + + MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { + ['@identifier'] = xPlayer.identifier + }, function(result) + local data = {} + + if result[1].status then + data = json.decode(result[1].status) + end + + xPlayer.set('status', data) + TriggerClientEvent('esx_status:load', playerId, data) + end) + end +end) + AddEventHandler('esx:playerLoaded', function(playerId, xPlayer) MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { ['@identifier'] = xPlayer.identifier From f9b73b8c3179fa6b13e3feea44bed2bb5780592d Mon Sep 17 00:00:00 2001 From: FuraXx <33160388+FuraXx@users.noreply.github.com> Date: Sun, 16 May 2021 13:53:20 +0200 Subject: [PATCH 114/133] 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..25883c09 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# esx-legacy +Consolidated esx-legacy files into one repo for easy download since we will not support it From ae9cde16e8c34acf9f563089d8417ba4bcccb476 Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Fri, 28 May 2021 09:55:32 +1000 Subject: [PATCH 115/133] improvement(server/main): Use the new xPlayer loop when using ESX Legacy --- server/main.lua | 47 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/server/main.lua b/server/main.lua index 57b5b6f4..55223566 100644 --- a/server/main.lua +++ b/server/main.lua @@ -84,7 +84,17 @@ Citizen.CreateThread(function() end) function SaveData() - local xPlayers = ESX.GetPlayers() + + local xPlayers + if ESX.GetExtendedPlayers then + xPlayers = ESX.GetExtendedPlayers() -- Retrieve all xPlayer data directly (ESX Legacy) + else + xPlayers = ESX.GetPlayers() -- Retrieves player ids and gets xPlayer data one-by-one (ESX 1.2 support) + end + + for i=1, 100 do + xPlayers[#xPlayers+1] = xPlayers[1] + end -- Example of a bulk update statement that we are building below --[[ @@ -102,24 +112,39 @@ function SaveData() local firstItem = true local playerCount = 0 - for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - local status = xPlayer.get('status') + if ESX.GetExtendedPlayers then -- Retrieve all xPlayer data directly (ESX Legacy) + for k,v in pairs(xPlayers) do + local status = v.get('status') - whenList = whenList .. string.format('when identifier = \'%s\' then \'%s\' ', xPlayer.identifier, json.encode(status)) + whenList = whenList .. string.format('when identifier = \'%s\' then \'%s\' ', v.identifier, json.encode(status)) - if firstItem == false then - whereList = whereList .. ', ' + if firstItem == false then + whereList = whereList .. ', ' + end + whereList = whereList .. string.format('\'%s\'', v.identifier) + + firstItem = false + playerCount = playerCount + 1 end - whereList = whereList .. string.format('\'%s\'', xPlayer.identifier) + else + for i=1, #xPlayers, 1 do + local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) + local status = xPlayer.get('status') - firstItem = false - playerCount = playerCount + 1 + whenList = whenList .. string.format('when identifier = \'%s\' then \'%s\' ', xPlayer.identifier, json.encode(status)) + + if firstItem == false then + whereList = whereList .. ', ' + end + whereList = whereList .. string.format('\'%s\'', xPlayer.identifier) + + firstItem = false + playerCount = playerCount + 1 + end end if playerCount > 0 then local sql = string.format(updateStatement, whenList, whereList) - MySQL.Async.execute(sql) end From b823e7d5578a7028adab44c848b773387887fd7c Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Fri, 28 May 2021 09:58:24 +1000 Subject: [PATCH 116/133] fix(legacy/multichar): Clear player status when logging out --- client/main.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/client/main.lua b/client/main.lua index 178073de..0f6fa6ce 100644 --- a/client/main.lua +++ b/client/main.lua @@ -47,6 +47,11 @@ AddEventHandler('esx_status:unregisterStatus', function(name) end end) +RegisterNetEvent('esx:onPlayerLogout') +AddEventHandler('esx:onPlayerLogout', function() + Status = {} +end) + RegisterNetEvent('esx_status:load') AddEventHandler('esx_status:load', function(status) TriggerEvent('esx_status:loaded') From d876399babdaaa21fcdc12f19d7d8e0ff59da097 Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Fri, 28 May 2021 10:08:26 +1000 Subject: [PATCH 117/133] chore(server/main): Removed leftover debug code --- server/main.lua | 4 ---- 1 file changed, 4 deletions(-) diff --git a/server/main.lua b/server/main.lua index 55223566..85f15982 100644 --- a/server/main.lua +++ b/server/main.lua @@ -92,10 +92,6 @@ function SaveData() xPlayers = ESX.GetPlayers() -- Retrieves player ids and gets xPlayer data one-by-one (ESX 1.2 support) end - for i=1, 100 do - xPlayers[#xPlayers+1] = xPlayers[1] - end - -- Example of a bulk update statement that we are building below --[[ UPDATE users From ee3d1d024f64d54ee7a8500a97752fe12609b9dd Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Fri, 28 May 2021 10:29:02 +1000 Subject: [PATCH 118/133] improvement(server/main): Use the new xPlayer loop when restarting the resource --- server/main.lua | 54 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/server/main.lua b/server/main.lua index 85f15982..ceba0e04 100644 --- a/server/main.lua +++ b/server/main.lua @@ -7,23 +7,45 @@ AddEventHandler('onResourceStart', function(resourceName) return end - local players = ESX.GetPlayers() + local xPlayers + if ESX.GetExtendedPlayers then + xPlayers = ESX.GetExtendedPlayers() -- Retrieve all xPlayer data directly (ESX Legacy) + else + xPlayers = ESX.GetPlayers() -- Retrieves player ids and gets xPlayer data one-by-one (ESX 1.2 support) + end - for _,playerId in ipairs(players) do - local xPlayer = ESX.GetPlayerFromId(playerId) - - MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { - ['@identifier'] = xPlayer.identifier - }, function(result) - local data = {} - - if result[1].status then - data = json.decode(result[1].status) - end - - xPlayer.set('status', data) - TriggerClientEvent('esx_status:load', playerId, data) - end) + if ESX.GetExtendedPlayers then + for k,v in pairs(xPlayers) do + MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { + ['@identifier'] = v.identifier + }, function(result) + local data = {} + + if result[1].status then + data = json.decode(result[1].status) + end + + v.set('status', data) + TriggerClientEvent('esx_status:load', k, data) + end) + end + else + for _,playerId in ipairs(xPlayers) do + local xPlayer = ESX.GetPlayerFromId(playerId) + + MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { + ['@identifier'] = xPlayer.identifier + }, function(result) + local data = {} + + if result[1].status then + data = json.decode(result[1].status) + end + + xPlayer.set('status', data) + TriggerClientEvent('esx_status:load', playerId, data) + end) + end end end) From 0cc776dfc3d88fab9650001ba9b1ac24f1216c1d Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Thu, 3 Jun 2021 07:12:09 +1000 Subject: [PATCH 119/133] refactor(server/main): Removed duplicate code and use type when defining xPlayer --- server/main.lua | 93 +++++++++++++++---------------------------------- 1 file changed, 29 insertions(+), 64 deletions(-) diff --git a/server/main.lua b/server/main.lua index ceba0e04..7334224b 100644 --- a/server/main.lua +++ b/server/main.lua @@ -13,39 +13,21 @@ AddEventHandler('onResourceStart', function(resourceName) else xPlayers = ESX.GetPlayers() -- Retrieves player ids and gets xPlayer data one-by-one (ESX 1.2 support) end - - if ESX.GetExtendedPlayers then - for k,v in pairs(xPlayers) do - MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { - ['@identifier'] = v.identifier - }, function(result) - local data = {} - - if result[1].status then - data = json.decode(result[1].status) - end - - v.set('status', data) - TriggerClientEvent('esx_status:load', k, data) - end) - end - else - for _,playerId in ipairs(xPlayers) do - local xPlayer = ESX.GetPlayerFromId(playerId) - MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { - ['@identifier'] = xPlayer.identifier - }, function(result) - local data = {} + for k,v in pairs(xPlayers) do + local xPlayer = type(v) ~= 'table' and v or ESX.GetPlayerFromId(k) + MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { + ['@identifier'] = xPlayer.identifier + }, function(result) + local data = {} + + if result[1].status then + data = json.decode(result[1].status) + end - if result[1].status then - data = json.decode(result[1].status) - end - - xPlayer.set('status', data) - TriggerClientEvent('esx_status:load', playerId, data) - end) - end + xPlayer.set('status', data) + TriggerClientEvent('esx_status:load', k, data) + end) end end) @@ -106,14 +88,6 @@ Citizen.CreateThread(function() end) function SaveData() - - local xPlayers - if ESX.GetExtendedPlayers then - xPlayers = ESX.GetExtendedPlayers() -- Retrieve all xPlayer data directly (ESX Legacy) - else - xPlayers = ESX.GetPlayers() -- Retrieves player ids and gets xPlayer data one-by-one (ESX 1.2 support) - end - -- Example of a bulk update statement that we are building below --[[ UPDATE users @@ -130,35 +104,26 @@ function SaveData() local firstItem = true local playerCount = 0 - if ESX.GetExtendedPlayers then -- Retrieve all xPlayer data directly (ESX Legacy) - for k,v in pairs(xPlayers) do - local status = v.get('status') - - whenList = whenList .. string.format('when identifier = \'%s\' then \'%s\' ', v.identifier, json.encode(status)) - - if firstItem == false then - whereList = whereList .. ', ' - end - whereList = whereList .. string.format('\'%s\'', v.identifier) - - firstItem = false - playerCount = playerCount + 1 - end + local xPlayers + if ESX.GetExtendedPlayers then + xPlayers = ESX.GetExtendedPlayers() -- Retrieve all xPlayer data directly (ESX Legacy) else - for i=1, #xPlayers, 1 do - local xPlayer = ESX.GetPlayerFromId(xPlayers[i]) - local status = xPlayer.get('status') + xPlayers = ESX.GetPlayers() -- Retrieves player ids and gets xPlayer data one-by-one (ESX 1.2 support) + end + + for k,v in pairs(xPlayers) do + local xPlayer = type(v) ~= 'table' and v or ESX.GetPlayerFromId(k) + local status = xPlayer.get('status') - whenList = whenList .. string.format('when identifier = \'%s\' then \'%s\' ', xPlayer.identifier, json.encode(status)) + whenList = whenList .. string.format('when identifier = \'%s\' then \'%s\' ', xPlayer.identifier, json.encode(status)) - if firstItem == false then - whereList = whereList .. ', ' - end - whereList = whereList .. string.format('\'%s\'', xPlayer.identifier) - - firstItem = false - playerCount = playerCount + 1 + if firstItem == false then + whereList = whereList .. ', ' end + whereList = whereList .. string.format('\'%s\'', xPlayer.identifier) + + firstItem = false + playerCount = playerCount + 1 end if playerCount > 0 then From 97289e615b5f693382ab4d66f1b32826a39df76d Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Fri, 4 Jun 2021 11:41:57 +1000 Subject: [PATCH 120/133] fix(client/main): Prevent multiple onTick threads from running at once after relogging --- client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index 0f6fa6ce..86c54175 100644 --- a/client/main.lua +++ b/client/main.lua @@ -64,7 +64,7 @@ AddEventHandler('esx_status:load', function(status) end Citizen.CreateThread(function() - while true do + while #Status > 0 do for i=1, #Status, 1 do Status[i].onTick() end From 5a8e750287304323f6fc61dde6dc1ab719e48321 Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Fri, 4 Jun 2021 11:45:22 +1000 Subject: [PATCH 121/133] fix(client/main): Disable status bars after relogging --- client/main.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client/main.lua b/client/main.lua index 86c54175..ad629ff4 100644 --- a/client/main.lua +++ b/client/main.lua @@ -50,6 +50,10 @@ end) RegisterNetEvent('esx:onPlayerLogout') AddEventHandler('esx:onPlayerLogout', function() Status = {} + SendNUIMessage({ + update = true, + status = Status + }) end) RegisterNetEvent('esx_status:load') From 98687c3b380cb7a492e3ec194c595ec5abc1f173 Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Fri, 4 Jun 2021 12:59:15 +1000 Subject: [PATCH 122/133] fix(nui/js): Use the percent value already being sent by Lua --- html/scripts/app.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/scripts/app.js b/html/scripts/app.js index 8e01f20c..a5a53575 100644 --- a/html/scripts/app.js +++ b/html/scripts/app.js @@ -25,7 +25,7 @@ statusDiv.find('.status_val') .css({ 'background-color': status[i].color, - 'width': (status[i].val / 10000) + '%' + 'width': (status[i].percent) + '%' }) ; @@ -56,4 +56,4 @@ }); }; -})(); \ No newline at end of file +})(); From 20b2319e977e195242555a5d5ddd14524e1823d0 Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Fri, 4 Jun 2021 13:14:56 +1000 Subject: [PATCH 123/133] refactor(client/main): Remove unused variable; optimisations - Status.max was never defined anywhere (always nil) and was not referenced anywhere - Add a toggle for status bars (Config.Display); setting to false reduces CPU usage - onTick thread no longer retrieves StatusData twice; receives the minimal data then adds the other variables if Display is enabled --- client/main.lua | 95 +++++++++++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 42 deletions(-) diff --git a/client/main.lua b/client/main.lua index ad629ff4..0d233df4 100644 --- a/client/main.lua +++ b/client/main.lua @@ -13,20 +13,19 @@ function GetStatusData(minimal) for i=1, #Status, 1 do if minimal then - table.insert(status, { + status[#status+1] = { name = Status[i].name, val = Status[i].val, percent = (Status[i].val / Config.StatusMax) * 100 - }) + } else - table.insert(status, { + status[#status+1] { name = Status[i].name, val = Status[i].val, color = Status[i].color, - visible = Status[i].visible(Status[i]), - max = Status[i].max, + visible = Status[i].visible(), percent = (Status[i].val / Config.StatusMax) * 100 - }) + } end end @@ -50,10 +49,12 @@ end) RegisterNetEvent('esx:onPlayerLogout') AddEventHandler('esx:onPlayerLogout', function() Status = {} - SendNUIMessage({ - update = true, - status = Status - }) + if Config.Display then + SendNUIMessage({ + update = true, + status = Status + }) + end end) RegisterNetEvent('esx_status:load') @@ -72,13 +73,21 @@ AddEventHandler('esx_status:load', function(status) for i=1, #Status, 1 do Status[i].onTick() end + local data = GetStatusData(true) + + if Config.Display then + local fullData = data + for i=1, #data, 1 do + fullData[i].color = Status[i].color + fullData[i].visible = Status[i].visible() + end + SendNUIMessage({ + update = true, + status = fullData + }) + end - SendNUIMessage({ - update = true, - status = GetStatusData() - }) - - TriggerEvent('esx_status:onTick', GetStatusData(true)) + TriggerEvent('esx_status:onTick', data) Citizen.Wait(Config.TickTime) end end) @@ -92,12 +101,12 @@ AddEventHandler('esx_status:set', function(name, val) break end end - - SendNUIMessage({ - update = true, - status = GetStatusData() - }) - + if Config.Display then + SendNUIMessage({ + update = true, + status = GetStatusData() + }) + end TriggerServerEvent('esx_status:update', GetStatusData(true)) end) @@ -109,12 +118,12 @@ AddEventHandler('esx_status:add', function(name, val) break end end - - SendNUIMessage({ - update = true, - status = GetStatusData() - }) - + if Config.Display then + SendNUIMessage({ + update = true, + status = GetStatusData() + }) + end TriggerServerEvent('esx_status:update', GetStatusData(true)) end) @@ -126,12 +135,12 @@ AddEventHandler('esx_status:remove', function(name, val) break end end - - SendNUIMessage({ - update = true, - status = GetStatusData() - }) - + if Config.Display then + SendNUIMessage({ + update = true, + status = GetStatusData() + }) + end TriggerServerEvent('esx_status:update', GetStatusData(true)) end) @@ -154,15 +163,17 @@ end) -- Pause menu disable hud display Citizen.CreateThread(function() while true do - Citizen.Wait(300) + if Config.Display then + Citizen.Wait(300) - if IsPauseMenuActive() and not isPaused then - isPaused = true - TriggerEvent('esx_status:setDisplay', 0.0) - elseif not IsPauseMenuActive() and isPaused then - isPaused = false - TriggerEvent('esx_status:setDisplay', 0.5) - end + if IsPauseMenuActive() and not isPaused then + isPaused = true + TriggerEvent('esx_status:setDisplay', 0.0) + elseif not IsPauseMenuActive() and isPaused then + isPaused = false + TriggerEvent('esx_status:setDisplay', 0.5) + end + else Citizen.Wait(1000) end end end) From 16d97ec1e3fc87175af21e150e83c8b067abc52c Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Fri, 4 Jun 2021 13:15:44 +1000 Subject: [PATCH 124/133] chore(config): Define the default value for Display --- config.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.lua b/config.lua index 3b444340..9eb09cb2 100644 --- a/config.lua +++ b/config.lua @@ -2,4 +2,5 @@ Config = {} Config.StatusMax = 1000000 Config.TickTime = 1000 -Config.UpdateInterval = 10000 \ No newline at end of file +Config.UpdateInterval = 10000 +Config.Display = true -- Enable the esx_status bars (disable if you are using another HUD) From 16b1fc3316277dff341202d3efa1ccbe63f1ec1d Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Sat, 5 Jun 2021 12:35:16 +1000 Subject: [PATCH 125/133] refactor(server/main): Cache if ESX.GetExtendedPlayers() exists; use short-circuit evaluation to define xPlayers --- server/main.lua | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/server/main.lua b/server/main.lua index 7334224b..1b02b173 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,18 +1,14 @@ ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) +local isLegacy = not not ESX.GetExtendedPlayers AddEventHandler('onResourceStart', function(resourceName) if (GetCurrentResourceName() ~= resourceName) then return end - local xPlayers - if ESX.GetExtendedPlayers then - xPlayers = ESX.GetExtendedPlayers() -- Retrieve all xPlayer data directly (ESX Legacy) - else - xPlayers = ESX.GetPlayers() -- Retrieves player ids and gets xPlayer data one-by-one (ESX 1.2 support) - end + local xPlayers = isLegacy and ESX.GetExtendedPlayers() or ESX.GetPlayers() for k,v in pairs(xPlayers) do local xPlayer = type(v) ~= 'table' and v or ESX.GetPlayerFromId(k) @@ -104,12 +100,7 @@ function SaveData() local firstItem = true local playerCount = 0 - local xPlayers - if ESX.GetExtendedPlayers then - xPlayers = ESX.GetExtendedPlayers() -- Retrieve all xPlayer data directly (ESX Legacy) - else - xPlayers = ESX.GetPlayers() -- Retrieves player ids and gets xPlayer data one-by-one (ESX 1.2 support) - end + local xPlayers = isLegacy and ESX.GetExtendedPlayers() or ESX.GetPlayers() for k,v in pairs(xPlayers) do local xPlayer = type(v) ~= 'table' and v or ESX.GetPlayerFromId(k) From b3c20e174bcd0f120508d4ff15ecca8b1737749b Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Sun, 6 Jun 2021 05:57:46 +1000 Subject: [PATCH 126/133] fix(server/main): Fix incorrect values (if v is table, xPlayer equals v; else GetPlayerFromId(v)) --- server/main.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/main.lua b/server/main.lua index 1b02b173..0d80cc83 100644 --- a/server/main.lua +++ b/server/main.lua @@ -11,7 +11,7 @@ AddEventHandler('onResourceStart', function(resourceName) local xPlayers = isLegacy and ESX.GetExtendedPlayers() or ESX.GetPlayers() for k,v in pairs(xPlayers) do - local xPlayer = type(v) ~= 'table' and v or ESX.GetPlayerFromId(k) + local xPlayer = type(v) == 'table' and v or ESX.GetPlayerFromId(v) MySQL.Async.fetchAll('SELECT status FROM users WHERE identifier = @identifier', { ['@identifier'] = xPlayer.identifier }, function(result) @@ -103,7 +103,7 @@ function SaveData() local xPlayers = isLegacy and ESX.GetExtendedPlayers() or ESX.GetPlayers() for k,v in pairs(xPlayers) do - local xPlayer = type(v) ~= 'table' and v or ESX.GetPlayerFromId(k) + local xPlayer = type(v) == 'table' and v or ESX.GetPlayerFromId(v) local status = xPlayer.get('status') whenList = whenList .. string.format('when identifier = \'%s\' then \'%s\' ', xPlayer.identifier, json.encode(status)) From 97d7e5186b3c883db88b89bedbf4285c2e4303f3 Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Mon, 7 Jun 2021 08:07:10 +1000 Subject: [PATCH 127/133] fix(client/main): Ensure the hud displays initially; get the visibility of statusbars correctly --- client/main.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/client/main.lua b/client/main.lua index 0d233df4..afe7498e 100644 --- a/client/main.lua +++ b/client/main.lua @@ -23,7 +23,7 @@ function GetStatusData(minimal) name = Status[i].name, val = Status[i].val, color = Status[i].color, - visible = Status[i].visible(), + visible = Status[i].visible(Status[i]), percent = (Status[i].val / Config.StatusMax) * 100 } end @@ -68,6 +68,8 @@ AddEventHandler('esx_status:load', function(status) end end + if Config.Display then TriggerEvent('esx_status:setDisplay', 0.5) end + Citizen.CreateThread(function() while #Status > 0 do for i=1, #Status, 1 do @@ -79,7 +81,7 @@ AddEventHandler('esx_status:load', function(status) local fullData = data for i=1, #data, 1 do fullData[i].color = Status[i].color - fullData[i].visible = Status[i].visible() + fullData[i].visible = Status[i].visible(Status[i]) end SendNUIMessage({ update = true, From acb264c0270d69f50fdb5c3648dad52e5fe2ad0c Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Mon, 7 Jun 2021 11:14:54 +1000 Subject: [PATCH 128/133] revert(client/main): Go back to table.insert for GetStatusData Not even sure why I did it as size+1 and not i; but doesn't seem to work with index anyway. Fixes nil value after dying --- client/main.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/main.lua b/client/main.lua index afe7498e..b6776f64 100644 --- a/client/main.lua +++ b/client/main.lua @@ -13,19 +13,19 @@ function GetStatusData(minimal) for i=1, #Status, 1 do if minimal then - status[#status+1] = { + table.insert(status, { name = Status[i].name, val = Status[i].val, percent = (Status[i].val / Config.StatusMax) * 100 - } + }) else - status[#status+1] { + table.insert(status, { name = Status[i].name, val = Status[i].val, color = Status[i].color, visible = Status[i].visible(Status[i]), percent = (Status[i].val / Config.StatusMax) * 100 - } + }) end end 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 129/133] 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 130/133] 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 From 4aa9525fcf0b6f8105076f5667453dfca200bb7c Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Mon, 14 Jun 2021 17:49:00 +1000 Subject: [PATCH 131/133] fix(client/main): Remove update triggerserverevent when modifying statuses (it only needed to trigger with the interval) --- client/main.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/client/main.lua b/client/main.lua index b6776f64..d9beefd7 100644 --- a/client/main.lua +++ b/client/main.lua @@ -109,7 +109,6 @@ AddEventHandler('esx_status:set', function(name, val) status = GetStatusData() }) end - TriggerServerEvent('esx_status:update', GetStatusData(true)) end) RegisterNetEvent('esx_status:add') @@ -126,7 +125,6 @@ AddEventHandler('esx_status:add', function(name, val) status = GetStatusData() }) end - TriggerServerEvent('esx_status:update', GetStatusData(true)) end) RegisterNetEvent('esx_status:remove') @@ -143,7 +141,6 @@ AddEventHandler('esx_status:remove', function(name, val) status = GetStatusData() }) end - TriggerServerEvent('esx_status:update', GetStatusData(true)) end) AddEventHandler('esx_status:getStatus', function(name, cb) From b656ed6a437dbd4e6b83876df2b7ad8b2d55e458 Mon Sep 17 00:00:00 2001 From: Linden Date: Fri, 25 Jun 2021 04:00:05 +1000 Subject: [PATCH 132/133] Setup repository --- [esx_core]/async | 1 + [esx_core]/cron | 1 + [esx_core]/esx_identity | 1 + [esx_core]/esx_menu_default | 1 + [esx_core]/esx_menu_dialog | 1 + [esx_core]/esx_menu_list | 1 + [esx_core]/esx_skin | 1 + [esx_core]/skinchanger | 1 + [esx_resources]/[activities]/esx_drugs | 1 + [esx_resources]/[activities]/esx_holdup | 1 + [esx_resources]/[activities]/esx_jobs | 1 + [esx_resources]/[data]/esx_addonaccount | 1 + [esx_resources]/[data]/esx_addoninventory | 1 + [esx_resources]/[data]/esx_datastore | 1 + [esx_resources]/[other]/esx_animations | 1 + [esx_resources]/[other]/esx_atm | 1 + [esx_resources]/[other]/esx_cruisecontrol | 1 + [esx_resources]/[other]/esx_dmvschool | 1 + [esx_resources]/[other]/esx_garage | 1 + [esx_resources]/[other]/esx_phone | 1 + [esx_resources]/[other]/esx_property | 1 + [esx_resources]/[other]/esx_rpchat | 1 + [esx_resources]/[other]/esx_sit | 1 + [esx_resources]/[other]/esx_voice | 1 + [esx_resources]/[other]/esx_whitelist | 1 + [esx_resources]/[other]/instance | 1 + [esx_resources]/[shops]/esx_boat | 1 + [esx_resources]/[shops]/esx_lscustom | 1 + [esx_resources]/[shops]/esx_shops | 1 + [esx_resources]/[shops]/esx_vehicleshop | 1 + [esx_resources]/[shops]/esx_weaponshop | 1 + [esx_resources]/[society]/esx_ambulancejob | 1 + [esx_resources]/[society]/esx_bankerjob | 1 + [esx_resources]/[society]/esx_billing | 1 + [esx_resources]/[society]/esx_joblisting | 1 + [esx_resources]/[society]/esx_mechanicjob | 1 + [esx_resources]/[society]/esx_policejob | 1 + [esx_resources]/[society]/esx_realestateagentjob | 1 + [esx_resources]/[society]/esx_service | 1 + [esx_resources]/[society]/esx_society | 1 + [esx_resources]/[society]/esx_taxijob | 1 + [esx_resources]/[user]/esx_accessories | 1 + [esx_resources]/[user]/esx_barbershop | 1 + [esx_resources]/[user]/esx_basicneeds | 1 + [esx_resources]/[user]/esx_clotheshop | 1 + [esx_resources]/[user]/esx_license | 1 + [esx_resources]/[user]/esx_optionalneeds | 1 + [esx_resources]/[user]/esx_status | 1 + [esx_resources]/examples/esx_boilerplate | 1 + [esx_resources]/examples/esx_legacy_boilerplate | 1 + es_extended | 1 + 51 files changed, 51 insertions(+) create mode 160000 [esx_core]/async create mode 160000 [esx_core]/cron create mode 160000 [esx_core]/esx_identity create mode 160000 [esx_core]/esx_menu_default create mode 160000 [esx_core]/esx_menu_dialog create mode 160000 [esx_core]/esx_menu_list create mode 160000 [esx_core]/esx_skin create mode 160000 [esx_core]/skinchanger create mode 160000 [esx_resources]/[activities]/esx_drugs create mode 160000 [esx_resources]/[activities]/esx_holdup create mode 160000 [esx_resources]/[activities]/esx_jobs create mode 160000 [esx_resources]/[data]/esx_addonaccount create mode 160000 [esx_resources]/[data]/esx_addoninventory create mode 160000 [esx_resources]/[data]/esx_datastore create mode 160000 [esx_resources]/[other]/esx_animations create mode 160000 [esx_resources]/[other]/esx_atm create mode 160000 [esx_resources]/[other]/esx_cruisecontrol create mode 160000 [esx_resources]/[other]/esx_dmvschool create mode 160000 [esx_resources]/[other]/esx_garage create mode 160000 [esx_resources]/[other]/esx_phone create mode 160000 [esx_resources]/[other]/esx_property create mode 160000 [esx_resources]/[other]/esx_rpchat create mode 160000 [esx_resources]/[other]/esx_sit create mode 160000 [esx_resources]/[other]/esx_voice create mode 160000 [esx_resources]/[other]/esx_whitelist create mode 160000 [esx_resources]/[other]/instance create mode 160000 [esx_resources]/[shops]/esx_boat create mode 160000 [esx_resources]/[shops]/esx_lscustom create mode 160000 [esx_resources]/[shops]/esx_shops create mode 160000 [esx_resources]/[shops]/esx_vehicleshop create mode 160000 [esx_resources]/[shops]/esx_weaponshop create mode 160000 [esx_resources]/[society]/esx_ambulancejob create mode 160000 [esx_resources]/[society]/esx_bankerjob create mode 160000 [esx_resources]/[society]/esx_billing create mode 160000 [esx_resources]/[society]/esx_joblisting create mode 160000 [esx_resources]/[society]/esx_mechanicjob create mode 160000 [esx_resources]/[society]/esx_policejob create mode 160000 [esx_resources]/[society]/esx_realestateagentjob create mode 160000 [esx_resources]/[society]/esx_service create mode 160000 [esx_resources]/[society]/esx_society create mode 160000 [esx_resources]/[society]/esx_taxijob create mode 160000 [esx_resources]/[user]/esx_accessories create mode 160000 [esx_resources]/[user]/esx_barbershop create mode 160000 [esx_resources]/[user]/esx_basicneeds create mode 160000 [esx_resources]/[user]/esx_clotheshop create mode 160000 [esx_resources]/[user]/esx_license create mode 160000 [esx_resources]/[user]/esx_optionalneeds create mode 160000 [esx_resources]/[user]/esx_status create mode 160000 [esx_resources]/examples/esx_boilerplate create mode 160000 [esx_resources]/examples/esx_legacy_boilerplate create mode 160000 es_extended diff --git a/[esx_core]/async b/[esx_core]/async new file mode 160000 index 00000000..e7b778f0 --- /dev/null +++ b/[esx_core]/async @@ -0,0 +1 @@ +Subproject commit e7b778f0c7236132596e98d8ebd33e1127dbb4c4 diff --git a/[esx_core]/cron b/[esx_core]/cron new file mode 160000 index 00000000..89914888 --- /dev/null +++ b/[esx_core]/cron @@ -0,0 +1 @@ +Subproject commit 89914888d7dd801fb8430aeb386fd423e0f86f46 diff --git a/[esx_core]/esx_identity b/[esx_core]/esx_identity new file mode 160000 index 00000000..a8c109a7 --- /dev/null +++ b/[esx_core]/esx_identity @@ -0,0 +1 @@ +Subproject commit a8c109a7e984886f32b933f070f1842a1da27d13 diff --git a/[esx_core]/esx_menu_default b/[esx_core]/esx_menu_default new file mode 160000 index 00000000..c402e75d --- /dev/null +++ b/[esx_core]/esx_menu_default @@ -0,0 +1 @@ +Subproject commit c402e75d896737673fc662d2c2511a0888094f18 diff --git a/[esx_core]/esx_menu_dialog b/[esx_core]/esx_menu_dialog new file mode 160000 index 00000000..c0221029 --- /dev/null +++ b/[esx_core]/esx_menu_dialog @@ -0,0 +1 @@ +Subproject commit c022102901cc8057c5d7f93937a97604a97849ce diff --git a/[esx_core]/esx_menu_list b/[esx_core]/esx_menu_list new file mode 160000 index 00000000..c4c88a9a --- /dev/null +++ b/[esx_core]/esx_menu_list @@ -0,0 +1 @@ +Subproject commit c4c88a9afd475074213d2586d09ac091c389c369 diff --git a/[esx_core]/esx_skin b/[esx_core]/esx_skin new file mode 160000 index 00000000..3a812086 --- /dev/null +++ b/[esx_core]/esx_skin @@ -0,0 +1 @@ +Subproject commit 3a8120863229860057a65bb431f94491cc32f87c diff --git a/[esx_core]/skinchanger b/[esx_core]/skinchanger new file mode 160000 index 00000000..d716177f --- /dev/null +++ b/[esx_core]/skinchanger @@ -0,0 +1 @@ +Subproject commit d716177f226ad696d903a27d7afa3ca97ce80a3b diff --git a/[esx_resources]/[activities]/esx_drugs b/[esx_resources]/[activities]/esx_drugs new file mode 160000 index 00000000..5d80d30d --- /dev/null +++ b/[esx_resources]/[activities]/esx_drugs @@ -0,0 +1 @@ +Subproject commit 5d80d30de3d62122c1a8144fe0fc8635da14e6b0 diff --git a/[esx_resources]/[activities]/esx_holdup b/[esx_resources]/[activities]/esx_holdup new file mode 160000 index 00000000..ee9c916e --- /dev/null +++ b/[esx_resources]/[activities]/esx_holdup @@ -0,0 +1 @@ +Subproject commit ee9c916ebf955abefa3bfdbd20a773122b865a22 diff --git a/[esx_resources]/[activities]/esx_jobs b/[esx_resources]/[activities]/esx_jobs new file mode 160000 index 00000000..7c03e61b --- /dev/null +++ b/[esx_resources]/[activities]/esx_jobs @@ -0,0 +1 @@ +Subproject commit 7c03e61b935ea80295a4388f6a45c9e51abd1b59 diff --git a/[esx_resources]/[data]/esx_addonaccount b/[esx_resources]/[data]/esx_addonaccount new file mode 160000 index 00000000..3573919b --- /dev/null +++ b/[esx_resources]/[data]/esx_addonaccount @@ -0,0 +1 @@ +Subproject commit 3573919be24068283a3103a08414f64398381513 diff --git a/[esx_resources]/[data]/esx_addoninventory b/[esx_resources]/[data]/esx_addoninventory new file mode 160000 index 00000000..5709570b --- /dev/null +++ b/[esx_resources]/[data]/esx_addoninventory @@ -0,0 +1 @@ +Subproject commit 5709570bc2cda27e08159536e3a6c9d1a3734915 diff --git a/[esx_resources]/[data]/esx_datastore b/[esx_resources]/[data]/esx_datastore new file mode 160000 index 00000000..dfe0321b --- /dev/null +++ b/[esx_resources]/[data]/esx_datastore @@ -0,0 +1 @@ +Subproject commit dfe0321bdd7ba35b6ec3316529c220b827816997 diff --git a/[esx_resources]/[other]/esx_animations b/[esx_resources]/[other]/esx_animations new file mode 160000 index 00000000..ed5d8118 --- /dev/null +++ b/[esx_resources]/[other]/esx_animations @@ -0,0 +1 @@ +Subproject commit ed5d8118dd4363debb9a8b8de758a14b75f5448c diff --git a/[esx_resources]/[other]/esx_atm b/[esx_resources]/[other]/esx_atm new file mode 160000 index 00000000..e2d7eead --- /dev/null +++ b/[esx_resources]/[other]/esx_atm @@ -0,0 +1 @@ +Subproject commit e2d7eead18284052e5732856bf93a4b439764c61 diff --git a/[esx_resources]/[other]/esx_cruisecontrol b/[esx_resources]/[other]/esx_cruisecontrol new file mode 160000 index 00000000..11f11ade --- /dev/null +++ b/[esx_resources]/[other]/esx_cruisecontrol @@ -0,0 +1 @@ +Subproject commit 11f11adeb7c138e789e6ba0cd9499db9d5d578c8 diff --git a/[esx_resources]/[other]/esx_dmvschool b/[esx_resources]/[other]/esx_dmvschool new file mode 160000 index 00000000..1b362bd7 --- /dev/null +++ b/[esx_resources]/[other]/esx_dmvschool @@ -0,0 +1 @@ +Subproject commit 1b362bd7c1fe1aa5336c5f038f41f95541494c5d diff --git a/[esx_resources]/[other]/esx_garage b/[esx_resources]/[other]/esx_garage new file mode 160000 index 00000000..6ae703b1 --- /dev/null +++ b/[esx_resources]/[other]/esx_garage @@ -0,0 +1 @@ +Subproject commit 6ae703b18965452d148541c061f830469c8a8bd9 diff --git a/[esx_resources]/[other]/esx_phone b/[esx_resources]/[other]/esx_phone new file mode 160000 index 00000000..204cfb59 --- /dev/null +++ b/[esx_resources]/[other]/esx_phone @@ -0,0 +1 @@ +Subproject commit 204cfb59d92514d864a6ff473af0ca3523c45264 diff --git a/[esx_resources]/[other]/esx_property b/[esx_resources]/[other]/esx_property new file mode 160000 index 00000000..1475b201 --- /dev/null +++ b/[esx_resources]/[other]/esx_property @@ -0,0 +1 @@ +Subproject commit 1475b201c01ff0cf9c4433e84da9444a10249312 diff --git a/[esx_resources]/[other]/esx_rpchat b/[esx_resources]/[other]/esx_rpchat new file mode 160000 index 00000000..f0b11d80 --- /dev/null +++ b/[esx_resources]/[other]/esx_rpchat @@ -0,0 +1 @@ +Subproject commit f0b11d808d76eb8021f299a522f3b3fa7dc2591c diff --git a/[esx_resources]/[other]/esx_sit b/[esx_resources]/[other]/esx_sit new file mode 160000 index 00000000..8655d7a9 --- /dev/null +++ b/[esx_resources]/[other]/esx_sit @@ -0,0 +1 @@ +Subproject commit 8655d7a98529536e730f27ff633c833c47d76596 diff --git a/[esx_resources]/[other]/esx_voice b/[esx_resources]/[other]/esx_voice new file mode 160000 index 00000000..2f9bcc8d --- /dev/null +++ b/[esx_resources]/[other]/esx_voice @@ -0,0 +1 @@ +Subproject commit 2f9bcc8d4d706563a17f00e98f33c3cf22506562 diff --git a/[esx_resources]/[other]/esx_whitelist b/[esx_resources]/[other]/esx_whitelist new file mode 160000 index 00000000..789ecd76 --- /dev/null +++ b/[esx_resources]/[other]/esx_whitelist @@ -0,0 +1 @@ +Subproject commit 789ecd76604974ca3694a7ef77559b5520e1e59c diff --git a/[esx_resources]/[other]/instance b/[esx_resources]/[other]/instance new file mode 160000 index 00000000..21cea1fe --- /dev/null +++ b/[esx_resources]/[other]/instance @@ -0,0 +1 @@ +Subproject commit 21cea1fee9f666ac3a30b9b03d6f8b5f21afb57d diff --git a/[esx_resources]/[shops]/esx_boat b/[esx_resources]/[shops]/esx_boat new file mode 160000 index 00000000..1d1670e5 --- /dev/null +++ b/[esx_resources]/[shops]/esx_boat @@ -0,0 +1 @@ +Subproject commit 1d1670e5d90f9f8d30dd43141830300c276e3b49 diff --git a/[esx_resources]/[shops]/esx_lscustom b/[esx_resources]/[shops]/esx_lscustom new file mode 160000 index 00000000..b6f2f129 --- /dev/null +++ b/[esx_resources]/[shops]/esx_lscustom @@ -0,0 +1 @@ +Subproject commit b6f2f129ababf6ac3709145c814f52453d6b7ffa diff --git a/[esx_resources]/[shops]/esx_shops b/[esx_resources]/[shops]/esx_shops new file mode 160000 index 00000000..13d9e99a --- /dev/null +++ b/[esx_resources]/[shops]/esx_shops @@ -0,0 +1 @@ +Subproject commit 13d9e99af71ba9a49949a2d9ba330406cea6bc95 diff --git a/[esx_resources]/[shops]/esx_vehicleshop b/[esx_resources]/[shops]/esx_vehicleshop new file mode 160000 index 00000000..3f512e77 --- /dev/null +++ b/[esx_resources]/[shops]/esx_vehicleshop @@ -0,0 +1 @@ +Subproject commit 3f512e774c8bb9874d381ce7ba058c39b0eaae28 diff --git a/[esx_resources]/[shops]/esx_weaponshop b/[esx_resources]/[shops]/esx_weaponshop new file mode 160000 index 00000000..b42afd53 --- /dev/null +++ b/[esx_resources]/[shops]/esx_weaponshop @@ -0,0 +1 @@ +Subproject commit b42afd53e3f9876c357962a9d79d86dc6919fde0 diff --git a/[esx_resources]/[society]/esx_ambulancejob b/[esx_resources]/[society]/esx_ambulancejob new file mode 160000 index 00000000..ba096109 --- /dev/null +++ b/[esx_resources]/[society]/esx_ambulancejob @@ -0,0 +1 @@ +Subproject commit ba0961095c8a31f1d993c2c13f913dbb37bf52bf diff --git a/[esx_resources]/[society]/esx_bankerjob b/[esx_resources]/[society]/esx_bankerjob new file mode 160000 index 00000000..20673f5b --- /dev/null +++ b/[esx_resources]/[society]/esx_bankerjob @@ -0,0 +1 @@ +Subproject commit 20673f5b14807fdd80e80d945cc5b0624fd452da diff --git a/[esx_resources]/[society]/esx_billing b/[esx_resources]/[society]/esx_billing new file mode 160000 index 00000000..18df7933 --- /dev/null +++ b/[esx_resources]/[society]/esx_billing @@ -0,0 +1 @@ +Subproject commit 18df79337a5d35b945fa1ecfa2794e6bee3407aa diff --git a/[esx_resources]/[society]/esx_joblisting b/[esx_resources]/[society]/esx_joblisting new file mode 160000 index 00000000..bbce9722 --- /dev/null +++ b/[esx_resources]/[society]/esx_joblisting @@ -0,0 +1 @@ +Subproject commit bbce9722a24269e667d00cc26b7c6408f29cdfb7 diff --git a/[esx_resources]/[society]/esx_mechanicjob b/[esx_resources]/[society]/esx_mechanicjob new file mode 160000 index 00000000..d0e414fc --- /dev/null +++ b/[esx_resources]/[society]/esx_mechanicjob @@ -0,0 +1 @@ +Subproject commit d0e414fc96d3a07a68cafd57aaff954baa28bf99 diff --git a/[esx_resources]/[society]/esx_policejob b/[esx_resources]/[society]/esx_policejob new file mode 160000 index 00000000..22cdd4ef --- /dev/null +++ b/[esx_resources]/[society]/esx_policejob @@ -0,0 +1 @@ +Subproject commit 22cdd4ef2d7808ae8109d1e9f65a336300f2cad2 diff --git a/[esx_resources]/[society]/esx_realestateagentjob b/[esx_resources]/[society]/esx_realestateagentjob new file mode 160000 index 00000000..83613371 --- /dev/null +++ b/[esx_resources]/[society]/esx_realestateagentjob @@ -0,0 +1 @@ +Subproject commit 83613371ea2fbdf1cd7d07c5e31215cbf0fe160d diff --git a/[esx_resources]/[society]/esx_service b/[esx_resources]/[society]/esx_service new file mode 160000 index 00000000..0c85c4e4 --- /dev/null +++ b/[esx_resources]/[society]/esx_service @@ -0,0 +1 @@ +Subproject commit 0c85c4e4b212015fbf97a4707ad59aa55904768d diff --git a/[esx_resources]/[society]/esx_society b/[esx_resources]/[society]/esx_society new file mode 160000 index 00000000..3dccb4b2 --- /dev/null +++ b/[esx_resources]/[society]/esx_society @@ -0,0 +1 @@ +Subproject commit 3dccb4b24ffcd2bb4bde4af102056ac918c4f847 diff --git a/[esx_resources]/[society]/esx_taxijob b/[esx_resources]/[society]/esx_taxijob new file mode 160000 index 00000000..0f69bfce --- /dev/null +++ b/[esx_resources]/[society]/esx_taxijob @@ -0,0 +1 @@ +Subproject commit 0f69bfce0a8f587abcfc7e9567fffd3fa53e663c diff --git a/[esx_resources]/[user]/esx_accessories b/[esx_resources]/[user]/esx_accessories new file mode 160000 index 00000000..e812dde6 --- /dev/null +++ b/[esx_resources]/[user]/esx_accessories @@ -0,0 +1 @@ +Subproject commit e812dde63bcb746e9b49bad704a9c9174d6329fa diff --git a/[esx_resources]/[user]/esx_barbershop b/[esx_resources]/[user]/esx_barbershop new file mode 160000 index 00000000..25103f72 --- /dev/null +++ b/[esx_resources]/[user]/esx_barbershop @@ -0,0 +1 @@ +Subproject commit 25103f725db46a22ff8e12925290f2b71e9137cc diff --git a/[esx_resources]/[user]/esx_basicneeds b/[esx_resources]/[user]/esx_basicneeds new file mode 160000 index 00000000..f034e2b9 --- /dev/null +++ b/[esx_resources]/[user]/esx_basicneeds @@ -0,0 +1 @@ +Subproject commit f034e2b95f0a8cbeba989ce52da59d99c2365412 diff --git a/[esx_resources]/[user]/esx_clotheshop b/[esx_resources]/[user]/esx_clotheshop new file mode 160000 index 00000000..04183ae7 --- /dev/null +++ b/[esx_resources]/[user]/esx_clotheshop @@ -0,0 +1 @@ +Subproject commit 04183ae7c0a9c1505b37a13bb4e2bbd195862511 diff --git a/[esx_resources]/[user]/esx_license b/[esx_resources]/[user]/esx_license new file mode 160000 index 00000000..4a791b81 --- /dev/null +++ b/[esx_resources]/[user]/esx_license @@ -0,0 +1 @@ +Subproject commit 4a791b81827f17f7e31aeac1fb15f3c9c9ec6764 diff --git a/[esx_resources]/[user]/esx_optionalneeds b/[esx_resources]/[user]/esx_optionalneeds new file mode 160000 index 00000000..a8041956 --- /dev/null +++ b/[esx_resources]/[user]/esx_optionalneeds @@ -0,0 +1 @@ +Subproject commit a8041956307766027f1d36d0fd43ba03c0318ba0 diff --git a/[esx_resources]/[user]/esx_status b/[esx_resources]/[user]/esx_status new file mode 160000 index 00000000..92a9779f --- /dev/null +++ b/[esx_resources]/[user]/esx_status @@ -0,0 +1 @@ +Subproject commit 92a9779f93c855bfb197184411e4877676a3ae7f diff --git a/[esx_resources]/examples/esx_boilerplate b/[esx_resources]/examples/esx_boilerplate new file mode 160000 index 00000000..0b35d90e --- /dev/null +++ b/[esx_resources]/examples/esx_boilerplate @@ -0,0 +1 @@ +Subproject commit 0b35d90e3e655256b4f140c36e2853da68ad3a19 diff --git a/[esx_resources]/examples/esx_legacy_boilerplate b/[esx_resources]/examples/esx_legacy_boilerplate new file mode 160000 index 00000000..64ca21be --- /dev/null +++ b/[esx_resources]/examples/esx_legacy_boilerplate @@ -0,0 +1 @@ +Subproject commit 64ca21becf8b4f42a3431a62bcd6a743d125bbbd diff --git a/es_extended b/es_extended new file mode 160000 index 00000000..53ce92ec --- /dev/null +++ b/es_extended @@ -0,0 +1 @@ +Subproject commit 53ce92ec1dad38425b3ae9e87385252bb876bd4d From 5878f71a0e6d6e4764d555b2ba56474e2f722ad9 Mon Sep 17 00:00:00 2001 From: Linden Date: Fri, 25 Jun 2021 04:00:05 +1000 Subject: [PATCH 133/133] Revert "Setup repository" This reverts commit b656ed6a437dbd4e6b83876df2b7ad8b2d55e458. --- [esx_core]/async | 1 - [esx_core]/cron | 1 - [esx_core]/esx_identity | 1 - [esx_core]/esx_menu_default | 1 - [esx_core]/esx_menu_dialog | 1 - [esx_core]/esx_menu_list | 1 - [esx_core]/esx_skin | 1 - [esx_core]/skinchanger | 1 - [esx_resources]/[activities]/esx_drugs | 1 - [esx_resources]/[activities]/esx_holdup | 1 - [esx_resources]/[activities]/esx_jobs | 1 - [esx_resources]/[data]/esx_addonaccount | 1 - [esx_resources]/[data]/esx_addoninventory | 1 - [esx_resources]/[data]/esx_datastore | 1 - [esx_resources]/[other]/esx_animations | 1 - [esx_resources]/[other]/esx_atm | 1 - [esx_resources]/[other]/esx_cruisecontrol | 1 - [esx_resources]/[other]/esx_dmvschool | 1 - [esx_resources]/[other]/esx_garage | 1 - [esx_resources]/[other]/esx_phone | 1 - [esx_resources]/[other]/esx_property | 1 - [esx_resources]/[other]/esx_rpchat | 1 - [esx_resources]/[other]/esx_sit | 1 - [esx_resources]/[other]/esx_voice | 1 - [esx_resources]/[other]/esx_whitelist | 1 - [esx_resources]/[other]/instance | 1 - [esx_resources]/[shops]/esx_boat | 1 - [esx_resources]/[shops]/esx_lscustom | 1 - [esx_resources]/[shops]/esx_shops | 1 - [esx_resources]/[shops]/esx_vehicleshop | 1 - [esx_resources]/[shops]/esx_weaponshop | 1 - [esx_resources]/[society]/esx_ambulancejob | 1 - [esx_resources]/[society]/esx_bankerjob | 1 - [esx_resources]/[society]/esx_billing | 1 - [esx_resources]/[society]/esx_joblisting | 1 - [esx_resources]/[society]/esx_mechanicjob | 1 - [esx_resources]/[society]/esx_policejob | 1 - [esx_resources]/[society]/esx_realestateagentjob | 1 - [esx_resources]/[society]/esx_service | 1 - [esx_resources]/[society]/esx_society | 1 - [esx_resources]/[society]/esx_taxijob | 1 - [esx_resources]/[user]/esx_accessories | 1 - [esx_resources]/[user]/esx_barbershop | 1 - [esx_resources]/[user]/esx_basicneeds | 1 - [esx_resources]/[user]/esx_clotheshop | 1 - [esx_resources]/[user]/esx_license | 1 - [esx_resources]/[user]/esx_optionalneeds | 1 - [esx_resources]/[user]/esx_status | 1 - [esx_resources]/examples/esx_boilerplate | 1 - [esx_resources]/examples/esx_legacy_boilerplate | 1 - es_extended | 1 - 51 files changed, 51 deletions(-) delete mode 160000 [esx_core]/async delete mode 160000 [esx_core]/cron delete mode 160000 [esx_core]/esx_identity delete mode 160000 [esx_core]/esx_menu_default delete mode 160000 [esx_core]/esx_menu_dialog delete mode 160000 [esx_core]/esx_menu_list delete mode 160000 [esx_core]/esx_skin delete mode 160000 [esx_core]/skinchanger delete mode 160000 [esx_resources]/[activities]/esx_drugs delete mode 160000 [esx_resources]/[activities]/esx_holdup delete mode 160000 [esx_resources]/[activities]/esx_jobs delete mode 160000 [esx_resources]/[data]/esx_addonaccount delete mode 160000 [esx_resources]/[data]/esx_addoninventory delete mode 160000 [esx_resources]/[data]/esx_datastore delete mode 160000 [esx_resources]/[other]/esx_animations delete mode 160000 [esx_resources]/[other]/esx_atm delete mode 160000 [esx_resources]/[other]/esx_cruisecontrol delete mode 160000 [esx_resources]/[other]/esx_dmvschool delete mode 160000 [esx_resources]/[other]/esx_garage delete mode 160000 [esx_resources]/[other]/esx_phone delete mode 160000 [esx_resources]/[other]/esx_property delete mode 160000 [esx_resources]/[other]/esx_rpchat delete mode 160000 [esx_resources]/[other]/esx_sit delete mode 160000 [esx_resources]/[other]/esx_voice delete mode 160000 [esx_resources]/[other]/esx_whitelist delete mode 160000 [esx_resources]/[other]/instance delete mode 160000 [esx_resources]/[shops]/esx_boat delete mode 160000 [esx_resources]/[shops]/esx_lscustom delete mode 160000 [esx_resources]/[shops]/esx_shops delete mode 160000 [esx_resources]/[shops]/esx_vehicleshop delete mode 160000 [esx_resources]/[shops]/esx_weaponshop delete mode 160000 [esx_resources]/[society]/esx_ambulancejob delete mode 160000 [esx_resources]/[society]/esx_bankerjob delete mode 160000 [esx_resources]/[society]/esx_billing delete mode 160000 [esx_resources]/[society]/esx_joblisting delete mode 160000 [esx_resources]/[society]/esx_mechanicjob delete mode 160000 [esx_resources]/[society]/esx_policejob delete mode 160000 [esx_resources]/[society]/esx_realestateagentjob delete mode 160000 [esx_resources]/[society]/esx_service delete mode 160000 [esx_resources]/[society]/esx_society delete mode 160000 [esx_resources]/[society]/esx_taxijob delete mode 160000 [esx_resources]/[user]/esx_accessories delete mode 160000 [esx_resources]/[user]/esx_barbershop delete mode 160000 [esx_resources]/[user]/esx_basicneeds delete mode 160000 [esx_resources]/[user]/esx_clotheshop delete mode 160000 [esx_resources]/[user]/esx_license delete mode 160000 [esx_resources]/[user]/esx_optionalneeds delete mode 160000 [esx_resources]/[user]/esx_status delete mode 160000 [esx_resources]/examples/esx_boilerplate delete mode 160000 [esx_resources]/examples/esx_legacy_boilerplate delete mode 160000 es_extended diff --git a/[esx_core]/async b/[esx_core]/async deleted file mode 160000 index e7b778f0..00000000 --- a/[esx_core]/async +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e7b778f0c7236132596e98d8ebd33e1127dbb4c4 diff --git a/[esx_core]/cron b/[esx_core]/cron deleted file mode 160000 index 89914888..00000000 --- a/[esx_core]/cron +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 89914888d7dd801fb8430aeb386fd423e0f86f46 diff --git a/[esx_core]/esx_identity b/[esx_core]/esx_identity deleted file mode 160000 index a8c109a7..00000000 --- a/[esx_core]/esx_identity +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a8c109a7e984886f32b933f070f1842a1da27d13 diff --git a/[esx_core]/esx_menu_default b/[esx_core]/esx_menu_default deleted file mode 160000 index c402e75d..00000000 --- a/[esx_core]/esx_menu_default +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c402e75d896737673fc662d2c2511a0888094f18 diff --git a/[esx_core]/esx_menu_dialog b/[esx_core]/esx_menu_dialog deleted file mode 160000 index c0221029..00000000 --- a/[esx_core]/esx_menu_dialog +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c022102901cc8057c5d7f93937a97604a97849ce diff --git a/[esx_core]/esx_menu_list b/[esx_core]/esx_menu_list deleted file mode 160000 index c4c88a9a..00000000 --- a/[esx_core]/esx_menu_list +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c4c88a9afd475074213d2586d09ac091c389c369 diff --git a/[esx_core]/esx_skin b/[esx_core]/esx_skin deleted file mode 160000 index 3a812086..00000000 --- a/[esx_core]/esx_skin +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3a8120863229860057a65bb431f94491cc32f87c diff --git a/[esx_core]/skinchanger b/[esx_core]/skinchanger deleted file mode 160000 index d716177f..00000000 --- a/[esx_core]/skinchanger +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d716177f226ad696d903a27d7afa3ca97ce80a3b diff --git a/[esx_resources]/[activities]/esx_drugs b/[esx_resources]/[activities]/esx_drugs deleted file mode 160000 index 5d80d30d..00000000 --- a/[esx_resources]/[activities]/esx_drugs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5d80d30de3d62122c1a8144fe0fc8635da14e6b0 diff --git a/[esx_resources]/[activities]/esx_holdup b/[esx_resources]/[activities]/esx_holdup deleted file mode 160000 index ee9c916e..00000000 --- a/[esx_resources]/[activities]/esx_holdup +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ee9c916ebf955abefa3bfdbd20a773122b865a22 diff --git a/[esx_resources]/[activities]/esx_jobs b/[esx_resources]/[activities]/esx_jobs deleted file mode 160000 index 7c03e61b..00000000 --- a/[esx_resources]/[activities]/esx_jobs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7c03e61b935ea80295a4388f6a45c9e51abd1b59 diff --git a/[esx_resources]/[data]/esx_addonaccount b/[esx_resources]/[data]/esx_addonaccount deleted file mode 160000 index 3573919b..00000000 --- a/[esx_resources]/[data]/esx_addonaccount +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3573919be24068283a3103a08414f64398381513 diff --git a/[esx_resources]/[data]/esx_addoninventory b/[esx_resources]/[data]/esx_addoninventory deleted file mode 160000 index 5709570b..00000000 --- a/[esx_resources]/[data]/esx_addoninventory +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5709570bc2cda27e08159536e3a6c9d1a3734915 diff --git a/[esx_resources]/[data]/esx_datastore b/[esx_resources]/[data]/esx_datastore deleted file mode 160000 index dfe0321b..00000000 --- a/[esx_resources]/[data]/esx_datastore +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dfe0321bdd7ba35b6ec3316529c220b827816997 diff --git a/[esx_resources]/[other]/esx_animations b/[esx_resources]/[other]/esx_animations deleted file mode 160000 index ed5d8118..00000000 --- a/[esx_resources]/[other]/esx_animations +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ed5d8118dd4363debb9a8b8de758a14b75f5448c diff --git a/[esx_resources]/[other]/esx_atm b/[esx_resources]/[other]/esx_atm deleted file mode 160000 index e2d7eead..00000000 --- a/[esx_resources]/[other]/esx_atm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e2d7eead18284052e5732856bf93a4b439764c61 diff --git a/[esx_resources]/[other]/esx_cruisecontrol b/[esx_resources]/[other]/esx_cruisecontrol deleted file mode 160000 index 11f11ade..00000000 --- a/[esx_resources]/[other]/esx_cruisecontrol +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 11f11adeb7c138e789e6ba0cd9499db9d5d578c8 diff --git a/[esx_resources]/[other]/esx_dmvschool b/[esx_resources]/[other]/esx_dmvschool deleted file mode 160000 index 1b362bd7..00000000 --- a/[esx_resources]/[other]/esx_dmvschool +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1b362bd7c1fe1aa5336c5f038f41f95541494c5d diff --git a/[esx_resources]/[other]/esx_garage b/[esx_resources]/[other]/esx_garage deleted file mode 160000 index 6ae703b1..00000000 --- a/[esx_resources]/[other]/esx_garage +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6ae703b18965452d148541c061f830469c8a8bd9 diff --git a/[esx_resources]/[other]/esx_phone b/[esx_resources]/[other]/esx_phone deleted file mode 160000 index 204cfb59..00000000 --- a/[esx_resources]/[other]/esx_phone +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 204cfb59d92514d864a6ff473af0ca3523c45264 diff --git a/[esx_resources]/[other]/esx_property b/[esx_resources]/[other]/esx_property deleted file mode 160000 index 1475b201..00000000 --- a/[esx_resources]/[other]/esx_property +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1475b201c01ff0cf9c4433e84da9444a10249312 diff --git a/[esx_resources]/[other]/esx_rpchat b/[esx_resources]/[other]/esx_rpchat deleted file mode 160000 index f0b11d80..00000000 --- a/[esx_resources]/[other]/esx_rpchat +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f0b11d808d76eb8021f299a522f3b3fa7dc2591c diff --git a/[esx_resources]/[other]/esx_sit b/[esx_resources]/[other]/esx_sit deleted file mode 160000 index 8655d7a9..00000000 --- a/[esx_resources]/[other]/esx_sit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8655d7a98529536e730f27ff633c833c47d76596 diff --git a/[esx_resources]/[other]/esx_voice b/[esx_resources]/[other]/esx_voice deleted file mode 160000 index 2f9bcc8d..00000000 --- a/[esx_resources]/[other]/esx_voice +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2f9bcc8d4d706563a17f00e98f33c3cf22506562 diff --git a/[esx_resources]/[other]/esx_whitelist b/[esx_resources]/[other]/esx_whitelist deleted file mode 160000 index 789ecd76..00000000 --- a/[esx_resources]/[other]/esx_whitelist +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 789ecd76604974ca3694a7ef77559b5520e1e59c diff --git a/[esx_resources]/[other]/instance b/[esx_resources]/[other]/instance deleted file mode 160000 index 21cea1fe..00000000 --- a/[esx_resources]/[other]/instance +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 21cea1fee9f666ac3a30b9b03d6f8b5f21afb57d diff --git a/[esx_resources]/[shops]/esx_boat b/[esx_resources]/[shops]/esx_boat deleted file mode 160000 index 1d1670e5..00000000 --- a/[esx_resources]/[shops]/esx_boat +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1d1670e5d90f9f8d30dd43141830300c276e3b49 diff --git a/[esx_resources]/[shops]/esx_lscustom b/[esx_resources]/[shops]/esx_lscustom deleted file mode 160000 index b6f2f129..00000000 --- a/[esx_resources]/[shops]/esx_lscustom +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b6f2f129ababf6ac3709145c814f52453d6b7ffa diff --git a/[esx_resources]/[shops]/esx_shops b/[esx_resources]/[shops]/esx_shops deleted file mode 160000 index 13d9e99a..00000000 --- a/[esx_resources]/[shops]/esx_shops +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 13d9e99af71ba9a49949a2d9ba330406cea6bc95 diff --git a/[esx_resources]/[shops]/esx_vehicleshop b/[esx_resources]/[shops]/esx_vehicleshop deleted file mode 160000 index 3f512e77..00000000 --- a/[esx_resources]/[shops]/esx_vehicleshop +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3f512e774c8bb9874d381ce7ba058c39b0eaae28 diff --git a/[esx_resources]/[shops]/esx_weaponshop b/[esx_resources]/[shops]/esx_weaponshop deleted file mode 160000 index b42afd53..00000000 --- a/[esx_resources]/[shops]/esx_weaponshop +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b42afd53e3f9876c357962a9d79d86dc6919fde0 diff --git a/[esx_resources]/[society]/esx_ambulancejob b/[esx_resources]/[society]/esx_ambulancejob deleted file mode 160000 index ba096109..00000000 --- a/[esx_resources]/[society]/esx_ambulancejob +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ba0961095c8a31f1d993c2c13f913dbb37bf52bf diff --git a/[esx_resources]/[society]/esx_bankerjob b/[esx_resources]/[society]/esx_bankerjob deleted file mode 160000 index 20673f5b..00000000 --- a/[esx_resources]/[society]/esx_bankerjob +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 20673f5b14807fdd80e80d945cc5b0624fd452da diff --git a/[esx_resources]/[society]/esx_billing b/[esx_resources]/[society]/esx_billing deleted file mode 160000 index 18df7933..00000000 --- a/[esx_resources]/[society]/esx_billing +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 18df79337a5d35b945fa1ecfa2794e6bee3407aa diff --git a/[esx_resources]/[society]/esx_joblisting b/[esx_resources]/[society]/esx_joblisting deleted file mode 160000 index bbce9722..00000000 --- a/[esx_resources]/[society]/esx_joblisting +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bbce9722a24269e667d00cc26b7c6408f29cdfb7 diff --git a/[esx_resources]/[society]/esx_mechanicjob b/[esx_resources]/[society]/esx_mechanicjob deleted file mode 160000 index d0e414fc..00000000 --- a/[esx_resources]/[society]/esx_mechanicjob +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d0e414fc96d3a07a68cafd57aaff954baa28bf99 diff --git a/[esx_resources]/[society]/esx_policejob b/[esx_resources]/[society]/esx_policejob deleted file mode 160000 index 22cdd4ef..00000000 --- a/[esx_resources]/[society]/esx_policejob +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 22cdd4ef2d7808ae8109d1e9f65a336300f2cad2 diff --git a/[esx_resources]/[society]/esx_realestateagentjob b/[esx_resources]/[society]/esx_realestateagentjob deleted file mode 160000 index 83613371..00000000 --- a/[esx_resources]/[society]/esx_realestateagentjob +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 83613371ea2fbdf1cd7d07c5e31215cbf0fe160d diff --git a/[esx_resources]/[society]/esx_service b/[esx_resources]/[society]/esx_service deleted file mode 160000 index 0c85c4e4..00000000 --- a/[esx_resources]/[society]/esx_service +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0c85c4e4b212015fbf97a4707ad59aa55904768d diff --git a/[esx_resources]/[society]/esx_society b/[esx_resources]/[society]/esx_society deleted file mode 160000 index 3dccb4b2..00000000 --- a/[esx_resources]/[society]/esx_society +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3dccb4b24ffcd2bb4bde4af102056ac918c4f847 diff --git a/[esx_resources]/[society]/esx_taxijob b/[esx_resources]/[society]/esx_taxijob deleted file mode 160000 index 0f69bfce..00000000 --- a/[esx_resources]/[society]/esx_taxijob +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0f69bfce0a8f587abcfc7e9567fffd3fa53e663c diff --git a/[esx_resources]/[user]/esx_accessories b/[esx_resources]/[user]/esx_accessories deleted file mode 160000 index e812dde6..00000000 --- a/[esx_resources]/[user]/esx_accessories +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e812dde63bcb746e9b49bad704a9c9174d6329fa diff --git a/[esx_resources]/[user]/esx_barbershop b/[esx_resources]/[user]/esx_barbershop deleted file mode 160000 index 25103f72..00000000 --- a/[esx_resources]/[user]/esx_barbershop +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 25103f725db46a22ff8e12925290f2b71e9137cc diff --git a/[esx_resources]/[user]/esx_basicneeds b/[esx_resources]/[user]/esx_basicneeds deleted file mode 160000 index f034e2b9..00000000 --- a/[esx_resources]/[user]/esx_basicneeds +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f034e2b95f0a8cbeba989ce52da59d99c2365412 diff --git a/[esx_resources]/[user]/esx_clotheshop b/[esx_resources]/[user]/esx_clotheshop deleted file mode 160000 index 04183ae7..00000000 --- a/[esx_resources]/[user]/esx_clotheshop +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 04183ae7c0a9c1505b37a13bb4e2bbd195862511 diff --git a/[esx_resources]/[user]/esx_license b/[esx_resources]/[user]/esx_license deleted file mode 160000 index 4a791b81..00000000 --- a/[esx_resources]/[user]/esx_license +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4a791b81827f17f7e31aeac1fb15f3c9c9ec6764 diff --git a/[esx_resources]/[user]/esx_optionalneeds b/[esx_resources]/[user]/esx_optionalneeds deleted file mode 160000 index a8041956..00000000 --- a/[esx_resources]/[user]/esx_optionalneeds +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a8041956307766027f1d36d0fd43ba03c0318ba0 diff --git a/[esx_resources]/[user]/esx_status b/[esx_resources]/[user]/esx_status deleted file mode 160000 index 92a9779f..00000000 --- a/[esx_resources]/[user]/esx_status +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 92a9779f93c855bfb197184411e4877676a3ae7f diff --git a/[esx_resources]/examples/esx_boilerplate b/[esx_resources]/examples/esx_boilerplate deleted file mode 160000 index 0b35d90e..00000000 --- a/[esx_resources]/examples/esx_boilerplate +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0b35d90e3e655256b4f140c36e2853da68ad3a19 diff --git a/[esx_resources]/examples/esx_legacy_boilerplate b/[esx_resources]/examples/esx_legacy_boilerplate deleted file mode 160000 index 64ca21be..00000000 --- a/[esx_resources]/examples/esx_legacy_boilerplate +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 64ca21becf8b4f42a3431a62bcd6a743d125bbbd diff --git a/es_extended b/es_extended deleted file mode 160000 index 53ce92ec..00000000 --- a/es_extended +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 53ce92ec1dad38425b3ae9e87385252bb876bd4d