From 3a2788df42a41a995cdfe31138fc80bb94f08dc8 Mon Sep 17 00:00:00 2001 From: imThaku Date: Mon, 14 Aug 2017 16:39:11 +0200 Subject: [PATCH 01/63] 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..1b73edab --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# fxserver-esx_weashops +Legal or illegal gun shop From 2d84093e177258528fb1d63b3a04740fe302f590 Mon Sep 17 00:00:00 2001 From: imThaku Date: Mon, 14 Aug 2017 16:40:45 +0200 Subject: [PATCH 02/63] esx_weashop v1.0.0 --- esx_weashops/LICENSE.txt | 674 +++++++++++++++++++++++++++++++++++ esx_weashops/README.md | 16 + esx_weashops/__resource.lua | 12 + esx_weashops/client/main.lua | 165 +++++++++ esx_weashops/config.lua | 27 ++ esx_weashops/esx_shops.sql | 17 + esx_weashops/server/main.lua | 82 +++++ 7 files changed, 993 insertions(+) create mode 100644 esx_weashops/LICENSE.txt create mode 100644 esx_weashops/README.md create mode 100644 esx_weashops/__resource.lua create mode 100644 esx_weashops/client/main.lua create mode 100644 esx_weashops/config.lua create mode 100644 esx_weashops/esx_shops.sql create mode 100644 esx_weashops/server/main.lua diff --git a/esx_weashops/LICENSE.txt b/esx_weashops/LICENSE.txt new file mode 100644 index 00000000..30ace6a8 --- /dev/null +++ b/esx_weashops/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 diff --git a/esx_weashops/README.md b/esx_weashops/README.md new file mode 100644 index 00000000..1bfeb057 --- /dev/null +++ b/esx_weashops/README.md @@ -0,0 +1,16 @@ +# fxserver-esx_shops +FXServer ESX Shops + +[INSTALLATION] + +1) CD in your resources/[esx] folder +2) Clone the repository +``` +git clone https://github.com/FXServer-ESX/fxserver-esx_shops esx_shops +``` +3) Import esx_shops.sql in your database +4) Add this in your server.cfg : + +``` +start esx_shops +``` diff --git a/esx_weashops/__resource.lua b/esx_weashops/__resource.lua new file mode 100644 index 00000000..47caca54 --- /dev/null +++ b/esx_weashops/__resource.lua @@ -0,0 +1,12 @@ +description 'ESX Mecano Job' + +client_scripts { + 'config.lua', + 'client/main.lua' +} + +server_scripts { + '@mysql-async/lib/MySQL.lua', + 'config.lua', + 'server/main.lua' +} \ No newline at end of file diff --git a/esx_weashops/client/main.lua b/esx_weashops/client/main.lua new file mode 100644 index 00000000..fc3ac617 --- /dev/null +++ b/esx_weashops/client/main.lua @@ -0,0 +1,165 @@ +ESX = nil +local HasAlreadyEnteredMarker = false +local LastZone = nil +local CurrentAction = nil +local CurrentActionMsg = '' +local CurrentActionData = {} + +Citizen.CreateThread(function() + while ESX == nil do + TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + Citizen.Wait(0) + end +end) + +AddEventHandler('onClientMapStart', function() + + ESX.TriggerServerCallback('esx_weashop:requestDBItems', function(ShopItems) + for k,v in pairs(ShopItems) do + Config.Zones[k].Items = v + end + end) + +end) + +function OpenShopMenu(zone) + + local elements = {} + + for i=1, #Config.Zones[zone].Items, 1 do + + local item = Config.Zones[zone].Items[i] + + table.insert(elements, { + label = item.label .. ' - $' .. item.price .. ' ', + realLabel = item.label, + value = item.name, + price = item.price + }) + + end + + + ESX.UI.Menu.CloseAll() + + ESX.UI.Menu.Open( + 'default', GetCurrentResourceName(), 'shop', + { + title = 'Magasin', + elements = elements + }, + function(data, menu) + TriggerServerEvent('esx_weashop:buyItem', data.current.value, data.current.price, zone) + end, + function(data, menu) + + menu.close() + + CurrentAction = 'shop_menu' + CurrentActionMsg = 'Appuyez sur ~INPUT_CONTEXT~ pour accéder au magasin.' + CurrentActionData = {zone = zone} + end + ) +end + +AddEventHandler('esx_weashop:hasEnteredMarker', function(zone) + + CurrentAction = 'shop_menu' + CurrentActionMsg = 'Appuyez sur ~INPUT_CONTEXT~ pour accéder au magasin.' + CurrentActionData = {zone = zone} + +end) + +AddEventHandler('esx_weashop:hasExitedMarker', function(zone) + + CurrentAction = nil + ESX.UI.Menu.CloseAll() + +end) + +-- Create Blips +Citizen.CreateThread(function() + for k,v in pairs(Config.Zones) do + if v.legal==0 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, 154) + SetBlipDisplay(blip, 4) + SetBlipScale (blip, 1.0) + SetBlipColour (blip, 2) + SetBlipAsShortRange(blip, true) + BeginTextCommandSetBlipName("STRING") + AddTextComponentString("GunShop") + 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) + +-- Enter / Exit marker events +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 + ShopItems = v.Items + currentZone = k + LastZone = k + end + end + end + if isInMarker and not HasAlreadyEnteredMarker then + HasAlreadyEnteredMarker = true + TriggerEvent('esx_weashop:hasEnteredMarker', currentZone) + end + if not isInMarker and HasAlreadyEnteredMarker then + HasAlreadyEnteredMarker = false + TriggerEvent('esx_weashop: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 + + if CurrentAction == 'shop_menu' then + OpenShopMenu(CurrentActionData.zone) + end + + CurrentAction = nil + + end + + end + end +end) \ No newline at end of file diff --git a/esx_weashops/config.lua b/esx_weashops/config.lua new file mode 100644 index 00000000..5006a708 --- /dev/null +++ b/esx_weashops/config.lua @@ -0,0 +1,27 @@ +Config = {} + +Config.DrawDistance = 100 +Config.Size = {x = 1.5, y = 1.5, z = 1.5} +Config.Color = {r = 0, g = 128, b = 255} +Config.Type = 1 + +Config.Zones = { + + GunShop = { + legal=0, + Items = {}, + Pos = { + {x = -662.180053710938, y =-934.961120605469, z = 20.8292293548584} + + } + }, + blackweashop = { + legal=1, + Items = {}, + Pos = { + {x = -1306.23986816406, y =-394.018707275391, z = 35.6958122253418} + + } + }, + +} \ No newline at end of file diff --git a/esx_weashops/esx_shops.sql b/esx_weashops/esx_shops.sql new file mode 100644 index 00000000..ee90319f --- /dev/null +++ b/esx_weashops/esx_shops.sql @@ -0,0 +1,17 @@ +USE `essentialmode`; + +CREATE TABLE `weashops` ( + + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(255) NOT NULL, + `item` varchar(255) NOT NULL, + `price` int(11) NOT NULL, + + PRIMARY KEY (`id`) +); + + +INSERT INTO `weashops` (name, item, price) VALUES + ('GunShop','WEAPON_Pistol',300), + ('blackweashop','WEAPON_Pistol',500) +; \ No newline at end of file diff --git a/esx_weashops/server/main.lua b/esx_weashops/server/main.lua new file mode 100644 index 00000000..ae222d5f --- /dev/null +++ b/esx_weashops/server/main.lua @@ -0,0 +1,82 @@ +ESX = nil +local ItemsLabels = {} + +TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + +AddEventHandler('onMySQLReady', function() + + MySQL.Async.fetchAll( + 'SELECT * FROM items', + {}, + function(result) + + for i=1, #result, 1 do + ItemsLabels[result[i].name] = result[i].label + end-- + + end + ) + +end) + +ESX.RegisterServerCallback('esx_weashop:requestDBItems', function(source, cb) + + MySQL.Async.fetchAll( + 'SELECT * FROM weashops', + {}, + function(result) + + local shopItems = {} + + for i=1, #result, 1 do + + if shopItems[result[i].name] == nil then + shopItems[result[i].name] = {} + end + + table.insert(shopItems[result[i].name], { + name = result[i].item, + price = result[i].price, + label = ESX.GetWeaponLabel(result[i].item) + }) + + end + + cb(shopItems) + + end + ) + +end) + +RegisterServerEvent('esx_weashop:buyItem') +AddEventHandler('esx_weashop:buyItem', function(itemName, price,zone) + + local _source = source + local xPlayer = ESX.GetPlayerFromId(source) + local account = xPlayer.getAccount('black_money') + + if zone=="blackweashop" then + if account.money >= price then + + xPlayer.removeAccountMoney('black_money', price) + xPlayer.addWeapon(itemName, 42) + TriggerClientEvent('esx:showNotification', _source, 'Vous avez acheté ~b~1x ' .. ItemsLabels[itemName]) + + else + TriggerClientEvent('esx:showNotification', _source, 'Vous n\'avez ~r~pas assez~s~ d\'argent sale') + end + + else if xPlayer.get('money') >= price then + + xPlayer.removeMoney(price) + xPlayer.addWeapon(itemName, 42) + + TriggerClientEvent('esx:showNotification', _source, 'Vous avez acheté ~b~1x ' .. ItemsLabels[itemName]) + + else + TriggerClientEvent('esx:showNotification', _source, 'Vous n\'avez ~r~pas assez~s~ d\'argent.') + end + end + +end) From ead076c2567daedae5e18da86d20a07568cf4124 Mon Sep 17 00:00:00 2001 From: imThaku Date: Mon, 14 Aug 2017 16:41:37 +0200 Subject: [PATCH 03/63] Update sql --- esx_weashops/{esx_shops.sql => esx_weashops.sql} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename esx_weashops/{esx_shops.sql => esx_weashops.sql} (99%) diff --git a/esx_weashops/esx_shops.sql b/esx_weashops/esx_weashops.sql similarity index 99% rename from esx_weashops/esx_shops.sql rename to esx_weashops/esx_weashops.sql index ee90319f..15819db8 100644 --- a/esx_weashops/esx_shops.sql +++ b/esx_weashops/esx_weashops.sql @@ -14,4 +14,4 @@ CREATE TABLE `weashops` ( INSERT INTO `weashops` (name, item, price) VALUES ('GunShop','WEAPON_Pistol',300), ('blackweashop','WEAPON_Pistol',500) -; \ No newline at end of file +; From 947bfac27c7e0b7d558eee1566db203f29bc703e Mon Sep 17 00:00:00 2001 From: imThaku Date: Mon, 14 Aug 2017 16:42:41 +0200 Subject: [PATCH 04/63] Update readMe --- esx_weashops/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/esx_weashops/README.md b/esx_weashops/README.md index 1bfeb057..cecf1651 100644 --- a/esx_weashops/README.md +++ b/esx_weashops/README.md @@ -1,14 +1,14 @@ -# fxserver-esx_shops -FXServer ESX Shops +# fxserver-esx_weashops +FXServer ESX Weapon Shops [INSTALLATION] 1) CD in your resources/[esx] folder 2) Clone the repository ``` -git clone https://github.com/FXServer-ESX/fxserver-esx_shops esx_shops + ``` -3) Import esx_shops.sql in your database +3) Import esx_weashops.sql in your database 4) Add this in your server.cfg : ``` From 3eb0647e11e774df6a2c5f5d2143effc272d2f7c Mon Sep 17 00:00:00 2001 From: imThaku Date: Mon, 14 Aug 2017 16:43:01 +0200 Subject: [PATCH 05/63] Delet old readme --- README.md | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index 1b73edab..00000000 --- a/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# fxserver-esx_weashops -Legal or illegal gun shop From d95ac08d0ab0361a5bb072e039dce84996b15506 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Tue, 15 Aug 2017 14:59:46 -0400 Subject: [PATCH 06/63] Multi-language support Updated readme with proper clone link, and moved it to the front directory. --- esx_weashops/LICENSE.txt => LICENSE.txt | 0 esx_weashops/README.md => README.md | 2 +- esx_weashops/__resource.lua => __resource.lua | 6 ++++++ {esx_weashops/client => client}/main.lua | 8 ++++---- esx_weashops/config.lua => config.lua | 1 + esx_weashops/esx_weashops.sql => esx_weashops.sql | 0 locales/en.lua | 10 ++++++++++ locales/fr.lua | 10 ++++++++++ {esx_weashops/server => server}/main.lua | 10 +++++----- 9 files changed, 37 insertions(+), 10 deletions(-) rename esx_weashops/LICENSE.txt => LICENSE.txt (100%) rename esx_weashops/README.md => README.md (74%) rename esx_weashops/__resource.lua => __resource.lua (55%) rename {esx_weashops/client => client}/main.lua (94%) rename esx_weashops/config.lua => config.lua (95%) rename esx_weashops/esx_weashops.sql => esx_weashops.sql (100%) create mode 100644 locales/en.lua create mode 100644 locales/fr.lua rename {esx_weashops/server => server}/main.lua (76%) diff --git a/esx_weashops/LICENSE.txt b/LICENSE.txt similarity index 100% rename from esx_weashops/LICENSE.txt rename to LICENSE.txt diff --git a/esx_weashops/README.md b/README.md similarity index 74% rename from esx_weashops/README.md rename to README.md index cecf1651..284f1eb0 100644 --- a/esx_weashops/README.md +++ b/README.md @@ -6,7 +6,7 @@ FXServer ESX Weapon Shops 1) CD in your resources/[esx] folder 2) Clone the repository ``` - +git clone https://github.com/FXServer-ESX/fxserver-esx_weashops.git esx_weashops ``` 3) Import esx_weashops.sql in your database 4) Add this in your server.cfg : diff --git a/esx_weashops/__resource.lua b/__resource.lua similarity index 55% rename from esx_weashops/__resource.lua rename to __resource.lua index 47caca54..34c968b5 100644 --- a/esx_weashops/__resource.lua +++ b/__resource.lua @@ -1,11 +1,17 @@ description 'ESX Mecano Job' client_scripts { + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/fr.lua', 'config.lua', 'client/main.lua' } server_scripts { + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/fr.lua', '@mysql-async/lib/MySQL.lua', 'config.lua', 'server/main.lua' diff --git a/esx_weashops/client/main.lua b/client/main.lua similarity index 94% rename from esx_weashops/client/main.lua rename to client/main.lua index fc3ac617..e07aca95 100644 --- a/esx_weashops/client/main.lua +++ b/client/main.lua @@ -45,7 +45,7 @@ function OpenShopMenu(zone) ESX.UI.Menu.Open( 'default', GetCurrentResourceName(), 'shop', { - title = 'Magasin', + title = _U('shop'), elements = elements }, function(data, menu) @@ -56,7 +56,7 @@ function OpenShopMenu(zone) menu.close() CurrentAction = 'shop_menu' - CurrentActionMsg = 'Appuyez sur ~INPUT_CONTEXT~ pour accéder au magasin.' + CurrentActionMsg = _U('shop_menu') CurrentActionData = {zone = zone} end ) @@ -65,7 +65,7 @@ end AddEventHandler('esx_weashop:hasEnteredMarker', function(zone) CurrentAction = 'shop_menu' - CurrentActionMsg = 'Appuyez sur ~INPUT_CONTEXT~ pour accéder au magasin.' + CurrentActionMsg = _U('shop_menu') CurrentActionData = {zone = zone} end) @@ -89,7 +89,7 @@ Citizen.CreateThread(function() SetBlipColour (blip, 2) SetBlipAsShortRange(blip, true) BeginTextCommandSetBlipName("STRING") - AddTextComponentString("GunShop") + AddTextComponentString(_U('map_blip')) EndTextCommandSetBlipName(blip) end end diff --git a/esx_weashops/config.lua b/config.lua similarity index 95% rename from esx_weashops/config.lua rename to config.lua index 5006a708..e4e843fd 100644 --- a/esx_weashops/config.lua +++ b/config.lua @@ -4,6 +4,7 @@ Config.DrawDistance = 100 Config.Size = {x = 1.5, y = 1.5, z = 1.5} Config.Color = {r = 0, g = 128, b = 255} Config.Type = 1 +Config.Locale = 'en' Config.Zones = { diff --git a/esx_weashops/esx_weashops.sql b/esx_weashops.sql similarity index 100% rename from esx_weashops/esx_weashops.sql rename to esx_weashops.sql diff --git a/locales/en.lua b/locales/en.lua new file mode 100644 index 00000000..a833c4cf --- /dev/null +++ b/locales/en.lua @@ -0,0 +1,10 @@ +Locales ['en'] = { + + ['buy'] = 'you bought', + ['not_enough_black'] = 'you do not have enough dirty money', + ['not_enough'] = 'you do not have enough money', + ['shop'] = 'shop', + ['shop_menu'] = 'Press ~INPUT_CONTENT~ to access the shop.', + ['map_blip'] = 'gun shop', + +} \ No newline at end of file diff --git a/locales/fr.lua b/locales/fr.lua new file mode 100644 index 00000000..1b3b5ca1 --- /dev/null +++ b/locales/fr.lua @@ -0,0 +1,10 @@ +Locales ['fr'] = { + + ['buy'] = 'vous avez acheté ~b~1x ', + ['not_enough_black'] = 'Vous n\'avez ~r~pas assez~s~ d\'argent sale', + ['not_enough'] = 'vous n\'avez ~r~pas assez~s~ d\'argent', + ['shop'] = 'magasin', + ['shop_menu'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder au magasin.', + ['map_blip'] = 'armurerie', + +} \ No newline at end of file diff --git a/esx_weashops/server/main.lua b/server/main.lua similarity index 76% rename from esx_weashops/server/main.lua rename to server/main.lua index ae222d5f..56b81495 100644 --- a/esx_weashops/server/main.lua +++ b/server/main.lua @@ -50,7 +50,7 @@ ESX.RegisterServerCallback('esx_weashop:requestDBItems', function(source, cb) end) RegisterServerEvent('esx_weashop:buyItem') -AddEventHandler('esx_weashop:buyItem', function(itemName, price,zone) +AddEventHandler('esx_weashop:buyItem', function(itemName, price, zone) local _source = source local xPlayer = ESX.GetPlayerFromId(source) @@ -61,10 +61,10 @@ AddEventHandler('esx_weashop:buyItem', function(itemName, price,zone) xPlayer.removeAccountMoney('black_money', price) xPlayer.addWeapon(itemName, 42) - TriggerClientEvent('esx:showNotification', _source, 'Vous avez acheté ~b~1x ' .. ItemsLabels[itemName]) + TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ItemsLabels[itemName]) else - TriggerClientEvent('esx:showNotification', _source, 'Vous n\'avez ~r~pas assez~s~ d\'argent sale') + TriggerClientEvent('esx:showNotification', _source, _U('not_enough_black')) end else if xPlayer.get('money') >= price then @@ -72,10 +72,10 @@ AddEventHandler('esx_weashop:buyItem', function(itemName, price,zone) xPlayer.removeMoney(price) xPlayer.addWeapon(itemName, 42) - TriggerClientEvent('esx:showNotification', _source, 'Vous avez acheté ~b~1x ' .. ItemsLabels[itemName]) + TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ItemsLabels[itemName]) else - TriggerClientEvent('esx:showNotification', _source, 'Vous n\'avez ~r~pas assez~s~ d\'argent.') + TriggerClientEvent('esx:showNotification', _source, _U('not_enough')) end end From 17d588c2e65530420f0652433b712127d6c4e7e6 Mon Sep 17 00:00:00 2001 From: Don Date: Thu, 17 Aug 2017 00:10:07 -0700 Subject: [PATCH 07/63] Fixed SQL, Fixed INPUT_CONTEXT Fixed SQL, Fixed INPUT_CONTEXT, Fixed Readme --- README.md | 2 +- config.lua | 2 +- esx_weashops.sql | 10 +++++----- locales/en.lua | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 284f1eb0..add5c390 100644 --- a/README.md +++ b/README.md @@ -12,5 +12,5 @@ git clone https://github.com/FXServer-ESX/fxserver-esx_weashops.git esx_weashops 4) Add this in your server.cfg : ``` -start esx_shops +start esx_weashops ``` diff --git a/config.lua b/config.lua index e4e843fd..cc22dc28 100644 --- a/config.lua +++ b/config.lua @@ -4,7 +4,7 @@ Config.DrawDistance = 100 Config.Size = {x = 1.5, y = 1.5, z = 1.5} Config.Color = {r = 0, g = 128, b = 255} Config.Type = 1 -Config.Locale = 'en' +Config.Locale = 'fr' Config.Zones = { diff --git a/esx_weashops.sql b/esx_weashops.sql index 15819db8..9e4ef2d2 100644 --- a/esx_weashops.sql +++ b/esx_weashops.sql @@ -6,12 +6,12 @@ CREATE TABLE `weashops` ( `name` varchar(255) NOT NULL, `item` varchar(255) NOT NULL, `price` int(11) NOT NULL, + `label` varchar(255) NOT NULL, PRIMARY KEY (`id`) ); - -INSERT INTO `weashops` (name, item, price) VALUES - ('GunShop','WEAPON_Pistol',300), - ('blackweashop','WEAPON_Pistol',500) -; +INSERT INTO `weashops` (name, item, price, label) VALUES + ('GunShop','WEAPON_Pistol',300, 'pistol'), + ('blackweashop','WEAPON_Pistol',500, 'pistol') +; \ No newline at end of file diff --git a/locales/en.lua b/locales/en.lua index a833c4cf..e52445a0 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -4,7 +4,7 @@ Locales ['en'] = { ['not_enough_black'] = 'you do not have enough dirty money', ['not_enough'] = 'you do not have enough money', ['shop'] = 'shop', - ['shop_menu'] = 'Press ~INPUT_CONTENT~ to access the shop.', + ['shop_menu'] = 'Press ~INPUT_CONTEXT~ to access the shop.', ['map_blip'] = 'gun shop', } \ No newline at end of file From 4cbfc6cd72151863f773e3d650e4f935f61e56c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Thu, 17 Aug 2017 10:53:08 +0200 Subject: [PATCH 08/63] Fix typo + weapon labels (you need to recreate the SQL table --- config.lua | 3 ++- esx_weashops.sql | 7 +++---- server/main.lua | 20 ++------------------ 3 files changed, 7 insertions(+), 23 deletions(-) diff --git a/config.lua b/config.lua index cc22dc28..f072bfbb 100644 --- a/config.lua +++ b/config.lua @@ -16,7 +16,8 @@ Config.Zones = { } }, - blackweashop = { + + BlackWeashop = { legal=1, Items = {}, Pos = { diff --git a/esx_weashops.sql b/esx_weashops.sql index 9e4ef2d2..a7a907cd 100644 --- a/esx_weashops.sql +++ b/esx_weashops.sql @@ -6,12 +6,11 @@ CREATE TABLE `weashops` ( `name` varchar(255) NOT NULL, `item` varchar(255) NOT NULL, `price` int(11) NOT NULL, - `label` varchar(255) NOT NULL, PRIMARY KEY (`id`) ); -INSERT INTO `weashops` (name, item, price, label) VALUES - ('GunShop','WEAPON_Pistol',300, 'pistol'), - ('blackweashop','WEAPON_Pistol',500, 'pistol') +INSERT INTO `weashops` (name, item, price) VALUES + ('GunShop','WEAPON_PISTOL',300), + ('BlackWeashop','WEAPON_PISTOL',500) ; \ No newline at end of file diff --git a/server/main.lua b/server/main.lua index 56b81495..9fe64e37 100644 --- a/server/main.lua +++ b/server/main.lua @@ -3,22 +3,6 @@ local ItemsLabels = {} TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) -AddEventHandler('onMySQLReady', function() - - MySQL.Async.fetchAll( - 'SELECT * FROM items', - {}, - function(result) - - for i=1, #result, 1 do - ItemsLabels[result[i].name] = result[i].label - end-- - - end - ) - -end) - ESX.RegisterServerCallback('esx_weashop:requestDBItems', function(source, cb) MySQL.Async.fetchAll( @@ -61,7 +45,7 @@ AddEventHandler('esx_weashop:buyItem', function(itemName, price, zone) xPlayer.removeAccountMoney('black_money', price) xPlayer.addWeapon(itemName, 42) - TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ItemsLabels[itemName]) + TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ESX.GetWeaponLabel(itemName)) else TriggerClientEvent('esx:showNotification', _source, _U('not_enough_black')) @@ -72,7 +56,7 @@ AddEventHandler('esx_weashop:buyItem', function(itemName, price, zone) xPlayer.removeMoney(price) xPlayer.addWeapon(itemName, 42) - TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ItemsLabels[itemName]) + TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ESX.GetWeaponLabel(itemName)) else TriggerClientEvent('esx:showNotification', _source, _U('not_enough')) From 24c6decac1d828f25ea36e53be47b613612eac3d Mon Sep 17 00:00:00 2001 From: TakumiBR <31086346+TakumiBR@users.noreply.github.com> Date: Thu, 17 Aug 2017 08:11:21 -0700 Subject: [PATCH 09/63] Add files via upload --- __resource.lua | 2 ++ locales/br.lua | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 locales/br.lua diff --git a/__resource.lua b/__resource.lua index 34c968b5..239daaed 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,6 +2,7 @@ description 'ESX Mecano Job' client_scripts { '@es_extended/locale.lua', + 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', 'config.lua', @@ -10,6 +11,7 @@ client_scripts { server_scripts { '@es_extended/locale.lua', + 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', '@mysql-async/lib/MySQL.lua', diff --git a/locales/br.lua b/locales/br.lua new file mode 100644 index 00000000..86c0b715 --- /dev/null +++ b/locales/br.lua @@ -0,0 +1,10 @@ +Locales ['br'] = { + + ['buy'] = 'Você comprou', + ['not_enough_black'] = 'Você não tem dinheiro sujo suficiente', + ['not_enough'] = 'você não tem dinheiro suficiente', + ['shop'] = 'Comprar', + ['shop_menu'] = 'Pressione ~INPUT_CONTEXT~ para comprar armas.', + ['map_blip'] = 'Loja de Armas', + +} \ No newline at end of file From a52c27eb8b88c31eb4e7ef45de37019aecb28fb2 Mon Sep 17 00:00:00 2001 From: ultratm Date: Sat, 26 Aug 2017 13:04:20 +0200 Subject: [PATCH 10/63] Add German Language --- __resource.lua | 2 ++ locales/de.lua | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 locales/de.lua diff --git a/__resource.lua b/__resource.lua index 239daaed..5f926927 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,6 +2,7 @@ description 'ESX Mecano Job' client_scripts { '@es_extended/locale.lua', + 'locales/de.lua', 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', @@ -11,6 +12,7 @@ client_scripts { server_scripts { '@es_extended/locale.lua', + 'locales/de.lua', 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', diff --git a/locales/de.lua b/locales/de.lua new file mode 100644 index 00000000..7415e576 --- /dev/null +++ b/locales/de.lua @@ -0,0 +1,10 @@ +Locales ['de'] = { + + ['buy'] = 'du kaufst', + ['not_enough_black'] = 'du hast nicht genug Schwarzgeld', + ['not_enough'] = 'du hast nicht genug Geld', + ['shop'] = 'Geschäft', + ['shop_menu'] = 'Drücke ~INPUT_CONTEXT~ um auf das Geschäft zuzugreifen.', + ['map_blip'] = 'Waffenladen', + +} \ No newline at end of file From 61409dfb13ff49bf1c91fe8b577d1b49da466686 Mon Sep 17 00:00:00 2001 From: David Carneiro <31643017+TheMrDeivid@users.noreply.github.com> Date: Thu, 7 Sep 2017 04:20:22 +0100 Subject: [PATCH 11/63] Added more Gun shops --- config.lua | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/config.lua b/config.lua index f072bfbb..cca587a4 100644 --- a/config.lua +++ b/config.lua @@ -12,7 +12,15 @@ Config.Zones = { legal=0, Items = {}, Pos = { - {x = -662.180053710938, y =-934.961120605469, z = 20.8292293548584} + {x = -662.180053710938, y =-934.961120605469, z = 20.8292293548584}, + {x = 810.25, y =-2157.60, z = 28.62}, + {x = 1693.44, y =3760.16, z = 33.71}, + {x = -330.24, y =6083.88, z = 30.45}, + {x = 252.63, y =-50.00, z = 68.94}, + {x = 22.09, y =-1107.28, z = 28.80}, + {x = 2567.69, y =294.38, z = 107.73}, + {x = -1117.58, y =2698.61, z = 17.55}, + {x = 842.44, y =-1033.42, z = 27.19} } }, @@ -26,4 +34,4 @@ Config.Zones = { } }, -} \ No newline at end of file +} From 0049d678e5c9b620e6ff27518f095c030e17e8db Mon Sep 17 00:00:00 2001 From: Don <30905704+ddh3@users.noreply.github.com> Date: Wed, 6 Sep 2017 21:45:44 -0700 Subject: [PATCH 12/63] Fixed dirty money, buying from black market Updated if zone=="BlackWeashop" - was not removing money from dirty money when purchasing guns --- server/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/main.lua b/server/main.lua index 9fe64e37..413999c7 100644 --- a/server/main.lua +++ b/server/main.lua @@ -40,7 +40,7 @@ AddEventHandler('esx_weashop:buyItem', function(itemName, price, zone) local xPlayer = ESX.GetPlayerFromId(source) local account = xPlayer.getAccount('black_money') - if zone=="blackweashop" then + if zone=="BlackWeashop" then if account.money >= price then xPlayer.removeAccountMoney('black_money', price) From 9030874dce1d6ef79d200b3b7a4d6455a3eeafa3 Mon Sep 17 00:00:00 2001 From: David Carneiro <31643017+TheMrDeivid@users.noreply.github.com> Date: Sat, 9 Sep 2017 03:14:22 +0100 Subject: [PATCH 13/63] Added more weapons (#6) * Added more weapons * Update esx_weashops.sql --- esx_weashops.sql | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/esx_weashops.sql b/esx_weashops.sql index a7a907cd..fd805b59 100644 --- a/esx_weashops.sql +++ b/esx_weashops.sql @@ -12,5 +12,43 @@ CREATE TABLE `weashops` ( INSERT INTO `weashops` (name, item, price) VALUES ('GunShop','WEAPON_PISTOL',300), - ('BlackWeashop','WEAPON_PISTOL',500) -; \ No newline at end of file + ('BlackWeashop','WEAPON_PISTOL',500), + ('GunShop', 'WEAPON_FLASHLIGHT', 60), + ('BlackWeashop', 'WEAPON_FLASHLIGHT', 70), + ('GunShop', 'WEAPON_MACHETE', 90), + ('BlackWeashop', 'WEAPON_MACHETE', 110), + ('GunShop', 'WEAPON_NIGHTSTICK', 150), + ('BlackWeashop', 'WEAPON_NIGHTSTICK', 150), + ('GunShop', 'WEAPON_BAT', 100), + ('BlackWeashop', 'WEAPON_BAT', 100), + ('GunShop', 'WEAPON_STUNGUN', 50), + ('BlackWeashop', 'WEAPON_STUNGUN', 50), + ('GunShop', 'WEAPON_MICROSMG', 1400), + ('BlackWeashop', 'WEAPON_MICROSMG', 1700), + ('GunShop', 'WEAPON_PUMPSHOTGUN', 3400), + ('BlackWeashop', 'WEAPON_PUMPSHOTGUN', 3500), + ('GunShop', 'WEAPON_ASSAULTRIFLE', 10000), + ('BlackWeashop', 'WEAPON_ASSAULTRIFLE', 11000), + ('GunShop', 'WEAPON_SPECIALCARBINE', 15000), + ('BlackWeashop', 'WEAPON_SPECIALCARBINE', 16500), + ('GunShop', 'WEAPON_SNIPERRIFLE', 22000), + ('BlackWeashop', 'WEAPON_SNIPERRIFLE', 24000), + ('GunShop', 'WEAPON_FIREWORK', 18000), + ('BlackWeashop', 'WEAPON_FIREWORK', 20000), + ('GunShop', 'WEAPON_GRENADE', 500), + ('BlackWeashop', 'WEAPON_GRENADE', 650), + ('GunShop', 'WEAPON_BZGAS', 200), + ('BlackWeashop', 'WEAPON_BZGAS', 350), + ('GunShop', 'WEAPON_FIREEXTINGUISHER', 100), + ('BlackWeashop', 'WEAPON_FIREEXTINGUISHER', 100), + ('GunShop', 'WEAPON_BALL', 50), + ('BlackWeashop', 'WEAPON_BALL', 50), + ('GunShop', 'WEAPON_SMOKEGRENADE', 100), + ('BlackWeashop', 'WEAPON_SMOKEGRENADE', 100), + ('BlackWeashop', 'WEAPON_APPISTOL', 1100), + ('BlackWeashop', 'WEAPON_CARBINERIFLE', 12000), + ('BlackWeashop', 'WEAPON_HEAVYSNIPER', 30000), + ('BlackWeashop', 'WEAPON_MINIGUN', 45000), + ('BlackWeashop', 'WEAPON_RAILGUN', 50000), + ('BlackWeashop', 'WEAPON_STICKYBOMB', 500) +; From 81188a7fc17d9eb84c3daeece317745c209d66e8 Mon Sep 17 00:00:00 2001 From: Coro Veneno Date: Tue, 12 Sep 2017 22:51:23 +0200 Subject: [PATCH 14/63] Create es.lua Added Spanish Language Multi-Language --- locales/es.lua | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 locales/es.lua diff --git a/locales/es.lua b/locales/es.lua new file mode 100644 index 00000000..71ea20a9 --- /dev/null +++ b/locales/es.lua @@ -0,0 +1,10 @@ +Locales ['es'] = { + + ['buy'] = 'Has comprado ~b~1 ', + ['not_enough_black'] = 'Usted no tiene ~r~suficiente~s~ dinero negro', + ['not_enough'] = 'Usted no tiene ~r~suficiente~s~ dinero', + ['shop'] = 'Tienda', + ['shop_menu'] = 'Presione ~INPUT_CONTEXT~ para acceder a la tienda.', + ['map_blip'] = 'Arsenal', + +} From 625c397f9e26317202db1400c998d996608ad653 Mon Sep 17 00:00:00 2001 From: Coro Veneno Date: Tue, 12 Sep 2017 23:03:07 +0200 Subject: [PATCH 15/63] Update Spanish Language Added Spanish Language --- __resource.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/__resource.lua b/__resource.lua index 5f926927..56dca513 100644 --- a/__resource.lua +++ b/__resource.lua @@ -6,6 +6,7 @@ client_scripts { 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', + 'locales/es.lua', 'config.lua', 'client/main.lua' } @@ -16,7 +17,8 @@ server_scripts { 'locales/br.lua', 'locales/en.lua', 'locales/fr.lua', + 'locales/es.lua', '@mysql-async/lib/MySQL.lua', 'config.lua', 'server/main.lua' -} \ No newline at end of file +} From ad56fdb7bc2acee69b813ca7eb36d474d674cb55 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:59 +0200 Subject: [PATCH 16/63] Update LICENSE.txt --- LICENSE.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 30ace6a8..fa1c8a5f 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_weashops + 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_weashops 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 1e03d2fc1c6200d79e9dcbdeefb441ba626889a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Fri, 15 Sep 2017 15:41:43 +0200 Subject: [PATCH 17/63] chore(resource): Add version --- __resource.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/__resource.lua b/__resource.lua index 56dca513..48d4cead 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,5 +1,7 @@ description 'ESX Mecano Job' +version '1.0.0' + client_scripts { '@es_extended/locale.lua', 'locales/de.lua', From 4803dac2f594e9b6349cfffa8e45c2bf47ff3d6c Mon Sep 17 00:00:00 2001 From: Romain Lanz Date: Sat, 14 Oct 2017 23:42:41 +0200 Subject: [PATCH 18/63] chore(style): change indentation --- .editorconfig | 9 +++ __resource.lua | 34 ++++----- client/main.lua | 192 ++++++++++++++++++++++++------------------------ config.lua | 39 +++++----- locales/br.lua | 14 ++-- locales/de.lua | 14 ++-- locales/en.lua | 14 ++-- locales/es.lua | 12 +-- locales/fr.lua | 14 ++-- server/main.lua | 80 ++++++++++---------- 10 files changed, 215 insertions(+), 207 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..4bfca33b --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +indent_size = 2 +indent_style = space +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true diff --git a/__resource.lua b/__resource.lua index 48d4cead..114c0c75 100644 --- a/__resource.lua +++ b/__resource.lua @@ -3,24 +3,24 @@ description 'ESX Mecano Job' version '1.0.0' client_scripts { - '@es_extended/locale.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'locales/es.lua', - 'config.lua', - 'client/main.lua' + '@es_extended/locale.lua', + 'locales/de.lua', + 'locales/br.lua', + 'locales/en.lua', + 'locales/fr.lua', + 'locales/es.lua', + 'config.lua', + 'client/main.lua' } server_scripts { - '@es_extended/locale.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'locales/es.lua', - '@mysql-async/lib/MySQL.lua', - 'config.lua', - 'server/main.lua' + '@es_extended/locale.lua', + 'locales/de.lua', + 'locales/br.lua', + 'locales/en.lua', + 'locales/fr.lua', + 'locales/es.lua', + '@mysql-async/lib/MySQL.lua', + 'config.lua', + 'server/main.lua' } diff --git a/client/main.lua b/client/main.lua index e07aca95..ef34d62f 100644 --- a/client/main.lua +++ b/client/main.lua @@ -4,140 +4,140 @@ local LastZone = nil local CurrentAction = nil local CurrentActionMsg = '' local CurrentActionData = {} - + 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) AddEventHandler('onClientMapStart', function() - - ESX.TriggerServerCallback('esx_weashop:requestDBItems', function(ShopItems) - for k,v in pairs(ShopItems) do - Config.Zones[k].Items = v - end - end) + + ESX.TriggerServerCallback('esx_weashop:requestDBItems', function(ShopItems) + for k,v in pairs(ShopItems) do + Config.Zones[k].Items = v + end + end) end) function OpenShopMenu(zone) - local elements = {} + local elements = {} - for i=1, #Config.Zones[zone].Items, 1 do + for i=1, #Config.Zones[zone].Items, 1 do - local item = Config.Zones[zone].Items[i] + local item = Config.Zones[zone].Items[i] - table.insert(elements, { - label = item.label .. ' - $' .. item.price .. ' ', - realLabel = item.label, - value = item.name, - price = item.price - }) + table.insert(elements, { + label = item.label .. ' - $' .. item.price .. ' ', + realLabel = item.label, + value = item.name, + price = item.price + }) - end + end - ESX.UI.Menu.CloseAll() + ESX.UI.Menu.CloseAll() - ESX.UI.Menu.Open( - 'default', GetCurrentResourceName(), 'shop', - { - title = _U('shop'), - elements = elements - }, - function(data, menu) - TriggerServerEvent('esx_weashop:buyItem', data.current.value, data.current.price, zone) - end, - function(data, menu) - - menu.close() - - CurrentAction = 'shop_menu' - CurrentActionMsg = _U('shop_menu') - CurrentActionData = {zone = zone} - end - ) + ESX.UI.Menu.Open( + 'default', GetCurrentResourceName(), 'shop', + { + title = _U('shop'), + elements = elements + }, + function(data, menu) + TriggerServerEvent('esx_weashop:buyItem', data.current.value, data.current.price, zone) + end, + function(data, menu) + + menu.close() + + CurrentAction = 'shop_menu' + CurrentActionMsg = _U('shop_menu') + CurrentActionData = {zone = zone} + end + ) end AddEventHandler('esx_weashop:hasEnteredMarker', function(zone) - - CurrentAction = 'shop_menu' - CurrentActionMsg = _U('shop_menu') - CurrentActionData = {zone = zone} + + CurrentAction = 'shop_menu' + CurrentActionMsg = _U('shop_menu') + CurrentActionData = {zone = zone} end) AddEventHandler('esx_weashop:hasExitedMarker', function(zone) - CurrentAction = nil - ESX.UI.Menu.CloseAll() + CurrentAction = nil + ESX.UI.Menu.CloseAll() end) -- Create Blips Citizen.CreateThread(function() - for k,v in pairs(Config.Zones) do - if v.legal==0 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, 154) - SetBlipDisplay(blip, 4) - SetBlipScale (blip, 1.0) - SetBlipColour (blip, 2) - SetBlipAsShortRange(blip, true) - BeginTextCommandSetBlipName("STRING") - AddTextComponentString(_U('map_blip')) - EndTextCommandSetBlipName(blip) - end - end - end + for k,v in pairs(Config.Zones) do + if v.legal==0 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, 154) + SetBlipDisplay(blip, 4) + SetBlipScale (blip, 1.0) + SetBlipColour (blip, 2) + SetBlipAsShortRange(blip, true) + BeginTextCommandSetBlipName("STRING") + AddTextComponentString(_U('map_blip')) + EndTextCommandSetBlipName(blip) + end + end + end end) -- Display markers Citizen.CreateThread(function() - while true do + while true do Wait(0) - local coords = GetEntityCoords(GetPlayerPed(-1)) + 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 end) -- Enter / Exit marker events Citizen.CreateThread(function() - while true do - Wait(0) - local coords = GetEntityCoords(GetPlayerPed(-1)) - local isInMarker = false - local currentZone = nil + 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 - ShopItems = v.Items - currentZone = k - LastZone = k - end - end - end - if isInMarker and not HasAlreadyEnteredMarker then - HasAlreadyEnteredMarker = true - TriggerEvent('esx_weashop:hasEnteredMarker', currentZone) - end - if not isInMarker and HasAlreadyEnteredMarker then - HasAlreadyEnteredMarker = false - TriggerEvent('esx_weashop:hasExitedMarker', LastZone) - end - end + 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 + ShopItems = v.Items + currentZone = k + LastZone = k + end + end + end + if isInMarker and not HasAlreadyEnteredMarker then + HasAlreadyEnteredMarker = true + TriggerEvent('esx_weashop:hasEnteredMarker', currentZone) + end + if not isInMarker and HasAlreadyEnteredMarker then + HasAlreadyEnteredMarker = false + TriggerEvent('esx_weashop:hasExitedMarker', LastZone) + end + end end) -- Key Controls @@ -145,21 +145,21 @@ 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 - + + if IsControlJustReleased(0, 38) then + if CurrentAction == 'shop_menu' then OpenShopMenu(CurrentActionData.zone) end - - CurrentAction = nil - + + CurrentAction = nil + end end end -end) \ No newline at end of file +end) diff --git a/config.lua b/config.lua index cca587a4..00e32e1d 100644 --- a/config.lua +++ b/config.lua @@ -1,36 +1,35 @@ Config = {} Config.DrawDistance = 100 -Config.Size = {x = 1.5, y = 1.5, z = 1.5} -Config.Color = {r = 0, g = 128, b = 255} +Config.Size = { x = 1.5, y = 1.5, z = 1.5 } +Config.Color = { r = 0, g = 128, b = 255 } Config.Type = 1 Config.Locale = 'fr' Config.Zones = { GunShop = { - legal=0, + legal = 0, Items = {}, - Pos = { - {x = -662.180053710938, y =-934.961120605469, z = 20.8292293548584}, - {x = 810.25, y =-2157.60, z = 28.62}, - {x = 1693.44, y =3760.16, z = 33.71}, - {x = -330.24, y =6083.88, z = 30.45}, - {x = 252.63, y =-50.00, z = 68.94}, - {x = 22.09, y =-1107.28, z = 28.80}, - {x = 2567.69, y =294.38, z = 107.73}, - {x = -1117.58, y =2698.61, z = 17.55}, - {x = 842.44, y =-1033.42, z = 27.19} - + Pos = { + { x = -662.180, y = -934.961, z = 20.829 }, + { x = 810.25, y = -2157.60, z = 28.62 }, + { x = 1693.44, y = 3760.16, z = 33.71 }, + { x = -330.24, y = 6083.88, z = 30.45 }, + { x = 252.63, y = -50.00, z = 68.94 }, + { x = 22.09, y = -1107.28, z = 28.80 }, + { x = 2567.69, y = 294.38, z = 107.73 }, + { x = -1117.58, y = 2698.61, z = 17.55 }, + { x = 842.44, y = -1033.42, z = 27.19 }, + } }, - - BlackWeashop = { - legal=1, + + BlackWeashop = { + legal = 1, Items = {}, - Pos = { - {x = -1306.23986816406, y =-394.018707275391, z = 35.6958122253418} - + Pos = { + { x = -1306.239, y = -394.018, z = 35.695 }, } }, diff --git a/locales/br.lua b/locales/br.lua index 86c0b715..2c67d44d 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,10 +1,10 @@ Locales ['br'] = { - ['buy'] = 'Você comprou', - ['not_enough_black'] = 'Você não tem dinheiro sujo suficiente', - ['not_enough'] = 'você não tem dinheiro suficiente', - ['shop'] = 'Comprar', - ['shop_menu'] = 'Pressione ~INPUT_CONTEXT~ para comprar armas.', - ['map_blip'] = 'Loja de Armas', + ['buy'] = 'Você comprou', + ['not_enough_black'] = 'Você não tem dinheiro sujo suficiente', + ['not_enough'] = 'você não tem dinheiro suficiente', + ['shop'] = 'Comprar', + ['shop_menu'] = 'Pressione ~INPUT_CONTEXT~ para comprar armas.', + ['map_blip'] = 'Loja de Armas', -} \ No newline at end of file +} diff --git a/locales/de.lua b/locales/de.lua index 7415e576..d18dc9a1 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -1,10 +1,10 @@ Locales ['de'] = { - ['buy'] = 'du kaufst', - ['not_enough_black'] = 'du hast nicht genug Schwarzgeld', - ['not_enough'] = 'du hast nicht genug Geld', - ['shop'] = 'Geschäft', - ['shop_menu'] = 'Drücke ~INPUT_CONTEXT~ um auf das Geschäft zuzugreifen.', - ['map_blip'] = 'Waffenladen', + ['buy'] = 'du kaufst', + ['not_enough_black'] = 'du hast nicht genug Schwarzgeld', + ['not_enough'] = 'du hast nicht genug Geld', + ['shop'] = 'Geschäft', + ['shop_menu'] = 'Drücke ~INPUT_CONTEXT~ um auf das Geschäft zuzugreifen.', + ['map_blip'] = 'Waffenladen', -} \ No newline at end of file +} diff --git a/locales/en.lua b/locales/en.lua index e52445a0..ff62d147 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,10 +1,10 @@ Locales ['en'] = { - ['buy'] = 'you bought', - ['not_enough_black'] = 'you do not have enough dirty money', - ['not_enough'] = 'you do not have enough money', - ['shop'] = 'shop', - ['shop_menu'] = 'Press ~INPUT_CONTEXT~ to access the shop.', - ['map_blip'] = 'gun shop', + ['buy'] = 'you bought', + ['not_enough_black'] = 'you do not have enough dirty money', + ['not_enough'] = 'you do not have enough money', + ['shop'] = 'shop', + ['shop_menu'] = 'Press ~INPUT_CONTEXT~ to access the shop.', + ['map_blip'] = 'gun shop', -} \ No newline at end of file +} diff --git a/locales/es.lua b/locales/es.lua index 71ea20a9..de77e82e 100644 --- a/locales/es.lua +++ b/locales/es.lua @@ -1,10 +1,10 @@ Locales ['es'] = { - ['buy'] = 'Has comprado ~b~1 ', - ['not_enough_black'] = 'Usted no tiene ~r~suficiente~s~ dinero negro', - ['not_enough'] = 'Usted no tiene ~r~suficiente~s~ dinero', - ['shop'] = 'Tienda', - ['shop_menu'] = 'Presione ~INPUT_CONTEXT~ para acceder a la tienda.', - ['map_blip'] = 'Arsenal', + ['buy'] = 'Has comprado ~b~1 ', + ['not_enough_black'] = 'Usted no tiene ~r~suficiente~s~ dinero negro', + ['not_enough'] = 'Usted no tiene ~r~suficiente~s~ dinero', + ['shop'] = 'Tienda', + ['shop_menu'] = 'Presione ~INPUT_CONTEXT~ para acceder a la tienda.', + ['map_blip'] = 'Arsenal', } diff --git a/locales/fr.lua b/locales/fr.lua index 1b3b5ca1..91eb81d5 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,10 +1,10 @@ Locales ['fr'] = { - ['buy'] = 'vous avez acheté ~b~1x ', - ['not_enough_black'] = 'Vous n\'avez ~r~pas assez~s~ d\'argent sale', - ['not_enough'] = 'vous n\'avez ~r~pas assez~s~ d\'argent', - ['shop'] = 'magasin', - ['shop_menu'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder au magasin.', - ['map_blip'] = 'armurerie', + ['buy'] = 'vous avez acheté ~b~1x ', + ['not_enough_black'] = 'Vous n\'avez ~r~pas assez~s~ d\'argent sale', + ['not_enough'] = 'vous n\'avez ~r~pas assez~s~ d\'argent', + ['shop'] = 'magasin', + ['shop_menu'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder au magasin.', + ['map_blip'] = 'armurerie', -} \ No newline at end of file +} diff --git a/server/main.lua b/server/main.lua index 413999c7..e8822f8b 100644 --- a/server/main.lua +++ b/server/main.lua @@ -5,62 +5,62 @@ TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) ESX.RegisterServerCallback('esx_weashop:requestDBItems', function(source, cb) - MySQL.Async.fetchAll( - 'SELECT * FROM weashops', - {}, - function(result) - - local shopItems = {} + MySQL.Async.fetchAll( + 'SELECT * FROM weashops', + {}, + function(result) - for i=1, #result, 1 do + local shopItems = {} - if shopItems[result[i].name] == nil then - shopItems[result[i].name] = {} - end + for i=1, #result, 1 do - table.insert(shopItems[result[i].name], { - name = result[i].item, - price = result[i].price, - label = ESX.GetWeaponLabel(result[i].item) - }) + if shopItems[result[i].name] == nil then + shopItems[result[i].name] = {} + end - end + table.insert(shopItems[result[i].name], { + name = result[i].item, + price = result[i].price, + label = ESX.GetWeaponLabel(result[i].item) + }) - cb(shopItems) + end - end - ) + cb(shopItems) + + end + ) end) RegisterServerEvent('esx_weashop:buyItem') AddEventHandler('esx_weashop:buyItem', function(itemName, price, zone) - - local _source = source - local xPlayer = ESX.GetPlayerFromId(source) - local account = xPlayer.getAccount('black_money') - - if zone=="BlackWeashop" then - if account.money >= price then - xPlayer.removeAccountMoney('black_money', price) - xPlayer.addWeapon(itemName, 42) - TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ESX.GetWeaponLabel(itemName)) + local _source = source + local xPlayer = ESX.GetPlayerFromId(source) + local account = xPlayer.getAccount('black_money') - else - TriggerClientEvent('esx:showNotification', _source, _U('not_enough_black')) - end + if zone=="BlackWeashop" then + if account.money >= price then - else if xPlayer.get('money') >= price then + xPlayer.removeAccountMoney('black_money', price) + xPlayer.addWeapon(itemName, 42) + TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ESX.GetWeaponLabel(itemName)) - xPlayer.removeMoney(price) - xPlayer.addWeapon(itemName, 42) + else + TriggerClientEvent('esx:showNotification', _source, _U('not_enough_black')) + end - TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ESX.GetWeaponLabel(itemName)) + else if xPlayer.get('money') >= price then - else - TriggerClientEvent('esx:showNotification', _source, _U('not_enough')) - end - end + xPlayer.removeMoney(price) + xPlayer.addWeapon(itemName, 42) + + TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ESX.GetWeaponLabel(itemName)) + + else + TriggerClientEvent('esx:showNotification', _source, _U('not_enough')) + end + end end) From 29d96bf1afdf2815b1f5aa05c66f75d2e937a29b Mon Sep 17 00:00:00 2001 From: Romain Lanz Date: Sat, 14 Oct 2017 23:55:24 +0200 Subject: [PATCH 19/63] feat(license): add license support --- client/main.lua | 45 ++++++++++++++++++++++++++++++++++++++++++--- config.lua | 15 ++++++++------- locales/en.lua | 3 +++ locales/fr.lua | 3 +++ server/main.lua | 29 +++++++++++++++++++++++++++++ 5 files changed, 85 insertions(+), 10 deletions(-) diff --git a/client/main.lua b/client/main.lua index ef34d62f..74017497 100644 --- a/client/main.lua +++ b/client/main.lua @@ -4,6 +4,7 @@ local LastZone = nil local CurrentAction = nil local CurrentActionMsg = '' local CurrentActionData = {} +local Licenses = {} Citizen.CreateThread(function() while ESX == nil do @@ -12,16 +13,46 @@ Citizen.CreateThread(function() end end) -AddEventHandler('onClientMapStart', function() +RegisterNetEvent('esx_weashop:loadLicenses') +AddEventHandler('esx_weashop:loadLicenses', function (licenses) + for i = 0, #licenses, 1 do + Licenses[licenses[i].type] = true + end +end) +AddEventHandler('onClientMapStart', function() ESX.TriggerServerCallback('esx_weashop:requestDBItems', function(ShopItems) for k,v in pairs(ShopItems) do Config.Zones[k].Items = v end end) - end) +function OpenBuyLicenseMenu (zone) + ESX.UI.Menu.CloseAll() + + ESX.UI.Menu.Open( + 'default', GetCurrentResourceName(), 'shop_license', + { + title = _U('buy_license'), + elements = { + { label = _U('yes') .. ' ($' .. Config.LicensePrice .. ')', value = 'yes' }, + { label = _U('no'), value = 'no' }, + } + }, + function (data, menu) + if data.current.value == 'yes' then + TriggerServerEvent('esx_weashop:buyLicense') + end + + menu.close() + end, + function (data, menu) + menu.close() + end + ) +end + function OpenShopMenu(zone) local elements = {} @@ -153,7 +184,15 @@ Citizen.CreateThread(function() if IsControlJustReleased(0, 38) then if CurrentAction == 'shop_menu' then - OpenShopMenu(CurrentActionData.zone) + if Config.EnableLicense == true then + if Licenses['weapon'] ~= nil or Config.Zones[CurrentActionData.zone].legal == 1 then + OpenShopMenu(CurrentActionData.zone) + else + OpenBuyLicenseMenu() + end + else + OpenShopMenu(CurrentActionData.zone) + end end CurrentAction = nil diff --git a/config.lua b/config.lua index 00e32e1d..b7d0b9ef 100644 --- a/config.lua +++ b/config.lua @@ -1,10 +1,11 @@ -Config = {} - -Config.DrawDistance = 100 -Config.Size = { x = 1.5, y = 1.5, z = 1.5 } -Config.Color = { r = 0, g = 128, b = 255 } -Config.Type = 1 -Config.Locale = 'fr' +Config = {} +Config.DrawDistance = 100 +Config.Size = { x = 1.5, y = 1.5, z = 1.5 } +Config.Color = { r = 0, g = 128, b = 255 } +Config.Type = 1 +Config.Locale = 'fr' +Config.EnableLicense = true +Config.LicensePrice = 5000 Config.Zones = { diff --git a/locales/en.lua b/locales/en.lua index ff62d147..e0fab708 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,5 +1,8 @@ Locales ['en'] = { + ['buy_license'] = 'buy a license?', + ['yes'] = 'yes', + ['no'] = 'no', ['buy'] = 'you bought', ['not_enough_black'] = 'you do not have enough dirty money', ['not_enough'] = 'you do not have enough money', diff --git a/locales/fr.lua b/locales/fr.lua index 91eb81d5..8f9b2862 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,5 +1,8 @@ Locales ['fr'] = { + ['buy_license'] = 'acheter une license ?', + ['yes'] = 'oui', + ['no'] = 'non', ['buy'] = 'vous avez acheté ~b~1x ', ['not_enough_black'] = 'Vous n\'avez ~r~pas assez~s~ d\'argent sale', ['not_enough'] = 'vous n\'avez ~r~pas assez~s~ d\'argent', diff --git a/server/main.lua b/server/main.lua index e8822f8b..ff9b2c29 100644 --- a/server/main.lua +++ b/server/main.lua @@ -3,6 +3,35 @@ local ItemsLabels = {} TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) +function LoadLicenses (source) + TriggerEvent('esx_license:getLicenses', source, function (licenses) + TriggerClientEvent('esx_weashop:loadLicenses', source, licenses) + end) +end + +if Config.EnableLicense == true then + AddEventHandler('esx:playerLoaded', function (source) + LoadLicenses(source) + end) +end + +RegisterServerEvent('esx_weashop:buyLicense') +AddEventHandler('esx_weashop:buyLicense', function () + local _source = source + local xPlayer = ESX.GetPlayerFromId(source) + + if xPlayer.get('money') >= Config.LicensePrice then + xPlayer.removeMoney(Config.LicensePrice) + + TriggerEvent('esx_license:addLicense', _source, 'weapon', function () + LoadLicenses(_source) + end) + else + TriggerClientEvent('esx:showNotification', _source, _U('not_enough')) + end +end) + + ESX.RegisterServerCallback('esx_weashop:requestDBItems', function(source, cb) MySQL.Async.fetchAll( From 95e35e4e489ea86aac348473c6e280780333698a Mon Sep 17 00:00:00 2001 From: Romain Lanz Date: Sat, 14 Oct 2017 23:56:54 +0200 Subject: [PATCH 20/63] feat(sql): update SQL script --- esx_weashops.sql | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/esx_weashops.sql b/esx_weashops.sql index fd805b59..ca1f2bc9 100644 --- a/esx_weashops.sql +++ b/esx_weashops.sql @@ -1,15 +1,19 @@ USE `essentialmode`; CREATE TABLE `weashops` ( - + `id` int(11) NOT NULL AUTO_INCREMENT, `name` varchar(255) NOT NULL, `item` varchar(255) NOT NULL, `price` int(11) NOT NULL, - + PRIMARY KEY (`id`) ); +INSERT INTO `licenses` (type, label) VALUES + ('weapon', "Permis de port d'arme") +; + INSERT INTO `weashops` (name, item, price) VALUES ('GunShop','WEAPON_PISTOL',300), ('BlackWeashop','WEAPON_PISTOL',500), From 5e4862afee84696ff6da87706113e1f807bf14f6 Mon Sep 17 00:00:00 2001 From: Romain Lanz Date: Sun, 15 Oct 2017 01:30:52 +0200 Subject: [PATCH 21/63] fix(license): little snicky integer --- client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index 74017497..afe19311 100644 --- a/client/main.lua +++ b/client/main.lua @@ -15,7 +15,7 @@ end) RegisterNetEvent('esx_weashop:loadLicenses') AddEventHandler('esx_weashop:loadLicenses', function (licenses) - for i = 0, #licenses, 1 do + for i = 1, #licenses, 1 do Licenses[licenses[i].type] = true end end) From 753be3a95f57e90472ddf5c9fed9e14094fb9ced Mon Sep 17 00:00:00 2001 From: Romain Lanz Date: Sun, 15 Oct 2017 01:44:47 +0200 Subject: [PATCH 22/63] chore: bump version --- __resource.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/__resource.lua b/__resource.lua index 114c0c75..a32fccc9 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,6 +1,6 @@ -description 'ESX Mecano Job' +description 'ESX Weashop' -version '1.0.0' +version '1.0.1' client_scripts { '@es_extended/locale.lua', From 6d58d19d79831e1ce758d77ded6fc6451701be29 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 21 Apr 2018 22:31:53 +0200 Subject: [PATCH 23/63] A lot of minor cleanup --- LICENSE.txt => LICENSE | 0 README.md | 38 ++++-- __resource.lua | 40 +++--- client/main.lua | 286 +++++++++++++++++++---------------------- config.lua | 2 +- server/main.lua | 108 +++++++--------- 6 files changed, 232 insertions(+), 242 deletions(-) rename LICENSE.txt => LICENSE (100%) diff --git a/LICENSE.txt b/LICENSE similarity index 100% rename from LICENSE.txt rename to LICENSE diff --git a/README.md b/README.md index add5c390..3e851a93 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,38 @@ -# fxserver-esx_weashops -FXServer ESX Weapon Shops +# esx_weashops -[INSTALLATION] +## Download & 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_weashops.git esx_weashops +fvm install --save --folder=esx esx-org/esx_weashops ``` -3) Import esx_weashops.sql in your database -4) Add this in your server.cfg : + +### Using Git +``` +cd resources +git clone https://github.com/ESX-Org/esx_weashops.git [esx]/esx_weashops +``` + +### Manually +- Download https://github.com/ESX-Org/esx_weashops/archive/master.zip +- Put it in the `[esx]` directory + +## Installation +- Import `esx_weashops.sql` in your database +- Add this to your `server.cfg`: ``` start esx_weashops ``` + +# Legal +### License +esx_weashops - Legal or illegal gun shop + +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 a32fccc9..3ce22bc1 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,26 +1,28 @@ -description 'ESX Weashop' +resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' -version '1.0.1' +description 'ESX Weaponshop' + +version '1.0.2' client_scripts { - '@es_extended/locale.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'locales/es.lua', - 'config.lua', - 'client/main.lua' + '@es_extended/locale.lua', + 'locales/de.lua', + 'locales/br.lua', + 'locales/en.lua', + 'locales/fr.lua', + 'locales/es.lua', + 'config.lua', + 'client/main.lua' } server_scripts { - '@es_extended/locale.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'locales/es.lua', - '@mysql-async/lib/MySQL.lua', - 'config.lua', - 'server/main.lua' + '@es_extended/locale.lua', + 'locales/de.lua', + 'locales/br.lua', + 'locales/en.lua', + 'locales/fr.lua', + 'locales/es.lua', + '@mysql-async/lib/MySQL.lua', + 'config.lua', + 'server/main.lua' } diff --git a/client/main.lua b/client/main.lua index afe19311..f40fbe0b 100644 --- a/client/main.lua +++ b/client/main.lua @@ -7,198 +7,178 @@ local CurrentActionData = {} local Licenses = {} 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) RegisterNetEvent('esx_weashop:loadLicenses') AddEventHandler('esx_weashop:loadLicenses', function (licenses) - for i = 1, #licenses, 1 do - Licenses[licenses[i].type] = true - end + for i = 1, #licenses, 1 do + Licenses[licenses[i].type] = true + end end) AddEventHandler('onClientMapStart', function() - ESX.TriggerServerCallback('esx_weashop:requestDBItems', function(ShopItems) - for k,v in pairs(ShopItems) do - Config.Zones[k].Items = v - end - end) + ESX.TriggerServerCallback('esx_weashop:requestDBItems', function(ShopItems) + for k,v in pairs(ShopItems) do + Config.Zones[k].Items = v + end + end) end) -function OpenBuyLicenseMenu (zone) - ESX.UI.Menu.CloseAll() +function OpenBuyLicenseMenu(zone) + ESX.UI.Menu.CloseAll() - ESX.UI.Menu.Open( - 'default', GetCurrentResourceName(), 'shop_license', - { - title = _U('buy_license'), - elements = { - { label = _U('yes') .. ' ($' .. Config.LicensePrice .. ')', value = 'yes' }, - { label = _U('no'), value = 'no' }, - } - }, - function (data, menu) - if data.current.value == 'yes' then - TriggerServerEvent('esx_weashop:buyLicense') - end - - menu.close() - end, - function (data, menu) - menu.close() - end - ) + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'shop_license', + { + title = _U('buy_license'), + elements = { + { label = _U('yes') .. ' ($' .. Config.LicensePrice .. ')', value = 'yes' }, + { label = _U('no'), value = 'no' }, + } + }, function (data, menu) + if data.current.value == 'yes' then + TriggerServerEvent('esx_weashop:buyLicense') + end + menu.close() + end, function (data, menu) + menu.close() + end + ) end function OpenShopMenu(zone) + local elements = {} - local elements = {} + for i=1, #Config.Zones[zone].Items, 1 do + local item = Config.Zones[zone].Items[i] - for i=1, #Config.Zones[zone].Items, 1 do + table.insert(elements, { + label = item.label .. ' - $' .. item.price .. ' ', + realLabel = item.label, + value = item.name, + price = item.price + }) + end + ESX.UI.Menu.CloseAll() - local item = Config.Zones[zone].Items[i] - - table.insert(elements, { - label = item.label .. ' - $' .. item.price .. ' ', - realLabel = item.label, - value = item.name, - price = item.price - }) - - end - - - ESX.UI.Menu.CloseAll() - - ESX.UI.Menu.Open( - 'default', GetCurrentResourceName(), 'shop', - { - title = _U('shop'), - elements = elements - }, - function(data, menu) - TriggerServerEvent('esx_weashop:buyItem', data.current.value, data.current.price, zone) - end, - function(data, menu) - - menu.close() - - CurrentAction = 'shop_menu' - CurrentActionMsg = _U('shop_menu') - CurrentActionData = {zone = zone} - end - ) + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'shop', + { + title = _U('shop'), + elements = elements + }, function(data, menu) + TriggerServerEvent('esx_weashop:buyItem', data.current.value, data.current.price, zone) + end, function(data, menu) + menu.close() + CurrentAction = 'shop_menu' + CurrentActionMsg = _U('shop_menu') + CurrentActionData = {zone = zone} + end + ) end AddEventHandler('esx_weashop:hasEnteredMarker', function(zone) - - CurrentAction = 'shop_menu' - CurrentActionMsg = _U('shop_menu') - CurrentActionData = {zone = zone} - + CurrentAction = 'shop_menu' + CurrentActionMsg = _U('shop_menu') + CurrentActionData = {zone = zone} end) -AddEventHandler('esx_weashop:hasExitedMarker', function(zone) - - CurrentAction = nil - ESX.UI.Menu.CloseAll() - +AddEventHandler('esx_weashop:hasExitedMarker', function(zone)´ + CurrentAction = nil + ESX.UI.Menu.CloseAll() end) -- Create Blips Citizen.CreateThread(function() - for k,v in pairs(Config.Zones) do - if v.legal==0 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, 154) - SetBlipDisplay(blip, 4) - SetBlipScale (blip, 1.0) - SetBlipColour (blip, 2) - SetBlipAsShortRange(blip, true) - BeginTextCommandSetBlipName("STRING") - AddTextComponentString(_U('map_blip')) - EndTextCommandSetBlipName(blip) - end - end - end + for k,v in pairs(Config.Zones) do + if v.legal==0 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, 154) + SetBlipDisplay(blip, 4) + SetBlipScale (blip, 1.0) + SetBlipColour (blip, 2) + SetBlipAsShortRange(blip, true) + BeginTextCommandSetBlipName("STRING") + AddTextComponentString(_U('map_blip')) + 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) -- Enter / Exit marker events Citizen.CreateThread(function() - while true do - Wait(0) - local coords = GetEntityCoords(GetPlayerPed(-1)) - local isInMarker = false - local currentZone = nil + while true do + Citizen.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 - ShopItems = v.Items - currentZone = k - LastZone = k - end - end - end - if isInMarker and not HasAlreadyEnteredMarker then - HasAlreadyEnteredMarker = true - TriggerEvent('esx_weashop:hasEnteredMarker', currentZone) - end - if not isInMarker and HasAlreadyEnteredMarker then - HasAlreadyEnteredMarker = false - TriggerEvent('esx_weashop:hasExitedMarker', LastZone) - end - end + 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 + ShopItems = v.Items + currentZone = k + LastZone = k + end + end + end + if isInMarker and not HasAlreadyEnteredMarker then + HasAlreadyEnteredMarker = true + TriggerEvent('esx_weashop:hasEnteredMarker', currentZone) + end + + if not isInMarker and HasAlreadyEnteredMarker then + HasAlreadyEnteredMarker = false + TriggerEvent('esx_weashop:hasExitedMarker', LastZone) + end + end end) -- Key Controls Citizen.CreateThread(function() - while true do - Citizen.Wait(0) - if CurrentAction ~= nil then + while true do + Citizen.Wait(0) + if CurrentAction ~= nil then - SetTextComponentFormat('STRING') - AddTextComponentString(CurrentActionMsg) - DisplayHelpTextFromStringLabel(0, 0, 1, -1) + SetTextComponentFormat('STRING') + AddTextComponentString(CurrentActionMsg) + DisplayHelpTextFromStringLabel(0, 0, 1, -1) - if IsControlJustReleased(0, 38) then + if IsControlJustReleased(0, 38) then - if CurrentAction == 'shop_menu' then - if Config.EnableLicense == true then - if Licenses['weapon'] ~= nil or Config.Zones[CurrentActionData.zone].legal == 1 then - OpenShopMenu(CurrentActionData.zone) - else - OpenBuyLicenseMenu() - end - else - OpenShopMenu(CurrentActionData.zone) - end - end - - CurrentAction = nil - - end - - end - end + if CurrentAction == 'shop_menu' then + if Config.EnableLicense == true then + if Licenses['weapon'] ~= nil or Config.Zones[CurrentActionData.zone].legal == 1 then + OpenShopMenu(CurrentActionData.zone) + else + OpenBuyLicenseMenu() + end + else + OpenShopMenu(CurrentActionData.zone) + end + end + CurrentAction = nil + end + end + end end) diff --git a/config.lua b/config.lua index b7d0b9ef..cbe06869 100644 --- a/config.lua +++ b/config.lua @@ -4,7 +4,7 @@ Config.Size = { x = 1.5, y = 1.5, z = 1.5 } Config.Color = { r = 0, g = 128, b = 255 } Config.Type = 1 Config.Locale = 'fr' -Config.EnableLicense = true +Config.EnableLicense = true -- only turn this on if you are using esx_license Config.LicensePrice = 5000 Config.Zones = { diff --git a/server/main.lua b/server/main.lua index ff9b2c29..672e113d 100644 --- a/server/main.lua +++ b/server/main.lua @@ -17,79 +17,65 @@ end RegisterServerEvent('esx_weashop:buyLicense') AddEventHandler('esx_weashop:buyLicense', function () - local _source = source - local xPlayer = ESX.GetPlayerFromId(source) + local _source = source + local xPlayer = ESX.GetPlayerFromId(source) - if xPlayer.get('money') >= Config.LicensePrice then - xPlayer.removeMoney(Config.LicensePrice) + if xPlayer.get('money') >= Config.LicensePrice then + xPlayer.removeMoney(Config.LicensePrice) - TriggerEvent('esx_license:addLicense', _source, 'weapon', function () - LoadLicenses(_source) - end) - else - TriggerClientEvent('esx:showNotification', _source, _U('not_enough')) - end + TriggerEvent('esx_license:addLicense', _source, 'weapon', function () + LoadLicenses(_source) + end) + else + TriggerClientEvent('esx:showNotification', _source, _U('not_enough')) + end end) - ESX.RegisterServerCallback('esx_weashop:requestDBItems', function(source, cb) + MySQL.Async.fetchAll('SELECT * FROM weashops', + {}, function(result) + local shopItems = {} + for i=1, #result, 1 do - MySQL.Async.fetchAll( - 'SELECT * FROM weashops', - {}, - function(result) + if shopItems[result[i].name] == nil then + shopItems[result[i].name] = {} + end - local shopItems = {} + table.insert(shopItems[result[i].name], { + name = result[i].item, + price = result[i].price, + label = ESX.GetWeaponLabel(result[i].item) + }) - for i=1, #result, 1 do + end - if shopItems[result[i].name] == nil then - shopItems[result[i].name] = {} - end - - table.insert(shopItems[result[i].name], { - name = result[i].item, - price = result[i].price, - label = ESX.GetWeaponLabel(result[i].item) - }) - - end - - cb(shopItems) - - end - ) + cb(shopItems) + end + ) end) RegisterServerEvent('esx_weashop:buyItem') AddEventHandler('esx_weashop:buyItem', function(itemName, price, zone) - - local _source = source - local xPlayer = ESX.GetPlayerFromId(source) - local account = xPlayer.getAccount('black_money') - - if zone=="BlackWeashop" then - if account.money >= price then - - xPlayer.removeAccountMoney('black_money', price) - xPlayer.addWeapon(itemName, 42) - TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ESX.GetWeaponLabel(itemName)) - - else - TriggerClientEvent('esx:showNotification', _source, _U('not_enough_black')) - end - - else if xPlayer.get('money') >= price then - - xPlayer.removeMoney(price) - xPlayer.addWeapon(itemName, 42) - - TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ESX.GetWeaponLabel(itemName)) - - else - TriggerClientEvent('esx:showNotification', _source, _U('not_enough')) - end - end - + local _source = source + local xPlayer = ESX.GetPlayerFromId(source) + local account = xPlayer.getAccount('black_money') + + if zone=="BlackWeashop" then + if account.money >= price then + xPlayer.removeAccountMoney('black_money', price) + xPlayer.addWeapon(itemName, 42) + TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ESX.GetWeaponLabel(itemName)) + else + TriggerClientEvent('esx:showNotification', _source, _U('not_enough_black')) + end + else + if xPlayer.get('money') >= price then + xPlayer.removeMoney(price) + xPlayer.addWeapon(itemName, 42) + TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ESX.GetWeaponLabel(itemName)) + else + TriggerClientEvent('esx:showNotification', _source, _U('not_enough')) + end + end end) From 63b75486a1a32ed45f3ff9247a9f9579e19bcf97 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 24 Apr 2018 19:22:47 +0200 Subject: [PATCH 24/63] Fixed invalid lua :/ --- client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index f40fbe0b..21fd1b0a 100644 --- a/client/main.lua +++ b/client/main.lua @@ -85,7 +85,7 @@ AddEventHandler('esx_weashop:hasEnteredMarker', function(zone) CurrentActionData = {zone = zone} end) -AddEventHandler('esx_weashop:hasExitedMarker', function(zone)´ +AddEventHandler('esx_weashop:hasExitedMarker', function(zone) CurrentAction = nil ESX.UI.Menu.CloseAll() end) From dd859db58fac8b26835b450ad855a0633a1c6437 Mon Sep 17 00:00:00 2001 From: vecchiotom Date: Fri, 27 Apr 2018 20:48:25 +0200 Subject: [PATCH 25/63] fixed vulnerability --- server/main.lua | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/server/main.lua b/server/main.lua index 672e113d..69cf2bc6 100644 --- a/server/main.lua +++ b/server/main.lua @@ -60,22 +60,23 @@ AddEventHandler('esx_weashop:buyItem', function(itemName, price, zone) local _source = source local xPlayer = ESX.GetPlayerFromId(source) local account = xPlayer.getAccount('black_money') - - if zone=="BlackWeashop" then - if account.money >= price then - xPlayer.removeAccountMoney('black_money', price) - xPlayer.addWeapon(itemName, 42) - TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ESX.GetWeaponLabel(itemName)) + if price >= 0 then + if zone=="BlackWeashop" then + if account.money >= price then + xPlayer.removeAccountMoney('black_money', price) + xPlayer.addWeapon(itemName, 42) + TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ESX.GetWeaponLabel(itemName)) + else + TriggerClientEvent('esx:showNotification', _source, _U('not_enough_black')) + end else - TriggerClientEvent('esx:showNotification', _source, _U('not_enough_black')) - end - else - if xPlayer.get('money') >= price then - xPlayer.removeMoney(price) - xPlayer.addWeapon(itemName, 42) - TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ESX.GetWeaponLabel(itemName)) - else - TriggerClientEvent('esx:showNotification', _source, _U('not_enough')) + if xPlayer.get('money') >= price then + xPlayer.removeMoney(price) + xPlayer.addWeapon(itemName, 42) + TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ESX.GetWeaponLabel(itemName)) + else + TriggerClientEvent('esx:showNotification', _source, _U('not_enough')) + end end end end) From a0a0cbc9a533374d8161031ec190920da518a710 Mon Sep 17 00:00:00 2001 From: vecchiotom Date: Fri, 27 Apr 2018 21:00:07 +0200 Subject: [PATCH 26/63] fixed the vulnerability further --- server/main.lua | 55 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 18 deletions(-) diff --git a/server/main.lua b/server/main.lua index 69cf2bc6..03ec327d 100644 --- a/server/main.lua +++ b/server/main.lua @@ -57,26 +57,45 @@ end) RegisterServerEvent('esx_weashop:buyItem') AddEventHandler('esx_weashop:buyItem', function(itemName, price, zone) - local _source = source - local xPlayer = ESX.GetPlayerFromId(source) - local account = xPlayer.getAccount('black_money') - if price >= 0 then - if zone=="BlackWeashop" then - if account.money >= price then - xPlayer.removeAccountMoney('black_money', price) - xPlayer.addWeapon(itemName, 42) - TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ESX.GetWeaponLabel(itemName)) - else - TriggerClientEvent('esx:showNotification', _source, _U('not_enough_black')) + MySQL.Async.fetchAll('SELECT * FROM weashops', + {}, function(result) + local shopItems = {} + for i=1, #result, 1 do + + if shopItems[result[i].name] == nil then + shopItems[result[i].name] = {} end - else - if xPlayer.get('money') >= price then - xPlayer.removeMoney(price) - xPlayer.addWeapon(itemName, 42) - TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ESX.GetWeaponLabel(itemName)) + + table.insert(shopItems[result[i].name], { + name = result[i].item, + price = result[i].price, + label = ESX.GetWeaponLabel(result[i].item) + }) + + end + + local _source = source + local xPlayer = ESX.GetPlayerFromId(source) + local account = xPlayer.getAccount('black_money') + if price == shopItems[itemName].price then + if zone=="BlackWeashop" then + if account.money >= price then + xPlayer.removeAccountMoney('black_money', price) + xPlayer.addWeapon(itemName, 42) + TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ESX.GetWeaponLabel(itemName)) + else + TriggerClientEvent('esx:showNotification', _source, _U('not_enough_black')) + end else - TriggerClientEvent('esx:showNotification', _source, _U('not_enough')) + if xPlayer.get('money') >= price then + xPlayer.removeMoney(price) + xPlayer.addWeapon(itemName, 42) + TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ESX.GetWeaponLabel(itemName)) + else + TriggerClientEvent('esx:showNotification', _source, _U('not_enough')) + end end end - end + + end) end) From 06c192e5293aea9ea96e57fb7996046cd3888588 Mon Sep 17 00:00:00 2001 From: vecchiotom Date: Fri, 27 Apr 2018 21:08:29 +0200 Subject: [PATCH 27/63] code clean up --- server/main.lua | 66 ++++++++++++++++++++----------------------------- 1 file changed, 27 insertions(+), 39 deletions(-) diff --git a/server/main.lua b/server/main.lua index 03ec327d..22d0fa21 100644 --- a/server/main.lua +++ b/server/main.lua @@ -15,6 +15,26 @@ if Config.EnableLicense == true then end) end +function LoadShopItems(cb) + MySQL.Async.fetchAll('SELECT * FROM weashops', + {}, function(result) + local shopItems = {} + for i=1, #result, 1 do + + if shopItems[result[i].name] == nil then + shopItems[result[i].name] = {} + end + + table.insert(shopItems[result[i].name], { + name = result[i].item, + price = result[i].price, + label = ESX.GetWeaponLabel(result[i].item) + }) + cb(shopItems) + end + end) +end + RegisterServerEvent('esx_weashop:buyLicense') AddEventHandler('esx_weashop:buyLicense', function () local _source = source @@ -32,49 +52,14 @@ AddEventHandler('esx_weashop:buyLicense', function () end) ESX.RegisterServerCallback('esx_weashop:requestDBItems', function(source, cb) - MySQL.Async.fetchAll('SELECT * FROM weashops', - {}, function(result) - local shopItems = {} - for i=1, #result, 1 do - - if shopItems[result[i].name] == nil then - shopItems[result[i].name] = {} - end - - table.insert(shopItems[result[i].name], { - name = result[i].item, - price = result[i].price, - label = ESX.GetWeaponLabel(result[i].item) - }) - - end - - cb(shopItems) - - end - ) + LoadShopItems(cb) end) RegisterServerEvent('esx_weashop:buyItem') AddEventHandler('esx_weashop:buyItem', function(itemName, price, zone) - MySQL.Async.fetchAll('SELECT * FROM weashops', - {}, function(result) - local shopItems = {} - for i=1, #result, 1 do +LoadShopItems(function(shopItems) - if shopItems[result[i].name] == nil then - shopItems[result[i].name] = {} - end - - table.insert(shopItems[result[i].name], { - name = result[i].item, - price = result[i].price, - label = ESX.GetWeaponLabel(result[i].item) - }) - - end - - local _source = source + local _source = source local xPlayer = ESX.GetPlayerFromId(source) local account = xPlayer.getAccount('black_money') if price == shopItems[itemName].price then @@ -97,5 +82,8 @@ AddEventHandler('esx_weashop:buyItem', function(itemName, price, zone) end end - end) +end) + + + end) From 9cf5586d86b7e2d0305a5f9ae84ff6393532ba46 Mon Sep 17 00:00:00 2001 From: vecchiotom Date: Fri, 27 Apr 2018 21:10:51 +0200 Subject: [PATCH 28/63] I N D E N T --- server/main.lua | 102 ++++++++++++++++++++++++------------------------ 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/server/main.lua b/server/main.lua index 22d0fa21..36e8d7b1 100644 --- a/server/main.lua +++ b/server/main.lua @@ -5,85 +5,85 @@ TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) function LoadLicenses (source) TriggerEvent('esx_license:getLicenses', source, function (licenses) - TriggerClientEvent('esx_weashop:loadLicenses', source, licenses) + TriggerClientEvent('esx_weashop:loadLicenses', source, licenses) end) end if Config.EnableLicense == true then AddEventHandler('esx:playerLoaded', function (source) - LoadLicenses(source) + LoadLicenses(source) end) end function LoadShopItems(cb) - MySQL.Async.fetchAll('SELECT * FROM weashops', - {}, function(result) - local shopItems = {} - for i=1, #result, 1 do + MySQL.Async.fetchAll('SELECT * FROM weashops', + {}, function(result) + local shopItems = {} + for i=1, #result, 1 do - if shopItems[result[i].name] == nil then - shopItems[result[i].name] = {} - end + if shopItems[result[i].name] == nil then + shopItems[result[i].name] = {} + end - table.insert(shopItems[result[i].name], { - name = result[i].item, - price = result[i].price, - label = ESX.GetWeaponLabel(result[i].item) - }) - cb(shopItems) - end - end) + table.insert(shopItems[result[i].name], { + name = result[i].item, + price = result[i].price, + label = ESX.GetWeaponLabel(result[i].item) + }) + cb(shopItems) + end + end) end RegisterServerEvent('esx_weashop:buyLicense') AddEventHandler('esx_weashop:buyLicense', function () - local _source = source - local xPlayer = ESX.GetPlayerFromId(source) +local _source = source +local xPlayer = ESX.GetPlayerFromId(source) - if xPlayer.get('money') >= Config.LicensePrice then - xPlayer.removeMoney(Config.LicensePrice) +if xPlayer.get('money') >= Config.LicensePrice then + xPlayer.removeMoney(Config.LicensePrice) - TriggerEvent('esx_license:addLicense', _source, 'weapon', function () - LoadLicenses(_source) - end) - else - TriggerClientEvent('esx:showNotification', _source, _U('not_enough')) - end + TriggerEvent('esx_license:addLicense', _source, 'weapon', function () + LoadLicenses(_source) + end) +else + TriggerClientEvent('esx:showNotification', _source, _U('not_enough')) +end end) ESX.RegisterServerCallback('esx_weashop:requestDBItems', function(source, cb) - LoadShopItems(cb) +LoadShopItems(cb) end) RegisterServerEvent('esx_weashop:buyItem') AddEventHandler('esx_weashop:buyItem', function(itemName, price, zone) LoadShopItems(function(shopItems) - local _source = source - local xPlayer = ESX.GetPlayerFromId(source) - local account = xPlayer.getAccount('black_money') - if price == shopItems[itemName].price then - if zone=="BlackWeashop" then - if account.money >= price then - xPlayer.removeAccountMoney('black_money', price) - xPlayer.addWeapon(itemName, 42) - TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ESX.GetWeaponLabel(itemName)) - else - TriggerClientEvent('esx:showNotification', _source, _U('not_enough_black')) - end - else - if xPlayer.get('money') >= price then - xPlayer.removeMoney(price) - xPlayer.addWeapon(itemName, 42) - TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ESX.GetWeaponLabel(itemName)) - else - TriggerClientEvent('esx:showNotification', _source, _U('not_enough')) - end - end - end +local _source = source +local xPlayer = ESX.GetPlayerFromId(source) +local account = xPlayer.getAccount('black_money') +if price == shopItems[itemName].price then + if zone=="BlackWeashop" then + if account.money >= price then + xPlayer.removeAccountMoney('black_money', price) + xPlayer.addWeapon(itemName, 42) + TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ESX.GetWeaponLabel(itemName)) + else + TriggerClientEvent('esx:showNotification', _source, _U('not_enough_black')) + end + else + if xPlayer.get('money') >= price then + xPlayer.removeMoney(price) + xPlayer.addWeapon(itemName, 42) + TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ESX.GetWeaponLabel(itemName)) + else + TriggerClientEvent('esx:showNotification', _source, _U('not_enough')) + end + end +end end) - + end) From 9b6ccb83585ec3fb8be73dee214d69e60cf4f7ad Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 8 May 2018 20:53:23 +0200 Subject: [PATCH 29/63] Revert "Merge pull request #17 from vecchiotom/master" This reverts commit 1630375a58698e041290eb5d1618e6997a77c3ca, reversing changes made to 63b75486a1a32ed45f3ff9247a9f9579e19bcf97. --- server/main.lua | 116 ++++++++++++++++++++++-------------------------- 1 file changed, 54 insertions(+), 62 deletions(-) diff --git a/server/main.lua b/server/main.lua index 36e8d7b1..672e113d 100644 --- a/server/main.lua +++ b/server/main.lua @@ -5,85 +5,77 @@ TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) function LoadLicenses (source) TriggerEvent('esx_license:getLicenses', source, function (licenses) - TriggerClientEvent('esx_weashop:loadLicenses', source, licenses) + TriggerClientEvent('esx_weashop:loadLicenses', source, licenses) end) end if Config.EnableLicense == true then AddEventHandler('esx:playerLoaded', function (source) - LoadLicenses(source) - end) -end - -function LoadShopItems(cb) - MySQL.Async.fetchAll('SELECT * FROM weashops', - {}, function(result) - local shopItems = {} - for i=1, #result, 1 do - - if shopItems[result[i].name] == nil then - shopItems[result[i].name] = {} - end - - table.insert(shopItems[result[i].name], { - name = result[i].item, - price = result[i].price, - label = ESX.GetWeaponLabel(result[i].item) - }) - cb(shopItems) - end + LoadLicenses(source) end) end RegisterServerEvent('esx_weashop:buyLicense') AddEventHandler('esx_weashop:buyLicense', function () -local _source = source -local xPlayer = ESX.GetPlayerFromId(source) + local _source = source + local xPlayer = ESX.GetPlayerFromId(source) -if xPlayer.get('money') >= Config.LicensePrice then - xPlayer.removeMoney(Config.LicensePrice) + if xPlayer.get('money') >= Config.LicensePrice then + xPlayer.removeMoney(Config.LicensePrice) - TriggerEvent('esx_license:addLicense', _source, 'weapon', function () - LoadLicenses(_source) - end) -else - TriggerClientEvent('esx:showNotification', _source, _U('not_enough')) -end + TriggerEvent('esx_license:addLicense', _source, 'weapon', function () + LoadLicenses(_source) + end) + else + TriggerClientEvent('esx:showNotification', _source, _U('not_enough')) + end end) ESX.RegisterServerCallback('esx_weashop:requestDBItems', function(source, cb) -LoadShopItems(cb) + MySQL.Async.fetchAll('SELECT * FROM weashops', + {}, function(result) + local shopItems = {} + for i=1, #result, 1 do + + if shopItems[result[i].name] == nil then + shopItems[result[i].name] = {} + end + + table.insert(shopItems[result[i].name], { + name = result[i].item, + price = result[i].price, + label = ESX.GetWeaponLabel(result[i].item) + }) + + end + + cb(shopItems) + + end + ) end) RegisterServerEvent('esx_weashop:buyItem') AddEventHandler('esx_weashop:buyItem', function(itemName, price, zone) -LoadShopItems(function(shopItems) - -local _source = source -local xPlayer = ESX.GetPlayerFromId(source) -local account = xPlayer.getAccount('black_money') -if price == shopItems[itemName].price then - if zone=="BlackWeashop" then - if account.money >= price then - xPlayer.removeAccountMoney('black_money', price) - xPlayer.addWeapon(itemName, 42) - TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ESX.GetWeaponLabel(itemName)) - else - TriggerClientEvent('esx:showNotification', _source, _U('not_enough_black')) - end - else - if xPlayer.get('money') >= price then - xPlayer.removeMoney(price) - xPlayer.addWeapon(itemName, 42) - TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ESX.GetWeaponLabel(itemName)) - else - TriggerClientEvent('esx:showNotification', _source, _U('not_enough')) - end - end -end - -end) - - - + local _source = source + local xPlayer = ESX.GetPlayerFromId(source) + local account = xPlayer.getAccount('black_money') + + if zone=="BlackWeashop" then + if account.money >= price then + xPlayer.removeAccountMoney('black_money', price) + xPlayer.addWeapon(itemName, 42) + TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ESX.GetWeaponLabel(itemName)) + else + TriggerClientEvent('esx:showNotification', _source, _U('not_enough_black')) + end + else + if xPlayer.get('money') >= price then + xPlayer.removeMoney(price) + xPlayer.addWeapon(itemName, 42) + TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ESX.GetWeaponLabel(itemName)) + else + TriggerClientEvent('esx:showNotification', _source, _U('not_enough')) + end + end end) From 99623ef6e89375a35a7fac2e144815dceb6e5bcb Mon Sep 17 00:00:00 2001 From: AdrineX Date: Tue, 12 Jun 2018 21:49:30 +0300 Subject: [PATCH 30/63] Add Finnish lang... --- __resource.lua | 2 ++ locales/fi.lua | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 locales/fi.lua diff --git a/__resource.lua b/__resource.lua index 3ce22bc1..3b1adb8c 100644 --- a/__resource.lua +++ b/__resource.lua @@ -9,6 +9,7 @@ client_scripts { 'locales/de.lua', 'locales/br.lua', 'locales/en.lua', + 'locales/fi.lua', 'locales/fr.lua', 'locales/es.lua', 'config.lua', @@ -20,6 +21,7 @@ server_scripts { 'locales/de.lua', 'locales/br.lua', 'locales/en.lua', + 'locales/fi.lua', 'locales/fr.lua', 'locales/es.lua', '@mysql-async/lib/MySQL.lua', diff --git a/locales/fi.lua b/locales/fi.lua new file mode 100644 index 00000000..5e897af2 --- /dev/null +++ b/locales/fi.lua @@ -0,0 +1,13 @@ +Locales ['fi'] = { + + ['buy_license'] = 'osta lisenssi?', + ['yes'] = 'kyllä', + ['no'] = 'ei', + ['buy'] = 'sinä ostit', + ['not_enough_black'] = 'ei tarpeeksi likaista rahaa', + ['not_enough'] = 'sinulla ei ole tarpeeksi rahaa', + ['shop'] = 'kauppa', + ['shop_menu'] = 'paina ~INPUT_CONTEXT~ avataksesi kauppa ikkuna.', + ['map_blip'] = 'asekauppa', + +} From 8197f3106fd1ab079526784fc3a56e255f7d5335 Mon Sep 17 00:00:00 2001 From: AdrineX Date: Wed, 13 Jun 2018 01:00:15 +0300 Subject: [PATCH 31/63] Added sql file --- localization/fi_esx_weashops.sql | 58 ++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 localization/fi_esx_weashops.sql diff --git a/localization/fi_esx_weashops.sql b/localization/fi_esx_weashops.sql new file mode 100644 index 00000000..f6e7cb68 --- /dev/null +++ b/localization/fi_esx_weashops.sql @@ -0,0 +1,58 @@ +USE `essentialmode`; + +CREATE TABLE `weashops` ( + + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(255) NOT NULL, + `item` varchar(255) NOT NULL, + `price` int(11) NOT NULL, + + PRIMARY KEY (`id`) +); + +INSERT INTO `licenses` (type, label) VALUES + ('weapon', "Aselupa") +; + +INSERT INTO `weashops` (name, item, price) VALUES + ('GunShop','WEAPON_PISTOL',300), + ('BlackWeashop','WEAPON_PISTOL',500), + ('GunShop', 'WEAPON_FLASHLIGHT', 60), + ('BlackWeashop', 'WEAPON_FLASHLIGHT', 70), + ('GunShop', 'WEAPON_MACHETE', 90), + ('BlackWeashop', 'WEAPON_MACHETE', 110), + ('GunShop', 'WEAPON_NIGHTSTICK', 150), + ('BlackWeashop', 'WEAPON_NIGHTSTICK', 150), + ('GunShop', 'WEAPON_BAT', 100), + ('BlackWeashop', 'WEAPON_BAT', 100), + ('GunShop', 'WEAPON_STUNGUN', 50), + ('BlackWeashop', 'WEAPON_STUNGUN', 50), + ('GunShop', 'WEAPON_MICROSMG', 1400), + ('BlackWeashop', 'WEAPON_MICROSMG', 1700), + ('GunShop', 'WEAPON_PUMPSHOTGUN', 3400), + ('BlackWeashop', 'WEAPON_PUMPSHOTGUN', 3500), + ('GunShop', 'WEAPON_ASSAULTRIFLE', 10000), + ('BlackWeashop', 'WEAPON_ASSAULTRIFLE', 11000), + ('GunShop', 'WEAPON_SPECIALCARBINE', 15000), + ('BlackWeashop', 'WEAPON_SPECIALCARBINE', 16500), + ('GunShop', 'WEAPON_SNIPERRIFLE', 22000), + ('BlackWeashop', 'WEAPON_SNIPERRIFLE', 24000), + ('GunShop', 'WEAPON_FIREWORK', 18000), + ('BlackWeashop', 'WEAPON_FIREWORK', 20000), + ('GunShop', 'WEAPON_GRENADE', 500), + ('BlackWeashop', 'WEAPON_GRENADE', 650), + ('GunShop', 'WEAPON_BZGAS', 200), + ('BlackWeashop', 'WEAPON_BZGAS', 350), + ('GunShop', 'WEAPON_FIREEXTINGUISHER', 100), + ('BlackWeashop', 'WEAPON_FIREEXTINGUISHER', 100), + ('GunShop', 'WEAPON_BALL', 50), + ('BlackWeashop', 'WEAPON_BALL', 50), + ('GunShop', 'WEAPON_SMOKEGRENADE', 100), + ('BlackWeashop', 'WEAPON_SMOKEGRENADE', 100), + ('BlackWeashop', 'WEAPON_APPISTOL', 1100), + ('BlackWeashop', 'WEAPON_CARBINERIFLE', 12000), + ('BlackWeashop', 'WEAPON_HEAVYSNIPER', 30000), + ('BlackWeashop', 'WEAPON_MINIGUN', 45000), + ('BlackWeashop', 'WEAPON_RAILGUN', 50000), + ('BlackWeashop', 'WEAPON_STICKYBOMB', 500) +; From f315be9369065243ac8a7ffce03d9d1ad1179096 Mon Sep 17 00:00:00 2001 From: deviljin112 <39461646+deviljin112@users.noreply.github.com> Date: Mon, 23 Jul 2018 21:49:11 +0100 Subject: [PATCH 32/63] Polish Translation --- __resource.lua | 2 ++ locales/pl.lua | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 locales/pl.lua diff --git a/__resource.lua b/__resource.lua index 3b1adb8c..e61bc142 100644 --- a/__resource.lua +++ b/__resource.lua @@ -12,6 +12,7 @@ client_scripts { 'locales/fi.lua', 'locales/fr.lua', 'locales/es.lua', + 'locales/pl.lua', 'config.lua', 'client/main.lua' } @@ -24,6 +25,7 @@ server_scripts { 'locales/fi.lua', 'locales/fr.lua', 'locales/es.lua', + 'locales/pl.lua', '@mysql-async/lib/MySQL.lua', 'config.lua', 'server/main.lua' diff --git a/locales/pl.lua b/locales/pl.lua new file mode 100644 index 00000000..26b33140 --- /dev/null +++ b/locales/pl.lua @@ -0,0 +1,13 @@ +Locales ['pl'] = { + + ['buy_license'] = 'czy chcesz kupić licencję?', + ['yes'] = 'tak', + ['no'] = 'nie', + ['buy'] = 'kupiłeś', + ['not_enough_black'] = 'nie masz wystarczająco brudnej kasy', + ['not_enough'] = 'nie masz wystarczająco pieniędzy', + ['shop'] = 'sklep', + ['shop_menu'] = 'Wciśnij ~INPUT_CONTEXT~ aby otworzyć sklep.', + ['map_blip'] = 'sklep z bronią', + +} From a8f5adbf18eca906c3dfc3f86ab602df21e9b9f1 Mon Sep 17 00:00:00 2001 From: deviljin112 <39461646+deviljin112@users.noreply.github.com> Date: Mon, 23 Jul 2018 22:27:44 +0100 Subject: [PATCH 33/63] Update pl.lua quick fix --- locales/pl.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/pl.lua b/locales/pl.lua index 26b33140..bdbe4278 100644 --- a/locales/pl.lua +++ b/locales/pl.lua @@ -3,7 +3,7 @@ Locales ['pl'] = { ['buy_license'] = 'czy chcesz kupić licencję?', ['yes'] = 'tak', ['no'] = 'nie', - ['buy'] = 'kupiłeś', + ['buy'] = 'kupiłeś/aś', ['not_enough_black'] = 'nie masz wystarczająco brudnej kasy', ['not_enough'] = 'nie masz wystarczająco pieniędzy', ['shop'] = 'sklep', From d4e494ad39af4fcc370f843bb917dfb6d9a513be Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Fri, 10 Aug 2018 00:56:27 -0400 Subject: [PATCH 34/63] Repo Update --- .editorconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.editorconfig b/.editorconfig index 4bfca33b..9b425256 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,9 +1,9 @@ root = true [*] -indent_size = 2 -indent_style = space -end_of_line = lf +indent_size = 4 +indent_style = tab +end_of_line = crlf charset = utf-8 trim_trailing_whitespace = true -insert_final_newline = true +insert_final_newline = true \ No newline at end of file From ca85a1fff6ee5da5b7d72105f8f15643cba6cae5 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 22 Oct 2018 22:50:43 +0200 Subject: [PATCH 35/63] Initial cleanup --- client/main.lua | 37 +++++++++++++++++++++++-------------- locales/br.lua | 7 ++++--- locales/de.lua | 7 ++++--- locales/en.lua | 6 ++---- locales/es.lua | 17 +++++++++-------- locales/fi.lua | 4 +--- locales/fr.lua | 6 ++---- locales/pl.lua | 4 +--- server/main.lua | 32 +++++++++++++++----------------- 9 files changed, 61 insertions(+), 59 deletions(-) diff --git a/client/main.lua b/client/main.lua index 21fd1b0a..3ef1c599 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,3 +1,15 @@ +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 @@ -31,12 +43,11 @@ end) function OpenBuyLicenseMenu(zone) ESX.UI.Menu.CloseAll() - ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'shop_license', - { + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'shop_license', { title = _U('buy_license'), elements = { { label = _U('yes') .. ' ($' .. Config.LicensePrice .. ')', value = 'yes' }, - { label = _U('no'), value = 'no' }, + { label = _U('no'), value = 'no' } } }, function (data, menu) if data.current.value == 'yes' then @@ -45,8 +56,7 @@ function OpenBuyLicenseMenu(zone) menu.close() end, function (data, menu) menu.close() - end - ) + end) end function OpenShopMenu(zone) @@ -62,21 +72,21 @@ function OpenShopMenu(zone) price = item.price }) end + ESX.UI.Menu.CloseAll() - ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'shop', - { + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'shop', { title = _U('shop'), elements = elements }, function(data, menu) TriggerServerEvent('esx_weashop:buyItem', data.current.value, data.current.price, zone) end, function(data, menu) menu.close() + CurrentAction = 'shop_menu' CurrentActionMsg = _U('shop_menu') CurrentActionData = {zone = zone} - end - ) + end) end AddEventHandler('esx_weashop:hasEnteredMarker', function(zone) @@ -96,11 +106,13 @@ Citizen.CreateThread(function() if v.legal==0 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, 154) SetBlipDisplay(blip, 4) SetBlipScale (blip, 1.0) SetBlipColour (blip, 2) SetBlipAsShortRange(blip, true) + BeginTextCommandSetBlipName("STRING") AddTextComponentString(_U('map_blip')) EndTextCommandSetBlipName(blip) @@ -159,12 +171,9 @@ Citizen.CreateThread(function() while true do Citizen.Wait(0) if CurrentAction ~= nil then + ESX.ShowHelpNotification(CurrentActionMsg) - SetTextComponentFormat('STRING') - AddTextComponentString(CurrentActionMsg) - DisplayHelpTextFromStringLabel(0, 0, 1, -1) - - if IsControlJustReleased(0, 38) then + if IsControlJustReleased(0, Keys['E']) then if CurrentAction == 'shop_menu' then if Config.EnableLicense == true then diff --git a/locales/br.lua b/locales/br.lua index 2c67d44d..e35d36b6 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,10 +1,11 @@ Locales ['br'] = { - - ['buy'] = 'Você comprou', + ['buy_license'] = 'buy weapon license?', + ['yes'] = 'yes', + ['no'] = 'no', + ['buy'] = 'Você comprou %s', ['not_enough_black'] = 'Você não tem dinheiro sujo suficiente', ['not_enough'] = 'você não tem dinheiro suficiente', ['shop'] = 'Comprar', ['shop_menu'] = 'Pressione ~INPUT_CONTEXT~ para comprar armas.', ['map_blip'] = 'Loja de Armas', - } diff --git a/locales/de.lua b/locales/de.lua index d18dc9a1..4f1f3821 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -1,10 +1,11 @@ Locales ['de'] = { - - ['buy'] = 'du kaufst', + ['buy_license'] = 'buy weapon license?', + ['yes'] = 'yes', + ['no'] = 'no', + ['buy'] = 'du kaufst %s', ['not_enough_black'] = 'du hast nicht genug Schwarzgeld', ['not_enough'] = 'du hast nicht genug Geld', ['shop'] = 'Geschäft', ['shop_menu'] = 'Drücke ~INPUT_CONTEXT~ um auf das Geschäft zuzugreifen.', ['map_blip'] = 'Waffenladen', - } diff --git a/locales/en.lua b/locales/en.lua index e0fab708..f61744b7 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,13 +1,11 @@ Locales ['en'] = { - - ['buy_license'] = 'buy a license?', + ['buy_license'] = 'buy weapon license?', ['yes'] = 'yes', ['no'] = 'no', - ['buy'] = 'you bought', + ['buy'] = 'you bought %s', ['not_enough_black'] = 'you do not have enough dirty money', ['not_enough'] = 'you do not have enough money', ['shop'] = 'shop', ['shop_menu'] = 'Press ~INPUT_CONTEXT~ to access the shop.', ['map_blip'] = 'gun shop', - } diff --git a/locales/es.lua b/locales/es.lua index de77e82e..f3e8e6a4 100644 --- a/locales/es.lua +++ b/locales/es.lua @@ -1,10 +1,11 @@ Locales ['es'] = { - - ['buy'] = 'Has comprado ~b~1 ', - ['not_enough_black'] = 'Usted no tiene ~r~suficiente~s~ dinero negro', - ['not_enough'] = 'Usted no tiene ~r~suficiente~s~ dinero', - ['shop'] = 'Tienda', - ['shop_menu'] = 'Presione ~INPUT_CONTEXT~ para acceder a la tienda.', - ['map_blip'] = 'Arsenal', - + ['buy_license'] = 'buy weapon license?', + ['yes'] = 'yes', + ['no'] = 'no', + ['buy'] = 'has comprado %s', + ['not_enough_black'] = 'usted no tiene ~r~suficiente~s~ dinero negro', + ['not_enough'] = 'usted no tiene ~r~suficiente~s~ dinero', + ['shop'] = 'tienda', + ['shop_menu'] = 'presione ~INPUT_CONTEXT~ para acceder a la tienda.', + ['map_blip'] = 'arsenal', } diff --git a/locales/fi.lua b/locales/fi.lua index 5e897af2..99824514 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -1,13 +1,11 @@ Locales ['fi'] = { - ['buy_license'] = 'osta lisenssi?', ['yes'] = 'kyllä', ['no'] = 'ei', - ['buy'] = 'sinä ostit', + ['buy'] = 'sinä ostit %s', ['not_enough_black'] = 'ei tarpeeksi likaista rahaa', ['not_enough'] = 'sinulla ei ole tarpeeksi rahaa', ['shop'] = 'kauppa', ['shop_menu'] = 'paina ~INPUT_CONTEXT~ avataksesi kauppa ikkuna.', ['map_blip'] = 'asekauppa', - } diff --git a/locales/fr.lua b/locales/fr.lua index 8f9b2862..23a4343f 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,13 +1,11 @@ Locales ['fr'] = { - - ['buy_license'] = 'acheter une license ?', + ['buy_license'] = 'acheter une license?', ['yes'] = 'oui', ['no'] = 'non', - ['buy'] = 'vous avez acheté ~b~1x ', + ['buy'] = 'vous avez acheté %s', ['not_enough_black'] = 'Vous n\'avez ~r~pas assez~s~ d\'argent sale', ['not_enough'] = 'vous n\'avez ~r~pas assez~s~ d\'argent', ['shop'] = 'magasin', ['shop_menu'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder au magasin.', ['map_blip'] = 'armurerie', - } diff --git a/locales/pl.lua b/locales/pl.lua index bdbe4278..ba7bd450 100644 --- a/locales/pl.lua +++ b/locales/pl.lua @@ -1,13 +1,11 @@ Locales ['pl'] = { - ['buy_license'] = 'czy chcesz kupić licencję?', ['yes'] = 'tak', ['no'] = 'nie', - ['buy'] = 'kupiłeś/aś', + ['buy'] = 'kupiłeś/aś %s', ['not_enough_black'] = 'nie masz wystarczająco brudnej kasy', ['not_enough'] = 'nie masz wystarczająco pieniędzy', ['shop'] = 'sklep', ['shop_menu'] = 'Wciśnij ~INPUT_CONTEXT~ aby otworzyć sklep.', ['map_blip'] = 'sklep z bronią', - } diff --git a/server/main.lua b/server/main.lua index 672e113d..ecc2859b 100644 --- a/server/main.lua +++ b/server/main.lua @@ -3,16 +3,16 @@ local ItemsLabels = {} TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) -function LoadLicenses (source) - TriggerEvent('esx_license:getLicenses', source, function (licenses) - TriggerClientEvent('esx_weashop:loadLicenses', source, licenses) - end) +function LoadLicenses(source) + TriggerEvent('esx_license:getLicenses', source, function (licenses) + TriggerClientEvent('esx_weashop:loadLicenses', source, licenses) + end) end if Config.EnableLicense == true then - AddEventHandler('esx:playerLoaded', function (source) - LoadLicenses(source) - end) + AddEventHandler('esx:playerLoaded', function (source) + LoadLicenses(source) + end) end RegisterServerEvent('esx_weashop:buyLicense') @@ -23,7 +23,7 @@ AddEventHandler('esx_weashop:buyLicense', function () if xPlayer.get('money') >= Config.LicensePrice then xPlayer.removeMoney(Config.LicensePrice) - TriggerEvent('esx_license:addLicense', _source, 'weapon', function () + TriggerEvent('esx_license:addLicense', _source, 'weapon', function() LoadLicenses(_source) end) else @@ -32,9 +32,9 @@ AddEventHandler('esx_weashop:buyLicense', function () end) ESX.RegisterServerCallback('esx_weashop:requestDBItems', function(source, cb) - MySQL.Async.fetchAll('SELECT * FROM weashops', - {}, function(result) + MySQL.Async.fetchAll('SELECT * FROM weashops', {}, function(result) local shopItems = {} + for i=1, #result, 1 do if shopItems[result[i].name] == nil then @@ -50,9 +50,7 @@ ESX.RegisterServerCallback('esx_weashop:requestDBItems', function(source, cb) end cb(shopItems) - - end - ) + end) end) RegisterServerEvent('esx_weashop:buyItem') @@ -61,19 +59,19 @@ AddEventHandler('esx_weashop:buyItem', function(itemName, price, zone) local xPlayer = ESX.GetPlayerFromId(source) local account = xPlayer.getAccount('black_money') - if zone=="BlackWeashop" then + if zone == "BlackWeashop" then if account.money >= price then xPlayer.removeAccountMoney('black_money', price) xPlayer.addWeapon(itemName, 42) - TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ESX.GetWeaponLabel(itemName)) + TriggerClientEvent('esx:showNotification', _source, _U('buy', ESX.GetWeaponLabel(itemName))) else TriggerClientEvent('esx:showNotification', _source, _U('not_enough_black')) end else - if xPlayer.get('money') >= price then + if xPlayer.getMoney() >= price then xPlayer.removeMoney(price) xPlayer.addWeapon(itemName, 42) - TriggerClientEvent('esx:showNotification', _source, _U('buy') .. ESX.GetWeaponLabel(itemName)) + TriggerClientEvent('esx:showNotification', _source, _U('buy', ESX.GetWeaponLabel(itemName))) else TriggerClientEvent('esx:showNotification', _source, _U('not_enough')) end From fb4887565c2f8fe5a5376468ddd03eaeda941e4e Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 22 Oct 2018 23:17:36 +0200 Subject: [PATCH 36/63] Properly formatted strings --- __resource.lua | 30 +++++++++++++++--------------- client/main.lua | 48 ++++++++++++++++++++++++------------------------ config.lua | 44 ++++++++++++++++++++++---------------------- locales/br.lua | 13 +++++++------ locales/de.lua | 9 +++++---- locales/en.lua | 9 +++++---- locales/es.lua | 3 ++- locales/fi.lua | 3 ++- locales/fr.lua | 3 ++- locales/pl.lua | 3 ++- server/main.lua | 23 +++++++++++------------ 11 files changed, 97 insertions(+), 91 deletions(-) diff --git a/__resource.lua b/__resource.lua index e61bc142..1b141e5c 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,9 +1,23 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' -description 'ESX Weaponshop' +description 'ESX Weapon Shop' version '1.0.2' +server_scripts { + '@mysql-async/lib/MySQL.lua', + '@es_extended/locale.lua', + 'locales/de.lua', + 'locales/br.lua', + 'locales/en.lua', + 'locales/fi.lua', + 'locales/fr.lua', + 'locales/es.lua', + 'locales/pl.lua', + 'config.lua', + 'server/main.lua' +} + client_scripts { '@es_extended/locale.lua', 'locales/de.lua', @@ -16,17 +30,3 @@ client_scripts { 'config.lua', 'client/main.lua' } - -server_scripts { - '@es_extended/locale.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/es.lua', - 'locales/pl.lua', - '@mysql-async/lib/MySQL.lua', - 'config.lua', - 'server/main.lua' -} diff --git a/client/main.lua b/client/main.lua index 3ef1c599..63b85064 100644 --- a/client/main.lua +++ b/client/main.lua @@ -23,16 +23,7 @@ Citizen.CreateThread(function() TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) Citizen.Wait(0) end -end) -RegisterNetEvent('esx_weashop:loadLicenses') -AddEventHandler('esx_weashop:loadLicenses', function (licenses) - for i = 1, #licenses, 1 do - Licenses[licenses[i].type] = true - end -end) - -AddEventHandler('onClientMapStart', function() ESX.TriggerServerCallback('esx_weashop:requestDBItems', function(ShopItems) for k,v in pairs(ShopItems) do Config.Zones[k].Items = v @@ -40,13 +31,20 @@ AddEventHandler('onClientMapStart', function() end) end) +RegisterNetEvent('esx_weashop:loadLicenses') +AddEventHandler('esx_weashop:loadLicenses', function(licenses) + for i = 1, #licenses, 1 do + Licenses[licenses[i].type] = true + end +end) + function OpenBuyLicenseMenu(zone) ESX.UI.Menu.CloseAll() ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'shop_license', { title = _U('buy_license'), elements = { - { label = _U('yes') .. ' ($' .. Config.LicensePrice .. ')', value = 'yes' }, + { label = _U('yes', ('%s'):format(ESX.Math.GroupDigits(_U('shop_menu_item', Config.LicensePrice)))), value = 'yes' }, { label = _U('no'), value = 'no' } } }, function (data, menu) @@ -66,10 +64,9 @@ function OpenShopMenu(zone) local item = Config.Zones[zone].Items[i] table.insert(elements, { - label = item.label .. ' - $' .. item.price .. ' ', - realLabel = item.label, - value = item.name, - price = item.price + label = ('%s - %s'):format(item.label, ESX.Math.GroupDigits(_U('shop_menu_item', item.price))), + weaponName = item.item, + price = item.price }) end @@ -79,20 +76,20 @@ function OpenShopMenu(zone) title = _U('shop'), elements = elements }, function(data, menu) - TriggerServerEvent('esx_weashop:buyItem', data.current.value, data.current.price, zone) + TriggerServerEvent('esx_weashop:buyItem', data.current.weaponName, data.current.price, zone) end, function(data, menu) menu.close() CurrentAction = 'shop_menu' CurrentActionMsg = _U('shop_menu') - CurrentActionData = {zone = zone} + CurrentActionData = { zone = zone } end) end AddEventHandler('esx_weashop:hasEnteredMarker', function(zone) CurrentAction = 'shop_menu' CurrentActionMsg = _U('shop_menu') - CurrentActionData = {zone = zone} + CurrentActionData = { zone = zone } end) AddEventHandler('esx_weashop:hasExitedMarker', function(zone) @@ -107,10 +104,10 @@ Citizen.CreateThread(function() for i = 1, #v.Pos, 1 do local blip = AddBlipForCoord(v.Pos[i].x, v.Pos[i].y, v.Pos[i].z) - SetBlipSprite (blip, 154) + SetBlipSprite (blip, 110) SetBlipDisplay(blip, 4) SetBlipScale (blip, 1.0) - SetBlipColour (blip, 2) + SetBlipColour (blip, 81) SetBlipAsShortRange(blip, true) BeginTextCommandSetBlipName("STRING") @@ -124,8 +121,10 @@ end) -- Display markers Citizen.CreateThread(function() while true do - Citizen.Wait(0) - local coords = GetEntityCoords(GetPlayerPed(-1)) + Citizen.Wait(0) + + 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 @@ -140,7 +139,8 @@ end) Citizen.CreateThread(function() while true do Citizen.Wait(0) - local coords = GetEntityCoords(GetPlayerPed(-1)) + + local coords = GetEntityCoords(PlayerPedId()) local isInMarker = false local currentZone = nil @@ -170,13 +170,13 @@ end) Citizen.CreateThread(function() while true do Citizen.Wait(0) + if CurrentAction ~= nil then ESX.ShowHelpNotification(CurrentActionMsg) if IsControlJustReleased(0, Keys['E']) then - if CurrentAction == 'shop_menu' then - if Config.EnableLicense == true then + if Config.EnableLicense then if Licenses['weapon'] ~= nil or Config.Zones[CurrentActionData.zone].legal == 1 then OpenShopMenu(CurrentActionData.zone) else diff --git a/config.lua b/config.lua index cbe06869..ab01d636 100644 --- a/config.lua +++ b/config.lua @@ -9,29 +9,29 @@ Config.LicensePrice = 5000 Config.Zones = { - GunShop = { - legal = 0, - Items = {}, - Pos = { - { x = -662.180, y = -934.961, z = 20.829 }, - { x = 810.25, y = -2157.60, z = 28.62 }, - { x = 1693.44, y = 3760.16, z = 33.71 }, - { x = -330.24, y = 6083.88, z = 30.45 }, - { x = 252.63, y = -50.00, z = 68.94 }, - { x = 22.09, y = -1107.28, z = 28.80 }, - { x = 2567.69, y = 294.38, z = 107.73 }, - { x = -1117.58, y = 2698.61, z = 17.55 }, - { x = 842.44, y = -1033.42, z = 27.19 }, + GunShop = { + legal = 0, + Items = {}, + Pos = { + { x = -662.180, y = -934.961, z = 20.829 }, + { x = 810.25, y = -2157.60, z = 28.62 }, + { x = 1693.44, y = 3760.16, z = 33.71 }, + { x = -330.24, y = 6083.88, z = 30.45 }, + { x = 252.63, y = -50.00, z = 68.94 }, + { x = 22.09, y = -1107.28, z = 28.80 }, + { x = 2567.69, y = 294.38, z = 107.73 }, + { x = -1117.58, y = 2698.61, z = 17.55 }, + { x = 842.44, y = -1033.42, z = 27.19 }, - } - }, + } + }, - BlackWeashop = { - legal = 1, - Items = {}, - Pos = { - { x = -1306.239, y = -394.018, z = 35.695 }, - } - }, + BlackWeashop = { + legal = 1, + Items = {}, + Pos = { + { x = -1306.239, y = -394.018, z = 35.695 }, + } + }, } diff --git a/locales/br.lua b/locales/br.lua index e35d36b6..d4e9add3 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,11 +1,12 @@ Locales ['br'] = { ['buy_license'] = 'buy weapon license?', - ['yes'] = 'yes', + ['yes'] = '%s', ['no'] = 'no', - ['buy'] = 'Você comprou %s', - ['not_enough_black'] = 'Você não tem dinheiro sujo suficiente', + ['buy'] = 'você comprou %s', + ['not_enough_black'] = 'você não tem dinheiro sujo suficiente', ['not_enough'] = 'você não tem dinheiro suficiente', - ['shop'] = 'Comprar', - ['shop_menu'] = 'Pressione ~INPUT_CONTEXT~ para comprar armas.', - ['map_blip'] = 'Loja de Armas', + ['shop'] = 'comprar', + ['shop_menu'] = 'pressione ~INPUT_CONTEXT~ para comprar armas.', + ['shop_menu_item'] = 'R$%s', + ['map_blip'] = 'loja de Armas', } diff --git a/locales/de.lua b/locales/de.lua index 4f1f3821..070f3a7e 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -1,11 +1,12 @@ Locales ['de'] = { ['buy_license'] = 'buy weapon license?', - ['yes'] = 'yes', + ['yes'] = '%s', ['no'] = 'no', ['buy'] = 'du kaufst %s', ['not_enough_black'] = 'du hast nicht genug Schwarzgeld', ['not_enough'] = 'du hast nicht genug Geld', - ['shop'] = 'Geschäft', - ['shop_menu'] = 'Drücke ~INPUT_CONTEXT~ um auf das Geschäft zuzugreifen.', - ['map_blip'] = 'Waffenladen', + ['shop'] = 'geschäft', + ['shop_menu'] = 'drücke ~INPUT_CONTEXT~ um auf das Geschäft zuzugreifen.', + ['shop_menu_item'] = '%s EUR', + ['map_blip'] = 'waffenladen', } diff --git a/locales/en.lua b/locales/en.lua index f61744b7..cd95640e 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,11 +1,12 @@ Locales ['en'] = { ['buy_license'] = 'buy weapon license?', - ['yes'] = 'yes', + ['yes'] = '%s', ['no'] = 'no', ['buy'] = 'you bought %s', ['not_enough_black'] = 'you do not have enough dirty money', ['not_enough'] = 'you do not have enough money', - ['shop'] = 'shop', - ['shop_menu'] = 'Press ~INPUT_CONTEXT~ to access the shop.', - ['map_blip'] = 'gun shop', + ['shop'] = 'weapon shop', + ['shop_menu'] = 'press ~INPUT_CONTEXT~ to access the ~y~weapon store~s~.', + ['shop_menu_item'] = '$%s', + ['map_blip'] = 'weapon shop', } diff --git a/locales/es.lua b/locales/es.lua index f3e8e6a4..47d20ab2 100644 --- a/locales/es.lua +++ b/locales/es.lua @@ -1,11 +1,12 @@ Locales ['es'] = { ['buy_license'] = 'buy weapon license?', - ['yes'] = 'yes', + ['yes'] = '%s', ['no'] = 'no', ['buy'] = 'has comprado %s', ['not_enough_black'] = 'usted no tiene ~r~suficiente~s~ dinero negro', ['not_enough'] = 'usted no tiene ~r~suficiente~s~ dinero', ['shop'] = 'tienda', ['shop_menu'] = 'presione ~INPUT_CONTEXT~ para acceder a la tienda.', + ['shop_menu_item'] = '%s EUR', ['map_blip'] = 'arsenal', } diff --git a/locales/fi.lua b/locales/fi.lua index 99824514..fa1a60f2 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -1,11 +1,12 @@ Locales ['fi'] = { ['buy_license'] = 'osta lisenssi?', - ['yes'] = 'kyllä', + ['yes'] = '%s', ['no'] = 'ei', ['buy'] = 'sinä ostit %s', ['not_enough_black'] = 'ei tarpeeksi likaista rahaa', ['not_enough'] = 'sinulla ei ole tarpeeksi rahaa', ['shop'] = 'kauppa', ['shop_menu'] = 'paina ~INPUT_CONTEXT~ avataksesi kauppa ikkuna.', + ['shop_menu_item'] = '%s EUR', ['map_blip'] = 'asekauppa', } diff --git a/locales/fr.lua b/locales/fr.lua index 23a4343f..fbdbff49 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,11 +1,12 @@ Locales ['fr'] = { ['buy_license'] = 'acheter une license?', - ['yes'] = 'oui', + ['yes'] = '%s', ['no'] = 'non', ['buy'] = 'vous avez acheté %s', ['not_enough_black'] = 'Vous n\'avez ~r~pas assez~s~ d\'argent sale', ['not_enough'] = 'vous n\'avez ~r~pas assez~s~ d\'argent', ['shop'] = 'magasin', ['shop_menu'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder au magasin.', + ['shop_menu_item'] = '%s EUR', ['map_blip'] = 'armurerie', } diff --git a/locales/pl.lua b/locales/pl.lua index ba7bd450..d52dc9aa 100644 --- a/locales/pl.lua +++ b/locales/pl.lua @@ -1,11 +1,12 @@ Locales ['pl'] = { ['buy_license'] = 'czy chcesz kupić licencję?', - ['yes'] = 'tak', + ['yes'] = '%s', ['no'] = 'nie', ['buy'] = 'kupiłeś/aś %s', ['not_enough_black'] = 'nie masz wystarczająco brudnej kasy', ['not_enough'] = 'nie masz wystarczająco pieniędzy', ['shop'] = 'sklep', ['shop_menu'] = 'Wciśnij ~INPUT_CONTEXT~ aby otworzyć sklep.', + ['shop_menu_item'] = '%s PLN', ['map_blip'] = 'sklep z bronią', } diff --git a/server/main.lua b/server/main.lua index ecc2859b..7412e593 100644 --- a/server/main.lua +++ b/server/main.lua @@ -20,7 +20,7 @@ AddEventHandler('esx_weashop:buyLicense', function () local _source = source local xPlayer = ESX.GetPlayerFromId(source) - if xPlayer.get('money') >= Config.LicensePrice then + if xPlayer.getMoney() >= Config.LicensePrice then xPlayer.removeMoney(Config.LicensePrice) TriggerEvent('esx_license:addLicense', _source, 'weapon', function() @@ -37,12 +37,12 @@ ESX.RegisterServerCallback('esx_weashop:requestDBItems', function(source, cb) for i=1, #result, 1 do - if shopItems[result[i].name] == nil then - shopItems[result[i].name] = {} + if shopItems[result[i].zone] == nil then + shopItems[result[i].zone] = {} end - table.insert(shopItems[result[i].name], { - name = result[i].item, + table.insert(shopItems[result[i].zone], { + item = result[i].item, price = result[i].price, label = ESX.GetWeaponLabel(result[i].item) }) @@ -55,25 +55,24 @@ end) RegisterServerEvent('esx_weashop:buyItem') AddEventHandler('esx_weashop:buyItem', function(itemName, price, zone) - local _source = source - local xPlayer = ESX.GetPlayerFromId(source) + local xPlayer = ESX.GetPlayerFromId(source) local account = xPlayer.getAccount('black_money') - + if zone == "BlackWeashop" then if account.money >= price then xPlayer.removeAccountMoney('black_money', price) xPlayer.addWeapon(itemName, 42) - TriggerClientEvent('esx:showNotification', _source, _U('buy', ESX.GetWeaponLabel(itemName))) + TriggerClientEvent('esx:showNotification', source, _U('buy', ESX.GetWeaponLabel(itemName))) else - TriggerClientEvent('esx:showNotification', _source, _U('not_enough_black')) + TriggerClientEvent('esx:showNotification', source, _U('not_enough_black')) end else if xPlayer.getMoney() >= price then xPlayer.removeMoney(price) xPlayer.addWeapon(itemName, 42) - TriggerClientEvent('esx:showNotification', _source, _U('buy', ESX.GetWeaponLabel(itemName))) + TriggerClientEvent('esx:showNotification', source, _U('buy', ESX.GetWeaponLabel(itemName))) else - TriggerClientEvent('esx:showNotification', _source, _U('not_enough')) + TriggerClientEvent('esx:showNotification', source, _U('not_enough')) end end end) From c7ea22d4642060050a871ae6176afaa54cfbf623 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 22 Oct 2018 23:28:03 +0200 Subject: [PATCH 37/63] Get price server side --- README.md | 2 +- client/main.lua | 13 ++++--- esx_weashops.sql | 21 ++++++------ localization/fi_esx_weashops.sql | 58 -------------------------------- server/main.lua | 43 ++++++++++++++--------- 5 files changed, 45 insertions(+), 92 deletions(-) delete mode 100644 localization/fi_esx_weashops.sql diff --git a/README.md b/README.md index 3e851a93..e3b90b2a 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ start esx_weashops # Legal ### License -esx_weashops - Legal or illegal gun shop +esx_weashops - Legal and illegal weapon shop Copyright (C) 2015-2018 Jérémie N'gadi diff --git a/client/main.lua b/client/main.lua index 63b85064..aac235c5 100644 --- a/client/main.lua +++ b/client/main.lua @@ -47,12 +47,12 @@ function OpenBuyLicenseMenu(zone) { label = _U('yes', ('%s'):format(ESX.Math.GroupDigits(_U('shop_menu_item', Config.LicensePrice)))), value = 'yes' }, { label = _U('no'), value = 'no' } } - }, function (data, menu) + }, function(data, menu) if data.current.value == 'yes' then TriggerServerEvent('esx_weashop:buyLicense') end menu.close() - end, function (data, menu) + end, function(data, menu) menu.close() end) end @@ -65,8 +65,7 @@ function OpenShopMenu(zone) table.insert(elements, { label = ('%s - %s'):format(item.label, ESX.Math.GroupDigits(_U('shop_menu_item', item.price))), - weaponName = item.item, - price = item.price + weaponName = item.item }) end @@ -76,7 +75,7 @@ function OpenShopMenu(zone) title = _U('shop'), elements = elements }, function(data, menu) - TriggerServerEvent('esx_weashop:buyItem', data.current.weaponName, data.current.price, zone) + TriggerServerEvent('esx_weashop:buyItem', data.current.weaponName, zone) end, function(data, menu) menu.close() @@ -145,7 +144,7 @@ Citizen.CreateThread(function() local currentZone = nil for k,v in pairs(Config.Zones) do - for i = 1, #v.Pos, 1 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 ShopItems = v.Items @@ -176,7 +175,7 @@ Citizen.CreateThread(function() if IsControlJustReleased(0, Keys['E']) then if CurrentAction == 'shop_menu' then - if Config.EnableLicense then + if Config.LicenseEnable then if Licenses['weapon'] ~= nil or Config.Zones[CurrentActionData.zone].legal == 1 then OpenShopMenu(CurrentActionData.zone) else diff --git a/esx_weashops.sql b/esx_weashops.sql index ca1f2bc9..28e5744e 100644 --- a/esx_weashops.sql +++ b/esx_weashops.sql @@ -1,22 +1,21 @@ USE `essentialmode`; CREATE TABLE `weashops` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `zone` varchar(255) NOT NULL, + `item` varchar(255) NOT NULL, + `price` int(11) NOT NULL, - `id` int(11) NOT NULL AUTO_INCREMENT, - `name` varchar(255) NOT NULL, - `item` varchar(255) NOT NULL, - `price` int(11) NOT NULL, - - PRIMARY KEY (`id`) + PRIMARY KEY (`id`) ); -INSERT INTO `licenses` (type, label) VALUES - ('weapon', "Permis de port d'arme") +INSERT INTO `licenses` (`type`, `label`) VALUES + ('weapon', "Permis de port d'arme") ; -INSERT INTO `weashops` (name, item, price) VALUES - ('GunShop','WEAPON_PISTOL',300), - ('BlackWeashop','WEAPON_PISTOL',500), +INSERT INTO `weashops` (`zone` `item`, `price`) VALUES + ('GunShop','WEAPON_PISTOL', 300), + ('BlackWeashop','WEAPON_PISTOL', 500), ('GunShop', 'WEAPON_FLASHLIGHT', 60), ('BlackWeashop', 'WEAPON_FLASHLIGHT', 70), ('GunShop', 'WEAPON_MACHETE', 90), diff --git a/localization/fi_esx_weashops.sql b/localization/fi_esx_weashops.sql deleted file mode 100644 index f6e7cb68..00000000 --- a/localization/fi_esx_weashops.sql +++ /dev/null @@ -1,58 +0,0 @@ -USE `essentialmode`; - -CREATE TABLE `weashops` ( - - `id` int(11) NOT NULL AUTO_INCREMENT, - `name` varchar(255) NOT NULL, - `item` varchar(255) NOT NULL, - `price` int(11) NOT NULL, - - PRIMARY KEY (`id`) -); - -INSERT INTO `licenses` (type, label) VALUES - ('weapon', "Aselupa") -; - -INSERT INTO `weashops` (name, item, price) VALUES - ('GunShop','WEAPON_PISTOL',300), - ('BlackWeashop','WEAPON_PISTOL',500), - ('GunShop', 'WEAPON_FLASHLIGHT', 60), - ('BlackWeashop', 'WEAPON_FLASHLIGHT', 70), - ('GunShop', 'WEAPON_MACHETE', 90), - ('BlackWeashop', 'WEAPON_MACHETE', 110), - ('GunShop', 'WEAPON_NIGHTSTICK', 150), - ('BlackWeashop', 'WEAPON_NIGHTSTICK', 150), - ('GunShop', 'WEAPON_BAT', 100), - ('BlackWeashop', 'WEAPON_BAT', 100), - ('GunShop', 'WEAPON_STUNGUN', 50), - ('BlackWeashop', 'WEAPON_STUNGUN', 50), - ('GunShop', 'WEAPON_MICROSMG', 1400), - ('BlackWeashop', 'WEAPON_MICROSMG', 1700), - ('GunShop', 'WEAPON_PUMPSHOTGUN', 3400), - ('BlackWeashop', 'WEAPON_PUMPSHOTGUN', 3500), - ('GunShop', 'WEAPON_ASSAULTRIFLE', 10000), - ('BlackWeashop', 'WEAPON_ASSAULTRIFLE', 11000), - ('GunShop', 'WEAPON_SPECIALCARBINE', 15000), - ('BlackWeashop', 'WEAPON_SPECIALCARBINE', 16500), - ('GunShop', 'WEAPON_SNIPERRIFLE', 22000), - ('BlackWeashop', 'WEAPON_SNIPERRIFLE', 24000), - ('GunShop', 'WEAPON_FIREWORK', 18000), - ('BlackWeashop', 'WEAPON_FIREWORK', 20000), - ('GunShop', 'WEAPON_GRENADE', 500), - ('BlackWeashop', 'WEAPON_GRENADE', 650), - ('GunShop', 'WEAPON_BZGAS', 200), - ('BlackWeashop', 'WEAPON_BZGAS', 350), - ('GunShop', 'WEAPON_FIREEXTINGUISHER', 100), - ('BlackWeashop', 'WEAPON_FIREEXTINGUISHER', 100), - ('GunShop', 'WEAPON_BALL', 50), - ('BlackWeashop', 'WEAPON_BALL', 50), - ('GunShop', 'WEAPON_SMOKEGRENADE', 100), - ('BlackWeashop', 'WEAPON_SMOKEGRENADE', 100), - ('BlackWeashop', 'WEAPON_APPISTOL', 1100), - ('BlackWeashop', 'WEAPON_CARBINERIFLE', 12000), - ('BlackWeashop', 'WEAPON_HEAVYSNIPER', 30000), - ('BlackWeashop', 'WEAPON_MINIGUN', 45000), - ('BlackWeashop', 'WEAPON_RAILGUN', 50000), - ('BlackWeashop', 'WEAPON_STICKYBOMB', 500) -; diff --git a/server/main.lua b/server/main.lua index 7412e593..ba6e5ba8 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,22 +1,21 @@ ESX = nil -local ItemsLabels = {} TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) function LoadLicenses(source) - TriggerEvent('esx_license:getLicenses', source, function (licenses) + TriggerEvent('esx_license:getLicenses', source, function(licenses) TriggerClientEvent('esx_weashop:loadLicenses', source, licenses) end) end -if Config.EnableLicense == true then - AddEventHandler('esx:playerLoaded', function (source) +if Config.LicenseEnable then + AddEventHandler('esx:playerLoaded', function(source) LoadLicenses(source) end) end RegisterServerEvent('esx_weashop:buyLicense') -AddEventHandler('esx_weashop:buyLicense', function () +AddEventHandler('esx_weashop:buyLicense', function() local _source = source local xPlayer = ESX.GetPlayerFromId(source) @@ -54,25 +53,39 @@ ESX.RegisterServerCallback('esx_weashop:requestDBItems', function(source, cb) end) RegisterServerEvent('esx_weashop:buyItem') -AddEventHandler('esx_weashop:buyItem', function(itemName, price, zone) - local xPlayer = ESX.GetPlayerFromId(source) - local account = xPlayer.getAccount('black_money') +AddEventHandler('esx_weashop:buyItem', function(weaponName, zone) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) + local price = GetPrice(weaponName, zone) if zone == "BlackWeashop" then - if account.money >= price then + + if xPlayer.getAccount('black_money').money >= price then xPlayer.removeAccountMoney('black_money', price) - xPlayer.addWeapon(itemName, 42) - TriggerClientEvent('esx:showNotification', source, _U('buy', ESX.GetWeaponLabel(itemName))) + xPlayer.addWeapon(weaponName, 42) + TriggerClientEvent('esx:showNotification', _source, _U('buy', ESX.GetWeaponLabel(weaponName))) else - TriggerClientEvent('esx:showNotification', source, _U('not_enough_black')) + TriggerClientEvent('esx:showNotification', _source, _U('not_enough_black')) end + else + if xPlayer.getMoney() >= price then xPlayer.removeMoney(price) - xPlayer.addWeapon(itemName, 42) - TriggerClientEvent('esx:showNotification', source, _U('buy', ESX.GetWeaponLabel(itemName))) + xPlayer.addWeapon(weaponName, 42) + TriggerClientEvent('esx:showNotification', _source, _U('buy', ESX.GetWeaponLabel(weaponName))) else - TriggerClientEvent('esx:showNotification', source, _U('not_enough')) + TriggerClientEvent('esx:showNotification', _source, _U('not_enough')) end + end end) + +function GetPrice(weaponName, zone) + local result = MySQL.Sync.fetchAll('SELECT 1 FROM weashops WHERE zone = @zone AND item = @item', { + ['@zone'] = zone, + ['@item'] = weaponName + }) + + return result[1].price +end From 542ff5a50566cd94510994811e72bae262543fdc Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Fri, 26 Oct 2018 21:22:40 +0200 Subject: [PATCH 38/63] Fixed invalid sql fixes #29, closes #31 --- esx_weashops.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esx_weashops.sql b/esx_weashops.sql index 28e5744e..dad5a971 100644 --- a/esx_weashops.sql +++ b/esx_weashops.sql @@ -13,7 +13,7 @@ INSERT INTO `licenses` (`type`, `label`) VALUES ('weapon', "Permis de port d'arme") ; -INSERT INTO `weashops` (`zone` `item`, `price`) VALUES +INSERT INTO `weashops` (`zone`, `item`, `price`) VALUES ('GunShop','WEAPON_PISTOL', 300), ('BlackWeashop','WEAPON_PISTOL', 500), ('GunShop', 'WEAPON_FLASHLIGHT', 60), From b50650db542c7feb991aa2a48f3c71919ea32145 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 5 Nov 2018 20:31:57 +0100 Subject: [PATCH 39/63] Corrected number grouping --- client/main.lua | 4 ++-- server/main.lua | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/main.lua b/client/main.lua index aac235c5..b9ceb88c 100644 --- a/client/main.lua +++ b/client/main.lua @@ -44,7 +44,7 @@ function OpenBuyLicenseMenu(zone) ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'shop_license', { title = _U('buy_license'), elements = { - { label = _U('yes', ('%s'):format(ESX.Math.GroupDigits(_U('shop_menu_item', Config.LicensePrice)))), value = 'yes' }, + { label = _U('yes', ('%s'):format((_U('shop_menu_item', ESX.Math.GroupDigits(Config.LicensePrice)))), value = 'yes' }, { label = _U('no'), value = 'no' } } }, function(data, menu) @@ -64,7 +64,7 @@ function OpenShopMenu(zone) local item = Config.Zones[zone].Items[i] table.insert(elements, { - label = ('%s - %s'):format(item.label, ESX.Math.GroupDigits(_U('shop_menu_item', item.price))), + label = ('%s - %s'):format(item.label, _U('shop_menu_item', ESX.Math.GroupDigits(item.price))), weaponName = item.item }) end diff --git a/server/main.lua b/server/main.lua index ba6e5ba8..aa2978e1 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,4 +1,4 @@ -ESX = nil +ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) From 093d5535a6708b0b428ac09fa713d18fbf32981d Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 11 Nov 2018 11:22:41 +0100 Subject: [PATCH 40/63] Check if player already has weapon --- locales/br.lua | 3 ++- locales/de.lua | 3 ++- locales/en.lua | 3 ++- locales/es.lua | 3 ++- locales/fi.lua | 3 ++- locales/fr.lua | 3 ++- locales/pl.lua | 3 ++- locales/sv.lua | 13 +++++++++++++ server/main.lua | 9 +++++++-- 9 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 locales/sv.lua diff --git a/locales/br.lua b/locales/br.lua index d4e9add3..2e80ea9c 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -2,9 +2,10 @@ Locales ['br'] = { ['buy_license'] = 'buy weapon license?', ['yes'] = '%s', ['no'] = 'no', - ['buy'] = 'você comprou %s', + ['buy'] = 'você comprou ~y~%s~s~ for ~r~R$%s~s~', ['not_enough_black'] = 'você não tem dinheiro sujo suficiente', ['not_enough'] = 'você não tem dinheiro suficiente', + ['already_owned'] = 'you already own this weapon!', ['shop'] = 'comprar', ['shop_menu'] = 'pressione ~INPUT_CONTEXT~ para comprar armas.', ['shop_menu_item'] = 'R$%s', diff --git a/locales/de.lua b/locales/de.lua index 070f3a7e..1022cac5 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -2,9 +2,10 @@ Locales ['de'] = { ['buy_license'] = 'buy weapon license?', ['yes'] = '%s', ['no'] = 'no', - ['buy'] = 'du kaufst %s', + ['buy'] = 'du kaufst ~y~%s~s~ for ~r~%s EUR~s~', ['not_enough_black'] = 'du hast nicht genug Schwarzgeld', ['not_enough'] = 'du hast nicht genug Geld', + ['already_owned'] = 'you already own this weapon!', ['shop'] = 'geschäft', ['shop_menu'] = 'drücke ~INPUT_CONTEXT~ um auf das Geschäft zuzugreifen.', ['shop_menu_item'] = '%s EUR', diff --git a/locales/en.lua b/locales/en.lua index cd95640e..06bc7062 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -2,9 +2,10 @@ Locales ['en'] = { ['buy_license'] = 'buy weapon license?', ['yes'] = '%s', ['no'] = 'no', - ['buy'] = 'you bought %s', + ['buy'] = 'you bought ~y~%s~s~ for ~r~$%s~s~', ['not_enough_black'] = 'you do not have enough dirty money', ['not_enough'] = 'you do not have enough money', + ['already_owned'] = 'you already own this weapon!', ['shop'] = 'weapon shop', ['shop_menu'] = 'press ~INPUT_CONTEXT~ to access the ~y~weapon store~s~.', ['shop_menu_item'] = '$%s', diff --git a/locales/es.lua b/locales/es.lua index 47d20ab2..95b5e98b 100644 --- a/locales/es.lua +++ b/locales/es.lua @@ -2,9 +2,10 @@ Locales ['es'] = { ['buy_license'] = 'buy weapon license?', ['yes'] = '%s', ['no'] = 'no', - ['buy'] = 'has comprado %s', + ['buy'] = 'has comprado ~y~%s~s~ for ~r~%s EUR~s~', ['not_enough_black'] = 'usted no tiene ~r~suficiente~s~ dinero negro', ['not_enough'] = 'usted no tiene ~r~suficiente~s~ dinero', + ['already_owned'] = 'you already own this weapon!', ['shop'] = 'tienda', ['shop_menu'] = 'presione ~INPUT_CONTEXT~ para acceder a la tienda.', ['shop_menu_item'] = '%s EUR', diff --git a/locales/fi.lua b/locales/fi.lua index fa1a60f2..d549fe68 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -2,9 +2,10 @@ Locales ['fi'] = { ['buy_license'] = 'osta lisenssi?', ['yes'] = '%s', ['no'] = 'ei', - ['buy'] = 'sinä ostit %s', + ['buy'] = 'sinä ostit ~y~%s~s~ for ~r~%s EUR~s~', ['not_enough_black'] = 'ei tarpeeksi likaista rahaa', ['not_enough'] = 'sinulla ei ole tarpeeksi rahaa', + ['already_owned'] = 'you already own this weapon!', ['shop'] = 'kauppa', ['shop_menu'] = 'paina ~INPUT_CONTEXT~ avataksesi kauppa ikkuna.', ['shop_menu_item'] = '%s EUR', diff --git a/locales/fr.lua b/locales/fr.lua index fbdbff49..b674c5f7 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -2,9 +2,10 @@ Locales ['fr'] = { ['buy_license'] = 'acheter une license?', ['yes'] = '%s', ['no'] = 'non', - ['buy'] = 'vous avez acheté %s', + ['buy'] = 'vous avez acheté ~y~%s~s~ for ~r~%s EUR~s~', ['not_enough_black'] = 'Vous n\'avez ~r~pas assez~s~ d\'argent sale', ['not_enough'] = 'vous n\'avez ~r~pas assez~s~ d\'argent', + ['already_owned'] = 'you already own this weapon!', ['shop'] = 'magasin', ['shop_menu'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder au magasin.', ['shop_menu_item'] = '%s EUR', diff --git a/locales/pl.lua b/locales/pl.lua index d52dc9aa..e64bb7fb 100644 --- a/locales/pl.lua +++ b/locales/pl.lua @@ -2,9 +2,10 @@ Locales ['pl'] = { ['buy_license'] = 'czy chcesz kupić licencję?', ['yes'] = '%s', ['no'] = 'nie', - ['buy'] = 'kupiłeś/aś %s', + ['buy'] = 'kupiłeś/aś ~y~%s~s~ for ~r~%s PLN~s~', ['not_enough_black'] = 'nie masz wystarczająco brudnej kasy', ['not_enough'] = 'nie masz wystarczająco pieniędzy', + ['already_owned'] = 'you already own this weapon!', ['shop'] = 'sklep', ['shop_menu'] = 'Wciśnij ~INPUT_CONTEXT~ aby otworzyć sklep.', ['shop_menu_item'] = '%s PLN', diff --git a/locales/sv.lua b/locales/sv.lua new file mode 100644 index 00000000..05a4df01 --- /dev/null +++ b/locales/sv.lua @@ -0,0 +1,13 @@ +Locales ['sv'] = { + ['buy_license'] = 'vill du köpa ett vapenlicens?', + ['yes'] = '%s', + ['no'] = 'nej tack', + ['buy'] = 'du köpte ~y~%s~s~ för ~r~%s SEK~s~', + ['not_enough_black'] = 'du har inte tillräckligt med svarta pengar', + ['not_enough'] = 'du har inte råd för detta', + ['already_owned'] = 'du äger redan detta vapen!', + ['shop'] = 'vapenaffär', + ['shop_menu'] = 'tryck ~INPUT_CONTEXT~ för att komma åt ~y~vapenaffären~s~.', + ['shop_menu_item'] = '%s SEK', + ['map_blip'] = 'vapenaffär', +} diff --git a/server/main.lua b/server/main.lua index aa2978e1..54297cab 100644 --- a/server/main.lua +++ b/server/main.lua @@ -58,12 +58,17 @@ AddEventHandler('esx_weashop:buyItem', function(weaponName, zone) local xPlayer = ESX.GetPlayerFromId(_source) local price = GetPrice(weaponName, zone) + if xPlayer.hasWeapon(weaponName) then + TriggerClientEvent('esx:showNotification', _source, _U('already_owned')) + return + end + if zone == "BlackWeashop" then if xPlayer.getAccount('black_money').money >= price then xPlayer.removeAccountMoney('black_money', price) xPlayer.addWeapon(weaponName, 42) - TriggerClientEvent('esx:showNotification', _source, _U('buy', ESX.GetWeaponLabel(weaponName))) + TriggerClientEvent('esx:showNotification', _source, _U('buy', ESX.GetWeaponLabel(weaponName), price)) else TriggerClientEvent('esx:showNotification', _source, _U('not_enough_black')) end @@ -73,7 +78,7 @@ AddEventHandler('esx_weashop:buyItem', function(weaponName, zone) if xPlayer.getMoney() >= price then xPlayer.removeMoney(price) xPlayer.addWeapon(weaponName, 42) - TriggerClientEvent('esx:showNotification', _source, _U('buy', ESX.GetWeaponLabel(weaponName))) + TriggerClientEvent('esx:showNotification', _source, _U('buy', ESX.GetWeaponLabel(weaponName), price)) else TriggerClientEvent('esx:showNotification', _source, _U('not_enough')) end From ed3c2f54c7adf124c995b7c915fc2c26fc245e98 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 11 Nov 2018 11:24:36 +0100 Subject: [PATCH 41/63] Fixed #35 --- client/main.lua | 4 ++-- server/main.lua | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/main.lua b/client/main.lua index b9ceb88c..ee6f3740 100644 --- a/client/main.lua +++ b/client/main.lua @@ -44,8 +44,8 @@ function OpenBuyLicenseMenu(zone) ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'shop_license', { title = _U('buy_license'), elements = { - { label = _U('yes', ('%s'):format((_U('shop_menu_item', ESX.Math.GroupDigits(Config.LicensePrice)))), value = 'yes' }, - { label = _U('no'), value = 'no' } + { label = _U('no'), value = 'no' }, + { label = _U('yes', ('%s'):format((_U('shop_menu_item', ESX.Math.GroupDigits(Config.LicensePrice))))), value = 'yes' }, } }, function(data, menu) if data.current.value == 'yes' then diff --git a/server/main.lua b/server/main.lua index 54297cab..239d48b5 100644 --- a/server/main.lua +++ b/server/main.lua @@ -87,10 +87,10 @@ AddEventHandler('esx_weashop:buyItem', function(weaponName, zone) end) function GetPrice(weaponName, zone) - local result = MySQL.Sync.fetchAll('SELECT 1 FROM weashops WHERE zone = @zone AND item = @item', { + local result = MySQL.Sync.fetchAll('SELECT price FROM weashops WHERE zone = @zone AND item = @item', { ['@zone'] = zone, ['@item'] = weaponName }) - + return result[1].price end From 464d4bde073a3c253310c638351c4d00925e0493 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 11 Nov 2018 11:26:14 +0100 Subject: [PATCH 42/63] Updated missing resource manifest --- README.md | 2 +- __resource.lua | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e3b90b2a..65e213d5 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ start esx_weashops # Legal ### License -esx_weashops - Legal and illegal weapon shop +esx_weashops - Legal and illegal weapon shops Copyright (C) 2015-2018 Jérémie N'gadi diff --git a/__resource.lua b/__resource.lua index 1b141e5c..2dd1d1a6 100644 --- a/__resource.lua +++ b/__resource.lua @@ -14,6 +14,7 @@ server_scripts { 'locales/fr.lua', 'locales/es.lua', 'locales/pl.lua', + 'locales/sv.lua', 'config.lua', 'server/main.lua' } @@ -27,6 +28,7 @@ client_scripts { 'locales/fr.lua', 'locales/es.lua', 'locales/pl.lua', + 'locales/sv.lua', 'config.lua', 'client/main.lua' } From 42ccf8f287d6828b4d4fb324ad2dd792d0a98a36 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 11 Nov 2018 12:28:17 +0100 Subject: [PATCH 43/63] Optimized getting shop items, open menu after license bought --- client/main.lua | 21 +++++++++++++---- config.lua | 2 +- server/main.lua | 62 ++++++++++++++++++++++++++----------------------- 3 files changed, 50 insertions(+), 35 deletions(-) diff --git a/client/main.lua b/client/main.lua index ee6f3740..b46d8ee3 100644 --- a/client/main.lua +++ b/client/main.lua @@ -24,13 +24,20 @@ Citizen.CreateThread(function() Citizen.Wait(0) end - ESX.TriggerServerCallback('esx_weashop:requestDBItems', function(ShopItems) - for k,v in pairs(ShopItems) do + ESX.TriggerServerCallback('esx_weashop:getShop', function(shopItems) + for k,v in pairs(shopItems) do Config.Zones[k].Items = v end end) end) +RegisterNetEvent('esx_weashop:sendShop') +AddEventHandler('esx_weashop:sendShop', function(shopItems) + for k,v in pairs(shopItems) do + Config.Zones[k].Items = v + end +end) + RegisterNetEvent('esx_weashop:loadLicenses') AddEventHandler('esx_weashop:loadLicenses', function(licenses) for i = 1, #licenses, 1 do @@ -49,9 +56,13 @@ function OpenBuyLicenseMenu(zone) } }, function(data, menu) if data.current.value == 'yes' then - TriggerServerEvent('esx_weashop:buyLicense') + ESX.TriggerServerCallback('esx_weashop:buyLicense', function(bought) + if bought then + menu.close() + OpenShopMenu(zone) + end + end) end - menu.close() end, function(data, menu) menu.close() end) @@ -179,7 +190,7 @@ Citizen.CreateThread(function() if Licenses['weapon'] ~= nil or Config.Zones[CurrentActionData.zone].legal == 1 then OpenShopMenu(CurrentActionData.zone) else - OpenBuyLicenseMenu() + OpenBuyLicenseMenu(CurrentActionData.zone) end else OpenShopMenu(CurrentActionData.zone) diff --git a/config.lua b/config.lua index ab01d636..2406ec53 100644 --- a/config.lua +++ b/config.lua @@ -21,7 +21,7 @@ Config.Zones = { { x = 22.09, y = -1107.28, z = 28.80 }, { x = 2567.69, y = 294.38, z = 107.73 }, { x = -1117.58, y = 2698.61, z = 17.55 }, - { x = 842.44, y = -1033.42, z = 27.19 }, + { x = 842.44, y = -1033.42, z = 27.19 } } }, diff --git a/server/main.lua b/server/main.lua index 239d48b5..e6154273 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,7 +1,32 @@ ESX = nil +local shopItems = {} TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) +MySQL.ready(function() + + MySQL.Async.fetchAll('SELECT * FROM weashops', {}, function(result) + for i=1, #result, 1 do + if shopItems[result[i].zone] == nil then + shopItems[result[i].zone] = {} + end + + table.insert(shopItems[result[i].zone], { + item = result[i].item, + price = result[i].price, + label = ESX.GetWeaponLabel(result[i].item) + }) + end + + TriggerClientEvent('esx_weashop:sendShop', -1, shopItems) + end) + +end) + +ESX.RegisterServerCallback('esx_weashop:getShop', function(source, cb) + cb(shopItems) +end) + function LoadLicenses(source) TriggerEvent('esx_license:getLicenses', source, function(licenses) TriggerClientEvent('esx_weashop:loadLicenses', source, licenses) @@ -14,44 +39,23 @@ if Config.LicenseEnable then end) end -RegisterServerEvent('esx_weashop:buyLicense') -AddEventHandler('esx_weashop:buyLicense', function() - local _source = source +ESX.RegisterServerCallback('esx_weashop:buyLicense', function(source, cb) local xPlayer = ESX.GetPlayerFromId(source) if xPlayer.getMoney() >= Config.LicensePrice then xPlayer.removeMoney(Config.LicensePrice) - TriggerEvent('esx_license:addLicense', _source, 'weapon', function() - LoadLicenses(_source) + TriggerEvent('esx_license:addLicense', source, 'weapon', function() + LoadLicenses(source) end) + + cb(true) else - TriggerClientEvent('esx:showNotification', _source, _U('not_enough')) + cb(false) + TriggerClientEvent('esx:showNotification', source, _U('not_enough')) end end) -ESX.RegisterServerCallback('esx_weashop:requestDBItems', function(source, cb) - MySQL.Async.fetchAll('SELECT * FROM weashops', {}, function(result) - local shopItems = {} - - for i=1, #result, 1 do - - if shopItems[result[i].zone] == nil then - shopItems[result[i].zone] = {} - end - - table.insert(shopItems[result[i].zone], { - item = result[i].item, - price = result[i].price, - label = ESX.GetWeaponLabel(result[i].item) - }) - - end - - cb(shopItems) - end) -end) - RegisterServerEvent('esx_weashop:buyItem') AddEventHandler('esx_weashop:buyItem', function(weaponName, zone) local _source = source @@ -63,7 +67,7 @@ AddEventHandler('esx_weashop:buyItem', function(weaponName, zone) return end - if zone == "BlackWeashop" then + if zone == 'BlackWeashop' then if xPlayer.getAccount('black_money').money >= price then xPlayer.removeAccountMoney('black_money', price) From d2a369e8256c638b98afcb8d1e7dd4a2e2717c26 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 11 Nov 2018 12:37:14 +0100 Subject: [PATCH 44/63] Added menu aligment --- client/main.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index b46d8ee3..878e3427 100644 --- a/client/main.lua +++ b/client/main.lua @@ -50,6 +50,7 @@ function OpenBuyLicenseMenu(zone) ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'shop_license', { title = _U('buy_license'), + align = 'top-left', elements = { { label = _U('no'), value = 'no' }, { label = _U('yes', ('%s'):format((_U('shop_menu_item', ESX.Math.GroupDigits(Config.LicensePrice))))), value = 'yes' }, @@ -83,7 +84,8 @@ function OpenShopMenu(zone) ESX.UI.Menu.CloseAll() ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'shop', { - title = _U('shop'), + title = _U('shop'), + align = 'top-left', elements = elements }, function(data, menu) TriggerServerEvent('esx_weashop:buyItem', data.current.weaponName, zone) From b0d73a4d79893e4e690092396a49531de3f37b05 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 17 Nov 2018 22:43:41 +0100 Subject: [PATCH 45/63] Fixed restarting script losing licenses --- client/main.lua | 24 +++++++++--------------- config.lua | 5 +++-- server/main.lua | 16 +--------------- 3 files changed, 13 insertions(+), 32 deletions(-) diff --git a/client/main.lua b/client/main.lua index 878e3427..f6d6cc3f 100644 --- a/client/main.lua +++ b/client/main.lua @@ -16,7 +16,6 @@ local LastZone = nil local CurrentAction = nil local CurrentActionMsg = '' local CurrentActionData = {} -local Licenses = {} Citizen.CreateThread(function() while ESX == nil do @@ -38,13 +37,6 @@ AddEventHandler('esx_weashop:sendShop', function(shopItems) end end) -RegisterNetEvent('esx_weashop:loadLicenses') -AddEventHandler('esx_weashop:loadLicenses', function(licenses) - for i = 1, #licenses, 1 do - Licenses[licenses[i].type] = true - end -end) - function OpenBuyLicenseMenu(zone) ESX.UI.Menu.CloseAll() @@ -112,7 +104,7 @@ end) -- Create Blips Citizen.CreateThread(function() for k,v in pairs(Config.Zones) do - if v.legal==0 then + if v.legal then for i = 1, #v.Pos, 1 do local blip = AddBlipForCoord(v.Pos[i].x, v.Pos[i].y, v.Pos[i].z) @@ -188,12 +180,14 @@ Citizen.CreateThread(function() if IsControlJustReleased(0, Keys['E']) then if CurrentAction == 'shop_menu' then - if Config.LicenseEnable then - if Licenses['weapon'] ~= nil or Config.Zones[CurrentActionData.zone].legal == 1 then - OpenShopMenu(CurrentActionData.zone) - else - OpenBuyLicenseMenu(CurrentActionData.zone) - end + if Config.LicenseEnable and Config.Zones[CurrentActionData.zone].legal then + ESX.TriggerServerCallback('esx_license:checkLicense', function(hasWeaponLicense) + if hasWeaponLicense then + OpenShopMenu(CurrentActionData.zone) + else + OpenBuyLicenseMenu(CurrentActionData.zone) + end + end, GetPlayerServerId(PlayerId()), 'weapon') else OpenShopMenu(CurrentActionData.zone) end diff --git a/config.lua b/config.lua index 2406ec53..9f0673e0 100644 --- a/config.lua +++ b/config.lua @@ -5,12 +5,13 @@ Config.Color = { r = 0, g = 128, b = 255 } Config.Type = 1 Config.Locale = 'fr' Config.EnableLicense = true -- only turn this on if you are using esx_license + Config.LicensePrice = 5000 Config.Zones = { GunShop = { - legal = 0, + legal = true, Items = {}, Pos = { { x = -662.180, y = -934.961, z = 20.829 }, @@ -27,7 +28,7 @@ Config.Zones = { }, BlackWeashop = { - legal = 1, + legal = false, Items = {}, Pos = { { x = -1306.239, y = -394.018, z = 35.695 }, diff --git a/server/main.lua b/server/main.lua index e6154273..fc531eed 100644 --- a/server/main.lua +++ b/server/main.lua @@ -27,18 +27,6 @@ ESX.RegisterServerCallback('esx_weashop:getShop', function(source, cb) cb(shopItems) end) -function LoadLicenses(source) - TriggerEvent('esx_license:getLicenses', source, function(licenses) - TriggerClientEvent('esx_weashop:loadLicenses', source, licenses) - end) -end - -if Config.LicenseEnable then - AddEventHandler('esx:playerLoaded', function(source) - LoadLicenses(source) - end) -end - ESX.RegisterServerCallback('esx_weashop:buyLicense', function(source, cb) local xPlayer = ESX.GetPlayerFromId(source) @@ -46,10 +34,8 @@ ESX.RegisterServerCallback('esx_weashop:buyLicense', function(source, cb) xPlayer.removeMoney(Config.LicensePrice) TriggerEvent('esx_license:addLicense', source, 'weapon', function() - LoadLicenses(source) + cb(true) end) - - cb(true) else cb(false) TriggerClientEvent('esx:showNotification', source, _U('not_enough')) From 02d419caf7a111b75642536c1d0ff225cbad3a38 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 17 Nov 2018 22:44:01 +0100 Subject: [PATCH 46/63] Fixed config --- config.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/config.lua b/config.lua index 9f0673e0..cb45fae4 100644 --- a/config.lua +++ b/config.lua @@ -6,6 +6,7 @@ Config.Type = 1 Config.Locale = 'fr' Config.EnableLicense = true -- only turn this on if you are using esx_license +Config.LicenseEnable = true -- only turn this on if you are using esx_license Config.LicensePrice = 5000 Config.Zones = { From 20160f78fb1d5693c49b1d5533d35801ceaa0dd1 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 17 Nov 2018 22:46:34 +0100 Subject: [PATCH 47/63] Rename resource to esx_weaponshop, closes #39 --- README.md | 14 +++++++------- __resource.lua | 2 +- client/main.lua | 18 +++++++++--------- esx_weashops.sql => esx_weaponshop.sql | 0 server/main.lua | 10 +++++----- 5 files changed, 22 insertions(+), 22 deletions(-) rename esx_weashops.sql => esx_weaponshop.sql (100%) diff --git a/README.md b/README.md index 65e213d5..b5cb8d14 100644 --- a/README.md +++ b/README.md @@ -1,33 +1,33 @@ -# esx_weashops +# esx_weaponshop ## Download & Installation ### Using [fvm](https://github.com/qlaffont/fvm-installer) ``` -fvm install --save --folder=esx esx-org/esx_weashops +fvm install --save --folder=esx esx-org/esx_weaponshop ``` ### Using Git ``` cd resources -git clone https://github.com/ESX-Org/esx_weashops.git [esx]/esx_weashops +git clone https://github.com/ESX-Org/esx_weaponshop.git [esx]/esx_weaponshop ``` ### Manually -- Download https://github.com/ESX-Org/esx_weashops/archive/master.zip +- Download https://github.com/ESX-Org/esx_weaponshop/archive/master.zip - Put it in the `[esx]` directory ## Installation -- Import `esx_weashops.sql` in your database +- Import `esx_weaponshop.sql` in your database - Add this to your `server.cfg`: ``` -start esx_weashops +start esx_weaponshop ``` # Legal ### License -esx_weashops - Legal and illegal weapon shops +esx_weaponshop - Legal and illegal weapon shops Copyright (C) 2015-2018 Jérémie N'gadi diff --git a/__resource.lua b/__resource.lua index 2dd1d1a6..1a01d31a 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,7 +2,7 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Weapon Shop' -version '1.0.2' +version '1.1.0' server_scripts { '@mysql-async/lib/MySQL.lua', diff --git a/client/main.lua b/client/main.lua index f6d6cc3f..863aac5c 100644 --- a/client/main.lua +++ b/client/main.lua @@ -23,15 +23,15 @@ Citizen.CreateThread(function() Citizen.Wait(0) end - ESX.TriggerServerCallback('esx_weashop:getShop', function(shopItems) + ESX.TriggerServerCallback('esx_weaponshop:getShop', function(shopItems) for k,v in pairs(shopItems) do Config.Zones[k].Items = v end end) end) -RegisterNetEvent('esx_weashop:sendShop') -AddEventHandler('esx_weashop:sendShop', function(shopItems) +RegisterNetEvent('esx_weaponshop:sendShop') +AddEventHandler('esx_weaponshop:sendShop', function(shopItems) for k,v in pairs(shopItems) do Config.Zones[k].Items = v end @@ -49,7 +49,7 @@ function OpenBuyLicenseMenu(zone) } }, function(data, menu) if data.current.value == 'yes' then - ESX.TriggerServerCallback('esx_weashop:buyLicense', function(bought) + ESX.TriggerServerCallback('esx_weaponshop:buyLicense', function(bought) if bought then menu.close() OpenShopMenu(zone) @@ -80,7 +80,7 @@ function OpenShopMenu(zone) align = 'top-left', elements = elements }, function(data, menu) - TriggerServerEvent('esx_weashop:buyItem', data.current.weaponName, zone) + TriggerServerEvent('esx_weaponshop:buyItem', data.current.weaponName, zone) end, function(data, menu) menu.close() @@ -90,13 +90,13 @@ function OpenShopMenu(zone) end) end -AddEventHandler('esx_weashop:hasEnteredMarker', function(zone) +AddEventHandler('esx_weaponshop:hasEnteredMarker', function(zone) CurrentAction = 'shop_menu' CurrentActionMsg = _U('shop_menu') CurrentActionData = { zone = zone } end) -AddEventHandler('esx_weashop:hasExitedMarker', function(zone) +AddEventHandler('esx_weaponshop:hasExitedMarker', function(zone) CurrentAction = nil ESX.UI.Menu.CloseAll() end) @@ -160,12 +160,12 @@ Citizen.CreateThread(function() end if isInMarker and not HasAlreadyEnteredMarker then HasAlreadyEnteredMarker = true - TriggerEvent('esx_weashop:hasEnteredMarker', currentZone) + TriggerEvent('esx_weaponshop:hasEnteredMarker', currentZone) end if not isInMarker and HasAlreadyEnteredMarker then HasAlreadyEnteredMarker = false - TriggerEvent('esx_weashop:hasExitedMarker', LastZone) + TriggerEvent('esx_weaponshop:hasExitedMarker', LastZone) end end end) diff --git a/esx_weashops.sql b/esx_weaponshop.sql similarity index 100% rename from esx_weashops.sql rename to esx_weaponshop.sql diff --git a/server/main.lua b/server/main.lua index fc531eed..a86ef876 100644 --- a/server/main.lua +++ b/server/main.lua @@ -18,16 +18,16 @@ MySQL.ready(function() }) end - TriggerClientEvent('esx_weashop:sendShop', -1, shopItems) + TriggerClientEvent('esx_weaponshop:sendShop', -1, shopItems) end) end) -ESX.RegisterServerCallback('esx_weashop:getShop', function(source, cb) +ESX.RegisterServerCallback('esx_weaponshop:getShop', function(source, cb) cb(shopItems) end) -ESX.RegisterServerCallback('esx_weashop:buyLicense', function(source, cb) +ESX.RegisterServerCallback('esx_weaponshop:buyLicense', function(source, cb) local xPlayer = ESX.GetPlayerFromId(source) if xPlayer.getMoney() >= Config.LicensePrice then @@ -42,8 +42,8 @@ ESX.RegisterServerCallback('esx_weashop:buyLicense', function(source, cb) end end) -RegisterServerEvent('esx_weashop:buyItem') -AddEventHandler('esx_weashop:buyItem', function(weaponName, zone) +RegisterServerEvent('esx_weaponshop:buyItem') +AddEventHandler('esx_weaponshop:buyItem', function(weaponName, zone) local _source = source local xPlayer = ESX.GetPlayerFromId(_source) local price = GetPrice(weaponName, zone) From 3e363d522f4ce0ad24dc63f351bb8cc27bda060d Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 25 Nov 2018 13:43:16 +0100 Subject: [PATCH 48/63] Group price when buying a weapon --- server/main.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/main.lua b/server/main.lua index a86ef876..491a4e92 100644 --- a/server/main.lua +++ b/server/main.lua @@ -58,7 +58,7 @@ AddEventHandler('esx_weaponshop:buyItem', function(weaponName, zone) if xPlayer.getAccount('black_money').money >= price then xPlayer.removeAccountMoney('black_money', price) xPlayer.addWeapon(weaponName, 42) - TriggerClientEvent('esx:showNotification', _source, _U('buy', ESX.GetWeaponLabel(weaponName), price)) + TriggerClientEvent('esx:showNotification', _source, _U('buy', ESX.GetWeaponLabel(weaponName), ESX.Math.GroupDigits(price))) else TriggerClientEvent('esx:showNotification', _source, _U('not_enough_black')) end @@ -68,7 +68,7 @@ AddEventHandler('esx_weaponshop:buyItem', function(weaponName, zone) if xPlayer.getMoney() >= price then xPlayer.removeMoney(price) xPlayer.addWeapon(weaponName, 42) - TriggerClientEvent('esx:showNotification', _source, _U('buy', ESX.GetWeaponLabel(weaponName), price)) + TriggerClientEvent('esx:showNotification', _source, _U('buy', ESX.GetWeaponLabel(weaponName), ESX.Math.GroupDigits(price))) else TriggerClientEvent('esx:showNotification', _source, _U('not_enough')) end From eaf63483dac7a8538beb4b620899fe90a14d5c91 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 23 Dec 2018 17:15:56 +0100 Subject: [PATCH 49/63] Scaleform when weapon is bought, gta sounds, cleanup --- __resource.lua | 2 + client/main.lua | 107 ++++++++++++++++++++++++++++++++++-------------- config.lua | 50 +++++++++++----------- locales/br.lua | 6 +-- locales/de.lua | 6 +-- locales/en.lua | 8 ++-- locales/es.lua | 6 +-- locales/fi.lua | 6 +-- locales/fr.lua | 6 +-- locales/pl.lua | 6 +-- locales/sv.lua | 6 +-- server/main.lua | 63 ++++++++++++++++------------ 12 files changed, 166 insertions(+), 106 deletions(-) diff --git a/__resource.lua b/__resource.lua index 1a01d31a..a45e385f 100644 --- a/__resource.lua +++ b/__resource.lua @@ -32,3 +32,5 @@ client_scripts { 'config.lua', 'client/main.lua' } + +dependency 'es_extended' \ No newline at end of file diff --git a/client/main.lua b/client/main.lua index 863aac5c..42d5a361 100644 --- a/client/main.lua +++ b/client/main.lua @@ -10,12 +10,13 @@ local Keys = { ["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 LastZone = nil +local CurrentAction = nil +local CurrentActionMsg = '' +local CurrentActionData = {} +local ShopOpen = false Citizen.CreateThread(function() while ESX == nil do @@ -63,37 +64,78 @@ end function OpenShopMenu(zone) local elements = {} + ShopOpen = true for i=1, #Config.Zones[zone].Items, 1 do local item = Config.Zones[zone].Items[i] table.insert(elements, { - label = ('%s - %s'):format(item.label, _U('shop_menu_item', ESX.Math.GroupDigits(item.price))), + label = ('%s - %s'):format(item.label, _U('shop_menu_item', ESX.Math.GroupDigits(item.price))), + price = item.price, weaponName = item.item }) end ESX.UI.Menu.CloseAll() + PlaySoundFrontend(-1, 'BACK', 'HUD_AMMO_SHOP_SOUNDSET', false) ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'shop', { - title = _U('shop'), + title = _U('shop_menu_title'), align = 'top-left', elements = elements }, function(data, menu) - TriggerServerEvent('esx_weaponshop:buyItem', data.current.weaponName, zone) + ESX.TriggerServerCallback('esx_weaponshop:buyWeapon', function(bought) + if bought then + DisplayBoughtScaleform(data.current.weaponName, data.current.price) + else + PlaySoundFrontend(-1, 'ERROR', 'HUD_AMMO_SHOP_SOUNDSET', false) + end + end, data.current.weaponName, zone) end, function(data, menu) + PlaySoundFrontend(-1, 'BACK', 'HUD_AMMO_SHOP_SOUNDSET', false) + ShopOpen = false menu.close() CurrentAction = 'shop_menu' - CurrentActionMsg = _U('shop_menu') + CurrentActionMsg = _U('shop_menu_prompt') CurrentActionData = { zone = zone } + end, function(data, menu) + PlaySoundFrontend(-1, 'NAV', 'HUD_AMMO_SHOP_SOUNDSET', false) + end) +end + +function DisplayBoughtScaleform(weaponName, price) + local scaleform = ESX.Scaleform.Utils.RequestScaleformMovie('MP_BIG_MESSAGE_FREEMODE') + local sec = 4 + + BeginScaleformMovieMethod(scaleform, 'SHOW_WEAPON_PURCHASED') + + PushScaleformMovieMethodParameterString(_U('weapon_bought', ESX.Math.GroupDigits(price))) + PushScaleformMovieMethodParameterString(ESX.GetWeaponLabel(weaponName)) + PushScaleformMovieMethodParameterInt(GetHashKey(weaponName)) + PushScaleformMovieMethodParameterString('') + PushScaleformMovieMethodParameterInt(100) + + EndScaleformMovieMethod() + + PlaySoundFrontend(-1, 'WEAPON_PURCHASE', 'HUD_AMMO_SHOP_SOUNDSET', false) + + Citizen.CreateThread(function() + while sec > 0 do + Citizen.Wait(0) + sec = sec - 0.01 + + DrawScaleformMovieFullscreen(scaleform, 255, 255, 255, 255) + end end) end AddEventHandler('esx_weaponshop:hasEnteredMarker', function(zone) - CurrentAction = 'shop_menu' - CurrentActionMsg = _U('shop_menu') - CurrentActionData = { zone = zone } + if zone == 'GunShop' then + CurrentAction = 'shop_menu' + CurrentActionMsg = _U('shop_menu_prompt') + CurrentActionData = { zone = zone } + end end) AddEventHandler('esx_weaponshop:hasExitedMarker', function(zone) @@ -101,12 +143,20 @@ AddEventHandler('esx_weaponshop:hasExitedMarker', function(zone) ESX.UI.Menu.CloseAll() end) +AddEventHandler('onResourceStop', function(resource) + if resource == GetCurrentResourceName() then + if ShopOpen then + ESX.UI.Menu.CloseAll() + end + end +end) + -- Create Blips Citizen.CreateThread(function() for k,v in pairs(Config.Zones) do - if v.legal then - for i = 1, #v.Pos, 1 do - local blip = AddBlipForCoord(v.Pos[i].x, v.Pos[i].y, v.Pos[i].z) + if v.Legal then + for i = 1, #v.Locations, 1 do + local blip = AddBlipForCoord(v.Locations[i]) SetBlipSprite (blip, 110) SetBlipDisplay(blip, 4) @@ -115,7 +165,7 @@ Citizen.CreateThread(function() SetBlipAsShortRange(blip, true) BeginTextCommandSetBlipName("STRING") - AddTextComponentString(_U('map_blip')) + AddTextComponentSubstringPlayerName(_U('map_blip')) EndTextCommandSetBlipName(blip) end end @@ -130,9 +180,9 @@ 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) + for i = 1, #v.Locations, 1 do + if (Config.Type ~= -1 and GetDistanceBetweenCoords(coords, v.Locations[i], true) < Config.DrawDistance) then + DrawMarker(Config.Type, v.Locations[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 @@ -143,18 +193,13 @@ end) Citizen.CreateThread(function() while true do Citizen.Wait(0) - - local coords = GetEntityCoords(PlayerPedId()) - local isInMarker = false - local currentZone = nil + local coords = GetEntityCoords(PlayerPedId()) + local isInMarker, currentZone = false, 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 - ShopItems = v.Items - currentZone = k - LastZone = k + for i=1, #v.Locations, 1 do + if GetDistanceBetweenCoords(coords, v.Locations[i], true) < Config.Size.x then + isInMarker, ShopItems, currentZone, LastZone = true, v.Items, k, k end end end @@ -179,8 +224,9 @@ Citizen.CreateThread(function() ESX.ShowHelpNotification(CurrentActionMsg) if IsControlJustReleased(0, Keys['E']) then + if CurrentAction == 'shop_menu' then - if Config.LicenseEnable and Config.Zones[CurrentActionData.zone].legal then + if Config.LicenseEnable and Config.Zones[CurrentActionData.zone].Legal then ESX.TriggerServerCallback('esx_license:checkLicense', function(hasWeaponLicense) if hasWeaponLicense then OpenShopMenu(CurrentActionData.zone) @@ -192,6 +238,7 @@ Citizen.CreateThread(function() OpenShopMenu(CurrentActionData.zone) end end + CurrentAction = nil end end diff --git a/config.lua b/config.lua index cb45fae4..32671dd2 100644 --- a/config.lua +++ b/config.lua @@ -1,39 +1,39 @@ -Config = {} -Config.DrawDistance = 100 -Config.Size = { x = 1.5, y = 1.5, z = 1.5 } -Config.Color = { r = 0, g = 128, b = 255 } -Config.Type = 1 -Config.Locale = 'fr' -Config.EnableLicense = true -- only turn this on if you are using esx_license +Config = {} -Config.LicenseEnable = true -- only turn this on if you are using esx_license -Config.LicensePrice = 5000 +Config.DrawDistance = 100 +Config.Size = { x = 1.5, y = 1.5, z = 0.5 } +Config.Color = { r = 0, g = 128, b = 255 } +Config.Type = 1 + +Config.Locale = 'fr' + +Config.LicenseEnable = false -- only turn this on if you are using esx_license +Config.LicensePrice = 5000 Config.Zones = { GunShop = { - legal = true, + Legal = true, Items = {}, - Pos = { - { x = -662.180, y = -934.961, z = 20.829 }, - { x = 810.25, y = -2157.60, z = 28.62 }, - { x = 1693.44, y = 3760.16, z = 33.71 }, - { x = -330.24, y = 6083.88, z = 30.45 }, - { x = 252.63, y = -50.00, z = 68.94 }, - { x = 22.09, y = -1107.28, z = 28.80 }, - { x = 2567.69, y = 294.38, z = 107.73 }, - { x = -1117.58, y = 2698.61, z = 17.55 }, - { x = 842.44, y = -1033.42, z = 27.19 } - + Locations = { + vector3(-662.1, -935.3, 20.8), + vector3(810.2, -2157.3, 28.6), + vector3(1693.4, 3759.5, 33.7), + vector3(-330.2, 6083.8, 30.4), + vector3(252.3, -50.0, 68.9), + vector3(22.0, -1107.2, 28.8), + vector3(2567.6, 294.3, 107.7), + vector3(-1117.5, 2698.6, 17.5), + vector3(842.4, -1033.4, 27.1) } }, BlackWeashop = { - legal = false, + Legal = false, Items = {}, - Pos = { - { x = -1306.239, y = -394.018, z = 35.695 }, + Locations = { + vector3(-1306.2, -394.0, 35.6) } - }, + } } diff --git a/locales/br.lua b/locales/br.lua index 2e80ea9c..170df88a 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -2,12 +2,12 @@ Locales ['br'] = { ['buy_license'] = 'buy weapon license?', ['yes'] = '%s', ['no'] = 'no', - ['buy'] = 'você comprou ~y~%s~s~ for ~r~R$%s~s~', + ['weapon_bought'] = 'purchased for %s EUR', ['not_enough_black'] = 'você não tem dinheiro sujo suficiente', ['not_enough'] = 'você não tem dinheiro suficiente', ['already_owned'] = 'you already own this weapon!', - ['shop'] = 'comprar', - ['shop_menu'] = 'pressione ~INPUT_CONTEXT~ para comprar armas.', + ['shop_menu_title'] = 'comprar', + ['shop_menu_prompt'] = 'pressione ~INPUT_CONTEXT~ para comprar armas.', ['shop_menu_item'] = 'R$%s', ['map_blip'] = 'loja de Armas', } diff --git a/locales/de.lua b/locales/de.lua index 1022cac5..1f85ab39 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -2,12 +2,12 @@ Locales ['de'] = { ['buy_license'] = 'buy weapon license?', ['yes'] = '%s', ['no'] = 'no', - ['buy'] = 'du kaufst ~y~%s~s~ for ~r~%s EUR~s~', + ['weapon_bought'] = 'purchased for %s EUR', ['not_enough_black'] = 'du hast nicht genug Schwarzgeld', ['not_enough'] = 'du hast nicht genug Geld', ['already_owned'] = 'you already own this weapon!', - ['shop'] = 'geschäft', - ['shop_menu'] = 'drücke ~INPUT_CONTEXT~ um auf das Geschäft zuzugreifen.', + ['shop_menu_title'] = 'geschäft', + ['shop_menu_prompt'] = 'drücke ~INPUT_CONTEXT~ um auf das Geschäft zuzugreifen.', ['shop_menu_item'] = '%s EUR', ['map_blip'] = 'waffenladen', } diff --git a/locales/en.lua b/locales/en.lua index 06bc7062..9da777e5 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -2,12 +2,12 @@ Locales ['en'] = { ['buy_license'] = 'buy weapon license?', ['yes'] = '%s', ['no'] = 'no', - ['buy'] = 'you bought ~y~%s~s~ for ~r~$%s~s~', + ['weapon_bought'] = 'purchased for $%s', ['not_enough_black'] = 'you do not have enough dirty money', ['not_enough'] = 'you do not have enough money', ['already_owned'] = 'you already own this weapon!', - ['shop'] = 'weapon shop', - ['shop_menu'] = 'press ~INPUT_CONTEXT~ to access the ~y~weapon store~s~.', + ['shop_menu_title'] = 'ammu-Nation', + ['shop_menu_prompt'] = 'press ~INPUT_CONTEXT~ to access the ~y~Ammu-Nation~s~.', ['shop_menu_item'] = '$%s', - ['map_blip'] = 'weapon shop', + ['map_blip'] = 'ammu-Nation', } diff --git a/locales/es.lua b/locales/es.lua index 95b5e98b..d3fd3304 100644 --- a/locales/es.lua +++ b/locales/es.lua @@ -2,12 +2,12 @@ Locales ['es'] = { ['buy_license'] = 'buy weapon license?', ['yes'] = '%s', ['no'] = 'no', - ['buy'] = 'has comprado ~y~%s~s~ for ~r~%s EUR~s~', + ['weapon_bought'] = 'purchased for %s EUR', ['not_enough_black'] = 'usted no tiene ~r~suficiente~s~ dinero negro', ['not_enough'] = 'usted no tiene ~r~suficiente~s~ dinero', ['already_owned'] = 'you already own this weapon!', - ['shop'] = 'tienda', - ['shop_menu'] = 'presione ~INPUT_CONTEXT~ para acceder a la tienda.', + ['shop_menu_title'] = 'tienda', + ['shop_menu_prompt'] = 'presione ~INPUT_CONTEXT~ para acceder a la tienda.', ['shop_menu_item'] = '%s EUR', ['map_blip'] = 'arsenal', } diff --git a/locales/fi.lua b/locales/fi.lua index d549fe68..e8b9bf68 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -2,12 +2,12 @@ Locales ['fi'] = { ['buy_license'] = 'osta lisenssi?', ['yes'] = '%s', ['no'] = 'ei', - ['buy'] = 'sinä ostit ~y~%s~s~ for ~r~%s EUR~s~', + ['weapon_bought'] = 'purchased for %s EUR', ['not_enough_black'] = 'ei tarpeeksi likaista rahaa', ['not_enough'] = 'sinulla ei ole tarpeeksi rahaa', ['already_owned'] = 'you already own this weapon!', - ['shop'] = 'kauppa', - ['shop_menu'] = 'paina ~INPUT_CONTEXT~ avataksesi kauppa ikkuna.', + ['shop_menu_title'] = 'kauppa', + ['shop_menu_prompt'] = 'paina ~INPUT_CONTEXT~ avataksesi kauppa ikkuna.', ['shop_menu_item'] = '%s EUR', ['map_blip'] = 'asekauppa', } diff --git a/locales/fr.lua b/locales/fr.lua index b674c5f7..cd11b198 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -2,12 +2,12 @@ Locales ['fr'] = { ['buy_license'] = 'acheter une license?', ['yes'] = '%s', ['no'] = 'non', - ['buy'] = 'vous avez acheté ~y~%s~s~ for ~r~%s EUR~s~', + ['weapon_bought'] = 'purchased for %s EUR', ['not_enough_black'] = 'Vous n\'avez ~r~pas assez~s~ d\'argent sale', ['not_enough'] = 'vous n\'avez ~r~pas assez~s~ d\'argent', ['already_owned'] = 'you already own this weapon!', - ['shop'] = 'magasin', - ['shop_menu'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder au magasin.', + ['shop_menu_title'] = 'magasin', + ['shop_menu_prompt'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder au magasin.', ['shop_menu_item'] = '%s EUR', ['map_blip'] = 'armurerie', } diff --git a/locales/pl.lua b/locales/pl.lua index e64bb7fb..8f389a72 100644 --- a/locales/pl.lua +++ b/locales/pl.lua @@ -2,12 +2,12 @@ Locales ['pl'] = { ['buy_license'] = 'czy chcesz kupić licencję?', ['yes'] = '%s', ['no'] = 'nie', - ['buy'] = 'kupiłeś/aś ~y~%s~s~ for ~r~%s PLN~s~', + ['weapon_bought'] = 'purchased for %s PLN', ['not_enough_black'] = 'nie masz wystarczająco brudnej kasy', ['not_enough'] = 'nie masz wystarczająco pieniędzy', ['already_owned'] = 'you already own this weapon!', - ['shop'] = 'sklep', - ['shop_menu'] = 'Wciśnij ~INPUT_CONTEXT~ aby otworzyć sklep.', + ['shop_menu_title'] = 'sklep', + ['shop_menu_prompt'] = 'Wciśnij ~INPUT_CONTEXT~ aby otworzyć sklep.', ['shop_menu_item'] = '%s PLN', ['map_blip'] = 'sklep z bronią', } diff --git a/locales/sv.lua b/locales/sv.lua index 05a4df01..57da682d 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -2,12 +2,12 @@ Locales ['sv'] = { ['buy_license'] = 'vill du köpa ett vapenlicens?', ['yes'] = '%s', ['no'] = 'nej tack', - ['buy'] = 'du köpte ~y~%s~s~ för ~r~%s SEK~s~', + ['weapon_bought'] = 'köpt för %s SEK', ['not_enough_black'] = 'du har inte tillräckligt med svarta pengar', ['not_enough'] = 'du har inte råd för detta', ['already_owned'] = 'du äger redan detta vapen!', - ['shop'] = 'vapenaffär', - ['shop_menu'] = 'tryck ~INPUT_CONTEXT~ för att komma åt ~y~vapenaffären~s~.', + ['shop_menu_title'] = 'vapenaffär', + ['shop_menu_prompt'] = 'tryck ~INPUT_CONTEXT~ för att komma åt ~y~vapenaffären~s~.', ['shop_menu_item'] = '%s SEK', ['map_blip'] = 'vapenaffär', } diff --git a/server/main.lua b/server/main.lua index 491a4e92..6fd3fbf1 100644 --- a/server/main.lua +++ b/server/main.lua @@ -37,50 +37,61 @@ ESX.RegisterServerCallback('esx_weaponshop:buyLicense', function(source, cb) cb(true) end) else - cb(false) TriggerClientEvent('esx:showNotification', source, _U('not_enough')) + cb(false) end end) -RegisterServerEvent('esx_weaponshop:buyItem') -AddEventHandler('esx_weaponshop:buyItem', function(weaponName, zone) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) +ESX.RegisterServerCallback('esx_weaponshop:buyWeapon', function(source, cb, weaponName, zone) + local xPlayer = ESX.GetPlayerFromId(source) local price = GetPrice(weaponName, zone) - if xPlayer.hasWeapon(weaponName) then - TriggerClientEvent('esx:showNotification', _source, _U('already_owned')) - return + if price == 0 then + print(('esx_weaponshop: %s attempted to buy a unknown weapon!'):format(xPlayer.identifier)) + cb(false) end - if zone == 'BlackWeashop' then - - if xPlayer.getAccount('black_money').money >= price then - xPlayer.removeAccountMoney('black_money', price) - xPlayer.addWeapon(weaponName, 42) - TriggerClientEvent('esx:showNotification', _source, _U('buy', ESX.GetWeaponLabel(weaponName), ESX.Math.GroupDigits(price))) - else - TriggerClientEvent('esx:showNotification', _source, _U('not_enough_black')) - end - + if xPlayer.hasWeapon(weaponName) then + TriggerClientEvent('esx:showNotification', source, _U('already_owned')) + cb(false) else + if zone == 'BlackWeashop' then + + if xPlayer.getAccount('black_money').money >= price then + xPlayer.removeAccountMoney('black_money', price) + xPlayer.addWeapon(weaponName, 42) + + cb(true) + else + TriggerClientEvent('esx:showNotification', source, _U('not_enough_black')) + cb(false) + end - if xPlayer.getMoney() >= price then - xPlayer.removeMoney(price) - xPlayer.addWeapon(weaponName, 42) - TriggerClientEvent('esx:showNotification', _source, _U('buy', ESX.GetWeaponLabel(weaponName), ESX.Math.GroupDigits(price))) else - TriggerClientEvent('esx:showNotification', _source, _U('not_enough')) - end + if xPlayer.getMoney() >= price then + xPlayer.removeMoney(price) + xPlayer.addWeapon(weaponName, 42) + + cb(true) + else + TriggerClientEvent('esx:showNotification', source, _U('not_enough')) + cb(false) + end + + end end end) function GetPrice(weaponName, zone) - local result = MySQL.Sync.fetchAll('SELECT price FROM weashops WHERE zone = @zone AND item = @item', { + local price = MySQL.Sync.fetchScalar('SELECT price FROM weashops WHERE zone = @zone AND item = @item', { ['@zone'] = zone, ['@item'] = weaponName }) - return result[1].price + if price then + return price + else + return 0 + end end From ef4c42b0bc4553976408417dceee9b88216f877a Mon Sep 17 00:00:00 2001 From: lFARVA <36070541+lFARVA@users.noreply.github.com> Date: Thu, 10 Jan 2019 05:21:42 -0500 Subject: [PATCH 50/63] Update main.lua --- client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index 42d5a361..2bd89fd8 100644 --- a/client/main.lua +++ b/client/main.lua @@ -131,7 +131,7 @@ function DisplayBoughtScaleform(weaponName, price) end AddEventHandler('esx_weaponshop:hasEnteredMarker', function(zone) - if zone == 'GunShop' then + if zone == 'GunShop' or zone == 'BlackWeashop' then CurrentAction = 'shop_menu' CurrentActionMsg = _U('shop_menu_prompt') CurrentActionData = { zone = zone } From cbc5113d7b30afbac743a33c7225bcd2fbaa64bb Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 2 Nov 2019 11:01:26 +0100 Subject: [PATCH 51/63] Minor statement fix --- server/main.lua | 50 +++++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/server/main.lua b/server/main.lua index 6fd3fbf1..772fbb3a 100644 --- a/server/main.lua +++ b/server/main.lua @@ -49,36 +49,32 @@ ESX.RegisterServerCallback('esx_weaponshop:buyWeapon', function(source, cb, weap if price == 0 then print(('esx_weaponshop: %s attempted to buy a unknown weapon!'):format(xPlayer.identifier)) cb(false) - end - - if xPlayer.hasWeapon(weaponName) then - TriggerClientEvent('esx:showNotification', source, _U('already_owned')) - cb(false) else - if zone == 'BlackWeashop' then - - if xPlayer.getAccount('black_money').money >= price then - xPlayer.removeAccountMoney('black_money', price) - xPlayer.addWeapon(weaponName, 42) - - cb(true) - else - TriggerClientEvent('esx:showNotification', source, _U('not_enough_black')) - cb(false) - end - + if xPlayer.hasWeapon(weaponName) then + TriggerClientEvent('esx:showNotification', source, _U('already_owned')) + cb(false) else - - if xPlayer.getMoney() >= price then - xPlayer.removeMoney(price) - xPlayer.addWeapon(weaponName, 42) - - cb(true) - else - TriggerClientEvent('esx:showNotification', source, _U('not_enough')) - cb(false) - end + if zone == 'BlackWeashop' then + if xPlayer.getAccount('black_money').money >= price then + xPlayer.removeAccountMoney('black_money', price) + xPlayer.addWeapon(weaponName, 42) + cb(true) + else + TriggerClientEvent('esx:showNotification', source, _U('not_enough_black')) + cb(false) + end + else + if xPlayer.getMoney() >= price then + xPlayer.removeMoney(price) + xPlayer.addWeapon(weaponName, 42) + + cb(true) + else + TriggerClientEvent('esx:showNotification', source, _U('not_enough')) + cb(false) + end + end end end end) From ea4dace2326246dbf0d1139850b516fb9fc00611 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Tue, 12 Nov 2019 21:01:26 +0100 Subject: [PATCH 52/63] New ESX support --- server/main.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/main.lua b/server/main.lua index 772fbb3a..dc403f25 100644 --- a/server/main.lua +++ b/server/main.lua @@ -37,7 +37,7 @@ ESX.RegisterServerCallback('esx_weaponshop:buyLicense', function(source, cb) cb(true) end) else - TriggerClientEvent('esx:showNotification', source, _U('not_enough')) + xPlayer.showNotification(_U('not_enough')) cb(false) end end) @@ -51,7 +51,7 @@ ESX.RegisterServerCallback('esx_weaponshop:buyWeapon', function(source, cb, weap cb(false) else if xPlayer.hasWeapon(weaponName) then - TriggerClientEvent('esx:showNotification', source, _U('already_owned')) + xPlayer.showNotification(_U('already_owned')) cb(false) else if zone == 'BlackWeashop' then @@ -61,7 +61,7 @@ ESX.RegisterServerCallback('esx_weaponshop:buyWeapon', function(source, cb, weap cb(true) else - TriggerClientEvent('esx:showNotification', source, _U('not_enough_black')) + xPlayer.showNotification(_U('not_enough_black')) cb(false) end else @@ -71,7 +71,7 @@ ESX.RegisterServerCallback('esx_weaponshop:buyWeapon', function(source, cb, weap cb(true) else - TriggerClientEvent('esx:showNotification', source, _U('not_enough')) + xPlayer.showNotification(_U('not_enough')) cb(false) end end From 5c5dcf764348d45cc9dc1753f12c1811b38c50be Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sun, 24 Nov 2019 18:05:16 +0100 Subject: [PATCH 53/63] Removed keys table --- client/main.lua | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/client/main.lua b/client/main.lua index 2bd89fd8..8d2ec4b5 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 @@ -223,7 +211,7 @@ Citizen.CreateThread(function() if CurrentAction ~= nil then ESX.ShowHelpNotification(CurrentActionMsg) - if IsControlJustReleased(0, Keys['E']) then + if IsControlJustReleased(0, 38) then if CurrentAction == 'shop_menu' then if Config.LicenseEnable and Config.Zones[CurrentActionData.zone].Legal then From b9ea9478c3714e7b7ab5437d31c131b10bd0a4a8 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sun, 24 Nov 2019 18:06:28 +0100 Subject: [PATCH 54/63] Added Czech locale (#55) * Czech language support * Fix * Czech lang support --- __resource.lua | 4 +++- locales/cs.lua | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 locales/cs.lua diff --git a/__resource.lua b/__resource.lua index a45e385f..0b512cd0 100644 --- a/__resource.lua +++ b/__resource.lua @@ -15,6 +15,7 @@ server_scripts { 'locales/es.lua', 'locales/pl.lua', 'locales/sv.lua', + 'locales/cs.lua', 'config.lua', 'server/main.lua' } @@ -29,8 +30,9 @@ client_scripts { 'locales/es.lua', 'locales/pl.lua', 'locales/sv.lua', + 'locales/cs.lua', 'config.lua', 'client/main.lua' } -dependency 'es_extended' \ No newline at end of file +dependency 'es_extended' diff --git a/locales/cs.lua b/locales/cs.lua new file mode 100644 index 00000000..a40074d5 --- /dev/null +++ b/locales/cs.lua @@ -0,0 +1,13 @@ +Locales ['cs'] = { + ['buy_license'] = 'zakoupit zbrojni prukaz?', + ['yes'] = '%s', + ['no'] = 'ne', + ['weapon_bought'] = 'zakoupeno za $%s', + ['not_enough_black'] = 'nemas dostatek spinavych penez', + ['not_enough'] = 'nemas dostatek penez', + ['already_owned'] = 'tuhle zbran jiz vlastnis!', + ['shop_menu_title'] = 'ammu-Nation', + ['shop_menu_prompt'] = 'stiskni ~INPUT_CONTEXT~ pro pristup do ~y~Ammu-Nationu~s~.', + ['shop_menu_item'] = '$%s', + ['map_blip'] = 'ammu-Nation', +} From 35f31af91e0032493cd35b91187bbe1f69c9fc72 Mon Sep 17 00:00:00 2001 From: Michael Douglas Date: Fri, 17 Jan 2020 12:48:14 -0300 Subject: [PATCH 55/63] Improved Portuguese locale (#59) * Correcting and improving translation * Update br.lua --- locales/br.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/locales/br.lua b/locales/br.lua index 170df88a..36d1414f 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,11 +1,11 @@ Locales ['br'] = { - ['buy_license'] = 'buy weapon license?', + ['buy_license'] = 'comprar licença de porte de arma?', ['yes'] = '%s', - ['no'] = 'no', - ['weapon_bought'] = 'purchased for %s EUR', + ['no'] = 'não', + ['weapon_bought'] = 'comprado por %s R$', ['not_enough_black'] = 'você não tem dinheiro sujo suficiente', ['not_enough'] = 'você não tem dinheiro suficiente', - ['already_owned'] = 'you already own this weapon!', + ['already_owned'] = 'você já possui esta arma!', ['shop_menu_title'] = 'comprar', ['shop_menu_prompt'] = 'pressione ~INPUT_CONTEXT~ para comprar armas.', ['shop_menu_item'] = 'R$%s', From 98294c1ade977042f97aa99f2906e2e4d3e110f8 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sun, 19 Jan 2020 17:02:37 +0100 Subject: [PATCH 56/63] Replace __resource.lua with fxmanifest.lua --- __resource.lua => fxmanifest.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename __resource.lua => fxmanifest.lua (90%) diff --git a/__resource.lua b/fxmanifest.lua similarity index 90% rename from __resource.lua rename to fxmanifest.lua index 0b512cd0..ecee11cf 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 Weapon Shop' From f2c646366591b909d8f576ea5f3585ac5d865aed Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 11 Feb 2020 21:28:20 +0100 Subject: [PATCH 57/63] Minor changes --- README.md | 4 +++- client/main.lua | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b5cb8d14..04c5b0d3 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # esx_weaponshop +ESX Weapon Shop adds.. well you guessed it - weapon shops to the already existing shops in the world. + ## Download & Installation ### Using [fvm](https://github.com/qlaffont/fvm-installer) @@ -29,7 +31,7 @@ start esx_weaponshop ### License esx_weaponshop - Legal and illegal weapon shops -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/client/main.lua b/client/main.lua index 8d2ec4b5..b213fe8b 100644 --- a/client/main.lua +++ b/client/main.lua @@ -33,8 +33,8 @@ function OpenBuyLicenseMenu(zone) title = _U('buy_license'), align = 'top-left', elements = { - { label = _U('no'), value = 'no' }, - { label = _U('yes', ('%s'):format((_U('shop_menu_item', ESX.Math.GroupDigits(Config.LicensePrice))))), value = 'yes' }, + {label = _U('no'), value = 'no'}, + {label = _U('yes', ('%s'):format((_U('shop_menu_item', ESX.Math.GroupDigits(Config.LicensePrice))))), value = 'yes'}, } }, function(data, menu) if data.current.value == 'yes' then From f5db0f85c10b29ea0b6e83661d6dcf9413b16da5 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 14 Apr 2020 16:53:46 +0200 Subject: [PATCH 58/63] Update esx_weaponshop.sql --- esx_weaponshop.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esx_weaponshop.sql b/esx_weaponshop.sql index dad5a971..98d1c4b6 100644 --- a/esx_weaponshop.sql +++ b/esx_weaponshop.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; CREATE TABLE `weashops` ( `id` int(11) NOT NULL AUTO_INCREMENT, From 35d83e34882bd9045c0ea78e192e86998bb426a8 Mon Sep 17 00:00:00 2001 From: Kevin O'Byrne <62954271+TehZombiJesus@users.noreply.github.com> Date: Fri, 3 Jul 2020 13:05:30 -0400 Subject: [PATCH 59/63] Update fr.lua (#67) --- locales/fr.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/fr.lua b/locales/fr.lua index cd11b198..a706c068 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -2,10 +2,10 @@ Locales ['fr'] = { ['buy_license'] = 'acheter une license?', ['yes'] = '%s', ['no'] = 'non', - ['weapon_bought'] = 'purchased for %s EUR', + ['weapon_bought'] = 'acheté pour %s EUR', ['not_enough_black'] = 'Vous n\'avez ~r~pas assez~s~ d\'argent sale', ['not_enough'] = 'vous n\'avez ~r~pas assez~s~ d\'argent', - ['already_owned'] = 'you already own this weapon!', + ['already_owned'] = 'vous possédez déjà cette arme!', ['shop_menu_title'] = 'magasin', ['shop_menu_prompt'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder au magasin.', ['shop_menu_item'] = '%s EUR', From 8b92dc1391bc6c2b7822087c89024758d865e79c Mon Sep 17 00:00:00 2001 From: btwlouis <56355239+btwlouis@users.noreply.github.com> Date: Fri, 3 Jul 2020 19:06:30 +0200 Subject: [PATCH 60/63] Update de.lua (#63) Translation --- locales/de.lua | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/locales/de.lua b/locales/de.lua index 1f85ab39..993e871d 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -1,13 +1,13 @@ Locales ['de'] = { - ['buy_license'] = 'buy weapon license?', + ['buy_license'] = 'Waffenlizenz kaufen?', ['yes'] = '%s', - ['no'] = 'no', - ['weapon_bought'] = 'purchased for %s EUR', - ['not_enough_black'] = 'du hast nicht genug Schwarzgeld', - ['not_enough'] = 'du hast nicht genug Geld', - ['already_owned'] = 'you already own this weapon!', - ['shop_menu_title'] = 'geschäft', - ['shop_menu_prompt'] = 'drücke ~INPUT_CONTEXT~ um auf das Geschäft zuzugreifen.', + ['no'] = 'Nein', + ['weapon_bought'] = 'Gekauft für %s EUR', + ['not_enough_black'] = 'Du hast nicht genug Schwarzgeld', + ['not_enough'] = 'Du hast nicht genug Geld', + ['already_owned'] = 'Du besitzt diese Waffe bereits', + ['shop_menu_title'] = 'Geschäft', + ['shop_menu_prompt'] = 'Drücke ~INPUT_CONTEXT~ um auf das Geschäft zuzugreifen.', ['shop_menu_item'] = '%s EUR', - ['map_blip'] = 'waffenladen', + ['map_blip'] = 'Waffenladen', } From c17c5456c67cbb9a842e88ea85c772517076f273 Mon Sep 17 00:00:00 2001 From: mansurov-am <50938882+mansurov-am@users.noreply.github.com> Date: Fri, 3 Jul 2020 22:07:44 +0500 Subject: [PATCH 61/63] Create en.sql (#62) EN Localization --- localization/en.sql | 57 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 localization/en.sql diff --git a/localization/en.sql b/localization/en.sql new file mode 100644 index 00000000..4103fcd3 --- /dev/null +++ b/localization/en.sql @@ -0,0 +1,57 @@ +USE `essentialmode`; + +CREATE TABLE `weashops` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `zone` varchar(255) NOT NULL, + `item` varchar(255) NOT NULL, + `price` int(11) NOT NULL, + + PRIMARY KEY (`id`) +); + +INSERT INTO `licenses` (`type`, `label`) VALUES + ('weapon', "Weapons license") +; + +INSERT INTO `weashops` (`zone`, `item`, `price`) VALUES + ('GunShop','WEAPON_PISTOL', 300), + ('BlackWeashop','WEAPON_PISTOL', 500), + ('GunShop', 'WEAPON_FLASHLIGHT', 60), + ('BlackWeashop', 'WEAPON_FLASHLIGHT', 70), + ('GunShop', 'WEAPON_MACHETE', 90), + ('BlackWeashop', 'WEAPON_MACHETE', 110), + ('GunShop', 'WEAPON_NIGHTSTICK', 150), + ('BlackWeashop', 'WEAPON_NIGHTSTICK', 150), + ('GunShop', 'WEAPON_BAT', 100), + ('BlackWeashop', 'WEAPON_BAT', 100), + ('GunShop', 'WEAPON_STUNGUN', 50), + ('BlackWeashop', 'WEAPON_STUNGUN', 50), + ('GunShop', 'WEAPON_MICROSMG', 1400), + ('BlackWeashop', 'WEAPON_MICROSMG', 1700), + ('GunShop', 'WEAPON_PUMPSHOTGUN', 3400), + ('BlackWeashop', 'WEAPON_PUMPSHOTGUN', 3500), + ('GunShop', 'WEAPON_ASSAULTRIFLE', 10000), + ('BlackWeashop', 'WEAPON_ASSAULTRIFLE', 11000), + ('GunShop', 'WEAPON_SPECIALCARBINE', 15000), + ('BlackWeashop', 'WEAPON_SPECIALCARBINE', 16500), + ('GunShop', 'WEAPON_SNIPERRIFLE', 22000), + ('BlackWeashop', 'WEAPON_SNIPERRIFLE', 24000), + ('GunShop', 'WEAPON_FIREWORK', 18000), + ('BlackWeashop', 'WEAPON_FIREWORK', 20000), + ('GunShop', 'WEAPON_GRENADE', 500), + ('BlackWeashop', 'WEAPON_GRENADE', 650), + ('GunShop', 'WEAPON_BZGAS', 200), + ('BlackWeashop', 'WEAPON_BZGAS', 350), + ('GunShop', 'WEAPON_FIREEXTINGUISHER', 100), + ('BlackWeashop', 'WEAPON_FIREEXTINGUISHER', 100), + ('GunShop', 'WEAPON_BALL', 50), + ('BlackWeashop', 'WEAPON_BALL', 50), + ('GunShop', 'WEAPON_SMOKEGRENADE', 100), + ('BlackWeashop', 'WEAPON_SMOKEGRENADE', 100), + ('BlackWeashop', 'WEAPON_APPISTOL', 1100), + ('BlackWeashop', 'WEAPON_CARBINERIFLE', 12000), + ('BlackWeashop', 'WEAPON_HEAVYSNIPER', 30000), + ('BlackWeashop', 'WEAPON_MINIGUN', 45000), + ('BlackWeashop', 'WEAPON_RAILGUN', 50000), + ('BlackWeashop', 'WEAPON_STICKYBOMB', 500) +; From cc0d5cd0ceaecbb736bf4c1542b1c9d6c3360130 Mon Sep 17 00:00:00 2001 From: SEOAlexRamon <37023161+seoalexramon@users.noreply.github.com> Date: Thu, 29 Oct 2020 18:44:50 +0100 Subject: [PATCH 62/63] fixed: es.lua --- locales/es.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/locales/es.lua b/locales/es.lua index d3fd3304..f87838e7 100644 --- a/locales/es.lua +++ b/locales/es.lua @@ -1,13 +1,13 @@ Locales ['es'] = { - ['buy_license'] = 'buy weapon license?', + ['buy_license'] = '¿comprar la licencia de armas?', ['yes'] = '%s', ['no'] = 'no', - ['weapon_bought'] = 'purchased for %s EUR', + ['weapon_bought'] = 'comprada por $%s', ['not_enough_black'] = 'usted no tiene ~r~suficiente~s~ dinero negro', ['not_enough'] = 'usted no tiene ~r~suficiente~s~ dinero', - ['already_owned'] = 'you already own this weapon!', + ['already_owned'] = '¡Ya dispones de esta arma!', ['shop_menu_title'] = 'tienda', ['shop_menu_prompt'] = 'presione ~INPUT_CONTEXT~ para acceder a la tienda.', - ['shop_menu_item'] = '%s EUR', - ['map_blip'] = 'arsenal', + ['shop_menu_item'] = '$%s', + ['map_blip'] = 'ammu-Nation', } From 69e13ecbf0e2ea5eb8b22e97062bd1d450372cab Mon Sep 17 00:00:00 2001 From: HypeLevels <61633775+HypeLevels@users.noreply.github.com> Date: Sat, 28 Nov 2020 22:28:59 +0000 Subject: [PATCH 63/63] Update config.lua --- config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.lua b/config.lua index 32671dd2..a505c50b 100644 --- a/config.lua +++ b/config.lua @@ -5,7 +5,7 @@ Config.Size = { x = 1.5, y = 1.5, z = 0.5 } Config.Color = { r = 0, g = 128, b = 255 } Config.Type = 1 -Config.Locale = 'fr' +Config.Locale = 'en' Config.LicenseEnable = false -- only turn this on if you are using esx_license Config.LicensePrice = 5000