From 874735443eb050dc606d2e12d6e5f970bc94f1ec Mon Sep 17 00:00:00 2001 From: Samuel Date: Sat, 4 Aug 2018 11:40:38 +0200 Subject: [PATCH 01/35] Initial commit --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 2 + 2 files changed, 676 insertions(+) create mode 100644 LICENSE create mode 100644 README.md diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..94a9ed02 --- /dev/null +++ b/LICENSE @@ -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. + + + Copyright (C) + + 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: + + Copyright (C) + 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 +. diff --git a/README.md b/README.md new file mode 100644 index 00000000..ad94b0fd --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# esx_boat +Boat shop and garage for ESX From 8c1494d5c7b83df1d678dc3ad8c300b6d2a52a3a Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 4 Aug 2018 16:08:24 +0200 Subject: [PATCH 02/35] Initial public push (WIP) --- README.md | 43 +++++++++++- __resource.lua | 26 +++++++ client/main.lua | 169 ++++++++++++++++++++++++++++++++++++++++++++++ client/marker.lua | 129 +++++++++++++++++++++++++++++++++++ config.lua | 51 ++++++++++++++ locales/en.lua | 10 +++ server/main.lua | 58 ++++++++++++++++ 7 files changed, 485 insertions(+), 1 deletion(-) create mode 100644 __resource.lua create mode 100644 client/main.lua create mode 100644 client/marker.lua create mode 100644 config.lua create mode 100644 locales/en.lua create mode 100644 server/main.lua diff --git a/README.md b/README.md index ad94b0fd..4be65dd0 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,43 @@ # esx_boat -Boat shop and garage for ESX +Adds boat shops and boat garages around San Andreas. Unlike esx_vehicleshop this script isn't built around a job. + +## Requirements +- [esx_vehicleshop](https://github.com/ESX-Org/esx_vehicleshop) + +## Download & Installation + +### Using [fvm](https://github.com/qlaffont/fvm-installer) +``` +fvm install --save --folder=esx esx-org/esx_boat +``` + +### Using Git +``` +cd resources +git clone https://github.com/ESX-Org/esx_boat [esx]/esx_boat +``` + +### Manually +- Download https://github.com/ESX-Org/esx_boat/archive/master.zip +- Put it in the `[esx]` directory + + +## Installation +- Import `esx_boat.sql` in your database +- Add this to your `server.cfg`: + +``` +start esx_boat +``` + +# Legal +### License +esx_boat - Boat shop and garage for ESX + +Copyright (C) 2015-2018 Jérémie N'gadi + +This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. + +This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details. + +You should have received a copy Of the GNU General Public License along with this program. If Not, see http://www.gnu.org/licenses/. diff --git a/__resource.lua b/__resource.lua new file mode 100644 index 00000000..edfbee1a --- /dev/null +++ b/__resource.lua @@ -0,0 +1,26 @@ +resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' + +description 'ESX Boat' + +version '0.1.0' + +server_scripts { + '@mysql-async/lib/MySQL.lua', + '@es_extended/locale.lua', + 'locales/en.lua', + 'config.lua', + 'server/main.lua' +} + +client_scripts { + '@es_extended/locale.lua', + 'locales/en.lua', + 'config.lua', + 'client/main.lua', + 'client/marker.lua' +} + +dependencies { + 'es_extended', + 'esx_vehicleshop' +} \ No newline at end of file diff --git a/client/main.lua b/client/main.lua new file mode 100644 index 00000000..c7d66277 --- /dev/null +++ b/client/main.lua @@ -0,0 +1,169 @@ +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 +isInShopMenu = false +local spawnedVehicles = {} + +Citizen.CreateThread(function() + while ESX == nil do + TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + Citizen.Wait(0) + end + + while ESX.GetPlayerData() == nil do + print('playerdata nil!! (boat)') + Citizen.Wait(10) + end + + ESX.PlayerData = ESX.GetPlayerData() +end) + +function OpenBoatShop(shop) + + isInShopMenu = true + + local playerPed = PlayerPedId() + local elements = {} + + for i=1, #Config.Vehicles, 1 do + + table.insert(elements, { + label = (string.format ('%s - $%i', Config.Vehicles[i].label, Config.Vehicles[i].price)), + name = Config.Vehicles[i].label, + model = Config.Vehicles[i].model, + price = Config.Vehicles[i].price, + }) + end + + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'boat_shop', + { + title = _U('boat_shop'), + align = 'top-left', + elements = elements + }, function (data, menu) + + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'boat_shop_confirm', + { + title = _U('boat_shop_confirm', data.current.name, data.current.price), + align = 'top-left', + elements = { + { label = _U('confirm_no'), value = 'no' }, + { label = _U('confirm_yes'), value = 'yes' } + } + }, function (data2, menu2) + + if data2.current.value == 'yes' then + + local plate = exports['esx_vehicleshop']:GeneratePlate() + local vehicle = GetVehiclePedIsIn(playerPed, false) + local props = ESX.Game.GetVehicleProperties(vehicle) + props.plate = plate + print(props.model) + + ESX.TriggerServerCallback('esx_boat:buyBoat', function (bought) + + if bought then + ESX.ShowNotification(_U('boat_shop_bought', data.current.model, data.current.price)) + + DeleteSpawnedVehicles() + ESX.UI.Menu.CloseAll() + + CurrentAction = 'boat_shop' + CurrentActionMsg = _U('boat_shop_open') + + FreezeEntityPosition(playerPed, false) + SetEntityVisible(playerPed, true) + SetEntityCoords(playerPed, shop.Outside.x, shop.Outside.y, shop.Outside.z) + else + ESX.ShowNotification(_U('boat_shop_nomoney')) + menu2.close() + end + + end, props, data.current.model) + + else + menu2.close() + end + + end, function (data2, menu2) + menu2.close() + end) + + + + end, function (data, menu) + -- exit menu + menu.close() + + DeleteSpawnedVehicles() + + CurrentAction = 'boat_shop' + CurrentActionMsg = _U('boat_shop_open') + + FreezeEntityPosition(playerPed, false) + SetEntityVisible(playerPed, true) + SetEntityCoords(playerPed, shop.Outside.x, shop.Outside.y, shop.Outside.z) + + end, function (data, menu) + DeleteSpawnedVehicles() + + ESX.Game.SpawnLocalVehicle(data.current.model, shop.Inside, shop.Heading, function (vehicle) + table.insert(spawnedVehicles, vehicle) + TaskWarpPedIntoVehicle(playerPed, vehicle, -1) + FreezeEntityPosition(vehicle, true) + end) + end, function (data, menu) + + end) + + -- spawn first vehicle + DeleteSpawnedVehicles() + ESX.Game.SpawnLocalVehicle(Config.Vehicles[1].model, shop.Inside, shop.Heading, function (vehicle) + table.insert(spawnedVehicles, vehicle) + TaskWarpPedIntoVehicle(playerPed, vehicle, -1) + FreezeEntityPosition(vehicle, true) + end) +end + +-- Key controls +Citizen.CreateThread(function() + while true do + Citizen.Wait(10) + + if isInShopMenu then + DisableControlAction(0, 75, true) -- Disable exit vehicle + DisableControlAction(27, 75, true) -- Disable exit vehicle + else + Citizen.Wait(500) + end + end +end) + +function DeleteSpawnedVehicles() + + while #spawnedVehicles > 0 do + + local vehicle = spawnedVehicles[1] + ESX.Game.DeleteVehicle(vehicle) + table.remove(spawnedVehicles, 1) + + end +end + + + +AddEventHandler('onResourceStop', function(resource) + --if resource == GetCurrentResourceName() and ESX.UI.Menu.IsOpen('default', GetCurrentResourceName(), 'boat_shop') then + ESX.UI.Menu.CloseAll() +-- end +end) diff --git a/client/marker.lua b/client/marker.lua new file mode 100644 index 00000000..5a4f7ff2 --- /dev/null +++ b/client/marker.lua @@ -0,0 +1,129 @@ +local HasAlreadyEnteredMarker = false +local LastZone = nil + +CurrentAction = nil +CurrentActionMsg = '' +CurrentActionData = {} + +-- Key controls +Citizen.CreateThread(function() + while true do + Citizen.Wait(10) + + if CurrentAction == nil then + Citizen.Wait(200) + else + + ESX.ShowHelpNotification(CurrentActionMsg) + + if IsControlJustReleased(0, Keys['E']) then + + if CurrentAction == 'boat_shop' then + OpenBoatShop(Config.Zones.BoatShops[CurrentActionData.zoneNum]) + end + + CurrentAction = nil + end + end + end +end) + +AddEventHandler('esx_boat:hasEnteredMarker', function(zone, zoneNum) + print(zone) + print(zoneNum) + + if zone == 'boat_shop' then + CurrentAction = 'boat_shop' + CurrentActionMsg = _U('boat_shop_open') + CurrentActionData = { zoneNum = zoneNum } + end +end) + +AddEventHandler('esx_boat:hasExitedMarker', function() + if not isInShopMenu then + ESX.UI.Menu.CloseAll() + end + + CurrentAction = nil +end) + +-- Draw markers +Citizen.CreateThread(function() + while true do + + Citizen.Wait(1) + + local playerPed = PlayerPedId() + local coords = GetEntityCoords(playerPed) + + for i=1, #Config.Zones.BoatShops, 1 do + local zone = Config.Zones.BoatShops[i].Outside + if GetDistanceBetweenCoords(coords, zone.x, zone.y, zone.z, true) < Config.DrawDistance then + DrawMarker(Config.MarkerType, zone.x, zone.y, zone.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.MarkerSize.x, Config.MarkerSize.y, Config.MarkerSize.z, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, false, false, false) + end + end + + end +end) + +-- Enter / Exit marker events +Citizen.CreateThread(function() + + while true do + + Citizen.Wait(1) + + local playerPed = PlayerPedId() + local coords = GetEntityCoords(playerPed) + local isInMarker = false + local currentZone = nil + local currentZoneNum = nil + + for i=1, #Config.Zones.BoatShops, 1 do + + if GetDistanceBetweenCoords(coords, Config.Zones.BoatShops[i].Outside.x, Config.Zones.BoatShops[i].Outside.y, Config.Zones.BoatShops[i].Outside.z, true) < Config.MarkerSize.x then + isInMarker = true + currentZone = 'boat_shop' + currentZoneNum = i + end + +--[[ + if GetDistanceBetweenCoords(coords, v.Helicopters[i].SpawnPoint.x, v.Helicopters[i].SpawnPoint.y, v.Helicopters[i].SpawnPoint.z, true) < Config.MarkerSize.x then + isInMarker = true + currentZone = 'HelicopterSpawnPoint' + currentZoneNum = i + end + extra för garage +]] + + + + end + + local hasExited = false + + if isInMarker and not HasAlreadyEnteredMarker or (isInMarker and (LastZone ~= currentZone or LastZoneNum ~= currentZoneNum) ) then + + if + (LastZone ~= nil and LastZoneNum ~= nil) and + (LastZone ~= currentZone or LastZoneNum ~= currentZoneNum) + then + TriggerEvent('esx_boat:hasExitedMarker', LastZone) + hasExited = true + end + + HasAlreadyEnteredMarker = true + LastZone = currentZone + LastZoneNum = currentZoneNum + + TriggerEvent('esx_boat:hasEnteredMarker', currentZone, currentZoneNum) + end + + if not hasExited and not isInMarker and HasAlreadyEnteredMarker then + + HasAlreadyEnteredMarker = false + TriggerEvent('esx_boat:hasExitedMarker') + end + + end +end) diff --git a/config.lua b/config.lua new file mode 100644 index 00000000..62f2dbd3 --- /dev/null +++ b/config.lua @@ -0,0 +1,51 @@ +Config = {} + +Config.Locale = 'en' + +Config.MarkerType = 1 +Config.DrawDistance = 100.0 +Config.ZoneSize = {x = 5.0, y = 5.0, z = 3.0} +Config.MarkerColor = {r = 100, g = 204, b = 100} +Config.MarkerSize = { x = 1.5, y = 1.5, z = 1.0 } + +Config.Zones = { + + Garages = { + { + GaragePos = { x = -772.42, y = -1430.90, z = 1.59 }, + SpawnPoint = { x = -785.39, y = -1426.30, z = -0.47 }, + RemovePos = { x = -798.45, y = -1456.03, z = -0.47 }, + Heading = 150.0 + } + + }, + + BoatShops = { + + { -- shank st + Outside = { x = -773.76, y = -1495.25, z = 1.6 }, + Inside = { x = -798.59, y = -1503.12, z = -0.47 }, + Heading = 120.0 + } + + } + + + +} + +Config.Vehicles = { + + { + model = 'seashark', + label = 'Seashark', + price = 15000 + }, + + { + model = 'speeder', + label = 'Speeder', + price = 10000 + } + +} \ No newline at end of file diff --git a/locales/en.lua b/locales/en.lua new file mode 100644 index 00000000..9f621d14 --- /dev/null +++ b/locales/en.lua @@ -0,0 +1,10 @@ +Locales['en'] = { + -- shop + ['boat_shop'] = 'boat shop', + ['boat_shop_open'] = 'press ~INPUT_CONTEXT~ to open the boat shop.', + ['boat_shop_confirm'] = 'buy a %s for $%s?', + ['boat_shop_bought'] = 'you have ~y~bought~s~ a ~b~%s~s~ for ~g~$%s~s~', + ['boat_shop_nomoney'] = 'you cannot afford this boat!', + ['confirm_no'] = 'no', + ['confirm_yes'] = 'yes', +} \ No newline at end of file diff --git a/server/main.lua b/server/main.lua new file mode 100644 index 00000000..fe9dde8b --- /dev/null +++ b/server/main.lua @@ -0,0 +1,58 @@ +ESX = nil + +TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + +ESX.RegisterServerCallback('esx_boat:buyBoat', function (source, cb, vehicleProps, model) + local xPlayer = ESX.GetPlayerFromId(source) + local price = getPriceFromModel(model) + + -- vehicle model not found + if price == 0 then + print(('esx_boat: %s attempted to exploit the shop! (invalid vehicle model)'):format(xPlayer.identifier)) + cb(false) + end + + if xPlayer.getMoney() >= price then + xPlayer.removeMoney(price) + + MySQL.Async.execute('INSERT INTO owned_vehicles (owner, plate, vehicle, vehicleType) VALUES (@owner, @plate, @vehicle, @vehicleType)', + { + ['@owner'] = xPlayer.identifier, + ['@plate'] = vehicleProps.plate, + ['@vehicle'] = json.encode(vehicleProps), + ['@vehicleType'] = 'boat' + }) + + cb(true) + else + cb(false) + end +end) + +ESX.RegisterServerCallback('esx_boat:getGarage', function (source, cb) + + MySQL.Async.fetchAll('SELECT * FROM owned_vehicles WHERE owner = @owner, vehicleType = @vehicleType, stored = 1', + { + ['@owner'] = GetPlayerIdentifiers(source)[1], + ['vehicleType'] = 'boat' + }, function (result) + local vehicles = {} + + for i=1, #result, 1 do + table.insert(vehicles, json.decode(result[i].vehicle)) + end + + cb(vehicles) + end) + +end) + +function getPriceFromModel(model) + for i=1, #Config.Vehicles, 1 do + if Config.Vehicles[i].model == model then + return Config.Vehicles[i].price + end + end + + return 0 +end \ No newline at end of file From 5d4603db4f2504f82d3fe48afe2020211dc9b606 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 4 Aug 2018 20:32:09 +0200 Subject: [PATCH 03/35] More WIP code --- client/main.lua | 99 +++++++++++++++++++++++++++-------- client/marker.lua | 131 ++++++++++++++++++++++++++++++++++++++-------- config.lua | 22 +++++--- locales/en.lua | 15 +++++- server/main.lua | 40 +++++++++++--- 5 files changed, 248 insertions(+), 59 deletions(-) diff --git a/client/main.lua b/client/main.lua index c7d66277..41e38d0f 100644 --- a/client/main.lua +++ b/client/main.lua @@ -20,8 +20,7 @@ Citizen.CreateThread(function() Citizen.Wait(0) end - while ESX.GetPlayerData() == nil do - print('playerdata nil!! (boat)') + while ESX.GetPlayerData().job == nil do Citizen.Wait(10) end @@ -41,7 +40,7 @@ function OpenBoatShop(shop) label = (string.format ('%s - $%i', Config.Vehicles[i].label, Config.Vehicles[i].price)), name = Config.Vehicles[i].label, model = Config.Vehicles[i].model, - price = Config.Vehicles[i].price, + price = Config.Vehicles[i].price }) end @@ -64,11 +63,11 @@ function OpenBoatShop(shop) if data2.current.value == 'yes' then - local plate = exports['esx_vehicleshop']:GeneratePlate() - local vehicle = GetVehiclePedIsIn(playerPed, false) - local props = ESX.Game.GetVehicleProperties(vehicle) - props.plate = plate - print(props.model) + local plate = exports['esx_vehicleshop']:GeneratePlate() + local vehicle = GetVehiclePedIsIn(playerPed, false) + local props = ESX.Game.GetVehicleProperties(vehicle) + props.plate = plate + props.modelAlt = data.current.model ESX.TriggerServerCallback('esx_boat:buyBoat', function (bought) @@ -89,7 +88,7 @@ function OpenBoatShop(shop) menu2.close() end - end, props, data.current.model) + end, props) else menu2.close() @@ -99,10 +98,7 @@ function OpenBoatShop(shop) menu2.close() end) - - end, function (data, menu) - -- exit menu menu.close() DeleteSpawnedVehicles() @@ -122,8 +118,6 @@ function OpenBoatShop(shop) TaskWarpPedIntoVehicle(playerPed, vehicle, -1) FreezeEntityPosition(vehicle, true) end) - end, function (data, menu) - end) -- spawn first vehicle @@ -135,6 +129,66 @@ function OpenBoatShop(shop) end) end +function OpenBoatGarage(garage) + + ESX.TriggerServerCallback('esx_boat:getGarage', function (ownedBoats) + + if #ownedBoats == 0 then + ESX.ShowNotification(_U('garage_noboats')) + else + + -- get all available boats + local elements = {} + for i=1, #ownedBoats, 1 do + table.insert(elements, { + label = getVehicleModelFromHash(ownedBoats[i].model), + vehicleProps = ownedBoats[i] + }) + end + + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'boat_garage', + { + title = _U('garage'), + align = 'top-left', + elements = elements + }, function (data, menu) + + -- make sure the spawn point isn't blocked + local closestVehicle = GetClosestVehicle(garage.SpawnPoint.x, garage.SpawnPoint.y, garage.SpawnPoint.z, 3.0, 0, 71) + local playerPed = PlayerPedId() + local vehicleProps = data.current.vehicleProps + + if not DoesEntityExist(closestVehicle) then + TriggerServerEvent('esx_boat:takeOutVehicle', vehicleProps.plate) + ESX.ShowNotification(_U('garage_taken')) + + ESX.Game.SpawnVehicle(vehicleProps.model, garage.SpawnPoint, 20, function(vehicle) + TaskWarpPedIntoVehicle(playerPed, vehicle, -1) + ESX.Game.SetVehicleProperties(vehicle, vehicleProps) + end) + + menu.close() + else + ESX.ShowNotification(_U('garage_blocked')) + end + + + end, function (data, menu) + menu.close() + + CurrentAction = 'garage_out' + CurrentActionMsg = _U('garage_open') + end) + end + + end) +end + +function StoreBoatInGarage(vehicle) + +end + + -- Key controls Citizen.CreateThread(function() while true do @@ -150,20 +204,19 @@ Citizen.CreateThread(function() end) function DeleteSpawnedVehicles() - while #spawnedVehicles > 0 do - local vehicle = spawnedVehicles[1] ESX.Game.DeleteVehicle(vehicle) table.remove(spawnedVehicles, 1) - end end +function getVehicleModelFromHash(hash) + for i=1, #Config.Vehicles, 1 do + if Config.Vehicles[i].hash == hash then + return Config.Vehicles[i].model + end + end - -AddEventHandler('onResourceStop', function(resource) - --if resource == GetCurrentResourceName() and ESX.UI.Menu.IsOpen('default', GetCurrentResourceName(), 'boat_shop') then - ESX.UI.Menu.CloseAll() --- end -end) + return 'Unknown hash [' .. hash .. ']' +end \ No newline at end of file diff --git a/client/marker.lua b/client/marker.lua index 5a4f7ff2..96c7bc6e 100644 --- a/client/marker.lua +++ b/client/marker.lua @@ -10,9 +10,7 @@ Citizen.CreateThread(function() while true do Citizen.Wait(10) - if CurrentAction == nil then - Citizen.Wait(200) - else + if CurrentAction ~= nil then ESX.ShowHelpNotification(CurrentActionMsg) @@ -20,10 +18,17 @@ Citizen.CreateThread(function() if CurrentAction == 'boat_shop' then OpenBoatShop(Config.Zones.BoatShops[CurrentActionData.zoneNum]) + elseif CurentAction == 'garage_out' then + OpenBoatGarage(Config.Zones.Garages[CurrentActionData.zoneNum]) + elseif CrurentAction == 'garage_in' then + StoreBoatInGarage(CurrentActionData.vehicle) end CurrentAction = nil + end + else + Citizen.Wait(200) end end end) @@ -36,6 +41,24 @@ AddEventHandler('esx_boat:hasEnteredMarker', function(zone, zoneNum) CurrentAction = 'boat_shop' CurrentActionMsg = _U('boat_shop_open') CurrentActionData = { zoneNum = zoneNum } + elseif zone == 'garage_out' then + CurrentAction = 'garage_out' + CurrentActionMsg = _U('garage_open') + CurrentActionData = { zoneNum = zoneNum } + elseif zone == 'garage_in' then + local playerPed = PlayerPedId() + local coords = GetEntityCoords(playerPed) + + if IsPedInAnyVehicle(playerPed, false) then + local vehicle = GetVehiclePedIsIn(playerPed, false) + + if DoesEntityExist(vehicle) then + CurrentAction = 'garage_in' + CurrentActionMsg = _U('garage_store') + CurrentActionData = {vehicle = vehicle} + end + + end end end) @@ -59,7 +82,21 @@ Citizen.CreateThread(function() for i=1, #Config.Zones.BoatShops, 1 do local zone = Config.Zones.BoatShops[i].Outside if GetDistanceBetweenCoords(coords, zone.x, zone.y, zone.z, true) < Config.DrawDistance then - DrawMarker(Config.MarkerType, zone.x, zone.y, zone.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.MarkerSize.x, Config.MarkerSize.y, Config.MarkerSize.z, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, false, false, false) + DrawMarker(Config.MarkerType, zone.x, zone.y, zone.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.Marker.x, Config.Marker.y, Config.Marker.z, Config.Marker.r, Config.Marker.g, Config.Marker.b, 100, false, true, 2, false, false, false, false) + end + end + + for i=1, #Config.Zones.Garages, 1 do + local zoneOut = Config.Zones.Garages[i].GaragePos + if GetDistanceBetweenCoords(coords, zoneOut.x, zoneOut.y, zoneOut.z, true) < Config.DrawDistance then + DrawMarker(Config.MarkerType, zoneOut.x, zoneOut.y, zoneOut.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.Marker.x, Config.Marker.y, Config.Marker.z, Config.Marker.r, Config.Marker.g, Config.Marker.b, 100, false, true, 2, false, false, false, false) + end + end + + for i=1, #Config.Zones.Garages, 1 do + local zoneIn = Config.Zones.Garages[i].StorePos + if GetDistanceBetweenCoords(coords, zoneIn.x, zoneIn.y, zoneIn.z, true) < Config.DrawDistance then + DrawMarker(Config.MarkerType, zoneIn.x, zoneIn.y, zoneIn.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.StoreMarker.x, Config.StoreMarker.y, Config.StoreMarker.z, Config.StoreMarker.r, Config.StoreMarker.g, Config.StoreMarker.b, 100, false, true, 2, false, false, false, false) end end @@ -79,27 +116,32 @@ Citizen.CreateThread(function() local currentZone = nil local currentZoneNum = nil - for i=1, #Config.Zones.BoatShops, 1 do - - if GetDistanceBetweenCoords(coords, Config.Zones.BoatShops[i].Outside.x, Config.Zones.BoatShops[i].Outside.y, Config.Zones.BoatShops[i].Outside.z, true) < Config.MarkerSize.x then - isInMarker = true - currentZone = 'boat_shop' - currentZoneNum = i - end - ---[[ - if GetDistanceBetweenCoords(coords, v.Helicopters[i].SpawnPoint.x, v.Helicopters[i].SpawnPoint.y, v.Helicopters[i].SpawnPoint.z, true) < Config.MarkerSize.x then - isInMarker = true - currentZone = 'HelicopterSpawnPoint' - currentZoneNum = i - end - extra för garage -]] - - + for i=1, #Config.Zones.BoatShops, 1 do + if GetDistanceBetweenCoords(coords, Config.Zones.BoatShops[i].Outside.x, Config.Zones.BoatShops[i].Outside.y, Config.Zones.BoatShops[i].Outside.z, true) < Config.Marker.x then + isInMarker = true + currentZone = 'boat_shop' + currentZoneNum = i end + end + + for i=1, #Config.Zones.Garages, 1 do + + if GetDistanceBetweenCoords(coords, Config.Zones.Garages[i].GaragePos.x, Config.Zones.Garages[i].GaragePos.y, Config.Zones.Garages[i].GaragePos.z, true) < Config.Marker.x then + isInMarker = true + currentZone = 'garage_out' + currentZoneNum = i + end + + if GetDistanceBetweenCoords(coords, Config.Zones.Garages[i].StorePos.x, Config.Zones.Garages[i].StorePos.y, Config.Zones.Garages[i].StorePos.z, true) < Config.StoreMarker.x then + isInMarker = true + currentZone = 'garage_in' + currentZoneNum = i + end + + end + local hasExited = false if isInMarker and not HasAlreadyEnteredMarker or (isInMarker and (LastZone ~= currentZone or LastZoneNum ~= currentZoneNum) ) then @@ -127,3 +169,48 @@ Citizen.CreateThread(function() end end) + +-- Blips +Citizen.CreateThread(function() + + local blipList = {} + + for i=1, #Config.Zones.Garages, 1 do + table.insert(blipList, { + coords = { Config.Zones.Garages[i].GaragePos.x, Config.Zones.Garages[i].GaragePos.y }, + text = _U('blip_garage'), + sprite = 356, + color = 3, + scale = 1.0 + }) + end + + for i=1, #Config.Zones.BoatShops, 1 do + table.insert(blipList, { + coords = { Config.Zones.BoatShops[i].Outside.x, Config.Zones.BoatShops[i].Outside.y }, + text = _U('blip_shop'), + sprite = 427, + color = 3, + scale = 1.0 + }) + end + + for i=1, #blipList, 1 do + CreateBlip(blipList[i].coords, blipList[i].text, blipList[i].sprite, blipList[i].color, blipList[i].scale) + end + +end) + +function CreateBlip(coords, text, sprite, color, scale) + local blip = AddBlipForCoord( table.unpack(coords) ) + + SetBlipSprite(blip, sprite) + SetBlipScale(blip, scale) + SetBlipColour(blip, color) + + SetBlipAsShortRange(blip, true) + + BeginTextCommandSetBlipName('STRING') + AddTextComponentSubstringPlayerName(text) + EndTextCommandSetBlipName(blip) +end \ No newline at end of file diff --git a/config.lua b/config.lua index 62f2dbd3..a5a1f16d 100644 --- a/config.lua +++ b/config.lua @@ -4,17 +4,25 @@ Config.Locale = 'en' Config.MarkerType = 1 Config.DrawDistance = 100.0 -Config.ZoneSize = {x = 5.0, y = 5.0, z = 3.0} -Config.MarkerColor = {r = 100, g = 204, b = 100} -Config.MarkerSize = { x = 1.5, y = 1.5, z = 1.0 } + +Config.Marker = { + r = 100, g = 204, b = 100, -- blue-ish color, standard size circle + x = 1.5, y = 1.5, z = 1.0 +} + +Config.StoreMarker = { + r = 255, g = 0, b = 0, + x = 5.0, y = 5.0, z = 1.0 -- big circle for storing boat +} + Config.Zones = { Garages = { { - GaragePos = { x = -772.42, y = -1430.90, z = 1.59 }, + GaragePos = { x = -772.42, y = -1430.90, z = 0.55 }, SpawnPoint = { x = -785.39, y = -1426.30, z = -0.47 }, - RemovePos = { x = -798.45, y = -1456.03, z = -0.47 }, + StorePos = { x = -798.45, y = -1456.03, z = -0.47 }, Heading = 150.0 } @@ -30,8 +38,6 @@ Config.Zones = { } - - } Config.Vehicles = { @@ -39,12 +45,14 @@ Config.Vehicles = { { model = 'seashark', label = 'Seashark', + hash = -1030275036, price = 15000 }, { model = 'speeder', label = 'Speeder', + hash = 231083307, price = 10000 } diff --git a/locales/en.lua b/locales/en.lua index 9f621d14..1f7372a3 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,10 +1,23 @@ Locales['en'] = { -- shop ['boat_shop'] = 'boat shop', - ['boat_shop_open'] = 'press ~INPUT_CONTEXT~ to open the boat shop.', + ['boat_shop_open'] = 'press ~INPUT_CONTEXT~ to access the ~y~boat shop~s~.', ['boat_shop_confirm'] = 'buy a %s for $%s?', ['boat_shop_bought'] = 'you have ~y~bought~s~ a ~b~%s~s~ for ~g~$%s~s~', ['boat_shop_nomoney'] = 'you cannot afford this boat!', ['confirm_no'] = 'no', ['confirm_yes'] = 'yes', + + -- garage + ['garage'] = 'boat garage', + ['garage_open'] = 'press ~INPUT_CONTEXT~ to access your ~y~boat garage~s~.', + ['garage_store'] = 'press ~INPUT_CONTEXT~ to ~y~store~s~ the boat in your garage.', + ['garage_taken'] = 'the boat has been taken out!', + ['garage_stored'] = 'the boat has been safely stored in your garage!', + ['garage_noboats'] = 'you don\'t have any stored boats! Visit the ~y~boat shop~s~ to buy one.', + ['garage_blocked'] = 'the boat cannot be taken out because another vehicle is blocking the spawn point!', + + -- blips + ['blip_garage'] = 'boat Garage', + ['blip_shop'] = 'boat Shop', } \ No newline at end of file diff --git a/server/main.lua b/server/main.lua index fe9dde8b..a32a4f9d 100644 --- a/server/main.lua +++ b/server/main.lua @@ -2,9 +2,22 @@ ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) -ESX.RegisterServerCallback('esx_boat:buyBoat', function (source, cb, vehicleProps, model) + +--[[ +AddEventHandler('onMySQLReady', function() + MySQL.Async.execute('UPDATE owned_vehicles SET stored = true WHERE stored = false', {}, function (rowsChanged) + if rowsChanged > 0 then + print('esx_boat: all boats have been stored!') + end + end) +end) +]] + +ESX.RegisterServerCallback('esx_boat:buyBoat', function (source, cb, vehicleProps) local xPlayer = ESX.GetPlayerFromId(source) - local price = getPriceFromModel(model) + local price = getPriceFromModel(vehicleProps.modelAlt) + + vehicleProps.modelAlt = nil -- vehicle model not found if price == 0 then @@ -29,17 +42,32 @@ ESX.RegisterServerCallback('esx_boat:buyBoat', function (source, cb, vehicleProp end end) +RegisterServerEvent('esx_boat:takeOutVehicle') +AddEventHandler('esx_boat:takeOutVehicle', function(plate) + MySQL.Async.execute('UPDATE owned_vehicles SET stored = @stored WHERE owner = @owner AND plate = @plate', + { + ['@stored'] = false, + ['@owner'] = GetPlayerIdentifiers(source)[1], + ['@plate'] = plate + }, function (rowsChanged) + print(rowsChanged) + end) + +end) + ESX.RegisterServerCallback('esx_boat:getGarage', function (source, cb) - MySQL.Async.fetchAll('SELECT * FROM owned_vehicles WHERE owner = @owner, vehicleType = @vehicleType, stored = 1', + MySQL.Async.fetchAll('SELECT * FROM owned_vehicles WHERE owner = @owner AND vehicleType = @vehicleType AND stored = @stored', { - ['@owner'] = GetPlayerIdentifiers(source)[1], - ['vehicleType'] = 'boat' + ['@owner'] = GetPlayerIdentifiers(source)[1], + ['@vehicleType'] = 'boat', + ['@stored'] = true }, function (result) local vehicles = {} for i=1, #result, 1 do - table.insert(vehicles, json.decode(result[i].vehicle)) + local vehicleProps = json.decode(result[i].vehicle) + table.insert(vehicles, vehicleProps) end cb(vehicles) From 78413c2f7baad97e7664e474d3750182bc403f8f Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 4 Aug 2018 21:08:36 +0200 Subject: [PATCH 04/35] Implemented store vehicle, CurrentAction living its own life --- client/main.lua | 9 ++++++++- client/marker.lua | 6 +++--- config.lua | 2 +- server/main.lua | 30 +++++++++++++++++++++--------- 4 files changed, 33 insertions(+), 14 deletions(-) diff --git a/client/main.lua b/client/main.lua index 41e38d0f..2ca7281e 100644 --- a/client/main.lua +++ b/client/main.lua @@ -186,6 +186,13 @@ end function StoreBoatInGarage(vehicle) + local vehicleProps = ESX.Game.GetVehicleProperties(vehicle) + + ESX.TriggerServerCallback('esx_boat:storeVehicle', function (rowsChanged) + ESX.Game.DeleteVehicle(vehicle) + ESX.ShowNotification(_U('garage_stored')) + end, vehicleProps.plate) + end @@ -219,4 +226,4 @@ function getVehicleModelFromHash(hash) end return 'Unknown hash [' .. hash .. ']' -end \ No newline at end of file +end diff --git a/client/marker.lua b/client/marker.lua index 96c7bc6e..37038238 100644 --- a/client/marker.lua +++ b/client/marker.lua @@ -22,6 +22,9 @@ Citizen.CreateThread(function() OpenBoatGarage(Config.Zones.Garages[CurrentActionData.zoneNum]) elseif CrurentAction == 'garage_in' then StoreBoatInGarage(CurrentActionData.vehicle) + + else + print('unknown') -- what's going on?!?! end CurrentAction = nil @@ -34,9 +37,6 @@ Citizen.CreateThread(function() end) AddEventHandler('esx_boat:hasEnteredMarker', function(zone, zoneNum) - print(zone) - print(zoneNum) - if zone == 'boat_shop' then CurrentAction = 'boat_shop' CurrentActionMsg = _U('boat_shop_open') diff --git a/config.lua b/config.lua index a5a1f16d..370e9b13 100644 --- a/config.lua +++ b/config.lua @@ -22,7 +22,7 @@ Config.Zones = { { GaragePos = { x = -772.42, y = -1430.90, z = 0.55 }, SpawnPoint = { x = -785.39, y = -1426.30, z = -0.47 }, - StorePos = { x = -798.45, y = -1456.03, z = -0.47 }, + StorePos = { x = -798.45, y = -1456.03, z = 0.00 }, Heading = 150.0 } diff --git a/server/main.lua b/server/main.lua index a32a4f9d..c4c96c3e 100644 --- a/server/main.lua +++ b/server/main.lua @@ -43,16 +43,28 @@ ESX.RegisterServerCallback('esx_boat:buyBoat', function (source, cb, vehicleProp end) RegisterServerEvent('esx_boat:takeOutVehicle') -AddEventHandler('esx_boat:takeOutVehicle', function(plate) - MySQL.Async.execute('UPDATE owned_vehicles SET stored = @stored WHERE owner = @owner AND plate = @plate', - { - ['@stored'] = false, - ['@owner'] = GetPlayerIdentifiers(source)[1], - ['@plate'] = plate - }, function (rowsChanged) - print(rowsChanged) - end) +AddEventHandler('esx_boat:takeOutVehicle', function (plate) + MySQL.Async.execute('UPDATE owned_vehicles SET stored = @stored WHERE owner = @owner AND plate = @plate', + { + ['@stored'] = false, + ['@owner'] = GetPlayerIdentifiers(source)[1], + ['@plate'] = plate + }, function (rowsChanged) + if rowsChanged == 0 then + print(('esx_boat: %s exploited the garage!'):format(GetPlayerIdentifiers(source)[1])) + end + end) +end) +ESX.RegisterServerCallback('esx_boat:storeVehicle', function (source, cb, plate) + MySQL.Async.execute('UPDATE owned_vehicles SET stored = @stored WHERE owner = @owner AND plate = @plate', + { + ['@stored'] = true, + ['@owner'] = GetPlayerIdentifiers(source)[1], + ['@plate'] = plate + }, function (rowsChanged) + cb(rowsChanged) + end) end) ESX.RegisterServerCallback('esx_boat:getGarage', function (source, cb) From c3b7b88fe89bfcb1b15f97ac2229c68d26579565 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 4 Aug 2018 22:56:49 +0200 Subject: [PATCH 05/35] Added many more spawn points and fixed spelling --- client/main.lua | 2 +- client/marker.lua | 7 +-- config.lua | 110 +++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 107 insertions(+), 12 deletions(-) diff --git a/client/main.lua b/client/main.lua index 2ca7281e..5547f3a8 100644 --- a/client/main.lua +++ b/client/main.lua @@ -162,7 +162,7 @@ function OpenBoatGarage(garage) TriggerServerEvent('esx_boat:takeOutVehicle', vehicleProps.plate) ESX.ShowNotification(_U('garage_taken')) - ESX.Game.SpawnVehicle(vehicleProps.model, garage.SpawnPoint, 20, function(vehicle) + ESX.Game.SpawnVehicle(vehicleProps.model, garage.SpawnPoint, garage.Heading, function(vehicle) TaskWarpPedIntoVehicle(playerPed, vehicle, -1) ESX.Game.SetVehicleProperties(vehicle, vehicleProps) end) diff --git a/client/marker.lua b/client/marker.lua index 37038238..9e0d3825 100644 --- a/client/marker.lua +++ b/client/marker.lua @@ -18,13 +18,10 @@ Citizen.CreateThread(function() if CurrentAction == 'boat_shop' then OpenBoatShop(Config.Zones.BoatShops[CurrentActionData.zoneNum]) - elseif CurentAction == 'garage_out' then + elseif CurrentAction == 'garage_out' then OpenBoatGarage(Config.Zones.Garages[CurrentActionData.zoneNum]) - elseif CrurentAction == 'garage_in' then + elseif CurrentAction == 'garage_in' then StoreBoatInGarage(CurrentActionData.vehicle) - - else - print('unknown') -- what's going on?!?! end CurrentAction = nil diff --git a/config.lua b/config.lua index 370e9b13..0352f1a1 100644 --- a/config.lua +++ b/config.lua @@ -19,12 +19,47 @@ Config.StoreMarker = { Config.Zones = { Garages = { + { GaragePos = { x = -772.42, y = -1430.90, z = 0.55 }, - SpawnPoint = { x = -785.39, y = -1426.30, z = -0.47 }, + SpawnPoint = { x = -785.39, y = -1426.30, z = 0.00 }, StorePos = { x = -798.45, y = -1456.03, z = 0.00 }, - Heading = 150.0 - } + Heading = 146.0 + }, + + { + GaragePos = { x = 3864.93, y = 4463.98, z = 1.65 }, + SpawnPoint = { x = 3854.40, y = 4477.28, z = 0.00 }, + StorePos = { x = 3857.04, y = 4446.94, z = 0.00 }, + Heading = 273.0 + }, + + { + GaragePos = { x = -1614.03, y = 5260.10, z = 2.80 }, + SpawnPoint = { x = -1622.52, y = 5247.12, z = 0.00 }, + StorePos = { x = -1600.37, y = 5261.91, z = 0.00 }, + Heading = 21.0 + }, + + { + GaragePos = { x = 712.67, y = 4093.31, z = 33.70 }, + SpawnPoint = { x = 712.89, y = 4080.20, z = 29.35 }, + StorePos = { x = 705.16, y = 4110.16, z = 30.20 }, + Heading = 181.0 + }, + + { + GaragePos = { x = 23.87, y = -2806.82, z = 4.80 }, + SpawnPoint = { x = 23.35, y = -2828.69, z = 0.81 }, + StorePos = { x = -1.03, y = -2799.20, z = 0.50 }, + Heading = 181.0 + }, + { + GaragePos = { x = -3427.36, y = 956.94, z = 7.35 }, + SpawnPoint = { x = -3448.97, y = 953.80, z = 0.00 }, + StorePos = { x = -3436.55, y = 946.67, z = 0.30 }, + Heading = 75.0 + }, }, @@ -44,16 +79,79 @@ Config.Vehicles = { { model = 'seashark', - label = 'Seashark', + label = 'Seashark (Random Color)', hash = -1030275036, - price = 15000 + price = 7500 + }, + + { + model = 'seashark3', + label = 'Seashark (Dark Blue)', + hash = -311022263, + price = 7500 + }, + + { + model = 'suntrap', + label = 'Suntrap', + hash = -282946103, + price = 10000 + }, + + { + model = 'jetmax', + label = 'Jetmax', + hash = 861409633, + price = 45000 + }, + + { + model = 'tropic2', + label = 'Tropic', + hash = 1448677353, + price = 65000 + }, + + { + model = 'dinghy2', + label = 'Dinghy (Black)', + hash = 276773164, + price = 32500 + }, + + { + model = 'dinghy', + label = 'Dinghy 2 (Random Color)', + hash = 1033245328, + price = 40000 }, { model = 'speeder', label = 'Speeder', hash = 231083307, - price = 10000 + price = 85000 + }, + + { + model = 'squalo', + label = 'Squalo (Random Color)', + hash = 400514754, + price = 61000 + }, + + { + model = 'toro', + label = 'Toro', + hash = 1070967343, + price = 200000 + }, + + { + model = 'submersible', + label = 'Submersible', + hash = 771711535, + price = 750000 } } \ No newline at end of file From 409e8975f57a1bb95a0ae3de0766f9f259f3934a Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 5 Aug 2018 12:09:51 +0200 Subject: [PATCH 06/35] Implemented boat license, closes #4. Added sql, closes #1 --- README.md | 1 - client/main.lua | 33 +++++++++++++++++++++++++++++++++ client/marker.lua | 18 ++++++++++++++++-- config.lua | 13 ++++++++----- esx_boat.sql | 10 ++++++++++ locales/en.lua | 11 +++++++++-- server/main.lua | 14 ++++++++++++++ 7 files changed, 90 insertions(+), 10 deletions(-) create mode 100644 esx_boat.sql diff --git a/README.md b/README.md index 4be65dd0..911302a6 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,6 @@ git clone https://github.com/ESX-Org/esx_boat [esx]/esx_boat - Download https://github.com/ESX-Org/esx_boat/archive/master.zip - Put it in the `[esx]` directory - ## Installation - Import `esx_boat.sql` in your database - Add this to your `server.cfg`: diff --git a/client/main.lua b/client/main.lua index 5547f3a8..ac689dba 100644 --- a/client/main.lua +++ b/client/main.lua @@ -184,6 +184,39 @@ function OpenBoatGarage(garage) end) end +function OpenLicenceMenu(shop) + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'boat_license', + { + title = _U('license_menu'), + align = 'top-left', + elements = { + { label = _U('license_buy_no'), value = 'no' }, + { label = _U('license_buy_yes', Config.LicensePrice), value = 'yes' } + } + }, function (data, menu) + if data.current.value == 'yes' then + ESX.TriggerServerCallback('esx_boat:buyBoatLicense', function (boughtLicense) + if boughtLicense then + ESX.ShowNotification(_U('license_bought', Config.LicensePrice)) + menu.close() + + OpenBoatShop(shop) -- parse current shop + else + ESX.ShowNotification(_U('license_nomoney')) + end + end) + else + CurrentAction = 'boat_shop' + CurrentActionMsg = _U('boat_shop_open') + menu.close() + end + end, function (data, menu) + CurrentAction = 'boat_shop' + CurrentActionMsg = _U('boat_shop_open') + menu.close() + end) +end + function StoreBoatInGarage(vehicle) local vehicleProps = ESX.Game.GetVehicleProperties(vehicle) diff --git a/client/marker.lua b/client/marker.lua index 9e0d3825..c89c7645 100644 --- a/client/marker.lua +++ b/client/marker.lua @@ -17,7 +17,21 @@ Citizen.CreateThread(function() if IsControlJustReleased(0, Keys['E']) then if CurrentAction == 'boat_shop' then - OpenBoatShop(Config.Zones.BoatShops[CurrentActionData.zoneNum]) + + if not Config.EnableLicense then + OpenBoatShop(Config.Zones.BoatShops[CurrentActionData.zoneNum]) + else -- check for license + + ESX.TriggerServerCallback('esx_license:checkLicense', function (hasBoatLicense) + if hasBoatLicense then + OpenBoatShop(Config.Zones.BoatShops[CurrentActionData.zoneNum]) + else + OpenLicenceMenu(Config.Zones.BoatShops[CurrentActionData.zoneNum]) + end + end, GetPlayerServerId(PlayerId()), 'boat') + + end + elseif CurrentAction == 'garage_out' then OpenBoatGarage(Config.Zones.Garages[CurrentActionData.zoneNum]) elseif CurrentAction == 'garage_in' then @@ -28,7 +42,7 @@ Citizen.CreateThread(function() end else - Citizen.Wait(200) + Citizen.Wait(500) end end end) diff --git a/config.lua b/config.lua index 0352f1a1..7a5c240d 100644 --- a/config.lua +++ b/config.lua @@ -1,9 +1,12 @@ -Config = {} +Config = {} -Config.Locale = 'en' +Config.Locale = 'en' -Config.MarkerType = 1 -Config.DrawDistance = 100.0 +Config.EnableLicense = true -- enable boat license? +Config.LicensePrice = 50000 + +Config.MarkerType = 1 +Config.DrawDistance = 100.0 Config.Marker = { r = 100, g = 204, b = 100, -- blue-ish color, standard size circle @@ -15,7 +18,6 @@ Config.StoreMarker = { x = 5.0, y = 5.0, z = 1.0 -- big circle for storing boat } - Config.Zones = { Garages = { @@ -54,6 +56,7 @@ Config.Zones = { StorePos = { x = -1.03, y = -2799.20, z = 0.50 }, Heading = 181.0 }, + { GaragePos = { x = -3427.36, y = 956.94, z = 7.35 }, SpawnPoint = { x = -3448.97, y = 953.80, z = 0.00 }, diff --git a/esx_boat.sql b/esx_boat.sql new file mode 100644 index 00000000..82e7c875 --- /dev/null +++ b/esx_boat.sql @@ -0,0 +1,10 @@ +USE `essentialmode`; + +INSERT INTO `licenses` (`type`, `label`) VALUES + ('boat', 'Boat License') +; + +ALTER TABLE `owned_vehicles` + ADD COLUMN `vehicleType` VARCHAR(20) NULL DEFAULT 'car', + ADD COLUMN `stored` TINYINT(1) NOT NULL DEFAULT '1' +; \ No newline at end of file diff --git a/locales/en.lua b/locales/en.lua index 1f7372a3..d0837892 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -2,9 +2,9 @@ Locales['en'] = { -- shop ['boat_shop'] = 'boat shop', ['boat_shop_open'] = 'press ~INPUT_CONTEXT~ to access the ~y~boat shop~s~.', - ['boat_shop_confirm'] = 'buy a %s for $%s?', + ['boat_shop_confirm'] = 'buy %s for $%s?', ['boat_shop_bought'] = 'you have ~y~bought~s~ a ~b~%s~s~ for ~g~$%s~s~', - ['boat_shop_nomoney'] = 'you cannot afford this boat!', + ['boat_shop_nomoney'] = 'you cannot ~r~afford~s~ this boat!', ['confirm_no'] = 'no', ['confirm_yes'] = 'yes', @@ -17,6 +17,13 @@ Locales['en'] = { ['garage_noboats'] = 'you don\'t have any stored boats! Visit the ~y~boat shop~s~ to buy one.', ['garage_blocked'] = 'the boat cannot be taken out because another vehicle is blocking the spawn point!', + -- license + ['license_menu'] = 'buy Boat License?', + ['license_buy_no'] = 'no', + ['license_buy_yes'] = 'buy Boat License $%s', + ['license_bought'] = 'you have bought the ~y~Boat License~s~ for ~g~$%s~s~', + ['license_nomoney'] = 'you cannot ~r~afford~s~ the ~y~Boat License~s~!', + -- blips ['blip_garage'] = 'boat Garage', ['blip_shop'] = 'boat Shop', diff --git a/server/main.lua b/server/main.lua index c4c96c3e..6d71cdc2 100644 --- a/server/main.lua +++ b/server/main.lua @@ -87,6 +87,20 @@ ESX.RegisterServerCallback('esx_boat:getGarage', function (source, cb) end) +ESX.RegisterServerCallback('esx_boat:buyBoatLicense', function (source, cb) + local xPlayer = ESX.GetPlayerFromId(source) + + if xPlayer.getMoney() >= Config.LicensePrice then + xPlayer.removeMoney(Config.LicensePrice) + + TriggerEvent('esx_license:addLicense', source, 'boat', function() + cb(true) + end) + else + cb(false) + end +end) + function getPriceFromModel(model) for i=1, #Config.Vehicles, 1 do if Config.Vehicles[i].model == model then From 2568a3755f393aec51dddc57121dcc09b6b21d2b Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 5 Aug 2018 12:17:53 +0200 Subject: [PATCH 07/35] Implemented parking / storing boats when sql is ready --- server/main.lua | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/server/main.lua b/server/main.lua index 6d71cdc2..4d432c35 100644 --- a/server/main.lua +++ b/server/main.lua @@ -2,16 +2,21 @@ ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - ---[[ AddEventHandler('onMySQLReady', function() - MySQL.Async.execute('UPDATE owned_vehicles SET stored = true WHERE stored = false', {}, function (rowsChanged) + ParkBoats() +end) + +function ParkBoats() + MySQL.Async.execute('UPDATE owned_vehicles SET stored = true WHERE stored = @stored AND vehicleType = @vehicleType', + { + ['@stored'] = false, + ['@vehicleType'] = 'boat' + }, function (rowsChanged) if rowsChanged > 0 then - print('esx_boat: all boats have been stored!') + print(('esx_boat: %s boat(s) have been stored!'):format(rowsChanged)) end end) -end) -]] +end ESX.RegisterServerCallback('esx_boat:buyBoat', function (source, cb, vehicleProps) local xPlayer = ESX.GetPlayerFromId(source) From fa8103355774d5b0d0db76b052474f6ef4be6456 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 5 Aug 2018 13:17:12 +0200 Subject: [PATCH 08/35] Fixed #3, fixed exploit storing boat when not in driver seat, fixed storing boat not owned - Async task for buying boats aswell --- client/main.lua | 15 +++++++++------ client/marker.lua | 4 ++-- locales/en.lua | 1 + server/main.lua | 7 +++---- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/client/main.lua b/client/main.lua index ac689dba..9c05b436 100644 --- a/client/main.lua +++ b/client/main.lua @@ -154,11 +154,10 @@ function OpenBoatGarage(garage) }, function (data, menu) -- make sure the spawn point isn't blocked - local closestVehicle = GetClosestVehicle(garage.SpawnPoint.x, garage.SpawnPoint.y, garage.SpawnPoint.z, 3.0, 0, 71) - local playerPed = PlayerPedId() - local vehicleProps = data.current.vehicleProps + local playerPed = PlayerPedId() + local vehicleProps = data.current.vehicleProps - if not DoesEntityExist(closestVehicle) then + if ESX.Game.IsSpawnPointClear(garage.SpawnPoint, 4.0) then TriggerServerEvent('esx_boat:takeOutVehicle', vehicleProps.plate) ESX.ShowNotification(_U('garage_taken')) @@ -222,8 +221,12 @@ function StoreBoatInGarage(vehicle) local vehicleProps = ESX.Game.GetVehicleProperties(vehicle) ESX.TriggerServerCallback('esx_boat:storeVehicle', function (rowsChanged) - ESX.Game.DeleteVehicle(vehicle) - ESX.ShowNotification(_U('garage_stored')) + if rowsChanged > 0 then + ESX.Game.DeleteVehicle(vehicle) + ESX.ShowNotification(_U('garage_stored')) + else + ESX.ShowNotification(_U('garage_notowner')) + end end, vehicleProps.plate) end diff --git a/client/marker.lua b/client/marker.lua index c89c7645..892d735f 100644 --- a/client/marker.lua +++ b/client/marker.lua @@ -63,10 +63,10 @@ AddEventHandler('esx_boat:hasEnteredMarker', function(zone, zoneNum) if IsPedInAnyVehicle(playerPed, false) then local vehicle = GetVehiclePedIsIn(playerPed, false) - if DoesEntityExist(vehicle) then + if DoesEntityExist(vehicle) and GetPedInVehicleSeat(vehicle, -1) == playerPed then CurrentAction = 'garage_in' CurrentActionMsg = _U('garage_store') - CurrentActionData = {vehicle = vehicle} + CurrentActionData = { vehicle = vehicle } end end diff --git a/locales/en.lua b/locales/en.lua index d0837892..6b14703c 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -16,6 +16,7 @@ Locales['en'] = { ['garage_stored'] = 'the boat has been safely stored in your garage!', ['garage_noboats'] = 'you don\'t have any stored boats! Visit the ~y~boat shop~s~ to buy one.', ['garage_blocked'] = 'the boat cannot be taken out because another vehicle is blocking the spawn point!', + ['garage_notowner'] = 'you don\'t own this boat!', -- license ['license_menu'] = 'buy Boat License?', diff --git a/server/main.lua b/server/main.lua index 4d432c35..36d32b64 100644 --- a/server/main.lua +++ b/server/main.lua @@ -39,9 +39,9 @@ ESX.RegisterServerCallback('esx_boat:buyBoat', function (source, cb, vehicleProp ['@plate'] = vehicleProps.plate, ['@vehicle'] = json.encode(vehicleProps), ['@vehicleType'] = 'boat' - }) - - cb(true) + }, function (rowsChanged) + cb(true) + end) else cb(false) end @@ -73,7 +73,6 @@ ESX.RegisterServerCallback('esx_boat:storeVehicle', function (source, cb, plate) end) ESX.RegisterServerCallback('esx_boat:getGarage', function (source, cb) - MySQL.Async.fetchAll('SELECT * FROM owned_vehicles WHERE owner = @owner AND vehicleType = @vehicleType AND stored = @stored', { ['@owner'] = GetPlayerIdentifiers(source)[1], From b692a11a399141e742aa919ecbd9de6d6faf84ef Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 5 Aug 2018 20:05:00 +0200 Subject: [PATCH 09/35] Fixed #6, vehicle label not model name --- client/main.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/client/main.lua b/client/main.lua index 9c05b436..fd89d907 100644 --- a/client/main.lua +++ b/client/main.lua @@ -75,6 +75,7 @@ function OpenBoatShop(shop) ESX.ShowNotification(_U('boat_shop_bought', data.current.model, data.current.price)) DeleteSpawnedVehicles() + isInShopMenu = false ESX.UI.Menu.CloseAll() CurrentAction = 'boat_shop' @@ -100,7 +101,7 @@ function OpenBoatShop(shop) end, function (data, menu) menu.close() - + isInShopMenu = false DeleteSpawnedVehicles() CurrentAction = 'boat_shop' @@ -141,7 +142,7 @@ function OpenBoatGarage(garage) local elements = {} for i=1, #ownedBoats, 1 do table.insert(elements, { - label = getVehicleModelFromHash(ownedBoats[i].model), + label = getVehicleLabelFromHash(ownedBoats[i].model), vehicleProps = ownedBoats[i] }) end @@ -254,10 +255,10 @@ function DeleteSpawnedVehicles() end end -function getVehicleModelFromHash(hash) +function getVehicleLabelFromHash(hash) for i=1, #Config.Vehicles, 1 do if Config.Vehicles[i].hash == hash then - return Config.Vehicles[i].model + return Config.Vehicles[i].label end end From d29646b7e02b8d94483780a561c9ce7e5657fa3c Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Wed, 8 Aug 2018 20:24:02 +0200 Subject: [PATCH 10/35] Compare model, removed hash metadata, closes #7 --- client/main.lua | 6 ++++-- config.lua | 11 ----------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/client/main.lua b/client/main.lua index fd89d907..c76778ba 100644 --- a/client/main.lua +++ b/client/main.lua @@ -256,11 +256,13 @@ function DeleteSpawnedVehicles() end function getVehicleLabelFromHash(hash) + local model = string.lower(GetDisplayNameFromVehicleModel(hash)) + for i=1, #Config.Vehicles, 1 do - if Config.Vehicles[i].hash == hash then + if Config.Vehicles[i].model == model then return Config.Vehicles[i].label end end - return 'Unknown hash [' .. hash .. ']' + return 'Unknown model [' .. model .. ']' end diff --git a/config.lua b/config.lua index 7a5c240d..8648dc66 100644 --- a/config.lua +++ b/config.lua @@ -83,77 +83,66 @@ Config.Vehicles = { { model = 'seashark', label = 'Seashark (Random Color)', - hash = -1030275036, price = 7500 }, { model = 'seashark3', label = 'Seashark (Dark Blue)', - hash = -311022263, price = 7500 }, { model = 'suntrap', label = 'Suntrap', - hash = -282946103, price = 10000 }, { model = 'jetmax', label = 'Jetmax', - hash = 861409633, price = 45000 }, { model = 'tropic2', label = 'Tropic', - hash = 1448677353, price = 65000 }, { model = 'dinghy2', label = 'Dinghy (Black)', - hash = 276773164, price = 32500 }, { model = 'dinghy', label = 'Dinghy 2 (Random Color)', - hash = 1033245328, price = 40000 }, { model = 'speeder', label = 'Speeder', - hash = 231083307, price = 85000 }, { model = 'squalo', label = 'Squalo (Random Color)', - hash = 400514754, price = 61000 }, { model = 'toro', label = 'Toro', - hash = 1070967343, price = 200000 }, { model = 'submersible', label = 'Submersible', - hash = 771711535, price = 750000 } From 2eab7e866f13327924120bb3c5124f0d78521af8 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Wed, 8 Aug 2018 21:03:50 +0200 Subject: [PATCH 11/35] Implemented teleport after storing boat in garage, closes #2 --- client/main.lua | 16 ++++++++++------ client/marker.lua | 5 ++--- config.lua | 43 +++++++++++++++++++++---------------------- 3 files changed, 33 insertions(+), 31 deletions(-) diff --git a/client/main.lua b/client/main.lua index c76778ba..6122e83b 100644 --- a/client/main.lua +++ b/client/main.lua @@ -72,7 +72,7 @@ function OpenBoatShop(shop) ESX.TriggerServerCallback('esx_boat:buyBoat', function (bought) if bought then - ESX.ShowNotification(_U('boat_shop_bought', data.current.model, data.current.price)) + ESX.ShowNotification(_U('boat_shop_bought', data.current.name, data.current.price)) DeleteSpawnedVehicles() isInShopMenu = false @@ -114,7 +114,7 @@ function OpenBoatShop(shop) end, function (data, menu) DeleteSpawnedVehicles() - ESX.Game.SpawnLocalVehicle(data.current.model, shop.Inside, shop.Heading, function (vehicle) + ESX.Game.SpawnLocalVehicle(data.current.model, shop.Inside, shop.Inside.h, function (vehicle) table.insert(spawnedVehicles, vehicle) TaskWarpPedIntoVehicle(playerPed, vehicle, -1) FreezeEntityPosition(vehicle, true) @@ -123,7 +123,7 @@ function OpenBoatShop(shop) -- spawn first vehicle DeleteSpawnedVehicles() - ESX.Game.SpawnLocalVehicle(Config.Vehicles[1].model, shop.Inside, shop.Heading, function (vehicle) + ESX.Game.SpawnLocalVehicle(Config.Vehicles[1].model, shop.Inside, shop.Inside.h, function (vehicle) table.insert(spawnedVehicles, vehicle) TaskWarpPedIntoVehicle(playerPed, vehicle, -1) FreezeEntityPosition(vehicle, true) @@ -162,7 +162,7 @@ function OpenBoatGarage(garage) TriggerServerEvent('esx_boat:takeOutVehicle', vehicleProps.plate) ESX.ShowNotification(_U('garage_taken')) - ESX.Game.SpawnVehicle(vehicleProps.model, garage.SpawnPoint, garage.Heading, function(vehicle) + ESX.Game.SpawnVehicle(vehicleProps.model, garage.SpawnPoint, garage.SpawnPoint.h, function(vehicle) TaskWarpPedIntoVehicle(playerPed, vehicle, -1) ESX.Game.SetVehicleProperties(vehicle, vehicleProps) end) @@ -217,7 +217,7 @@ function OpenLicenceMenu(shop) end) end -function StoreBoatInGarage(vehicle) +function StoreBoatInGarage(vehicle, teleportCoords) local vehicleProps = ESX.Game.GetVehicleProperties(vehicle) @@ -225,6 +225,11 @@ function StoreBoatInGarage(vehicle) if rowsChanged > 0 then ESX.Game.DeleteVehicle(vehicle) ESX.ShowNotification(_U('garage_stored')) + local playerPed = PlayerPedId() + + ESX.Game.Teleport(playerPed, teleportCoords, function() + SetEntityHeading(playerPed, teleportCoords.h) + end) else ESX.ShowNotification(_U('garage_notowner')) end @@ -232,7 +237,6 @@ function StoreBoatInGarage(vehicle) end - -- Key controls Citizen.CreateThread(function() while true do diff --git a/client/marker.lua b/client/marker.lua index 892d735f..8741cf13 100644 --- a/client/marker.lua +++ b/client/marker.lua @@ -35,11 +35,10 @@ Citizen.CreateThread(function() elseif CurrentAction == 'garage_out' then OpenBoatGarage(Config.Zones.Garages[CurrentActionData.zoneNum]) elseif CurrentAction == 'garage_in' then - StoreBoatInGarage(CurrentActionData.vehicle) + StoreBoatInGarage(CurrentActionData.vehicle, Config.Zones.Garages[CurrentActionData.zoneNum].StoreTP) end CurrentAction = nil - end else Citizen.Wait(500) @@ -66,7 +65,7 @@ AddEventHandler('esx_boat:hasEnteredMarker', function(zone, zoneNum) if DoesEntityExist(vehicle) and GetPedInVehicleSeat(vehicle, -1) == playerPed then CurrentAction = 'garage_in' CurrentActionMsg = _U('garage_store') - CurrentActionData = { vehicle = vehicle } + CurrentActionData = { vehicle = vehicle, zoneNum = zoneNum } end end diff --git a/config.lua b/config.lua index 8648dc66..3a4b796f 100644 --- a/config.lua +++ b/config.lua @@ -22,56 +22,55 @@ Config.Zones = { Garages = { - { + { -- Shank St, nearby campaign boat garage GaragePos = { x = -772.42, y = -1430.90, z = 0.55 }, - SpawnPoint = { x = -785.39, y = -1426.30, z = 0.00 }, + SpawnPoint = { x = -785.39, y = -1426.30, z = 0.00, h = 146.00 }, StorePos = { x = -798.45, y = -1456.03, z = 0.00 }, - Heading = 146.0 + StoreTP = { x = -791.41, y = -1452.57, z = 1.59, h = 318.96 } }, - { + { -- Catfish View GaragePos = { x = 3864.93, y = 4463.98, z = 1.65 }, - SpawnPoint = { x = 3854.40, y = 4477.28, z = 0.00 }, + SpawnPoint = { x = 3854.40, y = 4477.28, z = 0.00, h = 273.00 }, StorePos = { x = 3857.04, y = 4446.94, z = 0.00 }, - Heading = 273.0 + StoreTP = { x = 3854.73, y = 4458.66, z = 1.85, h = 355.35 } }, - { + { -- Great Ocean Highway GaragePos = { x = -1614.03, y = 5260.10, z = 2.80 }, - SpawnPoint = { x = -1622.52, y = 5247.12, z = 0.00 }, + SpawnPoint = { x = -1622.52, y = 5247.12, z = 0.00, h = 21.00 }, StorePos = { x = -1600.37, y = 5261.91, z = 0.00 }, - Heading = 21.0 + StoreTP = { x = -1605.77, y = 5259.00, z = 2.09, h = 25.00 } }, - { + { -- North Calafia Way GaragePos = { x = 712.67, y = 4093.31, z = 33.70 }, - SpawnPoint = { x = 712.89, y = 4080.20, z = 29.35 }, + SpawnPoint = { x = 712.89, y = 4080.20, z = 29.35, h = 181.00 }, StorePos = { x = 705.16, y = 4110.16, z = 30.20 }, - Heading = 181.0 + StoreTP = { x = 711.97, y = 4110.55, z = 31.30, h = 180.00 } }, - { + { -- Elysian Fields, nearby the airport GaragePos = { x = 23.87, y = -2806.82, z = 4.80 }, - SpawnPoint = { x = 23.35, y = -2828.69, z = 0.81 }, + SpawnPoint = { x = 23.35, y = -2828.69, z = 0.81, h = 181.0 }, StorePos = { x = -1.03, y = -2799.20, z = 0.50 }, - Heading = 181.0 + StoreTP = { x = 12.67, y = -2793.87, z = 2.52, h = 355.26 } }, - { + { -- Barbareno Rd GaragePos = { x = -3427.36, y = 956.94, z = 7.35 }, - SpawnPoint = { x = -3448.97, y = 953.80, z = 0.00 }, + SpawnPoint = { x = -3448.97, y = 953.80, z = 0.00, h = 75.00 }, StorePos = { x = -3436.55, y = 946.67, z = 0.30 }, - Heading = 75.0 + StoreTP = { x = -3427.08, y = 952.62, z = 8.34, h = 0.00 } }, }, BoatShops = { - { -- shank st - Outside = { x = -773.76, y = -1495.25, z = 1.6 }, - Inside = { x = -798.59, y = -1503.12, z = -0.47 }, - Heading = 120.0 + { -- Shank St, nearby campaign boat garage + Outside = { x = -773.76, y = -1495.25, z = 1.60 }, + Inside = { x = -798.59, y = -1503.12, z = -0.47, h = 120.00 }, } } From 2dd7e39bcb12d51dd92dcb720c2945314cd2e5db Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Wed, 8 Aug 2018 21:08:12 +0200 Subject: [PATCH 12/35] Added message when player attempts to store boat he doesn't own --- server/main.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/main.lua b/server/main.lua index 36d32b64..24d17971 100644 --- a/server/main.lua +++ b/server/main.lua @@ -68,6 +68,10 @@ ESX.RegisterServerCallback('esx_boat:storeVehicle', function (source, cb, plate) ['@owner'] = GetPlayerIdentifiers(source)[1], ['@plate'] = plate }, function (rowsChanged) + if rowsChanged == 0 then + print(('esx_boat: %s attempted to store an boat they don\'t own!'):format(GetPlayerIdentifiers(source)[1])) + end + cb(rowsChanged) end) end) From 888492b80a648f8df3fff6f4877b1409495c6cea Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Thu, 9 Aug 2018 19:55:11 +0200 Subject: [PATCH 13/35] Minor cleanup --- client/marker.lua | 7 ++++--- config.lua | 10 +++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/client/marker.lua b/client/marker.lua index 8741cf13..743d9659 100644 --- a/client/marker.lua +++ b/client/marker.lua @@ -18,7 +18,7 @@ Citizen.CreateThread(function() if CurrentAction == 'boat_shop' then - if not Config.EnableLicense then + if not Config.LicenseEnable then OpenBoatShop(Config.Zones.BoatShops[CurrentActionData.zoneNum]) else -- check for license @@ -90,6 +90,7 @@ Citizen.CreateThread(function() local coords = GetEntityCoords(playerPed) for i=1, #Config.Zones.BoatShops, 1 do + -- draw boat shop marker local zone = Config.Zones.BoatShops[i].Outside if GetDistanceBetweenCoords(coords, zone.x, zone.y, zone.z, true) < Config.DrawDistance then DrawMarker(Config.MarkerType, zone.x, zone.y, zone.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.Marker.x, Config.Marker.y, Config.Marker.z, Config.Marker.r, Config.Marker.g, Config.Marker.b, 100, false, true, 2, false, false, false, false) @@ -97,13 +98,13 @@ Citizen.CreateThread(function() end for i=1, #Config.Zones.Garages, 1 do + -- draw garage maker local zoneOut = Config.Zones.Garages[i].GaragePos if GetDistanceBetweenCoords(coords, zoneOut.x, zoneOut.y, zoneOut.z, true) < Config.DrawDistance then DrawMarker(Config.MarkerType, zoneOut.x, zoneOut.y, zoneOut.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.Marker.x, Config.Marker.y, Config.Marker.z, Config.Marker.r, Config.Marker.g, Config.Marker.b, 100, false, true, 2, false, false, false, false) end - end - for i=1, #Config.Zones.Garages, 1 do + -- draw store marker local zoneIn = Config.Zones.Garages[i].StorePos if GetDistanceBetweenCoords(coords, zoneIn.x, zoneIn.y, zoneIn.z, true) < Config.DrawDistance then DrawMarker(Config.MarkerType, zoneIn.x, zoneIn.y, zoneIn.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.StoreMarker.x, Config.StoreMarker.y, Config.StoreMarker.z, Config.StoreMarker.r, Config.StoreMarker.g, Config.StoreMarker.b, 100, false, true, 2, false, false, false, false) diff --git a/config.lua b/config.lua index 3a4b796f..a72eb121 100644 --- a/config.lua +++ b/config.lua @@ -2,20 +2,20 @@ Config = {} Config.Locale = 'en' -Config.EnableLicense = true -- enable boat license? +Config.LicenseEnable = true -- enable boat license? Requires esx_license Config.LicensePrice = 50000 Config.MarkerType = 1 Config.DrawDistance = 100.0 Config.Marker = { - r = 100, g = 204, b = 100, -- blue-ish color, standard size circle - x = 1.5, y = 1.5, z = 1.0 + r = 100, g = 204, b = 100, -- blue-ish color + x = 1.5, y = 1.5, z = 1.0 -- standard size circle } Config.StoreMarker = { - r = 255, g = 0, b = 0, - x = 5.0, y = 5.0, z = 1.0 -- big circle for storing boat + r = 255, g = 0, b = 0, -- red color + x = 5.0, y = 5.0, z = 1.0 -- big circle for storing boat } Config.Zones = { From 188a0943d74612f23167a16ead7f8a6c874386e7 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Thu, 9 Aug 2018 20:06:08 +0200 Subject: [PATCH 14/35] Added Swedish locale --- __resource.lua | 2 ++ locales/sv.lua | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 locales/sv.lua diff --git a/__resource.lua b/__resource.lua index edfbee1a..1a9cc5d8 100644 --- a/__resource.lua +++ b/__resource.lua @@ -8,6 +8,7 @@ server_scripts { '@mysql-async/lib/MySQL.lua', '@es_extended/locale.lua', 'locales/en.lua', + 'locales/sv.lua', 'config.lua', 'server/main.lua' } @@ -15,6 +16,7 @@ server_scripts { client_scripts { '@es_extended/locale.lua', 'locales/en.lua', + 'locales/sv.lua', 'config.lua', 'client/main.lua', 'client/marker.lua' diff --git a/locales/sv.lua b/locales/sv.lua new file mode 100644 index 00000000..7f5dd0fa --- /dev/null +++ b/locales/sv.lua @@ -0,0 +1,31 @@ +Locales['sv'] = { + -- shop + ['boat_shop'] = 'båtaffär', + ['boat_shop_open'] = 'tryck ~INPUT_CONTEXT~ för att öppna ~y~båtaffären~s~.', + ['boat_shop_confirm'] = 'köp %s för %s SEK?', + ['boat_shop_bought'] = 'du har ~y~köpt~s~ en ~b~%s~s~ för ~g~%s SEK~s~', + ['boat_shop_nomoney'] = 'du har ~r~inte råd~s~ för denna båt!', + ['confirm_no'] = 'nej', + ['confirm_yes'] = 'ja', + + -- garage + ['garage'] = 'båtgarage', + ['garage_open'] = 'tryck ~INPUT_CONTEXT~ för att öppna ~y~båtgaraget~s~.', + ['garage_store'] = 'tryck ~INPUT_CONTEXT~ för att ~y~lagra~s~ båten i ditt garage.', + ['garage_taken'] = 'båten har släppts från garaget!', + ['garage_stored'] = 'båten har lagrats i garaget!', + ['garage_noboats'] = 'du har inga lagrade båtar! Besök ~y~båtaffären~s~ för att köpa båtar.', + ['garage_blocked'] = 'båten kan inte tas ur på grund av att en annan båt blokerar spawnpointen!', + ['garage_notowner'] = 'du äger inte denna båt!', + + -- license + ['license_menu'] = 'köpa båtlicens?', + ['license_buy_no'] = 'nej', + ['license_buy_yes'] = 'köp båtlicens %s SEK', + ['license_bought'] = 'du köpte ~y~båtlicensen~s~ för ~g~%s SEK~s~', + ['license_nomoney'] = 'du har ~r~inte råd~s~ för ~y~båtlicensen~s~!', + + -- blips + ['blip_garage'] = 'båtgarage', + ['blip_shop'] = 'båtaffär', +} \ No newline at end of file From 9e558147bf2d0f5d98585c84146366309c13cbf8 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Fri, 10 Aug 2018 00:52:43 -0400 Subject: [PATCH 15/35] Repo Update --- .editorconfig | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..9b425256 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +indent_size = 4 +indent_style = tab +end_of_line = crlf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true \ No newline at end of file From 6281a1fa11b70d78de55412c4a45c36f2dab3325 Mon Sep 17 00:00:00 2001 From: Samuel Date: Wed, 15 Aug 2018 11:36:47 +0200 Subject: [PATCH 16/35] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 911302a6..2acdcb11 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # esx_boat -Adds boat shops and boat garages around San Andreas. Unlike esx_vehicleshop this script isn't built around a job. +This resource for ESX adds boat shops and boat garages around San Andreas, the island has been populated with boat garages, and comes defaulted with one boat shop. ## Requirements - [esx_vehicleshop](https://github.com/ESX-Org/esx_vehicleshop) From 03823cc93d2a90f3f67a2d458195728fbfbe33d9 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 24 Sep 2018 17:00:02 +0200 Subject: [PATCH 17/35] mysql-async v3.0.1 support --- server/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/main.lua b/server/main.lua index 24d17971..b08eac1a 100644 --- a/server/main.lua +++ b/server/main.lua @@ -2,7 +2,7 @@ ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) -AddEventHandler('onMySQLReady', function() +MySQL.ready(function() ParkBoats() end) From 6b5674e22d65dcaac2b7309080832eb5a532dc83 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 30 Dec 2018 21:00:23 +0100 Subject: [PATCH 18/35] Check IsControlJustReleased() every frame --- client/main.lua | 2 +- client/marker.lua | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/client/main.lua b/client/main.lua index 6122e83b..4132c970 100644 --- a/client/main.lua +++ b/client/main.lua @@ -240,7 +240,7 @@ end -- Key controls Citizen.CreateThread(function() while true do - Citizen.Wait(10) + Citizen.Wait(0) if isInShopMenu then DisableControlAction(0, 75, true) -- Disable exit vehicle diff --git a/client/marker.lua b/client/marker.lua index 743d9659..cdc488c8 100644 --- a/client/marker.lua +++ b/client/marker.lua @@ -8,7 +8,7 @@ CurrentActionData = {} -- Key controls Citizen.CreateThread(function() while true do - Citizen.Wait(10) + Citizen.Wait(0) if CurrentAction ~= nil then @@ -22,7 +22,7 @@ Citizen.CreateThread(function() OpenBoatShop(Config.Zones.BoatShops[CurrentActionData.zoneNum]) else -- check for license - ESX.TriggerServerCallback('esx_license:checkLicense', function (hasBoatLicense) + ESX.TriggerServerCallback('esx_license:checkLicense', function(hasBoatLicense) if hasBoatLicense then OpenBoatShop(Config.Zones.BoatShops[CurrentActionData.zoneNum]) else @@ -31,7 +31,7 @@ Citizen.CreateThread(function() end, GetPlayerServerId(PlayerId()), 'boat') end - + elseif CurrentAction == 'garage_out' then OpenBoatGarage(Config.Zones.Garages[CurrentActionData.zoneNum]) elseif CurrentAction == 'garage_in' then @@ -67,7 +67,6 @@ AddEventHandler('esx_boat:hasEnteredMarker', function(zone, zoneNum) CurrentActionMsg = _U('garage_store') CurrentActionData = { vehicle = vehicle, zoneNum = zoneNum } end - end end end) @@ -93,7 +92,7 @@ Citizen.CreateThread(function() -- draw boat shop marker local zone = Config.Zones.BoatShops[i].Outside if GetDistanceBetweenCoords(coords, zone.x, zone.y, zone.z, true) < Config.DrawDistance then - DrawMarker(Config.MarkerType, zone.x, zone.y, zone.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.Marker.x, Config.Marker.y, Config.Marker.z, Config.Marker.r, Config.Marker.g, Config.Marker.b, 100, false, true, 2, false, false, false, false) + DrawMarker(Config.MarkerType, zone.x, zone.y, zone.z, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, Config.Marker.x, Config.Marker.y, Config.Marker.z, Config.Marker.r, Config.Marker.g, Config.Marker.b, 100, false, true, 2, false, false, false, false) end end @@ -101,13 +100,13 @@ Citizen.CreateThread(function() -- draw garage maker local zoneOut = Config.Zones.Garages[i].GaragePos if GetDistanceBetweenCoords(coords, zoneOut.x, zoneOut.y, zoneOut.z, true) < Config.DrawDistance then - DrawMarker(Config.MarkerType, zoneOut.x, zoneOut.y, zoneOut.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.Marker.x, Config.Marker.y, Config.Marker.z, Config.Marker.r, Config.Marker.g, Config.Marker.b, 100, false, true, 2, false, false, false, false) + DrawMarker(Config.MarkerType, zoneOut.x, zoneOut.y, zoneOut.z, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, Config.Marker.x, Config.Marker.y, Config.Marker.z, Config.Marker.r, Config.Marker.g, Config.Marker.b, 100, false, true, 2, false, false, false, false) end -- draw store marker local zoneIn = Config.Zones.Garages[i].StorePos if GetDistanceBetweenCoords(coords, zoneIn.x, zoneIn.y, zoneIn.z, true) < Config.DrawDistance then - DrawMarker(Config.MarkerType, zoneIn.x, zoneIn.y, zoneIn.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.StoreMarker.x, Config.StoreMarker.y, Config.StoreMarker.z, Config.StoreMarker.r, Config.StoreMarker.g, Config.StoreMarker.b, 100, false, true, 2, false, false, false, false) + DrawMarker(Config.MarkerType, zoneIn.x, zoneIn.y, zoneIn.z, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, Config.StoreMarker.x, Config.StoreMarker.y, Config.StoreMarker.z, Config.StoreMarker.r, Config.StoreMarker.g, Config.StoreMarker.b, 100, false, true, 2, false, false, false, false) end end From 2d014112444cc079cd97b557fe887d61cb6ba643 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 4 Mar 2019 21:43:34 +0100 Subject: [PATCH 19/35] Updated to new vehicleshop database and fixed #9 --- esx_boat.sql | 5 ----- server/main.lua | 48 +++++++++++++++++++++--------------------------- 2 files changed, 21 insertions(+), 32 deletions(-) diff --git a/esx_boat.sql b/esx_boat.sql index 82e7c875..145daf31 100644 --- a/esx_boat.sql +++ b/esx_boat.sql @@ -2,9 +2,4 @@ USE `essentialmode`; INSERT INTO `licenses` (`type`, `label`) VALUES ('boat', 'Boat License') -; - -ALTER TABLE `owned_vehicles` - ADD COLUMN `vehicleType` VARCHAR(20) NULL DEFAULT 'car', - ADD COLUMN `stored` TINYINT(1) NOT NULL DEFAULT '1' ; \ No newline at end of file diff --git a/server/main.lua b/server/main.lua index b08eac1a..f1bbb580 100644 --- a/server/main.lua +++ b/server/main.lua @@ -7,10 +7,8 @@ MySQL.ready(function() end) function ParkBoats() - MySQL.Async.execute('UPDATE owned_vehicles SET stored = true WHERE stored = @stored AND vehicleType = @vehicleType', - { - ['@stored'] = false, - ['@vehicleType'] = 'boat' + MySQL.Async.execute('UPDATE owned_vehicles SET `stored` = true WHERE `stored` = false AND type = @type', { + ['@type'] = 'boat' }, function (rowsChanged) if rowsChanged > 0 then print(('esx_boat: %s boat(s) have been stored!'):format(rowsChanged)) @@ -18,7 +16,7 @@ function ParkBoats() end) end -ESX.RegisterServerCallback('esx_boat:buyBoat', function (source, cb, vehicleProps) +ESX.RegisterServerCallback('esx_boat:buyBoat', function(source, cb, vehicleProps) local xPlayer = ESX.GetPlayerFromId(source) local price = getPriceFromModel(vehicleProps.modelAlt) @@ -33,13 +31,13 @@ ESX.RegisterServerCallback('esx_boat:buyBoat', function (source, cb, vehicleProp if xPlayer.getMoney() >= price then xPlayer.removeMoney(price) - MySQL.Async.execute('INSERT INTO owned_vehicles (owner, plate, vehicle, vehicleType) VALUES (@owner, @plate, @vehicle, @vehicleType)', + MySQL.Async.execute('INSERT INTO owned_vehicles (owner, plate, vehicle, type) VALUES (@owner, @plate, @vehicle, @type)', { - ['@owner'] = xPlayer.identifier, - ['@plate'] = vehicleProps.plate, - ['@vehicle'] = json.encode(vehicleProps), - ['@vehicleType'] = 'boat' - }, function (rowsChanged) + ['@owner'] = xPlayer.identifier, + ['@plate'] = vehicleProps.plate, + ['@vehicle'] = json.encode(vehicleProps), + ['@type'] = 'boat' + }, function(rowsChanged) cb(true) end) else @@ -48,13 +46,12 @@ ESX.RegisterServerCallback('esx_boat:buyBoat', function (source, cb, vehicleProp end) RegisterServerEvent('esx_boat:takeOutVehicle') -AddEventHandler('esx_boat:takeOutVehicle', function (plate) - MySQL.Async.execute('UPDATE owned_vehicles SET stored = @stored WHERE owner = @owner AND plate = @plate', - { +AddEventHandler('esx_boat:takeOutVehicle', function(plate) + MySQL.Async.execute('UPDATE owned_vehicles SET `stored` = @stored WHERE owner = @owner AND plate = @plate', { ['@stored'] = false, ['@owner'] = GetPlayerIdentifiers(source)[1], ['@plate'] = plate - }, function (rowsChanged) + }, function(rowsChanged) if rowsChanged == 0 then print(('esx_boat: %s exploited the garage!'):format(GetPlayerIdentifiers(source)[1])) end @@ -62,12 +59,11 @@ AddEventHandler('esx_boat:takeOutVehicle', function (plate) end) ESX.RegisterServerCallback('esx_boat:storeVehicle', function (source, cb, plate) - MySQL.Async.execute('UPDATE owned_vehicles SET stored = @stored WHERE owner = @owner AND plate = @plate', - { + MySQL.Async.execute('UPDATE owned_vehicles SET `stored` = @stored WHERE owner = @owner AND plate = @plate', { ['@stored'] = true, ['@owner'] = GetPlayerIdentifiers(source)[1], ['@plate'] = plate - }, function (rowsChanged) + }, function(rowsChanged) if rowsChanged == 0 then print(('esx_boat: %s attempted to store an boat they don\'t own!'):format(GetPlayerIdentifiers(source)[1])) end @@ -76,13 +72,12 @@ ESX.RegisterServerCallback('esx_boat:storeVehicle', function (source, cb, plate) end) end) -ESX.RegisterServerCallback('esx_boat:getGarage', function (source, cb) - MySQL.Async.fetchAll('SELECT * FROM owned_vehicles WHERE owner = @owner AND vehicleType = @vehicleType AND stored = @stored', - { - ['@owner'] = GetPlayerIdentifiers(source)[1], - ['@vehicleType'] = 'boat', - ['@stored'] = true - }, function (result) +ESX.RegisterServerCallback('esx_boat:getGarage', function(source, cb) + MySQL.Async.fetchAll('SELECT * FROM owned_vehicles WHERE owner = @owner AND type = @type AND `stored` = @stored', { + ['@owner'] = GetPlayerIdentifiers(source)[1], + ['@type'] = 'boat', + ['@stored'] = true + }, function(result) local vehicles = {} for i=1, #result, 1 do @@ -92,10 +87,9 @@ ESX.RegisterServerCallback('esx_boat:getGarage', function (source, cb) cb(vehicles) end) - end) -ESX.RegisterServerCallback('esx_boat:buyBoatLicense', function (source, cb) +ESX.RegisterServerCallback('esx_boat:buyBoatLicense', function(source, cb) local xPlayer = ESX.GetPlayerFromId(source) if xPlayer.getMoney() >= Config.LicensePrice then From 54cae91fc4922934b275ca567520e1e4a48bc821 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 4 Mar 2019 21:43:58 +0100 Subject: [PATCH 20/35] Made the config simpler --- config.lua | 80 ++++++++---------------------------------------------- 1 file changed, 12 insertions(+), 68 deletions(-) diff --git a/config.lua b/config.lua index a72eb121..87312264 100644 --- a/config.lua +++ b/config.lua @@ -19,7 +19,7 @@ Config.StoreMarker = { } Config.Zones = { - + Garages = { { -- Shank St, nearby campaign boat garage @@ -78,71 +78,15 @@ Config.Zones = { } Config.Vehicles = { - - { - model = 'seashark', - label = 'Seashark (Random Color)', - price = 7500 - }, - - { - model = 'seashark3', - label = 'Seashark (Dark Blue)', - price = 7500 - }, - - { - model = 'suntrap', - label = 'Suntrap', - price = 10000 - }, - - { - model = 'jetmax', - label = 'Jetmax', - price = 45000 - }, - - { - model = 'tropic2', - label = 'Tropic', - price = 65000 - }, - - { - model = 'dinghy2', - label = 'Dinghy (Black)', - price = 32500 - }, - - { - model = 'dinghy', - label = 'Dinghy 2 (Random Color)', - price = 40000 - }, - - { - model = 'speeder', - label = 'Speeder', - price = 85000 - }, - - { - model = 'squalo', - label = 'Squalo (Random Color)', - price = 61000 - }, - - { - model = 'toro', - label = 'Toro', - price = 200000 - }, - - { - model = 'submersible', - label = 'Submersible', - price = 750000 - } - + {model = 'seashark', label = 'Seashark (Random Color)', price = 7500}, + {model = 'seashark3', label = 'Seashark (Dark Blue)', price = 7500}, + {model = 'suntrap', label = 'Suntrap', price = 10000}, + {model = 'jetmax', label = 'Jetmax', price = 45000}, + {model = 'tropic2', label = 'Tropic', price = 65000}, + {model = 'dinghy2', label = 'Dinghy (Black)', price = 32500}, + {model = 'dinghy', label = 'Dinghy 2 (Random Color)', price = 40000}, + {model = 'speeder', label = 'Speeder', price = 85000}, + {model = 'squalo', label = 'Squalo (Random Color)', price = 61000}, + {model = 'toro', label = 'Toro', price = 200000}, + {model = 'submersible', label = 'Submersible', price = 750000} } \ No newline at end of file From f4265fec52b27ec7513858985b7e8938f35e8423 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 9 Mar 2019 16:53:25 +0100 Subject: [PATCH 21/35] Use vector types, digit grouping, improved threads, locale file indent --- __resource.lua | 2 +- client/main.lua | 62 +++++++++++++++---------------- client/marker.lua | 94 +++++++++++++++++++---------------------------- config.lua | 52 +++++++++++++------------- locales/en.lua | 52 +++++++++++++------------- locales/sv.lua | 52 +++++++++++++------------- server/main.lua | 6 +-- 7 files changed, 147 insertions(+), 173 deletions(-) diff --git a/__resource.lua b/__resource.lua index 1a9cc5d8..3c677db1 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,7 +2,7 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Boat' -version '0.1.0' +version '0.5.0' server_scripts { '@mysql-async/lib/MySQL.lua', diff --git a/client/main.lua b/client/main.lua index 4132c970..488de03d 100644 --- a/client/main.lua +++ b/client/main.lua @@ -10,7 +10,7 @@ Keys = { ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 } -ESX = nil +ESX = nil isInShopMenu = false local spawnedVehicles = {} @@ -35,17 +35,15 @@ function OpenBoatShop(shop) local elements = {} for i=1, #Config.Vehicles, 1 do - table.insert(elements, { - label = (string.format ('%s - $%i', Config.Vehicles[i].label, Config.Vehicles[i].price)), + label = ('%s - $%s'):format(Config.Vehicles[i].label, ESX.Math.GroupDigits(Config.Vehicles[i].price)), name = Config.Vehicles[i].label, model = Config.Vehicles[i].model, price = Config.Vehicles[i].price }) end - ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'boat_shop', - { + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'boat_shop', { title = _U('boat_shop'), align = 'top-left', elements = elements @@ -53,7 +51,7 @@ function OpenBoatShop(shop) ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'boat_shop_confirm', { - title = _U('boat_shop_confirm', data.current.name, data.current.price), + title = _U('boat_shop_confirm', data.current.name, ESX.Math.GroupDigits(data.current.price)), align = 'top-left', elements = { { label = _U('confirm_no'), value = 'no' }, @@ -72,15 +70,15 @@ function OpenBoatShop(shop) ESX.TriggerServerCallback('esx_boat:buyBoat', function (bought) if bought then - ESX.ShowNotification(_U('boat_shop_bought', data.current.name, data.current.price)) + ESX.ShowNotification(_U('boat_shop_bought', data.current.name, ESX.Math.GroupDigits(data.current.price))) DeleteSpawnedVehicles() isInShopMenu = false ESX.UI.Menu.CloseAll() - CurrentAction = 'boat_shop' - CurrentActionMsg = _U('boat_shop_open') - + CurrentAction = 'boat_shop' + CurrentActionMsg = _U('boat_shop_open') + FreezeEntityPosition(playerPed, false) SetEntityVisible(playerPed, true) SetEntityCoords(playerPed, shop.Outside.x, shop.Outside.y, shop.Outside.z) @@ -88,7 +86,7 @@ function OpenBoatShop(shop) ESX.ShowNotification(_U('boat_shop_nomoney')) menu2.close() end - + end, props) else @@ -104,8 +102,8 @@ function OpenBoatShop(shop) isInShopMenu = false DeleteSpawnedVehicles() - CurrentAction = 'boat_shop' - CurrentActionMsg = _U('boat_shop_open') + CurrentAction = 'boat_shop' + CurrentActionMsg = _U('boat_shop_open') FreezeEntityPosition(playerPed, false) SetEntityVisible(playerPed, true) @@ -113,8 +111,8 @@ function OpenBoatShop(shop) end, function (data, menu) DeleteSpawnedVehicles() - - ESX.Game.SpawnLocalVehicle(data.current.model, shop.Inside, shop.Inside.h, function (vehicle) + + ESX.Game.SpawnLocalVehicle(data.current.model, shop.Inside, shop.Inside.w, function (vehicle) table.insert(spawnedVehicles, vehicle) TaskWarpPedIntoVehicle(playerPed, vehicle, -1) FreezeEntityPosition(vehicle, true) @@ -123,7 +121,8 @@ function OpenBoatShop(shop) -- spawn first vehicle DeleteSpawnedVehicles() - ESX.Game.SpawnLocalVehicle(Config.Vehicles[1].model, shop.Inside, shop.Inside.h, function (vehicle) + + ESX.Game.SpawnLocalVehicle(Config.Vehicles[1].model, shop.Inside, shop.Inside.w, function (vehicle) table.insert(spawnedVehicles, vehicle) TaskWarpPedIntoVehicle(playerPed, vehicle, -1) FreezeEntityPosition(vehicle, true) @@ -141,28 +140,29 @@ function OpenBoatGarage(garage) -- get all available boats local elements = {} for i=1, #ownedBoats, 1 do + ownedBoats[i] = json.decode(ownedBoats[i]) + table.insert(elements, { - label = getVehicleLabelFromHash(ownedBoats[i].model), + label = getVehicleLabelFromHash(ownedBoats[i].model), vehicleProps = ownedBoats[i] }) end - ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'boat_garage', - { + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'boat_garage', { title = _U('garage'), align = 'top-left', elements = elements }, function (data, menu) -- make sure the spawn point isn't blocked - local playerPed = PlayerPedId() + local playerPed = PlayerPedId() local vehicleProps = data.current.vehicleProps if ESX.Game.IsSpawnPointClear(garage.SpawnPoint, 4.0) then TriggerServerEvent('esx_boat:takeOutVehicle', vehicleProps.plate) ESX.ShowNotification(_U('garage_taken')) - ESX.Game.SpawnVehicle(vehicleProps.model, garage.SpawnPoint, garage.SpawnPoint.h, function(vehicle) + ESX.Game.SpawnVehicle(vehicleProps.model, garage.SpawnPoint, garage.SpawnPoint.w, function(vehicle) TaskWarpPedIntoVehicle(playerPed, vehicle, -1) ESX.Game.SetVehicleProperties(vehicle, vehicleProps) end) @@ -172,7 +172,6 @@ function OpenBoatGarage(garage) ESX.ShowNotification(_U('garage_blocked')) end - end, function (data, menu) menu.close() @@ -185,19 +184,18 @@ function OpenBoatGarage(garage) end function OpenLicenceMenu(shop) - ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'boat_license', - { + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'boat_license', { title = _U('license_menu'), align = 'top-left', elements = { { label = _U('license_buy_no'), value = 'no' }, - { label = _U('license_buy_yes', Config.LicensePrice), value = 'yes' } + { label = _U('license_buy_yes', ESX.Math.GroupDigits(Config.LicensePrice)), value = 'yes' } } }, function (data, menu) if data.current.value == 'yes' then ESX.TriggerServerCallback('esx_boat:buyBoatLicense', function (boughtLicense) if boughtLicense then - ESX.ShowNotification(_U('license_bought', Config.LicensePrice)) + ESX.ShowNotification(_U('license_bought', ESX.Math.GroupDigits(Config.LicensePrice))) menu.close() OpenBoatShop(shop) -- parse current shop @@ -206,19 +204,18 @@ function OpenLicenceMenu(shop) end end) else - CurrentAction = 'boat_shop' - CurrentActionMsg = _U('boat_shop_open') + CurrentAction = 'boat_shop' + CurrentActionMsg = _U('boat_shop_open') menu.close() end end, function (data, menu) - CurrentAction = 'boat_shop' - CurrentActionMsg = _U('boat_shop_open') + CurrentAction = 'boat_shop' + CurrentActionMsg = _U('boat_shop_open') menu.close() end) end function StoreBoatInGarage(vehicle, teleportCoords) - local vehicleProps = ESX.Game.GetVehicleProperties(vehicle) ESX.TriggerServerCallback('esx_boat:storeVehicle', function (rowsChanged) @@ -228,13 +225,12 @@ function StoreBoatInGarage(vehicle, teleportCoords) local playerPed = PlayerPedId() ESX.Game.Teleport(playerPed, teleportCoords, function() - SetEntityHeading(playerPed, teleportCoords.h) + SetEntityHeading(playerPed, teleportCoords.w) end) else ESX.ShowNotification(_U('garage_notowner')) end end, vehicleProps.plate) - end -- Key controls diff --git a/client/marker.lua b/client/marker.lua index cdc488c8..fd850ff0 100644 --- a/client/marker.lua +++ b/client/marker.lua @@ -79,83 +79,60 @@ AddEventHandler('esx_boat:hasExitedMarker', function() CurrentAction = nil end) --- Draw markers -Citizen.CreateThread(function() - while true do - - Citizen.Wait(1) - - local playerPed = PlayerPedId() - local coords = GetEntityCoords(playerPed) - - for i=1, #Config.Zones.BoatShops, 1 do - -- draw boat shop marker - local zone = Config.Zones.BoatShops[i].Outside - if GetDistanceBetweenCoords(coords, zone.x, zone.y, zone.z, true) < Config.DrawDistance then - DrawMarker(Config.MarkerType, zone.x, zone.y, zone.z, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, Config.Marker.x, Config.Marker.y, Config.Marker.z, Config.Marker.r, Config.Marker.g, Config.Marker.b, 100, false, true, 2, false, false, false, false) - end - end - - for i=1, #Config.Zones.Garages, 1 do - -- draw garage maker - local zoneOut = Config.Zones.Garages[i].GaragePos - if GetDistanceBetweenCoords(coords, zoneOut.x, zoneOut.y, zoneOut.z, true) < Config.DrawDistance then - DrawMarker(Config.MarkerType, zoneOut.x, zoneOut.y, zoneOut.z, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, Config.Marker.x, Config.Marker.y, Config.Marker.z, Config.Marker.r, Config.Marker.g, Config.Marker.b, 100, false, true, 2, false, false, false, false) - end - - -- draw store marker - local zoneIn = Config.Zones.Garages[i].StorePos - if GetDistanceBetweenCoords(coords, zoneIn.x, zoneIn.y, zoneIn.z, true) < Config.DrawDistance then - DrawMarker(Config.MarkerType, zoneIn.x, zoneIn.y, zoneIn.z, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, Config.StoreMarker.x, Config.StoreMarker.y, Config.StoreMarker.z, Config.StoreMarker.r, Config.StoreMarker.g, Config.StoreMarker.b, 100, false, true, 2, false, false, false, false) - end - end - - end -end) - -- Enter / Exit marker events Citizen.CreateThread(function() - while true do + Citizen.Wait(0) - Citizen.Wait(1) - - local playerPed = PlayerPedId() - local coords = GetEntityCoords(playerPed) - local isInMarker = false - local currentZone = nil - local currentZoneNum = nil + local playerPed = PlayerPedId() + local coords = GetEntityCoords(playerPed) + local isInMarker, hasExited, letSleep = false, false, true + local currentZone, currentZoneNum for i=1, #Config.Zones.BoatShops, 1 do + local distance = GetDistanceBetweenCoords(coords, Config.Zones.BoatShops[i].Outside, true) - if GetDistanceBetweenCoords(coords, Config.Zones.BoatShops[i].Outside.x, Config.Zones.BoatShops[i].Outside.y, Config.Zones.BoatShops[i].Outside.z, true) < Config.Marker.x then + if distance < Config.DrawDistance then + DrawMarker(Config.MarkerType, Config.Zones.BoatShops[i].Outside, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, Config.Marker.x, Config.Marker.y, Config.Marker.z, Config.Marker.r, Config.Marker.g, Config.Marker.b, 100, false, true, 2, false, nil, nil, false) + letSleep = false + end + + if distance < Config.Marker.x then isInMarker = true currentZone = 'boat_shop' currentZoneNum = i end - end for i=1, #Config.Zones.Garages, 1 do + local distance = GetDistanceBetweenCoords(coords, Config.Zones.Garages[i].GaragePos, true) - if GetDistanceBetweenCoords(coords, Config.Zones.Garages[i].GaragePos.x, Config.Zones.Garages[i].GaragePos.y, Config.Zones.Garages[i].GaragePos.z, true) < Config.Marker.x then + if distance < Config.DrawDistance then + DrawMarker(Config.MarkerType, Config.Zones.Garages[i].GaragePos, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, Config.Marker.x, Config.Marker.y, Config.Marker.z, Config.Marker.r, Config.Marker.g, Config.Marker.b, 100, false, true, 2, false, nil, nil, false) + letSleep = false + end + + if distance < Config.Marker.x then isInMarker = true currentZone = 'garage_out' currentZoneNum = i end - if GetDistanceBetweenCoords(coords, Config.Zones.Garages[i].StorePos.x, Config.Zones.Garages[i].StorePos.y, Config.Zones.Garages[i].StorePos.z, true) < Config.StoreMarker.x then + distance = GetDistanceBetweenCoords(coords, Config.Zones.Garages[i].StorePos, true) + + if distance < Config.DrawDistance then + DrawMarker(Config.MarkerType, Config.Zones.Garages[i].StorePos, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, Config.StoreMarker.x, Config.StoreMarker.y, Config.StoreMarker.z, Config.StoreMarker.r, Config.StoreMarker.g, Config.StoreMarker.b, 100, false, true, 2, false, nil, nil, false) + letSleep = false + end + + if distance < Config.StoreMarker.x then isInMarker = true currentZone = 'garage_in' currentZoneNum = i end - end - local hasExited = false - - if isInMarker and not HasAlreadyEnteredMarker or (isInMarker and (LastZone ~= currentZone or LastZoneNum ~= currentZoneNum) ) then - + if isInMarker and not HasAlreadyEnteredMarker or (isInMarker and (LastZone ~= currentZone or LastZoneNum ~= currentZoneNum)) then if (LastZone ~= nil and LastZoneNum ~= nil) and (LastZone ~= currentZone or LastZoneNum ~= currentZoneNum) @@ -165,18 +142,21 @@ Citizen.CreateThread(function() end HasAlreadyEnteredMarker = true - LastZone = currentZone - LastZoneNum = currentZoneNum + LastZone = currentZone + LastZoneNum = currentZoneNum TriggerEvent('esx_boat:hasEnteredMarker', currentZone, currentZoneNum) end if not hasExited and not isInMarker and HasAlreadyEnteredMarker then - HasAlreadyEnteredMarker = false TriggerEvent('esx_boat:hasExitedMarker') end + if letSleep then + Citizen.Wait(500) + end + end end) @@ -187,7 +167,7 @@ Citizen.CreateThread(function() for i=1, #Config.Zones.Garages, 1 do table.insert(blipList, { - coords = { Config.Zones.Garages[i].GaragePos.x, Config.Zones.Garages[i].GaragePos.y }, + coords = Config.Zones.Garages[i].GaragePos, text = _U('blip_garage'), sprite = 356, color = 3, @@ -197,7 +177,7 @@ Citizen.CreateThread(function() for i=1, #Config.Zones.BoatShops, 1 do table.insert(blipList, { - coords = { Config.Zones.BoatShops[i].Outside.x, Config.Zones.BoatShops[i].Outside.y }, + coords = Config.Zones.BoatShops[i].Outside, text = _U('blip_shop'), sprite = 427, color = 3, @@ -212,7 +192,7 @@ Citizen.CreateThread(function() end) function CreateBlip(coords, text, sprite, color, scale) - local blip = AddBlipForCoord( table.unpack(coords) ) + local blip = AddBlipForCoord(coords.x, coords.y) SetBlipSprite(blip, sprite) SetBlipScale(blip, scale) diff --git a/config.lua b/config.lua index 87312264..46aac300 100644 --- a/config.lua +++ b/config.lua @@ -23,45 +23,45 @@ Config.Zones = { Garages = { { -- Shank St, nearby campaign boat garage - GaragePos = { x = -772.42, y = -1430.90, z = 0.55 }, - SpawnPoint = { x = -785.39, y = -1426.30, z = 0.00, h = 146.00 }, - StorePos = { x = -798.45, y = -1456.03, z = 0.00 }, - StoreTP = { x = -791.41, y = -1452.57, z = 1.59, h = 318.96 } + GaragePos = vector3(-772.4, -1430.9, 0.5), + SpawnPoint = vector4(-785.39, -1426.3, 0.0, 146.0), + StorePos = vector3(-798.4, -1456.0, 0.0), + StoreTP = vector4(-791.4, -1452.5, 1.5, 318.9) }, { -- Catfish View - GaragePos = { x = 3864.93, y = 4463.98, z = 1.65 }, - SpawnPoint = { x = 3854.40, y = 4477.28, z = 0.00, h = 273.00 }, - StorePos = { x = 3857.04, y = 4446.94, z = 0.00 }, - StoreTP = { x = 3854.73, y = 4458.66, z = 1.85, h = 355.35 } + GaragePos = vector3(3864.9, 4463.9, 1.6), + SpawnPoint = vector4(3854.4, 4477.2, 0.0, 273.0), + StorePos = vector3(3857.0, 4446.9, 0.0), + StoreTP = vector4(3854.7, 4458.6, 1.8, 355.3) }, { -- Great Ocean Highway - GaragePos = { x = -1614.03, y = 5260.10, z = 2.80 }, - SpawnPoint = { x = -1622.52, y = 5247.12, z = 0.00, h = 21.00 }, - StorePos = { x = -1600.37, y = 5261.91, z = 0.00 }, - StoreTP = { x = -1605.77, y = 5259.00, z = 2.09, h = 25.00 } + GaragePos = vector3(-1614.0, 5260.1, 2.8), + SpawnPoint = vector4(-1622.5, 5247.1, 0.0, 21.0), + StorePos = vector3(-1600.3, 5261.9, 0.0), + StoreTP = vector4(-1605.7, 5259.0, 2.0, 25.0) }, { -- North Calafia Way - GaragePos = { x = 712.67, y = 4093.31, z = 33.70 }, - SpawnPoint = { x = 712.89, y = 4080.20, z = 29.35, h = 181.00 }, - StorePos = { x = 705.16, y = 4110.16, z = 30.20 }, - StoreTP = { x = 711.97, y = 4110.55, z = 31.30, h = 180.00 } + GaragePos = vector3(712.6, 4093.3, 33.7), + SpawnPoint = vector4(712.8, 4080.2, 29.3, 181.0), + StorePos = vector3(705.1, 4110.1, 30.2), + StoreTP = vector4(711.9, 4110.5, 31.3, 180.0) }, { -- Elysian Fields, nearby the airport - GaragePos = { x = 23.87, y = -2806.82, z = 4.80 }, - SpawnPoint = { x = 23.35, y = -2828.69, z = 0.81, h = 181.0 }, - StorePos = { x = -1.03, y = -2799.20, z = 0.50 }, - StoreTP = { x = 12.67, y = -2793.87, z = 2.52, h = 355.26 } + GaragePos = vector3(23.8, -2806.8, 4.8), + SpawnPoint = vector4(23.3, -2828.6, 0.8, 181.0), + StorePos = vector3(-1.0, -2799.2, 0.5), + StoreTP = vector4(12.6, -2793.8, 2.5, 355.2) }, { -- Barbareno Rd - GaragePos = { x = -3427.36, y = 956.94, z = 7.35 }, - SpawnPoint = { x = -3448.97, y = 953.80, z = 0.00, h = 75.00 }, - StorePos = { x = -3436.55, y = 946.67, z = 0.30 }, - StoreTP = { x = -3427.08, y = 952.62, z = 8.34, h = 0.00 } + GaragePos = vector3(-3427.3, 956.9, 7.3), + SpawnPoint = vector4(-3448.9, 953.8, 0.0, 75.0), + StorePos = vector3(-3436.5, 946.6, 0.3), + StoreTP = vector4(-3427.0, 952.6, 8.3, 0.0) }, }, @@ -69,8 +69,8 @@ Config.Zones = { BoatShops = { { -- Shank St, nearby campaign boat garage - Outside = { x = -773.76, y = -1495.25, z = 1.60 }, - Inside = { x = -798.59, y = -1503.12, z = -0.47, h = 120.00 }, + Outside = vector3(-773.7, -1495.2, 1.6), + Inside = vector4(-798.5, -1503.1, -0.4, 120.0) } } diff --git a/locales/en.lua b/locales/en.lua index 6b14703c..fd1f44ac 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,31 +1,31 @@ Locales['en'] = { - -- shop - ['boat_shop'] = 'boat shop', - ['boat_shop_open'] = 'press ~INPUT_CONTEXT~ to access the ~y~boat shop~s~.', - ['boat_shop_confirm'] = 'buy %s for $%s?', - ['boat_shop_bought'] = 'you have ~y~bought~s~ a ~b~%s~s~ for ~g~$%s~s~', - ['boat_shop_nomoney'] = 'you cannot ~r~afford~s~ this boat!', - ['confirm_no'] = 'no', - ['confirm_yes'] = 'yes', + -- shop + ['boat_shop'] = 'boat shop', + ['boat_shop_open'] = 'press ~INPUT_CONTEXT~ to access the ~y~boat shop~s~.', + ['boat_shop_confirm'] = 'buy %s for $%s?', + ['boat_shop_bought'] = 'you have ~y~bought~s~ a ~b~%s~s~ for ~g~$%s~s~', + ['boat_shop_nomoney'] = 'you cannot ~r~afford~s~ this boat!', + ['confirm_no'] = 'no', + ['confirm_yes'] = 'yes', - -- garage - ['garage'] = 'boat garage', - ['garage_open'] = 'press ~INPUT_CONTEXT~ to access your ~y~boat garage~s~.', - ['garage_store'] = 'press ~INPUT_CONTEXT~ to ~y~store~s~ the boat in your garage.', - ['garage_taken'] = 'the boat has been taken out!', - ['garage_stored'] = 'the boat has been safely stored in your garage!', - ['garage_noboats'] = 'you don\'t have any stored boats! Visit the ~y~boat shop~s~ to buy one.', - ['garage_blocked'] = 'the boat cannot be taken out because another vehicle is blocking the spawn point!', - ['garage_notowner'] = 'you don\'t own this boat!', + -- garage + ['garage'] = 'boat garage', + ['garage_open'] = 'press ~INPUT_CONTEXT~ to access your ~y~boat garage~s~.', + ['garage_store'] = 'press ~INPUT_CONTEXT~ to ~y~store~s~ the boat in your garage.', + ['garage_taken'] = 'the boat has been taken out!', + ['garage_stored'] = 'the boat has been safely stored in your garage!', + ['garage_noboats'] = 'you don\'t have any stored boats! Visit the ~y~boat shop~s~ to buy one.', + ['garage_blocked'] = 'the boat cannot be taken out because another vehicle is blocking the spawn point!', + ['garage_notowner'] = 'you don\'t own this boat!', - -- license - ['license_menu'] = 'buy Boat License?', - ['license_buy_no'] = 'no', - ['license_buy_yes'] = 'buy Boat License $%s', - ['license_bought'] = 'you have bought the ~y~Boat License~s~ for ~g~$%s~s~', - ['license_nomoney'] = 'you cannot ~r~afford~s~ the ~y~Boat License~s~!', + -- license + ['license_menu'] = 'buy Boat License?', + ['license_buy_no'] = 'no', + ['license_buy_yes'] = 'buy Boat License $%s', + ['license_bought'] = 'you have bought the ~y~Boat License~s~ for ~g~$%s~s~', + ['license_nomoney'] = 'you cannot ~r~afford~s~ the ~y~Boat License~s~!', - -- blips - ['blip_garage'] = 'boat Garage', - ['blip_shop'] = 'boat Shop', + -- blips + ['blip_garage'] = 'boat Garage', + ['blip_shop'] = 'boat Shop', } \ No newline at end of file diff --git a/locales/sv.lua b/locales/sv.lua index 7f5dd0fa..c4803dcc 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -1,31 +1,31 @@ Locales['sv'] = { - -- shop - ['boat_shop'] = 'båtaffär', - ['boat_shop_open'] = 'tryck ~INPUT_CONTEXT~ för att öppna ~y~båtaffären~s~.', - ['boat_shop_confirm'] = 'köp %s för %s SEK?', - ['boat_shop_bought'] = 'du har ~y~köpt~s~ en ~b~%s~s~ för ~g~%s SEK~s~', - ['boat_shop_nomoney'] = 'du har ~r~inte råd~s~ för denna båt!', - ['confirm_no'] = 'nej', - ['confirm_yes'] = 'ja', + -- shop + ['boat_shop'] = 'båtaffär', + ['boat_shop_open'] = 'tryck ~INPUT_CONTEXT~ för att öppna ~y~båtaffären~s~.', + ['boat_shop_confirm'] = 'köp %s för %s SEK?', + ['boat_shop_bought'] = 'du har ~y~köpt~s~ en ~b~%s~s~ för ~g~%s SEK~s~', + ['boat_shop_nomoney'] = 'du har ~r~inte råd~s~ för denna båt!', + ['confirm_no'] = 'nej', + ['confirm_yes'] = 'ja', - -- garage - ['garage'] = 'båtgarage', - ['garage_open'] = 'tryck ~INPUT_CONTEXT~ för att öppna ~y~båtgaraget~s~.', - ['garage_store'] = 'tryck ~INPUT_CONTEXT~ för att ~y~lagra~s~ båten i ditt garage.', - ['garage_taken'] = 'båten har släppts från garaget!', - ['garage_stored'] = 'båten har lagrats i garaget!', - ['garage_noboats'] = 'du har inga lagrade båtar! Besök ~y~båtaffären~s~ för att köpa båtar.', - ['garage_blocked'] = 'båten kan inte tas ur på grund av att en annan båt blokerar spawnpointen!', - ['garage_notowner'] = 'du äger inte denna båt!', + -- garage + ['garage'] = 'båtgarage', + ['garage_open'] = 'tryck ~INPUT_CONTEXT~ för att öppna ~y~båtgaraget~s~.', + ['garage_store'] = 'tryck ~INPUT_CONTEXT~ för att ~y~lagra~s~ båten i ditt garage.', + ['garage_taken'] = 'båten har släppts från garaget!', + ['garage_stored'] = 'båten har lagrats i garaget!', + ['garage_noboats'] = 'du har inga lagrade båtar! Besök ~y~båtaffären~s~ för att köpa båtar.', + ['garage_blocked'] = 'båten kan inte tas ur på grund av att en annan båt blokerar spawnpointen!', + ['garage_notowner'] = 'du äger inte denna båt!', - -- license - ['license_menu'] = 'köpa båtlicens?', - ['license_buy_no'] = 'nej', - ['license_buy_yes'] = 'köp båtlicens %s SEK', - ['license_bought'] = 'du köpte ~y~båtlicensen~s~ för ~g~%s SEK~s~', - ['license_nomoney'] = 'du har ~r~inte råd~s~ för ~y~båtlicensen~s~!', + -- license + ['license_menu'] = 'köpa båtlicens?', + ['license_buy_no'] = 'nej', + ['license_buy_yes'] = 'köp båtlicens %s SEK', + ['license_bought'] = 'du köpte ~y~båtlicensen~s~ för ~g~%s SEK~s~', + ['license_nomoney'] = 'du har ~r~inte råd~s~ för ~y~båtlicensen~s~!', - -- blips - ['blip_garage'] = 'båtgarage', - ['blip_shop'] = 'båtaffär', + -- blips + ['blip_garage'] = 'båtgarage', + ['blip_shop'] = 'båtaffär', } \ No newline at end of file diff --git a/server/main.lua b/server/main.lua index f1bbb580..20adc92b 100644 --- a/server/main.lua +++ b/server/main.lua @@ -31,8 +31,7 @@ ESX.RegisterServerCallback('esx_boat:buyBoat', function(source, cb, vehicleProps if xPlayer.getMoney() >= price then xPlayer.removeMoney(price) - MySQL.Async.execute('INSERT INTO owned_vehicles (owner, plate, vehicle, type) VALUES (@owner, @plate, @vehicle, @type)', - { + MySQL.Async.execute('INSERT INTO owned_vehicles (owner, plate, vehicle, type) VALUES (@owner, @plate, @vehicle, @type)', { ['@owner'] = xPlayer.identifier, ['@plate'] = vehicleProps.plate, ['@vehicle'] = json.encode(vehicleProps), @@ -81,8 +80,7 @@ ESX.RegisterServerCallback('esx_boat:getGarage', function(source, cb) local vehicles = {} for i=1, #result, 1 do - local vehicleProps = json.decode(result[i].vehicle) - table.insert(vehicles, vehicleProps) + table.insert(vehicles, result[i].vehicle) end cb(vehicles) From 5b5be014579f6a431b3d65486bd3ac6b30b493cf Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 9 Mar 2019 16:56:58 +0100 Subject: [PATCH 22/35] Fixed vonurability --- client/main.lua | 1 - server/main.lua | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/client/main.lua b/client/main.lua index 488de03d..322c0884 100644 --- a/client/main.lua +++ b/client/main.lua @@ -65,7 +65,6 @@ function OpenBoatShop(shop) local vehicle = GetVehiclePedIsIn(playerPed, false) local props = ESX.Game.GetVehicleProperties(vehicle) props.plate = plate - props.modelAlt = data.current.model ESX.TriggerServerCallback('esx_boat:buyBoat', function (bought) diff --git a/server/main.lua b/server/main.lua index 20adc92b..78f05d7c 100644 --- a/server/main.lua +++ b/server/main.lua @@ -18,9 +18,7 @@ end ESX.RegisterServerCallback('esx_boat:buyBoat', function(source, cb, vehicleProps) local xPlayer = ESX.GetPlayerFromId(source) - local price = getPriceFromModel(vehicleProps.modelAlt) - - vehicleProps.modelAlt = nil + local price = getPriceFromModel(vehicleProps.model) -- vehicle model not found if price == 0 then @@ -103,7 +101,7 @@ end) function getPriceFromModel(model) for i=1, #Config.Vehicles, 1 do - if Config.Vehicles[i].model == model then + if GetHashKey(Config.Vehicles[i].model) == model then return Config.Vehicles[i].price end end From ba227da7d625146227ece518a1a422c5c8d9ab9f Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 9 Mar 2019 19:12:04 +0100 Subject: [PATCH 23/35] Props support --- client/main.lua | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/client/main.lua b/client/main.lua index 322c0884..71029844 100644 --- a/client/main.lua +++ b/client/main.lua @@ -34,12 +34,13 @@ function OpenBoatShop(shop) local playerPed = PlayerPedId() local elements = {} - for i=1, #Config.Vehicles, 1 do + for k,v in ipairs(Config.Vehicles) do table.insert(elements, { - label = ('%s - $%s'):format(Config.Vehicles[i].label, ESX.Math.GroupDigits(Config.Vehicles[i].price)), - name = Config.Vehicles[i].label, - model = Config.Vehicles[i].model, - price = Config.Vehicles[i].price + label = ('%s - $%s'):format(v.label, ESX.Math.GroupDigits(v.price)), + name = v.label, + model = v.model, + price = v.price, + props = v.props or nil }) end @@ -115,6 +116,10 @@ function OpenBoatShop(shop) table.insert(spawnedVehicles, vehicle) TaskWarpPedIntoVehicle(playerPed, vehicle, -1) FreezeEntityPosition(vehicle, true) + + if data.current.props then + ESX.Game.SetVehicleProperties(vehicle, data.current.props) + end end) end) @@ -125,6 +130,10 @@ function OpenBoatShop(shop) table.insert(spawnedVehicles, vehicle) TaskWarpPedIntoVehicle(playerPed, vehicle, -1) FreezeEntityPosition(vehicle, true) + + if Config.Vehicles[1].props then + ESX.Game.SetVehicleProperties(vehicle, Config.Vehicles[1].props) + end end) end From 28a275a30a2a3d09bda4e64d6a310d9e06e27b27 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 5 May 2019 09:45:43 +0200 Subject: [PATCH 24/35] Proper cb usage --- server/main.lua | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/server/main.lua b/server/main.lua index 78f05d7c..24295b96 100644 --- a/server/main.lua +++ b/server/main.lua @@ -24,21 +24,21 @@ ESX.RegisterServerCallback('esx_boat:buyBoat', function(source, cb, vehicleProps if price == 0 then print(('esx_boat: %s attempted to exploit the shop! (invalid vehicle model)'):format(xPlayer.identifier)) cb(false) - end - - if xPlayer.getMoney() >= price then - xPlayer.removeMoney(price) - - MySQL.Async.execute('INSERT INTO owned_vehicles (owner, plate, vehicle, type) VALUES (@owner, @plate, @vehicle, @type)', { - ['@owner'] = xPlayer.identifier, - ['@plate'] = vehicleProps.plate, - ['@vehicle'] = json.encode(vehicleProps), - ['@type'] = 'boat' - }, function(rowsChanged) - cb(true) - end) else - cb(false) + if xPlayer.getMoney() >= price then + xPlayer.removeMoney(price) + + MySQL.Async.execute('INSERT INTO owned_vehicles (owner, plate, vehicle, type) VALUES (@owner, @plate, @vehicle, @type)', { + ['@owner'] = xPlayer.identifier, + ['@plate'] = vehicleProps.plate, + ['@vehicle'] = json.encode(vehicleProps), + ['@type'] = 'boat' + }, function(rowsChanged) + cb(true) + end) + else + cb(false) + end end end) From 8bd77249d5fe2d0f58fe5334cb04d9d9f3496577 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 3 Aug 2019 10:41:30 +0200 Subject: [PATCH 25/35] Removed keys table, minor improvements, final commit v1.0.0 --- __resource.lua | 2 +- client/main.lua | 57 +++++++++++------------------------------------ client/marker.lua | 14 +++--------- config.lua | 6 +---- locales/en.lua | 2 +- locales/sv.lua | 2 +- server/main.lua | 10 ++++----- 7 files changed, 25 insertions(+), 68 deletions(-) diff --git a/__resource.lua b/__resource.lua index 3c677db1..91e2d952 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,7 +2,7 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Boat' -version '0.5.0' +version '1.0.0' server_scripts { '@mysql-async/lib/MySQL.lua', diff --git a/client/main.lua b/client/main.lua index 71029844..63eacd3e 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,15 +1,3 @@ -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 isInShopMenu = false local spawnedVehicles = {} @@ -20,7 +8,7 @@ Citizen.CreateThread(function() Citizen.Wait(0) end - while ESX.GetPlayerData().job == nil do + while not ESX.GetPlayerData().job do Citizen.Wait(10) end @@ -28,7 +16,6 @@ Citizen.CreateThread(function() end) function OpenBoatShop(shop) - isInShopMenu = true local playerPed = PlayerPedId() @@ -49,26 +36,20 @@ function OpenBoatShop(shop) align = 'top-left', elements = elements }, function (data, menu) - - ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'boat_shop_confirm', - { + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'boat_shop_confirm', { title = _U('boat_shop_confirm', data.current.name, ESX.Math.GroupDigits(data.current.price)), align = 'top-left', elements = { - { label = _U('confirm_no'), value = 'no' }, - { label = _U('confirm_yes'), value = 'yes' } - } - }, function (data2, menu2) - + {label = _U('confirm_no'), value = 'no'}, + {label = _U('confirm_yes'), value = 'yes'} + }}, function (data2, menu2) if data2.current.value == 'yes' then + local plate = exports['esx_vehicleshop']:GeneratePlate() + local vehicle = GetVehiclePedIsIn(playerPed, false) + local props = ESX.Game.GetVehicleProperties(vehicle) + props.plate = plate - local plate = exports['esx_vehicleshop']:GeneratePlate() - local vehicle = GetVehiclePedIsIn(playerPed, false) - local props = ESX.Game.GetVehicleProperties(vehicle) - props.plate = plate - - ESX.TriggerServerCallback('esx_boat:buyBoat', function (bought) - + ESX.TriggerServerCallback('esx_boat:buyBoat', function(bought) if bought then ESX.ShowNotification(_U('boat_shop_bought', data.current.name, ESX.Math.GroupDigits(data.current.price))) @@ -86,17 +67,13 @@ function OpenBoatShop(shop) ESX.ShowNotification(_U('boat_shop_nomoney')) menu2.close() end - end, props) - else menu2.close() end - end, function (data2, menu2) menu2.close() end) - end, function (data, menu) menu.close() isInShopMenu = false @@ -108,7 +85,6 @@ function OpenBoatShop(shop) FreezeEntityPosition(playerPed, false) SetEntityVisible(playerPed, true) SetEntityCoords(playerPed, shop.Outside.x, shop.Outside.y, shop.Outside.z) - end, function (data, menu) DeleteSpawnedVehicles() @@ -138,13 +114,10 @@ function OpenBoatShop(shop) end function OpenBoatGarage(garage) - ESX.TriggerServerCallback('esx_boat:getGarage', function (ownedBoats) - if #ownedBoats == 0 then ESX.ShowNotification(_U('garage_noboats')) else - -- get all available boats local elements = {} for i=1, #ownedBoats, 1 do @@ -161,7 +134,6 @@ function OpenBoatGarage(garage) align = 'top-left', elements = elements }, function (data, menu) - -- make sure the spawn point isn't blocked local playerPed = PlayerPedId() local vehicleProps = data.current.vehicleProps @@ -179,7 +151,6 @@ function OpenBoatGarage(garage) else ESX.ShowNotification(_U('garage_blocked')) end - end, function (data, menu) menu.close() @@ -187,7 +158,6 @@ function OpenBoatGarage(garage) CurrentActionMsg = _U('garage_open') end) end - end) end @@ -196,10 +166,9 @@ function OpenLicenceMenu(shop) title = _U('license_menu'), align = 'top-left', elements = { - { label = _U('license_buy_no'), value = 'no' }, - { label = _U('license_buy_yes', ESX.Math.GroupDigits(Config.LicensePrice)), value = 'yes' } - } - }, function (data, menu) + {label = _U('license_buy_no'), value = 'no'}, + {label = _U('license_buy_yes', ESX.Math.GroupDigits(Config.LicensePrice)), value = 'yes'} + }}, function (data, menu) if data.current.value == 'yes' then ESX.TriggerServerCallback('esx_boat:buyBoatLicense', function (boughtLicense) if boughtLicense then diff --git a/client/marker.lua b/client/marker.lua index fd850ff0..46e18481 100644 --- a/client/marker.lua +++ b/client/marker.lua @@ -10,14 +10,11 @@ Citizen.CreateThread(function() while true do Citizen.Wait(0) - if CurrentAction ~= nil then - + if CurrentAction then ESX.ShowHelpNotification(CurrentActionMsg) - if IsControlJustReleased(0, Keys['E']) then - + if IsControlJustReleased(0, 38) then if CurrentAction == 'boat_shop' then - if not Config.LicenseEnable then OpenBoatShop(Config.Zones.BoatShops[CurrentActionData.zoneNum]) else -- check for license @@ -29,9 +26,7 @@ Citizen.CreateThread(function() OpenLicenceMenu(Config.Zones.BoatShops[CurrentActionData.zoneNum]) end end, GetPlayerServerId(PlayerId()), 'boat') - end - elseif CurrentAction == 'garage_out' then OpenBoatGarage(Config.Zones.Garages[CurrentActionData.zoneNum]) elseif CurrentAction == 'garage_in' then @@ -156,13 +151,11 @@ Citizen.CreateThread(function() if letSleep then Citizen.Wait(500) end - end end) -- Blips Citizen.CreateThread(function() - local blipList = {} for i=1, #Config.Zones.Garages, 1 do @@ -188,7 +181,6 @@ Citizen.CreateThread(function() for i=1, #blipList, 1 do CreateBlip(blipList[i].coords, blipList[i].text, blipList[i].sprite, blipList[i].color, blipList[i].scale) end - end) function CreateBlip(coords, text, sprite, color, scale) @@ -203,4 +195,4 @@ function CreateBlip(coords, text, sprite, color, scale) BeginTextCommandSetBlipName('STRING') AddTextComponentSubstringPlayerName(text) EndTextCommandSetBlipName(blip) -end \ No newline at end of file +end diff --git a/config.lua b/config.lua index 46aac300..1577e976 100644 --- a/config.lua +++ b/config.lua @@ -21,7 +21,6 @@ Config.StoreMarker = { Config.Zones = { Garages = { - { -- Shank St, nearby campaign boat garage GaragePos = vector3(-772.4, -1430.9, 0.5), SpawnPoint = vector4(-785.39, -1426.3, 0.0, 146.0), @@ -62,17 +61,14 @@ Config.Zones = { SpawnPoint = vector4(-3448.9, 953.8, 0.0, 75.0), StorePos = vector3(-3436.5, 946.6, 0.3), StoreTP = vector4(-3427.0, 952.6, 8.3, 0.0) - }, - + } }, BoatShops = { - { -- Shank St, nearby campaign boat garage Outside = vector3(-773.7, -1495.2, 1.6), Inside = vector4(-798.5, -1503.1, -0.4, 120.0) } - } } diff --git a/locales/en.lua b/locales/en.lua index fd1f44ac..0c981825 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -28,4 +28,4 @@ Locales['en'] = { -- blips ['blip_garage'] = 'boat Garage', ['blip_shop'] = 'boat Shop', -} \ No newline at end of file +} diff --git a/locales/sv.lua b/locales/sv.lua index c4803dcc..f4f194a5 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -28,4 +28,4 @@ Locales['sv'] = { -- blips ['blip_garage'] = 'båtgarage', ['blip_shop'] = 'båtaffär', -} \ No newline at end of file +} diff --git a/server/main.lua b/server/main.lua index 24295b96..4ebad086 100644 --- a/server/main.lua +++ b/server/main.lua @@ -70,7 +70,7 @@ ESX.RegisterServerCallback('esx_boat:storeVehicle', function (source, cb, plate) end) ESX.RegisterServerCallback('esx_boat:getGarage', function(source, cb) - MySQL.Async.fetchAll('SELECT * FROM owned_vehicles WHERE owner = @owner AND type = @type AND `stored` = @stored', { + MySQL.Async.fetchAll('SELECT vehicle FROM owned_vehicles WHERE owner = @owner AND type = @type AND `stored` = @stored', { ['@owner'] = GetPlayerIdentifiers(source)[1], ['@type'] = 'boat', ['@stored'] = true @@ -100,11 +100,11 @@ ESX.RegisterServerCallback('esx_boat:buyBoatLicense', function(source, cb) end) function getPriceFromModel(model) - for i=1, #Config.Vehicles, 1 do - if GetHashKey(Config.Vehicles[i].model) == model then - return Config.Vehicles[i].price + for k,v in ipairs(Config.Vehicles) do + if GetHashKey(v.model) == model then + return v.price end end return 0 -end \ No newline at end of file +end From a07b4a7e9c4bae66513c95fc8ab11217e5ceea23 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 3 Aug 2019 10:42:12 +0200 Subject: [PATCH 26/35] Very final commit v1.0.0 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2acdcb11..7477c962 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ start esx_boat ### License esx_boat - Boat shop and garage for ESX -Copyright (C) 2015-2018 Jérémie N'gadi +Copyright (C) 2015-2019 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. From 0af2a133bdd4a8d24c470b20d5a9be0eaf64d974 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sun, 19 Jan 2020 17:24:40 +0100 Subject: [PATCH 27/35] Replace __resource.lua with fxmanifest.lua --- __resource.lua => fxmanifest.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) rename __resource.lua => fxmanifest.lua (85%) diff --git a/__resource.lua b/fxmanifest.lua similarity index 85% rename from __resource.lua rename to fxmanifest.lua index 91e2d952..03bc591a 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 Boat' @@ -25,4 +27,4 @@ client_scripts { dependencies { 'es_extended', 'esx_vehicleshop' -} \ No newline at end of file +} From 8f0ff81b04156c4d5c413ca33521069b8c801672 Mon Sep 17 00:00:00 2001 From: Oldarorn <36448848+Oldarorn@users.noreply.github.com> Date: Tue, 11 Feb 2020 08:27:01 +0100 Subject: [PATCH 28/35] Adding french translation (#16) * Create fr.lua * Update fxmanifest.lua --- fxmanifest.lua | 1 + locales/fr.lua | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 locales/fr.lua diff --git a/fxmanifest.lua b/fxmanifest.lua index 03bc591a..0c38cf9b 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -18,6 +18,7 @@ server_scripts { client_scripts { '@es_extended/locale.lua', 'locales/en.lua', + 'locales/fr.lua', 'locales/sv.lua', 'config.lua', 'client/main.lua', diff --git a/locales/fr.lua b/locales/fr.lua new file mode 100644 index 00000000..c72137a9 --- /dev/null +++ b/locales/fr.lua @@ -0,0 +1,31 @@ +Locales['fr'] = { + -- shop + ['boat_shop'] = 'magasin de bateaux', + ['boat_shop_open'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder au ~y~magasin de bateaux~s~.', + ['boat_shop_confirm'] = 'voulez-vous acheter %s pour $%s?', + ['boat_shop_bought'] = 'vous avez ~y~acheté~s~ le ~b~%s~s~ pour ~g~$%s~s~', + ['boat_shop_nomoney'] = 'vous n\'avez pas les moyens ~r~pour acheter~s~ ce bateau !', + ['confirm_no'] = 'non', + ['confirm_yes'] = 'oui', + + -- garage + ['garage'] = 'garage à bateaux', + ['garage_open'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder à votre ~y~garage à bateaux~s~.', + ['garage_store'] = 'appuyez sur ~INPUT_CONTEXT~ pour ~y~ranger~s~ votre bateau dans votre garage.', + ['garage_taken'] = 'le bateau est sorti !', + ['garage_stored'] = 'le bateau a bien été rangé dans votre garage !', + ['garage_noboats'] = 'vous n\'avez aucun bateau ici ! Rendez-vous au ~y~magasin de bateaux~s~ pour en acheter un.', + ['garage_blocked'] = 'le bateau ne peux pas être sorti car un autre véhicule bloque le point !', + ['garage_notowner'] = 'ce bateau ne vous appartient pas !', + + -- license + ['license_menu'] = 'acheter un permis de naviguer', + ['license_buy_no'] = 'non', + ['license_buy_yes'] = 'acheter le permis pour $%s', + ['license_bought'] = 'vous avez acheté le ~y~permis de naviguer~s~ pour ~g~$%s~s~', + ['license_nomoney'] = 'vous n\'avez pas les moyens ~r~pour acheter~s~ ce permis !', + + -- blips + ['blip_garage'] = 'garage à bateaux', + ['blip_shop'] = 'magasin de bateaux', +} From 2821e1ee1f7df34db3876b03dd1f9988e8d2f1fd Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 17 Feb 2020 21:24:19 +0100 Subject: [PATCH 29/35] Support for latest ESX --- server/main.lua | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/server/main.lua b/server/main.lua index 4ebad086..94cecd05 100644 --- a/server/main.lua +++ b/server/main.lua @@ -28,11 +28,12 @@ ESX.RegisterServerCallback('esx_boat:buyBoat', function(source, cb, vehicleProps if xPlayer.getMoney() >= price then xPlayer.removeMoney(price) - MySQL.Async.execute('INSERT INTO owned_vehicles (owner, plate, vehicle, type) VALUES (@owner, @plate, @vehicle, @type)', { + MySQL.Async.execute('INSERT INTO owned_vehicles (owner, plate, vehicle, type, `stored`) VALUES (@owner, @plate, @vehicle, @type, @stored)', { ['@owner'] = xPlayer.identifier, ['@plate'] = vehicleProps.plate, ['@vehicle'] = json.encode(vehicleProps), - ['@type'] = 'boat' + ['@type'] = 'boat', + ['@stored'] = true }, function(rowsChanged) cb(true) end) @@ -44,25 +45,29 @@ end) RegisterServerEvent('esx_boat:takeOutVehicle') AddEventHandler('esx_boat:takeOutVehicle', function(plate) + local xPlayer = ESX.GetPlayerFromId(source) + MySQL.Async.execute('UPDATE owned_vehicles SET `stored` = @stored WHERE owner = @owner AND plate = @plate', { ['@stored'] = false, - ['@owner'] = GetPlayerIdentifiers(source)[1], + ['@owner'] = xPlayer.identifier, ['@plate'] = plate }, function(rowsChanged) if rowsChanged == 0 then - print(('esx_boat: %s exploited the garage!'):format(GetPlayerIdentifiers(source)[1])) + print(('esx_boat: %s exploited the garage!'):format(xPlayer.identifier)) end end) end) ESX.RegisterServerCallback('esx_boat:storeVehicle', function (source, cb, plate) + local xPlayer = ESX.GetPlayerFromId(source) + MySQL.Async.execute('UPDATE owned_vehicles SET `stored` = @stored WHERE owner = @owner AND plate = @plate', { ['@stored'] = true, - ['@owner'] = GetPlayerIdentifiers(source)[1], + ['@owner'] = xPlayer.identifier, ['@plate'] = plate }, function(rowsChanged) if rowsChanged == 0 then - print(('esx_boat: %s attempted to store an boat they don\'t own!'):format(GetPlayerIdentifiers(source)[1])) + print(('esx_boat: %s attempted to store an boat they don\'t own!'):format(xPlayer.identifier)) end cb(rowsChanged) @@ -70,8 +75,10 @@ ESX.RegisterServerCallback('esx_boat:storeVehicle', function (source, cb, plate) end) ESX.RegisterServerCallback('esx_boat:getGarage', function(source, cb) + local xPlayer = ESX.GetPlayerFromId(source) + MySQL.Async.fetchAll('SELECT vehicle FROM owned_vehicles WHERE owner = @owner AND type = @type AND `stored` = @stored', { - ['@owner'] = GetPlayerIdentifiers(source)[1], + ['@owner'] = xPlayer.identifier, ['@type'] = 'boat', ['@stored'] = true }, function(result) From 2534608d14b46b95c829dcd0949af1072237a38b Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 14 Apr 2020 16:48:45 +0200 Subject: [PATCH 30/35] Latest ESX code --- README.md | 2 +- esx_boat.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7477c962..881816ed 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ start esx_boat ### License esx_boat - Boat shop and garage for ESX -Copyright (C) 2015-2019 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/esx_boat.sql b/esx_boat.sql index 145daf31..901d7cad 100644 --- a/esx_boat.sql +++ b/esx_boat.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; INSERT INTO `licenses` (`type`, `label`) VALUES ('boat', 'Boat License') From b053a419e7b07d4780e3fc839eed2f1a706b45fb Mon Sep 17 00:00:00 2001 From: userMacieG Date: Tue, 14 Apr 2020 19:35:49 +0200 Subject: [PATCH 31/35] Create pl.lua --- locales/pl.lua | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 locales/pl.lua diff --git a/locales/pl.lua b/locales/pl.lua new file mode 100644 index 00000000..d09ee011 --- /dev/null +++ b/locales/pl.lua @@ -0,0 +1,31 @@ +Locales['pl'] = { + -- shop + ['boat_shop'] = 'sklep z łodziami', + ['boat_shop_open'] = 'naciśnij ~INPUT_CONTEXT~ aby otworzyć ~y~sklep z łodziami~s~.', + ['boat_shop_confirm'] = 'kup %s za $%s?', + ['boat_shop_bought'] = '~y~zakupiłeś/aś~s~ ~b~%s~s~ za ~g~$%s~s~', + ['boat_shop_nomoney'] = 'nie posiadasz ~r~wystarczająco~s~ pieniędzy aby zakupić te łódź!', + ['confirm_no'] = 'nie', + ['confirm_yes'] = 'tak', + + -- garage + ['garage'] = 'garaż: Lodzie', + ['garage_open'] = 'naciśnij ~INPUT_CONTEXT~ aby otworzyć ~y~garaż z łodziami~s~.', + ['garage_store'] = 'naciśnij ~INPUT_CONTEXT~ aby ~y~schować~s~ swoją łódź do garażu', + ['garage_taken'] = 'łódź zostałą wyjęta z garażu', + ['garage_stored'] = 'łódź została schowana do garażu', + ['garage_noboats'] = 'nie posiadasz żadnych łodzi!', + ['garage_blocked'] = 'łódź nie może zostać wyjęta dlatego że coś blokuje jej miejsce narodzenia', + ['garage_notowner'] = 'nie jesteś właścicielem tej łodzi!', + + -- license + ['license_menu'] = 'kup licencje na płwanie łodziami?', + ['license_buy_no'] = 'nie', + ['license_buy_yes'] = 'kup licencje na pływanie łodziami $%s', + ['license_bought'] = 'zakupiłeś/aś ~y~licencje na pływanie łodziami~s~ za ~g~$%s~s~', + ['license_nomoney'] = 'nie posiadasz ~r~wystarczająco~s~ pieniędzy aby zakupić ~y~licencje na pływanie łodziami~s~!', + + -- blips + ['blip_garage'] = 'garaż: Lodzie', + ['blip_shop'] = 'sklep z łodziami', +} From 63ffc284011a91ea995959eaede96f8badbde010 Mon Sep 17 00:00:00 2001 From: userMacieG Date: Sun, 19 Jul 2020 12:54:09 +0200 Subject: [PATCH 32/35] Update fxmanifest.lua (#19) --- fxmanifest.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fxmanifest.lua b/fxmanifest.lua index 0c38cf9b..385b5c42 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -11,6 +11,7 @@ server_scripts { '@es_extended/locale.lua', 'locales/en.lua', 'locales/sv.lua', + 'locales/pl.lua', 'config.lua', 'server/main.lua' } @@ -20,6 +21,7 @@ client_scripts { 'locales/en.lua', 'locales/fr.lua', 'locales/sv.lua', + 'locales/pl.lua', 'config.lua', 'client/main.lua', 'client/marker.lua' From 014ab9ea0698e5694b27bdbe868c9da9543b53a6 Mon Sep 17 00:00:00 2001 From: Yulian Ivanov <67766145+BrakingESX247@users.noreply.github.com> Date: Sun, 19 Jul 2020 12:22:42 +0100 Subject: [PATCH 33/35] Update fxmanifest.lua --- fxmanifest.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/fxmanifest.lua b/fxmanifest.lua index 385b5c42..00e2967e 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -10,6 +10,7 @@ server_scripts { '@mysql-async/lib/MySQL.lua', '@es_extended/locale.lua', 'locales/en.lua', + 'locales/fr.lua', 'locales/sv.lua', 'locales/pl.lua', 'config.lua', From 4a82b84a2623c5f5a13ba8266df9791c0d1a1578 Mon Sep 17 00:00:00 2001 From: Jougito - Kheros Date: Sun, 19 Jul 2020 13:25:48 +0200 Subject: [PATCH 34/35] Spanish translation implemented (#21) * Spanish translation implemented * Create es_esx_boat.sql Co-authored-by: Yulian Ivanov <67766145+BrakingESX247@users.noreply.github.com> --- fxmanifest.lua | 4 +++- locales/es.lua | 31 +++++++++++++++++++++++++++++++ localization/es_esx_boat.sql | 5 +++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 locales/es.lua create mode 100644 localization/es_esx_boat.sql diff --git a/fxmanifest.lua b/fxmanifest.lua index 00e2967e..b36a38d9 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -13,6 +13,7 @@ server_scripts { 'locales/fr.lua', 'locales/sv.lua', 'locales/pl.lua', + 'locales/es.lua', 'config.lua', 'server/main.lua' } @@ -23,6 +24,7 @@ client_scripts { 'locales/fr.lua', 'locales/sv.lua', 'locales/pl.lua', + 'locales/es.lua', 'config.lua', 'client/main.lua', 'client/marker.lua' @@ -31,4 +33,4 @@ client_scripts { dependencies { 'es_extended', 'esx_vehicleshop' -} +} \ No newline at end of file diff --git a/locales/es.lua b/locales/es.lua new file mode 100644 index 00000000..b73336dc --- /dev/null +++ b/locales/es.lua @@ -0,0 +1,31 @@ +Locales['es'] = { + -- shop + ['boat_shop'] = 'Tienda de barcos', + ['boat_shop_open'] = 'Pulsa ~INPUT_CONTEXT~ para acceder a la ~y~tienda de barcos~s~.', + ['boat_shop_confirm'] = '¿Comprar %s por %s$?', + ['boat_shop_bought'] = 'Has ~y~comprado~s~ un ~b~%s~s~ por ~g~%s$~s~', + ['boat_shop_nomoney'] = '¡No puedes ~r~permitirte~s~ ese barco!', + ['confirm_no'] = 'No', + ['confirm_yes'] = 'Si', + + -- garage + ['garage'] = 'Garaje de barcos', + ['garage_open'] = 'Pulsa ~INPUT_CONTEXT~ para acceder a tu ~y~garaje de barcos~s~', + ['garage_store'] = 'Pulsa ~INPUT_CONTEXT~ para ~y~almacenar~s~ el barco en el garaje', + ['garage_taken'] = '¡El barco ha sido sacado!', + ['garage_stored'] = '¡El barco se ha almacenado en el garaje!', + ['garage_noboats'] = '¡No tienes ningún barco guardado! Visita la ~y~tienda de barcos~s~ para comprar uno', + ['garage_blocked'] = '¡El barco no ha podido ser sacado, hay un objeto obstruyendo el spawn!', + ['garage_notowner'] = '¡No eres el dueño de ese barco!', + + -- license + ['license_menu'] = '¿Comprar Licencia de Barcos?', + ['license_buy_no'] = 'No', + ['license_buy_yes'] = 'Comprar Licencia de Barcos %s$', + ['license_bought'] = 'Compraste la ~y~Licencia de Barcos~s~ por ~g~$%s~s~', + ['license_nomoney'] = '¡No puedes ~r~permitirte~s~ la ~y~Licencia de Barcos~s~!', + + -- blips + ['blip_garage'] = 'Garaje de barcos', + ['blip_shop'] = 'Tienda de barcos', +} diff --git a/localization/es_esx_boat.sql b/localization/es_esx_boat.sql new file mode 100644 index 00000000..b0eca82c --- /dev/null +++ b/localization/es_esx_boat.sql @@ -0,0 +1,5 @@ +USE `es_extended`; + +INSERT INTO `licenses` (`type`, `label`) VALUES + ('boat', 'Licencia de Barcos') +; From 1d1670e5d90f9f8d30dd43141830300c276e3b49 Mon Sep 17 00:00:00 2001 From: Yulian Ivanov <67766145+BrakingESX247@users.noreply.github.com> Date: Sun, 19 Jul 2020 12:26:21 +0100 Subject: [PATCH 35/35] Fixed spacing. --- fxmanifest.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fxmanifest.lua b/fxmanifest.lua index b36a38d9..8e613ee4 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -13,7 +13,7 @@ server_scripts { 'locales/fr.lua', 'locales/sv.lua', 'locales/pl.lua', - 'locales/es.lua', + 'locales/es.lua', 'config.lua', 'server/main.lua' } @@ -24,7 +24,7 @@ client_scripts { 'locales/fr.lua', 'locales/sv.lua', 'locales/pl.lua', - 'locales/es.lua', + 'locales/es.lua', 'config.lua', 'client/main.lua', 'client/marker.lua' @@ -33,4 +33,4 @@ client_scripts { dependencies { 'es_extended', 'esx_vehicleshop' -} \ No newline at end of file +}