From f5040541305b8213561449455857edbe99054eb2 Mon Sep 17 00:00:00 2001 From: renaiku Date: Thu, 17 Aug 2017 07:50:12 +0200 Subject: [PATCH 01/55] Initial commit --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 1 + 2 files changed, 675 insertions(+) create mode 100644 LICENSE create mode 100644 README.md diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..9cecc1d4 --- /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. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README.md b/README.md new file mode 100644 index 00000000..e16e7cbb --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# fxserver-esx_lscustom \ No newline at end of file From 6d69f2182eb3065ab3792265e1d31fbe6eee6602 Mon Sep 17 00:00:00 2001 From: renaiku Date: Thu, 17 Aug 2017 08:21:01 +0200 Subject: [PATCH 02/55] Add files --- README.md | 6 +- __resource.lua | 8 + client/main.lua | 338 +++++++++++++++++++++++ config.lua | 696 ++++++++++++++++++++++++++++++++++++++++++++++++ server/main.lua | 17 ++ 5 files changed, 1064 insertions(+), 1 deletion(-) create mode 100644 __resource.lua create mode 100644 client/main.lua create mode 100644 config.lua create mode 100644 server/main.lua diff --git a/README.md b/README.md index e16e7cbb..46bec25c 100644 --- a/README.md +++ b/README.md @@ -1 +1,5 @@ -# fxserver-esx_lscustom \ No newline at end of file +# fxserver-esx_lscustom + +[DESCRIPTION] + +The best LS Custom out there for FX. \ No newline at end of file diff --git a/__resource.lua b/__resource.lua new file mode 100644 index 00000000..1baf6c0a --- /dev/null +++ b/__resource.lua @@ -0,0 +1,8 @@ +server_scripts { + 'server/main.lua' +} + +client_scripts { + 'config.lua', + 'client/main.lua' +} \ No newline at end of file diff --git a/client/main.lua b/client/main.lua new file mode 100644 index 00000000..423eb5b4 --- /dev/null +++ b/client/main.lua @@ -0,0 +1,338 @@ +ESX = nil + +Citizen.CreateThread(function() + while ESX == nil do + TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + Citizen.Wait(0) + end +end) + +local lsMenuIsShowed = false +local isInLSMarker = false +local myCar = {} + +RegisterNetEvent('esx_lscustom:installMod') +AddEventHandler('esx_lscustom:installMod', function() + local vehicle = GetVehiclePedIsIn(GetPlayerPed(-1), false) + myCar = ESX.Game.GetVehicleProperties(vehicle) +end) + +RegisterNetEvent('esx_lscustom:cancelInstallMod') +AddEventHandler('esx_lscustom:cancelInstallMod', function() + local vehicle = GetVehiclePedIsIn(GetPlayerPed(-1), false) + ESX.Game.SetVehicleProperties(vehicle, myCar) +end) + +function OpenLSMenu(elems, menuname, menutitle, parent) + + ESX.UI.Menu.Open( + 'default', GetCurrentResourceName(), menuname, + { + title = menutitle, + align = 'top-left', + elements = elems + }, + function(data, menu) -- on validate + local isRimMod = false + if data.current.modType == "modFrontWheels" then + isRimMod = true + end + local found = false + for k,v in pairs(Config.Menus) do + if k == data.current.modType or isRimMod then + if data.current.label == "Par défaut" or string.match(data.current.label, "Installé") then + ESX.ShowNotification("Vous possédez déjà: ~b~" .. data.current.label) + else + if isRimMod then + TriggerServerEvent("esx_lscustom:buyMod", data.current.price) + else + TriggerServerEvent("esx_lscustom:buyMod", v.price) + end + end + menu.close() + found = true + break + end + end + if not found then + GetAction(data.current) + end + end, + function(data, menu) -- on cancel + menu.close() + TriggerEvent('esx_lscustom:cancelInstallMod') + if parent == nil then + lsMenuIsShowed = false + local vehicle = GetVehiclePedIsIn(GetPlayerPed(-1), false) + FreezeEntityPosition(vehicle, false) + myCar = nil + end + end, + function(data, menu) -- on change + UpdateMods(data.current) + end + ) +end + +function UpdateMods(data) + if data.modType ~= nil then + local vehicle = GetVehiclePedIsIn(GetPlayerPed(-1), false) + local props = {} + + --Citizen.Trace('modType: ' .. data.modType) + --Citizen.Trace('modNum: ' .. json.encode(data.modNum)) + + if data.wheelType ~= nil then + props['wheels'] = data.wheelType + ESX.Game.SetVehicleProperties(vehicle, props) + props = {} + elseif data.modType == 'neonColor' then + props['neonEnabled'] = {true, true, true, true} + ESX.Game.SetVehicleProperties(vehicle, props) + props = {} + elseif data.modType == 'tyreSmokeColor' then + props['modSmokeEnabled'] = true + ESX.Game.SetVehicleProperties(vehicle, props) + props = {} + end + props[data.modType] = data.modNum + ESX.Game.SetVehicleProperties(vehicle, props) + end +end + +function GetAction(data) + local elements = {} + local menuname = '' + local menutitle = '' + local parent = nil + + local playerPed = GetPlayerPed(-1) + local vehicle = GetVehiclePedIsIn(playerPed, false) + local currentMods = ESX.Game.GetVehicleProperties(vehicle) + + for k,v in pairs(Config + .Menus) do + + if data.value == k then + + menuname = k + menutitle = v.label + parent = v.parent + + if v.modType ~= nil then + + if v.modType == 22 then + table.insert(elements, {label = " Par défaut", modType = k, modNum = false}) + else + table.insert(elements, {label = " Par défaut", modType = k, modNum = -1}) + end + + if v.modType == 14 then -- HORNS + for j = 0, 51, 1 do + local _label = '' + if j == currentMods.modHorns then + _label = GetHornName(j) .. ' - Installé' + else + _label = GetHornName(j) .. ' - $' .. v.price .. ' ' + end + table.insert(elements, {label = _label, modType = k, modNum = j}) + end + elseif v.modType == 'plateIndex' then -- PLATES + for j = 0, 4, 1 do + local _label = '' + if j == currentMods.plateIndex then + _label = GetPlatesName(j) .. ' - Installé' + else + _label = GetPlatesName(j) .. ' - $' .. v.price .. ' ' + end + table.insert(elements, {label = _label, modType = k, modNum = j}) + end + elseif v.modType == 22 then -- XENON + local _label = '' + if currentMods.modXenon then + _label = 'Xénon - Installé' + else + _label = 'Xénon - $' .. v.price .. ' ' + end + table.insert(elements, {label = _label, modType = k, modNum = true}) + elseif v.modType == 'neonColor' or v.modType == 'tyreSmokeColor' then -- NEON & SMOKE COLOR + local neons = GetNeons() + for i=1, #neons, 1 do + table.insert(elements, + { + label = '' .. neons[i].label .. ' ', + modType = k, + modNum = { neons[i].r, neons[i].g, neons[i].b } + } + ) + end + elseif v.modType == 'color1' or v.modType == 'color2' or v.modType == 'pearlescentColor' or v.modType == 'wheelColor' then -- RESPRAYS + local colors = GetColors(data.color) + for j = 1, #colors, 1 do + local _label = '' + _label = colors[j].label .. ' - $' .. v.price .. ' ' + table.insert(elements, {label = _label, modType = k, modNum = colors[j].index}) + end + elseif v.modType == 'windowTint' then -- WINDOWS TINT + for j = 1, 5, 1 do + local _label = '' + if j == currentMods.modHorns then + _label = GetWindowName(j) .. ' - Installé' + else + _label = GetWindowName(j) .. ' - $' .. v.price .. ' ' + end + table.insert(elements, {label = _label, modType = k, modNum = j}) + end + elseif v.modType == 23 then -- WHEELS RIM & TYPE + local props = {} + + props['wheels'] = v.wheelType + ESX.Game.SetVehicleProperties(vehicle, props) + + local modCount = GetNumVehicleMods(vehicle, v.modType) + for j = 0, modCount, 1 do + local modName = GetModTextLabel(vehicle, v.modType, j) + if modName ~= nil then + local _label = '' + if j == currentMods.modFrontWheels then + _label = GetLabelText(modName) .. ' - Installé' + else + _label = GetLabelText(modName) .. ' - $' .. v.price .. ' ' + end + table.insert(elements, {label = _label, modType = 'modFrontWheels', modNum = j, wheelType = v.wheelType, price = v.price}) + end + end + elseif v.modType == 11 or v.modType == 12 or v.modType == 13 or v.modType == 15 or v.modType == 16 or v.modType == 18 then + local modCount = GetNumVehicleMods(vehicle, v.modType) -- UPGRADES + for j = 0, modCount-1, 1 do + local _label = '' + if j == currentMods[k] then + _label = 'Niveau ' .. j .. ' - Installé' + else + _label = 'Niveau ' .. j .. ' - $' .. v.price .. ' ' + end + table.insert(elements, {label = _label, modType = k, modNum = j}) + end + else + local modCount = GetNumVehicleMods(vehicle, v.modType) -- BODYPARTS + for j = 0, modCount, 1 do + local modName = GetModTextLabel(vehicle, v.modType, j) + if modName ~= nil then + local _label = '' + if j == currentMods[k] then + _label = GetLabelText(modName) .. ' - Installé' + else + _label = GetLabelText(modName) .. ' - $' .. v.price .. ' ' + end + table.insert(elements, {label = _label, modType = k, modNum = j}) + end + end + end + else + if data.value == 'primaryRespray' or data.value == 'secondaryRespray' or data.value == 'pearlescentRespray' or data.value == 'modFrontWheelsColor' then + for i=1, #Config.Colors, 1 do + if data.value == 'primaryRespray' then + table.insert(elements, {label = Config.Colors[i].label, value = 'color1', color = Config.Colors[i].value}) + elseif data.value == 'secondaryRespray' then + table.insert(elements, {label = Config.Colors[i].label, value = 'color2', color = Config.Colors[i].value}) + elseif data.value == 'pearlescentRespray' then + table.insert(elements, {label = Config.Colors[i].label, value = 'pearlescentColor', color = Config.Colors[i].value}) + elseif data.value == 'modFrontWheelsColor' then + table.insert(elements, {label = Config.Colors[i].label, value = 'wheelColor', color = Config.Colors[i].value}) + end + end + else + for l,w in pairs(v) do + if l ~= 'label' and l ~= 'parent' then + table.insert(elements, {label = w, value = l}) + end + end + end + end + break + end + end + + table.sort(elements, function(a, b) + return a.label < b.label + end) + + OpenLSMenu(elements, menuname, menutitle, parent) +end + +-- Blips +Citizen.CreateThread(function() + for k,v in pairs(Config.Zones)do + local blip = AddBlipForCoord(v.Pos.x, v.Pos.y, v.Pos.z) + SetBlipSprite(blip, 72) + SetBlipScale(blip, 0.8) + SetBlipAsShortRange(blip, true) + BeginTextCommandSetBlipName("STRING") + AddTextComponentString(v.Name) + EndTextCommandSetBlipName(blip) + end +end) + +-- Activate menu when player is inside marker +Citizen.CreateThread(function() + while true do + Wait(0) + local playerPed = GetPlayerPed(-1) + if IsPedInAnyVehicle(playerPed, false) then + local coords = GetEntityCoords(GetPlayerPed(-1)) + local currentZone = nil + local zone = nil + local lastZone = nil + + for k,v in pairs(Config.Zones) do + if(GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < v.Size.x) then + isInLSMarker = true + + SetTextComponentFormat("STRING") + AddTextComponentString(v.Hint) + DisplayHelpTextFromStringLabel(0, 0, 1, -1) + + break + else + isInLSMarker = false + end + end + + if IsControlJustReleased(0, 38) and not lsMenuIsShowed and isInLSMarker then + lsMenuIsShowed = true + + local vehicle = GetVehiclePedIsIn(playerPed, false) + + --SetVehicleUndriveable(vehicle, true) + FreezeEntityPosition(vehicle, true) + + myCar = ESX.Game.GetVehicleProperties(vehicle) + + ESX.UI.Menu.CloseAll() + GetAction({value = 'main'}) + end + + if isInLSMarker and not hasAlreadyEnteredMarker then + hasAlreadyEnteredMarker = true + end + + if not isInLSMarker and hasAlreadyEnteredMarker then + hasAlreadyEnteredMarker = false + --lsMenuIsShowed = false + --ESX.UI.Menu.CloseAll() + end + + end + end +end) + +--char GET_MOD_SLOT_NAME(Vehicle vehicle, int modType) + +--int GET_NUM_VEHICLE_MODS(Vehicle vehicle, int modType) + +--char *GET_MOD_TEXT_LABEL(Vehicle vehicle, int modType, int modValue) + + --_GET_LABEL_TEXT to get the part name in the games language + +--local Veh = GetVehiclePedIsIn(GetPlayerPed(-1), true) +--local VehType = GetLabelText(GetDisplayNameFromVehicleModel(GetEntityModel(Veh))) \ No newline at end of file diff --git a/config.lua b/config.lua new file mode 100644 index 00000000..2866bc18 --- /dev/null +++ b/config.lua @@ -0,0 +1,696 @@ +Config = {} +Config.DrawDistance = 100.0 + +Config.Zones = { + ls1 = { + Pos = { x = -362.7962, y = -132.4005, z = 38.25239}, + Size = {x = 3.0, y = 3.0, z = 0.2}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Name = "LS CUSTOM", + Hint = "Appuyez sur ~INPUT_PICKUP~ pour personnaliser le véhicule." + } +} + +Config.Colors = { + { label = 'Noir', value = 'black'}, + { label = 'Blanc', value = 'white'}, + { label = 'Gris', value = 'grey'}, + { label = 'Rouge', value = 'red'}, + { label = 'Rose', value = 'pink'}, + { label = 'Bleu', value = 'blue'}, + { label = 'Jaune', value = 'yellow'}, + { label = 'Vert', value = 'green'}, + { label = 'Orange', value = 'orange'}, + { label = 'Marron', value = 'brown'}, + { label = 'Violet', value = 'purple'}, + { label = 'Chrome', value = 'chrome'}, + { label = 'Or', value = 'gold'}, +} + +function GetColors(color) + local colors = {} + if color == 'black' then + colors = { + { index = 0, label = 'Noir'}, + { index = 1, label = 'Graphite'}, + { index = 2, label = 'Noir Métallisé'}, + { index = 3, label = 'Acier Fondu'}, + { index = 11, label = 'Noir Anthracite'}, + { index = 12, label = 'Noir Mat'}, + { index = 15, label = 'Nuit Sombre'}, + { index = 16, label = 'Noir Profond'}, + { index = 21, label = 'Pétrol'}, + { index = 147, label = 'Carbon'} + } + elseif color == 'white' then + colors = { + { index = 106, label = 'Vanille'}, + { index = 107, label = 'Crème'}, + { index = 111, label = 'Blanc'}, + { index = 112, label = 'Blanc Polair'}, + { index = 113, label = 'Beige'}, + { index = 121, label = 'Blanc Mat'}, + { index = 122, label = 'Neige'}, + { index = 131, label = 'Coton'}, + { index = 132, label = 'Albâtre'}, + { index = 134, label = 'Blanc Pure'} + } + elseif color == 'grey' then + colors = { + { index = 4, label = 'Argenté'}, + { index = 5, label = 'Gris Métallisé'}, + { index = 6, label = 'Acier Laminé'}, + { index = 7, label = 'Gris Foncé'}, + { index = 8, label = 'Gris Rocheux'}, + { index = 9, label = 'Gris Nuit'}, + { index = 10, label = 'Aluminium'}, + { index = 13, label = 'Gris Mat'}, + { index = 14, label = 'Gris Clair'}, + { index = 17, label = 'Gris Bitume'}, + { index = 18, label = 'Gris Béton'}, + { index = 19, label = 'Argent Sombre'}, + { index = 20, label = 'Magnésite'}, + { index = 22, label = 'Nickel'}, + { index = 23, label = 'Zinc'}, + { index = 24, label = 'Dolomite'}, + { index = 25, label = 'Argent Bleuté'}, + { index = 26, label = 'Titane'}, + { index = 66, label = 'Acier Bleui'}, + { index = 93, label = 'Champagne'}, + { index = 144, label = 'Gris Chasseur'}, + { index = 156, label = 'Gris'} + } + elseif color == 'red' then + colors = { + { index = 27, label = 'Rouge'}, + { index = 28, label = 'Rouge Turin'}, + { index = 29, label = 'Coquelicot'}, + { index = 30, label = 'Rouge Cuivré'}, + { index = 31, label = 'Rouge Cardinal'}, + { index = 32, label = 'Rouge Brique'}, + { index = 33, label = 'Grenat'}, + { index = 34, label = 'Pourpre'}, + { index = 35, label = 'Framboise'}, + { index = 39, label = 'Rouge Mat'}, + { index = 40, label = 'Rouge Foncé'}, + { index = 43, label = 'Rouge Pulpeux'}, + { index = 44, label = 'Rouge Brillant'}, + { index = 46, label = 'Rouge Pale'}, + { index = 143, label = 'Rouge Vin'}, + { index = 150, label = 'Volcano'} + } + elseif color == 'pink' then + colors = { + { index = 135, label = 'Rose Electrique'}, + { index = 136, label = 'Rose Saumon'}, + { index = 137, label = 'Rose Dragée'} + } + elseif color == 'blue' then + colors = { + { index = 54, label = 'Topaze'}, + { index = 60, label = 'Bleu Clair'}, + { index = 61, label = 'Bleu Galaxy'}, + { index = 62, label = 'Bleu Foncé'}, + { index = 63, label = 'Bleu Azur'}, + { index = 64, label = 'Bleu Marine'}, + { index = 65, label = 'Lapis Lazuli'}, + { index = 67, label = 'Bleu Diamant'}, + { index = 68, label = 'Surfer'}, + { index = 69, label = 'Pastel'}, + { index = 70, label = 'Bleu Celeste'}, + { index = 73, label = 'Bleu Rally'}, + { index = 74, label = 'Bleu Paradis'}, + { index = 75, label = 'Bleu Nuit'}, + { index = 77, label = 'Bleu Cyan'}, + { index = 78, label = 'Cobalt'}, + { index = 79, label = 'Bleu Electrique'}, + { index = 80, label = 'Bleu Horizon'}, + { index = 82, label = 'Bleu Métallisé'}, + { index = 83, label = 'Aigue Marine '}, + { index = 84, label = 'Bleu Agathe'}, + { index = 85, label = 'Zirconium'}, + { index = 86, label = 'Spinelle'}, + { index = 87, label = 'Tourmaline'}, + { index = 127, label = 'Paradis'}, + { index = 140, label = 'Bubble Gum'}, + { index = 141, label = 'Bleu Minuit'}, + { index = 146, label = 'Bleu Interdit'}, + { index = 157, label = 'Bleu Glacier'} + } + elseif color == 'yellow' then + colors = { + { index = 42, label = 'Jaune'}, + { index = 88, label = 'Jaune Blé'}, + { index = 89, label = 'Jaune Rally'}, + { index = 91, label = 'Jaune Clair'}, + { index = 126, label = 'Jaune Pale'} + } + elseif color == 'green' then + colors = { + { index = 49, label = 'Vert Foncé'}, + { index = 50, label = 'Vert Rally'}, + { index = 51, label = 'Vert Sapin'}, + { index = 52, label = 'Vert Olive'}, + { index = 53, label = 'Vert Clair'}, + { index = 55, label = 'Vert Lime'}, + { index = 56, label = 'Vert Forêt'}, + { index = 57, label = 'Vert Pelouse'}, + { index = 58, label = 'Vert Impérial'}, + { index = 59, label = 'Vert Bouteille'}, + { index = 92, label = 'Vert Citrus'}, + { index = 125, label = 'Vert Anis'}, + { index = 128, label = 'Kaki'}, + { index = 133, label = 'Vert Army'}, + { index = 151, label = 'Vert Sombre'}, + { index = 152, label = 'Vert Chasseur'}, + { index = 155, label = 'Amarylisse'} + } + elseif color == 'orange' then + colors = { + { index = 36, label = 'Tangerine'}, + { index = 38, label = 'Orange'}, + { index = 41, label = 'Orange Mat'}, + { index = 123, label = 'Orange Clair'}, + { index = 124, label = 'Pèche'}, + { index = 130, label = 'Citrouille'}, + { index = 138, label = 'Orange Lambo'} + } + elseif color == 'brown' then + colors = { + { index = 45, label = 'Cuivre'}, + { index = 47, label = 'Marron clair'}, + { index = 48, label = 'Marron Foncé'}, + { index = 90, label = 'Bronze'}, + { index = 94, label = 'Marron Métallisé'}, + { index = 95, label = 'Expresso'}, + { index = 96, label = 'Chocolat'}, + { index = 97, label = 'Terre Cuite'}, + { index = 98, label = 'Marbre'}, + { index = 99, label = 'Sable'}, + { index = 100, label = 'Sépia'}, + { index = 101, label = 'Bison'}, + { index = 102, label = 'Palmier'}, + { index = 103, label = 'Caramel'}, + { index = 104, label = 'Rouille'}, + { index = 105, label = 'Chataigne'}, + { index = 108, label = 'Brun'}, + { index = 109, label = 'Noisette'}, + { index = 110, label = 'Coquillage'}, + { index = 114, label = 'Acajou'}, + { index = 115, label = 'Chaudron'}, + { index = 116, label = 'Blond'}, + { index = 129, label = 'Gravillon'}, + { index = 153, label = 'Terre Foncé'}, + { index = 154, label = 'Désert'} + } + elseif color == 'purple' then + colors = { + { index = 71, label = 'Indigo'}, + { index = 72, label = 'Violet Profond'}, + { index = 76, label = 'Violet Foncé'}, + { index = 81, label = 'Améthyste'}, + { index = 142, label = 'Violet Mystique'}, + { index = 145, label = 'Violet Métallisé'}, + { index = 148, label = 'Vilot Mat'}, + { index = 149, label = 'Violet Profond Mat'} + } + elseif color == 'chrome' then + colors = { + { index = 117, label = 'Chrome Brossé'}, + { index = 118, label = 'Chrome Noir'}, + { index = 119, label = 'Aluminum Brossé'}, + { index = 120, label = 'Chrome'} + } + elseif color == 'gold' then + colors = { + { index = 37, label = 'Or'}, + { index = 158, label = 'Or Pure'}, + { index = 159, label = 'Or Brossé'}, + { index = 160, label = 'Or Clair'} + } + end + return colors +end + +function GetWindowName(index) + if (index == 1) then + return "Pure Black" + elseif (index == 2) then + return "Darksmoke" + elseif (index == 3) then + return "Lightsmoke" + elseif (index == 4) then + return "Limo" + elseif (index == 5) then + return "Green" + else + return "Unknown" + end +end + +function GetHornName(index) + if (index == 0) then + return "Truck Horn" + elseif (index == 1) then + return "Cop Horn" + elseif (index == 2) then + return "Clown Horn" + elseif (index == 3) then + return "Musical Horn 1" + elseif (index == 4) then + return "Musical Horn 2" + elseif (index == 5) then + return "Musical Horn 3" + elseif (index == 6) then + return "Musical Horn 4" + elseif (index == 7) then + return "Musical Horn 5" + elseif (index == 8) then + return "Sad Trombone" + elseif (index == 9) then + return "Classical Horn 1" + elseif (index == 10) then + return "Classical Horn 2" + elseif (index == 11) then + return "Classical Horn 3" + elseif (index == 12) then + return "Classical Horn 4" + elseif (index == 13) then + return "Classical Horn 5" + elseif (index == 14) then + return "Classical Horn 6" + elseif (index == 15) then + return "Classical Horn 7" + elseif (index == 16) then + return "Scale - Do" + elseif (index == 17) then + return "Scale - Re" + elseif (index == 18) then + return "Scale - Mi" + elseif (index == 19) then + return "Scale - Fa" + elseif (index == 20) then + return "Scale - Sol" + elseif (index == 21) then + return "Scale - La" + elseif (index == 22) then + return "Scale - Ti" + elseif (index == 23) then + return "Scale - Do" + elseif (index == 24) then + return "Jazz Horn 1" + elseif (index == 25) then + return "Jazz Horn 2" + elseif (index == 26) then + return "Jazz Horn 3" + elseif (index == 27) then + return "Jazz Horn Loop" + elseif (index == 28) then + return "Star Spangled Banner 1" + elseif (index == 29) then + return "Star Spangled Banner 2" + elseif (index == 30) then + return "Star Spangled Banner 3" + elseif (index == 31) then + return "Star Spangled Banner 4" + elseif (index == 32) then + return "Classical Horn 8 Loop" + elseif (index == 33) then + return "Classical Horn 9 Loop" + elseif (index == 34) then + return "Classical Horn 10 Loop" + elseif (index == 35) then + return "Classical Horn 8" + elseif (index == 36) then + return "Classical Horn 9" + elseif (index == 37) then + return "Classical Horn 10" + elseif (index == 38) then + return "Funeral Loop" + elseif (index == 39) then + return "Funeral" + elseif (index == 40) then + return "Spooky Loop" + elseif (index == 41) then + return "Spooky" + elseif (index == 42) then + return "San Andreas Loop" + elseif (index == 43) then + return "San Andreas" + elseif (index == 44) then + return "Liberty City Loop" + elseif (index == 45) then + return "Liberty City" + elseif (index == 46) then + return "Festive 1 Loop" + elseif (index == 47) then + return "Festive 1" + elseif (index == 48) then + return "Festive 2 Loop" + elseif (index == 49) then + return "Festive 2" + elseif (index == 50) then + return "Festive 3 Loop" + elseif (index == 51) then + return "Festive 3" + else + return "Unknown Horn" + end +end + +function GetNeons() + local neons = { + { label = "white", r = 255, g = 255, b = 255}, + { label = "slate_gray", r = 112, g = 128, b = 144}, + { label = "blue", r = 0, g = 0, b = 255}, + { label = "light_blue", r = 0, g = 150, b = 255}, + { label = "navy_blue", r = 0, g = 0, b = 128}, + { label = "sky_blue", r = 135, g = 206, b = 235}, + { label = "turquoise", r = 0, g = 245, b = 255}, + { label = "mint_green", r = 50, g = 255, b = 155}, + { label = "lime_green", r = 0, g = 255, b = 0}, + { label = "olive", r = 128, g = 128, b = 0}, + { label = "yellow", r = 255, g = 255, b = 0}, + { label = "gold", r = 255, g = 215, b = 0}, + { label = "orange", r = 255, g = 165, b = 0}, + { label = "wheat", r = 245, g = 222, b = 179}, + { label = "red", r = 255, g = 0, b = 0}, + { label = "pink", r = 255, g = 161, b = 211}, + { label = "bright_pink", r = 255, g = 0, b = 255}, + { label = "purple", r = 153, g = 0, b = 153}, + { label = "ivory", r = 41, g = 36, b = 33} + } + return neons +end + +function GetPlatesName(index) + if (index == 0) then + return "Bleu sur fond Blanc 1" + elseif (index == 1) then + return "Jaune sur fond Noir" + elseif (index == 2) then + return "Jaune sur fond Bleu" + elseif (index == 3) then + return "Bleu sur fond Blanc 2" + elseif (index == 4) then + return "Bleu sur fond Blanc 3" + end +end + +Config.Menus = { + main = { + label = 'LS CUSTOM', + parent = nil, + upgrades = 'Upgrades', + cosmetics = 'Cosmétiques' + }, + upgrades = { + label = 'Upgrades', + parent = 'main', + modEngine = "Moteur", + modBrakes = "Freins", + modTransmission = "Transmission", + modSuspension = "Suspension", + modArmor = "Armure", + modTurbo = "Turbo" + }, + modEngine = { + label = 'Moteur', + parent = 'modEngine', + modType = 11, + price = 500 + }, + modBrakes = { + label = 'Freins', + parent = 'modBrakes', + modType = 12, + price = 500 + }, + modTransmission = { + label = 'Transmission', + parent = 'modTransmission', + modType = 13, + price = 500 + }, + modSuspension = { + label = 'Suspension', + parent = 'modSuspension', + modType = 15, + price = 500 + }, + modArmor = { + label = 'Armure', + parent = 'modArmor', + modType = 16, + price = 500 + }, + modTurbo = { + label = 'Turbo', + parent = 'modTurbo', + modType = 18, + price = 500 + }, + cosmetics = { + label = 'Cosmétiques', + parent = 'main', + bodyparts = 'Carosserie', -- + windowTint = 'Fenêtres', -- + modHorns = 'Klaxon', -- + neonColor = "Néons", -- + resprays = 'Peinture', -- + modXenon = 'Phares', -- + plateIndex = 'Plaque', -- + wheels = 'Roues' -- + }, + wheels = { + label = 'Roues', + parent = 'cosmetics', + modFrontWheelsTypes = "Types de Jantes", + modFrontWheelsColor = "Couleurs jantes", + tyreSmokeColor = "Fumée des pneus" + }, + modFrontWheelsTypes = { + label = 'Types de Jantes', + parent = 'wheels', + modFrontWheelsType0 = 'Jantes Sport', + modFrontWheelsType1 = 'Jantes Muscle', + modFrontWheelsType2 = 'Jantes Lowrider', + modFrontWheelsType3 = 'Jantes SUV', + modFrontWheelsType4 = 'Jantes Tout-terrain', + modFrontWheelsType5 = 'Jantes Tuning', + modFrontWheelsType6 = 'Jantes Moto', + modFrontWheelsType7 = 'Jantes Haut de gamme' + }, + modFrontWheelsType0 = { + label = 'Jantes Sport', + parent = 'modFrontWheelsTypes', + modType = 23, + wheelType = 0, + price = 500 + }, + modFrontWheelsType1 = { + label = 'Jantes Muscle', + parent = 'modFrontWheelsTypes', + modType = 23, + wheelType = 1, + price = 500 + }, + modFrontWheelsType2 = { + label = 'Jantes Lowrider', + parent = 'modFrontWheelsTypes', + modType = 23, + wheelType = 2, + price = 500 + }, + modFrontWheelsType3 = { + label = 'Jantes SUV', + parent = 'modFrontWheelsTypes', + modType = 23, + wheelType = 3, + price = 500 + }, + modFrontWheelsType4 = { + label = 'Jantes Tout-terrain', + parent = 'modFrontWheelsTypes', + modType = 23, + wheelType = 4, + price = 500 + }, + modFrontWheelsType5 = { + label = 'Jantes Tuning', + parent = 'modFrontWheelsTypes', + modType = 23, + wheelType = 5, + price = 500 + }, + modFrontWheelsType6 = { + label = 'Jantes Moto', + parent = 'modFrontWheelsTypes', + modType = 23, + wheelType = 6, + price = 500 + }, + modFrontWheelsType7 = { + label = 'Jantes Haut de gamme', + parent = 'modFrontWheelsTypes', + modType = 23, + wheelType = 7, + price = 500 + }, + modFrontWheelsColor = { + label = 'Peinture Jantes', + parent = 'wheels' + }, + wheelColor = { + label = 'Peinture Jantes', + parent = 'modFrontWheelsColor', + modType = 'wheelColor', + price = 500 + }, + plateIndex = { + label = 'Plaque', + parent = 'cosmetics', + modType = 'plateIndex', + price = 500 + }, + resprays = { + label = 'Peinture', + parent = 'cosmetics', + primaryRespray = 'Primaire', + secondaryRespray = 'Secondaire', + pearlescentRespray = 'Nacré', + }, + primaryRespray = { + label = 'Primaire', + parent = 'resprays', + }, + secondaryRespray = { + label = 'Secondaire', + parent = 'resprays', + }, + pearlescentRespray = { + label = 'Nacré', + parent = 'resprays', + }, + color1 = { + label = 'Primaire', + parent = 'primaryRespray', + modType = 'color1', + price = 500 + }, + color2 = { + label = 'Secondaire', + parent = 'secondaryRespray', + modType = 'color2', + price = 500 + }, + pearlescentColor = { + label = 'Nacré', + parent = 'pearlescentRespray', + modType = 'pearlescentColor', + price = 500 + }, + modXenon = { + label = 'Phares', + parent = 'cosmetics', + modType = 22, + price = 500 + }, + bodyparts = { + label = 'Carosserie', + parent = 'cosmetics', + modFender = 'Aile gauche', + modRightFender = 'Aile droite', + modSpoilers = 'Aileron', + modSideSkirt = 'Bas de caisse', + modFrame = 'Cage', + modHood = 'Capot', + modGrille = 'Grille', + modRearBumper = 'Pare-choc arrière', + modFrontBumper = 'Pare-choc avant', + modExhaust = 'Pot d\'échappement', + modRoof = 'Toit' + }, + modSpoilers = { + label = 'Aileron', + parent = 'bodyparts', + modType = 0, + price = 500 + }, + modFrontBumper = { + label = 'Pare-choc avant', + modType = 1, + price = 500 + }, + modRearBumper = { + label = 'Pare-choc arrière', + modType = 2, + price = 500 + }, + modSideSkirt = { + label = 'Bas de caisse', + modType = 3, + price = 500 + }, + modExhaust = { + label = 'Pot d\'échappement', + modType = 4, + price = 500 + }, + modFrame = { + label = 'Cage', + modType = 5, + price = 500 + }, + modGrille = { + label = 'Grille', + modType = 6, + price = 500 + }, + modHood = { + label = 'Capot', + modType = 7, + price = 500 + }, + modFender = { + label = 'Aile gauche', + modType = 8, + price = 500 + }, + modRightFender = { + label = 'Aile droite', + modType = 9, + price = 500 + }, + modRoof = { + label = 'Toit', + modType = 10, + price = 500 + }, + windowTint = { + label = 'Fenêtres', + parent = 'cosmetics', + modType = 'windowTint', + price = 500 + }, + modHorns = { + label = 'Klaxon', + parent = 'cosmetics', + modType = 14, + price = 500 + }, + neonColor = { + label = 'Néons', + parent = 'cosmetics', + modType = 'neonColor', + price = 500 + }, + tyreSmokeColor = { + label = 'Fumée des pneus', + parent = 'wheels', + modType = 'tyreSmokeColor', + price = 500 + } + +} \ No newline at end of file diff --git a/server/main.lua b/server/main.lua new file mode 100644 index 00000000..991c4ed9 --- /dev/null +++ b/server/main.lua @@ -0,0 +1,17 @@ +ESX = nil +TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + +RegisterServerEvent('esx_lscustom:buyMod') +AddEventHandler('esx_lscustom:buyMod', function(price) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) + price = tonumber(price) + if price > xPlayer.getMoney() then + TriggerClientEvent('esx_lscustom:cancelInstallMod', _source) + TriggerClientEvent('esx:showNotification', _source, "Vous n'avez pas assez d'argent !") + else + xPlayer.removeMoney(price) + TriggerClientEvent('esx_lscustom:installMod', _source) + TriggerClientEvent('esx:showNotification', _source, "Achat effectué !") + end +end) From 2163d0c8d9155d493c7d717de2cade00eaf07739 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Tue, 22 Aug 2017 00:46:41 -0400 Subject: [PATCH 03/55] Multi-language support --- __resource.lua | 8 ++++++- client/main.lua | 36 ++++++++++++++--------------- config.lua | 61 +++++++++++++++++++++++++------------------------ locales/en.lua | 23 +++++++++++++++++++ locales/fr.lua | 23 +++++++++++++++++++ server/main.lua | 4 ++-- 6 files changed, 104 insertions(+), 51 deletions(-) create mode 100644 locales/en.lua create mode 100644 locales/fr.lua diff --git a/__resource.lua b/__resource.lua index 1baf6c0a..e46bb7eb 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,8 +1,14 @@ server_scripts { + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/fr.lua', 'server/main.lua' } client_scripts { + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/fr.lua', 'config.lua', 'client/main.lua' -} \ No newline at end of file +} diff --git a/client/main.lua b/client/main.lua index 423eb5b4..3938d12b 100644 --- a/client/main.lua +++ b/client/main.lua @@ -40,14 +40,14 @@ function OpenLSMenu(elems, menuname, menutitle, parent) local found = false for k,v in pairs(Config.Menus) do if k == data.current.modType or isRimMod then - if data.current.label == "Par défaut" or string.match(data.current.label, "Installé") then - ESX.ShowNotification("Vous possédez déjà: ~b~" .. data.current.label) + if data.current.label == _U('by_default') or string.match(data.current.label, _U('installed')) then + ESX.ShowNotification(_U('already_own') .. data.current.label) else if isRimMod then TriggerServerEvent("esx_lscustom:buyMod", data.current.price) else TriggerServerEvent("esx_lscustom:buyMod", v.price) - end + end end menu.close() found = true @@ -64,7 +64,7 @@ function OpenLSMenu(elems, menuname, menutitle, parent) if parent == nil then lsMenuIsShowed = false local vehicle = GetVehiclePedIsIn(GetPlayerPed(-1), false) - FreezeEntityPosition(vehicle, false) + FreezeEntityPosition(vehicle, false) myCar = nil end end, @@ -122,16 +122,16 @@ function GetAction(data) if v.modType ~= nil then if v.modType == 22 then - table.insert(elements, {label = " Par défaut", modType = k, modNum = false}) + table.insert(elements, {label = " " .. _U('by_default'), modType = k, modNum = false}) else - table.insert(elements, {label = " Par défaut", modType = k, modNum = -1}) + table.insert(elements, {label = " " .. _U('by_default'), modType = k, modNum = -1}) end if v.modType == 14 then -- HORNS for j = 0, 51, 1 do local _label = '' if j == currentMods.modHorns then - _label = GetHornName(j) .. ' - Installé' + _label = GetHornName(j) .. ' - '.. _U('installed') ..'' else _label = GetHornName(j) .. ' - $' .. v.price .. ' ' end @@ -141,7 +141,7 @@ function GetAction(data) for j = 0, 4, 1 do local _label = '' if j == currentMods.plateIndex then - _label = GetPlatesName(j) .. ' - Installé' + _label = GetPlatesName(j) .. ' - '.. _U('installed') ..'' else _label = GetPlatesName(j) .. ' - $' .. v.price .. ' ' end @@ -150,7 +150,7 @@ function GetAction(data) elseif v.modType == 22 then -- XENON local _label = '' if currentMods.modXenon then - _label = 'Xénon - Installé' + _label = 'Xénon - '.. _U('installed') ..'' else _label = 'Xénon - $' .. v.price .. ' ' end @@ -177,7 +177,7 @@ function GetAction(data) for j = 1, 5, 1 do local _label = '' if j == currentMods.modHorns then - _label = GetWindowName(j) .. ' - Installé' + _label = GetWindowName(j) .. ' - '.. _U('installed') ..'' else _label = GetWindowName(j) .. ' - $' .. v.price .. ' ' end @@ -195,7 +195,7 @@ function GetAction(data) if modName ~= nil then local _label = '' if j == currentMods.modFrontWheels then - _label = GetLabelText(modName) .. ' - Installé' + _label = GetLabelText(modName) .. ' - '.. _U('installed') ..'' else _label = GetLabelText(modName) .. ' - $' .. v.price .. ' ' end @@ -207,7 +207,7 @@ function GetAction(data) for j = 0, modCount-1, 1 do local _label = '' if j == currentMods[k] then - _label = 'Niveau ' .. j .. ' - Installé' + _label = 'Niveau ' .. j .. ' - '.. _U('installed') ..'' else _label = 'Niveau ' .. j .. ' - $' .. v.price .. ' ' end @@ -220,7 +220,7 @@ function GetAction(data) if modName ~= nil then local _label = '' if j == currentMods[k] then - _label = GetLabelText(modName) .. ' - Installé' + _label = GetLabelText(modName) .. ' - '.. _U('installed') ..'' else _label = GetLabelText(modName) .. ' - $' .. v.price .. ' ' end @@ -236,12 +236,12 @@ function GetAction(data) elseif data.value == 'secondaryRespray' then table.insert(elements, {label = Config.Colors[i].label, value = 'color2', color = Config.Colors[i].value}) elseif data.value == 'pearlescentRespray' then - table.insert(elements, {label = Config.Colors[i].label, value = 'pearlescentColor', color = Config.Colors[i].value}) + table.insert(elements, {label = Config.Colors[i].label, value = 'pearlescentColor', color = Config.Colors[i].value}) elseif data.value == 'modFrontWheelsColor' then table.insert(elements, {label = Config.Colors[i].label, value = 'wheelColor', color = Config.Colors[i].value}) end end - else + else for l,w in pairs(v) do if l ~= 'label' and l ~= 'parent' then table.insert(elements, {label = w, value = l}) @@ -298,12 +298,12 @@ Citizen.CreateThread(function() end end - if IsControlJustReleased(0, 38) and not lsMenuIsShowed and isInLSMarker then + if IsControlJustReleased(0, 38) and not lsMenuIsShowed and isInLSMarker then lsMenuIsShowed = true local vehicle = GetVehiclePedIsIn(playerPed, false) - --SetVehicleUndriveable(vehicle, true) + --SetVehicleUndriveable(vehicle, true) FreezeEntityPosition(vehicle, true) myCar = ESX.Game.GetVehicleProperties(vehicle) @@ -335,4 +335,4 @@ end) --_GET_LABEL_TEXT to get the part name in the games language --local Veh = GetVehiclePedIsIn(GetPlayerPed(-1), true) ---local VehType = GetLabelText(GetDisplayNameFromVehicleModel(GetEntityModel(Veh))) \ No newline at end of file +--local VehType = GetLabelText(GetDisplayNameFromVehicleModel(GetEntityModel(Veh))) diff --git a/config.lua b/config.lua index 2866bc18..d81cefa3 100644 --- a/config.lua +++ b/config.lua @@ -1,14 +1,15 @@ Config = {} Config.DrawDistance = 100.0 +Config.Locale = 'fr' -Config.Zones = { +Config.Zones = { ls1 = { Pos = { x = -362.7962, y = -132.4005, z = 38.25239}, Size = {x = 3.0, y = 3.0, z = 0.2}, Color = {r = 204, g = 204, b = 0}, Marker= 1, Name = "LS CUSTOM", - Hint = "Appuyez sur ~INPUT_PICKUP~ pour personnaliser le véhicule." + Hint = _U('press_custom') } } @@ -31,7 +32,7 @@ Config.Colors = { function GetColors(color) local colors = {} if color == 'black' then - colors = { + colors = { { index = 0, label = 'Noir'}, { index = 1, label = 'Graphite'}, { index = 2, label = 'Noir Métallisé'}, @@ -41,10 +42,10 @@ function GetColors(color) { index = 15, label = 'Nuit Sombre'}, { index = 16, label = 'Noir Profond'}, { index = 21, label = 'Pétrol'}, - { index = 147, label = 'Carbon'} + { index = 147, label = 'Carbon'} } elseif color == 'white' then - colors = { + colors = { { index = 106, label = 'Vanille'}, { index = 107, label = 'Crème'}, { index = 111, label = 'Blanc'}, @@ -54,10 +55,10 @@ function GetColors(color) { index = 122, label = 'Neige'}, { index = 131, label = 'Coton'}, { index = 132, label = 'Albâtre'}, - { index = 134, label = 'Blanc Pure'} + { index = 134, label = 'Blanc Pure'} } elseif color == 'grey' then - colors = { + colors = { { index = 4, label = 'Argenté'}, { index = 5, label = 'Gris Métallisé'}, { index = 6, label = 'Acier Laminé'}, @@ -79,10 +80,10 @@ function GetColors(color) { index = 66, label = 'Acier Bleui'}, { index = 93, label = 'Champagne'}, { index = 144, label = 'Gris Chasseur'}, - { index = 156, label = 'Gris'} - } + { index = 156, label = 'Gris'} + } elseif color == 'red' then - colors = { + colors = { { index = 27, label = 'Rouge'}, { index = 28, label = 'Rouge Turin'}, { index = 29, label = 'Coquelicot'}, @@ -98,16 +99,16 @@ function GetColors(color) { index = 44, label = 'Rouge Brillant'}, { index = 46, label = 'Rouge Pale'}, { index = 143, label = 'Rouge Vin'}, - { index = 150, label = 'Volcano'} + { index = 150, label = 'Volcano'} } elseif color == 'pink' then - colors = { + colors = { { index = 135, label = 'Rose Electrique'}, { index = 136, label = 'Rose Saumon'}, - { index = 137, label = 'Rose Dragée'} - } + { index = 137, label = 'Rose Dragée'} + } elseif color == 'blue' then - colors = { + colors = { { index = 54, label = 'Topaze'}, { index = 60, label = 'Bleu Clair'}, { index = 61, label = 'Bleu Galaxy'}, @@ -137,17 +138,17 @@ function GetColors(color) { index = 141, label = 'Bleu Minuit'}, { index = 146, label = 'Bleu Interdit'}, { index = 157, label = 'Bleu Glacier'} - } + } elseif color == 'yellow' then - colors = { + colors = { { index = 42, label = 'Jaune'}, { index = 88, label = 'Jaune Blé'}, { index = 89, label = 'Jaune Rally'}, { index = 91, label = 'Jaune Clair'}, - { index = 126, label = 'Jaune Pale'} - } + { index = 126, label = 'Jaune Pale'} + } elseif color == 'green' then - colors = { + colors = { { index = 49, label = 'Vert Foncé'}, { index = 50, label = 'Vert Rally'}, { index = 51, label = 'Vert Sapin'}, @@ -164,20 +165,20 @@ function GetColors(color) { index = 133, label = 'Vert Army'}, { index = 151, label = 'Vert Sombre'}, { index = 152, label = 'Vert Chasseur'}, - { index = 155, label = 'Amarylisse'} + { index = 155, label = 'Amarylisse'} } elseif color == 'orange' then - colors = { + colors = { { index = 36, label = 'Tangerine'}, { index = 38, label = 'Orange'}, { index = 41, label = 'Orange Mat'}, { index = 123, label = 'Orange Clair'}, { index = 124, label = 'Pèche'}, { index = 130, label = 'Citrouille'}, - { index = 138, label = 'Orange Lambo'} + { index = 138, label = 'Orange Lambo'} } elseif color == 'brown' then - colors = { + colors = { { index = 45, label = 'Cuivre'}, { index = 47, label = 'Marron clair'}, { index = 48, label = 'Marron Foncé'}, @@ -202,7 +203,7 @@ function GetColors(color) { index = 116, label = 'Blond'}, { index = 129, label = 'Gravillon'}, { index = 153, label = 'Terre Foncé'}, - { index = 154, label = 'Désert'} + { index = 154, label = 'Désert'} } elseif color == 'purple' then colors = { @@ -213,7 +214,7 @@ function GetColors(color) { index = 142, label = 'Violet Mystique'}, { index = 145, label = 'Violet Métallisé'}, { index = 148, label = 'Vilot Mat'}, - { index = 149, label = 'Violet Profond Mat'} + { index = 149, label = 'Violet Profond Mat'} } elseif color == 'chrome' then colors = { @@ -229,7 +230,7 @@ function GetColors(color) { index = 159, label = 'Or Brossé'}, { index = 160, label = 'Or Clair'} } - end + end return colors end @@ -361,7 +362,7 @@ end function GetNeons() local neons = { - { label = "white", r = 255, g = 255, b = 255}, + { label = "white", r = 255, g = 255, b = 255}, { label = "slate_gray", r = 112, g = 128, b = 144}, { label = "blue", r = 0, g = 0, b = 255}, { label = "light_blue", r = 0, g = 150, b = 255}, @@ -538,7 +539,7 @@ Config.Menus = { wheelType = 7, price = 500 }, - modFrontWheelsColor = { + modFrontWheelsColor = { label = 'Peinture Jantes', parent = 'wheels' }, @@ -693,4 +694,4 @@ Config.Menus = { price = 500 } -} \ No newline at end of file +} diff --git a/locales/en.lua b/locales/en.lua new file mode 100644 index 00000000..e69bd5e6 --- /dev/null +++ b/locales/en.lua @@ -0,0 +1,23 @@ +Locales['en'] = { + + ['by_default'] = 'by default', + ['installed'] = 'installed', + ['already_own'] = 'you already own: ~b~', + ['not_enough_money'] = 'you do not have enough money!', + ['purchased'] = 'purchased!', + ['press_custom'] = 'press ~INPUT_PICKUP~ to personalize your vehicle.', + ['black'] = 'black', + ['white'] = 'white', + ['grey'] = 'grey', + ['red'] = 'red', + ['pink'] = 'pink', + ['blue'] = 'blue', + ['yellow'] = 'yellow', + ['green'] = 'green', + ['orange'] = 'orange', + ['brown'] = 'brown', + ['purple'] = 'purple', + ['chrome'] = 'chrome', + ['gold'] = 'gold', + +} diff --git a/locales/fr.lua b/locales/fr.lua new file mode 100644 index 00000000..2617a8b8 --- /dev/null +++ b/locales/fr.lua @@ -0,0 +1,23 @@ +Locales['fr'] = { + + ['by_default'] = 'par défaut', + ['installed'] = 'installé', + ['already_own'] = 'vous possédez déjà: ~b~', + ['not_enough_money'] = 'vous n\'avez pas assez d\'argent !', + ['purchased'] = 'achat effectué !', + ['press_custom'] = 'appuyez sur ~INPUT_PICKUP~ pour personnaliser le véhicule.', + ['black'] = 'noir', + ['white'] = 'blanc', + ['grey'] = 'gris', + ['red'] = 'rouge', + ['pink'] = 'rose', + ['blue'] = 'bleu', + ['yellow'] = 'jaune', + ['green'] = 'vert', + ['orange'] = 'orange', + ['brown'] = 'marron', + ['purple'] = 'violet', + ['chrome'] = 'chrome', + ['gold'] = 'or', + +} diff --git a/server/main.lua b/server/main.lua index 991c4ed9..26ebe2a7 100644 --- a/server/main.lua +++ b/server/main.lua @@ -8,10 +8,10 @@ AddEventHandler('esx_lscustom:buyMod', function(price) price = tonumber(price) if price > xPlayer.getMoney() then TriggerClientEvent('esx_lscustom:cancelInstallMod', _source) - TriggerClientEvent('esx:showNotification', _source, "Vous n'avez pas assez d'argent !") + TriggerClientEvent('esx:showNotification', _source, _U('not_enough_money')) else xPlayer.removeMoney(price) TriggerClientEvent('esx_lscustom:installMod', _source) - TriggerClientEvent('esx:showNotification', _source, "Achat effectué !") + TriggerClientEvent('esx:showNotification', _source, _U('purchased')) end end) From ad7a2b5be9c9b067b3a12e16dfcba866f6ac1068 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Tue, 22 Aug 2017 00:54:22 -0400 Subject: [PATCH 04/55] Update language support Add color categories --- config.lua | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/config.lua b/config.lua index d81cefa3..83bfa301 100644 --- a/config.lua +++ b/config.lua @@ -14,19 +14,19 @@ Config.Zones = { } Config.Colors = { - { label = 'Noir', value = 'black'}, - { label = 'Blanc', value = 'white'}, - { label = 'Gris', value = 'grey'}, - { label = 'Rouge', value = 'red'}, - { label = 'Rose', value = 'pink'}, - { label = 'Bleu', value = 'blue'}, - { label = 'Jaune', value = 'yellow'}, - { label = 'Vert', value = 'green'}, - { label = 'Orange', value = 'orange'}, - { label = 'Marron', value = 'brown'}, - { label = 'Violet', value = 'purple'}, - { label = 'Chrome', value = 'chrome'}, - { label = 'Or', value = 'gold'}, + { label = _U('black'), value = 'black'}, + { label = _U('white'), value = 'white'}, + { label = _U('grey'), value = 'grey'}, + { label = _U('red'), value = 'red'}, + { label = _U('pink'), value = 'pink'}, + { label = _U('blue'), value = 'blue'}, + { label = _U('yellow'), value = 'yellow'}, + { label = _U('green'), value = 'green'}, + { label = _U('orange'), value = 'orange'}, + { label = _U('brown'), value = 'brown'}, + { label = _U('purple'), value = 'purple'}, + { label = _U('chrome'), value = 'chrome'}, + { label = _U('gold'), value = 'gold'}, } function GetColors(color) From 60c362fde02e0fe38cbc741e97bbff641eb0192e Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Tue, 22 Aug 2017 22:44:40 -0400 Subject: [PATCH 05/55] Update language support --- __resource.lua | 1 + config.lua | 372 ++++++++++++++++++++++++------------------------- locales/en.lua | 140 ++++++++++++++++++- locales/fr.lua | 137 ++++++++++++++++++ 4 files changed, 463 insertions(+), 187 deletions(-) diff --git a/__resource.lua b/__resource.lua index e46bb7eb..58616817 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,6 +2,7 @@ server_scripts { '@es_extended/locale.lua', 'locales/en.lua', 'locales/fr.lua', + 'config.lua', 'server/main.lua' } diff --git a/config.lua b/config.lua index 83bfa301..cab20ac1 100644 --- a/config.lua +++ b/config.lua @@ -33,29 +33,29 @@ function GetColors(color) local colors = {} if color == 'black' then colors = { - { index = 0, label = 'Noir'}, - { index = 1, label = 'Graphite'}, - { index = 2, label = 'Noir Métallisé'}, - { index = 3, label = 'Acier Fondu'}, - { index = 11, label = 'Noir Anthracite'}, - { index = 12, label = 'Noir Mat'}, - { index = 15, label = 'Nuit Sombre'}, - { index = 16, label = 'Noir Profond'}, - { index = 21, label = 'Pétrol'}, - { index = 147, label = 'Carbon'} + { index = 0, label = _U('black')}, + { index = 1, label = _U('graphite')}, + { index = 2, label = _U('black_metallic')}, + { index = 3, label = _U('caststeel')}, + { index = 11, label = _U('black_anth')}, + { index = 12, label = _U('matteblack')}, + { index = 15, label = _U('darknight')}, + { index = 16, label = _U('deepblack')}, + { index = 21, label = _U('oil')}, + { index = 147, label = _U('carbon')} } elseif color == 'white' then colors = { - { index = 106, label = 'Vanille'}, - { index = 107, label = 'Crème'}, - { index = 111, label = 'Blanc'}, - { index = 112, label = 'Blanc Polair'}, - { index = 113, label = 'Beige'}, - { index = 121, label = 'Blanc Mat'}, - { index = 122, label = 'Neige'}, - { index = 131, label = 'Coton'}, - { index = 132, label = 'Albâtre'}, - { index = 134, label = 'Blanc Pure'} + { index = 106, label = _U('vanilla')}, + { index = 107, label = _U('creme')}, + { index = 111, label = _U('white')}, + { index = 112, label = _U('polarwhite')}, + { index = 113, label = _U('beige')}, + { index = 121, label = _U('mattewhite')}, + { index = 122, label = _U('snow')}, + { index = 131, label = _U('cotton')}, + { index = 132, label = _U('alabaster')}, + { index = 134, label = _U('purewhite')} } elseif color == 'grey' then colors = { @@ -80,11 +80,11 @@ function GetColors(color) { index = 66, label = 'Acier Bleui'}, { index = 93, label = 'Champagne'}, { index = 144, label = 'Gris Chasseur'}, - { index = 156, label = 'Gris'} + { index = 156, label = _U('grey')} } elseif color == 'red' then colors = { - { index = 27, label = 'Rouge'}, + { index = 27, label = _U('red')}, { index = 28, label = 'Rouge Turin'}, { index = 29, label = 'Coquelicot'}, { index = 30, label = 'Rouge Cuivré'}, @@ -103,9 +103,9 @@ function GetColors(color) } elseif color == 'pink' then colors = { - { index = 135, label = 'Rose Electrique'}, - { index = 136, label = 'Rose Saumon'}, - { index = 137, label = 'Rose Dragée'} + { index = 135, label = _U('electricpink')}, + { index = 136, label = _U('salmon')}, + { index = 137, label = _U('sugarplum')} } elseif color == 'blue' then colors = { @@ -141,11 +141,11 @@ function GetColors(color) } elseif color == 'yellow' then colors = { - { index = 42, label = 'Jaune'}, - { index = 88, label = 'Jaune Blé'}, - { index = 89, label = 'Jaune Rally'}, - { index = 91, label = 'Jaune Clair'}, - { index = 126, label = 'Jaune Pale'} + { index = 42, label = _U('yellow')}, + { index = 88, label = _U('wheat')}, + { index = 89, label = _U('raceyellow')}, + { index = 91, label = _U('paleyellow')}, + { index = 126, label = _U('lightyellow')} } elseif color == 'green' then colors = { @@ -169,66 +169,66 @@ function GetColors(color) } elseif color == 'orange' then colors = { - { index = 36, label = 'Tangerine'}, - { index = 38, label = 'Orange'}, - { index = 41, label = 'Orange Mat'}, - { index = 123, label = 'Orange Clair'}, - { index = 124, label = 'Pèche'}, - { index = 130, label = 'Citrouille'}, - { index = 138, label = 'Orange Lambo'} + { index = 36, label = _U('tangerine')}, + { index = 38, label = _U('orange')}, + { index = 41, label = _U('matteorange')}, + { index = 123, label = _U('lightorange')}, + { index = 124, label = _U('peach')}, + { index = 130, label = _U('pumpkin')}, + { index = 138, label = _U('orangelambo')} } elseif color == 'brown' then colors = { - { index = 45, label = 'Cuivre'}, - { index = 47, label = 'Marron clair'}, - { index = 48, label = 'Marron Foncé'}, - { index = 90, label = 'Bronze'}, - { index = 94, label = 'Marron Métallisé'}, - { index = 95, label = 'Expresso'}, - { index = 96, label = 'Chocolat'}, - { index = 97, label = 'Terre Cuite'}, - { index = 98, label = 'Marbre'}, - { index = 99, label = 'Sable'}, - { index = 100, label = 'Sépia'}, - { index = 101, label = 'Bison'}, - { index = 102, label = 'Palmier'}, - { index = 103, label = 'Caramel'}, - { index = 104, label = 'Rouille'}, - { index = 105, label = 'Chataigne'}, - { index = 108, label = 'Brun'}, - { index = 109, label = 'Noisette'}, - { index = 110, label = 'Coquillage'}, - { index = 114, label = 'Acajou'}, - { index = 115, label = 'Chaudron'}, - { index = 116, label = 'Blond'}, - { index = 129, label = 'Gravillon'}, - { index = 153, label = 'Terre Foncé'}, - { index = 154, label = 'Désert'} + { index = 45, label = _U('copper')}, + { index = 47, label = _U('lightbrown')}, + { index = 48, label = _U('darkbrown')}, + { index = 90, label = _U('bronze')}, + { index = 94, label = _U('brownmetallic')}, + { index = 95, label = _U('Expresso')}, + { index = 96, label = _U('chocolate')}, + { index = 97, label = _U('terracotta')}, + { index = 98, label = _U('marble')}, + { index = 99, label = _U('sand')}, + { index = 100, label = _U('sepia')}, + { index = 101, label = _U('bison')}, + { index = 102, label = _U('palm')}, + { index = 103, label = _U('caramel')}, + { index = 104, label = _U('rust')}, + { index = 105, label = _U('chestnut')}, + { index = 108, label = _U('brown')}, + { index = 109, label = _U('hazelnut')}, + { index = 110, label = _U('shell')}, + { index = 114, label = _U('mahogany')}, + { index = 115, label = _U('cauldron')}, + { index = 116, label = _U('blond')}, + { index = 129, label = _U('gravel')}, + { index = 153, label = _U('darkearth')}, + { index = 154, label = _U('desert')} } elseif color == 'purple' then colors = { - { index = 71, label = 'Indigo'}, - { index = 72, label = 'Violet Profond'}, - { index = 76, label = 'Violet Foncé'}, - { index = 81, label = 'Améthyste'}, - { index = 142, label = 'Violet Mystique'}, - { index = 145, label = 'Violet Métallisé'}, - { index = 148, label = 'Vilot Mat'}, - { index = 149, label = 'Violet Profond Mat'} + { index = 71, label = _U('indigo')}, + { index = 72, label = _U('deeppurple')}, + { index = 76, label = _U('darkviolet')}, + { index = 81, label = _U('amethyst')}, + { index = 142, label = _U('mysticalviolet')}, + { index = 145, label = _U('purplemetallic')}, + { index = 148, label = _U('matteviolet')}, + { index = 149, label = _U('mattedeeppurple')} } elseif color == 'chrome' then colors = { - { index = 117, label = 'Chrome Brossé'}, - { index = 118, label = 'Chrome Noir'}, - { index = 119, label = 'Aluminum Brossé'}, - { index = 120, label = 'Chrome'} + { index = 117, label = _U('brushechrome')}, + { index = 118, label = _U('blackchrome')}, + { index = 119, label = _U('brushedaluminum')}, + { index = 120, label = _U('chrome')} } elseif color == 'gold' then colors = { - { index = 37, label = 'Or'}, - { index = 158, label = 'Or Pure'}, - { index = 159, label = 'Or Brossé'}, - { index = 160, label = 'Or Clair'} + { index = 37, label = _U('gold')}, + { index = 158, label = _U('puregold')}, + { index = 159, label = _U('brushedgold')}, + { index = 160, label = _U('lightgold')} } end return colors @@ -362,40 +362,40 @@ end function GetNeons() local neons = { - { label = "white", r = 255, g = 255, b = 255}, - { label = "slate_gray", r = 112, g = 128, b = 144}, - { label = "blue", r = 0, g = 0, b = 255}, - { label = "light_blue", r = 0, g = 150, b = 255}, - { label = "navy_blue", r = 0, g = 0, b = 128}, - { label = "sky_blue", r = 135, g = 206, b = 235}, - { label = "turquoise", r = 0, g = 245, b = 255}, - { label = "mint_green", r = 50, g = 255, b = 155}, - { label = "lime_green", r = 0, g = 255, b = 0}, - { label = "olive", r = 128, g = 128, b = 0}, - { label = "yellow", r = 255, g = 255, b = 0}, - { label = "gold", r = 255, g = 215, b = 0}, - { label = "orange", r = 255, g = 165, b = 0}, - { label = "wheat", r = 245, g = 222, b = 179}, - { label = "red", r = 255, g = 0, b = 0}, - { label = "pink", r = 255, g = 161, b = 211}, - { label = "bright_pink", r = 255, g = 0, b = 255}, - { label = "purple", r = 153, g = 0, b = 153}, - { label = "ivory", r = 41, g = 36, b = 33} + { label = _U('white'), r = 255, g = 255, b = 255}, + { label = "Slate Gray", r = 112, g = 128, b = 144}, + { label = "Blue", r = 0, g = 0, b = 255}, + { label = "Light Blue", r = 0, g = 150, b = 255}, + { label = "Navy Blue", r = 0, g = 0, b = 128}, + { label = "Sky Blue", r = 135, g = 206, b = 235}, + { label = "Turquoise", r = 0, g = 245, b = 255}, + { label = "Mint Green", r = 50, g = 255, b = 155}, + { label = "Lime Green", r = 0, g = 255, b = 0}, + { label = "Olive", r = 128, g = 128, b = 0}, + { label = _U('yellow'), r = 255, g = 255, b = 0}, + { label = _U('gold'), r = 255, g = 215, b = 0}, + { label = _U('orange'), r = 255, g = 165, b = 0}, + { label = _U('wheat'), r = 245, g = 222, b = 179}, + { label = _U('red'), r = 255, g = 0, b = 0}, + { label = _U('pink'), r = 255, g = 161, b = 211}, + { label = _U('brightpink'), r = 255, g = 0, b = 255}, + { label = _U('purple'), r = 153, g = 0, b = 153}, + { label = "Ivory", r = 41, g = 36, b = 33} } return neons end function GetPlatesName(index) if (index == 0) then - return "Bleu sur fond Blanc 1" + return _U('blue_on_white_1') elseif (index == 1) then - return "Jaune sur fond Noir" + return _U('yellow_on_black') elseif (index == 2) then - return "Jaune sur fond Bleu" + return _U('yellow_blue') elseif (index == 3) then - return "Bleu sur fond Blanc 2" + return _U('blue_on_white_2') elseif (index == 4) then - return "Bleu sur fond Blanc 3" + return _U('blue_on_white_3') end end @@ -403,137 +403,137 @@ Config.Menus = { main = { label = 'LS CUSTOM', parent = nil, - upgrades = 'Upgrades', - cosmetics = 'Cosmétiques' + upgrades = _U('upgrades'), + cosmetics = _U('cosmetics') }, upgrades = { - label = 'Upgrades', + label = _U('upgrades'), parent = 'main', - modEngine = "Moteur", - modBrakes = "Freins", - modTransmission = "Transmission", - modSuspension = "Suspension", - modArmor = "Armure", - modTurbo = "Turbo" + modEngine = _U('engine'), + modBrakes = _U('brakes'), + modTransmission = _U('transmission'), + modSuspension = _U('suspension'), + modArmor = _U('armor'), + modTurbo = _U('turbo') }, modEngine = { - label = 'Moteur', + label = _U('engine'), parent = 'modEngine', modType = 11, price = 500 }, modBrakes = { - label = 'Freins', + label = _U('brakes'), parent = 'modBrakes', modType = 12, price = 500 }, modTransmission = { - label = 'Transmission', + label = _U('transmission'), parent = 'modTransmission', modType = 13, price = 500 }, modSuspension = { - label = 'Suspension', + label = _U('suspension'), parent = 'modSuspension', modType = 15, price = 500 }, modArmor = { - label = 'Armure', + label = _U('armor'), parent = 'modArmor', modType = 16, price = 500 }, modTurbo = { - label = 'Turbo', + label = _U('turbo'), parent = 'modTurbo', modType = 18, price = 500 }, cosmetics = { - label = 'Cosmétiques', + label = _U('cosmetics'), parent = 'main', - bodyparts = 'Carosserie', -- - windowTint = 'Fenêtres', -- - modHorns = 'Klaxon', -- - neonColor = "Néons", -- - resprays = 'Peinture', -- - modXenon = 'Phares', -- - plateIndex = 'Plaque', -- - wheels = 'Roues' -- + bodyparts = _U('bodyparts'), + windowTint = _U('windowtint'), + modHorns = _U('horns'), + neonColor = _U('neons'), + resprays = _U('respray'), + modXenon = _U('headlights'), + plateIndex = _U('licenseplates'), + wheels = _U('wheels') }, wheels = { - label = 'Roues', + label = _U('wheels'), parent = 'cosmetics', - modFrontWheelsTypes = "Types de Jantes", - modFrontWheelsColor = "Couleurs jantes", - tyreSmokeColor = "Fumée des pneus" + modFrontWheelsTypes = _U('wheel_type'), + modFrontWheelsColor = _U('wheel_color'), + tyreSmokeColor = _U('tiresmoke') }, modFrontWheelsTypes = { - label = 'Types de Jantes', + label = _U('wheel_type'), parent = 'wheels', - modFrontWheelsType0 = 'Jantes Sport', - modFrontWheelsType1 = 'Jantes Muscle', - modFrontWheelsType2 = 'Jantes Lowrider', - modFrontWheelsType3 = 'Jantes SUV', - modFrontWheelsType4 = 'Jantes Tout-terrain', - modFrontWheelsType5 = 'Jantes Tuning', - modFrontWheelsType6 = 'Jantes Moto', - modFrontWheelsType7 = 'Jantes Haut de gamme' + modFrontWheelsType0 = _U('sport'), + modFrontWheelsType1 = _U('muscle'), + modFrontWheelsType2 = _U('lowrider'), + modFrontWheelsType3 = _U('suv'), + modFrontWheelsType4 = _U('allterain'), + modFrontWheelsType5 = _U('tuning'), + modFrontWheelsType6 = _U('motorcycle'), + modFrontWheelsType7 = _U('highend') }, modFrontWheelsType0 = { - label = 'Jantes Sport', + label = _U('sport'), parent = 'modFrontWheelsTypes', modType = 23, wheelType = 0, price = 500 }, modFrontWheelsType1 = { - label = 'Jantes Muscle', + label = _U('muscle'), parent = 'modFrontWheelsTypes', modType = 23, wheelType = 1, price = 500 }, modFrontWheelsType2 = { - label = 'Jantes Lowrider', + label = _U('lowrider'), parent = 'modFrontWheelsTypes', modType = 23, wheelType = 2, price = 500 }, modFrontWheelsType3 = { - label = 'Jantes SUV', + label = _U('suv'), parent = 'modFrontWheelsTypes', modType = 23, wheelType = 3, price = 500 }, modFrontWheelsType4 = { - label = 'Jantes Tout-terrain', + label = _U('allterain'), parent = 'modFrontWheelsTypes', modType = 23, wheelType = 4, price = 500 }, modFrontWheelsType5 = { - label = 'Jantes Tuning', + label = _U('tuning'), parent = 'modFrontWheelsTypes', modType = 23, wheelType = 5, price = 500 }, modFrontWheelsType6 = { - label = 'Jantes Moto', + label = _U('motorcycle'), parent = 'modFrontWheelsTypes', modType = 23, wheelType = 6, price = 500 }, modFrontWheelsType7 = { - label = 'Jantes Haut de gamme', + label = _U('highend'), parent = 'modFrontWheelsTypes', modType = 23, wheelType = 7, @@ -550,145 +550,145 @@ Config.Menus = { price = 500 }, plateIndex = { - label = 'Plaque', + label = _U('licenseplates'), parent = 'cosmetics', modType = 'plateIndex', price = 500 }, resprays = { - label = 'Peinture', + label = _U('respray'), parent = 'cosmetics', - primaryRespray = 'Primaire', - secondaryRespray = 'Secondaire', - pearlescentRespray = 'Nacré', + primaryRespray = _U('primary'), + secondaryRespray = _U('secondary'), + pearlescentRespray = _U('pearlescent'), }, primaryRespray = { - label = 'Primaire', + label = _U('primary'), parent = 'resprays', }, secondaryRespray = { - label = 'Secondaire', + label = _U('secondary'), parent = 'resprays', }, pearlescentRespray = { - label = 'Nacré', + label = _U('pearlescent'), parent = 'resprays', }, color1 = { - label = 'Primaire', + label = _U('primary'), parent = 'primaryRespray', modType = 'color1', price = 500 }, color2 = { - label = 'Secondaire', + label = _U('secondary'), parent = 'secondaryRespray', modType = 'color2', price = 500 }, pearlescentColor = { - label = 'Nacré', + label = _U('pearlescent'), parent = 'pearlescentRespray', modType = 'pearlescentColor', price = 500 }, modXenon = { - label = 'Phares', + label = _U('headlights'), parent = 'cosmetics', modType = 22, price = 500 }, bodyparts = { - label = 'Carosserie', + label = _U('bodyparts'), parent = 'cosmetics', - modFender = 'Aile gauche', - modRightFender = 'Aile droite', - modSpoilers = 'Aileron', - modSideSkirt = 'Bas de caisse', - modFrame = 'Cage', - modHood = 'Capot', - modGrille = 'Grille', - modRearBumper = 'Pare-choc arrière', - modFrontBumper = 'Pare-choc avant', - modExhaust = 'Pot d\'échappement', - modRoof = 'Toit' + modFender = _U('leftfender'), + modRightFender = _U('rightfender'), + modSpoilers = _U('spoilers'), + modSideSkirt = _U('sideskirt'), + modFrame = _U('cage'), + modHood = _U('hood'), + modGrille = _U('grille'), + modRearBumper = _U('rearbumper'), + modFrontBumper = _U('frontbumper'), + modExhaust = _U('exhaust'), + modRoof = _U('roof') }, modSpoilers = { - label = 'Aileron', + label = _U('spoilers'), parent = 'bodyparts', modType = 0, price = 500 }, modFrontBumper = { - label = 'Pare-choc avant', + label = _U('frontbumper'), modType = 1, price = 500 }, modRearBumper = { - label = 'Pare-choc arrière', + label = _U('rearbumper'), modType = 2, price = 500 }, modSideSkirt = { - label = 'Bas de caisse', + label = _U('sideskirt'), modType = 3, price = 500 }, modExhaust = { - label = 'Pot d\'échappement', + label = _U('exhaust'), modType = 4, price = 500 }, modFrame = { - label = 'Cage', + label = _U('cage'), modType = 5, price = 500 }, modGrille = { - label = 'Grille', + label = _U('grille'), modType = 6, price = 500 }, modHood = { - label = 'Capot', + label = _U('hood'), modType = 7, price = 500 }, modFender = { - label = 'Aile gauche', + label = _U('leftfender'), modType = 8, price = 500 }, modRightFender = { - label = 'Aile droite', + label = _U('rightfender'), modType = 9, price = 500 }, modRoof = { - label = 'Toit', + label = _U('roof'), modType = 10, price = 500 }, windowTint = { - label = 'Fenêtres', + label = _U('windowTint'), parent = 'cosmetics', modType = 'windowTint', price = 500 }, modHorns = { - label = 'Klaxon', + label = _U('horns'), parent = 'cosmetics', modType = 14, price = 500 }, neonColor = { - label = 'Néons', + label = _U('neons'), parent = 'cosmetics', modType = 'neonColor', price = 500 }, tyreSmokeColor = { - label = 'Fumée des pneus', + label = _U('tiresmoke'), parent = 'wheels', modType = 'tyreSmokeColor', price = 500 diff --git a/locales/en.lua b/locales/en.lua index e69bd5e6..755395e0 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,23 +1,161 @@ Locales['en'] = { - ['by_default'] = 'by default', + ['by_default'] = 'default', ['installed'] = 'installed', ['already_own'] = 'you already own: ~b~', ['not_enough_money'] = 'you do not have enough money!', ['purchased'] = 'purchased!', ['press_custom'] = 'press ~INPUT_PICKUP~ to personalize your vehicle.', +-- Paint Colors + -- Black ['black'] = 'black', + ['graphite'] = 'graphite', + ['black_metallic'] = 'black Setallic', + ['caststeel'] = 'cast Steel', + ['black_anth'] = 'black Anthracite', + ['matteblack'] = 'matte Black', + ['darknight'] = 'dark Night', + ['deepblack'] = 'deep Black', + ['oil'] = 'oil', + ['carbon'] = 'carbon', + -- White ['white'] = 'white', + ['vanilla'] = 'vanilla', + ['creme'] = 'creme', + ['polarwhite'] = 'polar White', + ['beige'] = 'beige', + ['mattewhite'] = 'matte White', + ['snow'] = 'snow', + ['cotton'] = 'cotton', + ['alabaster'] = 'alabaster', + ['purewhite'] = 'pure White', + -- Grey ['grey'] = 'grey', + -- Red ['red'] = 'red', + -- Pink ['pink'] = 'pink', + ['electricpink'] = 'electric Pink', + ['brightpink'] = 'bright Pink', + ['salmon'] = 'salmon', + ['sugarplum'] = 'sugar Plum', + -- Blue ['blue'] = 'blue', + -- Yellow ['yellow'] = 'yellow', + ['wheat'] = 'wheat', + ['raceyellow'] = 'race Yellow', + ['paleyellow'] = 'pale Yellow', + ['lightyellow'] = 'light Yellow', + -- Green ['green'] = 'green', + -- Orange ['orange'] = 'orange', + ['tangerine'] = 'Tangerine', + ['matteorange'] = 'Matte Orange', + ['lightorange'] = 'Light Orange', + ['peach'] = 'Peach', + ['pumpkin'] = 'Pumpkin' + ['orangelambo'] = 'Orange Lambo', + -- Brown ['brown'] = 'brown', + ['copper'] = 'Copper', + ['lightbrown'] = 'Light Brown', + ['darkbrown'] = 'Dark Brown', + ['bronze'] = 'Bronze', + ['brownmetallic'] = 'Brown Metallic', + ['espresso'] = 'Espresso', + ['chocolate'] = 'Chocolate', + ['terracotta'] = 'Terracotta', + ['marble'] = 'Marble', + ['sand'] = 'Sand', + ['sepia'] = 'Sepia', + ['bison'] = 'Bison', + ['palm'] = 'Palm', + ['caramel'] = 'Caramel', + ['rust'] = 'Rust', + ['chestnut'] = 'Chestnut', + ['hazelnut'] = 'Hazelnut', + ['shell'] = 'Shell', + ['mahogany'] = 'Mahogany', + ['cauldron'] = 'Cauldron', + ['blond'] = 'Blond', + ['gravel'] = 'Gravel', + ['darkearth'] = 'Dark Earth', + ['desert'] = 'Desert', + -- Purple ['purple'] = 'purple', + ['indigo'] = 'Indigo', + ['deeppurple'] = 'Deep Purple' + ['darkviolet'] = 'Dark Violet', + ['amethyst'] = 'Amethyst', + ['mysticalviolet'] = 'Mystic Violet', + ['purplemetallic'] = 'Purple Metallic', + ['matteviolet'] = 'Matte Violet', + ['mattedeeppurple'] = 'Matte Deep Purple', + -- Chrome ['chrome'] = 'chrome', + ['brushedchrome'] = 'brushed Chrome', + ['blackchrome'] = 'black Chrome', + ['brushedaluminum'] = 'brushed Aluminum' + -- Metal ['gold'] = 'gold', + ['puregold'] = 'pure Gold', + ['brushedgold'] = 'brushed Gold', + ['lightgold'] = 'light Gold', +-- License Plates + ['blue_on_white_1'] = 'blue on white 1', + ['yellow_on_black'] = 'yellow on black', + ['yellow_blue'] = 'yellow on blue', + ['blue_on_white_2'] = 'blue on white 2', + ['blue_on_white_3'] = 'blue on white 3', +-- Upgrades + ['upgrades'] = 'upgrades', + ['engine'] = 'engine', + ['brakes'] = 'brakes', + ['transmission'] = 'transmission', + ['suspension'] = 'suspension', + ['armor'] = 'armor', + ['turbo'] = 'turbo', +-- Cosmetics + ['cosmetics'] = 'cosmetics', + -- Body Parts + ['bodyparts'] = 'body Parts', + ['leftfender'] = 'left fender', + ['rightfender'] = 'right fender', + ['spoilers'] = 'spoilers', + ['sideskirt'] = 'side skirts', + ['frame'] = 'cage', + ['hood'] = 'hood', + ['grille'] = 'grille', + ['rearbumper'] = 'rear bumper', + ['frontbumper'] = 'front bumper', + ['exhaust'] = 'exhaust', + ['roof'] = 'roof', + -- Paint + ['respray'] = 'respray', + ['primary'] = 'primary', + ['secondary'] = 'secondary', + ['pearlescent'] = 'pearlescent', + -- Misc + ['headlights'] = 'headlights', + ['licenseplates'] = 'license Plate', + ['windowtint'] = 'window Tint', + ['horns'] = 'horns', + -- Neon + ['neons'] = 'neons', + -- Wheels + ['wheels'] = 'wheels', + ['tiresmoke'] = 'tire smoke', + ['wheel_type'] = 'wheel type', + ['wheel_color'] = 'wheel color', + ['sport'] = 'sport', + ['muscle'] = 'muscle', + ['lowrider'] = 'lowrider', + ['suv'] = 'sUV', + ['allterrain'] = 'all terrain', + ['tuning'] = 'tuning', + ['motorcycle'] = 'motorcycle', + ['highend'] = 'high end', } diff --git a/locales/fr.lua b/locales/fr.lua index 2617a8b8..2148348e 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -6,18 +6,155 @@ Locales['fr'] = { ['not_enough_money'] = 'vous n\'avez pas assez d\'argent !', ['purchased'] = 'achat effectué !', ['press_custom'] = 'appuyez sur ~INPUT_PICKUP~ pour personnaliser le véhicule.', +-- Paint Colors + -- Black ['black'] = 'noir', + ['graphite'] = 'graphite', + ['black_metallic'] = 'noir Méttallisé', + ['caststeel'] = 'acier Fondu', + ['black_anth'] = 'noir Anthracite' + ['matteblack'] = 'noir Mat', + ['darknight'] = 'nuit Sombre', + ['deepblack'] = 'noir Profond', + ['oil'] = 'pétrol', + ['carbon'] = 'carbon', + -- White ['white'] = 'blanc', + ['vanilla'] = 'vanille', + ['creme'] = 'crème', + ['polarwhite'] = 'blanc Polair', + ['beige'] = 'beige', + ['mattewhite'] = 'blanc Mat', + ['snow'] = 'neige', + ['cotton'] = 'coton', + ['alabaster'] = 'albâtre', + ['purewhite'] = 'blanc Pure', + -- Grey ['grey'] = 'gris', + -- Red ['red'] = 'rouge', + -- Pink ['pink'] = 'rose', + ['electricpink'] = 'rose Electrique', + ['salmon'] = 'rose Saumon', + ['sugarplum'] = 'rose Dragée', + -- Blue ['blue'] = 'bleu', + -- Yellow ['yellow'] = 'jaune', + ['wheat'] = 'Jaune Blé', + ['raceyellow'] = 'Jaune Rally', + ['paleyellow'] = 'Jaune Clair', + ['lightyellow'] = 'Jaune Pâle', + -- Green ['green'] = 'vert', + -- Orange ['orange'] = 'orange', + ['tangerine'] = 'Tangerine', + ['matteorange'] = 'Orange Mat', + ['lightorange'] = 'Orange Clair', + ['peach'] = 'Pèche', + ['pumpkin'] = 'Citrouille', + ['orangelambo'] = 'Orange Lambo', + -- Brown ['brown'] = 'marron', + ['copper'] = 'Cuivre', + ['lightbrown'] = 'Marronclair', + ['darkbrown'] = 'Marron Foncé', + ['bronze'] = 'Bronze', + ['brownmetallic'] = 'Marron Métallisé', + ['espresso'] = 'Expresso', + ['chocolate'] = 'Chocolat', + ['terracotta'] = 'Terre Cuite', + ['marble'] = 'Marbre', + ['sand'] = 'Sable', + ['sepia'] = 'Sépia', + ['bison'] = 'Bison', + ['palm'] = 'Palmier', + ['caramel'] = 'Caramel', + ['rust'] = 'Rouille', + ['chestnut'] = 'Chataigne', + ['hazelnut'] = 'Noisette', + ['shell'] = 'Coquillage', + ['mahogany'] = 'Acajou', + ['cauldron'] = 'Chaudron', + ['blond'] = 'Blond', + ['gravel'] = 'Gravillon', + ['darkearth'] = 'Terre Foncé', + ['desert'] = 'Désert', + -- Purple ['purple'] = 'violet', + ['indigo'] = 'Indigo', + ['deeppurple'] = 'Violet Profond', + ['darkviolet'] = 'Violet Foncé', + ['amethyst'] = 'Améthyste', + ['mysticalviolet'] = 'Violet Mystique', + ['purplemetallic'] = 'Violet Métallisé', + ['matteviolet'] = 'Violet Mat', + ['mattedeeppurple'] = 'Violet Profond Mat', + -- Chrome ['chrome'] = 'chrome', + ['brushedchrome'] = 'chrome Brossé', + ['blackchrome'] = 'chrome Noir', + ['brushedaluminum'] = 'aluminum Brossé', + -- Metal ['gold'] = 'or', + ['puregold'] = 'Or Pure', + ['brushedgold'] = 'Or Brossé', + ['lightgold'] = 'Or Clair', +-- License Plates + ['blue_on_white_1'] = 'bleu sur fond Blanc 1', + ['yellow_on_black'] = 'jaune sur fond Noir', + ['yellow_blue'] = 'jaune sur fond Bleu', + ['blue_on_white_2'] = 'bleu sur fond Blanc 2', + ['blue_on_white_3'] = 'bleu sur fond Blanc 3', +-- Upgrades + ['upgrades'] = 'upgrades', + ['engine'] = 'moteur', + ['brakes'] = 'freins', + ['transmission'] = 'transmission', + ['suspension'] = 'suspension', + ['armor'] = 'armure', + ['turbo'] = 'turbo', +-- Cosmetics + ['cosmetics'] = 'cosmétiques', + -- Body Parts + ['bodyparts'] = 'carosserie', + ['leftfender'] = 'aile gauche', + ['rightfender'] = 'aile droite', + ['spoilers'] = 'aileron', + ['sideskirt'] = 'bas de caisse', + ['frame'] = 'cage', + ['hood'] = 'capot', + ['grille'] = 'grille', + ['rearbumper'] = 'pare-choc arrière', + ['frontbumper'] = 'pare-choc avant', + ['exhaust'] = 'pot d\'échappement', + ['roof'] = 'toit', + -- Paint + ['respray'] = 'peinture', + ['primary'] = 'primaire', + ['secondary'] = 'secondaire', + ['pearlescent'] = 'nacré', + -- Misc + ['headlights'] = 'phares', + ['licenseplates'] = 'plaque', + ['windowtint'] = 'fenêtres', + ['horns'] = 'klaxon', + -- Neon + ['neons'] = 'néons', + -- Wheels + ['wheels'] = 'roues', + ['tiresmoke'] = 'fumée des pneus', + ['wheel_type'] = 'types de Jantes', + ['wheel_color'] = 'couleurs jantes', + ['sport'] = 'Jantes Sport', + ['muscle'] = 'Jantes Muscle', + ['lowrider'] = 'Jantes Lowrider', + ['suv'] = 'Jantes SUV', + ['allterrain'] = 'Jantes Tout-terrain', + ['tuning'] = 'Jantes Tuning', + ['motorcycle'] = 'Jantes Moto', + ['highend'] = 'Jantes Haut de gamme', } From ccab8ff700abdce39c54a3a383ef87a1338c8bfe Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Tue, 22 Aug 2017 23:01:06 -0400 Subject: [PATCH 06/55] Added Grey Multi-Language --- config.lua | 42 +++++++++++++++++++++--------------------- locales/en.lua | 23 ++++++++++++++++++++++- locales/fr.lua | 21 +++++++++++++++++++++ 3 files changed, 64 insertions(+), 22 deletions(-) diff --git a/config.lua b/config.lua index cab20ac1..aef63381 100644 --- a/config.lua +++ b/config.lua @@ -59,27 +59,27 @@ function GetColors(color) } elseif color == 'grey' then colors = { - { index = 4, label = 'Argenté'}, - { index = 5, label = 'Gris Métallisé'}, - { index = 6, label = 'Acier Laminé'}, - { index = 7, label = 'Gris Foncé'}, - { index = 8, label = 'Gris Rocheux'}, - { index = 9, label = 'Gris Nuit'}, - { index = 10, label = 'Aluminium'}, - { index = 13, label = 'Gris Mat'}, - { index = 14, label = 'Gris Clair'}, - { index = 17, label = 'Gris Bitume'}, - { index = 18, label = 'Gris Béton'}, - { index = 19, label = 'Argent Sombre'}, - { index = 20, label = 'Magnésite'}, - { index = 22, label = 'Nickel'}, - { index = 23, label = 'Zinc'}, - { index = 24, label = 'Dolomite'}, - { index = 25, label = 'Argent Bleuté'}, - { index = 26, label = 'Titane'}, - { index = 66, label = 'Acier Bleui'}, - { index = 93, label = 'Champagne'}, - { index = 144, label = 'Gris Chasseur'}, + { index = 4, label = _U('silver')}, + { index = 5, label = _U('metallicgrey')}, + { index = 6, label = _U('laminatedsteel')}, + { index = 7, label = _U('darkgray')}, + { index = 8, label = _U('rockygray')}, + { index = 9, label = _U('graynight')}, + { index = 10, label = _U('aluminum')}, + { index = 13, label = _U('graymat')}, + { index = 14, label = _U('lightgrey')}, + { index = 17, label = _U('asphaltgray')}, + { index = 18, label = _U('grayconcrete')}, + { index = 19, label = _U('darksilver')}, + { index = 20, label = _U('magnesite')}, + { index = 22, label = _U('nickel')}, + { index = 23, label = _U('zinc')}, + { index = 24, label = _U('dolomite')}, + { index = 25, label = _U('bluesilver')}, + { index = 26, label = _U('titanium')}, + { index = 66, label = _U('steelblue')}, + { index = 93, label = _U('champagne')}, + { index = 144, label = _U('grayhunter')}, { index = 156, label = _U('grey')} } elseif color == 'red' then diff --git a/locales/en.lua b/locales/en.lua index 755395e0..16a7189b 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -10,7 +10,7 @@ Locales['en'] = { -- Black ['black'] = 'black', ['graphite'] = 'graphite', - ['black_metallic'] = 'black Setallic', + ['black_metallic'] = 'black Metallic', ['caststeel'] = 'cast Steel', ['black_anth'] = 'black Anthracite', ['matteblack'] = 'matte Black', @@ -31,6 +31,27 @@ Locales['en'] = { ['purewhite'] = 'pure White', -- Grey ['grey'] = 'grey', + ['silver'] = 'silver', + ['metallicgrey'] = 'metallic Grey', + ['laminatedsteel'] = 'laminated Steel', + ['darkgray'] = 'dark Grey', + ['rockygray'] = 'rocky Grey', + ['graynight'] = 'gray Night' + ['aluminum'] = 'aluminum', + ['graymat'] = 'matte Grey', + ['lightgrey'] = 'light Grey', + ['asphaltgray'] = 'asphalt Grey', + ['grayconcrete'] = 'concrete Grey', + ['darksilver'] = 'dark Silver', + ['magnesite'] = 'magnesite', + ['nickel'] = 'nickel', + ['zinc'] = 'zinc', + ['dolomite'] = 'dolomite', + ['bluesilver'] = 'blue Silver', + ['titanium'] = 'titanium', + ['steelblue'] = 'steel Blue', + ['champagne'] = 'champagne', + ['grayhunter'] = 'grey Hunter', -- Red ['red'] = 'red', -- Pink diff --git a/locales/fr.lua b/locales/fr.lua index 2148348e..7a915e0c 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -31,6 +31,27 @@ Locales['fr'] = { ['purewhite'] = 'blanc Pure', -- Grey ['grey'] = 'gris', + ['silver'] = 'Argenté', + ['metallicgrey'] = 'Gris Métallisé', + ['laminatedsteel'] = 'Acier Laminé', + ['darkgray'] = 'Gris Foncé', + ['rockygray'] = 'Gris Rocheux', + ['graynight'] = 'Gris Nuit' + ['aluminum'] = 'Aluminium', + ['graymat'] = 'Gris Mat', + ['lightgrey'] = 'Gris Clair', + ['asphaltgray'] = 'Gris Bitume', + ['grayconcrete'] = 'Gris Béton', + ['darksilver'] = 'Argent Sombre', + ['magnesite'] = 'Magnésite', + ['nickel'] = 'nickel', + ['zinc'] = 'zinc', + ['dolomite'] = 'dolomite', + ['bluesilver'] = 'Argent Bleuté', + ['titanium'] = 'Titane', + ['steelblue'] = 'Acier Bleui', + ['champagne'] = 'Champagne', + ['grayhunter'] = 'Gris Chasseur', -- Red ['red'] = 'rouge', -- Pink From a36e9a9dba91dd3bd36760b7327ab87a8d893699 Mon Sep 17 00:00:00 2001 From: Don <30905704+ddh3@users.noreply.github.com> Date: Tue, 22 Aug 2017 21:14:42 -0700 Subject: [PATCH 07/55] Update en.lua --- locales/en.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/locales/en.lua b/locales/en.lua index 16a7189b..0eb7566a 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -36,7 +36,7 @@ Locales['en'] = { ['laminatedsteel'] = 'laminated Steel', ['darkgray'] = 'dark Grey', ['rockygray'] = 'rocky Grey', - ['graynight'] = 'gray Night' + ['graynight'] = 'gray Night', ['aluminum'] = 'aluminum', ['graymat'] = 'matte Grey', ['lightgrey'] = 'light Grey', @@ -76,7 +76,7 @@ Locales['en'] = { ['matteorange'] = 'Matte Orange', ['lightorange'] = 'Light Orange', ['peach'] = 'Peach', - ['pumpkin'] = 'Pumpkin' + ['pumpkin'] = 'Pumpkin', ['orangelambo'] = 'Orange Lambo', -- Brown ['brown'] = 'brown', @@ -107,7 +107,7 @@ Locales['en'] = { -- Purple ['purple'] = 'purple', ['indigo'] = 'Indigo', - ['deeppurple'] = 'Deep Purple' + ['deeppurple'] = 'Deep Purple', ['darkviolet'] = 'Dark Violet', ['amethyst'] = 'Amethyst', ['mysticalviolet'] = 'Mystic Violet', @@ -118,7 +118,7 @@ Locales['en'] = { ['chrome'] = 'chrome', ['brushedchrome'] = 'brushed Chrome', ['blackchrome'] = 'black Chrome', - ['brushedaluminum'] = 'brushed Aluminum' + ['brushedaluminum'] = 'brushed Aluminum', -- Metal ['gold'] = 'gold', ['puregold'] = 'pure Gold', From 79c8d0f8fe45c273e672d7823e66f69d5ac78a01 Mon Sep 17 00:00:00 2001 From: Don <30905704+ddh3@users.noreply.github.com> Date: Tue, 22 Aug 2017 21:15:50 -0700 Subject: [PATCH 08/55] Update fr.lua --- locales/fr.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/fr.lua b/locales/fr.lua index 7a915e0c..333c2ee0 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -12,7 +12,7 @@ Locales['fr'] = { ['graphite'] = 'graphite', ['black_metallic'] = 'noir Méttallisé', ['caststeel'] = 'acier Fondu', - ['black_anth'] = 'noir Anthracite' + ['black_anth'] = 'noir Anthracite', ['matteblack'] = 'noir Mat', ['darknight'] = 'nuit Sombre', ['deepblack'] = 'noir Profond', @@ -36,7 +36,7 @@ Locales['fr'] = { ['laminatedsteel'] = 'Acier Laminé', ['darkgray'] = 'Gris Foncé', ['rockygray'] = 'Gris Rocheux', - ['graynight'] = 'Gris Nuit' + ['graynight'] = 'Gris Nuit', ['aluminum'] = 'Aluminium', ['graymat'] = 'Gris Mat', ['lightgrey'] = 'Gris Clair', From 87743aa5a279b4c26ecca93ef486644f77ec5d11 Mon Sep 17 00:00:00 2001 From: ultratm Date: Sat, 26 Aug 2017 12:40:40 +0200 Subject: [PATCH 09/55] Add German Language --- __resource.lua | 2 + locales/de.lua | 182 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 184 insertions(+) create mode 100644 locales/de.lua diff --git a/__resource.lua b/__resource.lua index 58616817..88f56ca1 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,5 +1,6 @@ server_scripts { '@es_extended/locale.lua', + 'locales/de.lua', 'locales/en.lua', 'locales/fr.lua', 'config.lua', @@ -8,6 +9,7 @@ server_scripts { client_scripts { '@es_extended/locale.lua', + 'locales/de.lua', 'locales/en.lua', 'locales/fr.lua', 'config.lua', diff --git a/locales/de.lua b/locales/de.lua new file mode 100644 index 00000000..75567f0b --- /dev/null +++ b/locales/de.lua @@ -0,0 +1,182 @@ +Locales['de'] = { + + ['by_default'] = 'default', + ['installed'] = 'installiert', + ['already_own'] = 'du besitzt bereits: ~b~', + ['not_enough_money'] = 'du hast nicht genug Geld!', + ['purchased'] = 'gekauft!', + ['press_custom'] = 'Drücke ~INPUT_PICKUP~ um dein Fahrzeug zu modifizieren.', +-- Paint Colors + -- Black + ['black'] = 'black', + ['graphite'] = 'graphite', + ['black_metallic'] = 'black Metallic', + ['caststeel'] = 'cast Steel', + ['black_anth'] = 'black Anthracite', + ['matteblack'] = 'matte Black', + ['darknight'] = 'dark Night', + ['deepblack'] = 'deep Black', + ['oil'] = 'oil', + ['carbon'] = 'carbon', + -- White + ['white'] = 'white', + ['vanilla'] = 'vanilla', + ['creme'] = 'creme', + ['polarwhite'] = 'polar White', + ['beige'] = 'beige', + ['mattewhite'] = 'matte White', + ['snow'] = 'snow', + ['cotton'] = 'cotton', + ['alabaster'] = 'alabaster', + ['purewhite'] = 'pure White', + -- Grey + ['grey'] = 'grey', + ['silver'] = 'silver', + ['metallicgrey'] = 'metallic Grey', + ['laminatedsteel'] = 'laminated Steel', + ['darkgray'] = 'dark Grey', + ['rockygray'] = 'rocky Grey', + ['graynight'] = 'gray Night', + ['aluminum'] = 'aluminum', + ['graymat'] = 'matte Grey', + ['lightgrey'] = 'light Grey', + ['asphaltgray'] = 'asphalt Grey', + ['grayconcrete'] = 'concrete Grey', + ['darksilver'] = 'dark Silver', + ['magnesite'] = 'magnesite', + ['nickel'] = 'nickel', + ['zinc'] = 'zinc', + ['dolomite'] = 'dolomite', + ['bluesilver'] = 'blue Silver', + ['titanium'] = 'titanium', + ['steelblue'] = 'steel Blue', + ['champagne'] = 'champagne', + ['grayhunter'] = 'grey Hunter', + -- Red + ['red'] = 'red', + -- Pink + ['pink'] = 'pink', + ['electricpink'] = 'electric Pink', + ['brightpink'] = 'bright Pink', + ['salmon'] = 'salmon', + ['sugarplum'] = 'sugar Plum', + -- Blue + ['blue'] = 'blue', + -- Yellow + ['yellow'] = 'yellow', + ['wheat'] = 'wheat', + ['raceyellow'] = 'race Yellow', + ['paleyellow'] = 'pale Yellow', + ['lightyellow'] = 'light Yellow', + -- Green + ['green'] = 'green', + -- Orange + ['orange'] = 'orange', + ['tangerine'] = 'Tangerine', + ['matteorange'] = 'Matte Orange', + ['lightorange'] = 'Light Orange', + ['peach'] = 'Peach', + ['pumpkin'] = 'Pumpkin', + ['orangelambo'] = 'Orange Lambo', + -- Brown + ['brown'] = 'brown', + ['copper'] = 'Copper', + ['lightbrown'] = 'Light Brown', + ['darkbrown'] = 'Dark Brown', + ['bronze'] = 'Bronze', + ['brownmetallic'] = 'Brown Metallic', + ['espresso'] = 'Espresso', + ['chocolate'] = 'Chocolate', + ['terracotta'] = 'Terracotta', + ['marble'] = 'Marble', + ['sand'] = 'Sand', + ['sepia'] = 'Sepia', + ['bison'] = 'Bison', + ['palm'] = 'Palm', + ['caramel'] = 'Caramel', + ['rust'] = 'Rust', + ['chestnut'] = 'Chestnut', + ['hazelnut'] = 'Hazelnut', + ['shell'] = 'Shell', + ['mahogany'] = 'Mahogany', + ['cauldron'] = 'Cauldron', + ['blond'] = 'Blond', + ['gravel'] = 'Gravel', + ['darkearth'] = 'Dark Earth', + ['desert'] = 'Desert', + -- Purple + ['purple'] = 'purple', + ['indigo'] = 'Indigo', + ['deeppurple'] = 'Deep Purple', + ['darkviolet'] = 'Dark Violet', + ['amethyst'] = 'Amethyst', + ['mysticalviolet'] = 'Mystic Violet', + ['purplemetallic'] = 'Purple Metallic', + ['matteviolet'] = 'Matte Violet', + ['mattedeeppurple'] = 'Matte Deep Purple', + -- Chrome + ['chrome'] = 'chrome', + ['brushedchrome'] = 'brushed Chrome', + ['blackchrome'] = 'black Chrome', + ['brushedaluminum'] = 'brushed Aluminum', + -- Metal + ['gold'] = 'gold', + ['puregold'] = 'pure Gold', + ['brushedgold'] = 'brushed Gold', + ['lightgold'] = 'light Gold', +-- License Plates + ['blue_on_white_1'] = 'blue on white 1', + ['yellow_on_black'] = 'yellow on black', + ['yellow_blue'] = 'yellow on blue', + ['blue_on_white_2'] = 'blue on white 2', + ['blue_on_white_3'] = 'blue on white 3', +-- Upgrades + ['upgrades'] = 'upgrades', + ['engine'] = 'engine', + ['brakes'] = 'brakes', + ['transmission'] = 'transmission', + ['suspension'] = 'suspension', + ['armor'] = 'armor', + ['turbo'] = 'turbo', +-- Cosmetics + ['cosmetics'] = 'cosmetics', + -- Body Parts + ['bodyparts'] = 'body Parts', + ['leftfender'] = 'left fender', + ['rightfender'] = 'right fender', + ['spoilers'] = 'spoilers', + ['sideskirt'] = 'side skirts', + ['frame'] = 'cage', + ['hood'] = 'hood', + ['grille'] = 'grille', + ['rearbumper'] = 'rear bumper', + ['frontbumper'] = 'front bumper', + ['exhaust'] = 'exhaust', + ['roof'] = 'roof', + -- Paint + ['respray'] = 'respray', + ['primary'] = 'primary', + ['secondary'] = 'secondary', + ['pearlescent'] = 'pearlescent', + -- Misc + ['headlights'] = 'headlights', + ['licenseplates'] = 'license Plate', + ['windowtint'] = 'window Tint', + ['horns'] = 'horns', + -- Neon + ['neons'] = 'neons', + -- Wheels + ['wheels'] = 'wheels', + ['tiresmoke'] = 'tire smoke', + ['wheel_type'] = 'wheel type', + ['wheel_color'] = 'wheel color', + ['sport'] = 'sport', + ['muscle'] = 'muscle', + ['lowrider'] = 'lowrider', + ['suv'] = 'sUV', + ['allterrain'] = 'all terrain', + ['tuning'] = 'tuning', + ['motorcycle'] = 'motorcycle', + ['highend'] = 'high end', + +} From a2e53dd64e2054ffa8a8285983820a40e4de8b8a Mon Sep 17 00:00:00 2001 From: renaiku Date: Wed, 30 Aug 2017 12:57:48 +0200 Subject: [PATCH 10/55] paint colors and return bugfixes --- client/main.lua | 6 ++++-- config.lua | 22 ++++++++++++++++------ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/client/main.lua b/client/main.lua index 3938d12b..1178ce49 100644 --- a/client/main.lua +++ b/client/main.lua @@ -110,8 +110,7 @@ function GetAction(data) local vehicle = GetVehiclePedIsIn(playerPed, false) local currentMods = ESX.Game.GetVehicleProperties(vehicle) - for k,v in pairs(Config - .Menus) do + for k,v in pairs(Config.Menus) do if data.value == k then @@ -123,6 +122,9 @@ function GetAction(data) if v.modType == 22 then table.insert(elements, {label = " " .. _U('by_default'), modType = k, modNum = false}) + elseif v.modType == 'color1' or v.modType == 'color2' or v.modType == 'pearlescentColor' or v.modType == 'wheelColor' then + local num = myCar[v.modType] + table.insert(elements, {label = " " .. _U('by_default'), modType = k, modNum = num}) else table.insert(elements, {label = " " .. _U('by_default'), modType = k, modNum = -1}) end diff --git a/config.lua b/config.lua index aef63381..67cfa883 100644 --- a/config.lua +++ b/config.lua @@ -418,37 +418,37 @@ Config.Menus = { }, modEngine = { label = _U('engine'), - parent = 'modEngine', + parent = 'upgrades', modType = 11, price = 500 }, modBrakes = { label = _U('brakes'), - parent = 'modBrakes', + parent = 'upgrades', modType = 12, price = 500 }, modTransmission = { label = _U('transmission'), - parent = 'modTransmission', + parent = 'upgrades', modType = 13, price = 500 }, modSuspension = { label = _U('suspension'), - parent = 'modSuspension', + parent = 'upgrades', modType = 15, price = 500 }, modArmor = { label = _U('armor'), - parent = 'modArmor', + parent = 'upgrades', modType = 16, price = 500 }, modTurbo = { label = _U('turbo'), - parent = 'modTurbo', + parent = 'upgrades', modType = 18, price = 500 }, @@ -621,51 +621,61 @@ Config.Menus = { }, modFrontBumper = { label = _U('frontbumper'), + parent = 'bodyparts', modType = 1, price = 500 }, modRearBumper = { label = _U('rearbumper'), + parent = 'bodyparts', modType = 2, price = 500 }, modSideSkirt = { label = _U('sideskirt'), + parent = 'bodyparts', modType = 3, price = 500 }, modExhaust = { label = _U('exhaust'), + parent = 'bodyparts', modType = 4, price = 500 }, modFrame = { label = _U('cage'), + parent = 'bodyparts', modType = 5, price = 500 }, modGrille = { label = _U('grille'), + parent = 'bodyparts', modType = 6, price = 500 }, modHood = { label = _U('hood'), + parent = 'bodyparts', modType = 7, price = 500 }, modFender = { label = _U('leftfender'), + parent = 'bodyparts', modType = 8, price = 500 }, modRightFender = { label = _U('rightfender'), + parent = 'bodyparts', modType = 9, price = 500 }, modRoof = { label = _U('roof'), + parent = 'bodyparts', modType = 10, price = 500 }, From 04eda375973d5cc76151bed1d232912f9350c083 Mon Sep 17 00:00:00 2001 From: renaiku Date: Wed, 30 Aug 2017 13:18:23 +0200 Subject: [PATCH 11/55] vehicle is saved each time you buy something (pressing enter) --- client/main.lua | 1 + server/main.lua | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/client/main.lua b/client/main.lua index 1178ce49..8767cde6 100644 --- a/client/main.lua +++ b/client/main.lua @@ -15,6 +15,7 @@ RegisterNetEvent('esx_lscustom:installMod') AddEventHandler('esx_lscustom:installMod', function() local vehicle = GetVehiclePedIsIn(GetPlayerPed(-1), false) myCar = ESX.Game.GetVehicleProperties(vehicle) + TriggerServerEvent('esx_lscustom:refreshOwnedVehicle', myCar) end) RegisterNetEvent('esx_lscustom:cancelInstallMod') diff --git a/server/main.lua b/server/main.lua index 26ebe2a7..de331d01 100644 --- a/server/main.lua +++ b/server/main.lua @@ -15,3 +15,14 @@ AddEventHandler('esx_lscustom:buyMod', function(price) TriggerClientEvent('esx:showNotification', _source, _U('purchased')) end end) + +RegisterServerEvent('esx_lscustom:refreshOwnedVehicle') +AddEventHandler('esx_lscustom:refreshOwnedVehicle', function(myCar) + + MySQL.Async.execute( + 'UPDATE `owned_vehicles` SET `vehicle` = @vehicle WHERE `vehicle` LIKE "%' .. myCar['plate'] .. '%"', + { + ['@vehicle'] = json.encode(myCar) + } + ) +end) \ No newline at end of file From 7e4838fb6e9af6f9f631170f14e7f9fe4755b6b1 Mon Sep 17 00:00:00 2001 From: renaiku Date: Wed, 30 Aug 2017 23:29:05 +0200 Subject: [PATCH 12/55] MYSQL fix --- __resource.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/__resource.lua b/__resource.lua index 88f56ca1..699b368a 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,4 +1,5 @@ server_scripts { + '@mysql-async/lib/MySQL.lua', '@es_extended/locale.lua', 'locales/de.lua', 'locales/en.lua', From 7baf65749d8529dde1e462edf245b39de12b445c Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Sat, 2 Sep 2017 19:13:42 -0400 Subject: [PATCH 13/55] Updated multi-language support --- config.lua | 126 ++++++++++++++++++++++++------------------------- locales/en.lua | 63 ++++++++++++++++++++++++- locales/fr.lua | 62 ++++++++++++++++++++++++ 3 files changed, 187 insertions(+), 64 deletions(-) diff --git a/config.lua b/config.lua index 67cfa883..0da98d8a 100644 --- a/config.lua +++ b/config.lua @@ -8,7 +8,7 @@ Config.Zones = { Size = {x = 3.0, y = 3.0, z = 0.2}, Color = {r = 204, g = 204, b = 0}, Marker= 1, - Name = "LS CUSTOM", + Name = "LS CUSTOMS", Hint = _U('press_custom') } } @@ -85,21 +85,21 @@ function GetColors(color) elseif color == 'red' then colors = { { index = 27, label = _U('red')}, - { index = 28, label = 'Rouge Turin'}, - { index = 29, label = 'Coquelicot'}, - { index = 30, label = 'Rouge Cuivré'}, - { index = 31, label = 'Rouge Cardinal'}, - { index = 32, label = 'Rouge Brique'}, - { index = 33, label = 'Grenat'}, - { index = 34, label = 'Pourpre'}, - { index = 35, label = 'Framboise'}, - { index = 39, label = 'Rouge Mat'}, - { index = 40, label = 'Rouge Foncé'}, - { index = 43, label = 'Rouge Pulpeux'}, - { index = 44, label = 'Rouge Brillant'}, - { index = 46, label = 'Rouge Pale'}, - { index = 143, label = 'Rouge Vin'}, - { index = 150, label = 'Volcano'} + { index = 28, label = _U('torino_red')}, + { index = 29, label = _U('poppy')}, + { index = 30, label = _U('copper_red')}, + { index = 31, label = _U('cardinal')}, + { index = 32, label = _U('brick')}, + { index = 33, label = _U('garnet')}, + { index = 34, label = _U('cabernet')}, + { index = 35, label = _U('candy')}, + { index = 39, label = _U('matte_red')}, + { index = 40, label = _U('dark_red')}, + { index = 43, label = _U('red_pulp')}, + { index = 44, label = _U('bril_red')}, + { index = 46, label = _U('pale_red')}, + { index = 143, label = _U('wine_red')}, + { index = 150, label = _U('volcano')} } elseif color == 'pink' then colors = { @@ -109,35 +109,35 @@ function GetColors(color) } elseif color == 'blue' then colors = { - { index = 54, label = 'Topaze'}, - { index = 60, label = 'Bleu Clair'}, - { index = 61, label = 'Bleu Galaxy'}, - { index = 62, label = 'Bleu Foncé'}, - { index = 63, label = 'Bleu Azur'}, - { index = 64, label = 'Bleu Marine'}, - { index = 65, label = 'Lapis Lazuli'}, - { index = 67, label = 'Bleu Diamant'}, - { index = 68, label = 'Surfer'}, - { index = 69, label = 'Pastel'}, - { index = 70, label = 'Bleu Celeste'}, - { index = 73, label = 'Bleu Rally'}, - { index = 74, label = 'Bleu Paradis'}, - { index = 75, label = 'Bleu Nuit'}, - { index = 77, label = 'Bleu Cyan'}, - { index = 78, label = 'Cobalt'}, - { index = 79, label = 'Bleu Electrique'}, - { index = 80, label = 'Bleu Horizon'}, - { index = 82, label = 'Bleu Métallisé'}, - { index = 83, label = 'Aigue Marine '}, - { index = 84, label = 'Bleu Agathe'}, - { index = 85, label = 'Zirconium'}, - { index = 86, label = 'Spinelle'}, - { index = 87, label = 'Tourmaline'}, - { index = 127, label = 'Paradis'}, - { index = 140, label = 'Bubble Gum'}, - { index = 141, label = 'Bleu Minuit'}, - { index = 146, label = 'Bleu Interdit'}, - { index = 157, label = 'Bleu Glacier'} + { index = 54, label = _U('topaz')}, + { index = 60, label = _U('light_blue')}, + { index = 61, label = _U('galaxy_blue')}, + { index = 62, label = _U('dark_blue')}, + { index = 63, label = _U('azure')}, + { index = 64, label = _U('navy_blue')}, + { index = 65, label = _U('lapis')}, + { index = 67, label = _U('blue_diamond')}, + { index = 68, label = _U('surfer')}, + { index = 69, label = _U('pastel_blue')}, + { index = 70, label = _U('celeste_blue')}, + { index = 73, label = _U('rally_blue')}, + { index = 74, label = _U('blue_paradise')}, + { index = 75, label = _U('blue_night')}, + { index = 77, label = _U('cyan_blue')}, + { index = 78, label = _U('cobalt')}, + { index = 79, label = _U('electric_blue')}, + { index = 80, label = _U('horizon_blue')}, + { index = 82, label = _U('metallic_blue')}, + { index = 83, label = _U('aquamarine')}, + { index = 84, label = _U('blue_agathe')}, + { index = 85, label = _U('zirconium')}, + { index = 86, label = _U('spinel')}, + { index = 87, label = _U('tourmaline')}, + { index = 127, label = _U('paradise')}, + { index = 140, label = _U('bubble_gum')}, + { index = 141, label = _U('midnight_blue')}, + { index = 146, label = _U('forbidden_blue')}, + { index = 157, label = _U('glacier_blue')} } elseif color == 'yellow' then colors = { @@ -149,23 +149,23 @@ function GetColors(color) } elseif color == 'green' then colors = { - { index = 49, label = 'Vert Foncé'}, - { index = 50, label = 'Vert Rally'}, - { index = 51, label = 'Vert Sapin'}, - { index = 52, label = 'Vert Olive'}, - { index = 53, label = 'Vert Clair'}, - { index = 55, label = 'Vert Lime'}, - { index = 56, label = 'Vert Forêt'}, - { index = 57, label = 'Vert Pelouse'}, - { index = 58, label = 'Vert Impérial'}, - { index = 59, label = 'Vert Bouteille'}, - { index = 92, label = 'Vert Citrus'}, - { index = 125, label = 'Vert Anis'}, - { index = 128, label = 'Kaki'}, - { index = 133, label = 'Vert Army'}, - { index = 151, label = 'Vert Sombre'}, - { index = 152, label = 'Vert Chasseur'}, - { index = 155, label = 'Amarylisse'} + { index = 49, label = _U('met_dark_green')}, + { index = 50, label = _U('rally_green')}, + { index = 51, label = _U('pine_green')}, + { index = 52, label = _U('olive_green')}, + { index = 53, label = _U('light_green')}, + { index = 55, label = _U('lime_green')}, + { index = 56, label = _U('forest_green')}, + { index = 57, label = _U('lawn_green')}, + { index = 58, label = _U('imperial_green')}, + { index = 59, label = _U('green_bottle')}, + { index = 92, label = _U('citrus_green')}, + { index = 125, label = _U('green_anis')}, + { index = 128, label = _U('khaki')}, + { index = 133, label = _U('army_green')}, + { index = 151, label = _U('dark_green')}, + { index = 152, label = _U('hunter_green')}, + { index = 155, label = _U('matte_foilage_green')} } elseif color == 'orange' then colors = { @@ -401,7 +401,7 @@ end Config.Menus = { main = { - label = 'LS CUSTOM', + label = 'LS CUSTOMS', parent = nil, upgrades = _U('upgrades'), cosmetics = _U('cosmetics') diff --git a/locales/en.lua b/locales/en.lua index 0eb7566a..dd3b5eae 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -54,6 +54,21 @@ Locales['en'] = { ['grayhunter'] = 'grey Hunter', -- Red ['red'] = 'red', + ['torino_red'] = 'torino Red', + ['poppy'] = 'poppy', + ['copper_red'] = 'copper Red', + ['cardinal'] = 'cardinal Red', + ['brick'] = 'brick Red', + ['garnet'] = 'Garnet', + ['cabernet'] = 'cabernet Red', + ['candy'] = 'candy Red', + ['matte_red'] = 'matte Red', + ['dark_red'] = 'dark Red', + ['red_pulp'] = 'red Pulp', + ['bril_red'] = 'brilliant Red', + ['pale_red'] = 'pale Red', + ['wine_red'] = 'wine Red', + ['volcano'] = 'Volcano', -- Pink ['pink'] = 'pink', ['electricpink'] = 'electric Pink', @@ -62,6 +77,35 @@ Locales['en'] = { ['sugarplum'] = 'sugar Plum', -- Blue ['blue'] = 'blue', + ['topaz'] = 'topaz', + ['light_blue'] = 'light Blue', + ['galaxy_blue'] = 'galaxy Blue', + ['dark_blue'] = 'dark Blue', + ['azure'] = 'azure', + ['navy_blue'] = 'navy Blue', + ['lapis'] = 'lapis Lazuli', + ['blue_diamond'] = 'blue Diamond', + ['surfer'] = 'surfer', + ['pastel_blue'] = 'pastel Blue', + ['celeste_blue'] = 'celeste Blue', + ['rally_blue'] = 'rally Blue', + ['blue_paradise'] = 'blue Paradise' + ['blue_night'] = 'blue Night', + ['cyan_blue'] = 'cyan Blue', + ['cobalt'] = 'cobalt', + ['electric_blue'] = 'electric Blue', + ['horizon_blue'] = 'horizon Blue', + ['metallic_blue'] = 'metallic Blue', + ['aquamarine'] = 'aquamarine', + ['blue_agathe'] = 'blue Agathe', + ['zirconium'] = 'zirconium', + ['spinel'] = 'spinel', + ['tourmaline'] = 'tourmaline', + ['paradise'] = 'paradise', + ['bubble_gum'] = 'bubble Gum', + ['midnight_blue'] = 'midnight Blue', + ['forbidden_blue'] = 'forbidden Blue', + ['glacier_blue'] = 'glacier Blue', -- Yellow ['yellow'] = 'yellow', ['wheat'] = 'wheat', @@ -70,6 +114,23 @@ Locales['en'] = { ['lightyellow'] = 'light Yellow', -- Green ['green'] = 'green', + ['met_dark_green'] = 'metallic Dark Green', + ['rally_green'] = 'Rally Green', + ['pine_green'] = 'pine Green' + ['olive_green'] = 'olive Green', + ['light_green'] = 'Light Green', + ['lime_green'] = 'lime green', + ['forest_green'] = 'forest Green', + ['lawn_green'] = 'lawn Green', + ['imperial_green'] = 'imperial Green', + ['green_bottle'] = 'breen Bottle', + ['citrus_green'] = 'citrus Green', + ['green_anis'] = 'green Anis', + ['khaki'] = 'Khaki', + ['army_green'] = 'army Green', + ['dark_green'] = 'dark Green', + ['hunter_green'] = 'hunter Green', + ['matte_foilage_green'] = 'matte Foilage Green', -- Orange ['orange'] = 'orange', ['tangerine'] = 'Tangerine', @@ -179,4 +240,4 @@ Locales['en'] = { ['motorcycle'] = 'motorcycle', ['highend'] = 'high end', -} + diff --git a/locales/fr.lua b/locales/fr.lua index 333c2ee0..3f1abcef 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -54,13 +54,58 @@ Locales['fr'] = { ['grayhunter'] = 'Gris Chasseur', -- Red ['red'] = 'rouge', + ['torino_red'] = 'Rouge Turin', + ['poppy'] = 'Coquelicot', + ['copper_red'] = 'Rouge Cuivré', + ['cardinal'] = 'Rouge Cardinal', + ['brick'] = 'Rouge Brique', + ['garnet'] = 'Grenat', + ['cabernet'] = 'Pourpre', + ['candy'] = 'Framboise', + ['matte_red'] = 'Rouge Mat', + ['dark_red'] = 'Rouge Foncé', + ['red_pulp'] = 'Rouge Pulpeux', + ['bril_red'] = 'Rouge Brillant', + ['pale_red'] = 'Rouge Pale', + ['wine_red'] = 'Rouge Vin', + ['volcano'] = 'Volcano', -- Pink ['pink'] = 'rose', ['electricpink'] = 'rose Electrique', + ['brightpink'] = 'rose pétant', ['salmon'] = 'rose Saumon', ['sugarplum'] = 'rose Dragée', -- Blue ['blue'] = 'bleu', + ['topaz'] = 'topaze', + ['light_blue'] = 'bleu clair', + ['galaxy_blue'] = 'bleu galaxy', + ['dark_blue'] = 'bleu foncé', + ['azure'] = 'bleu azur', + ['navy_blue'] = 'bleu marine', + ['lapis'] = 'lapis lazuli', + ['blue_diamond'] = 'bleu diamant', + ['surfer'] = 'surfer', + ['pastel_blue'] = 'pastel', + ['celeste_blue'] = 'bleu celeste', + ['rally_blue'] = 'bleu rally', + ['blue_paradise'] = 'bleu paradis', + ['blue_night'] = 'bleu nuit', + ['cyan_blue'] = 'bleu cyan', + ['cobalt'] = 'cobalt', + ['electric_blue'] = 'bleu electrique', + ['horizon_blue'] = 'bleu horizon', + ['metallic_blue'] = 'bleu métallisé', + ['aquamarine'] = 'aigue marine', + ['blue_agathe'] = 'bleu agathe', + ['zirconium'] = 'zirconium', + ['spinel'] = 'spinelle', + ['tourmaline'] = 'tourmaline', + ['paradise'] = 'paradis', + ['bubble_gum'] = 'bubble gum', + ['midnight_blue'] = 'bleu minuit', + ['forbidden_blue'] = 'bleu interdit', + ['glacier_blue'] = 'bleu glacier', -- Yellow ['yellow'] = 'jaune', ['wheat'] = 'Jaune Blé', @@ -69,6 +114,23 @@ Locales['fr'] = { ['lightyellow'] = 'Jaune Pâle', -- Green ['green'] = 'vert', + ['met_dark_green'] = 'Vert Foncé', + ['rally_green'] = 'Vert Rally', + ['pine_green'] = 'Vert Sapin', + ['olive_green'] = 'Vert Olive', + ['light_green'] = 'Vert Clair', + ['lime_green'] = 'Vert Lime', + ['forest_green'] = 'Vert Forêt', + ['lawn_green'] = 'Vert Pelouse', + ['imperial_green'] = 'Vert Impérial', + ['green_bottle'] = 'Vert Bouteille', + ['citrus_green'] = 'Vert Citrus', + ['green_anis'] = 'Vert Anis', + ['khaki'] = 'Kaki', + ['army_green'] = 'Vert Army', + ['dark_green'] = 'Vert Sombre', + ['hunter_green'] = 'Vert Chasseur', + ['matte_foilage_green'] = 'Amarylisse', -- Orange ['orange'] = 'orange', ['tangerine'] = 'Tangerine', From c51bda7aaab64e8261524da37978f9f4b51ece10 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Sat, 2 Sep 2017 20:17:18 -0400 Subject: [PATCH 14/55] Fix for missing } --- locales/en.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/locales/en.lua b/locales/en.lua index dd3b5eae..39b6b522 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -239,5 +239,4 @@ Locales['en'] = { ['tuning'] = 'tuning', ['motorcycle'] = 'motorcycle', ['highend'] = 'high end', - - +} \ No newline at end of file From db2ae90a2df18c369e31b7650ec56525f8d2fcca Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Sat, 2 Sep 2017 21:09:58 -0400 Subject: [PATCH 15/55] Fix en.lua --- locales/en.lua | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/locales/en.lua b/locales/en.lua index dd3b5eae..fcc55277 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -89,7 +89,7 @@ Locales['en'] = { ['pastel_blue'] = 'pastel Blue', ['celeste_blue'] = 'celeste Blue', ['rally_blue'] = 'rally Blue', - ['blue_paradise'] = 'blue Paradise' + ['blue_paradise'] = 'blue Paradise', ['blue_night'] = 'blue Night', ['cyan_blue'] = 'cyan Blue', ['cobalt'] = 'cobalt', @@ -116,7 +116,7 @@ Locales['en'] = { ['green'] = 'green', ['met_dark_green'] = 'metallic Dark Green', ['rally_green'] = 'Rally Green', - ['pine_green'] = 'pine Green' + ['pine_green'] = 'pine Green', ['olive_green'] = 'olive Green', ['light_green'] = 'Light Green', ['lime_green'] = 'lime green', @@ -239,5 +239,4 @@ Locales['en'] = { ['tuning'] = 'tuning', ['motorcycle'] = 'motorcycle', ['highend'] = 'high end', - - +} \ No newline at end of file From 83b35ee9bf1e3f53ad8229e56a58799ba5094fb7 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Sun, 3 Sep 2017 00:59:34 -0400 Subject: [PATCH 16/55] Update multi-language support --- client/main.lua | 4 ++-- locales/en.lua | 3 ++- locales/fr.lua | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/client/main.lua b/client/main.lua index 8767cde6..e56d2d20 100644 --- a/client/main.lua +++ b/client/main.lua @@ -210,9 +210,9 @@ function GetAction(data) for j = 0, modCount-1, 1 do local _label = '' if j == currentMods[k] then - _label = 'Niveau ' .. j .. ' - '.. _U('installed') ..'' + _label = _U('level') .. j .. ' - '.. _U('installed') ..'' else - _label = 'Niveau ' .. j .. ' - $' .. v.price .. ' ' + _label = _U('level') .. j .. ' - $' .. v.price .. ' ' end table.insert(elements, {label = _label, modType = k, modNum = j}) end diff --git a/locales/en.lua b/locales/en.lua index fcc55277..1b6ff0b9 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -6,6 +6,7 @@ Locales['en'] = { ['not_enough_money'] = 'you do not have enough money!', ['purchased'] = 'purchased!', ['press_custom'] = 'press ~INPUT_PICKUP~ to personalize your vehicle.', + ['level'] = 'level ', -- Paint Colors -- Black ['black'] = 'black', @@ -207,7 +208,7 @@ Locales['en'] = { ['rightfender'] = 'right fender', ['spoilers'] = 'spoilers', ['sideskirt'] = 'side skirts', - ['frame'] = 'cage', + ['cage'] = 'cage', ['hood'] = 'hood', ['grille'] = 'grille', ['rearbumper'] = 'rear bumper', diff --git a/locales/fr.lua b/locales/fr.lua index 3f1abcef..cb3d713c 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -6,6 +6,7 @@ Locales['fr'] = { ['not_enough_money'] = 'vous n\'avez pas assez d\'argent !', ['purchased'] = 'achat effectué !', ['press_custom'] = 'appuyez sur ~INPUT_PICKUP~ pour personnaliser le véhicule.', + ['level'] = 'niveau ', -- Paint Colors -- Black ['black'] = 'noir', @@ -207,7 +208,7 @@ Locales['fr'] = { ['rightfender'] = 'aile droite', ['spoilers'] = 'aileron', ['sideskirt'] = 'bas de caisse', - ['frame'] = 'cage', + ['cage'] = 'cage', ['hood'] = 'capot', ['grille'] = 'grille', ['rearbumper'] = 'pare-choc arrière', From 1c432b4cf437bc799ada5e1d31edfdeb7b311828 Mon Sep 17 00:00:00 2001 From: Don <30905704+ddh3@users.noreply.github.com> Date: Wed, 6 Sep 2017 23:58:50 -0700 Subject: [PATCH 17/55] Fixed spelling Fixed spelling allterrain --- config.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.lua b/config.lua index 0da98d8a..3e9f13c1 100644 --- a/config.lua +++ b/config.lua @@ -478,7 +478,7 @@ Config.Menus = { modFrontWheelsType1 = _U('muscle'), modFrontWheelsType2 = _U('lowrider'), modFrontWheelsType3 = _U('suv'), - modFrontWheelsType4 = _U('allterain'), + modFrontWheelsType4 = _U('allterrain'), modFrontWheelsType5 = _U('tuning'), modFrontWheelsType6 = _U('motorcycle'), modFrontWheelsType7 = _U('highend') @@ -512,7 +512,7 @@ Config.Menus = { price = 500 }, modFrontWheelsType4 = { - label = _U('allterain'), + label = _U('allterrain'), parent = 'modFrontWheelsTypes', modType = 23, wheelType = 4, From ac0ce7a242cdf9b813d2a3a0906701f7d0ba4562 Mon Sep 17 00:00:00 2001 From: David Carneiro <31643017+TheMrDeivid@users.noreply.github.com> Date: Sat, 9 Sep 2017 05:40:42 +0100 Subject: [PATCH 18/55] Added the other 4 LsCustoms They are now inside the shops itselfs --- config.lua | 48 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/config.lua b/config.lua index 3e9f13c1..f36de1bd 100644 --- a/config.lua +++ b/config.lua @@ -3,14 +3,46 @@ Config.DrawDistance = 100.0 Config.Locale = 'fr' Config.Zones = { - ls1 = { - Pos = { x = -362.7962, y = -132.4005, z = 38.25239}, - Size = {x = 3.0, y = 3.0, z = 0.2}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Name = "LS CUSTOMS", - Hint = _U('press_custom') - } + ls1 = { + Pos = { x = -337.3863, y = -136.9247, z = 38.5737}, + Size = {x = 3.0, y = 3.0, z = 0.2}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Name = "Los Santos Customs", + Hint = _U('press_custom') + }, + ls2 = { + Pos = { x = -1155.536, y = -2007.183, z = 12.744}, + Size = {x = 3.0, y = 3.0, z = 0.2}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Name = "Los Santos Customs", + Hint = _U('press_custom') + }, + ls3 = { + Pos = { x = 731.8163, y = -1088.822, z = 21.733}, + Size = {x = 3.0, y = 3.0, z = 0.2}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Name = "Los Santos Customs", + Hint = _U('press_custom') + }, + ls4 = { + Pos = { x = 1175.04, y = 2640.216, z = 37.32177}, + Size = {x = 3.0, y = 3.0, z = 0.2}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Name = "Los Santos Customs", + Hint = _U('press_custom') + }, + ls5 = { + Pos = { x = 110.99, y = 6626.39, z = 30.89}, + Size = {x = 3.0, y = 3.0, z = 0.2}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Name = "Los Santos Customs", + Hint = _U('press_custom') + }, } Config.Colors = { From 630f3536fb9cddeebea3372142c8b152ede8e589 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Sat, 9 Sep 2017 15:12:11 -0400 Subject: [PATCH 19/55] Fix typo --- config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.lua b/config.lua index f36de1bd..af89be08 100644 --- a/config.lua +++ b/config.lua @@ -712,7 +712,7 @@ Config.Menus = { price = 500 }, windowTint = { - label = _U('windowTint'), + label = _U('windowtint'), parent = 'cosmetics', modType = 'windowTint', price = 500 From 068a4f8e28887d0bb3542ea7bdf80b5454fddaec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Thu, 14 Sep 2017 23:17:31 +0200 Subject: [PATCH 20/55] Update LICENSE.txt --- LICENSE.txt | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..3d5faccf --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + fxserver-esx_lscustom + Copyright (C) 2015 Jérémie N'gadi + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + fxserver-esx_lscustom Copyright (C) 2015 Jérémie N'gadi + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. \ No newline at end of file From d5a85c376f9054c16ab90e1940e02f3bc6033275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Fri, 15 Sep 2017 15:33:31 +0200 Subject: [PATCH 21/55] chore(resource): Add version --- __resource.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/__resource.lua b/__resource.lua index 699b368a..05c82414 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,3 +1,5 @@ +version '1.0.0' + server_scripts { '@mysql-async/lib/MySQL.lua', '@es_extended/locale.lua', From 3e0712b0a6e0ebff1f3f50ec84d55deef8254ea7 Mon Sep 17 00:00:00 2001 From: TanguyOrtegat Date: Tue, 3 Oct 2017 14:36:38 +0200 Subject: [PATCH 22/55] fix turbo --- client/main.lua | 14 +++++++++++++- config.lua | 50 ++++++++++++++++++++++++------------------------- locales/de.lua | 1 + locales/en.lua | 1 + locales/fr.lua | 1 + 5 files changed, 41 insertions(+), 26 deletions(-) diff --git a/client/main.lua b/client/main.lua index e56d2d20..066d6761 100644 --- a/client/main.lua +++ b/client/main.lua @@ -129,6 +129,10 @@ function GetAction(data) else table.insert(elements, {label = " " .. _U('by_default'), modType = k, modNum = -1}) end + + if v.modType == 17 then + table.insert(elements, {label = " " .. _U('no_turbo'), modType = k, modNum = false}) + end if v.modType == 14 then -- HORNS for j = 0, 51, 1 do @@ -205,7 +209,7 @@ function GetAction(data) table.insert(elements, {label = _label, modType = 'modFrontWheels', modNum = j, wheelType = v.wheelType, price = v.price}) end end - elseif v.modType == 11 or v.modType == 12 or v.modType == 13 or v.modType == 15 or v.modType == 16 or v.modType == 18 then + elseif v.modType == 11 or v.modType == 12 or v.modType == 13 or v.modType == 15 or v.modType == 16 then local modCount = GetNumVehicleMods(vehicle, v.modType) -- UPGRADES for j = 0, modCount-1, 1 do local _label = '' @@ -216,6 +220,14 @@ function GetAction(data) end table.insert(elements, {label = _label, modType = k, modNum = j}) end + elseif v.modType == 17 then -- TURBO + local _label = '' + if currentMods.modTurbo then + _label = 'Turbo - '.. _U('installed') ..'' + else + _label = 'Turbo - $' .. v.price .. ' ' + end + table.insert(elements, {label = _label, modType = k, modNum = true}) else local modCount = GetNumVehicleMods(vehicle, v.modType) -- BODYPARTS for j = 0, modCount, 1 do diff --git a/config.lua b/config.lua index af89be08..8238e092 100644 --- a/config.lua +++ b/config.lua @@ -12,36 +12,36 @@ Config.Zones = { Hint = _U('press_custom') }, ls2 = { - Pos = { x = -1155.536, y = -2007.183, z = 12.744}, - Size = {x = 3.0, y = 3.0, z = 0.2}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Name = "Los Santos Customs", - Hint = _U('press_custom') + Pos = { x = -1155.536, y = -2007.183, z = 12.744}, + Size = {x = 3.0, y = 3.0, z = 0.2}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Name = "Los Santos Customs", + Hint = _U('press_custom') }, ls3 = { - Pos = { x = 731.8163, y = -1088.822, z = 21.733}, - Size = {x = 3.0, y = 3.0, z = 0.2}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Name = "Los Santos Customs", - Hint = _U('press_custom') + Pos = { x = 731.8163, y = -1088.822, z = 21.733}, + Size = {x = 3.0, y = 3.0, z = 0.2}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Name = "Los Santos Customs", + Hint = _U('press_custom') }, ls4 = { - Pos = { x = 1175.04, y = 2640.216, z = 37.32177}, - Size = {x = 3.0, y = 3.0, z = 0.2}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Name = "Los Santos Customs", - Hint = _U('press_custom') + Pos = { x = 1175.04, y = 2640.216, z = 37.32177}, + Size = {x = 3.0, y = 3.0, z = 0.2}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Name = "Los Santos Customs", + Hint = _U('press_custom') }, ls5 = { - Pos = { x = 110.99, y = 6626.39, z = 30.89}, - Size = {x = 3.0, y = 3.0, z = 0.2}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Name = "Los Santos Customs", - Hint = _U('press_custom') + Pos = { x = 110.99, y = 6626.39, z = 30.89}, + Size = {x = 3.0, y = 3.0, z = 0.2}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Name = "Los Santos Customs", + Hint = _U('press_custom') }, } @@ -481,7 +481,7 @@ Config.Menus = { modTurbo = { label = _U('turbo'), parent = 'upgrades', - modType = 18, + modType = 17, price = 500 }, cosmetics = { diff --git a/locales/de.lua b/locales/de.lua index 75567f0b..d7a1be95 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -138,6 +138,7 @@ Locales['de'] = { ['suspension'] = 'suspension', ['armor'] = 'armor', ['turbo'] = 'turbo', + ['no_turbo'] = 'keine turbo', -- Cosmetics ['cosmetics'] = 'cosmetics', -- Body Parts diff --git a/locales/en.lua b/locales/en.lua index 1b6ff0b9..565f928e 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -200,6 +200,7 @@ Locales['en'] = { ['suspension'] = 'suspension', ['armor'] = 'armor', ['turbo'] = 'turbo', + ['no_turbo'] = 'no turbo', -- Cosmetics ['cosmetics'] = 'cosmetics', -- Body Parts diff --git a/locales/fr.lua b/locales/fr.lua index cb3d713c..6368fb8e 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -200,6 +200,7 @@ Locales['fr'] = { ['suspension'] = 'suspension', ['armor'] = 'armure', ['turbo'] = 'turbo', + ['no_turbo'] = 'pas de turbo', -- Cosmetics ['cosmetics'] = 'cosmétiques', -- Body Parts From 613af392bf3e67b7190417bd63909886d966348e Mon Sep 17 00:00:00 2001 From: renaiku Date: Sat, 28 Oct 2017 20:32:48 +0200 Subject: [PATCH 23/55] ADD BENNY'S --- client/main.lua | 153 ++++++++++++++++++++----------- config.lua | 235 ++++++++++++++++++++++++++++++++++++++++-------- server/main.lua | 24 +++++ 3 files changed, 324 insertions(+), 88 deletions(-) diff --git a/client/main.lua b/client/main.lua index 066d6761..d8dedfc6 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,4 +1,5 @@ ESX = nil +local Vehicles = {} Citizen.CreateThread(function() while ESX == nil do @@ -11,8 +12,16 @@ local lsMenuIsShowed = false local isInLSMarker = false local myCar = {} +RegisterNetEvent('esx:playerLoaded') +AddEventHandler('esx:playerLoaded', function() + ESX.TriggerServerCallback('esx_lscustom:getVehiclesPrices', function(vehicles) + Vehicles = vehicles + end) +end) + RegisterNetEvent('esx_lscustom:installMod') AddEventHandler('esx_lscustom:installMod', function() + --Citizen.Trace('installMod') local vehicle = GetVehiclePedIsIn(GetPlayerPed(-1), false) myCar = ESX.Game.GetVehicleProperties(vehicle) TriggerServerEvent('esx_lscustom:refreshOwnedVehicle', myCar) @@ -20,6 +29,9 @@ end) RegisterNetEvent('esx_lscustom:cancelInstallMod') AddEventHandler('esx_lscustom:cancelInstallMod', function() + --Citizen.Trace('cancelInstallMod') + --Citizen.Trace('myCar: ' .. json.encode(myCar)) + local vehicle = GetVehiclePedIsIn(GetPlayerPed(-1), false) ESX.Game.SetVehicleProperties(vehicle, myCar) end) @@ -38,17 +50,34 @@ function OpenLSMenu(elems, menuname, menutitle, parent) if data.current.modType == "modFrontWheels" then isRimMod = true end + local vehicle = GetVehiclePedIsIn(GetPlayerPed(-1), false) local found = false for k,v in pairs(Config.Menus) do if k == data.current.modType or isRimMod then if data.current.label == _U('by_default') or string.match(data.current.label, _U('installed')) then ESX.ShowNotification(_U('already_own') .. data.current.label) + TriggerEvent('esx_lscustom:installMod') else - if isRimMod then - TriggerServerEvent("esx_lscustom:buyMod", data.current.price) - else - TriggerServerEvent("esx_lscustom:buyMod", v.price) + local vehiclePrice = 0 + + for i=1, #Vehicles, 1 do + if GetEntityModel(vehicle) == GetHashKey(Vehicles[i].model) then + vehiclePrice = Vehicles[i].price + break + end end + + if isRimMod then + price = math.floor(vehiclePrice * data.current.price / 100) + TriggerServerEvent("esx_lscustom:buyMod", price) + elseif v.modType == 11 or v.modType == 12 or v.modType == 13 or v.modType == 15 or v.modType == 16 or v.modType == 17 then + price = math.floor(vehiclePrice * v.price[data.current.modNum + 1] / 100) + TriggerServerEvent("esx_lscustom:buyMod", price) + else + price = math.floor(vehiclePrice * v.price / 100) + TriggerServerEvent("esx_lscustom:buyMod", price) + end + end menu.close() found = true @@ -62,11 +91,17 @@ function OpenLSMenu(elems, menuname, menutitle, parent) function(data, menu) -- on cancel menu.close() TriggerEvent('esx_lscustom:cancelInstallMod') + + local playerPed = GetPlayerPed(-1) + local vehicle = GetVehiclePedIsIn(playerPed, false) + + SetVehicleDoorsShut(vehicle, false) + if parent == nil then lsMenuIsShowed = false local vehicle = GetVehiclePedIsIn(GetPlayerPed(-1), false) FreezeEntityPosition(vehicle, false) - myCar = nil + myCar = {} end end, function(data, menu) -- on change @@ -76,9 +111,11 @@ function OpenLSMenu(elems, menuname, menutitle, parent) end function UpdateMods(data) - if data.modType ~= nil then - local vehicle = GetVehiclePedIsIn(GetPlayerPed(-1), false) - local props = {} + + local vehicle = GetVehiclePedIsIn(GetPlayerPed(-1), false) + + if data.modType ~= nil then + local props = {} --Citizen.Trace('modType: ' .. data.modType) --Citizen.Trace('modNum: ' .. json.encode(data.modNum)) @@ -111,6 +148,33 @@ function GetAction(data) local vehicle = GetVehiclePedIsIn(playerPed, false) local currentMods = ESX.Game.GetVehicleProperties(vehicle) + if data.value == 'modSpeakers' or + data.value == 'modTrunk' or + data.value == 'modHydrolic' or + data.value == 'modEngineBlock' or + data.value == 'modAirFilter' or + data.value == 'modStruts' or + data.value == 'modTank' then + SetVehicleDoorOpen(vehicle, 4, false) + SetVehicleDoorOpen(vehicle, 5, false) + elseif data.value == 'modDoorSpeaker' then + SetVehicleDoorOpen(vehicle, 0, false) + SetVehicleDoorOpen(vehicle, 1, false) + SetVehicleDoorOpen(vehicle, 2, false) + SetVehicleDoorOpen(vehicle, 3, false) + else + SetVehicleDoorsShut(vehicle, false) + end + + local vehiclePrice = 0 + + for i=1, #Vehicles, 1 do + if GetEntityModel(vehicle) == GetHashKey(Vehicles[i].model) then + vehiclePrice = Vehicles[i].price + break + end + end + for k,v in pairs(Config.Menus) do if data.value == k then @@ -120,7 +184,7 @@ function GetAction(data) parent = v.parent if v.modType ~= nil then - + if v.modType == 22 then table.insert(elements, {label = " " .. _U('by_default'), modType = k, modNum = false}) elseif v.modType == 'color1' or v.modType == 'color2' or v.modType == 'pearlescentColor' or v.modType == 'wheelColor' then @@ -129,10 +193,6 @@ function GetAction(data) else table.insert(elements, {label = " " .. _U('by_default'), modType = k, modNum = -1}) end - - if v.modType == 17 then - table.insert(elements, {label = " " .. _U('no_turbo'), modType = k, modNum = false}) - end if v.modType == 14 then -- HORNS for j = 0, 51, 1 do @@ -140,7 +200,8 @@ function GetAction(data) if j == currentMods.modHorns then _label = GetHornName(j) .. ' - '.. _U('installed') ..'' else - _label = GetHornName(j) .. ' - $' .. v.price .. ' ' + price = math.floor(vehiclePrice * v.price / 100) + _label = GetHornName(j) .. ' - $' .. price .. ' ' end table.insert(elements, {label = _label, modType = k, modNum = j}) end @@ -150,7 +211,8 @@ function GetAction(data) if j == currentMods.plateIndex then _label = GetPlatesName(j) .. ' - '.. _U('installed') ..'' else - _label = GetPlatesName(j) .. ' - $' .. v.price .. ' ' + price = math.floor(vehiclePrice * v.price / 100) + _label = GetPlatesName(j) .. ' - $' .. price .. ' ' end table.insert(elements, {label = _label, modType = k, modNum = j}) end @@ -159,15 +221,17 @@ function GetAction(data) if currentMods.modXenon then _label = 'Xénon - '.. _U('installed') ..'' else - _label = 'Xénon - $' .. v.price .. ' ' + price = math.floor(vehiclePrice * v.price / 100) + _label = 'Xénon - $' .. price .. ' ' end table.insert(elements, {label = _label, modType = k, modNum = true}) elseif v.modType == 'neonColor' or v.modType == 'tyreSmokeColor' then -- NEON & SMOKE COLOR - local neons = GetNeons() + local neons = GetNeons() + price = math.floor(vehiclePrice * v.price / 100) for i=1, #neons, 1 do table.insert(elements, { - label = '' .. neons[i].label .. ' ', + label = '' .. neons[i].label .. ' - $' .. price .. '', modType = k, modNum = { neons[i].r, neons[i].g, neons[i].b } } @@ -177,7 +241,8 @@ function GetAction(data) local colors = GetColors(data.color) for j = 1, #colors, 1 do local _label = '' - _label = colors[j].label .. ' - $' .. v.price .. ' ' + price = math.floor(vehiclePrice * v.price / 100) + _label = colors[j].label .. ' - $' .. price .. ' ' table.insert(elements, {label = _label, modType = k, modNum = colors[j].index}) end elseif v.modType == 'windowTint' then -- WINDOWS TINT @@ -186,7 +251,8 @@ function GetAction(data) if j == currentMods.modHorns then _label = GetWindowName(j) .. ' - '.. _U('installed') ..'' else - _label = GetWindowName(j) .. ' - $' .. v.price .. ' ' + price = math.floor(vehiclePrice * v.price / 100) + _label = GetWindowName(j) .. ' - $' .. price .. ' ' end table.insert(elements, {label = _label, modType = k, modNum = j}) end @@ -204,30 +270,27 @@ function GetAction(data) if j == currentMods.modFrontWheels then _label = GetLabelText(modName) .. ' - '.. _U('installed') ..'' else - _label = GetLabelText(modName) .. ' - $' .. v.price .. ' ' + price = math.floor(vehiclePrice * v.price / 100) + _label = GetLabelText(modName) .. ' - $' .. price .. ' ' end table.insert(elements, {label = _label, modType = 'modFrontWheels', modNum = j, wheelType = v.wheelType, price = v.price}) end end - elseif v.modType == 11 or v.modType == 12 or v.modType == 13 or v.modType == 15 or v.modType == 16 then + elseif v.modType == 11 or v.modType == 12 or v.modType == 13 or v.modType == 15 or v.modType == 16 or v.modType == 18 then local modCount = GetNumVehicleMods(vehicle, v.modType) -- UPGRADES - for j = 0, modCount-1, 1 do + for j = 0, modCount, 1 do local _label = '' if j == currentMods[k] then - _label = _U('level') .. j .. ' - '.. _U('installed') ..'' + _label = 'Niveau ' .. j+1 .. ' - '.. _U('installed') ..'' else - _label = _U('level') .. j .. ' - $' .. v.price .. ' ' + price = math.floor(vehiclePrice * v.price[j+1] / 100) + _label = 'Niveau ' .. j+1 .. ' - $' .. price .. ' ' end table.insert(elements, {label = _label, modType = k, modNum = j}) + if j == modCount-1 then + break + end end - elseif v.modType == 17 then -- TURBO - local _label = '' - if currentMods.modTurbo then - _label = 'Turbo - '.. _U('installed') ..'' - else - _label = 'Turbo - $' .. v.price .. ' ' - end - table.insert(elements, {label = _label, modType = k, modNum = true}) else local modCount = GetNumVehicleMods(vehicle, v.modType) -- BODYPARTS for j = 0, modCount, 1 do @@ -237,7 +300,8 @@ function GetAction(data) if j == currentMods[k] then _label = GetLabelText(modName) .. ' - '.. _U('installed') ..'' else - _label = GetLabelText(modName) .. ' - $' .. v.price .. ' ' + price = math.floor(vehiclePrice * v.price / 100) + _label = GetLabelText(modName) .. ' - $' .. price .. ' ' end table.insert(elements, {label = _label, modType = k, modNum = j}) end @@ -251,7 +315,7 @@ function GetAction(data) elseif data.value == 'secondaryRespray' then table.insert(elements, {label = Config.Colors[i].label, value = 'color2', color = Config.Colors[i].value}) elseif data.value == 'pearlescentRespray' then - table.insert(elements, {label = Config.Colors[i].label, value = 'pearlescentColor', color = Config.Colors[i].value}) + table.insert(elements, {label = Config.Colors[i].label, value = 'pearlescentColor', color = Config.Colors[i].value}) elseif data.value == 'modFrontWheelsColor' then table.insert(elements, {label = Config.Colors[i].label, value = 'wheelColor', color = Config.Colors[i].value}) end @@ -313,12 +377,10 @@ Citizen.CreateThread(function() end end - if IsControlJustReleased(0, 38) and not lsMenuIsShowed and isInLSMarker then + if IsControlJustReleased(0, 38) and not lsMenuIsShowed and isInLSMarker then lsMenuIsShowed = true local vehicle = GetVehiclePedIsIn(playerPed, false) - - --SetVehicleUndriveable(vehicle, true) FreezeEntityPosition(vehicle, true) myCar = ESX.Game.GetVehicleProperties(vehicle) @@ -333,21 +395,8 @@ Citizen.CreateThread(function() if not isInLSMarker and hasAlreadyEnteredMarker then hasAlreadyEnteredMarker = false - --lsMenuIsShowed = false - --ESX.UI.Menu.CloseAll() end end end -end) - ---char GET_MOD_SLOT_NAME(Vehicle vehicle, int modType) - ---int GET_NUM_VEHICLE_MODS(Vehicle vehicle, int modType) - ---char *GET_MOD_TEXT_LABEL(Vehicle vehicle, int modType, int modValue) - - --_GET_LABEL_TEXT to get the part name in the games language - ---local Veh = GetVehiclePedIsIn(GetPlayerPed(-1), true) ---local VehType = GetLabelText(GetDisplayNameFromVehicleModel(GetEntityModel(Veh))) +end) \ No newline at end of file diff --git a/config.lua b/config.lua index 8238e092..626c9454 100644 --- a/config.lua +++ b/config.lua @@ -452,37 +452,37 @@ Config.Menus = { label = _U('engine'), parent = 'upgrades', modType = 11, - price = 500 + price = {13.95, 32.56, 65.12, 139.53} }, modBrakes = { label = _U('brakes'), parent = 'upgrades', modType = 12, - price = 500 + price = {4.65, 9.3, 18.6, 13.95} }, modTransmission = { label = _U('transmission'), parent = 'upgrades', modType = 13, - price = 500 + price = {13.95, 20.93, 46.51} }, modSuspension = { label = _U('suspension'), parent = 'upgrades', modType = 15, - price = 500 + price = {3.72, 7.44, 14.88, 29.77, 40.2} }, modArmor = { label = _U('armor'), parent = 'upgrades', modType = 16, - price = 500 + price = {69.77, 116.28, 6666666.6, 6666666.6, 6666666.6, 6666666.6} }, modTurbo = { label = _U('turbo'), parent = 'upgrades', modType = 17, - price = 500 + price = {55.81} }, cosmetics = { label = _U('cosmetics'), @@ -494,8 +494,171 @@ Config.Menus = { resprays = _U('respray'), modXenon = _U('headlights'), plateIndex = _U('licenseplates'), - wheels = _U('wheels') + wheels = _U('wheels'), + modPlateHolder = 'Plaque - Contour', + modVanityPlate = 'Plaque - Avant', + modTrimA = 'Intérieur', + modOrnaments = 'Ornements', + modDashboard = 'Tableau de bord', + modDial = 'Compteur de vitesse', + modDoorSpeaker = 'Sono portière', + modSeats = 'Sièges', + modSteeringWheel = 'Volant', + modShifterLeavers = 'Levier de vitesse', + modAPlate = 'Plage arrière', + modSpeakers = 'Sono', + modTrunk = 'Coffre', + modHydrolic = 'Hydrolique', + modEngineBlock = 'Bloc moteur', + modAirFilter = 'Filtre à air', + modStruts = 'Struts', + modArchCover = 'Cache-roues', + modAerials = 'Antennes', + modTrimB = 'Ailes', + modTank = 'Réservoir', + modWindows = 'Fenêtres', + modLivery = 'Stickers' }, + + modPlateHolder = { + label = 'Plaque - Contour', + parent = 'cosmetics', + modType = 25, + price = 3.49 + }, + modVanityPlate = { + label = 'Plaque - Avant', + parent = 'cosmetics', + modType = 26, + price = 1.1 + }, + modTrimA = { + label = 'Intérieur', + parent = 'cosmetics', + modType = 27, + price = 6.98 + }, + modOrnaments = { + label = 'Ornements', + parent = 'cosmetics', + modType = 28, + price = 0.9 + }, + modDashboard = { + label = 'Tableau de bord', + parent = 'cosmetics', + modType = 29, + price = 4.65 + }, + modDial = { + label = 'Compteur de vitesse', + parent = 'cosmetics', + modType = 30, + price = 4.19 + }, + modDoorSpeaker = { + label = 'Sono portière', + parent = 'cosmetics', + modType = 31, + price = 5.58 + }, + modSeats = { + label = 'Siège', + parent = 'cosmetics', + modType = 32, + price = 4.65 + }, + modSteeringWheel = { + label = 'Volant', + parent = 'cosmetics', + modType = 33, + price = 4.19 + }, + modShifterLeavers = { + label = 'Levier de vitesse', + parent = 'cosmetics', + modType = 34, + price = 3.26 + }, + modAPlate = { + label = 'Plage arrière', + parent = 'cosmetics', + modType = 35, + price = 4.19 + }, + modSpeakers = { + label = 'Sono', + parent = 'cosmetics', + modType = 36, + price = 6.98 + }, + modTrunk = { + label = 'Coffre', + parent = 'cosmetics', + modType = 37, + price = 5.58 + }, + modHydrolic = { + label = 'Hydrolique', + parent = 'cosmetics', + modType = 38, + price = 5.12 + }, + modEngineBlock = { + label = 'Bloc moteur', + parent = 'cosmetics', + modType = 39, + price = 5.12 + }, + modAirFilter = { + label = 'Filtre a air', + parent = 'cosmetics', + modType = 40, + price = 3.72 + }, + modStruts = { + label = 'Struts', + parent = 'cosmetics', + modType = 41, + price = 6.51 + }, + modArchCover = { + label = 'Cache-roues', + parent = 'cosmetics', + modType = 42, + price = 4.19 + }, + modAerials = { + label = 'Antennes', + parent = 'cosmetics', + modType = 43, + price = 1.12 + }, + modTrimB = { + label = 'Ailes', + parent = 'cosmetics', + modType = 44, + price = 6.05 + }, + modTank = { + label = 'Réservoir', + parent = 'cosmetics', + modType = 45, + price = 4.19 + }, + modWindows = { + label = 'Fenêtres', + parent = 'cosmetics', + modType = 46, + price = 4.19 + }, + modLivery = { + label = 'Stickers', + parent = 'cosmetics', + modType = 48, + price = 9.3 + }, + wheels = { label = _U('wheels'), parent = 'cosmetics', @@ -520,56 +683,56 @@ Config.Menus = { parent = 'modFrontWheelsTypes', modType = 23, wheelType = 0, - price = 500 + price = 4.65 }, modFrontWheelsType1 = { label = _U('muscle'), parent = 'modFrontWheelsTypes', modType = 23, wheelType = 1, - price = 500 + price = 4.19 }, modFrontWheelsType2 = { label = _U('lowrider'), parent = 'modFrontWheelsTypes', modType = 23, wheelType = 2, - price = 500 + price = 4.65 }, modFrontWheelsType3 = { label = _U('suv'), parent = 'modFrontWheelsTypes', modType = 23, wheelType = 3, - price = 500 + price = 4.19 }, modFrontWheelsType4 = { label = _U('allterrain'), parent = 'modFrontWheelsTypes', modType = 23, wheelType = 4, - price = 500 + price = 4.19 }, modFrontWheelsType5 = { label = _U('tuning'), parent = 'modFrontWheelsTypes', modType = 23, wheelType = 5, - price = 500 + price = 5.12 }, modFrontWheelsType6 = { label = _U('motorcycle'), parent = 'modFrontWheelsTypes', modType = 23, wheelType = 6, - price = 500 + price = 3.26 }, modFrontWheelsType7 = { label = _U('highend'), parent = 'modFrontWheelsTypes', modType = 23, wheelType = 7, - price = 500 + price = 5.12 }, modFrontWheelsColor = { label = 'Peinture Jantes', @@ -579,13 +742,13 @@ Config.Menus = { label = 'Peinture Jantes', parent = 'modFrontWheelsColor', modType = 'wheelColor', - price = 500 + price = 0.66 }, plateIndex = { label = _U('licenseplates'), parent = 'cosmetics', modType = 'plateIndex', - price = 500 + price = 1.1 }, resprays = { label = _U('respray'), @@ -610,25 +773,25 @@ Config.Menus = { label = _U('primary'), parent = 'primaryRespray', modType = 'color1', - price = 500 + price = 1.12 }, color2 = { label = _U('secondary'), parent = 'secondaryRespray', modType = 'color2', - price = 500 + price = 0.66 }, pearlescentColor = { label = _U('pearlescent'), parent = 'pearlescentRespray', modType = 'pearlescentColor', - price = 500 + price = 0.88 }, modXenon = { label = _U('headlights'), parent = 'cosmetics', modType = 22, - price = 500 + price = 3.72 }, bodyparts = { label = _U('bodyparts'), @@ -649,91 +812,91 @@ Config.Menus = { label = _U('spoilers'), parent = 'bodyparts', modType = 0, - price = 500 + price = 4.65 }, modFrontBumper = { label = _U('frontbumper'), parent = 'bodyparts', modType = 1, - price = 500 + price = 5.12 }, modRearBumper = { label = _U('rearbumper'), parent = 'bodyparts', modType = 2, - price = 500 + price = 5.12 }, modSideSkirt = { label = _U('sideskirt'), parent = 'bodyparts', modType = 3, - price = 500 + price = 4.65 }, modExhaust = { label = _U('exhaust'), parent = 'bodyparts', modType = 4, - price = 500 + price = 5.12 }, modFrame = { label = _U('cage'), parent = 'bodyparts', modType = 5, - price = 500 + price = 5.12 }, modGrille = { label = _U('grille'), parent = 'bodyparts', modType = 6, - price = 500 + price = 3.72 }, modHood = { label = _U('hood'), parent = 'bodyparts', modType = 7, - price = 500 + price = 4.88 }, modFender = { label = _U('leftfender'), parent = 'bodyparts', modType = 8, - price = 500 + price = 5.12 }, modRightFender = { label = _U('rightfender'), parent = 'bodyparts', modType = 9, - price = 500 + price = 5.12 }, modRoof = { label = _U('roof'), parent = 'bodyparts', modType = 10, - price = 500 + price = 5.58 }, windowTint = { label = _U('windowtint'), parent = 'cosmetics', modType = 'windowTint', - price = 500 + price = 1.12 }, modHorns = { label = _U('horns'), parent = 'cosmetics', modType = 14, - price = 500 + price = 1.12 }, neonColor = { label = _U('neons'), parent = 'cosmetics', modType = 'neonColor', - price = 500 + price = 1.12 }, tyreSmokeColor = { label = _U('tiresmoke'), parent = 'wheels', modType = 'tyreSmokeColor', - price = 500 + price = 1.12 } } diff --git a/server/main.lua b/server/main.lua index de331d01..45c410b2 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,5 +1,6 @@ ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) +local Vehicles = nil RegisterServerEvent('esx_lscustom:buyMod') AddEventHandler('esx_lscustom:buyMod', function(price) @@ -25,4 +26,27 @@ AddEventHandler('esx_lscustom:refreshOwnedVehicle', function(myCar) ['@vehicle'] = json.encode(myCar) } ) +end) + +ESX.RegisterServerCallback('esx_lscustom:getVehiclesPrices', function(source, cb) + + if Vehicles == nil then + MySQL.Async.fetchAll( + 'SELECT * FROM vehicles', + {}, + function(result) + local vehicles = {} + for i=1, #result, 1 do + table.insert(vehicles,{ + model = result[i].model, + price = result[i].price + }) + end + Vehicles = vehicles + cb(Vehicles) + end + ) + else + cb(Vehicles) + end end) \ No newline at end of file From 4f6fdf5a50fad7ba387a124285e3599c8ac83725 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 28 Oct 2017 21:46:28 +0200 Subject: [PATCH 24/55] Add config with mecanojobonly --- client/main.lua | 32 +++++++++++++++++++++----------- config.lua | 1 + 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/client/main.lua b/client/main.lua index d8dedfc6..332cc32c 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,5 +1,6 @@ ESX = nil local Vehicles = {} +local PlayerData = {} Citizen.CreateThread(function() while ESX == nil do @@ -13,12 +14,19 @@ local isInLSMarker = false local myCar = {} RegisterNetEvent('esx:playerLoaded') -AddEventHandler('esx:playerLoaded', function() +AddEventHandler('esx:playerLoaded', function(xPlayer) + PlayerData = xPlayer ESX.TriggerServerCallback('esx_lscustom:getVehiclesPrices', function(vehicles) Vehicles = vehicles end) end) + +RegisterNetEvent('esx:setJob') +AddEventHandler('esx:setJob', function(job) + PlayerData.job = job +end) + RegisterNetEvent('esx_lscustom:installMod') AddEventHandler('esx_lscustom:installMod', function() --Citizen.Trace('installMod') @@ -341,6 +349,7 @@ end -- Blips Citizen.CreateThread(function() + for k,v in pairs(Config.Zones)do local blip = AddBlipForCoord(v.Pos.x, v.Pos.y, v.Pos.z) SetBlipSprite(blip, 72) @@ -362,18 +371,19 @@ Citizen.CreateThread(function() local currentZone = nil local zone = nil local lastZone = nil + if (PlayerData.job ~= nil and PlayerData.job.name == 'mecano') or Config.IsMecanoJobOnly == false then + for k,v in pairs(Config.Zones) do + if(GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < v.Size.x) then + isInLSMarker = true - for k,v in pairs(Config.Zones) do - if(GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < v.Size.x) then - isInLSMarker = true + SetTextComponentFormat("STRING") + AddTextComponentString(v.Hint) + DisplayHelpTextFromStringLabel(0, 0, 1, -1) - SetTextComponentFormat("STRING") - AddTextComponentString(v.Hint) - DisplayHelpTextFromStringLabel(0, 0, 1, -1) - - break - else - isInLSMarker = false + break + else + isInLSMarker = false + end end end diff --git a/config.lua b/config.lua index 626c9454..20f17a09 100644 --- a/config.lua +++ b/config.lua @@ -1,6 +1,7 @@ Config = {} Config.DrawDistance = 100.0 Config.Locale = 'fr' +Config.IsMecanoJobOnly = false Config.Zones = { ls1 = { From e81e5f3b70456c1c606ec7fb1d68ec1fb5485a49 Mon Sep 17 00:00:00 2001 From: renaiku Date: Sat, 28 Oct 2017 20:33:22 +0200 Subject: [PATCH 25/55] version --- __resource.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__resource.lua b/__resource.lua index 05c82414..8497047c 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,4 +1,4 @@ -version '1.0.0' +version '2.0.0' server_scripts { '@mysql-async/lib/MySQL.lua', From ce949455bf4ab26ecd8e37ac94d09873646e1ce4 Mon Sep 17 00:00:00 2001 From: renaiku Date: Thu, 2 Nov 2017 18:34:02 +0100 Subject: [PATCH 26/55] turbo fix back again ? --- client/main.lua | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/client/main.lua b/client/main.lua index 332cc32c..731029f5 100644 --- a/client/main.lua +++ b/client/main.lua @@ -198,7 +198,9 @@ function GetAction(data) elseif v.modType == 'color1' or v.modType == 'color2' or v.modType == 'pearlescentColor' or v.modType == 'wheelColor' then local num = myCar[v.modType] table.insert(elements, {label = " " .. _U('by_default'), modType = k, modNum = num}) - else + elseif v.modType == 17 then + table.insert(elements, {label = " " .. _U('no_turbo'), modType = k, modNum = false}) + else table.insert(elements, {label = " " .. _U('by_default'), modType = k, modNum = -1}) end @@ -284,7 +286,7 @@ function GetAction(data) table.insert(elements, {label = _label, modType = 'modFrontWheels', modNum = j, wheelType = v.wheelType, price = v.price}) end end - elseif v.modType == 11 or v.modType == 12 or v.modType == 13 or v.modType == 15 or v.modType == 16 or v.modType == 18 then + elseif v.modType == 11 or v.modType == 12 or v.modType == 13 or v.modType == 15 or v.modType == 16 then local modCount = GetNumVehicleMods(vehicle, v.modType) -- UPGRADES for j = 0, modCount, 1 do local _label = '' @@ -299,6 +301,14 @@ function GetAction(data) break end end + elseif v.modType == 17 then -- TURBO + local _label = '' + if currentMods.modTurbo then + _label = 'Turbo - '.. _U('installed') ..'' + else + _label = 'Turbo - $' .. v.price .. ' ' + end + table.insert(elements, {label = _label, modType = k, modNum = true}) else local modCount = GetNumVehicleMods(vehicle, v.modType) -- BODYPARTS for j = 0, modCount, 1 do From 4a8c95189fe4544f12ab2e2a0d1a58f965cd0dc9 Mon Sep 17 00:00:00 2001 From: Sylundef Date: Thu, 9 Nov 2017 14:57:13 +0100 Subject: [PATCH 27/55] Use mecano account when isMecanoJobOnly = true --- server/main.lua | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/server/main.lua b/server/main.lua index 45c410b2..3e27d1fe 100644 --- a/server/main.lua +++ b/server/main.lua @@ -4,17 +4,34 @@ local Vehicles = nil RegisterServerEvent('esx_lscustom:buyMod') AddEventHandler('esx_lscustom:buyMod', function(price) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) - price = tonumber(price) - if price > xPlayer.getMoney() then - TriggerClientEvent('esx_lscustom:cancelInstallMod', _source) - TriggerClientEvent('esx:showNotification', _source, _U('not_enough_money')) - else - xPlayer.removeMoney(price) - TriggerClientEvent('esx_lscustom:installMod', _source) - TriggerClientEvent('esx:showNotification', _source, _U('purchased')) - end + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) + price = tonumber(price) + + if Config.IsMecanoJobOnly == true then + local societyAccount = nil + TriggerEvent('esx_addonaccount:getSharedAccount', 'society_mecano', function(account) + societyAccount = account + end) + if price < societyAccount.money then + TriggerClientEvent('esx_lscustom:installMod', _source) + TriggerClientEvent('esx:showNotification', _source, _U('purchased')) + societyAccount.removeMoney(price) + else + TriggerClientEvent('esx_lscustom:cancelInstallMod', _source) + TriggerClientEvent('esx:showNotification', _source, _U('not_enough_money')) + end + + else + if price < xPlayer.getMoney() then + TriggerClientEvent('esx_lscustom:installMod', _source) + TriggerClientEvent('esx:showNotification', _source, _U('purchased')) + xPlayer.removeMoney(price) + else + TriggerClientEvent('esx_lscustom:cancelInstallMod', _source) + TriggerClientEvent('esx:showNotification', _source, _U('not_enough_money')) + end + end end) RegisterServerEvent('esx_lscustom:refreshOwnedVehicle') From b563cedc66e68284fa2dd54314baf734e5386e71 Mon Sep 17 00:00:00 2001 From: Lollypop Date: Tue, 30 Jan 2018 00:38:15 +0100 Subject: [PATCH 28/55] Fix turbo Adds exceptions for buying turbo because turbos "modNum" is currently a boolean but it is used as an index for an array which gives off a lua error and makes it impossible to purchase it --- client/main.lua | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/client/main.lua b/client/main.lua index 731029f5..71bb82a1 100644 --- a/client/main.lua +++ b/client/main.lua @@ -78,9 +78,12 @@ function OpenLSMenu(elems, menuname, menutitle, parent) if isRimMod then price = math.floor(vehiclePrice * data.current.price / 100) TriggerServerEvent("esx_lscustom:buyMod", price) - elseif v.modType == 11 or v.modType == 12 or v.modType == 13 or v.modType == 15 or v.modType == 16 or v.modType == 17 then + elseif v.modType == 11 or v.modType == 12 or v.modType == 13 or v.modType == 15 or v.modType == 16 then price = math.floor(vehiclePrice * v.price[data.current.modNum + 1] / 100) TriggerServerEvent("esx_lscustom:buyMod", price) + elseif v.modType == 17 then + price = math.floor(vehiclePrice * v.price[1] / 100) + TriggerServerEvent("esx_lscustom:buyMod", price) else price = math.floor(vehiclePrice * v.price / 100) TriggerServerEvent("esx_lscustom:buyMod", price) @@ -303,10 +306,10 @@ function GetAction(data) end elseif v.modType == 17 then -- TURBO local _label = '' - if currentMods.modTurbo then + if currentMods[k] then _label = 'Turbo - '.. _U('installed') ..'' else - _label = 'Turbo - $' .. v.price .. ' ' + _label = 'Turbo - $' .. v.price[1] .. ' ' end table.insert(elements, {label = _label, modType = k, modNum = true}) else @@ -419,4 +422,4 @@ Citizen.CreateThread(function() end end -end) \ No newline at end of file +end) From d2f420ec5c7febb2c3e7f5d3f7f4b1cde8b4e912 Mon Sep 17 00:00:00 2001 From: Lollypop Date: Thu, 8 Feb 2018 03:52:48 +0100 Subject: [PATCH 29/55] Fix the price aswell --- client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index 71bb82a1..59d2ed35 100644 --- a/client/main.lua +++ b/client/main.lua @@ -309,7 +309,7 @@ function GetAction(data) if currentMods[k] then _label = 'Turbo - '.. _U('installed') ..'' else - _label = 'Turbo - $' .. v.price[1] .. ' ' + _label = 'Turbo - $' .. math.floor(vehiclePrice * v.price[1] / 100) .. ' ' end table.insert(elements, {label = _label, modType = k, modNum = true}) else From 84762eb0cf7f08a9bcdc928970dbac20153014c7 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Thu, 5 Apr 2018 12:07:18 +0200 Subject: [PATCH 30/55] Fixed unremovable neon, prices, hardcoded strings --- client/main.lua | 73 +++++++++++++++++++--------------- config.lua | 102 ++++++++++++++++++++++++------------------------ locales/en.lua | 30 ++++++++++++-- 3 files changed, 119 insertions(+), 86 deletions(-) diff --git a/client/main.lua b/client/main.lua index 59d2ed35..5ff1533c 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,6 +1,21 @@ -ESX = nil -local Vehicles = {} -local PlayerData = {} +local Keys = { + ["ESC"] = 322, ["F1"] = 288, ["F2"] = 289, ["F3"] = 170, ["F5"] = 166, ["F6"] = 167, ["F7"] = 168, ["F8"] = 169, ["F9"] = 56, ["F10"] = 57, + ["~"] = 243, ["1"] = 157, ["2"] = 158, ["3"] = 160, ["4"] = 164, ["5"] = 165, ["6"] = 159, ["7"] = 161, ["8"] = 162, ["9"] = 163, ["-"] = 84, ["="] = 83, ["BACKSPACE"] = 177, + ["TAB"] = 37, ["Q"] = 44, ["W"] = 32, ["E"] = 38, ["R"] = 45, ["T"] = 245, ["Y"] = 246, ["U"] = 303, ["P"] = 199, ["["] = 39, ["]"] = 40, ["ENTER"] = 18, + ["CAPS"] = 137, ["A"] = 34, ["S"] = 8, ["D"] = 9, ["F"] = 23, ["G"] = 47, ["H"] = 74, ["K"] = 311, ["L"] = 182, + ["LEFTSHIFT"] = 21, ["Z"] = 20, ["X"] = 73, ["C"] = 26, ["V"] = 0, ["B"] = 29, ["N"] = 249, ["M"] = 244, [","] = 82, ["."] = 81, + ["LEFTCTRL"] = 36, ["LEFTALT"] = 19, ["SPACE"] = 22, ["RIGHTCTRL"] = 70, + ["HOME"] = 213, ["PAGEUP"] = 10, ["PAGEDOWN"] = 11, ["DELETE"] = 178, + ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173, + ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 +} + +ESX = nil +local Vehicles = {} +local PlayerData = {} +local lsMenuIsShowed = false +local isInLSMarker = false +local myCar = {} Citizen.CreateThread(function() while ESX == nil do @@ -9,27 +24,21 @@ Citizen.CreateThread(function() end end) -local lsMenuIsShowed = false -local isInLSMarker = false -local myCar = {} - RegisterNetEvent('esx:playerLoaded') AddEventHandler('esx:playerLoaded', function(xPlayer) - PlayerData = xPlayer + PlayerData = xPlayer ESX.TriggerServerCallback('esx_lscustom:getVehiclesPrices', function(vehicles) Vehicles = vehicles end) end) - RegisterNetEvent('esx:setJob') AddEventHandler('esx:setJob', function(job) - PlayerData.job = job + PlayerData.job = job end) RegisterNetEvent('esx_lscustom:installMod') AddEventHandler('esx_lscustom:installMod', function() - --Citizen.Trace('installMod') local vehicle = GetVehiclePedIsIn(GetPlayerPed(-1), false) myCar = ESX.Game.GetVehicleProperties(vehicle) TriggerServerEvent('esx_lscustom:refreshOwnedVehicle', myCar) @@ -37,9 +46,6 @@ end) RegisterNetEvent('esx_lscustom:cancelInstallMod') AddEventHandler('esx_lscustom:cancelInstallMod', function() - --Citizen.Trace('cancelInstallMod') - --Citizen.Trace('myCar: ' .. json.encode(myCar)) - local vehicle = GetVehiclePedIsIn(GetPlayerPed(-1), false) ESX.Game.SetVehicleProperties(vehicle, myCar) end) @@ -58,7 +64,7 @@ function OpenLSMenu(elems, menuname, menutitle, parent) if data.current.modType == "modFrontWheels" then isRimMod = true end - local vehicle = GetVehiclePedIsIn(GetPlayerPed(-1), false) + local vehicle = GetVehiclePedIsIn(GetPlayerPed(-1), false) local found = false for k,v in pairs(Config.Menus) do if k == data.current.modType or isRimMod then @@ -66,7 +72,7 @@ function OpenLSMenu(elems, menuname, menutitle, parent) ESX.ShowNotification(_U('already_own') .. data.current.label) TriggerEvent('esx_lscustom:installMod') else - local vehiclePrice = 0 + local vehiclePrice = 50000 for i=1, #Vehicles, 1 do if GetEntityModel(vehicle) == GetHashKey(Vehicles[i].model) then @@ -125,18 +131,19 @@ function UpdateMods(data) local vehicle = GetVehiclePedIsIn(GetPlayerPed(-1), false) - if data.modType ~= nil then - local props = {} - - --Citizen.Trace('modType: ' .. data.modType) - --Citizen.Trace('modNum: ' .. json.encode(data.modNum)) - + if data.modType ~= nil then + local props = {} + if data.wheelType ~= nil then props['wheels'] = data.wheelType ESX.Game.SetVehicleProperties(vehicle, props) props = {} elseif data.modType == 'neonColor' then - props['neonEnabled'] = {true, true, true, true} + if data.modNum[1] == 0 and data.modNum[2] == 0 and data.modNum[3] == 0 then + props['neonEnabled'] = {false, false, false, false} + else + props['neonEnabled'] = {true, true, true, true} + end ESX.Game.SetVehicleProperties(vehicle, props) props = {} elseif data.modType == 'tyreSmokeColor' then @@ -177,7 +184,7 @@ function GetAction(data) SetVehicleDoorsShut(vehicle, false) end - local vehiclePrice = 0 + local vehiclePrice = 50000 for i=1, #Vehicles, 1 do if GetEntityModel(vehicle) == GetHashKey(Vehicles[i].model) then @@ -198,6 +205,8 @@ function GetAction(data) if v.modType == 22 then table.insert(elements, {label = " " .. _U('by_default'), modType = k, modNum = false}) + elseif v.modType == 'neonColor' or v.modType == 'tyreSmokeColor' then -- disable neon + table.insert(elements, {label = " " .. _U('by_default'), modType = k, modNum = {0, 0, 0}}) elseif v.modType == 'color1' or v.modType == 'color2' or v.modType == 'pearlescentColor' or v.modType == 'wheelColor' then local num = myCar[v.modType] table.insert(elements, {label = " " .. _U('by_default'), modType = k, modNum = num}) @@ -229,17 +238,17 @@ function GetAction(data) end table.insert(elements, {label = _label, modType = k, modNum = j}) end - elseif v.modType == 22 then -- XENON + elseif v.modType == 22 then -- NEON local _label = '' if currentMods.modXenon then - _label = 'Xénon - '.. _U('installed') ..'' + _label = _U('neon') .. ' - '.. _U('installed') ..'' else price = math.floor(vehiclePrice * v.price / 100) - _label = 'Xénon - $' .. price .. ' ' + _label = _U('neon') .. ' - $' .. price .. ' ' end table.insert(elements, {label = _label, modType = k, modNum = true}) elseif v.modType == 'neonColor' or v.modType == 'tyreSmokeColor' then -- NEON & SMOKE COLOR - local neons = GetNeons() + local neons = GetNeons() price = math.floor(vehiclePrice * v.price / 100) for i=1, #neons, 1 do table.insert(elements, @@ -294,10 +303,10 @@ function GetAction(data) for j = 0, modCount, 1 do local _label = '' if j == currentMods[k] then - _label = 'Niveau ' .. j+1 .. ' - '.. _U('installed') ..'' + _label = _U('level') .. j+1 .. ' - '.. _U('installed') ..'' else price = math.floor(vehiclePrice * v.price[j+1] / 100) - _label = 'Niveau ' .. j+1 .. ' - $' .. price .. ' ' + _label = _U('level') .. j+1 .. ' - $' .. price .. ' ' end table.insert(elements, {label = _label, modType = k, modNum = j}) if j == modCount-1 then @@ -377,7 +386,7 @@ end) -- Activate menu when player is inside marker Citizen.CreateThread(function() while true do - Wait(0) + Citizen.Wait(10) local playerPed = GetPlayerPed(-1) if IsPedInAnyVehicle(playerPed, false) then local coords = GetEntityCoords(GetPlayerPed(-1)) @@ -400,7 +409,7 @@ Citizen.CreateThread(function() end end - if IsControlJustReleased(0, 38) and not lsMenuIsShowed and isInLSMarker then + if IsControlJustReleased(0, Keys['E']) and not lsMenuIsShowed and isInLSMarker then lsMenuIsShowed = true local vehicle = GetVehiclePedIsIn(playerPed, false) diff --git a/config.lua b/config.lua index 20f17a09..f0ee3e20 100644 --- a/config.lua +++ b/config.lua @@ -1,6 +1,6 @@ -Config = {} -Config.DrawDistance = 100.0 -Config.Locale = 'fr' +Config = {} +Config.DrawDistance = 100.0 +Config.Locale = 'en' Config.IsMecanoJobOnly = false Config.Zones = { @@ -477,7 +477,7 @@ Config.Menus = { label = _U('armor'), parent = 'upgrades', modType = 16, - price = {69.77, 116.28, 6666666.6, 6666666.6, 6666666.6, 6666666.6} + price = {69.77, 116.28, 130.00, 150.00, 180.00, 190.00} }, modTurbo = { label = _U('turbo'), @@ -496,165 +496,165 @@ Config.Menus = { modXenon = _U('headlights'), plateIndex = _U('licenseplates'), wheels = _U('wheels'), - modPlateHolder = 'Plaque - Contour', - modVanityPlate = 'Plaque - Avant', - modTrimA = 'Intérieur', - modOrnaments = 'Ornements', - modDashboard = 'Tableau de bord', - modDial = 'Compteur de vitesse', - modDoorSpeaker = 'Sono portière', - modSeats = 'Sièges', - modSteeringWheel = 'Volant', - modShifterLeavers = 'Levier de vitesse', - modAPlate = 'Plage arrière', - modSpeakers = 'Sono', - modTrunk = 'Coffre', - modHydrolic = 'Hydrolique', - modEngineBlock = 'Bloc moteur', - modAirFilter = 'Filtre à air', - modStruts = 'Struts', - modArchCover = 'Cache-roues', - modAerials = 'Antennes', - modTrimB = 'Ailes', - modTank = 'Réservoir', - modWindows = 'Fenêtres', - modLivery = 'Stickers' + modPlateHolder = _U('modplateholder'), + modVanityPlate = _U('modvanityplate'), + modTrimA = _U('interior'), + modOrnaments = _U('trim'), + modDashboard = _U('dashboard'), + modDial = _U('speedometer'), + modDoorSpeaker = _U('door_speakers'), + modSeats = _U('seats'), + modSteeringWheel = _U('steering_wheel'), + modShifterLeavers = _U('gear_lever'), + modAPlate = _U('quarter_deck'), + modSpeakers = _U('speakers'), + modTrunk = _U('trunk'), + modHydrolic = _U('hydraulic'), + modEngineBlock = _U('engine_block'), + modAirFilter = _U('air_filter'), + modStruts = _U('struts'), + modArchCover = _U('arch_cover'), + modAerials = _U('aerials'), + modTrimB = _U('wings'), + modTank = _U('fuel_tank'), + modWindows = _U('windows'), + modLivery = _U('stickers') }, modPlateHolder = { - label = 'Plaque - Contour', + label = _U('modplateholder'), parent = 'cosmetics', modType = 25, price = 3.49 }, modVanityPlate = { - label = 'Plaque - Avant', + label = _U('modvanityplate'), parent = 'cosmetics', modType = 26, price = 1.1 }, modTrimA = { - label = 'Intérieur', + label = _U('interior'), parent = 'cosmetics', modType = 27, price = 6.98 }, modOrnaments = { - label = 'Ornements', + label = _U('trim'), parent = 'cosmetics', modType = 28, price = 0.9 }, modDashboard = { - label = 'Tableau de bord', + label = _U('dashboard'), parent = 'cosmetics', modType = 29, price = 4.65 }, modDial = { - label = 'Compteur de vitesse', + label = _U('speedometer'), parent = 'cosmetics', modType = 30, price = 4.19 }, modDoorSpeaker = { - label = 'Sono portière', + label = _U('door_speakers'), parent = 'cosmetics', modType = 31, price = 5.58 }, modSeats = { - label = 'Siège', + label = _U('seats'), parent = 'cosmetics', modType = 32, price = 4.65 }, modSteeringWheel = { - label = 'Volant', + label = _U('steering_wheel'), parent = 'cosmetics', modType = 33, price = 4.19 }, modShifterLeavers = { - label = 'Levier de vitesse', + label = _U('gear_lever'), parent = 'cosmetics', modType = 34, price = 3.26 }, modAPlate = { - label = 'Plage arrière', + label = _U('quarter_deck'), parent = 'cosmetics', modType = 35, price = 4.19 }, modSpeakers = { - label = 'Sono', + label = _U('speakers'), parent = 'cosmetics', modType = 36, price = 6.98 }, modTrunk = { - label = 'Coffre', + label = _U('trunk'), parent = 'cosmetics', modType = 37, price = 5.58 }, modHydrolic = { - label = 'Hydrolique', + label = _U('hydraulic'), parent = 'cosmetics', modType = 38, price = 5.12 }, modEngineBlock = { - label = 'Bloc moteur', + label = _U('engine_block'), parent = 'cosmetics', modType = 39, price = 5.12 }, modAirFilter = { - label = 'Filtre a air', + label = _U('air_filter'), parent = 'cosmetics', modType = 40, price = 3.72 }, modStruts = { - label = 'Struts', + label = _U('struts'), parent = 'cosmetics', modType = 41, price = 6.51 }, modArchCover = { - label = 'Cache-roues', + label = _U('arch_cover'), parent = 'cosmetics', modType = 42, price = 4.19 }, modAerials = { - label = 'Antennes', + label = _U('aerials'), parent = 'cosmetics', modType = 43, price = 1.12 }, modTrimB = { - label = 'Ailes', + label = _U('wings'), parent = 'cosmetics', modType = 44, price = 6.05 }, modTank = { - label = 'Réservoir', + label = _U('fuel_tank'), parent = 'cosmetics', modType = 45, price = 4.19 }, modWindows = { - label = 'Fenêtres', + label = _U('windows'), parent = 'cosmetics', modType = 46, price = 4.19 }, modLivery = { - label = 'Stickers', + label = _U('stickers'), parent = 'cosmetics', modType = 48, price = 9.3 @@ -900,4 +900,4 @@ Config.Menus = { price = 1.12 } -} +} \ No newline at end of file diff --git a/locales/en.lua b/locales/en.lua index 565f928e..1d779354 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,12 +1,12 @@ Locales['en'] = { - ['by_default'] = 'default', ['installed'] = 'installed', ['already_own'] = 'you already own: ~b~', ['not_enough_money'] = 'you do not have enough money!', - ['purchased'] = 'purchased!', + ['purchased'] = 'you have purchased the mod!', ['press_custom'] = 'press ~INPUT_PICKUP~ to personalize your vehicle.', ['level'] = 'level ', + ['neon'] = 'neon', -- Paint Colors -- Black ['black'] = 'black', @@ -236,9 +236,33 @@ Locales['en'] = { ['sport'] = 'sport', ['muscle'] = 'muscle', ['lowrider'] = 'lowrider', - ['suv'] = 'sUV', + ['suv'] = 'SUV', ['allterrain'] = 'all terrain', ['tuning'] = 'tuning', ['motorcycle'] = 'motorcycle', ['highend'] = 'high end', + + ['modplateholder'] = 'plate - Back', + ['modvanityplate'] = 'plate - Front', + ['interior'] = 'interior', + ['trim'] = 'trim', + ['dashboard'] = 'dashboard', + ['speedometer'] = 'speedometer', + ['door_speakers'] = 'door speakers', + ['seats'] = 'seats', + ['steering_wheel'] = 'steering wheel', + ['gear_lever'] = 'gear lever', + ['quarter_deck'] = 'quarter-deck', + ['speakers'] = 'speakers', + ['trunk'] = 'trunk', + ['hydraulic'] = 'hydraulic', + ['engine_block'] = 'engine block', + ['air_filter'] = 'air filter', + ['struts'] = 'struts', + ['arch_cover'] = 'arch cover', + ['aerials'] = 'aerials', + ['wings'] = 'wings', + ['fuel_tank'] = 'fuel tank', + ['windows'] = 'windows', + ['stickers'] = 'stickers', } \ No newline at end of file From 31803370d653bc4046c246b84fa3f3b2f580267e Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 21 Apr 2018 12:15:00 +0200 Subject: [PATCH 31/55] Cleanup start --- LICENSE.txt | 674 ------------------------------------------------ README.md | 41 ++- __resource.lua | 6 +- config.lua | 189 +++++++------- server/main.lua | 56 ++-- 5 files changed, 165 insertions(+), 801 deletions(-) delete mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index 3d5faccf..00000000 --- a/LICENSE.txt +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - fxserver-esx_lscustom - Copyright (C) 2015 Jérémie N'gadi - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - fxserver-esx_lscustom Copyright (C) 2015 Jérémie N'gadi - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. \ No newline at end of file diff --git a/README.md b/README.md index 46bec25c..e21c4e36 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,40 @@ -# fxserver-esx_lscustom +# esx_lscustom -[DESCRIPTION] +## Requirements +- [esx_vehicleshop](https://github.com/ESX-Org/esx_vehicleshop) -The best LS Custom out there for FX. \ No newline at end of file +## Download & Installation + +### Using [fvm](https://github.com/qlaffont/fvm-installer) +``` +fvm install --save --folder=esx esx-org/esx_lscustom +``` + +### Using Git +``` +cd resources +git clone https://github.com/ESX-Org/esx_lscustom [esx]/esx_lscustom +``` + +### Manually +- Download https://github.com/ESX-Org/esx_lscustom/archive/master.zip +- Put it in the `[esx]` directory + +## Installation +- Add this to your `server.cfg`: + +``` +start esx_lscustom +``` + +# Legal +### License +esx_lscustoms - The best LS Custom out there for FX + +Copyright (C) 2015-2018 Jérémie N'gadi + +This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. + +This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details. + +You should have received a copy Of the GNU General Public License along with this program. If Not, see http://www.gnu.org/licenses/. \ No newline at end of file diff --git a/__resource.lua b/__resource.lua index 8497047c..e0c3b8ec 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,4 +1,8 @@ -version '2.0.0' +resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' + +description 'ESX LS Customs' + +version '2.1.0' server_scripts { '@mysql-async/lib/MySQL.lua', diff --git a/config.lua b/config.lua index f0ee3e20..a04db43c 100644 --- a/config.lua +++ b/config.lua @@ -4,46 +4,46 @@ Config.Locale = 'en' Config.IsMecanoJobOnly = false Config.Zones = { - ls1 = { - Pos = { x = -337.3863, y = -136.9247, z = 38.5737}, - Size = {x = 3.0, y = 3.0, z = 0.2}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Name = "Los Santos Customs", - Hint = _U('press_custom') - }, - ls2 = { + ls1 = { + Pos = { x = -337.3863, y = -136.9247, z = 38.5737}, + Size = {x = 3.0, y = 3.0, z = 0.2}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Name = "Los Santos Customs", + Hint = _U('press_custom') + }, + ls2 = { Pos = { x = -1155.536, y = -2007.183, z = 12.744}, Size = {x = 3.0, y = 3.0, z = 0.2}, Color = {r = 204, g = 204, b = 0}, Marker= 1, Name = "Los Santos Customs", Hint = _U('press_custom') - }, - ls3 = { + }, + ls3 = { Pos = { x = 731.8163, y = -1088.822, z = 21.733}, Size = {x = 3.0, y = 3.0, z = 0.2}, Color = {r = 204, g = 204, b = 0}, Marker= 1, Name = "Los Santos Customs", Hint = _U('press_custom') - }, - ls4 = { + }, + ls4 = { Pos = { x = 1175.04, y = 2640.216, z = 37.32177}, Size = {x = 3.0, y = 3.0, z = 0.2}, Color = {r = 204, g = 204, b = 0}, Marker= 1, Name = "Los Santos Customs", Hint = _U('press_custom') - }, - ls5 = { + }, + ls5 = { Pos = { x = 110.99, y = 6626.39, z = 30.89}, Size = {x = 3.0, y = 3.0, z = 0.2}, Color = {r = 204, g = 204, b = 0}, Marker= 1, Name = "Los Santos Customs", Hint = _U('press_custom') - }, + }, } Config.Colors = { @@ -63,7 +63,7 @@ Config.Colors = { } function GetColors(color) - local colors = {} + local colors = {} if color == 'black' then colors = { { index = 0, label = _U('black')}, @@ -264,7 +264,7 @@ function GetColors(color) { index = 160, label = _U('lightgold')} } end - return colors + return colors end function GetWindowName(index) @@ -395,27 +395,28 @@ end function GetNeons() local neons = { - { label = _U('white'), r = 255, g = 255, b = 255}, - { label = "Slate Gray", r = 112, g = 128, b = 144}, - { label = "Blue", r = 0, g = 0, b = 255}, - { label = "Light Blue", r = 0, g = 150, b = 255}, - { label = "Navy Blue", r = 0, g = 0, b = 128}, - { label = "Sky Blue", r = 135, g = 206, b = 235}, - { label = "Turquoise", r = 0, g = 245, b = 255}, - { label = "Mint Green", r = 50, g = 255, b = 155}, - { label = "Lime Green", r = 0, g = 255, b = 0}, - { label = "Olive", r = 128, g = 128, b = 0}, - { label = _U('yellow'), r = 255, g = 255, b = 0}, - { label = _U('gold'), r = 255, g = 215, b = 0}, - { label = _U('orange'), r = 255, g = 165, b = 0}, - { label = _U('wheat'), r = 245, g = 222, b = 179}, - { label = _U('red'), r = 255, g = 0, b = 0}, - { label = _U('pink'), r = 255, g = 161, b = 211}, - { label = _U('brightpink'), r = 255, g = 0, b = 255}, - { label = _U('purple'), r = 153, g = 0, b = 153}, - { label = "Ivory", r = 41, g = 36, b = 33} - } - return neons + { label = _U('white'), r = 255, g = 255, b = 255}, + { label = "Slate Gray", r = 112, g = 128, b = 144}, + { label = "Blue", r = 0, g = 0, b = 255}, + { label = "Light Blue", r = 0, g = 150, b = 255}, + { label = "Navy Blue", r = 0, g = 0, b = 128}, + { label = "Sky Blue", r = 135, g = 206, b = 235}, + { label = "Turquoise", r = 0, g = 245, b = 255}, + { label = "Mint Green", r = 50, g = 255, b = 155}, + { label = "Lime Green", r = 0, g = 255, b = 0}, + { label = "Olive", r = 128, g = 128, b = 0}, + { label = _U('yellow'), r = 255, g = 255, b = 0}, + { label = _U('gold'), r = 255, g = 215, b = 0}, + { label = _U('orange'), r = 255, g = 165, b = 0}, + { label = _U('wheat'), r = 245, g = 222, b = 179}, + { label = _U('red'), r = 255, g = 0, b = 0}, + { label = _U('pink'), r = 255, g = 161, b = 211}, + { label = _U('brightpink'), r = 255, g = 0, b = 255}, + { label = _U('purple'), r = 153, g = 0, b = 153}, + { label = "Ivory", r = 41, g = 36, b = 33} + } + + return neons end function GetPlatesName(index) @@ -434,20 +435,20 @@ end Config.Menus = { main = { - label = 'LS CUSTOMS', - parent = nil, - upgrades = _U('upgrades'), - cosmetics = _U('cosmetics') + label = 'LS CUSTOMS', + parent = nil, + upgrades = _U('upgrades'), + cosmetics = _U('cosmetics') }, upgrades = { - label = _U('upgrades'), - parent = 'main', - modEngine = _U('engine'), - modBrakes = _U('brakes'), - modTransmission = _U('transmission'), - modSuspension = _U('suspension'), - modArmor = _U('armor'), - modTurbo = _U('turbo') + label = _U('upgrades'), + parent = 'main', + modEngine = _U('engine'), + modBrakes = _U('brakes'), + modTransmission = _U('transmission'), + modSuspension = _U('suspension'), + modArmor = _U('armor'), + modTurbo = _U('turbo') }, modEngine = { label = _U('engine'), @@ -486,39 +487,39 @@ Config.Menus = { price = {55.81} }, cosmetics = { - label = _U('cosmetics'), - parent = 'main', - bodyparts = _U('bodyparts'), - windowTint = _U('windowtint'), - modHorns = _U('horns'), - neonColor = _U('neons'), - resprays = _U('respray'), - modXenon = _U('headlights'), - plateIndex = _U('licenseplates'), - wheels = _U('wheels'), - modPlateHolder = _U('modplateholder'), - modVanityPlate = _U('modvanityplate'), - modTrimA = _U('interior'), - modOrnaments = _U('trim'), - modDashboard = _U('dashboard'), - modDial = _U('speedometer'), - modDoorSpeaker = _U('door_speakers'), - modSeats = _U('seats'), - modSteeringWheel = _U('steering_wheel'), - modShifterLeavers = _U('gear_lever'), - modAPlate = _U('quarter_deck'), - modSpeakers = _U('speakers'), - modTrunk = _U('trunk'), - modHydrolic = _U('hydraulic'), - modEngineBlock = _U('engine_block'), - modAirFilter = _U('air_filter'), - modStruts = _U('struts'), - modArchCover = _U('arch_cover'), - modAerials = _U('aerials'), - modTrimB = _U('wings'), - modTank = _U('fuel_tank'), - modWindows = _U('windows'), - modLivery = _U('stickers') + label = _U('cosmetics'), + parent = 'main', + bodyparts = _U('bodyparts'), + windowTint = _U('windowtint'), + modHorns = _U('horns'), + neonColor = _U('neons'), + resprays = _U('respray'), + modXenon = _U('headlights'), + plateIndex = _U('licenseplates'), + wheels = _U('wheels'), + modPlateHolder = _U('modplateholder'), + modVanityPlate = _U('modvanityplate'), + modTrimA = _U('interior'), + modOrnaments = _U('trim'), + modDashboard = _U('dashboard'), + modDial = _U('speedometer'), + modDoorSpeaker = _U('door_speakers'), + modSeats = _U('seats'), + modSteeringWheel = _U('steering_wheel'), + modShifterLeavers = _U('gear_lever'), + modAPlate = _U('quarter_deck'), + modSpeakers = _U('speakers'), + modTrunk = _U('trunk'), + modHydrolic = _U('hydraulic'), + modEngineBlock = _U('engine_block'), + modAirFilter = _U('air_filter'), + modStruts = _U('struts'), + modArchCover = _U('arch_cover'), + modAerials = _U('aerials'), + modTrimB = _U('wings'), + modTank = _U('fuel_tank'), + modWindows = _U('windows'), + modLivery = _U('stickers') }, modPlateHolder = { @@ -668,16 +669,16 @@ Config.Menus = { tyreSmokeColor = _U('tiresmoke') }, modFrontWheelsTypes = { - label = _U('wheel_type'), - parent = 'wheels', - modFrontWheelsType0 = _U('sport'), - modFrontWheelsType1 = _U('muscle'), - modFrontWheelsType2 = _U('lowrider'), - modFrontWheelsType3 = _U('suv'), - modFrontWheelsType4 = _U('allterrain'), - modFrontWheelsType5 = _U('tuning'), - modFrontWheelsType6 = _U('motorcycle'), - modFrontWheelsType7 = _U('highend') + label = _U('wheel_type'), + parent = 'wheels', + modFrontWheelsType0 = _U('sport'), + modFrontWheelsType1 = _U('muscle'), + modFrontWheelsType2 = _U('lowrider'), + modFrontWheelsType3 = _U('suv'), + modFrontWheelsType4 = _U('allterrain'), + modFrontWheelsType5 = _U('tuning'), + modFrontWheelsType6 = _U('motorcycle'), + modFrontWheelsType7 = _U('highend') }, modFrontWheelsType0 = { label = _U('sport'), diff --git a/server/main.lua b/server/main.lua index 3e27d1fe..4d7c4a71 100644 --- a/server/main.lua +++ b/server/main.lua @@ -4,39 +4,38 @@ local Vehicles = nil RegisterServerEvent('esx_lscustom:buyMod') AddEventHandler('esx_lscustom:buyMod', function(price) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) - price = tonumber(price) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) + price = tonumber(price) - if Config.IsMecanoJobOnly == true then - local societyAccount = nil - TriggerEvent('esx_addonaccount:getSharedAccount', 'society_mecano', function(account) - societyAccount = account - end) - if price < societyAccount.money then - TriggerClientEvent('esx_lscustom:installMod', _source) - TriggerClientEvent('esx:showNotification', _source, _U('purchased')) - societyAccount.removeMoney(price) - else - TriggerClientEvent('esx_lscustom:cancelInstallMod', _source) - TriggerClientEvent('esx:showNotification', _source, _U('not_enough_money')) - end + if Config.IsMecanoJobOnly == true then + local societyAccount = nil + TriggerEvent('esx_addonaccount:getSharedAccount', 'society_mecano', function(account) + societyAccount = account + end) + if price < societyAccount.money then + TriggerClientEvent('esx_lscustom:installMod', _source) + TriggerClientEvent('esx:showNotification', _source, _U('purchased')) + societyAccount.removeMoney(price) + else + TriggerClientEvent('esx_lscustom:cancelInstallMod', _source) + TriggerClientEvent('esx:showNotification', _source, _U('not_enough_money')) + end - else - if price < xPlayer.getMoney() then - TriggerClientEvent('esx_lscustom:installMod', _source) - TriggerClientEvent('esx:showNotification', _source, _U('purchased')) - xPlayer.removeMoney(price) - else - TriggerClientEvent('esx_lscustom:cancelInstallMod', _source) - TriggerClientEvent('esx:showNotification', _source, _U('not_enough_money')) - end - end + else + if price < xPlayer.getMoney() then + TriggerClientEvent('esx_lscustom:installMod', _source) + TriggerClientEvent('esx:showNotification', _source, _U('purchased')) + xPlayer.removeMoney(price) + else + TriggerClientEvent('esx_lscustom:cancelInstallMod', _source) + TriggerClientEvent('esx:showNotification', _source, _U('not_enough_money')) + end + end end) RegisterServerEvent('esx_lscustom:refreshOwnedVehicle') AddEventHandler('esx_lscustom:refreshOwnedVehicle', function(myCar) - MySQL.Async.execute( 'UPDATE `owned_vehicles` SET `vehicle` = @vehicle WHERE `vehicle` LIKE "%' .. myCar['plate'] .. '%"', { @@ -46,7 +45,6 @@ AddEventHandler('esx_lscustom:refreshOwnedVehicle', function(myCar) end) ESX.RegisterServerCallback('esx_lscustom:getVehiclesPrices', function(source, cb) - if Vehicles == nil then MySQL.Async.fetchAll( 'SELECT * FROM vehicles', @@ -62,7 +60,7 @@ ESX.RegisterServerCallback('esx_lscustom:getVehiclesPrices', function(source, cb Vehicles = vehicles cb(Vehicles) end - ) + ) else cb(Vehicles) end From 079b9f7966819e6db67e4d117c5504df0bb3ffce Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 24 Jul 2018 13:35:46 +0200 Subject: [PATCH 32/55] Added missing locales --- locales/de.lua | 4 +++- locales/en.lua | 1 + locales/fr.lua | 3 ++- server/main.lua | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/locales/de.lua b/locales/de.lua index d7a1be95..b29f9cb1 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -1,11 +1,13 @@ Locales['de'] = { - ['by_default'] = 'default', ['installed'] = 'installiert', ['already_own'] = 'du besitzt bereits: ~b~', ['not_enough_money'] = 'du hast nicht genug Geld!', ['purchased'] = 'gekauft!', ['press_custom'] = 'Drücke ~INPUT_PICKUP~ um dein Fahrzeug zu modifizieren.', + ['open_command'] = 'open LS Customs', + ['level'] = 'level ', + ['neon'] = 'neon', -- Paint Colors -- Black ['black'] = 'black', diff --git a/locales/en.lua b/locales/en.lua index 1d779354..f6a46223 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -5,6 +5,7 @@ Locales['en'] = { ['not_enough_money'] = 'you do not have enough money!', ['purchased'] = 'you have purchased the mod!', ['press_custom'] = 'press ~INPUT_PICKUP~ to personalize your vehicle.', + ['open_command'] = 'open LS Customs', ['level'] = 'level ', ['neon'] = 'neon', -- Paint Colors diff --git a/locales/fr.lua b/locales/fr.lua index 6368fb8e..cb0a71b6 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,12 +1,13 @@ Locales['fr'] = { - ['by_default'] = 'par défaut', ['installed'] = 'installé', ['already_own'] = 'vous possédez déjà: ~b~', ['not_enough_money'] = 'vous n\'avez pas assez d\'argent !', ['purchased'] = 'achat effectué !', ['press_custom'] = 'appuyez sur ~INPUT_PICKUP~ pour personnaliser le véhicule.', + ['open_command'] = 'open LS Customs', ['level'] = 'niveau ', + ['neon'] = 'neon', -- Paint Colors -- Black ['black'] = 'noir', diff --git a/server/main.lua b/server/main.lua index 4d7c4a71..263539ca 100644 --- a/server/main.lua +++ b/server/main.lua @@ -37,7 +37,7 @@ end) RegisterServerEvent('esx_lscustom:refreshOwnedVehicle') AddEventHandler('esx_lscustom:refreshOwnedVehicle', function(myCar) MySQL.Async.execute( - 'UPDATE `owned_vehicles` SET `vehicle` = @vehicle WHERE `vehicle` LIKE "%' .. myCar['plate'] .. '%"', + 'UPDATE `owned_vehicles` SET `vehicle` = @vehicle WHERE `vehicle` LIKE "%' .. myCar.plate .. '%"', { ['@vehicle'] = json.encode(myCar) } From 4331aabd2acf8c1035d48a259a69b0859dc24b55 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 24 Jul 2018 15:25:11 +0200 Subject: [PATCH 33/55] Update to support new vehicle db --- server/main.lua | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/server/main.lua b/server/main.lua index 263539ca..28a15c4f 100644 --- a/server/main.lua +++ b/server/main.lua @@ -36,12 +36,11 @@ end) RegisterServerEvent('esx_lscustom:refreshOwnedVehicle') AddEventHandler('esx_lscustom:refreshOwnedVehicle', function(myCar) - MySQL.Async.execute( - 'UPDATE `owned_vehicles` SET `vehicle` = @vehicle WHERE `vehicle` LIKE "%' .. myCar.plate .. '%"', - { - ['@vehicle'] = json.encode(myCar) - } - ) + MySQL.Async.execute('UPDATE `owned_vehicles` SET `vehicle` = @vehicle WHERE `plate` = @plate', + { + ['@plate'] = myCar.plate, + ['@vehicle'] = json.encode(myCar) + }) end) ESX.RegisterServerCallback('esx_lscustom:getVehiclesPrices', function(source, cb) From 5e76f8d683ceb604a31b2a4b1c8f256ea09e2ac5 Mon Sep 17 00:00:00 2001 From: scorpio686 <31187145+scorpio686@users.noreply.github.com> Date: Mon, 30 Jul 2018 18:32:27 +0200 Subject: [PATCH 34/55] Add missing translations --- locales/fr.lua | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/locales/fr.lua b/locales/fr.lua index cb0a71b6..219c4402 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -242,5 +242,28 @@ Locales['fr'] = { ['tuning'] = 'Jantes Tuning', ['motorcycle'] = 'Jantes Moto', ['highend'] = 'Jantes Haut de gamme', - + + ['modplateholder'] = 'plaque - Arrière', + ['modvanityplate'] = 'plate - Avant', + ['interior'] = 'Intérieur', + ['trim'] = 'Accessoires', + ['dashboard'] = 'Tableau de bord', + ['speedometer'] = 'Compteur de vitesse', + ['door_speakers'] = 'Haut-parleurs - portières', + ['seats'] = 'Sièges', + ['steering_wheel'] = 'Volant', + ['gear_lever'] = 'Levier de vitesse', + ['quarter_deck'] = 'Plage arrière', + ['speakers'] = 'haut-parleurs', + ['trunk'] = 'Coffre', + ['hydraulic'] = 'Suspension hydraulique', + ['engine_block'] = 'Bloc moteur', + ['air_filter'] = 'Filtre à air', + ['struts'] = 'Entretoises', + ['arch_cover'] = 'Pare-boue des ailes', + ['aerials'] = 'Antennes', + ['wings'] = 'Ailes', + ['fuel_tank'] = 'Bouchon du réservoir', + ['windows'] = 'Fenêtres', + ['stickers'] = 'Autocollants', } From c3ac114943d7c2207f2eba4a32f98ad722da3d81 Mon Sep 17 00:00:00 2001 From: MajorMarcin Date: Tue, 31 Jul 2018 20:35:37 +0200 Subject: [PATCH 35/55] add pl --- __resource.lua | 2 + locales/pl.lua | 269 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 271 insertions(+) create mode 100644 locales/pl.lua diff --git a/__resource.lua b/__resource.lua index e0c3b8ec..db66d00c 100644 --- a/__resource.lua +++ b/__resource.lua @@ -10,6 +10,7 @@ server_scripts { 'locales/de.lua', 'locales/en.lua', 'locales/fr.lua', + 'locales/pl.lua', 'config.lua', 'server/main.lua' } @@ -19,6 +20,7 @@ client_scripts { 'locales/de.lua', 'locales/en.lua', 'locales/fr.lua', + 'locales/pl.lua', 'config.lua', 'client/main.lua' } diff --git a/locales/pl.lua b/locales/pl.lua new file mode 100644 index 00000000..7f8ad37a --- /dev/null +++ b/locales/pl.lua @@ -0,0 +1,269 @@ +Locales['pl'] = { + ['by_default'] = 'domyślna', + ['installed'] = 'zainstalowane', + ['already_own'] = 'już posiadasz: ~b~', + ['not_enough_money'] = 'nie masz wystarczająco pieniędzy!', + ['purchased'] = 'zakupiłeś!', + ['press_custom'] = 'naciśnij ~INPUT_PICKUP~ aby spersonalizować swój pojazd.', + ['open_command'] = 'wjedz do LS Customs', + ['level'] = 'level ', + ['neon'] = 'neon', +-- Paint Colors + -- Czarny + ['black'] = 'czarny', + ['graphite'] = 'grafit', + ['black_metallic'] = 'metaliczny czarny', + ['caststeel'] = 'kuta stal', + ['black_anth'] = 'czarny Antracyt', + ['matteblack'] = 'matowa czerń', + ['darknight'] = 'ciemna noc', + ['deepblack'] = 'głęboka czerń', + ['oil'] = 'olej', + ['carbon'] = 'carbon', + -- Biały + ['white'] = 'biały', + ['vanilla'] = 'wanilliowy', + ['creme'] = 'kremowy', + ['polarwhite'] = 'polarny biały', + ['beige'] = 'beżowy', + ['mattewhite'] = 'matowy biały', + ['snow'] = 'snieżny', + ['cotton'] = 'bawełna', + ['alabaster'] = 'alabastrowy', + ['purewhite'] = 'czysty biały', + -- Szary + ['grey'] = 'szary', + ['silver'] = 'srebro', + ['metallicgrey'] = 'metaliczny szary', + ['laminatedsteel'] = 'laminowana stal', + ['darkgray'] = 'ciemny szary', + ['rockygray'] = 'skalisty szary', + ['graynight'] = 'szara noc', + ['aluminum'] = 'aluminium', + ['graymat'] = 'matowy szary', + ['lightgrey'] = 'jasny szary', + ['asphaltgray'] = 'asfaltowy szary', + ['grayconcrete'] = 'betonowy szary', + ['darksilver'] = 'ciemny szary', + ['magnesite'] = 'magnesite', + ['nickel'] = 'nikiel', + ['zinc'] = 'cynk', + ['dolomite'] = 'dolomite', + ['bluesilver'] = 'niebieski srebrzysty', + ['titanium'] = 'titanium', + ['steelblue'] = 'niebieska stal', + ['champagne'] = 'szampanowy', + ['grayhunter'] = 'grey Hunter', + -- Czerwony + ['red'] = 'czerwony', + ['torino_red'] = 'turyńska czerwień', + ['poppy'] = 'makowy czerwień', + ['copper_red'] = 'miedziany czerwień', + ['cardinal'] = 'kardynałowy czerwień', + ['brick'] = 'ceglana czerwień', + ['garnet'] = 'granat', + ['cabernet'] = 'cabernet Red', + ['candy'] = 'cukierkowa czerwień', + ['matte_red'] = 'matowa czerwień', + ['dark_red'] = 'ciemna czerwień', + ['red_pulp'] = 'red Pulp', + ['bril_red'] = 'brilliant Red', + ['pale_red'] = 'blady czerwony', + ['wine_red'] = 'winiana czerwień', + ['volcano'] = 'wulkanowy', + -- Różowy + ['pink'] = 'różowy', + ['electricpink'] = 'elektryczny różowy', + ['brightpink'] = 'jasny Różowy', + ['salmon'] = 'łososiowy', + ['sugarplum'] = 'sugar Plum', + -- Niebieski + ['blue'] = 'niebieski', + ['topaz'] = 'topaz', + ['light_blue'] = 'jasny niebieski', + ['galaxy_blue'] = 'galaktyczny niebieski', + ['dark_blue'] = 'ciemny niebieski', + ['azure'] = 'azure', + ['navy_blue'] = 'granatowy', + ['lapis'] = 'lapis Lazuli', + ['blue_diamond'] = 'niebieski diament', + ['surfer'] = 'surfer', + ['pastel_blue'] = 'pastelowy niebieski', + ['celeste_blue'] = 'celeste Blue', + ['rally_blue'] = 'rally Blue', + ['blue_paradise'] = 'blue Paradise', + ['blue_night'] = 'niebieska noc', + ['cyan_blue'] = 'cyankowy', + ['cobalt'] = 'kobaltowy', + ['electric_blue'] = 'elektryczny miebieski', + ['horizon_blue'] = 'horizon Blue', + ['metallic_blue'] = 'metaliczny niebieski', + ['aquamarine'] = 'akwamaryn', + ['blue_agathe'] = 'blue Agathe', + ['zirconium'] = 'zirconium', + ['spinel'] = 'spinel', + ['tourmaline'] = 'tourmaline', + ['paradise'] = 'paradise', + ['bubble_gum'] = 'guma balonowa', + ['midnight_blue'] = 'midnight Blue', + ['forbidden_blue'] = 'forbidden Blue', + ['glacier_blue'] = 'glacier Blue', + -- Żółty + ['yellow'] = 'żółty', + ['wheat'] = 'pszenica', + ['raceyellow'] = 'wyścigowy żółty', + ['paleyellow'] = 'jasnożółty', + ['lightyellow'] = 'jasny żółty', + -- Zielony + ['green'] = 'zielony', + ['met_dark_green'] = 'metaliczny ciemny zielony', + ['rally_green'] = 'rally Green', + ['pine_green'] = 'pine Green', + ['olive_green'] = 'zielona oliwka', + ['light_green'] = 'jasny zielony', + ['lime_green'] = 'lime green', + ['forest_green'] = 'forest Green', + ['lawn_green'] = 'lawn Green', + ['imperial_green'] = 'imperial Green', + ['green_bottle'] = 'breen Bottle', + ['citrus_green'] = 'cytrusowy Zielony', + ['green_anis'] = 'zielony anyż', + ['khaki'] = 'khaki', + ['army_green'] = 'zieleń wojskowa', + ['dark_green'] = 'ciemny zielony', + ['hunter_green'] = 'hunter Green', + ['matte_foilage_green'] = 'matte Foilage Green', + -- Pomarańczowy + ['orange'] = 'pomarańczowy', + ['tangerine'] = 'tangerine', + ['matteorange'] = 'matowy Pomarańczowy', + ['lightorange'] = 'jasny Pomarańczowy', + ['peach'] = 'brzoskwiniowy ', + ['pumpkin'] = 'dynia', + ['orangelambo'] = 'orange Lambo', + -- Brązowy + ['brown'] = 'brązowy', + ['copper'] = 'medziany', + ['lightbrown'] = 'jasny brązowy', + ['darkbrown'] = 'ciemny brąz', + ['bronze'] = 'brąz', + ['brownmetallic'] = 'metaliczny brązowy', + ['espresso'] = 'espresso', + ['chocolate'] = 'czekoladowy', + ['terracotta'] = 'terakota', + ['marble'] = 'marmur', + ['sand'] = 'piasek', + ['sepia'] = 'sepia', + ['bison'] = 'bison', + ['palm'] = 'palma', + ['caramel'] = 'karmel', + ['rust'] = 'rdza ', + ['chestnut'] = 'orzechowy', + ['hazelnut'] = 'orzech laskowy', + ['shell'] = 'shell', + ['mahogany'] = 'mahogany', + ['cauldron'] = 'cauldron', + ['blond'] = 'blond', + ['gravel'] = 'żwir', + ['darkearth'] = 'ciemna ziemia', + ['desert'] = 'pustynia', + -- Fioletowy + ['purple'] = 'fioletowy', + ['indigo'] = 'indygo', + ['deeppurple'] = 'głęboki fiolet', + ['darkviolet'] = 'ciemny fiolet', + ['amethyst'] = 'ametyst', + ['mysticalviolet'] = 'mystic Violet', + ['purplemetallic'] = 'metaliczny fiolet', + ['matteviolet'] = 'matowy fiolet', + ['mattedeeppurple'] = 'matowy głęboki fiolet', + -- Chrome + ['chrome'] = 'chrom', + ['brushedchrome'] = 'oczyszczony chrom', + ['blackchrome'] = 'czarny chrom', + ['brushedaluminum'] = 'szczotkowane aluminium', + -- Metale + ['gold'] = 'Złoto', + ['puregold'] = 'czyste złoto', + ['brushedgold'] = 'szczotkowane złoto', + ['lightgold'] = 'jasne złoto', +-- Tablice rejestracyjne + ['blue_on_white_1'] = 'niebieskie na białym 1', + ['yellow_on_black'] = 'żółte na czarnym', + ['yellow_blue'] = 'żółte na niebieskim', + ['blue_on_white_2'] = 'niebieskie na białym 2', + ['blue_on_white_3'] = 'niebieskie na białym 3', +-- Ulepszenia + ['upgrades'] = 'ulepszenia', + ['engine'] = 'silnik', + ['brakes'] = 'hamulce', + ['transmission'] = 'skrzynia biegów', + ['suspension'] = 'zawieszenie', + ['armor'] = 'opancerzenie', + ['turbo'] = 'turbo', + ['no_turbo'] = 'bez turbo', +-- Kosmetyczne + ['cosmetics'] = 'kosmetyczne', + -- Body parts + ['bodyparts'] = 'karoseria', + ['leftfender'] = 'lewy błotnik', + ['rightfender'] = 'prawy błotnik', + ['spoilers'] = 'spojler', + ['sideskirt'] = 'progi', + ['cage'] = 'bagażnik', + ['hood'] = 'maska', + ['grille'] = 'gril', + ['rearbumper'] = 'tylny zderzak ', + ['frontbumper'] = 'przedni zderzak', + ['exhaust'] = 'wydech', + ['roof'] = 'dach', + -- Farba + ['respray'] = 'przefarbuj', + ['primary'] = 'pierwszy', + ['secondary'] = 'drugi', + ['pearlescent'] = 'perła', + -- Różne + ['headlights'] = 'reflektory', + ['licenseplates'] = 'tablice rejestracyjne', + ['windowtint'] = 'odcień okna', + ['horns'] = 'klakson', + -- Neon + ['neons'] = 'neony', + -- Koła + ['wheels'] = 'koła', + ['tiresmoke'] = 'dym spod opon', + ['wheel_type'] = 'typ koła', + ['wheel_color'] = 'kolor koła', + ['sport'] = 'sportowe', + ['muscle'] = 'muscle', + ['lowrider'] = 'lowrider', + ['suv'] = 'sUV', + ['allterrain'] = 'terenowe', + ['tuning'] = 'tuner', + ['motorcycle'] = 'motocykle', + ['highend'] = 'high end', + + ['modplateholder'] = 'tablica - Tył', + ['modvanityplate'] = 'tablica - Przód', + ['interior'] = 'wnętrze', + ['trim'] = 'wykończenie', + ['dashboard'] = 'deska rozdzielcza', + ['speedometer'] = 'prędkościomierz', + ['door_speakers'] = 'drzwi', + ['seats'] = 'siedzenia', + ['steering_wheel'] = 'kierownica', + ['gear_lever'] = 'dżwignia zmiany biegów', + ['quarter_deck'] = 'quarter-deck', + ['speakers'] = 'głośniki', + ['trunk'] = 'bagażnik', + ['hydraulic'] = 'hydraulika', + ['engine_block'] = 'blok silnika', + ['air_filter'] = 'filtr powietrza', + ['struts'] = 'podpórka', + ['arch_cover'] = 'arch cover', + ['aerials'] = 'anteny', + ['wings'] = 'skrzydełka ', + ['fuel_tank'] = 'zbiornik paliwa', + ['windows'] = 'okna', + ['stickers'] = 'naklejki', +} \ No newline at end of file From 7ca5e34135ce680814995e095f6d4c3b631ec08c Mon Sep 17 00:00:00 2001 From: scorpio686 <31187145+scorpio686@users.noreply.github.com> Date: Sun, 5 Aug 2018 11:38:48 +0200 Subject: [PATCH 36/55] Update add missing translations --- locales/fr.lua | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/locales/fr.lua b/locales/fr.lua index 219c4402..4be9c419 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -245,25 +245,25 @@ Locales['fr'] = { ['modplateholder'] = 'plaque - Arrière', ['modvanityplate'] = 'plate - Avant', - ['interior'] = 'Intérieur', - ['trim'] = 'Accessoires', - ['dashboard'] = 'Tableau de bord', - ['speedometer'] = 'Compteur de vitesse', - ['door_speakers'] = 'Haut-parleurs - portières', - ['seats'] = 'Sièges', - ['steering_wheel'] = 'Volant', - ['gear_lever'] = 'Levier de vitesse', - ['quarter_deck'] = 'Plage arrière', + ['interior'] = 'intérieur', + ['trim'] = 'accessoires', + ['dashboard'] = 'tableau de bord', + ['speedometer'] = 'compteur de vitesse', + ['door_speakers'] = 'haut-parleurs - portières', + ['seats'] = 'sièges', + ['steering_wheel'] = 'volant', + ['gear_lever'] = 'levier de vitesse', + ['quarter_deck'] = 'plage arrière', ['speakers'] = 'haut-parleurs', - ['trunk'] = 'Coffre', - ['hydraulic'] = 'Suspension hydraulique', - ['engine_block'] = 'Bloc moteur', - ['air_filter'] = 'Filtre à air', - ['struts'] = 'Entretoises', - ['arch_cover'] = 'Pare-boue des ailes', - ['aerials'] = 'Antennes', - ['wings'] = 'Ailes', - ['fuel_tank'] = 'Bouchon du réservoir', - ['windows'] = 'Fenêtres', - ['stickers'] = 'Autocollants', + ['trunk'] = 'coffre', + ['hydraulic'] = 'suspension hydraulique', + ['engine_block'] = 'bloc moteur', + ['air_filter'] = 'filtre à air', + ['struts'] = 'entretoises', + ['arch_cover'] = 'pare-boue des ailes', + ['aerials'] = 'antennes', + ['wings'] = 'ailes', + ['fuel_tank'] = 'bouchon du réservoir', + ['windows'] = 'fenêtres', + ['stickers'] = 'autocollants', } From a5f00c0530159910cf40752c1a7abf12e03e8909 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Fri, 10 Aug 2018 00:54:13 -0400 Subject: [PATCH 37/55] 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 7ae6bbb87b34d956963e28018da685268ec99aed Mon Sep 17 00:00:00 2001 From: iTzBla Date: Tue, 14 Aug 2018 17:35:32 +0100 Subject: [PATCH 38/55] Create br.lua and Prevent Free Tuning Bug (#35) * Added br.lua * Prevent Free Tuning Bug --- __resource.lua | 2 + client/main.lua | 19 ++++ locales/br.lua | 268 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 289 insertions(+) create mode 100644 locales/br.lua diff --git a/__resource.lua b/__resource.lua index db66d00c..fc05adf5 100644 --- a/__resource.lua +++ b/__resource.lua @@ -11,6 +11,7 @@ server_scripts { 'locales/en.lua', 'locales/fr.lua', 'locales/pl.lua', + 'locales/br.lua', 'config.lua', 'server/main.lua' } @@ -21,6 +22,7 @@ client_scripts { 'locales/en.lua', 'locales/fr.lua', 'locales/pl.lua', + 'locales/br.lua', 'config.lua', 'client/main.lua' } diff --git a/client/main.lua b/client/main.lua index 5ff1533c..9388d733 100644 --- a/client/main.lua +++ b/client/main.lua @@ -432,3 +432,22 @@ Citizen.CreateThread(function() end end end) + +--Prevent Free Tunning Bug +Citizen.CreateThread(function() + while true do + Citizen.Wait(1) + if lsMenuIsShowed then + DisableControlAction(2, Keys['F1'], true) + DisableControlAction(2, Keys['F2'], true) + DisableControlAction(2, Keys['F3'], true) + DisableControlAction(2, Keys['F6'], true) + DisableControlAction(2, Keys['F7'], true) + DisableControlAction(2, Keys['F'], true) + DisableControlAction(0, 75, true) -- Disable exit vehicle + DisableControlAction(27, 75, true) -- Disable exit vehicle + else + Citizen.Wait(500) + end + end +end) diff --git a/locales/br.lua b/locales/br.lua new file mode 100644 index 00000000..4803e02c --- /dev/null +++ b/locales/br.lua @@ -0,0 +1,268 @@ +Locales['br'] = { + ['by_default'] = 'default', + ['installed'] = 'instalado', + ['already_own'] = 'já possuis: ~b~', + ['not_enough_money'] = 'sem dinheiro!', + ['purchased'] = 'tu compras-te esta peça!', + ['press_custom'] = 'pressiona ~INPUT_PICKUP~ para personalizar o veiculo.', + ['level'] = 'level ', + ['neon'] = 'neon', +-- Paint Colors + -- Preto + ['black'] = 'preto', + ['graphite'] = 'preto grafit', + ['black_metallic'] = 'preto metalico', + ['caststeel'] = 'aço fundido', + ['black_anth'] = 'antracite Preto', + ['matteblack'] = 'preto fosco', + ['darknight'] = 'noite escura', + ['deepblack'] = 'preto profundo', + ['oil'] = 'preto oleo', + ['carbon'] = 'preto carbono', + -- White + ['white'] = 'branco', + ['vanilla'] = 'baunilha', + ['creme'] = 'creme', + ['polarwhite'] = 'branco polar', + ['beige'] = 'bege', + ['mattewhite'] = 'branco fosco', + ['snow'] = 'branco neve', + ['cotton'] = 'branco algodao', + ['alabaster'] = 'branco alabastro', + ['purewhite'] = 'branco puro', + -- Grey + ['grey'] = 'cinzento', + ['silver'] = 'prata', + ['metallicgrey'] = 'cinza metalizado', + ['laminatedsteel'] = 'aço laminado', + ['darkgray'] = 'cinza escuro', + ['rockygray'] = 'cinza rochoso', + ['graynight'] = 'noite cinzenta', + ['aluminum'] = 'alumínio', + ['graymat'] = 'cinza fosco', + ['lightgrey'] = 'cinza claro', + ['asphaltgray'] = 'asfalto Cinza', + ['grayconcrete'] = 'cinza concreto', + ['darksilver'] = 'prata escura', + ['magnesite'] = 'magnesita', + ['nickel'] = 'níquel', + ['zinc'] = 'zinco', + ['dolomite'] = 'dolomite', + ['bluesilver'] = 'prata azul', + ['titanium'] = 'titânio', + ['steelblue'] = 'aço azul', + ['champagne'] = 'champanhe', + ['grayhunter'] = 'caçador cinzento', + -- Red + ['red'] = 'vermelho', + ['torino_red'] = 'vermelho torino', + ['poppy'] = 'vermelho papoila', + ['copper_red'] = 'vermelho cobre', + ['cardinal'] = 'vermelho cardeal', + ['brick'] = 'vermelho tijolo', + ['garnet'] = 'vermelho granada', + ['cabernet'] = 'vermelho cabernet', + ['candy'] = 'vermelho doce', + ['matte_red'] = 'vermelho fosco', + ['dark_red'] = 'vermelho escuro', + ['red_pulp'] = 'polpa vermelha', + ['bril_red'] = 'vermelho brilhante', + ['pale_red'] = 'vermelho pálido', + ['wine_red'] = 'vermelho vinho', + ['volcano'] = 'vermelho vulcão', + -- Pink + ['pink'] = 'rosa', + ['electricpink'] = 'rosa elétrica', + ['brightpink'] = 'rosa brilhante', + ['salmon'] = 'rosa salmão', + ['sugarplum'] = 'ameixa doce', + -- Blue + ['blue'] = 'azul', + ['topaz'] = 'azul topázio', + ['light_blue'] = 'azul claro', + ['galaxy_blue'] = 'azul galáxia', + ['dark_blue'] = 'azul escuro', + ['azure'] = 'azure', + ['navy_blue'] = 'azul marinho', + ['lapis'] = 'lápis lazúli', + ['blue_diamond'] = 'azul diamante', + ['surfer'] = 'azul surfista', + ['pastel_blue'] = 'azul pastel', + ['celeste_blue'] = 'azul celeste', + ['rally_blue'] = 'azul rally', + ['blue_paradise'] = 'azul paraíso', + ['blue_night'] = 'azul noite', + ['cyan_blue'] = 'azul ciano', + ['cobalt'] = 'azul cobalto', + ['electric_blue'] = 'azul elétrico', + ['horizon_blue'] = 'azul horizonte', + ['metallic_blue'] = 'azul metálico', + ['aquamarine'] = 'azul aquamarino', + ['blue_agathe'] = 'azul ágata', + ['zirconium'] = 'azul zircônio', + ['spinel'] = 'azul espinel', + ['tourmaline'] = 'azul turmalina', + ['paradise'] = 'azul paraíso', + ['bubble_gum'] = 'azul pastilha', + ['midnight_blue'] = 'azul meia-noite', + ['forbidden_blue'] = 'azul proibido', + ['glacier_blue'] = 'azul glaciar', + -- Yellow + ['yellow'] = 'amarelo', + ['wheat'] = 'amarelo trigo', + ['raceyellow'] = 'amarelo corrida', + ['paleyellow'] = 'amarelo pálido', + ['lightyellow'] = 'amarelo claro', + -- Green + ['green'] = 'verde', + ['met_dark_green'] = 'verde escuro metálico', + ['rally_green'] = 'verde rally', + ['pine_green'] = 'verde pinho', + ['olive_green'] = 'verde oliva', + ['light_green'] = 'verde claro', + ['lime_green'] = 'verde lima', + ['forest_green'] = 'verde floresta', + ['lawn_green'] = 'verde relva', + ['imperial_green'] = 'verde imperial', + ['green_bottle'] = 'verde garrafa', + ['citrus_green'] = 'verde cítrico', + ['green_anis'] = 'verde anis', + ['khaki'] = 'verde Khaki', + ['army_green'] = 'verde tropa', + ['dark_green'] = 'verde escuro', + ['hunter_green'] = 'verde caça', + ['matte_foilage_green'] = 'verde fosco', + -- Orange + ['orange'] = 'laranja', + ['tangerine'] = 'laranja tangerina', + ['matteorange'] = 'laranja fosco', + ['lightorange'] = 'laranja claro', + ['peach'] = 'laranja pessego', + ['pumpkin'] = 'laranja abóbora', + ['orangelambo'] = 'laranja lambo', + -- Brown + ['brown'] = 'castanho', + ['copper'] = 'castanho cobre', + ['lightbrown'] = 'castanho claro', + ['darkbrown'] = 'castanho escuro', + ['Bronze'] = 'bronze', + ['brownmetallic'] = 'castanho metálico', + ['espresso'] = 'castanho expresso', + ['chocolate'] = 'castanho chocolate', + ['terracotta'] = 'castanho Terracota', + ['marble'] = 'castanho mármore', + ['sand'] = 'castanho areia', + ['sepia'] = 'castanho sepia', + ['bison'] = 'castanho Bisonte', + ['palm'] = 'castanho palma', + ['caramel'] = 'castanho caramelo', + ['rust'] = 'castanho ferrugem', + ['chestnut'] = 'castanho fruto-seco', + ['hazelnut'] = 'castanho avelã', + ['shell'] = 'castanho concha', + ['mahogany'] = 'castanho mogno', + ['cauldron'] = 'castanho caldeirão', + ['blond'] = 'castanho loiro', + ['gravel'] = 'castanho gravilha', + ['darkearth'] = 'castanho escuro', + ['desert'] = 'castanho deserto', + -- Purple + ['purple'] = 'roxo', + ['indigo'] = 'roxo indigo', + ['deeppurple'] = 'roxo profundo', + ['darkviolet'] = 'violeta negro', + ['amethyst'] = 'roxo ametista', + ['mysticalviolet'] = 'violeta mística', + ['purplemetallic'] = 'roxo metálico', + ['matteviolet'] = 'violeta fosco', + ['mattedeeppurple'] = 'roxo fosco', + -- Chrome + ['chrome'] = 'cromado', + ['brushedchrome'] = 'cromado escovado', + ['blackchrome'] = 'cromado Preto', + ['brushedaluminum'] = 'alumínio escovado', + -- Metal + ['gold'] = 'ouro', + ['puregold'] = 'ouro puro', + ['brushedgold'] = 'ouro escovado', + ['lightgold'] = 'ouro brilhante', +-- License Plates + ['blue_on_white_1'] = 'azul e cinza 1', + ['yellow_on_black'] = 'amarelo e Preto', + ['yellow_blue'] = 'amarelo e azul', + ['blue_on_white_2'] = 'azul e cinza 2', + ['blue_on_white_3'] = 'azul no cinza 3', +-- Upgrades + ['upgrades'] = 'upgrades', + ['engine'] = 'motor', + ['brakes'] = 'travões', + ['transmission'] = 'transmissão', + ['suspension'] = 'suspensão', + ['armor'] = 'armadura', + ['turbo'] = 'turbo', + ['no_turbo'] = 'sem turbo', +-- Cosmetics + ['cosmetics'] = 'cosméticos', + -- Body Parts + ['bodyparts'] = 'chaparia', + ['leftfender'] = 'para-choque esquerdo', + ['rightfender'] = 'para-choque direito', + ['spoilers'] = 'alarão', + ['sideskirt'] = 'saias laterais', + ['cage'] = 'santantônio', + ['hood'] = 'capô', + ['grille'] = 'grade', + ['rearbumper'] = 'para-choque traseiro', + ['frontbumper'] = 'para-choque dianteiro', + ['exhaust'] = 'escape', + ['roof'] = 'teto', + -- Paint + ['respray'] = 'pintura', + ['primary'] = 'primário', + ['secondary'] = 'secundário', + ['pearlescent'] = 'perolado', + -- Misc + ['headlights'] = 'faróis dianteiros', + ['licenseplates'] = 'matricula', + ['windowtint'] = 'pelicula de vidro', + ['horns'] = 'buzinas', + -- Neon + ['neons'] = 'neons', + -- Wheels + ['wheels'] = 'rodas', + ['tiresmoke'] = 'fumaça de pneu', + ['wheel_type'] = 'tipo de roda', + ['wheel_color'] = 'cor de roda', + ['sport'] = 'desportivo', + ['muscle'] = 'muscle', + ['lowrider'] = 'lowrider', + ['suv'] = 'suv', + ['allterrain'] = 'todo terreno', + ['tuning'] = 'tuning', + ['motorcycle'] = 'motociclo', + ['highend'] = 'high end', + + ['modplateholder'] = 'placa - atrás', + ['modvanityplate'] = 'placa - frente', + ['interior'] = 'interior', + ['trim'] = 'trim', + ['dashboard'] = 'painel', + ['speedometer'] = 'velocímetro', + ['door_speakers'] = 'colunas da porta', + ['seats'] = 'bancos', + ['steering_wheel'] = 'volante', + ['gear_lever'] = 'manete de veloçidades', + ['quarter_deck'] = 'quarter-deck', + ['speakers'] = 'colunas', + ['trunk'] = 'bagagem', + ['hydraulic'] = 'hidráulico', + ['engine_block'] = 'bloco do motor', + ['air_filter'] = 'filtro de ar', + ['struts'] = 'suportes do motor', + ['arch_cover'] = 'cobertura de arco', + ['aerials'] = 'antenas', + ['wings'] = 'wings', + ['fuel_tank'] = 'tanque de combustível', + ['windows'] = 'janelas', + ['stickers'] = 'autocolantes', +} From c248eb934ba3d38e220d665f013c9c284ca21314 Mon Sep 17 00:00:00 2001 From: deadeye2 Date: Sat, 1 Sep 2018 19:16:07 -0400 Subject: [PATCH 39/55] missing language strings --- config.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config.lua b/config.lua index a04db43c..5179489e 100644 --- a/config.lua +++ b/config.lua @@ -737,11 +737,11 @@ Config.Menus = { price = 5.12 }, modFrontWheelsColor = { - label = 'Peinture Jantes', + label = _U('wheel_color'), parent = 'wheels' }, wheelColor = { - label = 'Peinture Jantes', + label = _U('wheel_color'), parent = 'modFrontWheelsColor', modType = 'wheelColor', price = 0.66 @@ -901,4 +901,4 @@ Config.Menus = { price = 1.12 } -} \ No newline at end of file +} From 0fd3440bb56a778f05c96367d8daad037766771d Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 29 Sep 2018 00:05:22 +0200 Subject: [PATCH 40/55] Fixed #42, minor changes - Removed unfinished DE locale - Enforced 2 space indent for locale files - Proper indenting --- __resource.lua | 2 - client/main.lua | 226 ++++++++++---------- config.lua | 36 ++-- locales/br.lua | 525 +++++++++++++++++++++++------------------------ locales/de.lua | 185 ----------------- locales/en.lua | 528 +++++++++++++++++++++++------------------------ locales/fr.lua | 526 +++++++++++++++++++++++------------------------ locales/pl.lua | 534 ++++++++++++++++++++++++------------------------ server/main.lua | 31 +-- 9 files changed, 1204 insertions(+), 1389 deletions(-) delete mode 100644 locales/de.lua diff --git a/__resource.lua b/__resource.lua index fc05adf5..eb9932df 100644 --- a/__resource.lua +++ b/__resource.lua @@ -7,7 +7,6 @@ version '2.1.0' server_scripts { '@mysql-async/lib/MySQL.lua', '@es_extended/locale.lua', - 'locales/de.lua', 'locales/en.lua', 'locales/fr.lua', 'locales/pl.lua', @@ -18,7 +17,6 @@ server_scripts { client_scripts { '@es_extended/locale.lua', - 'locales/de.lua', 'locales/en.lua', 'locales/fr.lua', 'locales/pl.lua', diff --git a/client/main.lua b/client/main.lua index 9388d733..782ec737 100644 --- a/client/main.lua +++ b/client/main.lua @@ -10,12 +10,12 @@ local Keys = { ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 } -ESX = nil -local Vehicles = {} -local PlayerData = {} -local lsMenuIsShowed = false +ESX = nil +local Vehicles = {} +local PlayerData = {} +local lsMenuIsShowed = false local isInLSMarker = false -local myCar = {} +local myCar = {} Citizen.CreateThread(function() while ESX == nil do @@ -39,97 +39,94 @@ end) RegisterNetEvent('esx_lscustom:installMod') AddEventHandler('esx_lscustom:installMod', function() - local vehicle = GetVehiclePedIsIn(GetPlayerPed(-1), false) + local vehicle = GetVehiclePedIsIn(PlayerPedId(), false) myCar = ESX.Game.GetVehicleProperties(vehicle) TriggerServerEvent('esx_lscustom:refreshOwnedVehicle', myCar) end) RegisterNetEvent('esx_lscustom:cancelInstallMod') AddEventHandler('esx_lscustom:cancelInstallMod', function() - local vehicle = GetVehiclePedIsIn(GetPlayerPed(-1), false) + local vehicle = GetVehiclePedIsIn(PlayerPedId(), false) ESX.Game.SetVehicleProperties(vehicle, myCar) end) -function OpenLSMenu(elems, menuname, menutitle, parent) +function OpenLSMenu(elems, menuName, menuTitle, parent) + ESX.UI.Menu.Open('default', GetCurrentResourceName(), menuName, + { + title = menuTitle, + align = 'top-left', + elements = elems + }, function(data, menu) + local isRimMod, found = false, false + local vehicle = GetVehiclePedIsIn(PlayerPedId(), false) - ESX.UI.Menu.Open( - 'default', GetCurrentResourceName(), menuname, - { - title = menutitle, - align = 'top-left', - elements = elems - }, - function(data, menu) -- on validate - local isRimMod = false - if data.current.modType == "modFrontWheels" then - isRimMod = true - end - local vehicle = GetVehiclePedIsIn(GetPlayerPed(-1), false) - local found = false - for k,v in pairs(Config.Menus) do - if k == data.current.modType or isRimMod then - if data.current.label == _U('by_default') or string.match(data.current.label, _U('installed')) then - ESX.ShowNotification(_U('already_own') .. data.current.label) - TriggerEvent('esx_lscustom:installMod') - else - local vehiclePrice = 50000 - - for i=1, #Vehicles, 1 do - if GetEntityModel(vehicle) == GetHashKey(Vehicles[i].model) then - vehiclePrice = Vehicles[i].price - break - end - end - - if isRimMod then - price = math.floor(vehiclePrice * data.current.price / 100) - TriggerServerEvent("esx_lscustom:buyMod", price) - elseif v.modType == 11 or v.modType == 12 or v.modType == 13 or v.modType == 15 or v.modType == 16 then - price = math.floor(vehiclePrice * v.price[data.current.modNum + 1] / 100) - TriggerServerEvent("esx_lscustom:buyMod", price) - elseif v.modType == 17 then - price = math.floor(vehiclePrice * v.price[1] / 100) - TriggerServerEvent("esx_lscustom:buyMod", price) - else - price = math.floor(vehiclePrice * v.price / 100) - TriggerServerEvent("esx_lscustom:buyMod", price) - end - - end - menu.close() - found = true - break - end - end - if not found then - GetAction(data.current) - end - end, - function(data, menu) -- on cancel - menu.close() - TriggerEvent('esx_lscustom:cancelInstallMod') - - local playerPed = GetPlayerPed(-1) - local vehicle = GetVehiclePedIsIn(playerPed, false) - - SetVehicleDoorsShut(vehicle, false) - - if parent == nil then - lsMenuIsShowed = false - local vehicle = GetVehiclePedIsIn(GetPlayerPed(-1), false) - FreezeEntityPosition(vehicle, false) - myCar = {} - end - end, - function(data, menu) -- on change - UpdateMods(data.current) + if data.current.modType == "modFrontWheels" then + isRimMod = true end - ) + + for k,v in pairs(Config.Menus) do + + if k == data.current.modType or isRimMod then + + if data.current.label == _U('by_default') or string.match(data.current.label, _U('installed')) then + ESX.ShowNotification(_U('already_own', data.current.label)) + TriggerEvent('esx_lscustom:installMod') + else + local vehiclePrice = 50000 + + for i=1, #Vehicles, 1 do + if GetEntityModel(vehicle) == GetHashKey(Vehicles[i].model) then + vehiclePrice = Vehicles[i].price + break + end + end + + if isRimMod then + price = math.floor(vehiclePrice * data.current.price / 100) + TriggerServerEvent("esx_lscustom:buyMod", price) + elseif v.modType == 11 or v.modType == 12 or v.modType == 13 or v.modType == 15 or v.modType == 16 then + price = math.floor(vehiclePrice * v.price[data.current.modNum + 1] / 100) + TriggerServerEvent("esx_lscustom:buyMod", price) + elseif v.modType == 17 then + price = math.floor(vehiclePrice * v.price[1] / 100) + TriggerServerEvent("esx_lscustom:buyMod", price) + else + price = math.floor(vehiclePrice * v.price / 100) + TriggerServerEvent("esx_lscustom:buyMod", price) + end + end + + menu.close() + found = true + break + end + + end + + if not found then + GetAction(data.current) + end + end, function(data, menu) -- on cancel + menu.close() + TriggerEvent('esx_lscustom:cancelInstallMod') + + local playerPed = PlayerPedId() + local vehicle = GetVehiclePedIsIn(playerPed, false) + SetVehicleDoorsShut(vehicle, false) + + if parent == nil then + lsMenuIsShowed = false + local vehicle = GetVehiclePedIsIn(PlayerPedId(), false) + FreezeEntityPosition(vehicle, false) + myCar = {} + end + end, function(data, menu) -- on change + UpdateMods(data.current) + end) end function UpdateMods(data) - - local vehicle = GetVehiclePedIsIn(GetPlayerPed(-1), false) + local vehicle = GetVehiclePedIsIn(PlayerPedId(), false) if data.modType ~= nil then local props = {} @@ -140,9 +137,9 @@ function UpdateMods(data) props = {} elseif data.modType == 'neonColor' then if data.modNum[1] == 0 and data.modNum[2] == 0 and data.modNum[3] == 0 then - props['neonEnabled'] = {false, false, false, false} + props['neonEnabled'] = { false, false, false, false } else - props['neonEnabled'] = {true, true, true, true} + props['neonEnabled'] = { true, true, true, true } end ESX.Game.SetVehicleProperties(vehicle, props) props = {} @@ -151,6 +148,7 @@ function UpdateMods(data) ESX.Game.SetVehicleProperties(vehicle, props) props = {} end + props[data.modType] = data.modNum ESX.Game.SetVehicleProperties(vehicle, props) end @@ -158,11 +156,11 @@ end function GetAction(data) local elements = {} - local menuname = '' - local menutitle = '' + local menuName = '' + local menuTitle = '' local parent = nil - local playerPed = GetPlayerPed(-1) + local playerPed = PlayerPedId() local vehicle = GetVehiclePedIsIn(playerPed, false) local currentMods = ESX.Game.GetVehicleProperties(vehicle) @@ -197,8 +195,8 @@ function GetAction(data) if data.value == k then - menuname = k - menutitle = v.label + menuName = k + menuTitle = v.label parent = v.parent if v.modType ~= nil then @@ -251,13 +249,11 @@ function GetAction(data) local neons = GetNeons() price = math.floor(vehiclePrice * v.price / 100) for i=1, #neons, 1 do - table.insert(elements, - { - label = '' .. neons[i].label .. ' - $' .. price .. '', - modType = k, - modNum = { neons[i].r, neons[i].g, neons[i].b } - } - ) + table.insert(elements, { + label = '' .. neons[i].label .. ' - $' .. price .. '', + modType = k, + modNum = { neons[i].r, neons[i].g, neons[i].b } + }) end elseif v.modType == 'color1' or v.modType == 'color2' or v.modType == 'pearlescentColor' or v.modType == 'wheelColor' then -- RESPRAYS local colors = GetColors(data.color) @@ -303,10 +299,10 @@ function GetAction(data) for j = 0, modCount, 1 do local _label = '' if j == currentMods[k] then - _label = _U('level') .. j+1 .. ' - '.. _U('installed') ..'' + _label = _U('level', j+1) .. ' - '.. _U('installed') ..'' else price = math.floor(vehiclePrice * v.price[j+1] / 100) - _label = _U('level') .. j+1 .. ' - $' .. price .. ' ' + _label = _U('level', j+1) .. ' - $' .. price .. ' ' end table.insert(elements, {label = _label, modType = k, modNum = j}) if j == modCount-1 then @@ -345,7 +341,7 @@ function GetAction(data) elseif data.value == 'secondaryRespray' then table.insert(elements, {label = Config.Colors[i].label, value = 'color2', color = Config.Colors[i].value}) elseif data.value == 'pearlescentRespray' then - table.insert(elements, {label = Config.Colors[i].label, value = 'pearlescentColor', color = Config.Colors[i].value}) + table.insert(elements, {label = Config.Colors[i].label, value = 'pearlescentColor', color = Config.Colors[i].value}) elseif data.value == 'modFrontWheelsColor' then table.insert(elements, {label = Config.Colors[i].label, value = 'wheelColor', color = Config.Colors[i].value}) end @@ -366,13 +362,12 @@ function GetAction(data) return a.label < b.label end) - OpenLSMenu(elements, menuname, menutitle, parent) + OpenLSMenu(elements, menuName, menuTitle, parent) end -- Blips Citizen.CreateThread(function() - - for k,v in pairs(Config.Zones)do + for k,v in pairs(Config.Zones) do local blip = AddBlipForCoord(v.Pos.x, v.Pos.y, v.Pos.z) SetBlipSprite(blip, 72) SetBlipScale(blip, 0.8) @@ -387,20 +382,17 @@ end) Citizen.CreateThread(function() while true do Citizen.Wait(10) - local playerPed = GetPlayerPed(-1) + local playerPed = PlayerPedId() if IsPedInAnyVehicle(playerPed, false) then - local coords = GetEntityCoords(GetPlayerPed(-1)) + local coords = GetEntityCoords(PlayerPedId()) local currentZone = nil local zone = nil local lastZone = nil if (PlayerData.job ~= nil and PlayerData.job.name == 'mecano') or Config.IsMecanoJobOnly == false then for k,v in pairs(Config.Zones) do - if(GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < v.Size.x) then + if GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < v.Size.x then isInLSMarker = true - - SetTextComponentFormat("STRING") - AddTextComponentString(v.Hint) - DisplayHelpTextFromStringLabel(0, 0, 1, -1) + ESX.ShowHelpNotification(v.Hint) break else @@ -410,15 +402,17 @@ Citizen.CreateThread(function() end if IsControlJustReleased(0, Keys['E']) and not lsMenuIsShowed and isInLSMarker then - lsMenuIsShowed = true + if (PlayerData.job ~= nil and PlayerData.job.name == 'mecano') or Config.IsMecanoJobOnly == false then + lsMenuIsShowed = true - local vehicle = GetVehiclePedIsIn(playerPed, false) - FreezeEntityPosition(vehicle, true) + local vehicle = GetVehiclePedIsIn(playerPed, false) + FreezeEntityPosition(vehicle, true) - myCar = ESX.Game.GetVehicleProperties(vehicle) + myCar = ESX.Game.GetVehicleProperties(vehicle) - ESX.UI.Menu.CloseAll() - GetAction({value = 'main'}) + ESX.UI.Menu.CloseAll() + GetAction({value = 'main'}) + end end if isInLSMarker and not hasAlreadyEnteredMarker then @@ -433,7 +427,7 @@ Citizen.CreateThread(function() end end) ---Prevent Free Tunning Bug +-- Prevent Free Tunning Bug Citizen.CreateThread(function() while true do Citizen.Wait(1) diff --git a/config.lua b/config.lua index 5179489e..0354bf7d 100644 --- a/config.lua +++ b/config.lua @@ -4,46 +4,52 @@ Config.Locale = 'en' Config.IsMecanoJobOnly = false Config.Zones = { + ls1 = { - Pos = { x = -337.3863, y = -136.9247, z = 38.5737}, + Pos = { x = -337.38, y = -136.92, z = 38.57}, Size = {x = 3.0, y = 3.0, z = 0.2}, Color = {r = 204, g = 204, b = 0}, Marker= 1, - Name = "Los Santos Customs", + Name = _U('blip_name'), Hint = _U('press_custom') }, - ls2 = { - Pos = { x = -1155.536, y = -2007.183, z = 12.744}, + + ls2 = { + Pos = { x = -1155.53, y = -2007.18, z = 12.74}, Size = {x = 3.0, y = 3.0, z = 0.2}, Color = {r = 204, g = 204, b = 0}, Marker= 1, - Name = "Los Santos Customs", + Name = _U('blip_name'), Hint = _U('press_custom') }, - ls3 = { - Pos = { x = 731.8163, y = -1088.822, z = 21.733}, + + ls3 = { + Pos = { x = 731.81, y = -1088.82, z = 21.73}, Size = {x = 3.0, y = 3.0, z = 0.2}, Color = {r = 204, g = 204, b = 0}, Marker= 1, - Name = "Los Santos Customs", + Name = _U('blip_name'), Hint = _U('press_custom') }, - ls4 = { - Pos = { x = 1175.04, y = 2640.216, z = 37.32177}, + + ls4 = { + Pos = { x = 1175.04, y = 2640.21, z = 37.32}, Size = {x = 3.0, y = 3.0, z = 0.2}, Color = {r = 204, g = 204, b = 0}, Marker= 1, - Name = "Los Santos Customs", + Name = _U('blip_name'), Hint = _U('press_custom') }, - ls5 = { + + ls5 = { Pos = { x = 110.99, y = 6626.39, z = 30.89}, Size = {x = 3.0, y = 3.0, z = 0.2}, Color = {r = 204, g = 204, b = 0}, Marker= 1, - Name = "Los Santos Customs", + Name = _U('blip_name'), Hint = _U('press_custom') - }, + } + } Config.Colors = { @@ -59,7 +65,7 @@ Config.Colors = { { label = _U('brown'), value = 'brown'}, { label = _U('purple'), value = 'purple'}, { label = _U('chrome'), value = 'chrome'}, - { label = _U('gold'), value = 'gold'}, + { label = _U('gold'), value = 'gold'} } function GetColors(color) diff --git a/locales/br.lua b/locales/br.lua index 4803e02c..77df97b7 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,268 +1,269 @@ Locales['br'] = { - ['by_default'] = 'default', - ['installed'] = 'instalado', - ['already_own'] = 'já possuis: ~b~', - ['not_enough_money'] = 'sem dinheiro!', - ['purchased'] = 'tu compras-te esta peça!', - ['press_custom'] = 'pressiona ~INPUT_PICKUP~ para personalizar o veiculo.', - ['level'] = 'level ', - ['neon'] = 'neon', + ['by_default'] = 'default', + ['installed'] = 'instalado', + ['already_own'] = 'já possuis: ~b~%s~s~', + ['not_enough_money'] = 'sem dinheiro!', + ['purchased'] = 'tu compras-te esta peça!', + ['press_custom'] = 'pressiona ~INPUT_PICKUP~ para personalizar o veiculo.', + ['level'] = 'level %s', + ['neon'] = 'neon', + ['blip_name'] = 'los Santos Customs', -- Paint Colors - -- Preto - ['black'] = 'preto', - ['graphite'] = 'preto grafit', - ['black_metallic'] = 'preto metalico', - ['caststeel'] = 'aço fundido', - ['black_anth'] = 'antracite Preto', - ['matteblack'] = 'preto fosco', - ['darknight'] = 'noite escura', - ['deepblack'] = 'preto profundo', - ['oil'] = 'preto oleo', - ['carbon'] = 'preto carbono', - -- White - ['white'] = 'branco', - ['vanilla'] = 'baunilha', - ['creme'] = 'creme', - ['polarwhite'] = 'branco polar', - ['beige'] = 'bege', - ['mattewhite'] = 'branco fosco', - ['snow'] = 'branco neve', - ['cotton'] = 'branco algodao', - ['alabaster'] = 'branco alabastro', - ['purewhite'] = 'branco puro', - -- Grey - ['grey'] = 'cinzento', - ['silver'] = 'prata', - ['metallicgrey'] = 'cinza metalizado', - ['laminatedsteel'] = 'aço laminado', - ['darkgray'] = 'cinza escuro', - ['rockygray'] = 'cinza rochoso', - ['graynight'] = 'noite cinzenta', - ['aluminum'] = 'alumínio', - ['graymat'] = 'cinza fosco', - ['lightgrey'] = 'cinza claro', - ['asphaltgray'] = 'asfalto Cinza', - ['grayconcrete'] = 'cinza concreto', - ['darksilver'] = 'prata escura', - ['magnesite'] = 'magnesita', - ['nickel'] = 'níquel', - ['zinc'] = 'zinco', - ['dolomite'] = 'dolomite', - ['bluesilver'] = 'prata azul', - ['titanium'] = 'titânio', - ['steelblue'] = 'aço azul', - ['champagne'] = 'champanhe', - ['grayhunter'] = 'caçador cinzento', - -- Red - ['red'] = 'vermelho', - ['torino_red'] = 'vermelho torino', - ['poppy'] = 'vermelho papoila', - ['copper_red'] = 'vermelho cobre', - ['cardinal'] = 'vermelho cardeal', - ['brick'] = 'vermelho tijolo', - ['garnet'] = 'vermelho granada', - ['cabernet'] = 'vermelho cabernet', - ['candy'] = 'vermelho doce', - ['matte_red'] = 'vermelho fosco', - ['dark_red'] = 'vermelho escuro', - ['red_pulp'] = 'polpa vermelha', - ['bril_red'] = 'vermelho brilhante', - ['pale_red'] = 'vermelho pálido', - ['wine_red'] = 'vermelho vinho', - ['volcano'] = 'vermelho vulcão', - -- Pink - ['pink'] = 'rosa', - ['electricpink'] = 'rosa elétrica', - ['brightpink'] = 'rosa brilhante', - ['salmon'] = 'rosa salmão', - ['sugarplum'] = 'ameixa doce', - -- Blue - ['blue'] = 'azul', - ['topaz'] = 'azul topázio', - ['light_blue'] = 'azul claro', - ['galaxy_blue'] = 'azul galáxia', - ['dark_blue'] = 'azul escuro', - ['azure'] = 'azure', - ['navy_blue'] = 'azul marinho', - ['lapis'] = 'lápis lazúli', - ['blue_diamond'] = 'azul diamante', - ['surfer'] = 'azul surfista', - ['pastel_blue'] = 'azul pastel', - ['celeste_blue'] = 'azul celeste', - ['rally_blue'] = 'azul rally', - ['blue_paradise'] = 'azul paraíso', - ['blue_night'] = 'azul noite', - ['cyan_blue'] = 'azul ciano', - ['cobalt'] = 'azul cobalto', - ['electric_blue'] = 'azul elétrico', - ['horizon_blue'] = 'azul horizonte', - ['metallic_blue'] = 'azul metálico', - ['aquamarine'] = 'azul aquamarino', - ['blue_agathe'] = 'azul ágata', - ['zirconium'] = 'azul zircônio', - ['spinel'] = 'azul espinel', - ['tourmaline'] = 'azul turmalina', - ['paradise'] = 'azul paraíso', - ['bubble_gum'] = 'azul pastilha', - ['midnight_blue'] = 'azul meia-noite', - ['forbidden_blue'] = 'azul proibido', - ['glacier_blue'] = 'azul glaciar', - -- Yellow - ['yellow'] = 'amarelo', - ['wheat'] = 'amarelo trigo', - ['raceyellow'] = 'amarelo corrida', - ['paleyellow'] = 'amarelo pálido', - ['lightyellow'] = 'amarelo claro', - -- Green - ['green'] = 'verde', - ['met_dark_green'] = 'verde escuro metálico', - ['rally_green'] = 'verde rally', - ['pine_green'] = 'verde pinho', - ['olive_green'] = 'verde oliva', - ['light_green'] = 'verde claro', - ['lime_green'] = 'verde lima', - ['forest_green'] = 'verde floresta', - ['lawn_green'] = 'verde relva', - ['imperial_green'] = 'verde imperial', - ['green_bottle'] = 'verde garrafa', - ['citrus_green'] = 'verde cítrico', - ['green_anis'] = 'verde anis', - ['khaki'] = 'verde Khaki', - ['army_green'] = 'verde tropa', - ['dark_green'] = 'verde escuro', - ['hunter_green'] = 'verde caça', - ['matte_foilage_green'] = 'verde fosco', - -- Orange - ['orange'] = 'laranja', - ['tangerine'] = 'laranja tangerina', - ['matteorange'] = 'laranja fosco', - ['lightorange'] = 'laranja claro', - ['peach'] = 'laranja pessego', - ['pumpkin'] = 'laranja abóbora', - ['orangelambo'] = 'laranja lambo', - -- Brown - ['brown'] = 'castanho', - ['copper'] = 'castanho cobre', - ['lightbrown'] = 'castanho claro', - ['darkbrown'] = 'castanho escuro', - ['Bronze'] = 'bronze', - ['brownmetallic'] = 'castanho metálico', - ['espresso'] = 'castanho expresso', - ['chocolate'] = 'castanho chocolate', - ['terracotta'] = 'castanho Terracota', - ['marble'] = 'castanho mármore', - ['sand'] = 'castanho areia', - ['sepia'] = 'castanho sepia', - ['bison'] = 'castanho Bisonte', - ['palm'] = 'castanho palma', - ['caramel'] = 'castanho caramelo', - ['rust'] = 'castanho ferrugem', - ['chestnut'] = 'castanho fruto-seco', - ['hazelnut'] = 'castanho avelã', - ['shell'] = 'castanho concha', - ['mahogany'] = 'castanho mogno', - ['cauldron'] = 'castanho caldeirão', - ['blond'] = 'castanho loiro', - ['gravel'] = 'castanho gravilha', - ['darkearth'] = 'castanho escuro', - ['desert'] = 'castanho deserto', - -- Purple - ['purple'] = 'roxo', - ['indigo'] = 'roxo indigo', - ['deeppurple'] = 'roxo profundo', - ['darkviolet'] = 'violeta negro', - ['amethyst'] = 'roxo ametista', - ['mysticalviolet'] = 'violeta mística', - ['purplemetallic'] = 'roxo metálico', - ['matteviolet'] = 'violeta fosco', - ['mattedeeppurple'] = 'roxo fosco', - -- Chrome - ['chrome'] = 'cromado', - ['brushedchrome'] = 'cromado escovado', - ['blackchrome'] = 'cromado Preto', - ['brushedaluminum'] = 'alumínio escovado', - -- Metal - ['gold'] = 'ouro', - ['puregold'] = 'ouro puro', - ['brushedgold'] = 'ouro escovado', - ['lightgold'] = 'ouro brilhante', + -- Black + ['black'] = 'preto', + ['graphite'] = 'preto grafit', + ['black_metallic'] = 'preto metalico', + ['caststeel'] = 'aço fundido', + ['black_anth'] = 'antracite Preto', + ['matteblack'] = 'preto fosco', + ['darknight'] = 'noite escura', + ['deepblack'] = 'preto profundo', + ['oil'] = 'preto oleo', + ['carbon'] = 'preto carbono', + -- White + ['white'] = 'branco', + ['vanilla'] = 'baunilha', + ['creme'] = 'creme', + ['polarwhite'] = 'branco polar', + ['beige'] = 'bege', + ['mattewhite'] = 'branco fosco', + ['snow'] = 'branco neve', + ['cotton'] = 'branco algodao', + ['alabaster'] = 'branco alabastro', + ['purewhite'] = 'branco puro', + -- Grey + ['grey'] = 'cinzento', + ['silver'] = 'prata', + ['metallicgrey'] = 'cinza metalizado', + ['laminatedsteel'] = 'aço laminado', + ['darkgray'] = 'cinza escuro', + ['rockygray'] = 'cinza rochoso', + ['graynight'] = 'noite cinzenta', + ['aluminum'] = 'alumínio', + ['graymat'] = 'cinza fosco', + ['lightgrey'] = 'cinza claro', + ['asphaltgray'] = 'asfalto Cinza', + ['grayconcrete'] = 'cinza concreto', + ['darksilver'] = 'prata escura', + ['magnesite'] = 'magnesita', + ['nickel'] = 'níquel', + ['zinc'] = 'zinco', + ['dolomite'] = 'dolomite', + ['bluesilver'] = 'prata azul', + ['titanium'] = 'titânio', + ['steelblue'] = 'aço azul', + ['champagne'] = 'champanhe', + ['grayhunter'] = 'caçador cinzento', + -- Red + ['red'] = 'vermelho', + ['torino_red'] = 'vermelho torino', + ['poppy'] = 'vermelho papoila', + ['copper_red'] = 'vermelho cobre', + ['cardinal'] = 'vermelho cardeal', + ['brick'] = 'vermelho tijolo', + ['garnet'] = 'vermelho granada', + ['cabernet'] = 'vermelho cabernet', + ['candy'] = 'vermelho doce', + ['matte_red'] = 'vermelho fosco', + ['dark_red'] = 'vermelho escuro', + ['red_pulp'] = 'polpa vermelha', + ['bril_red'] = 'vermelho brilhante', + ['pale_red'] = 'vermelho pálido', + ['wine_red'] = 'vermelho vinho', + ['volcano'] = 'vermelho vulcão', + -- Pink + ['pink'] = 'rosa', + ['electricpink'] = 'rosa elétrica', + ['brightpink'] = 'rosa brilhante', + ['salmon'] = 'rosa salmão', + ['sugarplum'] = 'ameixa doce', + -- Blue + ['blue'] = 'azul', + ['topaz'] = 'azul topázio', + ['light_blue'] = 'azul claro', + ['galaxy_blue'] = 'azul galáxia', + ['dark_blue'] = 'azul escuro', + ['azure'] = 'azure', + ['navy_blue'] = 'azul marinho', + ['lapis'] = 'lápis lazúli', + ['blue_diamond'] = 'azul diamante', + ['surfer'] = 'azul surfista', + ['pastel_blue'] = 'azul pastel', + ['celeste_blue'] = 'azul celeste', + ['rally_blue'] = 'azul rally', + ['blue_paradise'] = 'azul paraíso', + ['blue_night'] = 'azul noite', + ['cyan_blue'] = 'azul ciano', + ['cobalt'] = 'azul cobalto', + ['electric_blue'] = 'azul elétrico', + ['horizon_blue'] = 'azul horizonte', + ['metallic_blue'] = 'azul metálico', + ['aquamarine'] = 'azul aquamarino', + ['blue_agathe'] = 'azul ágata', + ['zirconium'] = 'azul zircônio', + ['spinel'] = 'azul espinel', + ['tourmaline'] = 'azul turmalina', + ['paradise'] = 'azul paraíso', + ['bubble_gum'] = 'azul pastilha', + ['midnight_blue'] = 'azul meia-noite', + ['forbidden_blue'] = 'azul proibido', + ['glacier_blue'] = 'azul glaciar', + -- Yellow + ['yellow'] = 'amarelo', + ['wheat'] = 'amarelo trigo', + ['raceyellow'] = 'amarelo corrida', + ['paleyellow'] = 'amarelo pálido', + ['lightyellow'] = 'amarelo claro', + -- Green + ['green'] = 'verde', + ['met_dark_green'] = 'verde escuro metálico', + ['rally_green'] = 'verde rally', + ['pine_green'] = 'verde pinho', + ['olive_green'] = 'verde oliva', + ['light_green'] = 'verde claro', + ['lime_green'] = 'verde lima', + ['forest_green'] = 'verde floresta', + ['lawn_green'] = 'verde relva', + ['imperial_green'] = 'verde imperial', + ['green_bottle'] = 'verde garrafa', + ['citrus_green'] = 'verde cítrico', + ['green_anis'] = 'verde anis', + ['khaki'] = 'verde Khaki', + ['army_green'] = 'verde tropa', + ['dark_green'] = 'verde escuro', + ['hunter_green'] = 'verde caça', + ['matte_foilage_green'] = 'verde fosco', + -- Orange + ['orange'] = 'laranja', + ['tangerine'] = 'laranja tangerina', + ['matteorange'] = 'laranja fosco', + ['lightorange'] = 'laranja claro', + ['peach'] = 'laranja pessego', + ['pumpkin'] = 'laranja abóbora', + ['orangelambo'] = 'laranja lambo', + -- Brown + ['brown'] = 'castanho', + ['copper'] = 'castanho cobre', + ['lightbrown'] = 'castanho claro', + ['darkbrown'] = 'castanho escuro', + ['Bronze'] = 'bronze', + ['brownmetallic'] = 'castanho metálico', + ['espresso'] = 'castanho expresso', + ['chocolate'] = 'castanho chocolate', + ['terracotta'] = 'castanho Terracota', + ['marble'] = 'castanho mármore', + ['sand'] = 'castanho areia', + ['sepia'] = 'castanho sepia', + ['bison'] = 'castanho Bisonte', + ['palm'] = 'castanho palma', + ['caramel'] = 'castanho caramelo', + ['rust'] = 'castanho ferrugem', + ['chestnut'] = 'castanho fruto-seco', + ['hazelnut'] = 'castanho avelã', + ['shell'] = 'castanho concha', + ['mahogany'] = 'castanho mogno', + ['cauldron'] = 'castanho caldeirão', + ['blond'] = 'castanho loiro', + ['gravel'] = 'castanho gravilha', + ['darkearth'] = 'castanho escuro', + ['desert'] = 'castanho deserto', + -- Purple + ['purple'] = 'roxo', + ['indigo'] = 'roxo indigo', + ['deeppurple'] = 'roxo profundo', + ['darkviolet'] = 'violeta negro', + ['amethyst'] = 'roxo ametista', + ['mysticalviolet'] = 'violeta mística', + ['purplemetallic'] = 'roxo metálico', + ['matteviolet'] = 'violeta fosco', + ['mattedeeppurple'] = 'roxo fosco', + -- Chrome + ['chrome'] = 'cromado', + ['brushedchrome'] = 'cromado escovado', + ['blackchrome'] = 'cromado Preto', + ['brushedaluminum'] = 'alumínio escovado', + -- Metal + ['gold'] = 'ouro', + ['puregold'] = 'ouro puro', + ['brushedgold'] = 'ouro escovado', + ['lightgold'] = 'ouro brilhante', -- License Plates - ['blue_on_white_1'] = 'azul e cinza 1', - ['yellow_on_black'] = 'amarelo e Preto', - ['yellow_blue'] = 'amarelo e azul', - ['blue_on_white_2'] = 'azul e cinza 2', - ['blue_on_white_3'] = 'azul no cinza 3', + ['blue_on_white_1'] = 'azul e cinza 1', + ['yellow_on_black'] = 'amarelo e Preto', + ['yellow_blue'] = 'amarelo e azul', + ['blue_on_white_2'] = 'azul e cinza 2', + ['blue_on_white_3'] = 'azul no cinza 3', -- Upgrades - ['upgrades'] = 'upgrades', - ['engine'] = 'motor', - ['brakes'] = 'travões', - ['transmission'] = 'transmissão', - ['suspension'] = 'suspensão', - ['armor'] = 'armadura', - ['turbo'] = 'turbo', - ['no_turbo'] = 'sem turbo', + ['upgrades'] = 'upgrades', + ['engine'] = 'motor', + ['brakes'] = 'travões', + ['transmission'] = 'transmissão', + ['suspension'] = 'suspensão', + ['armor'] = 'armadura', + ['turbo'] = 'turbo', + ['no_turbo'] = 'sem turbo', -- Cosmetics - ['cosmetics'] = 'cosméticos', - -- Body Parts - ['bodyparts'] = 'chaparia', - ['leftfender'] = 'para-choque esquerdo', - ['rightfender'] = 'para-choque direito', - ['spoilers'] = 'alarão', - ['sideskirt'] = 'saias laterais', - ['cage'] = 'santantônio', - ['hood'] = 'capô', - ['grille'] = 'grade', - ['rearbumper'] = 'para-choque traseiro', - ['frontbumper'] = 'para-choque dianteiro', - ['exhaust'] = 'escape', - ['roof'] = 'teto', - -- Paint - ['respray'] = 'pintura', - ['primary'] = 'primário', - ['secondary'] = 'secundário', - ['pearlescent'] = 'perolado', - -- Misc - ['headlights'] = 'faróis dianteiros', - ['licenseplates'] = 'matricula', - ['windowtint'] = 'pelicula de vidro', - ['horns'] = 'buzinas', - -- Neon - ['neons'] = 'neons', - -- Wheels - ['wheels'] = 'rodas', - ['tiresmoke'] = 'fumaça de pneu', - ['wheel_type'] = 'tipo de roda', - ['wheel_color'] = 'cor de roda', - ['sport'] = 'desportivo', - ['muscle'] = 'muscle', - ['lowrider'] = 'lowrider', - ['suv'] = 'suv', - ['allterrain'] = 'todo terreno', - ['tuning'] = 'tuning', - ['motorcycle'] = 'motociclo', - ['highend'] = 'high end', - - ['modplateholder'] = 'placa - atrás', - ['modvanityplate'] = 'placa - frente', - ['interior'] = 'interior', - ['trim'] = 'trim', - ['dashboard'] = 'painel', - ['speedometer'] = 'velocímetro', - ['door_speakers'] = 'colunas da porta', - ['seats'] = 'bancos', - ['steering_wheel'] = 'volante', - ['gear_lever'] = 'manete de veloçidades', - ['quarter_deck'] = 'quarter-deck', - ['speakers'] = 'colunas', - ['trunk'] = 'bagagem', - ['hydraulic'] = 'hidráulico', - ['engine_block'] = 'bloco do motor', - ['air_filter'] = 'filtro de ar', - ['struts'] = 'suportes do motor', - ['arch_cover'] = 'cobertura de arco', - ['aerials'] = 'antenas', - ['wings'] = 'wings', - ['fuel_tank'] = 'tanque de combustível', - ['windows'] = 'janelas', - ['stickers'] = 'autocolantes', + ['cosmetics'] = 'cosméticos', + -- Body Parts + ['bodyparts'] = 'chaparia', + ['leftfender'] = 'para-choque esquerdo', + ['rightfender'] = 'para-choque direito', + ['spoilers'] = 'alarão', + ['sideskirt'] = 'saias laterais', + ['cage'] = 'santantônio', + ['hood'] = 'capô', + ['grille'] = 'grade', + ['rearbumper'] = 'para-choque traseiro', + ['frontbumper'] = 'para-choque dianteiro', + ['exhaust'] = 'escape', + ['roof'] = 'teto', + -- Paint + ['respray'] = 'pintura', + ['primary'] = 'primário', + ['secondary'] = 'secundário', + ['pearlescent'] = 'perolado', + -- Misc + ['headlights'] = 'faróis dianteiros', + ['licenseplates'] = 'matricula', + ['windowtint'] = 'pelicula de vidro', + ['horns'] = 'buzinas', + -- Neon + ['neons'] = 'neons', + -- Wheels + ['wheels'] = 'rodas', + ['tiresmoke'] = 'fumaça de pneu', + ['wheel_type'] = 'tipo de roda', + ['wheel_color'] = 'cor de roda', + ['sport'] = 'desportivo', + ['muscle'] = 'muscle', + ['lowrider'] = 'lowrider', + ['suv'] = 'suv', + ['allterrain'] = 'todo terreno', + ['tuning'] = 'tuning', + ['motorcycle'] = 'motociclo', + ['highend'] = 'high end', + + ['modplateholder'] = 'placa - atrás', + ['modvanityplate'] = 'placa - frente', + ['interior'] = 'interior', + ['trim'] = 'trim', + ['dashboard'] = 'painel', + ['speedometer'] = 'velocímetro', + ['door_speakers'] = 'colunas da porta', + ['seats'] = 'bancos', + ['steering_wheel'] = 'volante', + ['gear_lever'] = 'manete de veloçidades', + ['quarter_deck'] = 'quarter-deck', + ['speakers'] = 'colunas', + ['trunk'] = 'bagagem', + ['hydraulic'] = 'hidráulico', + ['engine_block'] = 'bloco do motor', + ['air_filter'] = 'filtro de ar', + ['struts'] = 'suportes do motor', + ['arch_cover'] = 'cobertura de arco', + ['aerials'] = 'antenas', + ['wings'] = 'wings', + ['fuel_tank'] = 'tanque de combustível', + ['windows'] = 'janelas', + ['stickers'] = 'autocolantes', } diff --git a/locales/de.lua b/locales/de.lua deleted file mode 100644 index b29f9cb1..00000000 --- a/locales/de.lua +++ /dev/null @@ -1,185 +0,0 @@ -Locales['de'] = { - ['by_default'] = 'default', - ['installed'] = 'installiert', - ['already_own'] = 'du besitzt bereits: ~b~', - ['not_enough_money'] = 'du hast nicht genug Geld!', - ['purchased'] = 'gekauft!', - ['press_custom'] = 'Drücke ~INPUT_PICKUP~ um dein Fahrzeug zu modifizieren.', - ['open_command'] = 'open LS Customs', - ['level'] = 'level ', - ['neon'] = 'neon', --- Paint Colors - -- Black - ['black'] = 'black', - ['graphite'] = 'graphite', - ['black_metallic'] = 'black Metallic', - ['caststeel'] = 'cast Steel', - ['black_anth'] = 'black Anthracite', - ['matteblack'] = 'matte Black', - ['darknight'] = 'dark Night', - ['deepblack'] = 'deep Black', - ['oil'] = 'oil', - ['carbon'] = 'carbon', - -- White - ['white'] = 'white', - ['vanilla'] = 'vanilla', - ['creme'] = 'creme', - ['polarwhite'] = 'polar White', - ['beige'] = 'beige', - ['mattewhite'] = 'matte White', - ['snow'] = 'snow', - ['cotton'] = 'cotton', - ['alabaster'] = 'alabaster', - ['purewhite'] = 'pure White', - -- Grey - ['grey'] = 'grey', - ['silver'] = 'silver', - ['metallicgrey'] = 'metallic Grey', - ['laminatedsteel'] = 'laminated Steel', - ['darkgray'] = 'dark Grey', - ['rockygray'] = 'rocky Grey', - ['graynight'] = 'gray Night', - ['aluminum'] = 'aluminum', - ['graymat'] = 'matte Grey', - ['lightgrey'] = 'light Grey', - ['asphaltgray'] = 'asphalt Grey', - ['grayconcrete'] = 'concrete Grey', - ['darksilver'] = 'dark Silver', - ['magnesite'] = 'magnesite', - ['nickel'] = 'nickel', - ['zinc'] = 'zinc', - ['dolomite'] = 'dolomite', - ['bluesilver'] = 'blue Silver', - ['titanium'] = 'titanium', - ['steelblue'] = 'steel Blue', - ['champagne'] = 'champagne', - ['grayhunter'] = 'grey Hunter', - -- Red - ['red'] = 'red', - -- Pink - ['pink'] = 'pink', - ['electricpink'] = 'electric Pink', - ['brightpink'] = 'bright Pink', - ['salmon'] = 'salmon', - ['sugarplum'] = 'sugar Plum', - -- Blue - ['blue'] = 'blue', - -- Yellow - ['yellow'] = 'yellow', - ['wheat'] = 'wheat', - ['raceyellow'] = 'race Yellow', - ['paleyellow'] = 'pale Yellow', - ['lightyellow'] = 'light Yellow', - -- Green - ['green'] = 'green', - -- Orange - ['orange'] = 'orange', - ['tangerine'] = 'Tangerine', - ['matteorange'] = 'Matte Orange', - ['lightorange'] = 'Light Orange', - ['peach'] = 'Peach', - ['pumpkin'] = 'Pumpkin', - ['orangelambo'] = 'Orange Lambo', - -- Brown - ['brown'] = 'brown', - ['copper'] = 'Copper', - ['lightbrown'] = 'Light Brown', - ['darkbrown'] = 'Dark Brown', - ['bronze'] = 'Bronze', - ['brownmetallic'] = 'Brown Metallic', - ['espresso'] = 'Espresso', - ['chocolate'] = 'Chocolate', - ['terracotta'] = 'Terracotta', - ['marble'] = 'Marble', - ['sand'] = 'Sand', - ['sepia'] = 'Sepia', - ['bison'] = 'Bison', - ['palm'] = 'Palm', - ['caramel'] = 'Caramel', - ['rust'] = 'Rust', - ['chestnut'] = 'Chestnut', - ['hazelnut'] = 'Hazelnut', - ['shell'] = 'Shell', - ['mahogany'] = 'Mahogany', - ['cauldron'] = 'Cauldron', - ['blond'] = 'Blond', - ['gravel'] = 'Gravel', - ['darkearth'] = 'Dark Earth', - ['desert'] = 'Desert', - -- Purple - ['purple'] = 'purple', - ['indigo'] = 'Indigo', - ['deeppurple'] = 'Deep Purple', - ['darkviolet'] = 'Dark Violet', - ['amethyst'] = 'Amethyst', - ['mysticalviolet'] = 'Mystic Violet', - ['purplemetallic'] = 'Purple Metallic', - ['matteviolet'] = 'Matte Violet', - ['mattedeeppurple'] = 'Matte Deep Purple', - -- Chrome - ['chrome'] = 'chrome', - ['brushedchrome'] = 'brushed Chrome', - ['blackchrome'] = 'black Chrome', - ['brushedaluminum'] = 'brushed Aluminum', - -- Metal - ['gold'] = 'gold', - ['puregold'] = 'pure Gold', - ['brushedgold'] = 'brushed Gold', - ['lightgold'] = 'light Gold', --- License Plates - ['blue_on_white_1'] = 'blue on white 1', - ['yellow_on_black'] = 'yellow on black', - ['yellow_blue'] = 'yellow on blue', - ['blue_on_white_2'] = 'blue on white 2', - ['blue_on_white_3'] = 'blue on white 3', --- Upgrades - ['upgrades'] = 'upgrades', - ['engine'] = 'engine', - ['brakes'] = 'brakes', - ['transmission'] = 'transmission', - ['suspension'] = 'suspension', - ['armor'] = 'armor', - ['turbo'] = 'turbo', - ['no_turbo'] = 'keine turbo', --- Cosmetics - ['cosmetics'] = 'cosmetics', - -- Body Parts - ['bodyparts'] = 'body Parts', - ['leftfender'] = 'left fender', - ['rightfender'] = 'right fender', - ['spoilers'] = 'spoilers', - ['sideskirt'] = 'side skirts', - ['frame'] = 'cage', - ['hood'] = 'hood', - ['grille'] = 'grille', - ['rearbumper'] = 'rear bumper', - ['frontbumper'] = 'front bumper', - ['exhaust'] = 'exhaust', - ['roof'] = 'roof', - -- Paint - ['respray'] = 'respray', - ['primary'] = 'primary', - ['secondary'] = 'secondary', - ['pearlescent'] = 'pearlescent', - -- Misc - ['headlights'] = 'headlights', - ['licenseplates'] = 'license Plate', - ['windowtint'] = 'window Tint', - ['horns'] = 'horns', - -- Neon - ['neons'] = 'neons', - -- Wheels - ['wheels'] = 'wheels', - ['tiresmoke'] = 'tire smoke', - ['wheel_type'] = 'wheel type', - ['wheel_color'] = 'wheel color', - ['sport'] = 'sport', - ['muscle'] = 'muscle', - ['lowrider'] = 'lowrider', - ['suv'] = 'sUV', - ['allterrain'] = 'all terrain', - ['tuning'] = 'tuning', - ['motorcycle'] = 'motorcycle', - ['highend'] = 'high end', - -} diff --git a/locales/en.lua b/locales/en.lua index f6a46223..71f994a4 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,269 +1,269 @@ Locales['en'] = { - ['by_default'] = 'default', - ['installed'] = 'installed', - ['already_own'] = 'you already own: ~b~', - ['not_enough_money'] = 'you do not have enough money!', - ['purchased'] = 'you have purchased the mod!', - ['press_custom'] = 'press ~INPUT_PICKUP~ to personalize your vehicle.', - ['open_command'] = 'open LS Customs', - ['level'] = 'level ', - ['neon'] = 'neon', + ['by_default'] = 'default', + ['installed'] = 'installed', + ['already_own'] = 'you already own: ~b~%s~s~', + ['not_enough_money'] = 'you cannot afford this mod!', + ['purchased'] = 'you have purchased the mod!', + ['press_custom'] = 'press ~INPUT_PICKUP~ to ~y~personalize~s~ your vehicle.', + ['level'] = 'level %s', + ['neon'] = 'neon', + ['blip_name'] = 'los Santos Customs', -- Paint Colors - -- Black - ['black'] = 'black', - ['graphite'] = 'graphite', - ['black_metallic'] = 'black Metallic', - ['caststeel'] = 'cast Steel', - ['black_anth'] = 'black Anthracite', - ['matteblack'] = 'matte Black', - ['darknight'] = 'dark Night', - ['deepblack'] = 'deep Black', - ['oil'] = 'oil', - ['carbon'] = 'carbon', - -- White - ['white'] = 'white', - ['vanilla'] = 'vanilla', - ['creme'] = 'creme', - ['polarwhite'] = 'polar White', - ['beige'] = 'beige', - ['mattewhite'] = 'matte White', - ['snow'] = 'snow', - ['cotton'] = 'cotton', - ['alabaster'] = 'alabaster', - ['purewhite'] = 'pure White', - -- Grey - ['grey'] = 'grey', - ['silver'] = 'silver', - ['metallicgrey'] = 'metallic Grey', - ['laminatedsteel'] = 'laminated Steel', - ['darkgray'] = 'dark Grey', - ['rockygray'] = 'rocky Grey', - ['graynight'] = 'gray Night', - ['aluminum'] = 'aluminum', - ['graymat'] = 'matte Grey', - ['lightgrey'] = 'light Grey', - ['asphaltgray'] = 'asphalt Grey', - ['grayconcrete'] = 'concrete Grey', - ['darksilver'] = 'dark Silver', - ['magnesite'] = 'magnesite', - ['nickel'] = 'nickel', - ['zinc'] = 'zinc', - ['dolomite'] = 'dolomite', - ['bluesilver'] = 'blue Silver', - ['titanium'] = 'titanium', - ['steelblue'] = 'steel Blue', - ['champagne'] = 'champagne', - ['grayhunter'] = 'grey Hunter', - -- Red - ['red'] = 'red', - ['torino_red'] = 'torino Red', - ['poppy'] = 'poppy', - ['copper_red'] = 'copper Red', - ['cardinal'] = 'cardinal Red', - ['brick'] = 'brick Red', - ['garnet'] = 'Garnet', - ['cabernet'] = 'cabernet Red', - ['candy'] = 'candy Red', - ['matte_red'] = 'matte Red', - ['dark_red'] = 'dark Red', - ['red_pulp'] = 'red Pulp', - ['bril_red'] = 'brilliant Red', - ['pale_red'] = 'pale Red', - ['wine_red'] = 'wine Red', - ['volcano'] = 'Volcano', - -- Pink - ['pink'] = 'pink', - ['electricpink'] = 'electric Pink', - ['brightpink'] = 'bright Pink', - ['salmon'] = 'salmon', - ['sugarplum'] = 'sugar Plum', - -- Blue - ['blue'] = 'blue', - ['topaz'] = 'topaz', - ['light_blue'] = 'light Blue', - ['galaxy_blue'] = 'galaxy Blue', - ['dark_blue'] = 'dark Blue', - ['azure'] = 'azure', - ['navy_blue'] = 'navy Blue', - ['lapis'] = 'lapis Lazuli', - ['blue_diamond'] = 'blue Diamond', - ['surfer'] = 'surfer', - ['pastel_blue'] = 'pastel Blue', - ['celeste_blue'] = 'celeste Blue', - ['rally_blue'] = 'rally Blue', - ['blue_paradise'] = 'blue Paradise', - ['blue_night'] = 'blue Night', - ['cyan_blue'] = 'cyan Blue', - ['cobalt'] = 'cobalt', - ['electric_blue'] = 'electric Blue', - ['horizon_blue'] = 'horizon Blue', - ['metallic_blue'] = 'metallic Blue', - ['aquamarine'] = 'aquamarine', - ['blue_agathe'] = 'blue Agathe', - ['zirconium'] = 'zirconium', - ['spinel'] = 'spinel', - ['tourmaline'] = 'tourmaline', - ['paradise'] = 'paradise', - ['bubble_gum'] = 'bubble Gum', - ['midnight_blue'] = 'midnight Blue', - ['forbidden_blue'] = 'forbidden Blue', - ['glacier_blue'] = 'glacier Blue', - -- Yellow - ['yellow'] = 'yellow', - ['wheat'] = 'wheat', - ['raceyellow'] = 'race Yellow', - ['paleyellow'] = 'pale Yellow', - ['lightyellow'] = 'light Yellow', - -- Green - ['green'] = 'green', - ['met_dark_green'] = 'metallic Dark Green', - ['rally_green'] = 'Rally Green', - ['pine_green'] = 'pine Green', - ['olive_green'] = 'olive Green', - ['light_green'] = 'Light Green', - ['lime_green'] = 'lime green', - ['forest_green'] = 'forest Green', - ['lawn_green'] = 'lawn Green', - ['imperial_green'] = 'imperial Green', - ['green_bottle'] = 'breen Bottle', - ['citrus_green'] = 'citrus Green', - ['green_anis'] = 'green Anis', - ['khaki'] = 'Khaki', - ['army_green'] = 'army Green', - ['dark_green'] = 'dark Green', - ['hunter_green'] = 'hunter Green', - ['matte_foilage_green'] = 'matte Foilage Green', - -- Orange - ['orange'] = 'orange', - ['tangerine'] = 'Tangerine', - ['matteorange'] = 'Matte Orange', - ['lightorange'] = 'Light Orange', - ['peach'] = 'Peach', - ['pumpkin'] = 'Pumpkin', - ['orangelambo'] = 'Orange Lambo', - -- Brown - ['brown'] = 'brown', - ['copper'] = 'Copper', - ['lightbrown'] = 'Light Brown', - ['darkbrown'] = 'Dark Brown', - ['bronze'] = 'Bronze', - ['brownmetallic'] = 'Brown Metallic', - ['espresso'] = 'Espresso', - ['chocolate'] = 'Chocolate', - ['terracotta'] = 'Terracotta', - ['marble'] = 'Marble', - ['sand'] = 'Sand', - ['sepia'] = 'Sepia', - ['bison'] = 'Bison', - ['palm'] = 'Palm', - ['caramel'] = 'Caramel', - ['rust'] = 'Rust', - ['chestnut'] = 'Chestnut', - ['hazelnut'] = 'Hazelnut', - ['shell'] = 'Shell', - ['mahogany'] = 'Mahogany', - ['cauldron'] = 'Cauldron', - ['blond'] = 'Blond', - ['gravel'] = 'Gravel', - ['darkearth'] = 'Dark Earth', - ['desert'] = 'Desert', - -- Purple - ['purple'] = 'purple', - ['indigo'] = 'Indigo', - ['deeppurple'] = 'Deep Purple', - ['darkviolet'] = 'Dark Violet', - ['amethyst'] = 'Amethyst', - ['mysticalviolet'] = 'Mystic Violet', - ['purplemetallic'] = 'Purple Metallic', - ['matteviolet'] = 'Matte Violet', - ['mattedeeppurple'] = 'Matte Deep Purple', - -- Chrome - ['chrome'] = 'chrome', - ['brushedchrome'] = 'brushed Chrome', - ['blackchrome'] = 'black Chrome', - ['brushedaluminum'] = 'brushed Aluminum', - -- Metal - ['gold'] = 'gold', - ['puregold'] = 'pure Gold', - ['brushedgold'] = 'brushed Gold', - ['lightgold'] = 'light Gold', + -- Black + ['black'] = 'black', + ['graphite'] = 'graphite', + ['black_metallic'] = 'black Metallic', + ['caststeel'] = 'cast Steel', + ['black_anth'] = 'black Anthracite', + ['matteblack'] = 'matte Black', + ['darknight'] = 'dark Night', + ['deepblack'] = 'deep Black', + ['oil'] = 'oil', + ['carbon'] = 'carbon', + -- White + ['white'] = 'white', + ['vanilla'] = 'vanilla', + ['creme'] = 'creme', + ['polarwhite'] = 'polar White', + ['beige'] = 'beige', + ['mattewhite'] = 'matte White', + ['snow'] = 'snow', + ['cotton'] = 'cotton', + ['alabaster'] = 'alabaster', + ['purewhite'] = 'pure White', + -- Grey + ['grey'] = 'grey', + ['silver'] = 'silver', + ['metallicgrey'] = 'metallic Grey', + ['laminatedsteel'] = 'laminated Steel', + ['darkgray'] = 'dark Grey', + ['rockygray'] = 'rocky Grey', + ['graynight'] = 'gray Night', + ['aluminum'] = 'aluminum', + ['graymat'] = 'matte Grey', + ['lightgrey'] = 'light Grey', + ['asphaltgray'] = 'asphalt Grey', + ['grayconcrete'] = 'concrete Grey', + ['darksilver'] = 'dark Silver', + ['magnesite'] = 'magnesite', + ['nickel'] = 'nickel', + ['zinc'] = 'zinc', + ['dolomite'] = 'dolomite', + ['bluesilver'] = 'blue Silver', + ['titanium'] = 'titanium', + ['steelblue'] = 'steel Blue', + ['champagne'] = 'champagne', + ['grayhunter'] = 'grey Hunter', + -- Red + ['red'] = 'red', + ['torino_red'] = 'torino Red', + ['poppy'] = 'poppy', + ['copper_red'] = 'copper Red', + ['cardinal'] = 'cardinal Red', + ['brick'] = 'brick Red', + ['garnet'] = 'Garnet', + ['cabernet'] = 'cabernet Red', + ['candy'] = 'candy Red', + ['matte_red'] = 'matte Red', + ['dark_red'] = 'dark Red', + ['red_pulp'] = 'red Pulp', + ['bril_red'] = 'brilliant Red', + ['pale_red'] = 'pale Red', + ['wine_red'] = 'wine Red', + ['volcano'] = 'Volcano', + -- Pink + ['pink'] = 'pink', + ['electricpink'] = 'electric Pink', + ['brightpink'] = 'bright Pink', + ['salmon'] = 'salmon', + ['sugarplum'] = 'sugar Plum', + -- Blue + ['blue'] = 'blue', + ['topaz'] = 'topaz', + ['light_blue'] = 'light Blue', + ['galaxy_blue'] = 'galaxy Blue', + ['dark_blue'] = 'dark Blue', + ['azure'] = 'azure', + ['navy_blue'] = 'navy Blue', + ['lapis'] = 'lapis Lazuli', + ['blue_diamond'] = 'blue Diamond', + ['surfer'] = 'surfer', + ['pastel_blue'] = 'pastel Blue', + ['celeste_blue'] = 'celeste Blue', + ['rally_blue'] = 'rally Blue', + ['blue_paradise'] = 'blue Paradise', + ['blue_night'] = 'blue Night', + ['cyan_blue'] = 'cyan Blue', + ['cobalt'] = 'cobalt', + ['electric_blue'] = 'electric Blue', + ['horizon_blue'] = 'horizon Blue', + ['metallic_blue'] = 'metallic Blue', + ['aquamarine'] = 'aquamarine', + ['blue_agathe'] = 'blue Agathe', + ['zirconium'] = 'zirconium', + ['spinel'] = 'spinel', + ['tourmaline'] = 'tourmaline', + ['paradise'] = 'paradise', + ['bubble_gum'] = 'bubble Gum', + ['midnight_blue'] = 'midnight Blue', + ['forbidden_blue'] = 'forbidden Blue', + ['glacier_blue'] = 'glacier Blue', + -- Yellow + ['yellow'] = 'yellow', + ['wheat'] = 'wheat', + ['raceyellow'] = 'race Yellow', + ['paleyellow'] = 'pale Yellow', + ['lightyellow'] = 'light Yellow', + -- Green + ['green'] = 'green', + ['met_dark_green'] = 'metallic Dark Green', + ['rally_green'] = 'Rally Green', + ['pine_green'] = 'pine Green', + ['olive_green'] = 'olive Green', + ['light_green'] = 'Light Green', + ['lime_green'] = 'lime green', + ['forest_green'] = 'forest Green', + ['lawn_green'] = 'lawn Green', + ['imperial_green'] = 'imperial Green', + ['green_bottle'] = 'breen Bottle', + ['citrus_green'] = 'citrus Green', + ['green_anis'] = 'green Anis', + ['khaki'] = 'Khaki', + ['army_green'] = 'army Green', + ['dark_green'] = 'dark Green', + ['hunter_green'] = 'hunter Green', + ['matte_foilage_green'] = 'matte Foilage Green', + -- Orange + ['orange'] = 'orange', + ['tangerine'] = 'Tangerine', + ['matteorange'] = 'Matte Orange', + ['lightorange'] = 'Light Orange', + ['peach'] = 'Peach', + ['pumpkin'] = 'Pumpkin', + ['orangelambo'] = 'Orange Lambo', + -- Brown + ['brown'] = 'brown', + ['copper'] = 'Copper', + ['lightbrown'] = 'Light Brown', + ['darkbrown'] = 'Dark Brown', + ['bronze'] = 'Bronze', + ['brownmetallic'] = 'Brown Metallic', + ['espresso'] = 'Espresso', + ['chocolate'] = 'Chocolate', + ['terracotta'] = 'Terracotta', + ['marble'] = 'Marble', + ['sand'] = 'Sand', + ['sepia'] = 'Sepia', + ['bison'] = 'Bison', + ['palm'] = 'Palm', + ['caramel'] = 'Caramel', + ['rust'] = 'Rust', + ['chestnut'] = 'Chestnut', + ['hazelnut'] = 'Hazelnut', + ['shell'] = 'Shell', + ['mahogany'] = 'Mahogany', + ['cauldron'] = 'Cauldron', + ['blond'] = 'Blond', + ['gravel'] = 'Gravel', + ['darkearth'] = 'Dark Earth', + ['desert'] = 'Desert', + -- Purple + ['purple'] = 'purple', + ['indigo'] = 'Indigo', + ['deeppurple'] = 'Deep Purple', + ['darkviolet'] = 'Dark Violet', + ['amethyst'] = 'Amethyst', + ['mysticalviolet'] = 'Mystic Violet', + ['purplemetallic'] = 'Purple Metallic', + ['matteviolet'] = 'Matte Violet', + ['mattedeeppurple'] = 'Matte Deep Purple', + -- Chrome + ['chrome'] = 'chrome', + ['brushedchrome'] = 'brushed Chrome', + ['blackchrome'] = 'black Chrome', + ['brushedaluminum'] = 'brushed Aluminum', + -- Metal + ['gold'] = 'gold', + ['puregold'] = 'pure Gold', + ['brushedgold'] = 'brushed Gold', + ['lightgold'] = 'light Gold', -- License Plates - ['blue_on_white_1'] = 'blue on white 1', - ['yellow_on_black'] = 'yellow on black', - ['yellow_blue'] = 'yellow on blue', - ['blue_on_white_2'] = 'blue on white 2', - ['blue_on_white_3'] = 'blue on white 3', + ['blue_on_white_1'] = 'blue on white 1', + ['yellow_on_black'] = 'yellow on black', + ['yellow_blue'] = 'yellow on blue', + ['blue_on_white_2'] = 'blue on white 2', + ['blue_on_white_3'] = 'blue on white 3', -- Upgrades - ['upgrades'] = 'upgrades', - ['engine'] = 'engine', - ['brakes'] = 'brakes', - ['transmission'] = 'transmission', - ['suspension'] = 'suspension', - ['armor'] = 'armor', - ['turbo'] = 'turbo', - ['no_turbo'] = 'no turbo', + ['upgrades'] = 'upgrades', + ['engine'] = 'engine', + ['brakes'] = 'brakes', + ['transmission'] = 'transmission', + ['suspension'] = 'suspension', + ['armor'] = 'armor', + ['turbo'] = 'turbo', + ['no_turbo'] = 'no turbo', -- Cosmetics - ['cosmetics'] = 'cosmetics', - -- Body Parts - ['bodyparts'] = 'body Parts', - ['leftfender'] = 'left fender', - ['rightfender'] = 'right fender', - ['spoilers'] = 'spoilers', - ['sideskirt'] = 'side skirts', - ['cage'] = 'cage', - ['hood'] = 'hood', - ['grille'] = 'grille', - ['rearbumper'] = 'rear bumper', - ['frontbumper'] = 'front bumper', - ['exhaust'] = 'exhaust', - ['roof'] = 'roof', - -- Paint - ['respray'] = 'respray', - ['primary'] = 'primary', - ['secondary'] = 'secondary', - ['pearlescent'] = 'pearlescent', - -- Misc - ['headlights'] = 'headlights', - ['licenseplates'] = 'license Plate', - ['windowtint'] = 'window Tint', - ['horns'] = 'horns', - -- Neon - ['neons'] = 'neons', - -- Wheels - ['wheels'] = 'wheels', - ['tiresmoke'] = 'tire smoke', - ['wheel_type'] = 'wheel type', - ['wheel_color'] = 'wheel color', - ['sport'] = 'sport', - ['muscle'] = 'muscle', - ['lowrider'] = 'lowrider', - ['suv'] = 'SUV', - ['allterrain'] = 'all terrain', - ['tuning'] = 'tuning', - ['motorcycle'] = 'motorcycle', - ['highend'] = 'high end', - - ['modplateholder'] = 'plate - Back', - ['modvanityplate'] = 'plate - Front', - ['interior'] = 'interior', - ['trim'] = 'trim', - ['dashboard'] = 'dashboard', - ['speedometer'] = 'speedometer', - ['door_speakers'] = 'door speakers', - ['seats'] = 'seats', - ['steering_wheel'] = 'steering wheel', - ['gear_lever'] = 'gear lever', - ['quarter_deck'] = 'quarter-deck', - ['speakers'] = 'speakers', - ['trunk'] = 'trunk', - ['hydraulic'] = 'hydraulic', - ['engine_block'] = 'engine block', - ['air_filter'] = 'air filter', - ['struts'] = 'struts', - ['arch_cover'] = 'arch cover', - ['aerials'] = 'aerials', - ['wings'] = 'wings', - ['fuel_tank'] = 'fuel tank', - ['windows'] = 'windows', - ['stickers'] = 'stickers', -} \ No newline at end of file + ['cosmetics'] = 'cosmetics', + -- Body Parts + ['bodyparts'] = 'body Parts', + ['leftfender'] = 'left fender', + ['rightfender'] = 'right fender', + ['spoilers'] = 'spoilers', + ['sideskirt'] = 'side skirts', + ['cage'] = 'cage', + ['hood'] = 'hood', + ['grille'] = 'grille', + ['rearbumper'] = 'rear bumper', + ['frontbumper'] = 'front bumper', + ['exhaust'] = 'exhaust', + ['roof'] = 'roof', + -- Paint + ['respray'] = 'respray', + ['primary'] = 'primary', + ['secondary'] = 'secondary', + ['pearlescent'] = 'pearlescent', + -- Misc + ['headlights'] = 'headlights', + ['licenseplates'] = 'license Plate', + ['windowtint'] = 'window Tint', + ['horns'] = 'horns', + -- Neon + ['neons'] = 'neons', + -- Wheels + ['wheels'] = 'wheels', + ['tiresmoke'] = 'tire smoke', + ['wheel_type'] = 'wheel type', + ['wheel_color'] = 'wheel color', + ['sport'] = 'sport', + ['muscle'] = 'muscle', + ['lowrider'] = 'lowrider', + ['suv'] = 'SUV', + ['allterrain'] = 'all terrain', + ['tuning'] = 'tuning', + ['motorcycle'] = 'motorcycle', + ['highend'] = 'high end', + + ['modplateholder'] = 'plate - Back', + ['modvanityplate'] = 'plate - Front', + ['interior'] = 'interior', + ['trim'] = 'trim', + ['dashboard'] = 'dashboard', + ['speedometer'] = 'speedometer', + ['door_speakers'] = 'door speakers', + ['seats'] = 'seats', + ['steering_wheel'] = 'steering wheel', + ['gear_lever'] = 'gear lever', + ['quarter_deck'] = 'quarter-deck', + ['speakers'] = 'speakers', + ['trunk'] = 'trunk', + ['hydraulic'] = 'hydraulic', + ['engine_block'] = 'engine block', + ['air_filter'] = 'air filter', + ['struts'] = 'struts', + ['arch_cover'] = 'arch cover', + ['aerials'] = 'aerials', + ['wings'] = 'wings', + ['fuel_tank'] = 'fuel tank', + ['windows'] = 'windows', + ['stickers'] = 'stickers', +} diff --git a/locales/fr.lua b/locales/fr.lua index 4be9c419..c786ffc4 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,269 +1,269 @@ Locales['fr'] = { - ['by_default'] = 'par défaut', - ['installed'] = 'installé', - ['already_own'] = 'vous possédez déjà: ~b~', - ['not_enough_money'] = 'vous n\'avez pas assez d\'argent !', - ['purchased'] = 'achat effectué !', - ['press_custom'] = 'appuyez sur ~INPUT_PICKUP~ pour personnaliser le véhicule.', - ['open_command'] = 'open LS Customs', - ['level'] = 'niveau ', - ['neon'] = 'neon', + ['by_default'] = 'par défaut', + ['installed'] = 'installé', + ['already_own'] = 'vous possédez déjà: ~b~%s~s~', + ['not_enough_money'] = 'vous n\'avez pas assez d\'argent!', + ['purchased'] = 'achat effectué!', + ['press_custom'] = 'appuyez sur ~INPUT_PICKUP~ pour personnaliser le véhicule.', + ['level'] = 'niveau %s', + ['neon'] = 'neon', + ['blip_name'] = 'los Santos Customs', -- Paint Colors - -- Black - ['black'] = 'noir', - ['graphite'] = 'graphite', - ['black_metallic'] = 'noir Méttallisé', - ['caststeel'] = 'acier Fondu', - ['black_anth'] = 'noir Anthracite', - ['matteblack'] = 'noir Mat', - ['darknight'] = 'nuit Sombre', - ['deepblack'] = 'noir Profond', - ['oil'] = 'pétrol', - ['carbon'] = 'carbon', - -- White - ['white'] = 'blanc', - ['vanilla'] = 'vanille', - ['creme'] = 'crème', - ['polarwhite'] = 'blanc Polair', - ['beige'] = 'beige', - ['mattewhite'] = 'blanc Mat', - ['snow'] = 'neige', - ['cotton'] = 'coton', - ['alabaster'] = 'albâtre', - ['purewhite'] = 'blanc Pure', - -- Grey - ['grey'] = 'gris', - ['silver'] = 'Argenté', - ['metallicgrey'] = 'Gris Métallisé', - ['laminatedsteel'] = 'Acier Laminé', - ['darkgray'] = 'Gris Foncé', - ['rockygray'] = 'Gris Rocheux', - ['graynight'] = 'Gris Nuit', - ['aluminum'] = 'Aluminium', - ['graymat'] = 'Gris Mat', - ['lightgrey'] = 'Gris Clair', - ['asphaltgray'] = 'Gris Bitume', - ['grayconcrete'] = 'Gris Béton', - ['darksilver'] = 'Argent Sombre', - ['magnesite'] = 'Magnésite', - ['nickel'] = 'nickel', - ['zinc'] = 'zinc', - ['dolomite'] = 'dolomite', - ['bluesilver'] = 'Argent Bleuté', - ['titanium'] = 'Titane', - ['steelblue'] = 'Acier Bleui', - ['champagne'] = 'Champagne', - ['grayhunter'] = 'Gris Chasseur', - -- Red - ['red'] = 'rouge', - ['torino_red'] = 'Rouge Turin', - ['poppy'] = 'Coquelicot', - ['copper_red'] = 'Rouge Cuivré', - ['cardinal'] = 'Rouge Cardinal', - ['brick'] = 'Rouge Brique', - ['garnet'] = 'Grenat', - ['cabernet'] = 'Pourpre', - ['candy'] = 'Framboise', - ['matte_red'] = 'Rouge Mat', - ['dark_red'] = 'Rouge Foncé', - ['red_pulp'] = 'Rouge Pulpeux', - ['bril_red'] = 'Rouge Brillant', - ['pale_red'] = 'Rouge Pale', - ['wine_red'] = 'Rouge Vin', - ['volcano'] = 'Volcano', - -- Pink - ['pink'] = 'rose', - ['electricpink'] = 'rose Electrique', - ['brightpink'] = 'rose pétant', - ['salmon'] = 'rose Saumon', - ['sugarplum'] = 'rose Dragée', - -- Blue - ['blue'] = 'bleu', - ['topaz'] = 'topaze', - ['light_blue'] = 'bleu clair', - ['galaxy_blue'] = 'bleu galaxy', - ['dark_blue'] = 'bleu foncé', - ['azure'] = 'bleu azur', - ['navy_blue'] = 'bleu marine', - ['lapis'] = 'lapis lazuli', - ['blue_diamond'] = 'bleu diamant', - ['surfer'] = 'surfer', - ['pastel_blue'] = 'pastel', - ['celeste_blue'] = 'bleu celeste', - ['rally_blue'] = 'bleu rally', - ['blue_paradise'] = 'bleu paradis', - ['blue_night'] = 'bleu nuit', - ['cyan_blue'] = 'bleu cyan', - ['cobalt'] = 'cobalt', - ['electric_blue'] = 'bleu electrique', - ['horizon_blue'] = 'bleu horizon', - ['metallic_blue'] = 'bleu métallisé', - ['aquamarine'] = 'aigue marine', - ['blue_agathe'] = 'bleu agathe', - ['zirconium'] = 'zirconium', - ['spinel'] = 'spinelle', - ['tourmaline'] = 'tourmaline', - ['paradise'] = 'paradis', - ['bubble_gum'] = 'bubble gum', - ['midnight_blue'] = 'bleu minuit', - ['forbidden_blue'] = 'bleu interdit', - ['glacier_blue'] = 'bleu glacier', - -- Yellow - ['yellow'] = 'jaune', - ['wheat'] = 'Jaune Blé', - ['raceyellow'] = 'Jaune Rally', - ['paleyellow'] = 'Jaune Clair', - ['lightyellow'] = 'Jaune Pâle', - -- Green - ['green'] = 'vert', - ['met_dark_green'] = 'Vert Foncé', - ['rally_green'] = 'Vert Rally', - ['pine_green'] = 'Vert Sapin', - ['olive_green'] = 'Vert Olive', - ['light_green'] = 'Vert Clair', - ['lime_green'] = 'Vert Lime', - ['forest_green'] = 'Vert Forêt', - ['lawn_green'] = 'Vert Pelouse', - ['imperial_green'] = 'Vert Impérial', - ['green_bottle'] = 'Vert Bouteille', - ['citrus_green'] = 'Vert Citrus', - ['green_anis'] = 'Vert Anis', - ['khaki'] = 'Kaki', - ['army_green'] = 'Vert Army', - ['dark_green'] = 'Vert Sombre', - ['hunter_green'] = 'Vert Chasseur', - ['matte_foilage_green'] = 'Amarylisse', - -- Orange - ['orange'] = 'orange', - ['tangerine'] = 'Tangerine', - ['matteorange'] = 'Orange Mat', - ['lightorange'] = 'Orange Clair', - ['peach'] = 'Pèche', - ['pumpkin'] = 'Citrouille', - ['orangelambo'] = 'Orange Lambo', - -- Brown - ['brown'] = 'marron', - ['copper'] = 'Cuivre', - ['lightbrown'] = 'Marronclair', - ['darkbrown'] = 'Marron Foncé', - ['bronze'] = 'Bronze', - ['brownmetallic'] = 'Marron Métallisé', - ['espresso'] = 'Expresso', - ['chocolate'] = 'Chocolat', - ['terracotta'] = 'Terre Cuite', - ['marble'] = 'Marbre', - ['sand'] = 'Sable', - ['sepia'] = 'Sépia', - ['bison'] = 'Bison', - ['palm'] = 'Palmier', - ['caramel'] = 'Caramel', - ['rust'] = 'Rouille', - ['chestnut'] = 'Chataigne', - ['hazelnut'] = 'Noisette', - ['shell'] = 'Coquillage', - ['mahogany'] = 'Acajou', - ['cauldron'] = 'Chaudron', - ['blond'] = 'Blond', - ['gravel'] = 'Gravillon', - ['darkearth'] = 'Terre Foncé', - ['desert'] = 'Désert', - -- Purple - ['purple'] = 'violet', - ['indigo'] = 'Indigo', - ['deeppurple'] = 'Violet Profond', - ['darkviolet'] = 'Violet Foncé', - ['amethyst'] = 'Améthyste', - ['mysticalviolet'] = 'Violet Mystique', - ['purplemetallic'] = 'Violet Métallisé', - ['matteviolet'] = 'Violet Mat', - ['mattedeeppurple'] = 'Violet Profond Mat', - -- Chrome - ['chrome'] = 'chrome', - ['brushedchrome'] = 'chrome Brossé', - ['blackchrome'] = 'chrome Noir', - ['brushedaluminum'] = 'aluminum Brossé', - -- Metal - ['gold'] = 'or', - ['puregold'] = 'Or Pure', - ['brushedgold'] = 'Or Brossé', - ['lightgold'] = 'Or Clair', + -- Black + ['black'] = 'noir', + ['graphite'] = 'graphite', + ['black_metallic'] = 'noir Méttallisé', + ['caststeel'] = 'acier Fondu', + ['black_anth'] = 'noir Anthracite', + ['matteblack'] = 'noir Mat', + ['darknight'] = 'nuit Sombre', + ['deepblack'] = 'noir Profond', + ['oil'] = 'pétrol', + ['carbon'] = 'carbon', + -- White + ['white'] = 'blanc', + ['vanilla'] = 'vanille', + ['creme'] = 'crème', + ['polarwhite'] = 'blanc Polair', + ['beige'] = 'beige', + ['mattewhite'] = 'blanc Mat', + ['snow'] = 'neige', + ['cotton'] = 'coton', + ['alabaster'] = 'albâtre', + ['purewhite'] = 'blanc Pure', + -- Grey + ['grey'] = 'gris', + ['silver'] = 'Argenté', + ['metallicgrey'] = 'Gris Métallisé', + ['laminatedsteel'] = 'Acier Laminé', + ['darkgray'] = 'Gris Foncé', + ['rockygray'] = 'Gris Rocheux', + ['graynight'] = 'Gris Nuit', + ['aluminum'] = 'Aluminium', + ['graymat'] = 'Gris Mat', + ['lightgrey'] = 'Gris Clair', + ['asphaltgray'] = 'Gris Bitume', + ['grayconcrete'] = 'Gris Béton', + ['darksilver'] = 'Argent Sombre', + ['magnesite'] = 'Magnésite', + ['nickel'] = 'nickel', + ['zinc'] = 'zinc', + ['dolomite'] = 'dolomite', + ['bluesilver'] = 'Argent Bleuté', + ['titanium'] = 'Titane', + ['steelblue'] = 'Acier Bleui', + ['champagne'] = 'Champagne', + ['grayhunter'] = 'Gris Chasseur', + -- Red + ['red'] = 'rouge', + ['torino_red'] = 'Rouge Turin', + ['poppy'] = 'Coquelicot', + ['copper_red'] = 'Rouge Cuivré', + ['cardinal'] = 'Rouge Cardinal', + ['brick'] = 'Rouge Brique', + ['garnet'] = 'Grenat', + ['cabernet'] = 'Pourpre', + ['candy'] = 'Framboise', + ['matte_red'] = 'Rouge Mat', + ['dark_red'] = 'Rouge Foncé', + ['red_pulp'] = 'Rouge Pulpeux', + ['bril_red'] = 'Rouge Brillant', + ['pale_red'] = 'Rouge Pale', + ['wine_red'] = 'Rouge Vin', + ['volcano'] = 'Volcano', + -- Pink + ['pink'] = 'rose', + ['electricpink'] = 'rose Electrique', + ['brightpink'] = 'rose pétant', + ['salmon'] = 'rose Saumon', + ['sugarplum'] = 'rose Dragée', + -- Blue + ['blue'] = 'bleu', + ['topaz'] = 'topaze', + ['light_blue'] = 'bleu clair', + ['galaxy_blue'] = 'bleu galaxy', + ['dark_blue'] = 'bleu foncé', + ['azure'] = 'bleu azur', + ['navy_blue'] = 'bleu marine', + ['lapis'] = 'lapis lazuli', + ['blue_diamond'] = 'bleu diamant', + ['surfer'] = 'surfer', + ['pastel_blue'] = 'pastel', + ['celeste_blue'] = 'bleu celeste', + ['rally_blue'] = 'bleu rally', + ['blue_paradise'] = 'bleu paradis', + ['blue_night'] = 'bleu nuit', + ['cyan_blue'] = 'bleu cyan', + ['cobalt'] = 'cobalt', + ['electric_blue'] = 'bleu electrique', + ['horizon_blue'] = 'bleu horizon', + ['metallic_blue'] = 'bleu métallisé', + ['aquamarine'] = 'aigue marine', + ['blue_agathe'] = 'bleu agathe', + ['zirconium'] = 'zirconium', + ['spinel'] = 'spinelle', + ['tourmaline'] = 'tourmaline', + ['paradise'] = 'paradis', + ['bubble_gum'] = 'bubble gum', + ['midnight_blue'] = 'bleu minuit', + ['forbidden_blue'] = 'bleu interdit', + ['glacier_blue'] = 'bleu glacier', + -- Yellow + ['yellow'] = 'jaune', + ['wheat'] = 'Jaune Blé', + ['raceyellow'] = 'Jaune Rally', + ['paleyellow'] = 'Jaune Clair', + ['lightyellow'] = 'Jaune Pâle', + -- Green + ['green'] = 'vert', + ['met_dark_green'] = 'Vert Foncé', + ['rally_green'] = 'Vert Rally', + ['pine_green'] = 'Vert Sapin', + ['olive_green'] = 'Vert Olive', + ['light_green'] = 'Vert Clair', + ['lime_green'] = 'Vert Lime', + ['forest_green'] = 'Vert Forêt', + ['lawn_green'] = 'Vert Pelouse', + ['imperial_green'] = 'Vert Impérial', + ['green_bottle'] = 'Vert Bouteille', + ['citrus_green'] = 'Vert Citrus', + ['green_anis'] = 'Vert Anis', + ['khaki'] = 'Kaki', + ['army_green'] = 'Vert Army', + ['dark_green'] = 'Vert Sombre', + ['hunter_green'] = 'Vert Chasseur', + ['matte_foilage_green'] = 'Amarylisse', + -- Orange + ['orange'] = 'orange', + ['tangerine'] = 'Tangerine', + ['matteorange'] = 'Orange Mat', + ['lightorange'] = 'Orange Clair', + ['peach'] = 'Pèche', + ['pumpkin'] = 'Citrouille', + ['orangelambo'] = 'Orange Lambo', + -- Brown + ['brown'] = 'marron', + ['copper'] = 'Cuivre', + ['lightbrown'] = 'Marronclair', + ['darkbrown'] = 'Marron Foncé', + ['bronze'] = 'Bronze', + ['brownmetallic'] = 'Marron Métallisé', + ['espresso'] = 'Expresso', + ['chocolate'] = 'Chocolat', + ['terracotta'] = 'Terre Cuite', + ['marble'] = 'Marbre', + ['sand'] = 'Sable', + ['sepia'] = 'Sépia', + ['bison'] = 'Bison', + ['palm'] = 'Palmier', + ['caramel'] = 'Caramel', + ['rust'] = 'Rouille', + ['chestnut'] = 'Chataigne', + ['hazelnut'] = 'Noisette', + ['shell'] = 'Coquillage', + ['mahogany'] = 'Acajou', + ['cauldron'] = 'Chaudron', + ['blond'] = 'Blond', + ['gravel'] = 'Gravillon', + ['darkearth'] = 'Terre Foncé', + ['desert'] = 'Désert', + -- Purple + ['purple'] = 'violet', + ['indigo'] = 'Indigo', + ['deeppurple'] = 'Violet Profond', + ['darkviolet'] = 'Violet Foncé', + ['amethyst'] = 'Améthyste', + ['mysticalviolet'] = 'Violet Mystique', + ['purplemetallic'] = 'Violet Métallisé', + ['matteviolet'] = 'Violet Mat', + ['mattedeeppurple'] = 'Violet Profond Mat', + -- Chrome + ['chrome'] = 'chrome', + ['brushedchrome'] = 'chrome Brossé', + ['blackchrome'] = 'chrome Noir', + ['brushedaluminum'] = 'aluminum Brossé', + -- Metal + ['gold'] = 'or', + ['puregold'] = 'Or Pure', + ['brushedgold'] = 'Or Brossé', + ['lightgold'] = 'Or Clair', -- License Plates - ['blue_on_white_1'] = 'bleu sur fond Blanc 1', - ['yellow_on_black'] = 'jaune sur fond Noir', - ['yellow_blue'] = 'jaune sur fond Bleu', - ['blue_on_white_2'] = 'bleu sur fond Blanc 2', - ['blue_on_white_3'] = 'bleu sur fond Blanc 3', + ['blue_on_white_1'] = 'bleu sur fond Blanc 1', + ['yellow_on_black'] = 'jaune sur fond Noir', + ['yellow_blue'] = 'jaune sur fond Bleu', + ['blue_on_white_2'] = 'bleu sur fond Blanc 2', + ['blue_on_white_3'] = 'bleu sur fond Blanc 3', -- Upgrades - ['upgrades'] = 'upgrades', - ['engine'] = 'moteur', - ['brakes'] = 'freins', - ['transmission'] = 'transmission', - ['suspension'] = 'suspension', - ['armor'] = 'armure', - ['turbo'] = 'turbo', - ['no_turbo'] = 'pas de turbo', + ['upgrades'] = 'upgrades', + ['engine'] = 'moteur', + ['brakes'] = 'freins', + ['transmission'] = 'transmission', + ['suspension'] = 'suspension', + ['armor'] = 'armure', + ['turbo'] = 'turbo', + ['no_turbo'] = 'pas de turbo', -- Cosmetics - ['cosmetics'] = 'cosmétiques', - -- Body Parts - ['bodyparts'] = 'carosserie', - ['leftfender'] = 'aile gauche', - ['rightfender'] = 'aile droite', - ['spoilers'] = 'aileron', - ['sideskirt'] = 'bas de caisse', - ['cage'] = 'cage', - ['hood'] = 'capot', - ['grille'] = 'grille', - ['rearbumper'] = 'pare-choc arrière', - ['frontbumper'] = 'pare-choc avant', - ['exhaust'] = 'pot d\'échappement', - ['roof'] = 'toit', - -- Paint - ['respray'] = 'peinture', - ['primary'] = 'primaire', - ['secondary'] = 'secondaire', - ['pearlescent'] = 'nacré', - -- Misc - ['headlights'] = 'phares', - ['licenseplates'] = 'plaque', - ['windowtint'] = 'fenêtres', - ['horns'] = 'klaxon', - -- Neon - ['neons'] = 'néons', - -- Wheels - ['wheels'] = 'roues', - ['tiresmoke'] = 'fumée des pneus', - ['wheel_type'] = 'types de Jantes', - ['wheel_color'] = 'couleurs jantes', - ['sport'] = 'Jantes Sport', - ['muscle'] = 'Jantes Muscle', - ['lowrider'] = 'Jantes Lowrider', - ['suv'] = 'Jantes SUV', - ['allterrain'] = 'Jantes Tout-terrain', - ['tuning'] = 'Jantes Tuning', - ['motorcycle'] = 'Jantes Moto', - ['highend'] = 'Jantes Haut de gamme', - - ['modplateholder'] = 'plaque - Arrière', - ['modvanityplate'] = 'plate - Avant', - ['interior'] = 'intérieur', - ['trim'] = 'accessoires', - ['dashboard'] = 'tableau de bord', - ['speedometer'] = 'compteur de vitesse', - ['door_speakers'] = 'haut-parleurs - portières', - ['seats'] = 'sièges', - ['steering_wheel'] = 'volant', - ['gear_lever'] = 'levier de vitesse', - ['quarter_deck'] = 'plage arrière', - ['speakers'] = 'haut-parleurs', - ['trunk'] = 'coffre', - ['hydraulic'] = 'suspension hydraulique', - ['engine_block'] = 'bloc moteur', - ['air_filter'] = 'filtre à air', - ['struts'] = 'entretoises', - ['arch_cover'] = 'pare-boue des ailes', - ['aerials'] = 'antennes', - ['wings'] = 'ailes', - ['fuel_tank'] = 'bouchon du réservoir', - ['windows'] = 'fenêtres', - ['stickers'] = 'autocollants', + ['cosmetics'] = 'cosmétiques', + -- Body Parts + ['bodyparts'] = 'carosserie', + ['leftfender'] = 'aile gauche', + ['rightfender'] = 'aile droite', + ['spoilers'] = 'aileron', + ['sideskirt'] = 'bas de caisse', + ['cage'] = 'cage', + ['hood'] = 'capot', + ['grille'] = 'grille', + ['rearbumper'] = 'pare-choc arrière', + ['frontbumper'] = 'pare-choc avant', + ['exhaust'] = 'pot d\'échappement', + ['roof'] = 'toit', + -- Paint + ['respray'] = 'peinture', + ['primary'] = 'primaire', + ['secondary'] = 'secondaire', + ['pearlescent'] = 'nacré', + -- Misc + ['headlights'] = 'phares', + ['licenseplates'] = 'plaque', + ['windowtint'] = 'fenêtres', + ['horns'] = 'klaxon', + -- Neon + ['neons'] = 'néons', + -- Wheels + ['wheels'] = 'roues', + ['tiresmoke'] = 'fumée des pneus', + ['wheel_type'] = 'types de Jantes', + ['wheel_color'] = 'couleurs jantes', + ['sport'] = 'Jantes Sport', + ['muscle'] = 'Jantes Muscle', + ['lowrider'] = 'Jantes Lowrider', + ['suv'] = 'Jantes SUV', + ['allterrain'] = 'Jantes Tout-terrain', + ['tuning'] = 'Jantes Tuning', + ['motorcycle'] = 'Jantes Moto', + ['highend'] = 'Jantes Haut de gamme', + + ['modplateholder'] = 'plaque - Arrière', + ['modvanityplate'] = 'plate - Avant', + ['interior'] = 'intérieur', + ['trim'] = 'accessoires', + ['dashboard'] = 'tableau de bord', + ['speedometer'] = 'compteur de vitesse', + ['door_speakers'] = 'haut-parleurs - portières', + ['seats'] = 'sièges', + ['steering_wheel'] = 'volant', + ['gear_lever'] = 'levier de vitesse', + ['quarter_deck'] = 'plage arrière', + ['speakers'] = 'haut-parleurs', + ['trunk'] = 'coffre', + ['hydraulic'] = 'suspension hydraulique', + ['engine_block'] = 'bloc moteur', + ['air_filter'] = 'filtre à air', + ['struts'] = 'entretoises', + ['arch_cover'] = 'pare-boue des ailes', + ['aerials'] = 'antennes', + ['wings'] = 'ailes', + ['fuel_tank'] = 'bouchon du réservoir', + ['windows'] = 'fenêtres', + ['stickers'] = 'autocollants', } diff --git a/locales/pl.lua b/locales/pl.lua index 7f8ad37a..d57b599d 100644 --- a/locales/pl.lua +++ b/locales/pl.lua @@ -1,269 +1,269 @@ Locales['pl'] = { - ['by_default'] = 'domyślna', - ['installed'] = 'zainstalowane', - ['already_own'] = 'już posiadasz: ~b~', - ['not_enough_money'] = 'nie masz wystarczająco pieniędzy!', - ['purchased'] = 'zakupiłeś!', - ['press_custom'] = 'naciśnij ~INPUT_PICKUP~ aby spersonalizować swój pojazd.', - ['open_command'] = 'wjedz do LS Customs', - ['level'] = 'level ', - ['neon'] = 'neon', + ['by_default'] = 'domyślna', + ['installed'] = 'zainstalowane', + ['already_own'] = 'już posiadasz: ~b~%s~s~', + ['not_enough_money'] = 'nie masz wystarczająco pieniędzy!', + ['purchased'] = 'zakupiłeś!', + ['press_custom'] = 'naciśnij ~INPUT_PICKUP~ aby spersonalizować swój pojazd.', + ['level'] = 'level %s', + ['neon'] = 'neon', + ['blip_name'] = 'los Santos Customs', -- Paint Colors - -- Czarny - ['black'] = 'czarny', - ['graphite'] = 'grafit', - ['black_metallic'] = 'metaliczny czarny', - ['caststeel'] = 'kuta stal', - ['black_anth'] = 'czarny Antracyt', - ['matteblack'] = 'matowa czerń', - ['darknight'] = 'ciemna noc', - ['deepblack'] = 'głęboka czerń', - ['oil'] = 'olej', - ['carbon'] = 'carbon', - -- Biały - ['white'] = 'biały', - ['vanilla'] = 'wanilliowy', - ['creme'] = 'kremowy', - ['polarwhite'] = 'polarny biały', - ['beige'] = 'beżowy', - ['mattewhite'] = 'matowy biały', - ['snow'] = 'snieżny', - ['cotton'] = 'bawełna', - ['alabaster'] = 'alabastrowy', - ['purewhite'] = 'czysty biały', - -- Szary - ['grey'] = 'szary', - ['silver'] = 'srebro', - ['metallicgrey'] = 'metaliczny szary', - ['laminatedsteel'] = 'laminowana stal', - ['darkgray'] = 'ciemny szary', - ['rockygray'] = 'skalisty szary', - ['graynight'] = 'szara noc', - ['aluminum'] = 'aluminium', - ['graymat'] = 'matowy szary', - ['lightgrey'] = 'jasny szary', - ['asphaltgray'] = 'asfaltowy szary', - ['grayconcrete'] = 'betonowy szary', - ['darksilver'] = 'ciemny szary', - ['magnesite'] = 'magnesite', - ['nickel'] = 'nikiel', - ['zinc'] = 'cynk', - ['dolomite'] = 'dolomite', - ['bluesilver'] = 'niebieski srebrzysty', - ['titanium'] = 'titanium', - ['steelblue'] = 'niebieska stal', - ['champagne'] = 'szampanowy', - ['grayhunter'] = 'grey Hunter', - -- Czerwony - ['red'] = 'czerwony', - ['torino_red'] = 'turyńska czerwień', - ['poppy'] = 'makowy czerwień', - ['copper_red'] = 'miedziany czerwień', - ['cardinal'] = 'kardynałowy czerwień', - ['brick'] = 'ceglana czerwień', - ['garnet'] = 'granat', - ['cabernet'] = 'cabernet Red', - ['candy'] = 'cukierkowa czerwień', - ['matte_red'] = 'matowa czerwień', - ['dark_red'] = 'ciemna czerwień', - ['red_pulp'] = 'red Pulp', - ['bril_red'] = 'brilliant Red', - ['pale_red'] = 'blady czerwony', - ['wine_red'] = 'winiana czerwień', - ['volcano'] = 'wulkanowy', - -- Różowy - ['pink'] = 'różowy', - ['electricpink'] = 'elektryczny różowy', - ['brightpink'] = 'jasny Różowy', - ['salmon'] = 'łososiowy', - ['sugarplum'] = 'sugar Plum', - -- Niebieski - ['blue'] = 'niebieski', - ['topaz'] = 'topaz', - ['light_blue'] = 'jasny niebieski', - ['galaxy_blue'] = 'galaktyczny niebieski', - ['dark_blue'] = 'ciemny niebieski', - ['azure'] = 'azure', - ['navy_blue'] = 'granatowy', - ['lapis'] = 'lapis Lazuli', - ['blue_diamond'] = 'niebieski diament', - ['surfer'] = 'surfer', - ['pastel_blue'] = 'pastelowy niebieski', - ['celeste_blue'] = 'celeste Blue', - ['rally_blue'] = 'rally Blue', - ['blue_paradise'] = 'blue Paradise', - ['blue_night'] = 'niebieska noc', - ['cyan_blue'] = 'cyankowy', - ['cobalt'] = 'kobaltowy', - ['electric_blue'] = 'elektryczny miebieski', - ['horizon_blue'] = 'horizon Blue', - ['metallic_blue'] = 'metaliczny niebieski', - ['aquamarine'] = 'akwamaryn', - ['blue_agathe'] = 'blue Agathe', - ['zirconium'] = 'zirconium', - ['spinel'] = 'spinel', - ['tourmaline'] = 'tourmaline', - ['paradise'] = 'paradise', - ['bubble_gum'] = 'guma balonowa', - ['midnight_blue'] = 'midnight Blue', - ['forbidden_blue'] = 'forbidden Blue', - ['glacier_blue'] = 'glacier Blue', - -- Żółty - ['yellow'] = 'żółty', - ['wheat'] = 'pszenica', - ['raceyellow'] = 'wyścigowy żółty', - ['paleyellow'] = 'jasnożółty', - ['lightyellow'] = 'jasny żółty', - -- Zielony - ['green'] = 'zielony', - ['met_dark_green'] = 'metaliczny ciemny zielony', - ['rally_green'] = 'rally Green', - ['pine_green'] = 'pine Green', - ['olive_green'] = 'zielona oliwka', - ['light_green'] = 'jasny zielony', - ['lime_green'] = 'lime green', - ['forest_green'] = 'forest Green', - ['lawn_green'] = 'lawn Green', - ['imperial_green'] = 'imperial Green', - ['green_bottle'] = 'breen Bottle', - ['citrus_green'] = 'cytrusowy Zielony', - ['green_anis'] = 'zielony anyż', - ['khaki'] = 'khaki', - ['army_green'] = 'zieleń wojskowa', - ['dark_green'] = 'ciemny zielony', - ['hunter_green'] = 'hunter Green', - ['matte_foilage_green'] = 'matte Foilage Green', - -- Pomarańczowy - ['orange'] = 'pomarańczowy', - ['tangerine'] = 'tangerine', - ['matteorange'] = 'matowy Pomarańczowy', - ['lightorange'] = 'jasny Pomarańczowy', - ['peach'] = 'brzoskwiniowy ', - ['pumpkin'] = 'dynia', - ['orangelambo'] = 'orange Lambo', - -- Brązowy - ['brown'] = 'brązowy', - ['copper'] = 'medziany', - ['lightbrown'] = 'jasny brązowy', - ['darkbrown'] = 'ciemny brąz', - ['bronze'] = 'brąz', - ['brownmetallic'] = 'metaliczny brązowy', - ['espresso'] = 'espresso', - ['chocolate'] = 'czekoladowy', - ['terracotta'] = 'terakota', - ['marble'] = 'marmur', - ['sand'] = 'piasek', - ['sepia'] = 'sepia', - ['bison'] = 'bison', - ['palm'] = 'palma', - ['caramel'] = 'karmel', - ['rust'] = 'rdza ', - ['chestnut'] = 'orzechowy', - ['hazelnut'] = 'orzech laskowy', - ['shell'] = 'shell', - ['mahogany'] = 'mahogany', - ['cauldron'] = 'cauldron', - ['blond'] = 'blond', - ['gravel'] = 'żwir', - ['darkearth'] = 'ciemna ziemia', - ['desert'] = 'pustynia', - -- Fioletowy - ['purple'] = 'fioletowy', - ['indigo'] = 'indygo', - ['deeppurple'] = 'głęboki fiolet', - ['darkviolet'] = 'ciemny fiolet', - ['amethyst'] = 'ametyst', - ['mysticalviolet'] = 'mystic Violet', - ['purplemetallic'] = 'metaliczny fiolet', - ['matteviolet'] = 'matowy fiolet', - ['mattedeeppurple'] = 'matowy głęboki fiolet', - -- Chrome - ['chrome'] = 'chrom', - ['brushedchrome'] = 'oczyszczony chrom', - ['blackchrome'] = 'czarny chrom', - ['brushedaluminum'] = 'szczotkowane aluminium', - -- Metale - ['gold'] = 'Złoto', - ['puregold'] = 'czyste złoto', - ['brushedgold'] = 'szczotkowane złoto', - ['lightgold'] = 'jasne złoto', --- Tablice rejestracyjne - ['blue_on_white_1'] = 'niebieskie na białym 1', - ['yellow_on_black'] = 'żółte na czarnym', - ['yellow_blue'] = 'żółte na niebieskim', - ['blue_on_white_2'] = 'niebieskie na białym 2', - ['blue_on_white_3'] = 'niebieskie na białym 3', --- Ulepszenia - ['upgrades'] = 'ulepszenia', - ['engine'] = 'silnik', - ['brakes'] = 'hamulce', - ['transmission'] = 'skrzynia biegów', - ['suspension'] = 'zawieszenie', - ['armor'] = 'opancerzenie', - ['turbo'] = 'turbo', - ['no_turbo'] = 'bez turbo', --- Kosmetyczne - ['cosmetics'] = 'kosmetyczne', - -- Body parts - ['bodyparts'] = 'karoseria', - ['leftfender'] = 'lewy błotnik', - ['rightfender'] = 'prawy błotnik', - ['spoilers'] = 'spojler', - ['sideskirt'] = 'progi', - ['cage'] = 'bagażnik', - ['hood'] = 'maska', - ['grille'] = 'gril', - ['rearbumper'] = 'tylny zderzak ', - ['frontbumper'] = 'przedni zderzak', - ['exhaust'] = 'wydech', - ['roof'] = 'dach', - -- Farba - ['respray'] = 'przefarbuj', - ['primary'] = 'pierwszy', - ['secondary'] = 'drugi', - ['pearlescent'] = 'perła', - -- Różne - ['headlights'] = 'reflektory', - ['licenseplates'] = 'tablice rejestracyjne', - ['windowtint'] = 'odcień okna', - ['horns'] = 'klakson', - -- Neon - ['neons'] = 'neony', - -- Koła - ['wheels'] = 'koła', - ['tiresmoke'] = 'dym spod opon', - ['wheel_type'] = 'typ koła', - ['wheel_color'] = 'kolor koła', - ['sport'] = 'sportowe', - ['muscle'] = 'muscle', - ['lowrider'] = 'lowrider', - ['suv'] = 'sUV', - ['allterrain'] = 'terenowe', - ['tuning'] = 'tuner', - ['motorcycle'] = 'motocykle', - ['highend'] = 'high end', - - ['modplateholder'] = 'tablica - Tył', - ['modvanityplate'] = 'tablica - Przód', - ['interior'] = 'wnętrze', - ['trim'] = 'wykończenie', - ['dashboard'] = 'deska rozdzielcza', - ['speedometer'] = 'prędkościomierz', - ['door_speakers'] = 'drzwi', - ['seats'] = 'siedzenia', - ['steering_wheel'] = 'kierownica', - ['gear_lever'] = 'dżwignia zmiany biegów', - ['quarter_deck'] = 'quarter-deck', - ['speakers'] = 'głośniki', - ['trunk'] = 'bagażnik', - ['hydraulic'] = 'hydraulika', - ['engine_block'] = 'blok silnika', - ['air_filter'] = 'filtr powietrza', - ['struts'] = 'podpórka', - ['arch_cover'] = 'arch cover', - ['aerials'] = 'anteny', - ['wings'] = 'skrzydełka ', - ['fuel_tank'] = 'zbiornik paliwa', - ['windows'] = 'okna', - ['stickers'] = 'naklejki', -} \ No newline at end of file + -- Black + ['black'] = 'czarny', + ['graphite'] = 'grafit', + ['black_metallic'] = 'metaliczny czarny', + ['caststeel'] = 'kuta stal', + ['black_anth'] = 'czarny Antracyt', + ['matteblack'] = 'matowa czerń', + ['darknight'] = 'ciemna noc', + ['deepblack'] = 'głęboka czerń', + ['oil'] = 'olej', + ['carbon'] = 'carbon', + -- White + ['white'] = 'biały', + ['vanilla'] = 'wanilliowy', + ['creme'] = 'kremowy', + ['polarwhite'] = 'polarny biały', + ['beige'] = 'beżowy', + ['mattewhite'] = 'matowy biały', + ['snow'] = 'snieżny', + ['cotton'] = 'bawełna', + ['alabaster'] = 'alabastrowy', + ['purewhite'] = 'czysty biały', + -- Grey + ['grey'] = 'szary', + ['silver'] = 'srebro', + ['metallicgrey'] = 'metaliczny szary', + ['laminatedsteel'] = 'laminowana stal', + ['darkgray'] = 'ciemny szary', + ['rockygray'] = 'skalisty szary', + ['graynight'] = 'szara noc', + ['aluminum'] = 'aluminium', + ['graymat'] = 'matowy szary', + ['lightgrey'] = 'jasny szary', + ['asphaltgray'] = 'asfaltowy szary', + ['grayconcrete'] = 'betonowy szary', + ['darksilver'] = 'ciemny szary', + ['magnesite'] = 'magnesite', + ['nickel'] = 'nikiel', + ['zinc'] = 'cynk', + ['dolomite'] = 'dolomite', + ['bluesilver'] = 'niebieski srebrzysty', + ['titanium'] = 'titanium', + ['steelblue'] = 'niebieska stal', + ['champagne'] = 'szampanowy', + ['grayhunter'] = 'grey Hunter', + -- Red + ['red'] = 'czerwony', + ['torino_red'] = 'turyńska czerwień', + ['poppy'] = 'makowy czerwień', + ['copper_red'] = 'miedziany czerwień', + ['cardinal'] = 'kardynałowy czerwień', + ['brick'] = 'ceglana czerwień', + ['garnet'] = 'granat', + ['cabernet'] = 'cabernet Red', + ['candy'] = 'cukierkowa czerwień', + ['matte_red'] = 'matowa czerwień', + ['dark_red'] = 'ciemna czerwień', + ['red_pulp'] = 'red Pulp', + ['bril_red'] = 'brilliant Red', + ['pale_red'] = 'blady czerwony', + ['wine_red'] = 'winiana czerwień', + ['volcano'] = 'wulkanowy', + -- Pink + ['pink'] = 'różowy', + ['electricpink'] = 'elektryczny różowy', + ['brightpink'] = 'jasny Różowy', + ['salmon'] = 'łososiowy', + ['sugarplum'] = 'sugar Plum', + -- Niebieski + ['blue'] = 'niebieski', + ['topaz'] = 'topaz', + ['light_blue'] = 'jasny niebieski', + ['galaxy_blue'] = 'galaktyczny niebieski', + ['dark_blue'] = 'ciemny niebieski', + ['azure'] = 'azure', + ['navy_blue'] = 'granatowy', + ['lapis'] = 'lapis Lazuli', + ['blue_diamond'] = 'niebieski diament', + ['surfer'] = 'surfer', + ['pastel_blue'] = 'pastelowy niebieski', + ['celeste_blue'] = 'celeste Blue', + ['rally_blue'] = 'rally Blue', + ['blue_paradise'] = 'blue Paradise', + ['blue_night'] = 'niebieska noc', + ['cyan_blue'] = 'cyankowy', + ['cobalt'] = 'kobaltowy', + ['electric_blue'] = 'elektryczny miebieski', + ['horizon_blue'] = 'horizon Blue', + ['metallic_blue'] = 'metaliczny niebieski', + ['aquamarine'] = 'akwamaryn', + ['blue_agathe'] = 'blue Agathe', + ['zirconium'] = 'zirconium', + ['spinel'] = 'spinel', + ['tourmaline'] = 'tourmaline', + ['paradise'] = 'paradise', + ['bubble_gum'] = 'guma balonowa', + ['midnight_blue'] = 'midnight Blue', + ['forbidden_blue'] = 'forbidden Blue', + ['glacier_blue'] = 'glacier Blue', + -- Yellow + ['yellow'] = 'żółty', + ['wheat'] = 'pszenica', + ['raceyellow'] = 'wyścigowy żółty', + ['paleyellow'] = 'jasnożółty', + ['lightyellow'] = 'jasny żółty', + -- Green + ['green'] = 'zielony', + ['met_dark_green'] = 'metaliczny ciemny zielony', + ['rally_green'] = 'rally Green', + ['pine_green'] = 'pine Green', + ['olive_green'] = 'zielona oliwka', + ['light_green'] = 'jasny zielony', + ['lime_green'] = 'lime green', + ['forest_green'] = 'forest Green', + ['lawn_green'] = 'lawn Green', + ['imperial_green'] = 'imperial Green', + ['green_bottle'] = 'breen Bottle', + ['citrus_green'] = 'cytrusowy Zielony', + ['green_anis'] = 'zielony anyż', + ['khaki'] = 'khaki', + ['army_green'] = 'zieleń wojskowa', + ['dark_green'] = 'ciemny zielony', + ['hunter_green'] = 'hunter Green', + ['matte_foilage_green'] = 'matte Foilage Green', + -- Orange + ['orange'] = 'pomarańczowy', + ['tangerine'] = 'tangerine', + ['matteorange'] = 'matowy Pomarańczowy', + ['lightorange'] = 'jasny Pomarańczowy', + ['peach'] = 'brzoskwiniowy ', + ['pumpkin'] = 'dynia', + ['orangelambo'] = 'orange Lambo', + -- Brown + ['brown'] = 'brązowy', + ['copper'] = 'medziany', + ['lightbrown'] = 'jasny brązowy', + ['darkbrown'] = 'ciemny brąz', + ['bronze'] = 'brąz', + ['brownmetallic'] = 'metaliczny brązowy', + ['espresso'] = 'espresso', + ['chocolate'] = 'czekoladowy', + ['terracotta'] = 'terakota', + ['marble'] = 'marmur', + ['sand'] = 'piasek', + ['sepia'] = 'sepia', + ['bison'] = 'bison', + ['palm'] = 'palma', + ['caramel'] = 'karmel', + ['rust'] = 'rdza ', + ['chestnut'] = 'orzechowy', + ['hazelnut'] = 'orzech laskowy', + ['shell'] = 'shell', + ['mahogany'] = 'mahogany', + ['cauldron'] = 'cauldron', + ['blond'] = 'blond', + ['gravel'] = 'żwir', + ['darkearth'] = 'ciemna ziemia', + ['desert'] = 'pustynia', + -- Purple + ['purple'] = 'fioletowy', + ['indigo'] = 'indygo', + ['deeppurple'] = 'głęboki fiolet', + ['darkviolet'] = 'ciemny fiolet', + ['amethyst'] = 'ametyst', + ['mysticalviolet'] = 'mystic Violet', + ['purplemetallic'] = 'metaliczny fiolet', + ['matteviolet'] = 'matowy fiolet', + ['mattedeeppurple'] = 'matowy głęboki fiolet', + -- Chrome + ['chrome'] = 'chrom', + ['brushedchrome'] = 'oczyszczony chrom', + ['blackchrome'] = 'czarny chrom', + ['brushedaluminum'] = 'szczotkowane aluminium', + -- Metal + ['gold'] = 'Złoto', + ['puregold'] = 'czyste złoto', + ['brushedgold'] = 'szczotkowane złoto', + ['lightgold'] = 'jasne złoto', +-- License Plates + ['blue_on_white_1'] = 'niebieskie na białym 1', + ['yellow_on_black'] = 'żółte na czarnym', + ['yellow_blue'] = 'żółte na niebieskim', + ['blue_on_white_2'] = 'niebieskie na białym 2', + ['blue_on_white_3'] = 'niebieskie na białym 3', +-- Upgrades + ['upgrades'] = 'ulepszenia', + ['engine'] = 'silnik', + ['brakes'] = 'hamulce', + ['transmission'] = 'skrzynia biegów', + ['suspension'] = 'zawieszenie', + ['armor'] = 'opancerzenie', + ['turbo'] = 'turbo', + ['no_turbo'] = 'bez turbo', +-- Cosmetics + ['cosmetics'] = 'kosmetyczne', + -- Body parts + ['bodyparts'] = 'karoseria', + ['leftfender'] = 'lewy błotnik', + ['rightfender'] = 'prawy błotnik', + ['spoilers'] = 'spojler', + ['sideskirt'] = 'progi', + ['cage'] = 'bagażnik', + ['hood'] = 'maska', + ['grille'] = 'gril', + ['rearbumper'] = 'tylny zderzak ', + ['frontbumper'] = 'przedni zderzak', + ['exhaust'] = 'wydech', + ['roof'] = 'dach', + -- Paint + ['respray'] = 'przefarbuj', + ['primary'] = 'pierwszy', + ['secondary'] = 'drugi', + ['pearlescent'] = 'perła', + -- Misc + ['headlights'] = 'reflektory', + ['licenseplates'] = 'tablice rejestracyjne', + ['windowtint'] = 'odcień okna', + ['horns'] = 'klakson', + -- Neon + ['neons'] = 'neony', + -- Wheels + ['wheels'] = 'koła', + ['tiresmoke'] = 'dym spod opon', + ['wheel_type'] = 'typ koła', + ['wheel_color'] = 'kolor koła', + ['sport'] = 'sportowe', + ['muscle'] = 'muscle', + ['lowrider'] = 'lowrider', + ['suv'] = 'sUV', + ['allterrain'] = 'terenowe', + ['tuning'] = 'tuner', + ['motorcycle'] = 'motocykle', + ['highend'] = 'high end', + + ['modplateholder'] = 'tablica - Tył', + ['modvanityplate'] = 'tablica - Przód', + ['interior'] = 'wnętrze', + ['trim'] = 'wykończenie', + ['dashboard'] = 'deska rozdzielcza', + ['speedometer'] = 'prędkościomierz', + ['door_speakers'] = 'drzwi', + ['seats'] = 'siedzenia', + ['steering_wheel'] = 'kierownica', + ['gear_lever'] = 'dżwignia zmiany biegów', + ['quarter_deck'] = 'quarter-deck', + ['speakers'] = 'głośniki', + ['trunk'] = 'bagażnik', + ['hydraulic'] = 'hydraulika', + ['engine_block'] = 'blok silnika', + ['air_filter'] = 'filtr powietrza', + ['struts'] = 'podpórka', + ['arch_cover'] = 'arch cover', + ['aerials'] = 'anteny', + ['wings'] = 'skrzydełka ', + ['fuel_tank'] = 'zbiornik paliwa', + ['windows'] = 'okna', + ['stickers'] = 'naklejki', +} diff --git a/server/main.lua b/server/main.lua index 28a15c4f..61187c43 100644 --- a/server/main.lua +++ b/server/main.lua @@ -8,7 +8,8 @@ AddEventHandler('esx_lscustom:buyMod', function(price) local xPlayer = ESX.GetPlayerFromId(_source) price = tonumber(price) - if Config.IsMecanoJobOnly == true then + if Config.IsMecanoJobOnly then + local societyAccount = nil TriggerEvent('esx_addonaccount:getSharedAccount', 'society_mecano', function(account) societyAccount = account @@ -23,6 +24,7 @@ AddEventHandler('esx_lscustom:buyMod', function(price) end else + if price < xPlayer.getMoney() then TriggerClientEvent('esx_lscustom:installMod', _source) TriggerClientEvent('esx:showNotification', _source, _U('purchased')) @@ -31,6 +33,7 @@ AddEventHandler('esx_lscustom:buyMod', function(price) TriggerClientEvent('esx_lscustom:cancelInstallMod', _source) TriggerClientEvent('esx:showNotification', _source, _U('not_enough_money')) end + end end) @@ -45,21 +48,19 @@ end) ESX.RegisterServerCallback('esx_lscustom:getVehiclesPrices', function(source, cb) if Vehicles == nil then - MySQL.Async.fetchAll( - 'SELECT * FROM vehicles', - {}, - function(result) - local vehicles = {} - for i=1, #result, 1 do - table.insert(vehicles,{ - model = result[i].model, - price = result[i].price - }) - end - Vehicles = vehicles - cb(Vehicles) + MySQL.Async.fetchAll('SELECT * FROM vehicles', {}, function(result) + local vehicles = {} + + for i=1, #result, 1 do + table.insert(vehicles, { + model = result[i].model, + price = result[i].price + }) end - ) + + Vehicles = vehicles + cb(Vehicles) + end) else cb(Vehicles) end From b5f85af6c45d263bc54ae41170627ef748d5b819 Mon Sep 17 00:00:00 2001 From: deadeye2 Date: Sat, 29 Sep 2018 11:04:45 -0400 Subject: [PATCH 41/55] fixed typo --- config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.lua b/config.lua index 0354bf7d..fffcc657 100644 --- a/config.lua +++ b/config.lua @@ -257,7 +257,7 @@ function GetColors(color) } elseif color == 'chrome' then colors = { - { index = 117, label = _U('brushechrome')}, + { index = 117, label = _U('brushedchrome')}, { index = 118, label = _U('blackchrome')}, { index = 119, label = _U('brushedaluminum')}, { index = 120, label = _U('chrome')} From b50a94bf2403c359a28cdbb69edb6edacc212f47 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 30 Dec 2018 21:32:38 +0100 Subject: [PATCH 42/55] Check IsControlJustReleased() every frame --- client/main.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/client/main.lua b/client/main.lua index 782ec737..639f6369 100644 --- a/client/main.lua +++ b/client/main.lua @@ -381,7 +381,7 @@ end) -- Activate menu when player is inside marker Citizen.CreateThread(function() while true do - Citizen.Wait(10) + Citizen.Wait(0) local playerPed = PlayerPedId() if IsPedInAnyVehicle(playerPed, false) then local coords = GetEntityCoords(PlayerPedId()) @@ -393,7 +393,6 @@ Citizen.CreateThread(function() if GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < v.Size.x then isInLSMarker = true ESX.ShowHelpNotification(v.Hint) - break else isInLSMarker = false From cdb083c13ffc76064e378a0028a856edda8e1799 Mon Sep 17 00:00:00 2001 From: RedAlex <855331+RedAlex@users.noreply.github.com> Date: Fri, 25 Jan 2019 21:22:23 -0500 Subject: [PATCH 43/55] update to new esx_mechanicjob name --- client/main.lua | 4 ++-- config.lua | 8 ++++---- server/main.lua | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client/main.lua b/client/main.lua index 639f6369..eb7de0ce 100644 --- a/client/main.lua +++ b/client/main.lua @@ -388,7 +388,7 @@ Citizen.CreateThread(function() local currentZone = nil local zone = nil local lastZone = nil - if (PlayerData.job ~= nil and PlayerData.job.name == 'mecano') or Config.IsMecanoJobOnly == false then + if (PlayerData.job ~= nil and PlayerData.job.name == 'mechanic') or Config.IsMechanicJobOnly == false then for k,v in pairs(Config.Zones) do if GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < v.Size.x then isInLSMarker = true @@ -401,7 +401,7 @@ Citizen.CreateThread(function() end if IsControlJustReleased(0, Keys['E']) and not lsMenuIsShowed and isInLSMarker then - if (PlayerData.job ~= nil and PlayerData.job.name == 'mecano') or Config.IsMecanoJobOnly == false then + if (PlayerData.job ~= nil and PlayerData.job.name == 'mechanic') or Config.IsMechanicJobOnly == false then lsMenuIsShowed = true local vehicle = GetVehiclePedIsIn(playerPed, false) diff --git a/config.lua b/config.lua index fffcc657..c633e2fa 100644 --- a/config.lua +++ b/config.lua @@ -1,7 +1,7 @@ -Config = {} -Config.DrawDistance = 100.0 -Config.Locale = 'en' -Config.IsMecanoJobOnly = false +Config = {} +Config.DrawDistance = 100.0 +Config.Locale = 'en' +Config.IsMechanicJobOnly = false Config.Zones = { diff --git a/server/main.lua b/server/main.lua index 61187c43..50e5145a 100644 --- a/server/main.lua +++ b/server/main.lua @@ -8,10 +8,10 @@ AddEventHandler('esx_lscustom:buyMod', function(price) local xPlayer = ESX.GetPlayerFromId(_source) price = tonumber(price) - if Config.IsMecanoJobOnly then + if Config.IsMechanicJobOnly then local societyAccount = nil - TriggerEvent('esx_addonaccount:getSharedAccount', 'society_mecano', function(account) + TriggerEvent('esx_addonaccount:getSharedAccount', 'society_mechanic', function(account) societyAccount = account end) if price < societyAccount.money then From b3d26ae02f4cd1bd371f1931d969ca0da26b5a05 Mon Sep 17 00:00:00 2001 From: Lerk Date: Sat, 20 Jul 2019 14:44:55 +0200 Subject: [PATCH 44/55] hide "press e to modify" hint when in the menu --- client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index eb7de0ce..2eed92c9 100644 --- a/client/main.lua +++ b/client/main.lua @@ -390,7 +390,7 @@ Citizen.CreateThread(function() local lastZone = nil if (PlayerData.job ~= nil and PlayerData.job.name == 'mechanic') or Config.IsMechanicJobOnly == false then for k,v in pairs(Config.Zones) do - if GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < v.Size.x then + if GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < v.Size.x and not lsMenuIsShowed then isInLSMarker = true ESX.ShowHelpNotification(v.Hint) break From 96f9dab2a8a0f88fa5ecd0b0c9a61fbe152b306b Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Wed, 18 Sep 2019 18:39:21 +0200 Subject: [PATCH 45/55] Dont let model be changed, as it cant be changed in LS anyways and is used to cheat Co-Authored-By: danishrp --- server/main.lua | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/server/main.lua b/server/main.lua index 50e5145a..23432b8e 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,6 +1,7 @@ ESX = nil +local Vehicles + TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) -local Vehicles = nil RegisterServerEvent('esx_lscustom:buyMod') AddEventHandler('esx_lscustom:buyMod', function(price) @@ -9,11 +10,12 @@ AddEventHandler('esx_lscustom:buyMod', function(price) price = tonumber(price) if Config.IsMechanicJobOnly then + local societyAccount - local societyAccount = nil TriggerEvent('esx_addonaccount:getSharedAccount', 'society_mechanic', function(account) societyAccount = account end) + if price < societyAccount.money then TriggerClientEvent('esx_lscustom:installMod', _source) TriggerClientEvent('esx:showNotification', _source, _U('purchased')) @@ -22,9 +24,7 @@ AddEventHandler('esx_lscustom:buyMod', function(price) TriggerClientEvent('esx_lscustom:cancelInstallMod', _source) TriggerClientEvent('esx:showNotification', _source, _U('not_enough_money')) end - else - if price < xPlayer.getMoney() then TriggerClientEvent('esx_lscustom:installMod', _source) TriggerClientEvent('esx:showNotification', _source, _U('purchased')) @@ -33,21 +33,33 @@ AddEventHandler('esx_lscustom:buyMod', function(price) TriggerClientEvent('esx_lscustom:cancelInstallMod', _source) TriggerClientEvent('esx:showNotification', _source, _U('not_enough_money')) end - end end) RegisterServerEvent('esx_lscustom:refreshOwnedVehicle') -AddEventHandler('esx_lscustom:refreshOwnedVehicle', function(myCar) - MySQL.Async.execute('UPDATE `owned_vehicles` SET `vehicle` = @vehicle WHERE `plate` = @plate', - { - ['@plate'] = myCar.plate, - ['@vehicle'] = json.encode(myCar) - }) +AddEventHandler('esx_lscustom:refreshOwnedVehicle', function(vehicleProps) + local xPlayer = ESX.GetPlayerFromId(source) + + MySQL.Async.fetchAll('SELECT vehicle FROM owned_vehicles WHERE plate = @plate', { + ['@plate'] = vehicleProps.plate + }, function(result) + if result[1] then + local vehicle = json.decode(result[1].vehicle) + + if vehicleProps.model == vehicle.model then + MySQL.Async.execute('UPDATE owned_vehicles SET vehicle = @vehicle WHERE plate = @plate', { + ['@plate'] = vehicleProps.plate, + ['@vehicle'] = json.encode(vehicleProps) + }) + else + print(('esx_lscustom: %s attempted to upgrade vehicle with mismatching vehicle model!'):format(xPlayer.identifier)) + end + end + end) end) ESX.RegisterServerCallback('esx_lscustom:getVehiclesPrices', function(source, cb) - if Vehicles == nil then + if not Vehicles then MySQL.Async.fetchAll('SELECT * FROM vehicles', {}, function(result) local vehicles = {} From cceee68ca7271a14aac5556f6055ef9ad1f15e01 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Wed, 18 Sep 2019 18:39:36 +0200 Subject: [PATCH 46/55] Minor cleanup Co-Authored-By: danishrp --- client/main.lua | 78 ++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 43 deletions(-) diff --git a/client/main.lua b/client/main.lua index eb7de0ce..0593c62d 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,21 +1,9 @@ -local Keys = { - ["ESC"] = 322, ["F1"] = 288, ["F2"] = 289, ["F3"] = 170, ["F5"] = 166, ["F6"] = 167, ["F7"] = 168, ["F8"] = 169, ["F9"] = 56, ["F10"] = 57, - ["~"] = 243, ["1"] = 157, ["2"] = 158, ["3"] = 160, ["4"] = 164, ["5"] = 165, ["6"] = 159, ["7"] = 161, ["8"] = 162, ["9"] = 163, ["-"] = 84, ["="] = 83, ["BACKSPACE"] = 177, - ["TAB"] = 37, ["Q"] = 44, ["W"] = 32, ["E"] = 38, ["R"] = 45, ["T"] = 245, ["Y"] = 246, ["U"] = 303, ["P"] = 199, ["["] = 39, ["]"] = 40, ["ENTER"] = 18, - ["CAPS"] = 137, ["A"] = 34, ["S"] = 8, ["D"] = 9, ["F"] = 23, ["G"] = 47, ["H"] = 74, ["K"] = 311, ["L"] = 182, - ["LEFTSHIFT"] = 21, ["Z"] = 20, ["X"] = 73, ["C"] = 26, ["V"] = 0, ["B"] = 29, ["N"] = 249, ["M"] = 244, [","] = 82, ["."] = 81, - ["LEFTCTRL"] = 36, ["LEFTALT"] = 19, ["SPACE"] = 22, ["RIGHTCTRL"] = 70, - ["HOME"] = 213, ["PAGEUP"] = 10, ["PAGEDOWN"] = 11, ["DELETE"] = 178, - ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173, - ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 -} - -ESX = nil -local Vehicles = {} -local PlayerData = {} -local lsMenuIsShowed = false -local isInLSMarker = false -local myCar = {} +ESX = nil +local Vehicles = {} +local PlayerData = {} +local lsMenuIsShowed = false +local isInLSMarker = false +local myCar = {} Citizen.CreateThread(function() while ESX == nil do @@ -27,6 +15,7 @@ end) RegisterNetEvent('esx:playerLoaded') AddEventHandler('esx:playerLoaded', function(xPlayer) PlayerData = xPlayer + ESX.TriggerServerCallback('esx_lscustom:getVehiclesPrices', function(vehicles) Vehicles = vehicles end) @@ -83,16 +72,16 @@ function OpenLSMenu(elems, menuName, menuTitle, parent) if isRimMod then price = math.floor(vehiclePrice * data.current.price / 100) - TriggerServerEvent("esx_lscustom:buyMod", price) + TriggerServerEvent('esx_lscustom:buyMod', price) elseif v.modType == 11 or v.modType == 12 or v.modType == 13 or v.modType == 15 or v.modType == 16 then price = math.floor(vehiclePrice * v.price[data.current.modNum + 1] / 100) - TriggerServerEvent("esx_lscustom:buyMod", price) + TriggerServerEvent('esx_lscustom:buyMod', price) elseif v.modType == 17 then price = math.floor(vehiclePrice * v.price[1] / 100) - TriggerServerEvent("esx_lscustom:buyMod", price) + TriggerServerEvent('esx_lscustom:buyMod', price) else price = math.floor(vehiclePrice * v.price / 100) - TriggerServerEvent("esx_lscustom:buyMod", price) + TriggerServerEvent('esx_lscustom:buyMod', price) end end @@ -128,10 +117,10 @@ end function UpdateMods(data) local vehicle = GetVehiclePedIsIn(PlayerPedId(), false) - if data.modType ~= nil then + if data.modType then local props = {} - if data.wheelType ~= nil then + if data.wheelType then props['wheels'] = data.wheelType ESX.Game.SetVehicleProperties(vehicle, props) props = {} @@ -199,7 +188,7 @@ function GetAction(data) menuTitle = v.label parent = v.parent - if v.modType ~= nil then + if v.modType then if v.modType == 22 then table.insert(elements, {label = " " .. _U('by_default'), modType = k, modNum = false}) @@ -283,7 +272,7 @@ function GetAction(data) local modCount = GetNumVehicleMods(vehicle, v.modType) for j = 0, modCount, 1 do local modName = GetModTextLabel(vehicle, v.modType, j) - if modName ~= nil then + if modName then local _label = '' if j == currentMods.modFrontWheels then _label = GetLabelText(modName) .. ' - '.. _U('installed') ..'' @@ -321,7 +310,7 @@ function GetAction(data) local modCount = GetNumVehicleMods(vehicle, v.modType) -- BODYPARTS for j = 0, modCount, 1 do local modName = GetModTextLabel(vehicle, v.modType, j) - if modName ~= nil then + if modName then local _label = '' if j == currentMods[k] then _label = GetLabelText(modName) .. ' - '.. _U('installed') ..'' @@ -369,11 +358,13 @@ end Citizen.CreateThread(function() for k,v in pairs(Config.Zones) do local blip = AddBlipForCoord(v.Pos.x, v.Pos.y, v.Pos.z) + SetBlipSprite(blip, 72) SetBlipScale(blip, 0.8) SetBlipAsShortRange(blip, true) - BeginTextCommandSetBlipName("STRING") - AddTextComponentString(v.Name) + + BeginTextCommandSetBlipName('STRING') + AddTextComponentSubstringPlayerName(v.Name) EndTextCommandSetBlipName(blip) end end) @@ -383,12 +374,12 @@ Citizen.CreateThread(function() while true do Citizen.Wait(0) local playerPed = PlayerPedId() + if IsPedInAnyVehicle(playerPed, false) then - local coords = GetEntityCoords(PlayerPedId()) - local currentZone = nil - local zone = nil - local lastZone = nil - if (PlayerData.job ~= nil and PlayerData.job.name == 'mechanic') or Config.IsMechanicJobOnly == false then + local coords = GetEntityCoords(PlayerPedId()) + local currentZone, zone, lastZone + + if (PlayerData.job and PlayerData.job.name == 'mechanic') or not Config.IsMechanicJobOnly then for k,v in pairs(Config.Zones) do if GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < v.Size.x then isInLSMarker = true @@ -400,8 +391,8 @@ Citizen.CreateThread(function() end end - if IsControlJustReleased(0, Keys['E']) and not lsMenuIsShowed and isInLSMarker then - if (PlayerData.job ~= nil and PlayerData.job.name == 'mechanic') or Config.IsMechanicJobOnly == false then + if IsControlJustReleased(0, 38) and not lsMenuIsShowed and isInLSMarker then + if (PlayerData.job and PlayerData.job.name == 'mechanic') or not Config.IsMechanicJobOnly then lsMenuIsShowed = true local vehicle = GetVehiclePedIsIn(playerPed, false) @@ -429,14 +420,15 @@ end) -- Prevent Free Tunning Bug Citizen.CreateThread(function() while true do - Citizen.Wait(1) + Citizen.Wait(0) + if lsMenuIsShowed then - DisableControlAction(2, Keys['F1'], true) - DisableControlAction(2, Keys['F2'], true) - DisableControlAction(2, Keys['F3'], true) - DisableControlAction(2, Keys['F6'], true) - DisableControlAction(2, Keys['F7'], true) - DisableControlAction(2, Keys['F'], true) + DisableControlAction(2, 288, true) + DisableControlAction(2, 289, true) + DisableControlAction(2, 170, true) + DisableControlAction(2, 167, true) + DisableControlAction(2, 168, true) + DisableControlAction(2, 23, true) DisableControlAction(0, 75, true) -- Disable exit vehicle DisableControlAction(27, 75, true) -- Disable exit vehicle else From 02841bb362b339b69a77d0b7589bd1f98e0f0760 Mon Sep 17 00:00:00 2001 From: LeCyreaxYT <38440842+LeCyreaxYT@users.noreply.github.com> Date: Sun, 19 Jan 2020 16:12:21 +0100 Subject: [PATCH 47/55] Added German translation (#78) * Create de.lua * Update __resource.lua --- __resource.lua | 2 + locales/de.lua | 269 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 271 insertions(+) create mode 100644 locales/de.lua diff --git a/__resource.lua b/__resource.lua index eb9932df..696eed11 100644 --- a/__resource.lua +++ b/__resource.lua @@ -11,6 +11,7 @@ server_scripts { 'locales/fr.lua', 'locales/pl.lua', 'locales/br.lua', + 'locales/de.lua', 'config.lua', 'server/main.lua' } @@ -21,6 +22,7 @@ client_scripts { 'locales/fr.lua', 'locales/pl.lua', 'locales/br.lua', + 'locales/de.lua', 'config.lua', 'client/main.lua' } diff --git a/locales/de.lua b/locales/de.lua new file mode 100644 index 00000000..d2fac421 --- /dev/null +++ b/locales/de.lua @@ -0,0 +1,269 @@ +Locales['de'] = { + ['by_default'] = 'Standard', + ['installed'] = 'installed', + ['already_own'] = 'Sie besitzen bereits: %s', + ['not_enough_money'] = 'du kannst dir diese mod nicht leisten', + ['purchased'] = 'Du hast diese Mod gekauft!', + ['press_custom'] = 'Drücke ~INPUT_PICKUP~ um dein Fahrzeug auf zu Tunen', + ['level'] = 'level %s', + ['neon'] = 'Neon', + ['blip_name'] = 'Tuning', +-- Paint Colors + -- Black + ['black'] = 'black', + ['graphite'] = 'graphite', + ['black_metallic'] = 'black Metallic', + ['caststeel'] = 'cast Steel', + ['black_anth'] = 'black Anthracite', + ['matteblack'] = 'matte Black', + ['darknight'] = 'dark Night', + ['deepblack'] = 'deep Black', + ['oil'] = 'oil', + ['carbon'] = 'carbon', + -- White + ['white'] = 'white', + ['vanilla'] = 'vanilla', + ['creme'] = 'creme', + ['polarwhite'] = 'polar White', + ['beige'] = 'beige', + ['mattewhite'] = 'matte White', + ['snow'] = 'snow', + ['cotton'] = 'cotton', + ['alabaster'] = 'alabaster', + ['purewhite'] = 'pure White', + -- Grey + ['grey'] = 'grey', + ['silver'] = 'silver', + ['metallicgrey'] = 'metallic Grey', + ['laminatedsteel'] = 'laminated Steel', + ['darkgray'] = 'dark Grey', + ['rockygray'] = 'rocky Grey', + ['graynight'] = 'gray Night', + ['aluminum'] = 'aluminum', + ['graymat'] = 'matte Grey', + ['lightgrey'] = 'light Grey', + ['asphaltgray'] = 'asphalt Grey', + ['grayconcrete'] = 'concrete Grey', + ['darksilver'] = 'dark Silver', + ['magnesite'] = 'magnesite', + ['nickel'] = 'nickel', + ['zinc'] = 'zinc', + ['dolomite'] = 'dolomite', + ['bluesilver'] = 'blue Silver', + ['titanium'] = 'titanium', + ['steelblue'] = 'steel Blue', + ['champagne'] = 'champagne', + ['grayhunter'] = 'grey Hunter', + -- Red + ['red'] = 'red', + ['torino_red'] = 'torino Red', + ['poppy'] = 'poppy', + ['copper_red'] = 'copper Red', + ['cardinal'] = 'cardinal Red', + ['brick'] = 'brick Red', + ['garnet'] = 'Garnet', + ['cabernet'] = 'cabernet Red', + ['candy'] = 'candy Red', + ['matte_red'] = 'matte Red', + ['dark_red'] = 'dark Red', + ['red_pulp'] = 'red Pulp', + ['bril_red'] = 'brilliant Red', + ['pale_red'] = 'pale Red', + ['wine_red'] = 'wine Red', + ['volcano'] = 'Volcano', + -- Pink + ['pink'] = 'pink', + ['electricpink'] = 'electric Pink', + ['brightpink'] = 'bright Pink', + ['salmon'] = 'salmon', + ['sugarplum'] = 'sugar Plum', + -- Blue + ['blue'] = 'blue', + ['topaz'] = 'topaz', + ['light_blue'] = 'light Blue', + ['galaxy_blue'] = 'galaxy Blue', + ['dark_blue'] = 'dark Blue', + ['azure'] = 'azure', + ['navy_blue'] = 'navy Blue', + ['lapis'] = 'lapis Lazuli', + ['blue_diamond'] = 'blue Diamond', + ['surfer'] = 'surfer', + ['pastel_blue'] = 'pastel Blue', + ['celeste_blue'] = 'celeste Blue', + ['rally_blue'] = 'rally Blue', + ['blue_paradise'] = 'blue Paradise', + ['blue_night'] = 'blue Night', + ['cyan_blue'] = 'cyan Blue', + ['cobalt'] = 'cobalt', + ['electric_blue'] = 'electric Blue', + ['horizon_blue'] = 'horizon Blue', + ['metallic_blue'] = 'metallic Blue', + ['aquamarine'] = 'aquamarine', + ['blue_agathe'] = 'blue Agathe', + ['zirconium'] = 'zirconium', + ['spinel'] = 'spinel', + ['tourmaline'] = 'tourmaline', + ['paradise'] = 'paradise', + ['bubble_gum'] = 'bubble Gum', + ['midnight_blue'] = 'midnight Blue', + ['forbidden_blue'] = 'forbidden Blue', + ['glacier_blue'] = 'glacier Blue', + -- Yellow + ['yellow'] = 'yellow', + ['wheat'] = 'wheat', + ['raceyellow'] = 'race Yellow', + ['paleyellow'] = 'pale Yellow', + ['lightyellow'] = 'light Yellow', + -- Green + ['green'] = 'green', + ['met_dark_green'] = 'metallic Dark Green', + ['rally_green'] = 'Rally Green', + ['pine_green'] = 'pine Green', + ['olive_green'] = 'olive Green', + ['light_green'] = 'Light Green', + ['lime_green'] = 'lime green', + ['forest_green'] = 'forest Green', + ['lawn_green'] = 'lawn Green', + ['imperial_green'] = 'imperial Green', + ['green_bottle'] = 'breen Bottle', + ['citrus_green'] = 'citrus Green', + ['green_anis'] = 'green Anis', + ['khaki'] = 'Khaki', + ['army_green'] = 'army Green', + ['dark_green'] = 'dark Green', + ['hunter_green'] = 'hunter Green', + ['matte_foilage_green'] = 'matte Foilage Green', + -- Orange + ['orange'] = 'orange', + ['tangerine'] = 'Tangerine', + ['matteorange'] = 'Matte Orange', + ['lightorange'] = 'Light Orange', + ['peach'] = 'Peach', + ['pumpkin'] = 'Pumpkin', + ['orangelambo'] = 'Orange Lambo', + -- Brown + ['brown'] = 'brown', + ['copper'] = 'Copper', + ['lightbrown'] = 'Light Brown', + ['darkbrown'] = 'Dark Brown', + ['bronze'] = 'Bronze', + ['brownmetallic'] = 'Brown Metallic', + ['espresso'] = 'Espresso', + ['chocolate'] = 'Chocolate', + ['terracotta'] = 'Terracotta', + ['marble'] = 'Marble', + ['sand'] = 'Sand', + ['sepia'] = 'Sepia', + ['bison'] = 'Bison', + ['palm'] = 'Palm', + ['caramel'] = 'Caramel', + ['rust'] = 'Rust', + ['chestnut'] = 'Chestnut', + ['hazelnut'] = 'Hazelnut', + ['shell'] = 'Shell', + ['mahogany'] = 'Mahogany', + ['cauldron'] = 'Cauldron', + ['blond'] = 'Blond', + ['gravel'] = 'Gravel', + ['darkearth'] = 'Dark Earth', + ['desert'] = 'Desert', + -- Purple + ['purple'] = 'purple', + ['indigo'] = 'Indigo', + ['deeppurple'] = 'Deep Purple', + ['darkviolet'] = 'Dark Violet', + ['amethyst'] = 'Amethyst', + ['mysticalviolet'] = 'Mystic Violet', + ['purplemetallic'] = 'Purple Metallic', + ['matteviolet'] = 'Matte Violet', + ['mattedeeppurple'] = 'Matte Deep Purple', + -- Chrome + ['chrome'] = 'chrome', + ['brushedchrome'] = 'brushed Chrome', + ['blackchrome'] = 'black Chrome', + ['brushedaluminum'] = 'brushed Aluminum', + -- Metal + ['gold'] = 'gold', + ['puregold'] = 'pure Gold', + ['brushedgold'] = 'brushed Gold', + ['lightgold'] = 'light Gold', +-- License Plates + ['blue_on_white_1'] = 'blau auf weiß 1', + ['yellow_on_black'] = 'gelb auf schwarz', + ['yellow_blue'] = 'gelb auf blau', + ['blue_on_white_2'] = 'blau auf weiß 2', + ['blue_on_white_3'] = 'blau auf weiß 3', +-- Upgrades + ['upgrades'] = 'Upgrades', + ['engine'] = 'Motor', + ['brakes'] = 'bremsen', + ['transmission'] = 'Getriebe', + ['suspension'] = 'Suspension', + ['armor'] = 'Panzerung', + ['turbo'] = 'Turbo', + ['no_turbo'] = 'kein Turbo', +-- Cosmetics + ['cosmetics'] = 'Zubehör', + -- Body Parts + ['bodyparts'] = 'Karroserie Teile', + ['leftfender'] = 'linker Kotflügel', + ['rightfender'] = 'rechter Kotflügel', + ['spoilers'] = 'Spoiler', + ['sideskirt'] = 'Seitenschweller', + ['cage'] = 'Käfig', + ['hood'] = 'Motorhaube', + ['grille'] = 'Gitter', + ['rearbumper'] = 'hintere Stoßstange', + ['frontbumper'] = 'Frontstoßstange', + ['exhaust'] = 'Auspuff', + ['roof'] = 'Dach', + -- Paint + ['respray'] = 'Lackierung', + ['primary'] = 'Primär', + ['secondary'] = 'Sekundär', + ['pearlescent'] = 'Perlglanz', + -- Misc + ['headlights'] = 'Scheinwerfer', + ['licenseplates'] = 'Nummernschild', + ['windowtint'] = 'Fenstertönung', + ['horns'] = 'Hörner', + -- Neon + ['neons'] = 'neons', + -- Wheels + ['wheels'] = 'Räder', + ['tiresmoke'] = 'Reifenrauch', + ['wheel_type'] = 'Rad-Typ', + ['wheel_color'] = 'Radfarbe', + ['sport'] = 'Sport', + ['muscle'] = 'Muskel', + ['lowrider'] = 'Lowrider', + ['suv'] = 'SUV', + ['allterrain'] = 'alles Gelände', + ['tuning'] = 'tuning', + ['motorcycle'] = 'Motorrad', + ['highend'] = 'High End', + + ['modplateholder'] = 'Platte - Zurück', + ['modvanityplate'] = 'Platte - Vorne', + ['interior'] = 'interior', + ['trim'] = 'trim', + ['dashboard'] = 'dashboard', + ['speedometer'] = 'Tachometer', + ['door_speakers'] = 'Türlautsprecher', + ['seats'] = 'Sitze', + ['steering_wheel'] = 'Lenkrad', + ['gear_lever'] = 'Schalthebel', + ['quarter_deck'] = 'Achterdeck', + ['speakers'] = 'Lautsprecher', + ['trunk'] = 'Kofferraum', + ['hydraulic'] = 'hydraulisch', + ['engine_block'] = 'Motorblock', + ['air_filter'] = 'air filter', + ['struts'] = 'Streben', + ['arch_cover'] = 'Bogenabdeckung', + ['aerials'] = 'Antennen', + ['wings'] = 'Flügel', + ['fuel_tank'] = 'Treibstofftank', + ['windows'] = 'Fenster', + ['stickers'] = 'Designs', +} From fb16b7970ac787a373ebcad8930957fa70b62498 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sun, 19 Jan 2020 16:53:30 +0100 Subject: [PATCH 48/55] Replace __resource.lua with fxmanifest.lua --- __resource.lua => fxmanifest.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename __resource.lua => fxmanifest.lua (87%) diff --git a/__resource.lua b/fxmanifest.lua similarity index 87% rename from __resource.lua rename to fxmanifest.lua index 696eed11..ebdbf7df 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 LS Customs' From 84b061a1fbf7e17875a1c9d35013832654e4809e Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 17 Feb 2020 21:54:47 +0100 Subject: [PATCH 49/55] Minor edits --- README.md | 2 +- config.lua | 64 +++++++++++++++++++++++++++--------------------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index e21c4e36..199b94db 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ start esx_lscustom ### License esx_lscustoms - The best LS Custom out there for FX -Copyright (C) 2015-2018 Jérémie N'gadi +Copyright (C) 2015-2020 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/config.lua b/config.lua index c633e2fa..c2881bbf 100644 --- a/config.lua +++ b/config.lua @@ -53,19 +53,19 @@ Config.Zones = { } Config.Colors = { - { label = _U('black'), value = 'black'}, - { label = _U('white'), value = 'white'}, - { label = _U('grey'), value = 'grey'}, - { label = _U('red'), value = 'red'}, - { label = _U('pink'), value = 'pink'}, - { label = _U('blue'), value = 'blue'}, - { label = _U('yellow'), value = 'yellow'}, - { label = _U('green'), value = 'green'}, - { label = _U('orange'), value = 'orange'}, - { label = _U('brown'), value = 'brown'}, - { label = _U('purple'), value = 'purple'}, - { label = _U('chrome'), value = 'chrome'}, - { label = _U('gold'), value = 'gold'} + {label = _U('black'), value = 'black'}, + {label = _U('white'), value = 'white'}, + {label = _U('grey'), value = 'grey'}, + {label = _U('red'), value = 'red'}, + {label = _U('pink'), value = 'pink'}, + {label = _U('blue'), value = 'blue'}, + {label = _U('yellow'), value = 'yellow'}, + {label = _U('green'), value = 'green'}, + {label = _U('orange'), value = 'orange'}, + {label = _U('brown'), value = 'brown'}, + {label = _U('purple'), value = 'purple'}, + {label = _U('chrome'), value = 'chrome'}, + {label = _U('gold'), value = 'gold'} } function GetColors(color) @@ -401,25 +401,25 @@ end function GetNeons() local neons = { - { label = _U('white'), r = 255, g = 255, b = 255}, - { label = "Slate Gray", r = 112, g = 128, b = 144}, - { label = "Blue", r = 0, g = 0, b = 255}, - { label = "Light Blue", r = 0, g = 150, b = 255}, - { label = "Navy Blue", r = 0, g = 0, b = 128}, - { label = "Sky Blue", r = 135, g = 206, b = 235}, - { label = "Turquoise", r = 0, g = 245, b = 255}, - { label = "Mint Green", r = 50, g = 255, b = 155}, - { label = "Lime Green", r = 0, g = 255, b = 0}, - { label = "Olive", r = 128, g = 128, b = 0}, - { label = _U('yellow'), r = 255, g = 255, b = 0}, - { label = _U('gold'), r = 255, g = 215, b = 0}, - { label = _U('orange'), r = 255, g = 165, b = 0}, - { label = _U('wheat'), r = 245, g = 222, b = 179}, - { label = _U('red'), r = 255, g = 0, b = 0}, - { label = _U('pink'), r = 255, g = 161, b = 211}, - { label = _U('brightpink'), r = 255, g = 0, b = 255}, - { label = _U('purple'), r = 153, g = 0, b = 153}, - { label = "Ivory", r = 41, g = 36, b = 33} + {label = _U('white'), r = 255, g = 255, b = 255}, + {label = "Slate Gray", r = 112, g = 128, b = 144}, + {label = "Blue", r = 0, g = 0, b = 255}, + {label = "Light Blue", r = 0, g = 150, b = 255}, + {label = "Navy Blue", r = 0, g = 0, b = 128}, + {label = "Sky Blue", r = 135, g = 206, b = 235}, + {label = "Turquoise", r = 0, g = 245, b = 255}, + {label = "Mint Green", r = 50, g = 255, b = 155}, + {label = "Lime Green", r = 0, g = 255, b = 0}, + {label = "Olive", r = 128, g = 128, b = 0}, + {label = _U('yellow'), r = 255, g = 255, b = 0}, + {label = _U('gold'), r = 255, g = 215, b = 0}, + {label = _U('orange'), r = 255, g = 165, b = 0}, + {label = _U('wheat'), r = 245, g = 222, b = 179}, + {label = _U('red'), r = 255, g = 0, b = 0}, + {label = _U('pink'), r = 255, g = 161, b = 211}, + {label = _U('brightpink'), r = 255, g = 0, b = 255}, + {label = _U('purple'), r = 153, g = 0, b = 153}, + {label = "Ivory", r = 41, g = 36, b = 33} } return neons From 4d7dc79eae5739d65ebd91f3e894db57b704f097 Mon Sep 17 00:00:00 2001 From: Tinky <48660658+Tinky124@users.noreply.github.com> Date: Fri, 3 Jul 2020 20:08:45 +0200 Subject: [PATCH 50/55] Fix when restarting script :D (#96) --- client/main.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/client/main.lua b/client/main.lua index 9f1e1bfd..6d4af4b3 100644 --- a/client/main.lua +++ b/client/main.lua @@ -10,6 +10,12 @@ Citizen.CreateThread(function() TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) Citizen.Wait(0) end + + while ESX.GetPlayerData().job == nil do + Citizen.Wait(10) + end + + PlayerData = ESX.GetPlayerData() end) RegisterNetEvent('esx:playerLoaded') From 256dcb09aa6a21cb5a8665e8ff887d65da831060 Mon Sep 17 00:00:00 2001 From: Muhammad Hifzirrohman Syafi'i Date: Tue, 21 Jul 2020 06:42:49 +0700 Subject: [PATCH 51/55] Update main.lua (#93) Fix Free turbo and Xenon Glitch Co-authored-by: Yulian Ivanov <67766145+BrakingESX247@users.noreply.github.com> --- client/main.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/client/main.lua b/client/main.lua index 6d4af4b3..b9319cd2 100644 --- a/client/main.lua +++ b/client/main.lua @@ -43,6 +43,15 @@ RegisterNetEvent('esx_lscustom:cancelInstallMod') AddEventHandler('esx_lscustom:cancelInstallMod', function() local vehicle = GetVehiclePedIsIn(PlayerPedId(), false) ESX.Game.SetVehicleProperties(vehicle, myCar) + if not (myCar.modTurbo) then + ToggleVehicleMod(vehicle, 18, false) + end + if not (myCar.modXenon) then + ToggleVehicleMod(vehicle, 22, false) + end + if not (myCar.windowTint) then + SetVehicleWindowTint(vehicle, 0) + end end) function OpenLSMenu(elems, menuName, menuTitle, parent) From 011a548e7428c0be43223585c60eaf43ca5ee004 Mon Sep 17 00:00:00 2001 From: SW1FT Date: Tue, 21 Jul 2020 00:45:10 +0100 Subject: [PATCH 52/55] Fix "Expresso" color translations (#91) --- locales/br.lua | 4 ++-- locales/de.lua | 2 +- locales/en.lua | 2 +- locales/fr.lua | 2 +- locales/pl.lua | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/locales/br.lua b/locales/br.lua index 77df97b7..84c286ba 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -3,7 +3,7 @@ Locales['br'] = { ['installed'] = 'instalado', ['already_own'] = 'já possuis: ~b~%s~s~', ['not_enough_money'] = 'sem dinheiro!', - ['purchased'] = 'tu compras-te esta peça!', + ['purchased'] = 'tu compraste esta peça!', ['press_custom'] = 'pressiona ~INPUT_PICKUP~ para personalizar o veiculo.', ['level'] = 'level %s', ['neon'] = 'neon', @@ -148,7 +148,7 @@ Locales['br'] = { ['darkbrown'] = 'castanho escuro', ['Bronze'] = 'bronze', ['brownmetallic'] = 'castanho metálico', - ['espresso'] = 'castanho expresso', + ['expresso'] = 'castanho expresso', ['chocolate'] = 'castanho chocolate', ['terracotta'] = 'castanho Terracota', ['marble'] = 'castanho mármore', diff --git a/locales/de.lua b/locales/de.lua index d2fac421..889a98f9 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -148,7 +148,7 @@ Locales['de'] = { ['darkbrown'] = 'Dark Brown', ['bronze'] = 'Bronze', ['brownmetallic'] = 'Brown Metallic', - ['espresso'] = 'Espresso', + ['expresso'] = 'Expresso', ['chocolate'] = 'Chocolate', ['terracotta'] = 'Terracotta', ['marble'] = 'Marble', diff --git a/locales/en.lua b/locales/en.lua index 71f994a4..d613518a 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -148,7 +148,7 @@ Locales['en'] = { ['darkbrown'] = 'Dark Brown', ['bronze'] = 'Bronze', ['brownmetallic'] = 'Brown Metallic', - ['espresso'] = 'Espresso', + ['expresso'] = 'Expresso', ['chocolate'] = 'Chocolate', ['terracotta'] = 'Terracotta', ['marble'] = 'Marble', diff --git a/locales/fr.lua b/locales/fr.lua index c786ffc4..e97d789a 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -148,7 +148,7 @@ Locales['fr'] = { ['darkbrown'] = 'Marron Foncé', ['bronze'] = 'Bronze', ['brownmetallic'] = 'Marron Métallisé', - ['espresso'] = 'Expresso', + ['expresso'] = 'Expresso', ['chocolate'] = 'Chocolat', ['terracotta'] = 'Terre Cuite', ['marble'] = 'Marbre', diff --git a/locales/pl.lua b/locales/pl.lua index d57b599d..65ed3522 100644 --- a/locales/pl.lua +++ b/locales/pl.lua @@ -148,7 +148,7 @@ Locales['pl'] = { ['darkbrown'] = 'ciemny brąz', ['bronze'] = 'brąz', ['brownmetallic'] = 'metaliczny brązowy', - ['espresso'] = 'espresso', + ['expresso'] = 'expresso', ['chocolate'] = 'czekoladowy', ['terracotta'] = 'terakota', ['marble'] = 'marmur', From 149e69cdf45b10161c456c4a13dd8863a7fa8867 Mon Sep 17 00:00:00 2001 From: gdanbo Date: Sat, 15 Aug 2020 15:40:14 +0200 Subject: [PATCH 53/55] Update main.lua Fixes an issue where there's only 1 upgrade level on some cars --- client/main.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/client/main.lua b/client/main.lua index b9319cd2..0c6084b3 100644 --- a/client/main.lua +++ b/client/main.lua @@ -299,6 +299,7 @@ function GetAction(data) end end elseif v.modType == 11 or v.modType == 12 or v.modType == 13 or v.modType == 15 or v.modType == 16 then + SetVehicleModKit(vehicle, 0) local modCount = GetNumVehicleMods(vehicle, v.modType) -- UPGRADES for j = 0, modCount, 1 do local _label = '' From b2cca56643513885893a1cc541350e168584fc17 Mon Sep 17 00:00:00 2001 From: CCasusensa Date: Sun, 13 Sep 2020 18:45:01 +0800 Subject: [PATCH 54/55] fixed Free Tuning Bug after being shot by a stun gun --- client/main.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/client/main.lua b/client/main.lua index b9319cd2..f75cd7db 100644 --- a/client/main.lua +++ b/client/main.lua @@ -42,6 +42,9 @@ end) RegisterNetEvent('esx_lscustom:cancelInstallMod') AddEventHandler('esx_lscustom:cancelInstallMod', function() local vehicle = GetVehiclePedIsIn(PlayerPedId(), false) + if (GetPedInVehicleSeat(vehicle, -1) ~= PlayerPedId()) then + vehicle = GetPlayersLastVehicle(PlayerPedId()) + end ESX.Game.SetVehicleProperties(vehicle, myCar) if not (myCar.modTurbo) then ToggleVehicleMod(vehicle, 18, false) From bdfd93359277a3acb80a45904f861081156927bf Mon Sep 17 00:00:00 2001 From: LazarusOfTheFallen <31637812+LazarusOfTheFallen@users.noreply.github.com> Date: Mon, 1 Feb 2021 17:00:30 -0600 Subject: [PATCH 55/55] Update main.lua --- client/main.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/client/main.lua b/client/main.lua index f75cd7db..5b6cfb18 100644 --- a/client/main.lua +++ b/client/main.lua @@ -43,17 +43,17 @@ RegisterNetEvent('esx_lscustom:cancelInstallMod') AddEventHandler('esx_lscustom:cancelInstallMod', function() local vehicle = GetVehiclePedIsIn(PlayerPedId(), false) if (GetPedInVehicleSeat(vehicle, -1) ~= PlayerPedId()) then - vehicle = GetPlayersLastVehicle(PlayerPedId()) + vehicle = GetPlayersLastVehicle(PlayerPedId()) end - ESX.Game.SetVehicleProperties(vehicle, myCar) + ESX.Game.SetVehicleProperties(vehicle, myCar) if not (myCar.modTurbo) then - ToggleVehicleMod(vehicle, 18, false) + ToggleVehicleMod(vehicle, 18, false) end if not (myCar.modXenon) then - ToggleVehicleMod(vehicle, 22, false) + ToggleVehicleMod(vehicle, 22, false) end if not (myCar.windowTint) then - SetVehicleWindowTint(vehicle, 0) + SetVehicleWindowTint(vehicle, 0) end end)