Update functions.lua

Merge to Community_bridge

.vscode/settings.json

@@ -0,0 +1,27 @@
+{
+    "Lua.diagnostics.disable": [
+        "missing-parameter",
+        "param-type-mismatch"
+    ],
+    "Lua.diagnostics.globals": [
+        "lib",
+        "progressbar",
+        "loadParticle",
+        "makeMenu",
+        "minigame",
+        "tele",
+        "sorter",
+        "MySQL",
+        "trays",
+        "heroinkit",
+        "getPlayer",
+        "dist",
+        "sortTab",
+        "getRep",
+        "heroinCooldown",
+        "checkLoc",
+        "getRandW",
+        "shroomsCooldown",
+        "targets"
+    ]
+}

LICENSE

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- 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 <https://www.gnu.org/licenses/>.
-
-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:
-
-    <program>  Copyright (C) <year>  <name of author>
-    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
-<https://www.gnu.org/licenses/>.
-
-  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
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

ate_balloon/fxmanifest.lua

@@ -0,0 +1,25 @@
+fx_version 'cerulean'
+game 'gta5'
+
+lua54 'yes'
+this_is_a_map 'yes'
+
+author 'Atenea'
+description 'Balloon / MD-Drugs'
+version '1.0.1'
+
+---------------------------------------------------------------------------
+-- INCLUDED FILES
+---------------------------------------------------------------------------
+files {
+    'stream/*.ytyp',
+}
+
+data_file 'DLC_ITYP_REQUEST' 'stream/*.ytyp'
+
+dependency '/assetpacks'
+
+
+escrow_ignore {
+    'stream/*.ydr',
+}

ate_balloon/readme.txt

@@ -0,0 +1,20 @@
+Thank you for your purchase!
+We hope you enjoy this prop ♥
+
+Author: Atenea Store | Atenea
+
+-- IMPORTANT --
+/Please read below.
+
+► If you rename the folder or files I will not be responsible if it does not work correctly afterwards.
+
+► If you encounter any problems, errors, or have any questions related to our prop, JOIN OUR DISCORD.
+Don't hesitate to open a ticket, we’ll assist you as quickly as possible.
+
+				https://discord.gg/mam8Nmg49d
+
+				SCRIPTS
+				https://discord.gg/S5WZ7ecKDc
+
+Make sure you’ve already READ our post on FiveM/Tebex/Discord.
+Atenea from the Atenea Store Team.

client/TravellingMerchant.lua

@@ -0,0 +1,35 @@
+if not Config.Drugs['TravellingMerchant'] then return end
+local function spawn()
+    local data = Bridge.Callback.Trigger('md-drugs:server:GetMerchant')
+    local model = 's_m_m_trucker_01'
+    requestModel(model)
+    local ped = CreatePed(4, model, data.loc.x, data.loc.y, data.loc.z, data.loc.w, false, true)
+    Freeze(ped, true, data.loc.w)
+    Bridge.Target.AddLocalEntity(ped, {
+        {
+            icon = Bridge.Language.Locale('merchant.targetIcon'),
+            label = Bridge.Language.Locale('merchant.targetOpen'),
+            action = function()
+                local options = {}
+                for k, v in pairs (data.items) do
+                    local itemInfo = Bridge.Inventory.GetItemInfo(k)
+                    options[#options+1] = {
+                        title = itemInfo.label,
+                        description = '$'..v,
+                        icon = itemInfo.image,
+                        onSelect = function()
+                            TriggerServerEvent('md-drugs:server:purchaseGoods', k)
+                        end
+                    }
+                end
+                Bridge.Menu.Open({
+                    id = 'merchant_menu',
+                    title = Bridge.Language.Locale('merchant.menuTitle'),
+                    options = options
+                })
+            end
+        }
+    })
+    targets[#targets+1] = ped
+end
+spawn()

client/animationsandfunctions.lua

@@ -1,707 +0,0 @@
-
-local QBCore = exports['qb-core']:GetCoreObject()
-local started = nil
-
-local function loadParticle(dict)
-    if not HasNamedPtfxAssetLoaded(dict) then
-        RequestNamedPtfxAsset(dict)
-    end
-    while not HasNamedPtfxAssetLoaded(dict) do
-        Wait(0)
-    end
-    SetPtfxAssetNextCall(dict)
-end
-
-
-
-function MethCooking()
-local animDict, animName = "anim@amb@business@meth@meth_monitoring_cooking@cooking@", "chemical_pour_short_cooker"
-lib.requestAnimDict(animDict, 500)
-dict = "scr_ornate_heist"
-local ped = PlayerPedId()
-SetEntityCoords(ped, vector3(1005.773, -3200.402, -38.524))
-Wait(1)
-local targetPosition = GetEntityCoords(ped)
-local animDuration = GetAnimDuration(animDict, animName) * 800
-FreezeEntityPosition(ped, true)
-local scenePos, sceneRot = vector3(1010.656, -3198.445, -38.925), vector3(0.0, 0.0, 0.0)
-local netScene = NetworkCreateSynchronisedScene(scenePos, sceneRot, 2, false, false, 1065353216, 0, 1.3)
-NetworkAddPedToSynchronisedScene(ped, netScene, animDict, animName, 1.5, -4.0, 1, 16, 1148846080, 0)
-local sacid = CreateObjectNoOffset(`bkr_prop_meth_sacid`, targetPosition, 1, 1, 0)
-NetworkAddEntityToSynchronisedScene(sacid, netScene, animDict, "chemical_pour_short_sacid", 4.0, -8.0, 1)
-local ammonia = CreateObjectNoOffset(`bkr_prop_meth_ammonia`, targetPosition, 1, 1, 0)
-NetworkAddEntityToSynchronisedScene(ammonia, netScene, animDict, "chemical_pour_short_ammonia", 4.0, -8.0, 1)
-NetworkStartSynchronisedScene(netScene)
-Wait(animDuration)
-NetworkStopSynchronisedScene(netScene)
-DeleteObject(sacid)
-DeleteObject(ammonia)
-FreezeEntityPosition(ped, false)
-lib.requestModel('hei_prop_heist_thermite', 2000)
-loadParticle('scr_ornate_heist')
-
-local thermite = CreateObject('hei_prop_heist_thermite', vector3(1005.76, -3201.3, -39.25), true, false, false)
-FreezeEntityPosition(thermite, true)
-SetEntityRotation(thermite, 190.0, 90.0, 140.0, 3, true )
-Wait(1000)
-local therm = StartParticleFxLoopedOnEntity('scr_heist_ornate_thermal_burn', thermite, 0.0, 1.4, 0.0, 0.0, 0.0, 0.0, 1.5, false, false, false)
-Wait(math.random(10000, 20000))
-StopParticleFxLooped(therm, true)
-end
-
-
-function SmashMeth()
-local ver = ""
-local animDict, animName = "anim@amb@business@meth@meth_smash_weight_check@", "break_weigh_"..ver.."char02"
-lib.requestAnimDict(animDict, 500)
-local ped = PlayerPedId()
-local targetPosition = vector3(1012.628, -3194.619, -39.589)
-SetEntityCoords(ped, targetPosition)
-Wait(1)
-local animDuration = GetAnimDuration(animDict, animName) * 800
-FreezeEntityPosition(ped, true)
-local scenePos, sceneRot = vector3(1008.734, -3196.646, -39.99), vector3(0.0, 0.0, 1.08)
-local netScene = NetworkCreateSynchronisedScene(scenePos, sceneRot, 2, false, false, 1065353216, 0, 1.3)
-NetworkAddPedToSynchronisedScene(ped, netScene, animDict, animName, 1.5, -4.0, 1, 16, 1148846080, 0)
-local objects, sceneObjects = {}, {
-	{
-		hash = `w_me_hammer`,
-		animName = "break_weigh_"..ver.."hammer"
-	},
-	{
-		hash = `bkr_Prop_Meth_SmashedTray_01_frag_`,
-		animName = "break_weigh_"..ver.."tray01"
-	},
-	{
-		hash = `bkr_Prop_Meth_Tray_02a`,
-		animName = "break_weigh_"..ver.."tray01^1"
-	},
-	{
-		hash = `bkr_Prop_Meth_Tray_02a`,
-		animName = "break_weigh_"..ver.."tray01^2"
-	},
-	{
-		hash = `bkr_Prop_Meth_SmashedTray_01_frag_`,
-		animName = "break_weigh_"..ver.."tray01^3"
-	},
-}
-for i=1, #sceneObjects, 1 do
-	local obj = CreateObjectNoOffset(sceneObjects[i].hash, targetPosition, true, true, true)
-	NetworkAddEntityToSynchronisedScene(obj, netScene, animDict, sceneObjects[i].animName, 4.0, -8.0, 1)
-	objects[#objects+1] = obj
-end
-NetworkStartSynchronisedScene(netScene)
-Wait(animDuration)
-NetworkStopSynchronisedScene(netScene)
-for i=1, #objects, 1 do
-	DeleteObject(objects[i])
-end
-RemoveAnimDict(animDict)
-FreezeEntityPosition(ped, false)
-end
-
-function BagMeth()
-local ver = ""
-	local animDict, animName = "anim@amb@business@meth@meth_smash_weight_check@", "break_weigh_"..ver.."char01"
-	lib.requestAnimDict(animDict, 500)
-	local animDuration = GetAnimDuration(animDict, animName) * 1000
-	local ped = PlayerPedId()
-	local coords = GetEntityCoords(ped)
-	local scenePos, sceneRot = vector3(1008.734, -3196.646, -39.99), vector3(0.0, 0.0, 1.08)
-	local scenes = {
-	{
-		{
-			hash = `bkr_prop_meth_bigbag_04a`,
-			animName = "break_weigh_"..ver.."box01"
-		},
-		{
-			hash = `bkr_prop_meth_bigbag_03a`,
-			animName = "break_weigh_"..ver.."box01^1"
-		},
-		{
-			hash = `bkr_prop_meth_openbag_02`,
-			animName = "break_weigh_"..ver.."methbag01"
-		}
-	},
-	{
-		{
-			hash = `bkr_prop_meth_openbag_02`,
-			animName = "break_weigh_"..ver.."methbag01^1"
-		},
-		{
-			hash = `bkr_prop_meth_openbag_02`,
-			animName = "break_weigh_"..ver.."methbag01^2"
-		},
-		{
-			hash = `bkr_prop_meth_openbag_02`,
-			animName = "break_weigh_"..ver.."methbag01^3"
-		}
-	},
-	{
-		{
-			hash = `bkr_prop_meth_openbag_02`,
-			animName = "break_weigh_"..ver.."methbag01^4"
-		},
-		{
-			hash = `bkr_prop_meth_openbag_02`,
-			animName = "break_weigh_"..ver.."methbag01^5"
-		},
-		{
-			hash = `bkr_prop_meth_openbag_02`,
-			animName = "break_weigh_"..ver.."methbag01^6"
-		}
-	},
-	{
-		{
-			hash = `bkr_prop_meth_scoop_01a`,
-			animName = "break_weigh_"..ver.."scoop"
-		},
-		{
-			hash = `bkr_prop_coke_scale_01`,
-			animName = "break_weigh_"..ver.."scale"
-		},
-		{
-			hash = `bkr_prop_fakeid_penclipboard`,
-			animName = "break_weigh_"..ver.."pen"
-		}
-	},
-	{
-		{
-			hash = `bkr_prop_fakeid_clipboard_01a`,
-			animName = "break_weigh_"..ver.."clipboard"
-		},
-		{
-			hash = `bkr_Prop_Meth_Tray_02a`,
-			animName = "break_weigh_"..ver.."tray01^5"
-		}
-	}
-}
-local scenesList, entitiesList = {}, {}
-for i=1, #scenes, 1 do
-	local scene = NetworkCreateSynchronisedScene(scenePos, sceneRot, 2, false, false, 1065353216, 0, 1.3)
-	NetworkAddPedToSynchronisedScene(ped, scene, animDict, animName, 1.5, -4.0, 1, 16, 1148846080, 0)
-	for j=1, #scenes[i], 1 do
-		local s = scenes[i][j]
-		RequestModel(s.hash)
-		while not HasModelLoaded(s.hash) do
-			Wait(0)
-		end
-		local obj = CreateObjectNoOffset(s.hash, coords, true, true, true)
-		SetModelAsNoLongerNeeded(s.hash)
-		entitiesList[#entitiesList+1] = obj
-		NetworkAddEntityToSynchronisedScene(obj, scene, animDict, s.animName, 4.0, -8.0, 1)
-	end
-	scenesList[#scenesList+1] = scene
-end
-DisableCamCollisionForEntity(ped)
-FreezeEntityPosition(ped, true)
-for i=1, #scenesList, 1 do
-	NetworkStartSynchronisedScene(scenesList[i])
-end
-
-Wait(animDuration-11000)
--- Citizen.Wait(45000)
-for i=1, #scenesList, 1 do
-	NetworkStopSynchronisedScene(scenesList[i])
-end
-for i=1, #entitiesList, 1 do
-	DeleteEntity(entitiesList[i])
-end
-RemoveAnimDict(animDict)
-FreezeEntityPosition(ped, false)
-end
-
-function Tray()
-local pos = GetEntityCoords(PlayerPedId(), true)
-RequestAnimDict('anim@heists@box_carry@')
-while (not HasAnimDictLoaded('anim@heists@box_carry@')) do
-Wait(7)
-end
-TaskPlayAnim(PlayerPedId(), 'anim@heists@box_carry@', 'idle', 5.0, -1, -1, 50, 0, false, false, false)
-RequestModel("bkr_prop_meth_tray_02a")
-while not HasModelLoaded("bkr_prop_meth_tray_02a") do
-Wait(0)
-end
-local trays = CreateObject("bkr_prop_meth_tray_02a", pos.x, pos.y, pos.z, true, true, true)
-AttachEntityToEntity(trays, PlayerPedId(), GetPedBoneIndex(PlayerPedId(), 28422), 0.01,-0.2, -0.2, 20.0, 0.0, 0.0, true, true, false, true, 1, true)
-end
-
-
-
-function CutCoke()
-	local animDict, animName = "anim@amb@business@coc@coc_unpack_cut_left@", "coke_cut_v5_coccutter"
-	lib.requestAnimDict(animDict, 500)
-	local animDuration = GetAnimDuration(animDict, animName) * 1000
-	local ped = PlayerPedId()
-	local coords = GetEntityCoords(ped)
-	local scenePos, sceneRot = vector3(1090.37+.9, -3193.61-1.68, -39.60), vector3(0.0, 0.0, 0.00)
-	local scenes = {
-	{
-		{
-			hash = `bkr_prop_coke_bakingsoda_o`,
-			animName = "coke_cut_v5_bakingsoda"
-		},
-		{
-			hash = `prop_cs_credit_card`,
-			animName = "coke_cut_v5_creditcard"
-		},
-		{
-			hash = `prop_cs_credit_card`,
-			animName = "coke_cut_v5_creditcard^1"
-		}
-	},
-	
-}
-local scenesList, entitiesList = {}, {}
-for i=1, #scenes, 1 do
-	local scene = NetworkCreateSynchronisedScene(scenePos, sceneRot, 2, false, false, 1065353216, 0, 1.3)
-	NetworkAddPedToSynchronisedScene(ped, scene, animDict, animName, 1.5, -4.0, 1, 16, 1148846080, 0)
-	for j=1, #scenes[i], 1 do
-		local s = scenes[i][j]
-		RequestModel(s.hash)
-		while not HasModelLoaded(s.hash) do
-			Wait(0)
-		end
-		local obj = CreateObjectNoOffset(s.hash, coords, true, true, true)
-		SetModelAsNoLongerNeeded(s.hash)
-		entitiesList[#entitiesList+1] = obj
-		NetworkAddEntityToSynchronisedScene(obj, scene, animDict, s.animName, 4.0, -8.0, 1)
-	end
-	scenesList[#scenesList+1] = scene
-end
-DisableCamCollisionForEntity(ped)
-FreezeEntityPosition(ped, true)
-for i=1, #scenesList, 1 do
-	NetworkStartSynchronisedScene(scenesList[i])
-end
-
-Wait(animDuration-11000)
-for i=1, #scenesList, 1 do
-	NetworkStopSynchronisedScene(scenesList[i])
-end
-for i=1, #entitiesList, 1 do
-	DeleteEntity(entitiesList[i])
-end
-RemoveAnimDict(animDict)
-FreezeEntityPosition(ped, false)
-end
-
-CreateThread(function()
-
-	BikerCocaine = exports['bob74_ipl']:GetBikerCocaineObject()
-    BikerCocaine.Style.Set(BikerCocaine.Style.upgrade)
-    BikerCocaine.Security.Set(BikerCocaine.Security.upgrade)
-    BikerCocaine.Details.Enable({BikerCocaine.Details.cokeBasic1, BikerCocaine.Details.cokeBasic2, BikerCocaine.Details.cokeBasic3}, true)
-
-end)
-
- function BagCoke()
-local ver = ""
-	local animDict, animName = "anim@amb@business@meth@meth_smash_weight_check@", "break_weigh_"..ver.."char01"
-	lib.requestAnimDict(animDict, 500)
-	local animDuration = GetAnimDuration(animDict, animName) * 1000
-	local ped = PlayerPedId()
-	local coords = GetEntityCoords(ped)
-	local scenePos, sceneRot = vector3(1090.62+4.3, -3196.2+3, -38.99-1), vector3(360.0, 360.0, 180.08)
-	local scenes = {
-	{
-		{
-			hash = `bkr_prop_coke_cutblock_01`,
-			animName = "break_weigh_"..ver.."box01"
-		},
-		{
-			hash = `bkr_prop_coke_fullmetalbowl_02`,
-			animName = "break_weigh_"..ver.."box01^1"
-		},
-		{
-			hash = `bkr_prop_coke_cutblock_01`,
-			animName = "break_weigh_"..ver.."methbag01"
-		}
-	},
-	{
-		{
-			hash = `xm3_prop_xm3_bag_coke_01a`,
-			animName = "break_weigh_"..ver.."methbag01^1"
-		},
-		{
-			hash = `xm3_prop_xm3_bag_coke_01a`,
-			animName = "break_weigh_"..ver.."methbag01^2"
-		},
-		{
-			hash = `xm3_prop_xm3_bag_coke_01a`,
-			animName = "break_weigh_"..ver.."methbag01^3"
-		}
-	},
-	{
-		{
-			hash = `bkr_prop_coke_fullscoop_01a`,
-			animName = "break_weigh_"..ver.."scoop"
-		},
-		{
-			hash = `bkr_prop_coke_scale_01`,
-			animName = "break_weigh_"..ver.."scale"
-		},
-		{
-			hash = `bkr_prop_fakeid_penclipboard`,
-			animName = "break_weigh_"..ver.."pen"
-		}
-	},
-	{
-		{
-			hash = `bkr_prop_fakeid_clipboard_01a`,
-			animName = "break_weigh_"..ver.."clipboard"
-		},
-		
-	}
-}
-local scenesList, entitiesList = {}, {}
-for i=1, #scenes, 1 do
-	local scene = NetworkCreateSynchronisedScene(scenePos, sceneRot, 2, false, false, 1065353216, 0, 1.3)
-	NetworkAddPedToSynchronisedScene(ped, scene, animDict, animName, 1.5, -4.0, 1, 16, 1148846080, 0)
-	for j=1, #scenes[i], 1 do
-		local s = scenes[i][j]
-		RequestModel(s.hash)
-		while not HasModelLoaded(s.hash) do
-		Wait(0)
-		end
-		local obj = CreateObjectNoOffset(s.hash, coords, true, true, true)
-		SetModelAsNoLongerNeeded(s.hash)
-		entitiesList[#entitiesList+1] = obj
-		NetworkAddEntityToSynchronisedScene(obj, scene, animDict, s.animName, 4.0, -8.0, 1)
-	end
-	scenesList[#scenesList+1] = scene
-end
-DisableCamCollisionForEntity(ped)
-FreezeEntityPosition(ped, true)
-for i=1, #scenesList, 1 do
-	NetworkStartSynchronisedScene(scenesList[i])
-end
-
-Wait(animDuration-11000)
--- Citizen.Wait(45000)
-for i=1, #scenesList, 1 do
-	NetworkStopSynchronisedScene(scenesList[i])
-end
-for i=1, #entitiesList, 1 do
-	DeleteEntity(entitiesList[i])
-end
-RemoveAnimDict(animDict)
-FreezeEntityPosition(ped, false)
-end
-
-function EcstasyEffect()
-    local startStamina = 50
-    SetFlash(0, 0, 500, 20000, 500)
-    while startStamina > 0 do
-        Wait(1000)
-        startStamina = startStamina - 1
-        RestorePlayerStamina(PlayerId(), 1.0)
-        if math.random(1, 100) < 51 then
-            SetFlash(0, 0, 500, 7000, 500)
-            ShakeGameplayCam('SMALL_EXPLOSION_SHAKE', 0.08)
-        end
-    end
-    if IsPedRunning(PlayerPedId()) then
-        SetPedToRagdoll(PlayerPedId(), math.random(1000, 3000), math.random(1000, 3000), 3, 0, 0, 0)
-    end
-
-    startStamina = 0
-end
-
-
-function MethBagEffect()
-    local startStamina = 30
-    TrevorEffect()
-    SetRunSprintMultiplierForPlayer(PlayerId(), 1.49)
-    while startStamina > 0 do
-        Wait(1000)
-        if math.random(5, 100) < 10 then
-            RestorePlayerStamina(PlayerId(), 1.0)
-        end
-        startStamina = startStamina - 1
-        if math.random(5, 100) < 51 then
-            TrevorEffect()
-        end
-    end
-    startStamina = 0
-    SetRunSprintMultiplierForPlayer(PlayerId(), 1.0)
-end
-
-function TrevorEffect()
-    StartScreenEffect("DrugsTrevorClownsFightIn", 3.0, 0)
-    Wait(3000)
-    StartScreenEffect("DrugsTrevorClownsFight", 3.0, 0)
-    Wait(3000)
-	StartScreenEffect("DrugsTrevorClownsFightOut", 3.0, 0)
-	StopScreenEffect("DrugsTrevorClownsFight")
-	StopScreenEffect("DrugsTrevorClownsFightIn")
-	StopScreenEffect("DrugsTrevorClownsFightOut")
-end
-
-
-function CokeBaggyEffect()
-    local startStamina = 20
-    local ped = PlayerPedId()
-    AlienEffect()
-    SetRunSprintMultiplierForPlayer(PlayerId(), 1.1)
-    while startStamina > 0 do
-        Wait(1000)
-        if math.random(1, 100) < 20 then
-            RestorePlayerStamina(PlayerId(), 1.0)
-        end
-        startStamina = startStamina - 1
-        if math.random(1, 100) < 10 and IsPedRunning(ped) then
-            SetPedToRagdoll(ped, math.random(1000, 3000), math.random(1000, 3000), 3, 0, 0, 0)
-        end
-        if math.random(1, 300) < 10 then
-            AlienEffect()
-            Wait(math.random(3000, 6000))
-        end
-    end
-    if IsPedRunning(ped) then
-        SetPedToRagdoll(ped, math.random(1000, 3000), math.random(1000, 3000), 3, 0, 0, 0)
-    end
-
-    startStamina = 0
-    SetRunSprintMultiplierForPlayer(PlayerId(), 1.0)
-end
-
-function AlienEffect()
-    StartScreenEffect("DrugsMichaelAliensFightIn", 3.0, 0)
-    Wait(math.random(5000, 8000))
-    StartScreenEffect("DrugsMichaelAliensFight", 3.0, 0)
-    Wait(math.random(5000, 8000))
-    StartScreenEffect("DrugsMichaelAliensFightOut", 3.0, 0)
-    StopScreenEffect("DrugsMichaelAliensFightIn")
-    StopScreenEffect("DrugsMichaelAliensFight")
-    StopScreenEffect("DrugsMichaelAliensFightOut")
-end
-
-function SpawnCarPedChase()
-local ped = GetEntityCoords(PlayerPedId())
-local stoploc = vector3(-1157.63, -3056.71, 13.94)
-local start = Config.StartLoc[math.random(1,#Config.StartLoc)]
-if started then  --  checks if active
-else
-    started = true
-    lib.requestModel(`pounder`, Config.RequestModelTime)
-    lib.requestModel("ig_priest", Config.RequestModelTime)
-    lib.requestModel(`cargobob3`, Config.RequestModelTime)
-   local leancar = CreateVehicle(`pounder`, start.x+3, start.y-2, start.z-1, 52.0, true, true)
-   local driver = CreatePed(26, "ig_priest", start.x, start.y, start.z, 268.9422, true, false)
-   local pilot2 = CreatePed(26, "ig_priest", stoploc.x-3, stoploc.y-3, stoploc.z-1, 268.9422, true, false)
-	FreezeEntityPosition(pilot2, true)
-	SetEntityInvincible(pilot2, true)
-    SetEntityAsMissionEntity(leancar)
-    AddBlipForEntity(leancar)
-    SetPedIntoVehicle(driver, leancar, -1)
-    SetPedFleeAttributes(driver,false)
-    TaskVehicleDriveToCoordLongrange(driver, leancar, stoploc.x, stoploc.y, stoploc.z-1, 50.0, 524288, 25.0)
-    SetPedKeepTask(driver, true) -- everything above is ped/ veh spawn
-	repeat -- repeats Wait(1000) only until 
-		Wait(1000)
-	until #(GetEntityCoords(driver) - stoploc) < 20.0 or GetEntityHealth(driver) == 0 -- either the distance is within 20 OR the driver is dead
-	if GetEntityHealth(driver) == 0 then  -- once one of those thing ends, the loop breaks and carries on from here
-		if Config.oxtarget then 
-			local options = {
-				{
-					name = 'leancar',
-					icon = 'fa-solid fa-car',
-					label = 'Steal From Car',
-					onSelect = function()
-						 if not minigame(2,8) then return end
-						TriggerServerEvent('md-drugs:server:givelean')
-						started = nil
-						if math.random(1,100) <= 30 then
-							DeleteVehicle(leancar)
-							DeleteEntity(driver)
-							DeleteEntity(pilot2)
-						 end    
-					end,		
-				}
-			}                
-			exports.ox_target:addLocalEntity(leancar, options)
-		else	
-			exports['qb-target']:AddTargetEntity(leancar, {
-    		options = {
-    		       {
-    		           name = 'leancar',
-    		           icon = 'fa-solid fa-car',
-    		           label = 'Steal From Car',
-    		           action = function()
-							if not minigame(2,8) then return end
-    		               TriggerServerEvent('md-drugs:server:givelean')
-    		               started = nil
-    		               if math.random(1,100) <= 30 then
-    		                   DeleteVehicle(leancar)
-    		                   DeleteEntity(driver)
-    		                   DeleteEntity(pilot2)
-    		                end    
-    		           end,		
-    		       }
-    		   }                
-    		})
-		end
-	else
-		repeat -- this second loop is to spawn the helicopter when the truck is in distance 
-			Wait(1000)
-		until #(GetEntityCoords(driver) - GetEntityCoords(pilot2)) < 25.0
-        Wait( 3 * 1000)
-        local heli = CreateVehicle(`cargobob3`, stoploc.x-20, stoploc.y-20, stoploc.z-1, 80, true,true) 
-        Wait(1000)
-        if DoesEntityExist(heli) then
-			SetEntityInvincible(pilot2, false)
-            DeleteVehicle(leancar)
-            DeleteEntity(driver)
-            SetEntityAsMissionEntity(heli)
-            SetPedIntoVehicle(pilot2, heli, -1)
-            TaskHeliMission(pilot2, heli, 0, 0, -3362.05, 589.45, -13.04, 4, 150.0, 20.0, -1.0, 10, 10, 5.0, 0)
-        else    
-        	heli = CreateVehicle(`cargobob3`, stoploc.x-20, stoploc.y-20, stoploc.z-1, 80, true,true) 
-        end  
-     end        
-end
-end
-
-function SpawnMethCarPedChase()
-local ped = GetEntityCoords(PlayerPedId())
-local stoploc = vector3(-1157.63, -3056.71, 13.94)
-local start = Config.StartLoc[math.random(1,#Config.StartLoc)]
-local startedmeth = false
-
-if startedmeth then 
-else
-    startedmeth = true
-    lib.requestModel(`journey`, Config.RequestModelTime)
-    lib.requestModel("a_m_m_hillbilly_02", Config.RequestModelTime)
-    lib.requestModel(`cargobob3`, Config.RequestModelTime)
-    local methcar = CreateVehicle(`journey`, start.x+3, start.y-2, start.z-1, 52.0, true, true)
-    local methdriver = CreatePed(26, "a_m_m_hillbilly_02", start.x, start.y, start.z, 268.9422, true, false)
-    local methpilot = CreatePed(26, "a_m_m_hillbilly_02", stoploc.x-3, stoploc.y-3, stoploc.z-1, 268.9422, true, false)
-	FreezeEntityPosition(methpilot, true)
-	SetEntityInvincible(methpilot, true)
-    SetEntityAsMissionEntity(methcar)
-    AddBlipForEntity(methcar)
-    SetPedIntoVehicle(methdriver, methcar, -1)
-    SetPedFleeAttributes(methdriver,false)
-    TaskVehicleDriveToCoordLongrange(methdriver, methcar, stoploc.x, stoploc.y, stoploc.z-1, 50.0, 524288, 25.0)
-    SetPedKeepTask(methdriver, true)
-	repeat 
-		Wait(1000)
-	until #(GetEntityCoords(methdriver) - stoploc) < 20.0 or GetEntityHealth(methdriver) == 0
-	if GetEntityHealth(methdriver) == 0 then 
-		if Config.oxtarget then 
-			local options = {
-				{
-					name = 'methcar',
-					icon = 'fa-solid fa-car',
-					label = 'Steal From Car',
-					onSelect = function()
-						 if not minigame(2,8) then return end
-						 TriggerServerEvent('md-drugs:server:givemethingridients')
-						 startedmeth = nil
-						if math.random(1,100) <= 30 then
-							DeleteVehicle(methcar)
-                            DeleteEntity(methdriver)
-                            DeleteEntity(methpilot)
-						 end    
-					end,		
-				}
-			}                
-			exports.ox_target:addLocalEntity(methcar, options)
-		else	
-			exports['qb-target']:AddTargetEntity(methcar, {
-    		options = {
-    		       {
-    		           name = 'methcar',
-    		           icon = 'fa-solid fa-car',
-    		           label = 'Steal From Car',
-    		           action = function()
-						if not minigame(2,8) then return end
-						TriggerServerEvent('md-drugs:server:givemethingridients')
-						startedmeth = nil
-					    if math.random(1,100) <= 30 then
-						   DeleteVehicle(methcar)
-						   DeleteEntity(methdriver)
-						   DeleteEntity(methpilot)
-						end    
-    		           end,		
-    		       }
-    		   }                
-    		})
-		end
-	else
-		repeat
-			Wait(1000)
-		until #(GetEntityCoords(methdriver) - GetEntityCoords(methpilot)) < 25.0
-        Wait( 3 * 1000)
-        local methheli = CreateVehicle(`cargobob3`, stoploc.x-20, stoploc.y-20, stoploc.z-1, 80, true,true) 
-        Wait(1000)
-        if DoesEntityExist(methheli) then
-			SetEntityInvincible(methpilot, false)
-			CreatePickUpRopeForCargobob(methheli, 1)
-            AttachVehicleToCargobob(methheli, methcar, GetEntityBoneIndexByName(methcar, 'bodyshell'), 0.0, 0.0, 0.0)
-            DeleteEntity(methdriver)
-            SetEntityAsMissionEntity(methheli)
-            SetPedIntoVehicle(methpilot, methheli, -1)
-            TaskHeliMission(methpilot, methheli, 0, 0, -3362.05, 589.45, -13.04, 4, 150.0, 20.0, -1.0, 10, 10, 5.0, 0)
-        else    
-        	methheli = CreateVehicle(`cargobob3`, stoploc.x-20, stoploc.y-20, stoploc.z-1, 80, true,true) 
-        end  
-    end        
-end
-end
-
-function SetUpPeds()
-local 	ped = GetEntityCoords(PlayerPedId())
-local	CokePed = CreatePed(0, "g_m_y_famdnf_01", ped.x+3, ped.y-5, ped.z-1, 90.0, true, true)
-local	CokePed2 = CreatePed(0,"g_m_y_famdnf_01", ped.x+6, ped.y-10, ped.z-1, 90.0, true, true)
-local	CokePed3 = CreatePed(0,"g_m_y_famdnf_01", ped.x+-2, ped.y+5, ped.z-1, 90.0, true, true)
-local	CokePed4 = CreatePed(0,"g_m_y_famdnf_01", ped.x+8, ped.y-12, ped.z-1, 90.0, true, true)
-local	CokePed5 = CreatePed(0,"g_m_y_famdnf_01", ped.x+5, ped.y-2, ped.z-1, 90.0, true, true)
-local	CokePed6 = CreatePed(0,"g_m_y_famdnf_01", ped.x+2, ped.y-20, ped.z-1, 90.0, true, true)
-local	CokePed7 = CreatePed(0,"g_m_y_famdnf_01", ped.x+1, ped.y-10, ped.z-1, 90.0, true, true)
-AddRelationshipGroup('setups')
-local peds = {CokePed, CokePed2,CokePed3, CokePed4, CokePed5,CokePed6, CokePed7}
-for k, v in pairs (ped) do 
-	SetPedRelationshipGroupDefaultHash(v, 'setups')
-end
-SetPedArmour(CokePed, 200)
-SetPedCanSwitchWeapon(CokePed, true)
-GiveWeaponToPed(CokePed, "weapon_pistol", 1, false, true)
-TaskCombatPed(CokePed, PlayerPedId(), 0, 16)
-GiveWeaponToPed(CokePed2, "weapon_pistol", 1, false, true)
-TaskCombatPed(CokePed2, PlayerPedId(), 0, 16)
-GiveWeaponToPed(CokePed3, "weapon_pistol", 1, false, true)
-TaskCombatPed(CokePed3, PlayerPedId(), 0, 16)
-GiveWeaponToPed(CokePed4, "weapon_pistol", 1, false, true)
-TaskCombatPed(CokePed4, PlayerPedId(), 0, 16)
-GiveWeaponToPed(CokePed5, "weapon_pistol", 1, false, true)
-TaskCombatPed(CokePed5, PlayerPedId(), 0, 16)
-GiveWeaponToPed(CokePed6, "weapon_pistol", 1, false, true)
-TaskCombatPed(CokePed6, PlayerPedId(), 0, 16)
-GiveWeaponToPed(CokePed7, "weapon_pistol", 1, false, true)
-TaskCombatPed(CokePed7, PlayerPedId(), 0, 16)
-SetPedCombatAttributes(CokePed, 46, true)
-SetPedCombatAttributes(CokePed2, 46, true)
-SetPedCombatAttributes(CokePed3, 46, true)
-SetPedCombatAttributes(CokePed4, 46, true)
-SetPedCombatAttributes(CokePed5, 46, true)
-SetPedCombatAttributes(CokePed6, 46, true)
-SetPedCombatAttributes(CokePed7, 46, true)
-end
-
-RegisterCommand('DrugRep', function()
-	if not Config.TierSystem then return end
-	lib.registerContext({
-		id = 'DrugRep',
-		title = 'Drug Reputation',
-		options = {
-		  {icon = "fa-solid fa-face-flushed", title = 'Cocaine: '..QBCore.Functions.GetPlayerData().metadata.coke},
-		  {icon = "fa-solid fa-syringe", title = 'Heroin: '..QBCore.Functions.GetPlayerData().metadata.heroin},
-		  {icon = "fa-solid fa-vial", title = 'LSD: '..QBCore.Functions.GetPlayerData().metadata.lsd},
-		  {icon = "fa-solid fa-plug", title = 'Dealer: '..QBCore.Functions.GetPlayerData().metadata.dealerrep},
-		}
-	  })
-	  lib.showContext('DrugRep')
-end, false)

client/cocaine.lua

@@ -1,186 +1,210 @@
-local QBCore = exports['qb-core']:GetCoreObject()
-local CocaPlant = {}
 local cuttingcoke = nil
 local baggingcoke = nil
+local locations = Config.Cocaine.Locations
 
-local function pick(loc)
-if not progressbar(Lang.Coke.picking, 4000, 'uncuff') then return end
-TriggerServerEvent("coke:pickupCane", loc)  
-return true 
+local function CutCoke(coords, offset, rotation)
+	cuttingcoke = true
+	local animDict, animName = "anim@amb@business@coc@coc_unpack_cut_left@", "coke_cut_v5_coccutter"
+	Bridge.Anim.RequestDict(animDict, 500)
+	local animDuration = GetAnimDuration(animDict, animName) * 1000
+	local ped = PlayerPedId()
+	local scenePos, sceneRot = vector3(coords.x + offset.x, coords.y + offset.y,coords.z + offset.z), rotation
+	local scenes = {
+	{
+		{	hash = "bkr_prop_coke_bakingsoda_o",	animName = "coke_cut_v5_bakingsoda"},
+		{	hash = "prop_cs_credit_card",	animName = "coke_cut_v5_creditcard"},
+		{	hash = "prop_cs_credit_card",	animName = "coke_cut_v5_creditcard^1"}
+	},
+}
+	local scenesList, entitiesList = {}, {}
+	for i=1, #scenes, 1 do
+		local scene = NetworkCreateSynchronisedScene(scenePos, sceneRot, 2, false, false, 1065353216, 0, 1.3)
+		NetworkAddPedToSynchronisedScene(ped, scene, animDict, animName, 1.5, -4.0, 1, 16, 1148846080, 0)
+		for j=1, #scenes[i], 1 do
+			local s = scenes[i][j]
+			RequestModel(s.hash)
+			while not HasModelLoaded(s.hash) do
+				Wait(0)
+			end
+			local obj = CreateObjectNoOffset(s.hash, coords, true, true, true)
+			SetModelAsNoLongerNeeded(s.hash)
+			entitiesList[#entitiesList+1] = obj
+			NetworkAddEntityToSynchronisedScene(obj, scene, animDict, s.animName, 4.0, -8.0, 1)
+		end
+		scenesList[#scenesList+1] = scene
+	end
+	DisableCamCollisionForEntity(ped)
+	FreezeEntityPosition(ped, true)
+	for i=1, #scenesList, 1 do
+		NetworkStartSynchronisedScene(scenesList[i])
+	end
+
+	Wait(animDuration-11000)
+	for i=1, #scenesList, 1 do
+		NetworkStopSynchronisedScene(scenesList[i])
+	end
+	for i=1, #entitiesList, 1 do
+		DeleteEntity(entitiesList[i])
+	end
+	RemoveAnimDict(animDict)
+	FreezeEntityPosition(ped, false)
+	cuttingcoke = nil
 end
 
-RegisterNetEvent('coke:respawnCane', function(loc)
-    local v = GlobalState.CocaPlant[loc]
-    local hash = GetHashKey(v.model)
-    if not CocaPlant[loc] then
-        CocaPlant[loc] = CreateObject(hash, v.location, false, true, true)
-       Freeze(CocaPlant[loc], true, v.heading)
-        local options = { 
-                {
-                    icon = "fas fa-hand",
-                    label = "pick Cocaine",
-                    action = function()
-                        if not pick(loc) then return end
-                    end
-                }
-            }
-        local optionsox = {
-                {
-                    icon = "fas fa-hand",
-                    label = "pick Cocaine",
-                    distance = 2.5,
-                    onSelect = function()
-                        if not pick(loc) then return end
-                    end
-                }
-            }
-        if Config.oxtarget then
-            exports.ox_target:addLocalEntity(CocaPlant[loc], optionsox)
-        else
-            exports['qb-target']:AddTargetEntity(CocaPlant[loc], {options = options, distance = 2.5})
-        end
+local function BagCoke(coords, offset, rotation)
+baggingcoke = true
+    local ver = ""
+	local animDict, animName = "anim@amb@business@meth@meth_smash_weight_check@", "break_weigh_"..ver.."char01"
+	Bridge.Anim.RequestDict(animDict, 500)
+	local animDuration = GetAnimDuration(animDict, animName) * 1000
+	local ped = PlayerPedId()
+	local scenePos, sceneRot = vector3(coords.x + offset.x, coords.y + offset.y,coords.z + offset.z +0.03), rotation
+	local scenes = {
+    	{
+    		{	hash = "bkr_prop_coke_cutblock_01",	animName = "break_weigh_"..ver.."box01"},
+    		{	hash = "bkr_prop_coke_fullmetalbowl_02",	animName = "break_weigh_"..ver.."box01^1"},
+    		{	hash = "bkr_prop_coke_cutblock_01",	animName = "break_weigh_"..ver.."methbag01"}
+    	},
+    	{
+    		{	hash = "xm3_prop_xm3_bag_coke_01a",	animName = "break_weigh_"..ver.."methbag01^1"},
+    		{	hash = "xm3_prop_xm3_bag_coke_01a",	animName = "break_weigh_"..ver.."methbag01^2"},
+    		{	hash = "xm3_prop_xm3_bag_coke_01a",	animName = "break_weigh_"..ver.."methbag01^3"}
+    	},
+    	{
+    		{	hash = "bkr_prop_coke_fullscoop_01a",	animName = "break_weigh_"..ver.."scoop"},
+    		{	hash = "bkr_prop_coke_scale_01",	animName = "break_weigh_"..ver.."scale"},
+    		{	hash = "bkr_prop_fakeid_penclipboard",	animName = "break_weigh_"..ver.."pen"}
+    	},
+    	{
+    		{	hash = "bkr_prop_fakeid_clipboard_01a",	animName = "break_weigh_"..ver.."clipboard"},
+    	}
+    }
+    local scenesList, entitiesList = {}, {}
+    for i=1, #scenes, 1 do
+    	local scene = NetworkCreateSynchronisedScene(scenePos, sceneRot, 2, false, false, 1065353216, 0, 1.3)
+    	NetworkAddPedToSynchronisedScene(ped, scene, animDict, animName, 1.5, -4.0, 1, 16, 1148846080, 0)
+    	for j=1, #scenes[i], 1 do
+    		local s = scenes[i][j]
+    		RequestModel(s.hash)
+    		while not HasModelLoaded(s.hash) do
+    		Wait(0)
+    		end
+    		local obj = CreateObjectNoOffset(s.hash, coords, true, true, true)
+    		SetModelAsNoLongerNeeded(s.hash)
+    		entitiesList[#entitiesList+1] = obj
+    		NetworkAddEntityToSynchronisedScene(obj, scene, animDict, s.animName, 4.0, -8.0, 1)
+    	end
+    	scenesList[#scenesList+1] = scene
     end
-end)
-
-RegisterNetEvent('coke:removeCane', function(loc)
-    if DoesEntityExist(CocaPlant[loc]) then DeleteEntity(CocaPlant[loc]) end
-    CocaPlant[loc] = nil
-end)
-
-RegisterNetEvent("coke:init", function()
-    for k, v in pairs (GlobalState.CocaPlant) do
-        local hash = GetHashKey(v.model)
-        if not HasModelLoaded(hash) then LoadModel(hash) end
-        if not v.taken then
-            CocaPlant[k] = CreateObject(hash, v.location.x, v.location.y, v.location.z, false, true, true)
-            Freeze(CocaPlant[k], true, v.heading)
-            local options = { 
-                {
-                    icon = "fas fa-hand",
-                    label = "pick Cocaine",
-                    action = function()
-                        if not pick(k) then return end
-                    end
-                }
-            }
-        local optionsox = {
-                {
-                    icon = "fas fa-hand",
-                    label = "pick Cocaine",
-                    distance = 2.5,
-                    onSelect = function()
-                        if not pick(k) then return end
-                    end
-                }
-            }
-        if Config.oxtarget then
-            exports.ox_target:addLocalEntity(CocaPlant[k], optionsox)
-        else
-            exports['qb-target']:AddTargetEntity(CocaPlant[k], {options = options, distance = 2.5})
-        end
+    DisableCamCollisionForEntity(ped)
+    FreezeEntityPosition(ped, true)
+    for i=1, #scenesList, 1 do
+    	NetworkStartSynchronisedScene(scenesList[i])
     end
-    end
-end)
 
-AddEventHandler('onResourceStart', function(resource)
-    if resource == GetCurrentResourceName() then
-        LoadModel('prop_plant_01a')
-        TriggerEvent('coke:init')
+    Wait(animDuration-11000)
+    for i=1, #scenesList, 1 do
+    	NetworkStopSynchronisedScene(scenesList[i])
     end
- end)
- RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function()
-     Wait(3000)
-     LoadModel('prop_plant_01a')
-     TriggerEvent('coke:init')
- end)
- 
-AddEventHandler('onResourceStop', function(resourceName)
-    if GetCurrentResourceName() == resourceName then
-        SetModelAsNoLongerNeeded(GetHashKey('prop_plant_01a'))
-        for k, v in pairs(CocaPlant) do
-            if DoesEntityExist(v) then
-                DeleteEntity(v) SetEntityAsNoLongerNeeded(v)
-            end
-        end
+    for i=1, #entitiesList, 1 do
+    	DeleteEntity(entitiesList[i])
     end
-end)
-
-RegisterNetEvent("md-drugs:client:makepowder", function(data)
-    if not ItemCheck('coca_leaf') then return end
-    if not progressbar(Lang.Coke.makepow, 4000, 'uncuff') then return end
-	TriggerServerEvent("md-drugs:server:makepowder", data.data)
-end)
-
-RegisterNetEvent("md-drugs:client:cutcokeone", function()
-    if not ItemCheck('bakingsoda') then return end
-	cuttingcoke = true
-    if Config.FancyCokeAnims then
-	    CutCoke()
-    else
-         if not progressbar(Lang.Coke.cutting, 5000, 'uncuff') then cuttingcoke = nil return end
-    end
-	TriggerServerEvent("md-drugs:server:cutcokeone")
-	cuttingcoke = nil
-end)
-
-RegisterNetEvent("md-drugs:client:bagcoke", function() 
-    if not ItemCheck('empty_weed_bag') then return end
-	baggingcoke = true
-    if Config.FancyCokeAnims then
-	    BagCoke()
-    else
-        if not progressbar(Lang.Coke.bagging, 5000, 'uncuff') then baggingcoke = nil return end
-    end      
-	TriggerServerEvent("md-drugs:server:bagcoke")
+    RemoveAnimDict(animDict)
+    FreezeEntityPosition(ped, false)
 	baggingcoke = nil
-   
-end)
+end
+
+for k, v in pairs (locations.MakePowder) do
+    Bridge.Target.AddBoxZone('cocaplant'..k, v.loc, v.size, v.loc.w or 180.0, {
+        {
+            label = Bridge.Language.Locale('coke.targetMakePow'),
+            icon = Bridge.Language.Locale('coke.targetMakePowIcon'),
+            action = function()
+                if not itemCheck('coca_leaf') then return end
+                if not progressbar(Bridge.Language.Locale('coke.makePow')) then return end
+	            TriggerServerEvent("md-drugs:server:makepowder", k)
+            end,
+            canInteract = function()
+                return handleGang(v.gang)
+            end
+        }
+    })
+	targets[#targets+1] = 'cocaplant'..k
+end
+
+for k, v in pairs (locations.CuttingCoke) do
+    Bridge.Target.AddBoxZone('cutcoke'..k,  v.loc, v.size, v.loc.w or 180.0,  {
+        {
+            label = Bridge.Language.Locale('coke.targetCutCoke'),
+            icon = Bridge.Language.Locale('coke.targetCutCokeIcon'),
+            action = function()
+                if not itemCheck('bakingsoda') then return end
+                CutCoke(v.loc, v.offset, v.rotation)
+				TriggerServerEvent("md-drugs:server:cutcokeone", k)
+            end,
+            canInteract = function()
+                if not handleGang(v.gang) then return false end
+                if cuttingcoke ~= nil or baggingcoke ~= nil then return false end
+                return true
+            end,
+        }
+    })
+	targets[#targets+1] = 'cutcoke'..k
+end
+
+for k, v in pairs (locations.BaggingCoke) do
+    Bridge.Target.AddBoxZone('bagcoke'..k, v.loc, v.size, v.loc.w or 180.0, {
+        {
+            label = Bridge.Language.Locale('coke.targetBagCoke'),
+            icon = Bridge.Language.Locale('coke.targetBagCokeIcon'),
+            action = function()
+                if not itemCheck('empty_weed_bag') then return end
+                BagCoke(v.loc, v.offset, v.rotation)
+				TriggerServerEvent("md-drugs:server:bagcoke", k)
+            end,
+            canInteract = function()
+                if not handleGang(v.gang) then return false end
+                if cuttingcoke ~= nil or baggingcoke ~= nil then return false end
+                return true
+            end
+        }
+    })
+	targets[#targets+1] = 'bagcoke'..k
+end
+
+for k, v in pairs (locations.cokeTele) do
+	Bridge.Target.AddBoxZone('coke_tele'..k, v.inside, v.size, v.inside.w or 180.0,{
+		{
+			icon = Bridge.Language.Locale('coke.teleOutIcon'),
+			label = Bridge.Language.Locale('coke.teleOut'),
+			action = function()
+				SetEntityCoords(PlayerPedId(), v.outside)
+			end,
+			canInteract = function()
+                return handleGang(v.gang)
+            end
+		}
+	})
+	targets[#targets+1] = 'coke_tele'..k
+	Bridge.Target.AddBoxZone('coke_teleout'..k, v.outside, v.size, v.outside.w or 180.0,{
+		{
+			icon = Bridge.Language.Locale('coke.teleInIcon'),
+			label = Bridge.Language.Locale('coke.teleIn'),
+			action = function()
+				SetEntityCoords(PlayerPedId(), v.inside)
+			end,
+			canInteract = function()
+                return handleGang(v.gang)
+            end
+		}
+	})
+	targets[#targets+1] = 'coke_teleout'..k
+end
 
 CreateThread(function()
-	local options = {
-		{ type = "client", event = "md-drugs:client:cutcokeone", icon = "fas fa-sign-in-alt", label = "cut up", canInteract = function()
-				if cuttingcoke == nil and baggingcoke == nil then return true end
-			end			
-		},
-	}
-    local options2 = {
-		{ type = "client", event = "md-drugs:client:bagcoke", icon = "fas fa-sign-in-alt", label = "bagging", canInteract = function()
-				if baggingcoke == nil and cuttingcoke == nil then return true end end }, }
-    if Config.oxtarget then
-        exports.ox_target:addBoxZone({coords = vector3(1093.17, -3195.74, -39.19 -1), size = vec3(1,1,1), options = options})
-        exports.ox_target:addBoxZone({coords = vector3(1093.17, -3195.74, -39.19 -1), size = vec3(1,1,1), options = options2})
-    else
-        exports['qb-target']:AddBoxZone("cutcokepowder",vector3(1093.17, -3195.74, -39.19 -1),1.5, 1.75, {name = "cutcokepowder", minZ = -40.0,maxZ = -38.0,}, { options = options, distance = 2.0 })
-	    exports['qb-target']:AddBoxZone("bagcokepowder",vector3(1090.29, -3195.66, -39.13 - 1),1.5, 1.75, {name = "bagcokepowder", minZ = -40, maxZ = -38,}, {options = options2, distance = 2.0})
-    end
-    if Config.FancyCokeAnims == false then 
-        for k, v in pairs (Config.CuttingCoke) do 
-            if v.gang == nil or v.gang == '' or v.gang == "" then v.gang = 1 end
-             local options = {
-                {	type = "client",	event = "md-drugs:client:cutcokeone",	icon = "fas fa-sign-in-alt",	label = "Cut Coke", data = k,  distance = 2.0,
-                    canInteract = function()
-                        if QBCore.Functions.GetPlayerData().gang.name == v.gang or v.gang == 1 then return true end end
-                },
-            }
-            if Config.oxtarget then
-                exports.ox_target:addBoxZone({coords = v.loc, size = vec3(1,1,1),debugPoly = false,rotation = v.rot, options = options,})
-            else
-                exports['qb-target']:AddBoxZone("cutcoke"..k ,vector3(v.loc.x, v.loc.y, v.loc.z), v.l, v.w, {name ="cutcoke"..k, heading = 156.0,minZ = v.loc.z-1, maxZ = v.loc.z+1, }, {options = options, distance = 1.5})
-            end
-        end
-        for k, v in pairs (Config.BaggingCoke) do 
-            if v.gang == nil or v.gang == '' or v.gang == "" then v.gang = 1 end
-             local options = {
-                {	type = "client",	event = "md-drugs:client:bagcoke",	icon = "fas fa-sign-in-alt",	label = "Bag Coke", data = k,  distance = 2.0,
-                    canInteract = function()
-                        if QBCore.Functions.GetPlayerData().gang.name == v.gang or v.gang == 1 then return true end end
-                },
-            }
-            if Config.oxtarget then
-                exports.ox_target:addBoxZone({coords = v.loc, size = vec3(1,1,1),debugPoly = false,rotation = v.rot, options = options,})
-            else
-                exports['qb-target']:AddBoxZone("bagcoke"..k ,vector3(v.loc.x, v.loc.y, v.loc.z), v.l, v.w, {name ="bagcoke"..k, heading = 156.0,minZ = v.loc.z-1, maxZ = v.loc.z+1, }, {options = options, distance = 1.5})
-            end
-        end
-    end
+	BikerCocaine = exports['bob74_ipl']:GetBikerCocaineObject()
+    BikerCocaine.Style.Set(BikerCocaine.Style.upgrade)
+    BikerCocaine.Security.Set(BikerCocaine.Security.upgrade)
+    BikerCocaine.Details.Enable({BikerCocaine.Details.cokeBasic1, BikerCocaine.Details.cokeBasic2, BikerCocaine.Details.cokeBasic3}, true)
 end)
+

client/consumables.lua

@@ -1,17 +1,146 @@
-local QBCore = exports['qb-core']:GetCoreObject()
+if not Config.Drugs['consumables'] then return end
 
-RegisterNetEvent('md-drugs:client:consumedrugs', function(time, effect, anim, progresstext, status, statval, item)
-	if not progressbar(progresstext .. GetLabel(item).. "!", time, anim ) then return end
-	TriggerServerEvent('md-drugs:server:removeconsum', item)
-	if status == "armor" then 
-		TriggerServerEvent('hospital:server:SetArmor', statval)
-       	TriggerServerEvent('consumables:server:useArmor')
-       	SetPedArmour(PlayerPedId(), statval)
-	else	
-		TriggerServerEvent('md-drugs:server:updatestatus', status, statval)	
+Bridge.Callback.Register('md-drugs:client:consumedrugs', function(time, effect, anim, progresstext, status, item)
+    Bridge.Anim.RequestDict(anim.dict)
+	if not progressbar(progresstext .. Bridge.Inventory.GetItemInfo(item).label.. "!", time, anim ) then return end
+	for k, v in pairs (status) do
+		if k == 'health' then
+			local cur = GetEntityHealth(PlayerPedId())
+			SetEntityHealth(PlayerPedId(), cur + v)
+		elseif k == 'thirst' or k == 'stress' or k == 'hunger' then
+			TriggerServerEvent('md-drugs:server:updatestatus', k, v)
+		elseif k == "armor" then 
+			TriggerServerEvent('hospital:server:SetArmor', v)
+    	   	TriggerServerEvent('consumables:server:useArmor')
+    	   	SetPedArmour(PlayerPedId(), v)
+		elseif k == 'speed' then 
+			TriggerEvent('md-drugs:client:recievebuff', k, v)
+		elseif k == 'strength' then 
+			TriggerEvent('md-drugs:client:recievebuff', k, v)
+		end
 	end
 	TriggerEvent('evidence:client:SetStatus', 'widepupils', 200)
-	if effect == "alien" then AlienEffect() elseif effect == "ecstacy" then EcstasyEffect() elseif effect == "meth" then MethBagEffect() elseif effect == "coke" then CokeBaggyEffect() elseif effect == "trevor" then TrevorEffect() else end
-	if status == nil then return end
+	TriggerEvent('md-drugs:client:applyFeeling', effect)
+	return true
 end)
 
+RegisterNetEvent('md-drugs:client:recievebuff', function(type, amount)
+	if type == 'speed' then
+		local count = 0
+		SetRunSprintMultiplierForPlayer(PlayerPedId(), 1.49)
+		repeat 
+			count = count + 1
+			Wait(1000) 
+		until count == amount
+		SetRunSprintMultiplierForPlayer(PlayerPedId(), 1.00)
+	end
+	if type == 'strength' then
+		local strength = 0
+		SetCurrentPedWeapon(PlayerPedId(), 'weapon_unarmed', true)
+		SetWeaponDamageModifier(GetHashKey("WEAPON_UNARMED"), 50.0) 
+		repeat 
+			strength = strength + 1
+			Wait(1000)
+		until strength == amount
+		SetWeaponDamageModifier(GetHashKey("WEAPON_UNARMED"), 1.0) 
+	end
+end)
+
+local function EcstasyEffect()
+    local startStamina = 50
+    SetFlash(0, 0, 500, 20000, 500)
+    while startStamina > 0 do
+        Wait(1000)
+        startStamina = startStamina - 1
+        RestorePlayerStamina(PlayerId(), 1.0)
+        if math.random(1, 100) < 51 then
+            SetFlash(0, 0, 500, 7000, 500)
+            ShakeGameplayCam('SMALL_EXPLOSION_SHAKE', 0.08)
+        end
+    end
+    if IsPedRunning(PlayerPedId()) then
+        SetPedToRagdoll(PlayerPedId(), math.random(1000, 3000), math.random(1000, 3000), 3, 0, 0, 0)
+    end
+    startStamina = 0
+end
+
+local function TrevorEffect()
+    StartScreenEffect("DrugsTrevorClownsFightIn", 3.0, 0)
+    Wait(3000)
+    StartScreenEffect("DrugsTrevorClownsFight", 3.0, 0)
+    Wait(3000)
+	StartScreenEffect("DrugsTrevorClownsFightOut", 3.0, 0)
+	StopScreenEffect("DrugsTrevorClownsFight")
+	StopScreenEffect("DrugsTrevorClownsFightIn")
+	StopScreenEffect("DrugsTrevorClownsFightOut")
+end
+
+local function MethBagEffect()
+    local startStamina = 30
+    TrevorEffect()
+    SetRunSprintMultiplierForPlayer(PlayerId(), 1.49)
+    while startStamina > 0 do
+        Wait(1000)
+        if math.random(5, 100) < 10 then
+            RestorePlayerStamina(PlayerId(), 1.0)
+        end
+        startStamina = startStamina - 1
+        if math.random(5, 100) < 51 then
+            TrevorEffect()
+        end
+    end
+    startStamina = 0
+    SetRunSprintMultiplierForPlayer(PlayerId(), 1.0)
+end
+
+local function AlienEffect()
+    StartScreenEffect("DrugsMichaelAliensFightIn", 3.0, 0)
+    Wait(math.random(5000, 8000))
+    StartScreenEffect("DrugsMichaelAliensFight", 3.0, 0)
+    Wait(math.random(5000, 8000))
+    StartScreenEffect("DrugsMichaelAliensFightOut", 3.0, 0)
+    StopScreenEffect("DrugsMichaelAliensFightIn")
+    StopScreenEffect("DrugsMichaelAliensFight")
+    StopScreenEffect("DrugsMichaelAliensFightOut")
+end
+
+local function CokeBaggyEffect()
+    local startStamina = 20
+    local ped = PlayerPedId()
+    AlienEffect()
+    SetRunSprintMultiplierForPlayer(PlayerId(), 1.1)
+    while startStamina > 0 do
+        Wait(1000)
+        if math.random(1, 100) < 20 then
+            RestorePlayerStamina(PlayerId(), 1.0)
+        end
+        startStamina = startStamina - 1
+        if math.random(1, 100) < 10 and IsPedRunning(ped) then
+            SetPedToRagdoll(ped, math.random(1000, 3000), math.random(1000, 3000), 3, 0, 0, 0)
+        end
+        if math.random(1, 300) < 10 then
+            AlienEffect()
+            Wait(math.random(3000, 6000))
+        end
+    end
+    if IsPedRunning(ped) then
+        SetPedToRagdoll(ped, math.random(1000, 3000), math.random(1000, 3000), 3, 0, 0, 0)
+    end
+
+    startStamina = 0
+    SetRunSprintMultiplierForPlayer(PlayerId(), 1.0)
+end
+
+RegisterNetEvent('md-drugs:client:applyFeeling', function(effect)
+	if effect == "alien" then
+		AlienEffect()
+	elseif effect == "ecstacy" then
+		 EcstasyEffect()
+	elseif effect == "meth" then
+		MethBagEffect()
+	elseif effect == "coke" then
+		CokeBaggyEffect()
+	elseif effect == "trevor" then
+		TrevorEffect()
+	end
+end)

client/cornerselling.lua

@@ -1,145 +1,227 @@
-local QBCore = exports['qb-core']:GetCoreObject()
 local sell = false
+local inZone = false
+local buyers = {}
+
+local function walkAway(targ)
+    FreezeEntityPosition(targ, false)
+    ClearPedTasks(targ)
+end
+
+local function sellDrug(item, amount, price, targ)
+    PoliceCall(20)
+    if IsPedInAnyVehicle(PlayerPedId(), true) then
+        Bridge.Notify.SendNotify(Bridge.Language.Locale('Cornerselling.inVeh'), 'error')
+        walkAway(targ)
+        return
+    end
+
+    if not progressbar(Bridge.Language.Locale('Cornerselling.selling', Bridge.Inventory.GetItemInfo(item).label, price)) then
+        walkAway(targ)
+        return
+    end
+    buyers[targ] = 'sold'
+    TriggerServerEvent('md-drugs:server:sellCornerDrugs', item, amount, price, NetworkGetNetworkIdFromEntity(targ))
+    walkAway(targ)
+ end
+
+local function deny(targ)
+    PoliceCall(20)
+    buyers[targ] = 'sold'
+    if not progressbar(Bridge.Language.Locale('Cornerselling.deny'), 4000, {
+		dict = 'anim@amb@casino@brawl@fights@argue@',
+		clip = 'arguement_loop_mp_m_brawler_01',
+		flag = 49
+	}) then return end
+    walkAway(targ)
+end
+
+local function getClosestPed()
+    local coords = GetEntityCoords(PlayerPedId())
+    local distance = 10.0
+    local pedList = GetGamePool('CPed')
+    local closestDistance = 1000.0
+    local PED = nil
+    for i = 1, #pedList do
+        local ped = pedList[i]
+        if ped ~= PlayerPedId() then
+            local pedCoords = GetEntityCoords(ped)
+            local dist = #(coords - pedCoords)
+            if dist < closestDistance then
+                PED = ped
+                closestDistance = dist
+            end
+        end
+    end
+    if PED and closestDistance < distance then
+        return PED, closestDistance
+    else
+        return nil
+    end
+end
+
+local function findPed()
+    local targ = nil
+
+    repeat
+        Wait(100)
+        targ = getClosestPed()
+        if IsPedInAnyVehicle(targ, false) or GetEntityHealth(targ) == 0 or not IsPedHuman(targ) then
+            targ = nil
+        end
+        if buyers[targ] then
+            targ = nil
+        end
+        if inZone then
+            targ = nil
+        end
+    until targ ~= nil or sell == false
+
+    if not sell then return end
+    buyers[targ] = true
+
+    Bridge.HelpText.ShowHelpText(Bridge.Language.Locale('Cornerselling.wait'))
 
-function Cornersell()
-    local targ = lib.GetClosestPed(GetEntityCoords(PlayerPedId()), 8)
-    if targ == nil then return end
-    if IsPedInAnyVehicle(targ, false) or GetEntityHealth(targ) == 0 then return end
-    local sold = false
-    TaskGoToCoordAnyMeans(targ, GetEntityCoords(PlayerPedId()), 1.0, 0, 0, 0, 0)
     repeat
         Wait(1000)
-    until #(GetEntityCoords(PlayerPedId()) - GetEntityCoords(targ)) < 2.0
-    lib.requestAnimDict("rcmme_tracey1")
-    TaskStartScenarioInPlace(targ, "WORLD_HUMAN_STAND_IMPATIENT_UPRIGHT", 0, false)
-    FreezeEntityPosition(targ, true)
-    local item, amount = lib.callback.await('md-drugs:server:cornerselling:getAvailableDrugs', false)
-        if item == 'nothing' then Notify(' You Aint Got Shit', 'error') sell = false  FreezeEntityPosition(targ, false)  ClearPedTasks(targ) return false end
-            local bagAmount = math.random(1, amount)
-            if bagAmount > 15 then bagAmount = math.random(1,15) end
-            local table = QBConfig.DrugsPrice[item]
-            local price = math.random(table['min'], table['max'] ) * bagAmount
-            local targbusy = false
-            local options = {
-                { label = 'Sell ' .. bagAmount .. ' Of ' .. GetLabel(item) .. ' For $' .. price .. '!', icon = "fas fa-eye", 
-                    onSelect = function() 
-                        PoliceCall(20)
-                        targbusy = true
-                        if IsPedInAnyVehicle(PlayerPedId(), true) then 
-                            Notify('STRANGER DANGER, I WONT GET IN THE CAR WITH YOU', 'error') 
-                            FreezeEntityPosition(targ, false)
-                            ClearPedTasks(targ)
-                            Wait(10000)
-                            DeletePed(targ)
-                            targbusy = false
-                            sold = true
-                            sell = false
-                        return end
-                        if not progressbar('Selling ' .. GetLabel(item) .. '!', 4000, 'uncuff') then return end
-                        TriggerServerEvent('md-drugs:server:sellCornerDrugs', item, bagAmount, price)
-                        FreezeEntityPosition(targ, false)
-                        ClearPedTasks(targ)
-                        Wait(10000)
-                        DeletePed(targ)
-                        targbusy = false
-                        sold = true
-                        
-                    end,
+        TaskGoToCoordAnyMeans(targ, GetEntityCoords(PlayerPedId()), 1.0, 0, 0, 0, 0)
+    until #(GetEntityCoords(PlayerPedId()) - GetEntityCoords(targ)) < 2.0 or sell == false or inZone
+
+    if not sell then return end
+
+    TaskTurnPedToFaceEntity(targ, PlayerPedId(), -1)
+    Bridge.HelpText.HideHelpText()
+    CreateThread(function()
+        Wait(45000)
+        walkAway(targ)
+        buyers[targ] = 'sold'
+    end)
+    return targ
+end
+
+local function checkItems()
+    local has = false
+    for k, v in pairs (GlobalState.DrugNames) do
+        if Bridge.Inventory.HasItem(v) then
+            has = true
+            break
+        end
+    end
+    if not has then
+        Bridge.Notify.SendNotify(Bridge.Language.Locale('Cornerselling.nodrugs', 'error'))
+        return false
+    end
+    return true
+end
+
+local function Cornersell()
+    if inZone then sell = false return end
+
+    if not sell then
+        return
+    end
+
+    local hasDrugs = checkItems()
+    if not hasDrugs then
+        sell = false
+        return
+    end
+
+    Bridge.HelpText.ShowHelpText(Bridge.Language.Locale('Cornerselling.searching'))
+
+    local targ = findPed()
+    local data = Bridge.Callback.Trigger('md-drugs:server:cornerselling:getAvailableDrugs', NetworkGetNetworkIdFromEntity(targ))
+    if data == false then
+        sell = false
+        return
+    end
+
+    if data == 'robbed' then
+        TaskGoStraightToCoord(targ, -1858.232910, -1242.395630, 8.60510, 100.0, -1, 0.0, 0.0)
+        SetPedMoveRateOverride(targ, 10.0)
+        local got = false
+        Bridge.Target.AddLocalEntity(targ, {
+            {
+                label = Bridge.Language.Locale('Cornerselling.targetTakeBack'),
+                icon = Bridge.Language.Locale("Cornerselling.targetTakeBackIcon"),
+                action =   function()
+                    got = true
+                    TriggerServerEvent('md-drugs:server:getBackRobbed',  NetworkGetNetworkIdFromEntity(targ))
+                    Cornersell()
+                end,
                 canInteract = function()
-                    if not targbusy then return true end end,
-                 distance = 2.0
-                },
-                { label = 'Deny Price', icon = "fas fa-eye", 
-                    onSelect = function() 
-                        PoliceCall(20)
-                        targbusy = true
-                        if not progressbar('Telling This Dumbass To Leave!', 4000, 'argue5') then return end
-                        FreezeEntityPosition(targ, false)
-                        ClearPedTasks(targ)
-                        Wait(10000)
-                        DeletePed(targ)
-                        targbusy = false
-                        sold = true
-                    end,
+                    if IsEntityDead(targ) and not got then
+                        return true
+                    end
+                end,
+            }
+        })
+        targets[#targets+1] = targ
+    else
+        Bridge.Anim.RequestDict("rcmme_tracey1")
+        TaskStartScenarioInPlace(targ, "WORLD_HUMAN_STAND_IMPATIENT_UPRIGHT", 0, false)
+        FreezeEntityPosition(targ, true)
+        Bridge.Target.AddLocalEntity(targ, {
+            {
+                label = Bridge.Language.Locale('Cornerselling.targetSell', data.amount, Bridge.Inventory.GetItemInfo(data.item).label, data.price),
+                icon = Bridge.Language.Locale("Cornerselling.targetSellIcon"),
+                action =   function()
+                    sellDrug(data.item, data.amount, data.price, targ)
+                    Cornersell()
+                end,
                 canInteract = function()
-                    if not targbusy then return true end end,
-                 distance = 2.0
-                },
-            } 
-            local optionsqb = {
-                { label = 'Sell ' .. bagAmount .. ' Of ' .. GetLabel(item) .. ' For $' .. price .. '!', icon = "fas fa-eye", 
-                    action = function() 
-                        PoliceCall(20)
-                        targbusy = true
-                        if IsPedInAnyVehicle(PlayerPedId(), true) then 
-                            Notify('STRANGER DANGER, I WONT GET IN THE CAR WITH YOU', 'error') 
-                            FreezeEntityPosition(targ, false)
-                            ClearPedTasks(targ)
-                            Wait(10000)
-                            DeletePed(targ)
-                            targbusy = false
-                            sold = true
-                            sell = false
-                        return end
-                        if not progressbar('Selling ' .. GetLabel(item) .. '!', 4000, 'uncuff') then return end
-                        TriggerServerEvent('md-drugs:server:sellCornerDrugs', item, bagAmount, price)
-                        FreezeEntityPosition(targ, false)
-                        ClearPedTasks(targ)
-                        Wait(10000)
-                        DeletePed(targ)
-                        targbusy = false
-                        sold = true
-                        
-                    end,
+                    if buyers[targ] ~= 'sold' and sell then
+                        return true
+                    end
+                end,
+            },
+            {
+                label = Bridge.Language.Locale('Cornerselling.targetDeny'),
+                icon = Bridge.Language.Locale("Cornerselling.targetDenyIcon"),
+                action = function()
+                    deny(targ)
+                    walkAway(targ)
+                    Cornersell()
+                end,
                 canInteract = function()
-                    if not targbusy then return true end end,
-                 distance = 2.0
-                },
-                { label = 'Deny Price', icon = "fas fa-eye", 
-                action = function() 
-                        PoliceCall(20)
-                        targbusy = true
-                        if not progressbar('Telling This Dumbass To Leave!', 4000, 'argue5') then return end
-                        FreezeEntityPosition(targ, false)
-                        ClearPedTasks(targ)
-                        Wait(10000)
-                        DeletePed(targ)
-                        targbusy = false
-                        sold = true
-                    end,
-                canInteract = function()
-                    if not targbusy then return true end end,
-                 distance = 2.0
-                },
-            } 
-            if Config.oxtarget then
-                exports.ox_target:addLocalEntity(targ, options)
-            else
-	            exports['qb-target']:AddTargetEntity(targ, { options = optionsqb, distance = 2.0})
-            end  
-    repeat
-        Wait(1000)
-    until sold 
-    if sold then sold = false return true end
+                    if buyers[targ] == true and sell then
+                        return true
+                    end
+                end
+            }
+        })
+        targets[#targets+1] = targ
+    end
 end
 
 RegisterNetEvent('md-drugs:client:cornerselling', function()
-    if not GetCops(QBConfig.MinimumDrugSalePolice) then return end
-    local item, amount = lib.callback.await('md-drugs:server:cornerselling:getAvailableDrugs', false)
-    if item ~= 'nothing' then
-        if sell then 
-            Notify('Lazy Ass Cant Even Sell Drugs', 'error')
-            sell = false
-        else
-            sell = true
-            Notify('Go Make That Paper', 'success')
-            repeat
-                Wait(1000)
-               if not Cornersell() then end
-            until sell == false
-        end
+    if inZone then
+        Bridge.Notify.SendNotify(Bridge.Language.Locale('Cornerselling.inNoSellZone'), 'error')
+        return
+    end
+    if sell then
+        sell = false
+        Bridge.HelpText.HideHelpText()
+        Bridge.Notify.SendNotify(Bridge.Language.Locale('Cornerselling.stopped'), 'error')
     else
-        Notify('You Cant Sell Air', 'error')
+        sell = true
+        Bridge.Notify.SendNotify(Bridge.Language.Locale('Cornerselling.start'), 'success')
+        Cornersell()
     end
 end)
 
+CreateThread(function()
+    for k, v in pairs (Config.Cornerselling.noSellZones) do
+        Bridge.Point.Register(
+        'MDDRUGNOSELLZONE'..k,
+        v.loc,
+        ((v.width or 10.0) + (v.length or 10.0)) / 2,
+        nil,
+        function()
+           inZone = true
+        end,
+        function(point, data)
+           inZone = false
+        end
+    )
+    end
+end)

client/crack.lua

@@ -1,18 +1,43 @@
-local QBCore = exports['qb-core']:GetCoreObject()
+local locations = Config.Crack.Locations
 
+for k, v in pairs (locations.makecrack) do
+	Bridge.Target.AddBoxZone('makeCrack'..k,  v.loc, v.size, v.loc.w or 180.0, {
+		{
+			label = Bridge.Language.Locale('crack.targetMake'),
+			icon = Bridge.Language.Locale('crack.makeIcon'),
+			action = function()
+				if not itemCheck('bakingsoda') then return end
+				if not minigame() then
+					TriggerServerEvent("md-drugs:server:failcrackone", k)
+					return
+				end
+				if not progressbar(Bridge.Language.Locale('crack.cook')) then return end
+				TriggerServerEvent('md-drugs:server:makecrackone', k)
+			end,
+			canInteract = function()
+				if not handleGang(v.gang) then return false end
+				return true
+			end
+		}
+	})
+	targets[#targets+1] = 'makeCrack'..k
+end
 
-RegisterNetEvent("md-drugs:client:makecrackone", function(data)
-	if not ItemCheck('bakingsoda') then return end
-	if not minigame(2, 8) then TriggerServerEvent("md-drugs:server:failcrackone", data.data) return end
-    if not progressbar(Lang.Crack.cookcrack, 4000, 'uncuff') then return end
-    TriggerServerEvent("md-drugs:server:makecrackone", data.data)       
-end)
-
-
-
-RegisterNetEvent("md-drugs:client:bagcrack", function(data)
-	if not ItemCheck('empty_weed_bag') then return end
-	if not progressbar(Lang.Crack.bagcrack, 4000, 'uncuff') then return end
-	TriggerServerEvent("md-drugs:server:bagcrack", data.data)
-end)
-
+for k, v in pairs (locations.bagcrack) do
+	Bridge.Target.AddBoxZone('bagCrack'..k, v.loc, v.size, v.loc.w or 180.0, {
+		{
+			label = Bridge.Language.Locale('crack.targetBag'),
+			icon = Bridge.Language.Locale('crack.bagIcon'),
+			action = function()
+				if not itemCheck('empty_weed_bag') then return end
+				if not progressbar(Bridge.Language.Locale('crack.bag')) then return end
+				TriggerServerEvent("md-drugs:server:bagcrack", k)
+			end,
+			canInteract = function()
+				if not handleGang(v.gang) then return false end
+				return true
+			end
+		}
+	})
+	targets[#targets+1] = 'bagCrack'..k
+end

client/deliveries.lua

@@ -1,360 +1,83 @@
-local QBCore = exports['qb-core']:GetCoreObject()
-local currentDealer = nil
-local dealerIsHome = false
-local waitingDelivery = nil
-local activeDelivery = nil
-local deliveryTimeout = 0
-local waitingKeyPress = false
-local dealerCombo = nil
-local drugDeliveryZone
+if not Config.Drugs['deliveries'] then return end
+local dealer = {}
+local buyer = nil
 
--- Handlers
+repeat Wait(100) until GlobalState.MDDrugDealers ~= nil
 
-AddStateBagChangeHandler('isLoggedIn', nil, function(_, _, value)
-    if value then
-        QBCore.Functions.TriggerCallback('md-drugs:server:RequestConfig', function(DealerConfig)
-            QBConfig.Dealers = DealerConfig
-        end)
-        Wait(1000)
-        InitZones()
-    else
-        if dealerCombo then dealerCombo:destroy() end
-    end
-end)
-
--- Functions
-
-local function GetClosestDealer()
-    local ped = PlayerPedId()
-    local pCoords = GetEntityCoords(ped)
-    for k, v in pairs(QBConfig.Dealers) do
-        local dealerCoords = vector3(v.coords.x, v.coords.y, v.coords.z)
-        if #(pCoords - dealerCoords) < 2.0 then
-            currentDealer = k
-            break
+local function SpawnDealer()
+    if #dealer >= 1 then
+        for k,v in pairs (dealer) do
+            DeletePed(v)
         end
+        dealer = {}
     end
-end
-RegisterNetEvent('md-drugs:client:opendealermenu', function()
-    local dealermenu = {}
-    if Config.StupidassNewQbItemName then
-        for k, v in pairs (QBConfig.ProductsStupidNameRewrite) do 
-			if  QBCore.Functions.GetPlayerData().metadata["dealerrep"] >= v.minrep then 
-            dealermenu[#dealermenu + 1] = {
-                          icon =  GetImage(v.name),
-                          title = GetLabel(v.name),
-                          description = v.price,
-                          event = "md-drugs:client:travellingmerchantox",
-                          args = {
-                              item = v.name,
-                              cost = v.price,
-                             amount = v.amount,
-                             table = QBConfig.ProductsStupidNameRewrite,
-                             num = k,
+    for k,v in pairs(GlobalState.MDDrugDealers) do
+        requestModel(v.model)
+        dealer[k] = CreatePed(0, v.model, v.coords.x, v.coords.y, v.coords.z-1, v.coords.w, false, false)
+        Freeze(dealer[k], true, v.coords.w)
+        Bridge.Target.AddLocalEntity(dealer[k], {
+            {
+                icon = Bridge.Language.Locale('Deliveries.targetGetDelIcon'),
+                label = Bridge.Language.Locale('Deliveries.targetGetDel'),
+                action = function()
+                    TriggerServerEvent('md-drugs:server:requestDelivery', k)
+                end,
+            },
+            {
+                icon = Bridge.Language.Locale('Deliveries.targetOpenShopIcon'),
+                label = Bridge.Language.Locale('Deliveries.targetOpenShop'),
+                action = function()
+                    local rep = GetRep()
+                    local options = {}
+                    for m, d in pairs (Config.Deliveries.Recipes) do
+                        if rep.dealerrep >= d.minrep then
+                            options[#options+1] = {
+                                title = Bridge.Inventory.GetItemInfo(d.name).label,
+                                description = '$' .. d.price,
+                                icon = Bridge.Inventory.GetItemInfo(d.name).image,
+                                onSelect = function()
+                                    TriggerServerEvent('md-drugs:server:buyItemDealer', m, k)
+                                end,
                             }
-                        }
-               
-                   lib.registerContext({id = 'dealermenu',title = "Dealer Menu", options = dealermenu})
-			end	   
-        end           
-    else
-         for k, v in pairs (QBConfig.Products) do 
-			if  QBCore.Functions.GetPlayerData().metadata["dealerrep"] >= v.minrep then 
-            dealermenu[#dealermenu + 1] = {
-                          icon =  GetImage(v.name),
-                          title = GetLabel(v.name),
-                          description = v.price,
-                          event = "md-drugs:client:travellingmerchantox",
-                          args = {
-                              item = v.name,
-                              cost = v.price,
-                             amount = v.amount,
-                             table = QBConfig.Products,
-                             num = k,
-                            }
-                        }
-
-                   lib.registerContext({id = 'dealermenu',title = "Dealer Menu", options = dealermenu})
-			end	   
-        end     
-    end
-    lib.showContext('dealermenu')
-end)
-local function RandomDeliveryItemOnRep()
-    local myRep = QBCore.Functions.GetPlayerData().metadata["dealerrep"]
-    local availableItems = {}
-    for k, _ in pairs(QBConfig.DeliveryItems) do
-        if QBConfig.DeliveryItems[k]["minrep"] <= myRep then
-            availableItems[#availableItems+1] = k
-        end
-    end
-    return availableItems[math.random(1, #availableItems)]
-end
-
-local function RequestDelivery()
-    if not waitingDelivery then
-        GetClosestDealer()
-        
-        local amount = math.random(1, 3)
-        local item = RandomDeliveryItemOnRep()
-
-        Notify(Lang.Delivery.search, 'success')
-        if Config.NearbyDeliveries == true then
-            local playerPed = PlayerPedId()
-            local playerCoords = GetEntityCoords(playerPed)
-            local nearbyLocations = {}
-        -- Filter out the nearby locations
-            for _, location in ipairs(Config.DeliveryLocations) do
-                local distance = #(playerCoords - location.coords)
-                if distance <= Config.DeliveryWithin then
-                    nearbyLocations[#nearbyLocations + 1] = location
-                end
-            end
-
-            -- Select a random location from the nearby locations
-            if #nearbyLocations > 0 then
-                local selectedLocation = nearbyLocations[math.random(1, #nearbyLocations)]
-                waitingDelivery = {
-                    ["coords"] = selectedLocation.coords,
-                    ["locationLabel"] = selectedLocation.label,
-                    ["amount"] = amount,
-                    ["dealer"] = currentDealer,
-                    ["itemData"] = Config.DeliveryItems[item],
-                    ["item"] = item
-                }
-            else
-                Notify(Lang.Delivery.none, 'error')
-                
-            end
-        else
-            local location = math.random(1, #QBConfig.DeliveryLocations)
-
-            waitingDelivery = {
-                ["coords"] = QBConfig.DeliveryLocations[location]["coords"],
-                ["locationLabel"] = QBConfig.DeliveryLocations[location]["label"],
-                ["amount"] = amount,
-                ["dealer"] = currentDealer,
-                ["itemData"] = QBConfig.DeliveryItems[item],
-                ["item"] = item
-            }
-            if QBConfig.Debug == true then
-                print(QBConfig.DeliveryLocations[location]["coords"])
-                print(QBConfig.DeliveryLocations[location]["label"])
-            end
-        end
-		
-        TriggerServerEvent('md-drugs:server:giveDeliveryItems', waitingDelivery)
-        SetTimeout(2000, function()
-           TriggerServerEvent('qb-phone:server:sendNewMail', {
-               sender = QBConfig.Dealers[currentDealer]["name"],
-               subject = "Delivery Location",
-               message = "Deliver This For Me",
-               
-           })
-        end)
-        TriggerEvent("md-drugs:client:setLocation",waitingDelivery)
-    else
-        Notify(Lang.Delivery.busy, 'error')
-    end
-end
-
-local function DeliveryTimer()
-    CreateThread(function()
-        while deliveryTimeout - 1 > 0 do
-            deliveryTimeout = deliveryTimeout - 1
-            Wait(1000)
-        end
-        deliveryTimeout = 0
-    end)
-end
-
-
-
-local function DeliverStuff()
-    if deliveryTimeout > 0 then
-        Wait(500)
-        TriggerEvent('animations:client:EmoteCommandStart', {'uncuff'}) 
-        PoliceCall(20)
-        progressbar(Lang.Delivery.pack, 4000, 'uncuff')
-        TriggerServerEvent('md-drugs:server:successDelivery', activeDelivery, true)
-        activeDelivery = nil
-        exports['qb-target']:RemoveZone('drugDeliveryZone')
-        ClearPedTasks(PlayerPedId())
-    else
-        TriggerServerEvent('md-drugs:server:successDelivery', activeDelivery, false)
-    end
-    deliveryTimeout = 0
-end
-
-local function SetMapBlip(x, y)
-    SetNewWaypoint(x, y)
-    Notify(Lang.Delivery.found, 'success');
-end
-
-
-
-
-function InitZones()
-    if next(QBConfig.Dealers) == nil then return end
-   
-     for k,v in pairs(QBConfig.Dealers) do
-		local Ped = "g_m_y_famdnf_01"
-         RequestModel(Ped)
-         while not HasModelLoaded(Ped) do
-             Wait(0)
-         end
-         testdealer = CreatePed(0, Ped,v.coords.x,v.coords.y,v.coords.z-1, 90.0, false, false)
-         Freeze(testdealer, true, 90)
-           exports["qb-target"]:AddBoxZone("dealer_"..k, vector3(v.coords.x, v.coords.y, v.coords.z), 1.5, 1.5, {
-             name = "dealer_"..k,
-             heading = v.heading,
-             minZ = v.coords.z - 1,
-             maxZ = v.coords.z + 1,
-             debugPoly = false,
-         }, {
-             options = {
-                 {
-                     icon = 'fas fa-user-secret',
-                     label = "Deliver",
-                     action = function()
-				RequestDelivery()
-			end,
-                     canInteract = function()
-                         GetClosestDealer()
-                         local hours = GetClockHours()
-                         local min = QBConfig.Dealers[currentDealer]["time"]["min"]
-                         local max = QBConfig.Dealers[currentDealer]["time"]["max"]
-                         if max < min then
-                             if hours <= max then
-                                 if not waitingDelivery then
-                                     return true
-                                 end
-                             elseif hours >= min then
-                                 if not waitingDelivery then
-                                     return true
-                                 end
-                             end
-                         else
-                             if hours >= min and hours <= max then
-                                 if not waitingDelivery then
-                                     return true
-                                 end
-                             end
-                         end
-                     end
-                 },
-                 {
-                     icon = 'fas fa-user-secret',
-                     label = "Open Shop",
-                     action = function()
-                        TriggerEvent('md-drugs:client:opendealermenu')
-                     end,
-                     canInteract = function()
-                         GetClosestDealer()
-                         local hours = GetClockHours()
-                         local min = QBConfig.Dealers[currentDealer]["time"]["min"]
-                         local max = QBConfig.Dealers[currentDealer]["time"]["max"]
-                         if max < min then
-                             if hours <= max then
-                                 return true
-                             elseif hours >= min then
-                                 return true
-                             end
-                         else
-                             if hours >= min and hours <= max then
-                                 return true
-                             end
-                         end
-                     end
-                 }
-             },
-             distance = 1.5
-         })
-     end
-   
-end
-
--- Events
-
-RegisterNetEvent('md-drugs:client:RefreshDealers', function(DealerData)
-    if dealerCombo then dealerCombo:destroy() end
-    QBConfig.Dealers = DealerData
-    Wait(1000)
-    InitZones()
-end)
-
-RegisterNetEvent('md-drugs:client:updateDealerItems', function(itemData, amount)
-    TriggerServerEvent('md-drugs:server:updateDealerItems', itemData, amount, currentDealer)
-end)
-
-RegisterNetEvent('md-drugs:client:setDealerItems', function(itemData, amount, dealer)
-    QBConfig.Dealers[dealer]["products"][itemData.slot].amount = QBConfig.Dealers[dealer]["products"][itemData.slot].amount - amount
-end)
-
-RegisterNetEvent('md-drugs:client:setLocation', function(locationData)
-    if activeDelivery then
-        SetMapBlip(activeDelivery["coords"]["x"], activeDelivery["coords"]["y"])
-        Notify(Lang.Delivery.already, 'error')
-        return
-    end
-    activeDelivery = locationData
-    deliveryTimeout = 300
-    DeliveryTimer()
-    SetMapBlip(activeDelivery["coords"].x, activeDelivery["coords"].y)
-	local Ped = "g_m_y_famdnf_01"
-     RequestModel(Ped)
-     while not HasModelLoaded(Ped) do
-         Wait(0)
-     end
-     
-     Buyer = CreatePed(0, Ped,activeDelivery["coords"].x, activeDelivery["coords"].y, activeDelivery["coords"].z-1, 180.0, false, false)
-        Freeze(Buyer, true, 180)
-       exports['qb-target']:AddTargetEntity(Buyer, {
-            options = {
-                {
-                    icon = 'fas fa-user-secret',
-                    label = "Hand Off",
-                    action = function()
-                        DeliverStuff()
-						Wait(4000)
-						DeleteEntity(Buyer)
-                        waitingDelivery = nil
-                    end,
-                    canInteract = function()
-                        if waitingDelivery then
-                            return true
                         end
                     end
-                }
-            },
-            distance = 1.5
-        })
-    
-end)
-
-RegisterNetEvent('md-drugs:client:sendDeliveryMail', function(type, deliveryData)
-    if type == 'perfect' then
-        TriggerServerEvent('qb-phone:server:sendNewMail', {
-            sender = QBConfig.Dealers[deliveryData["dealer"]]["name"],
-            subject = "Delivery",
-            message = "You did it"
-        })
-    elseif type == 'bad' then
-        TriggerServerEvent('qb-phone:server:sendNewMail', {
-            sender = QBConfig.Dealers[deliveryData["dealer"]]["name"],
-            subject = "Delivery",
-            message = "You Fucked Me Over"
-        })
-    elseif type == 'late' then
-        TriggerServerEvent('qb-phone:server:sendNewMail', {
-            sender = QBConfig.Dealers[deliveryData["dealer"]]["name"],
-            subject = "Delivery",
-            message = "Better Late Than Dead"
+                    Bridge.Menu.Open({
+                        id = 'DealerMenu',
+                        title = Bridge.Language.Locale('Deliveries.shopHeader'),
+                        description = Bridge.Language.Locale('Deliveries.shopHeader'),
+                        options = options
+                    })
+                end,
+            }
         })
     end
+end
+
+SpawnDealer()
+
+RegisterNetEvent('md-drugs:client:RefreshDealers', function()
+    SpawnDealer()
 end)
 
-RegisterCommand('checkrep', function()
-    local drugrep = QBCore.Functions.GetPlayerData().metadata["dealerrep"]
-    Notify(Lang.Delivery.checkrep..drugrep)
-end, false)
+RegisterNetEvent('md-drugs:client:setLocation', function(data)
+    if buyer then
+        DeletePed(buyer)
+    end
+    local coord = data.coords
+    SetNewWaypoint(coord.x, coord.y)
+    requestModel("g_m_y_famdnf_01") 
+    buyer = CreatePed(0, "g_m_y_famdnf_01",coord.x, coord.y, coord.z-1, coord.w, false, false)
+    Freeze(buyer, true, coord.w)
+    Bridge.Target.AddLocalEntity(buyer  ,  {
+        {
+            icon = Bridge.Language.Locale('Deliveries.targetHandOffIcon'),
+            label = Bridge.Language.Locale('Deliveries.targetHandOff'),
+            action = function()
+               if not progressbar(Bridge.Language.Locale('Deliveries.delivering')) then return end
+               TriggerServerEvent('md-drugs:server:giveDeliveryItems')
+               Wait(400)
+                DeletePed(buyer)
+            end,
+        }
+    })
+end)

client/functions.lua

@@ -1,215 +1,382 @@
-local QBCore = exports['qb-core']:GetCoreObject()
 
-local progressbartype = Config.progressbartype 
 local minigametype = Config.minigametype
-local notifytype = Config.Notify 
-local dispatch = Config.Dispatch
 
-function progressbar(text, time, anim)
-	TriggerEvent('animations:client:EmoteCommandStart', {anim}) 
-	if progressbartype == 'oxbar' then 
-	  if lib.progressBar({ duration = time, label = text, useWhileDead = false, canCancel = true, disable = { car = true, move = true},}) then 
-		if GetResourceState('scully_emotemenu') == 'started' then
-			exports.scully_emotemenu:cancelEmote()
-		else
-			TriggerEvent('animations:client:EmoteCommandStart', {"c"}) 
-		end
-		return true
-	  end	 
-	elseif progressbartype == 'oxcir' then
-	  if lib.progressCircle({ duration = time, label = text, useWhileDead = false, canCancel = true, position = 'bottom', disable = { car = true,move = true},}) then 
-		if GetResourceState('scully_emotemenu') == 'started' then
-			exports.scully_emotemenu:cancelEmote()
-		else
-			TriggerEvent('animations:client:EmoteCommandStart', {"c"}) 
-		end
-		return true
-	  end
-	elseif progressbartype == 'qb' then
-	local test = false
-		local cancelled = false
-	  QBCore.Functions.Progressbar("drink_something", text, time, false, true, { disableMovement = true, disableCarMovement = true, disableMouse = false, disableCombat = true, disableInventory = true,
-	  }, {}, {}, {}, function()-- Done
-		test = true
-		if GetResourceState('scully_emotemenu') == 'started' then
-			exports.scully_emotemenu:cancelEmote()
-		else
-			TriggerEvent('animations:client:EmoteCommandStart', {"c"}) 
-		end
-	  end, function()
-		cancelled = true
-		if GetResourceState('scully_emotemenu') == 'started' then
-			exports.scully_emotemenu:cancelEmote()
-		else
-			TriggerEvent('animations:client:EmoteCommandStart', {"c"}) 
-		end
-	end)
-	  repeat 
-		Wait(100)
-	  until cancelled or test
-	  if test then return true end
-	else
-		print"dude, it literally tells you what you need to set it as in the config"
-	end	  
-  end
-
-function minigame(num1, num2)
-    local check
-	if minigametype == 'ps' then
-    	exports['ps-ui']:Circle(function(success)
-        	check = success
-    	end, num1, num2) 
-    	return check
-	elseif minigametype == 'ox' then
-		num1 = 'easy'
-		if num2 <= 6 then num2 = 'hard' elseif num2 >= 7 and num2 <= 12 then num2 = 'medium' else num2 = 'easy' end
-		local success = lib.skillCheck({num1, num2}, {'1', '2', '3', '4'})
-		return success 
-    elseif minigametype == 'none' then
-		return true
-	else	
-		
-        print"dude, it literally tells you what you need to set it as in the config"
+function requestModel(ped, timeout)
+	timeout = timeout or 15000
+    local startTime = GetGameTimer()
+    RequestModel(ped)
+    while not HasModelLoaded(ped) do
+		Wait(0)
+        if GetGameTimer() - startTime > timeout then
+            Bridge.Prints.Debug('requestModel timed out', ped, GetGameTimer() - startTime)
+            return false
+        end
     end
+	return true
 end
 
-
- function Notify(text, type)
-	if notifytype =='ox' then
-	  lib.notify({title = text, type = type})
-        elseif notifytype == 'qb' then
-	  QBCore.Functions.Notify(text, type)
-	elseif notifytype == 'okok' then
-	  exports['okokNotify']:Alert('', text, 4000, type, false)
-	else 
-       	print"dude, it literally tells you what you need to set it as in the config"
-    	end   
-  end
-
-function GetImage(img)
-	if GetResourceState('ox_inventory') == 'started' then
-		local Items = exports['ox_inventory']:Items()
-		if Items[img]['client'] then 
-			if Items[img]['client']['image'] then
-				return Items[img]['client']['image']
-			else
-				return "nui://ox_inventory/web/images/".. img.. '.png'
-			end
-		else
-			return "nui://ox_inventory/web/images/".. img.. '.png'
-		end
-	elseif GetResourceState('ps-inventory') == 'started' then
-		return "nui://ps-inventory/html/images/".. QBCore.Shared.Items[img].image
-	elseif GetResourceState('lj-inventory') == 'started' then
-		return "nui://lj-inventory/html/images/".. QBCore.Shared.Items[img].image
-	elseif GetResourceState('qb-inventory') == 'started' then
-		return "nui://qb-inventory/html/images/".. QBCore.Shared.Items[img].image
-	elseif GetResourceState('qs-inventory') == 'started' then
-		return "nui://qs-inventory/html/img/".. QBCore.Shared.Items[img].image
-	elseif GetResourceState('origen_inventory') == 'started' then
-		return "nui://origen_inventory/html/img/".. QBCore.Shared.Items[img].image
-	elseif GetResourceState('core_inventory') == 'started' then
-		return "nui://core_inventory/html/img/".. QBCore.Shared.Items[img].image
-	end
-end
-
-function GetLabel(label)
-	if GetResourceState('ox_inventory') == 'started' then
-		local Items = exports['ox_inventory']:Items()
-		return Items[label]['label']
+function minigame()
+	local time = 0
+	local game = Config.Minigames
+	if minigametype == 'ps_circle' then
+		local check = exports['ps-ui']:Circle(false, game['ps_circle'].amount, game['ps_circle'].speed)
+		return check
+	elseif minigametype == 'ps_maze' then
+	   local check = exports['ps-ui']:Maze(false, game['ps_maze'].timelimit)
+	   return check
+   elseif minigametype == 'ps_scrambler' then
+	   local check = exports['ps-ui']:Scrambler(false, game['ps_scrambler'].type,  game['ps_scrambler'].time, game['ps_scrambler'].mirrored)
+	   return check
+   elseif minigametype == 'ps_var' then
+	   local check = exports['ps-ui']:VarHack(false, game['ps_var'].numBlocks,  game['ps_var'].time)
+	   return check
+   elseif minigametype == 'ps_thermite' then
+	   local check = exports['ps-ui']:Thermite(false, game['ps_thermite'].time,  game['ps_thermite'].gridsize, game['ps_thermite'].incorrect)
+	   return check	
+	elseif minigametype == 'ox' then
+		local success = lib.skillCheck(game['ox'], {'1', '2', '3', '4'})
+		return success 
+	elseif minigametype == 'blcirprog' then
+		local success = exports.bl_ui:CircleProgress(game['blcirprog'].amount, game['blcirprog'].speed)
+		return success
+	elseif minigametype == 'blprog' then
+		local success = exports.bl_ui:Progress(game['blprog'].amount, game['blprog'].speed)
+		return success
+	elseif minigametype == 'blkeyspam' then
+		local success = exports.bl_ui:KeySpam(game['blkeyspam'].amount, game['blprog'].difficulty)
+		return success
+	elseif minigametype == 'blkeycircle' then
+		local success = exports.bl_ui:KeyCircle(game['blkeycircle'].amount, game['blkeycircle'].difficulty, game['blkeycircle'].keynumbers)
+		return success	
+	elseif minigametype == 'blnumberslide' then
+		local success = exports.bl_ui:NumberSlide(game['blnumberslide'].amount, game['blnumberslide'].difficulty, game['blnumberslide'].keynumbers)
+		return success	
+	elseif minigametype == 'blrapidlines' then
+		local success = exports.bl_ui:RapidLines(game['blrapidlines'].amount, game['blrapidlines'].difficulty, game['blrapidlines'].numberofline)
+		return success	
+	elseif minigametype == 'blcircleshake' then
+		local success = exports.bl_ui:CircleShake(game['blcircleshake'].amount, game['blcircleshake'].difficulty, game['blcircleshake'].stages)
+		return success	
+	elseif minigametype == 'glpath' then 
+		local settings = {gridSize = game['glpath'].gridSize, lives = game['glpath'].lives, timeLimit = game['glpath'].timelimit}
+		local successes = false
+		 exports["glow_minigames"]:StartMinigame(function(success)
+			 if success then successes = true else successes = false  end
+		 end, "path", settings)
+		 repeat
+			Wait(1000)
+			time = time + 1
+		 until successes or time == 100
+		 if successes then return true end
+	elseif minigametype == 'glspot' then
+		local settings = {gridSize = game['glspot'].gridSize, timeLimit = game['glspot'].gridSize, charSet =  game['glspot'].charSet, required = game['glspot'].required}
+		local successes = false
+		exports["glow_minigames"]:StartMinigame(function(success)
+		   if success then successes = true else successes = false  end
+		end, "spot", settings)
+		repeat
+		   Wait(1000)
+		   time = time + 1
+		until successes or time == 100
+	elseif minigametype == 'glmath' then
+		local settings = {timeLimit  = game['glmath'].timeLimit}
+		local successes = false
+		exports["glow_minigames"]:StartMinigame(function(success)
+		   if success then successes = true else successes = false  end
+		end, "math", settings)
+		repeat
+		   Wait(1000)
+		   time = time + 1
+		until successes or time == 100
+	elseif minigametype == 'none' then
+		return true
 	else
-		return QBCore.Shared.Items[label]['label']
+		print"^1 SCRIPT ERROR: Md-Drugs set your minigame with one of the options!"
 	end
 end
 
-
-function ItemCheck(item)
-local success 
-if GetResourceState('ox_inventory') == 'started' then
-    if exports.ox_inventory:GetItemCount(item) >= 1 then return true else Notify('You Need ' .. GetLabel(item) .. " !", 'error') end
-else
-    if QBCore.Shared.Items[item] == nil then print("There Is No " .. item .. " In Your QB Items.lua") return end
-    if QBCore.Functions.HasItem(item) then success = item return success else Notify('You Need ' .. QBCore.Shared.Items[item].label .. " !", 'error') end
+function GetRep()
+	local rep = Bridge.Callback.Trigger('md-drugs:server:GetRep')
+	return rep
 end
-end
-
-function Email(sender, subject, message)
-	if Config.Phone == 'yflip' then
-		local receiver = GetPlayerServerId(PlayerId())
-		local insertId, received = exports["yflip-phone"]:SendMail({
-			title = subject,
-			sender = sender,
-			senderDisplayName = sender,
-			content = message,
-			
-		}, 'phoneNumber', receiver)
-	elseif Config.Phone == 'qs' then
-		TriggerServerEvent('qs-smartphone:server:sendNewMail', {
-   		sender = sender,
-   		subject = subject,
-    		message = message,
-    		button = {}
-		})
-	else
-		TriggerServerEvent('qb-phone:server:sendNewMail', {
-			sender = sender,
-			subject = subject,
-			message = message,
-		})
-	end
-end	  
 
 function PoliceCall(chance)
 	local math = math.random(1,100)
 	if math <= chance then
-		if dispatch == 'ps' then 
-			exports['ps-dispatch']:DrugSale()
-		elseif dispatch == 'cd' then
-			local data = exports['cd_dispatch']:GetPlayerInfo()
-			TriggerServerEvent('cd_dispatch:AddNotification', {
-				job_table = {'police', }, 
-				coords = data.coords,
-				title = '420-69 Drug Sale',
-				message = 'A '..data.sex..' robbing a store at '..data.street, 
-				flash = 0,
-				unique_id = data.unique_id,
-				sound = 1,
-				blip = {
-					sprite = 431, 
-					scale = 1.2, 
-					colour = 3,
-					flashes = false, 
-					text = '420-69 Drug Sale',
-					time = 5,
-					radius = 0,
-				}
-			})
-		elseif	dispatch == 'core' then
-			exports['core_dispatch']:addCall("420-69", "Drugs Are Being Sold", {
-				{icon="fa-ruler", info="4.5 MILES"},
-				}, {GetEntityCoords(PlayerPedId())}, "police", 3000, 11, 5 )
-		elseif dispatch == 'aty' then 
-			exports["aty_dispatch"]:SendDispatch('Drug Sale', '420-69', 40, {'police'})
-		elseif dispatch == 'qs' then
-			exports['qs-dispatch']:DrugSale()
-		else
-			print('Congrats, You Choose 0 of the options :)')	
-		end
+		Bridge.Dispatch.SendAlert({
+		    message = Bridge.Language.Locale('Dispatch.header'),
+		    code = Bridge.Language.Locale('Dispatch.code'),
+		    coords = GetEntityCoords(PlayerPedId()),
+		    jobs = {"police"},
+		    blipData = {
+		        sprite = 161,
+		        color = 1,
+		        scale = 1.0
+		    },
+		    time = 300000,
+		    icon = Bridge.Language.Locale('Dispatch.icon')
+		})
 	else
+		return
 	end
 end
 
 function GetCops(number)
 	if number == 0 then return true end
-	local amount = lib.callback.await('md-drugs:server:GetCoppers', false)
-	if amount >= number then return true else Notify('You Need '.. number - amount .. ' More Cops To Do This', 'error')  end
+	local amount = Bridge.Callback.Trigger('md-drugs:server:GetCoppers')
+	if amount >= number then return true else Bridge.Notify.SendNotify(string.format(Bridge.Language.Locale('Catches.YouNeedMoreCops'), number - amount), 'error')  end
 end
 
-
 function Freeze(entity, toggle, head)
-		SetEntityInvincible(entity, toggle)
-		SetEntityAsMissionEntity(entity, toggle, toggle)
-        FreezeEntityPosition(entity, toggle)
-        SetEntityHeading(entity, head)
-		SetBlockingOfNonTemporaryEvents(entity, toggle)
-end
+	SetEntityInvincible(entity, toggle)
+	SetEntityAsMissionEntity(entity, toggle, toggle)
+    FreezeEntityPosition(entity, toggle)
+    SetEntityHeading(entity, head)
+	SetBlockingOfNonTemporaryEvents(entity, toggle)
+end
+
+local function RotationToDirection(rotation)
+    local adjustedRotation = {
+        x = (math.pi / 180) * rotation.x,
+        y = (math.pi / 180) * rotation.y,
+        z = (math.pi / 180) * rotation.z
+    }
+    local direction = {
+        x = -math.sin(adjustedRotation.z) * math.abs(math.cos(adjustedRotation.x)),
+        y = math.cos(adjustedRotation.z) * math.abs(math.cos(adjustedRotation.x)),
+        z = math.sin(adjustedRotation.x)
+    }
+    return direction
+end
+
+local function RayCastGamePlayCamera(distance)
+    local currentRenderingCam = false
+    if not IsGameplayCamRendering() then
+        currentRenderingCam = GetRenderingCam()
+    end
+
+    local cameraRotation = not currentRenderingCam and GetGameplayCamRot() or GetCamRot(currentRenderingCam, 2)
+    local cameraCoord = not currentRenderingCam and GetGameplayCamCoord() or GetCamCoord(currentRenderingCam)
+    local direction = RotationToDirection(cameraRotation)
+    local destination = {
+        x = cameraCoord.x + direction.x * distance,
+        y = cameraCoord.y + direction.y * distance,
+        z = cameraCoord.z + direction.z * distance
+    }
+    local _, hit, endCoords, surfaceNormal, entityHit  = GetShapeTestResult(StartShapeTestRay(cameraCoord.x, cameraCoord.y, cameraCoord.z, destination.x, destination.y, destination.z, -1, PlayerPedId(), 0))
+    return _, hit, endCoords, surfaceNormal, entityHit
+end
+
+local function ray()
+   local _, hit, endCoords, surfaceNormal, entityHit  = RayCastGamePlayCamera(1000.0)
+    return hit, endCoords, surfaceNormal, entityHit
+end
+
+local created = false
+local heading = 180.0
+function StartRay()
+    local run = true
+	local pedcoord = GetEntityCoords(PlayerPedId())
+	requestModel('v_ret_ml_tablea', 30000)
+	local table = CreateObject('v_ret_ml_tablea', pedcoord.x, pedcoord.y, pedcoord.z+1, heading, false, false)
+    repeat
+       	local hit, endCoords, surfaceNormal, entityHit = ray()
+		if not created then 
+			created = true
+			Bridge.HelpText.ShowHelpText([[[E] To Place   
+			[DEL] To Cancel  
+			[<-] To Move Left  
+			[->] To Move Right]])
+		else
+			SetEntityCoords(table, endCoords.x, endCoords.y, endCoords.z+1)
+			SetEntityHeading(table, heading)
+			SetEntityCollision(table, false, false)
+			SetEntityAlpha(table, 100)
+		end
+		if IsControlPressed(0, 174) then
+            heading = heading - 2
+        end
+		if IsControlPressed(0, 175) then
+            heading = heading + 2
+        end
+        if IsControlPressed(0, 38) then
+            Bridge.HelpText.HideHelpText()
+            run = false
+			DeleteObject(table)
+			created = false
+            return endCoords, heading
+        end
+
+        if IsControlPressed(0, 178) then
+            Bridge.HelpText.HideHelpText()
+            run = false
+			created = false
+			DeleteObject(table)
+            return nil, nil
+		end
+        Wait(0)
+    until run == false
+end
+
+function StartRay2()
+    local run = true
+	local pedcoord = GetEntityCoords(PlayerPedId())
+	requestModel('bkr_prop_coke_press_01aa', 30000)
+	local table = CreateObject('bkr_prop_coke_press_01aa', pedcoord.x, pedcoord.y, pedcoord.z+1, heading, false, false)
+    repeat
+        local hit, endCoords, surfaceNormal, entityHit = ray()
+		if not created then 
+			created = true
+			Bridge.HelpText.ShowHelpText([[[E] To Place   
+			[DEL] To Cancel  
+			[<-] To Move Left  
+			[->] To Move Right]])
+		else
+			SetEntityCoords(table, endCoords.x, endCoords.y, endCoords.z+1)
+			SetEntityHeading(table, heading)
+			SetEntityCollision(table, false, false)
+			SetEntityAlpha(table, 100)
+		end
+		if IsControlPressed(0, 174) then
+            heading = heading - 2
+        end
+		if IsControlPressed(0, 175) then
+            heading = heading + 2
+        end
+        if IsControlPressed(0, 38) then
+            Bridge.HelpText.HideHelpText()
+            run = false
+			DeleteObject(table)
+			created = false
+            return endCoords, heading
+        end
+
+        if IsControlPressed(0, 178) then
+            Bridge.HelpText.HideHelpText()
+            run = false
+			created = false
+			DeleteObject(table)
+            return nil, nil
+		end
+        Wait(0)
+    until run == false
+end
+
+Bridge.Callback.Register('md-drugs:client:uncuff', function(data)
+	if not progressbar(data) then return end
+	return true
+end)
+
+RegisterCommand('DrugRep', function()
+	if not Config.TierSystem then return end
+	local rep = GetRep()
+	Bridge.Menu.Open({
+		id = 'drugrep',
+		title = Bridge.Language.Locale('DrugRep.header'),
+		description = Bridge.Language.Locale('DrugRep.increased'),
+		options = {
+			{icon = Bridge.Language.Locale('DrugRep.coke.icon'), title = Bridge.Language.Locale('DrugRep.coke.title', rep.coke)},
+			{icon = Bridge.Language.Locale('DrugRep.heroin.icon'), 	  title = Bridge.Language.Locale('DrugRep.heroin.title', rep.heroin)},
+			{icon = Bridge.Language.Locale('DrugRep.lsd.icon'),		  title = Bridge.Language.Locale('DrugRep.lsd.title', rep.lsd)},
+			{icon = Bridge.Language.Locale('DrugRep.dealerrep.icon'), 		  title = Bridge.Language.Locale('DrugRep.dealerrep.title', rep.dealerrep)},
+			{icon = Bridge.Language.Locale('DrugRep.cornerselling.icon'),   title = Bridge.Language.Locale('DrugRep.cornerselling.title', rep.cornerselling.rep), description = Bridge.Language.Locale('DrugRep.cornerselling.description', rep.cornerselling.label) }
+		}
+	})
+end, false)
+
+if Bridge.Framework.GetResourceName() == 'es_extended' then
+	function handleGang(gang)
+		return true
+	end
+else
+	function handleGang(gang)
+		if not gang then 
+			return true
+		end
+		if #gang == 0 then
+			return true
+		end
+		local data = Bridge.Framework.GetPlayerData()
+		if not data.gang then
+			return false
+		end
+		return data.gang.name == gang
+	end
+end
+
+if Config.Emotes == 'scully' then
+    function playEmote(emote)
+        exports.scully_emotemenu:playEmoteByCommand(emote, 0)
+    end
+    function stopEmote()
+        exports.scully_emotemenu:cancelEmote()
+    end
+end
+
+if Config.Emotes == 'dpemotes' then
+    function playEmote(emote)
+        TriggerEvent('animations:client:EmoteCommandStart', {emote})
+    end
+    function stopEmote()
+        TriggerEvent('animations:client:EmoteCommandStart', {"c"})
+    end
+end
+
+if Config.Emotes == 'rpemotes' then
+    function playEmote(emote)
+        exports["rpemotes"]:EmoteCommandStart(emote, 0)
+    end
+    function stopEmote()
+        exports["rpemotes"]:EmoteCancel()
+    end
+end
+
+local animation = nil
+
+function progressbar(text, time, emote, cancel)
+	local animData
+	if type(emote) == 'string' then
+		playEmote(emote)
+		animation = emote
+	elseif type(emote) == 'table' then
+		animData = emote
+		if emote.prop and not emote.prop.model then
+			emote.prop = nil
+		end
+	end
+	local success = Bridge.ProgressBar.Open({
+		duration = time or 5000,
+		label = text or 'LAZY AF DEVS',
+		canCancel = true,
+		disable = cancel or Config.ProgressBar.Disables,
+		anim = animData or Config.DefaultAnimation,
+		prop = animData and animData.prop or nil
+	})
+	if animation then
+		animation = nil
+		stopEmote()
+	end
+	return success
+end
+
+function itemCheck(item)
+	if not Bridge.Inventory.HasItem(item) then
+        Bridge.Notify.SendNotify(Bridge.Language.Locale('Catches.itemMissings', Bridge.Inventory.GetItemInfo(item).label), 'error')
+        return false
+    end
+	return true
+end
+
+AddEventHandler('onResourceStop', function(resourceName)
+	if GetCurrentResourceName() ~= resourceName then return end
+	for k, v in pairs (targets) do
+		if type(v) == 'number' then
+			Bridge.Target.RemoveLocalEntity(v)
+			if DoesEntityExist(v) then
+				DeleteEntity(v)
+			end
+		else
+			Bridge.Target.RemoveZone(v)
+		end
+	end
+end)

client/heroin.lua

@@ -1,207 +1,155 @@
-local QBCore = exports['qb-core']:GetCoreObject()
-local CocaPlant = {}
-local PoppyPlants = {}
+if not Config.Drugs['heroin'] then return end
 local herointable = false
-local function loadParticle(dict)
-    if not HasNamedPtfxAssetLoaded(dict) then
-        RequestNamedPtfxAsset(dict)
-    end
-    while not HasNamedPtfxAssetLoaded(dict) do
-        Wait(0)
-    end
-    SetPtfxAssetNextCall(dict)
-end
-CreateThread(function() 
-local Ped = "g_m_y_famdnf_01"
-	lib.requestModel("g_m_y_famdnf_01", Config.RequestModelTime)
-	local labkitlocation = Config.buyheroinlabkit
-	local heroinkitdealer = CreatePed(0, Ped, labkitlocation.x, labkitlocation.y, labkitlocation.z-1, labkitlocation.w, false, false)
-    Freeze(heroinkitdealer, true, labkitlocation.w)
-    local options = {
-        { label = "Buy Heroin Lab Kit", icon = "fas fa-eye", event = "md-drugs:client:buyheroinlabkit", distance = 2.0},
-    } 
-    if Config.oxtarget then
-        exports.ox_target:addLocalEntity(heroinkitdealer, options)
-    else
-	    exports['qb-target']:AddTargetEntity(heroinkitdealer, { options = options, distance = 2.0})
-    end    
-end)
+local dirty = false
 
----- plant spawns dont edit
-RegisterNetEvent('heroin:respawnCane', function(loc)
-    local v = GlobalState.PoppyPlants[loc]
-    local hash = GetHashKey(v.model)
+local locations = Config.Heroin.Locations
 
-    if not PoppyPlants[loc] then
-        PoppyPlants[loc] = CreateObject(hash, v.location, false, true, true)
-        Freeze(PoppyPlants[loc], true, v.heading)
-        exports['qb-target']:AddTargetEntity(PoppyPlants[loc], {
-            options = { {
-                    icon = "fas fa-hand",
-                    label = "pick Poppies",
-                    action = function()
-                       if not progressbar(Lang.Heroin.pick, 4000, 'uncuff') then return end
-                        TriggerServerEvent("heroin:pickupCane", loc)
-                    end
-                }
-            },
-            distance = 2.5
-        })
-    end
-end)
+local function createLabKit(coord, head)
+    local heroinlabkit = CreateObject("v_ret_ml_tablea", coord.x, coord.y, coord.z - 1, true, false,false)
+    SetEntityHeading(heroinlabkit, head)
+    PlaceObjectOnGroundProperly(heroinlabkit)
+    Bridge.Target.AddLocalEntity(heroinlabkit, {
+        {
+            icon = Bridge.Language.Locale('heroin.cookIcon'),
+            label = Bridge.Language.Locale('heroin.targetCook'),
+            action = function()
+            if not itemCheck('emptyvial') then return end
 
-
-
-RegisterNetEvent('heroin:removeCane', function(loc)
-    if DoesEntityExist(PoppyPlants[loc]) then DeleteEntity(PoppyPlants[loc]) end
-    PoppyPlants[loc] = nil
-end)
-
-
-
-RegisterNetEvent("heroin:init", function()
-    for k, v in pairs (GlobalState.PoppyPlants) do
-        local hash = GetHashKey(v.model)
-        if not HasModelLoaded(hash) then LoadModel(hash) end
-        if not v.taken then
-            PoppyPlants[k] = CreateObject(hash, v.location.x, v.location.y, v.location.z, false, true, true)
-            Freeze(PoppyPlants[k], true, v.heading)
-            exports['qb-target']:AddTargetEntity(PoppyPlants[k], {
-                options = { {
-                        icon = "fas fa-hand",
-                        label = "Pick Poppies",
-                        action = function()
-                           if not progressbar(Lang.Heroin.pick, 4000, 'uncuff') then return end
-                            TriggerServerEvent("heroin:pickupCane", k) 
-                        end
-                    }
-                },
-                distance = 2.5
-            })
-        end
-    end
-end)
-
-AddEventHandler('onResourceStart', function(resource)
-    if resource == GetCurrentResourceName() then
-        LoadModel('prop_plant_01b')
-        TriggerEvent('heroin:init')
-    end
- end)
- 
- RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function()
-     Wait(3000)
-     LoadModel('prop_plant_01b')
-     TriggerEvent('heroin:init')
- end)
- 
- AddEventHandler('onResourceStop', function(resourceName)
-    if GetCurrentResourceName() == resourceName then
-        SetModelAsNoLongerNeeded(GetHashKey('prop_plant_01b'))
-        for k, v in pairs(PoppyPlants) do
-            if DoesEntityExist(v) then
-                DeleteEntity(v) SetEntityAsNoLongerNeeded(v)
+            if not minigame() then
+                dirty = true
+                TriggerServerEvent("md-drugs:server:failheatingheroin")
+                local coords = GetEntityCoords(heroinlabkit)
+                AddExplosion(coords.x, coords.y, coords.z-1.0, 34, 0.0, true, false, true)
+                SetParticleFxLoopedAlpha(heroinkit, 3.0)
+	        	SetPedToRagdoll(PlayerPedId(), 1300, 1300, 0, 0, 0, 0)
+	            return
             end
+            if not progressbar(Bridge.Language.Locale('heroin.pbCook')) then return end
+            TriggerServerEvent("md-drugs:server:heatliquidheroin")
+        end,
+        canInteract = function()
+            if not dirty then return true end
         end
-    end
-	DeleteObject(heroinlabkit)
-	DeleteObject(dirtylabkitheroin)
-end)
----- plant stop end
-
-
-RegisterNetEvent("md-drugs:client:dryplant", function(data) 
-    if not progressbar(Lang.Heroin.dryout, 4000, 'uncuff') then return end
-	TriggerServerEvent("md-drugs:server:dryplant",data.data)
-end)
-
-RegisterNetEvent("md-drugs:client:cutheroin", function(data) 
-    if not ItemCheck('bakingsoda') then return end
-	if not progressbar(Lang.Heroin.cutting, 4000, 'uncuff') then return end
-	TriggerServerEvent("md-drugs:server:cutheroin", data.data)   
-end)
-
-RegisterNetEvent("md-drugs:client:buyheroinlabkit", function()
-   if not progressbar(Lang.Heroin.secret, 4000, 'uncuff') then return end
-	TriggerServerEvent("md-drugs:server:getheroinlabkit")
-end)
-
-RegisterNetEvent("md-drugs:client:setheroinlabkit")
-AddEventHandler("md-drugs:client:setheroinlabkit", function() 
-if herointable then   
-   Notify(Lang.Heroin.tableout, 'error')
-else
-local PedCoords = GetEntityCoords(PlayerPedId())
-    if not progressbar(Lang.Heroin.table, 4000, 'uncuff') then TriggerServerEvent('md-drugs:server:getheroinlabkitback') return end
-    herointable = true
-	local heroinlabkit = CreateObject("v_ret_ml_tablea", PedCoords.x+1, PedCoords.y+1, PedCoords.z-1, true, false)
-	PlaceObjectOnGroundProperly(heroinlabkit)
-    local  options = {
-        { event = "md-drugs:client:heatliquidheroin", icon = "fas fa-box-circle-check", label = "Cook Heroin", data = heroinlabkit},
-        { event = "md-drugs:client:getheroinkitback", icon = "fas fa-box-circle-check", label = "Pick Up",     data = heroinlabkit, canInteract = function() if herointable then return true end end},
-     }
-    if Config.oxtarget then
-        exports.ox_target:addLocalEntity(heroinlabkit, options)
-    else
-	    exports['qb-target']:AddTargetEntity(heroinlabkit, {options = options})
-    end    
+    },
+    {
+        icon = Bridge.Language.Locale('heroin.targetPickupIcon'),
+        label = Bridge.Language.Locale('heroin.targetPickup'),
+        action = function()
+            if not progressbar(Bridge.Language.Locale('heroin.pbPickup')) then return end
+            herointable = false
+            DeleteObject(heroinlabkit)
+            TriggerServerEvent("md-drugs:server:getheroinlabkitback")
+        end,
+        canInteract = function()
+            if not dirty then return true end
+            return false
+        end
+    },
+    {
+        icon = Bridge.Language.Locale('heroin.targetCleanIcon'),
+        label = Bridge.Language.Locale('heroin.targetClean'),
+        action = function()
+            if not itemCheck('cleaningkit') then return end
+            if not progressbar(Bridge.Language.Locale('heroin.pbClean'), 4000, 'clean') then return end
+	        local done = Bridge.Callback.Trigger('md-drugs:server:removeCleaningKitHeroin', false)
+            if done then dirty = false end
+        end,
+        canInteract = function()
+            if dirty then return true end
+            return false
+        end
+    }})
+    targets[#targets+1] = heroinlabkit
 end
-end)
 
-
-RegisterNetEvent("md-drugs:client:heatliquidheroin", function(data) 
-local PedCoords = GetEntityCoords(PlayerPedId())
-    if not ItemCheck('emptyvial') then return end
-    if not minigame(2, 8) then
-        TriggerServerEvent("md-drugs:server:failheatingheroin")
-		DeleteObject(data.data)
-		Wait(100)
-		local dirtylabkitheroin = CreateObject("v_ret_ml_tablea", PedCoords.x+1, PedCoords.y+1, PedCoords.z-1, true, false)
-		loadParticle("core")
-	    heroinkit = StartParticleFxLoopedOnEntity("exp_air_molotov", dirtylabkitheroin, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.5, false, false, false)
-        SetParticleFxLoopedAlpha(heroinkit, 3.0)
-		SetPedToRagdoll(PlayerPedId(), 1300, 1300, 0, 0, 0, 0)
-        local options = {
-            {   event = "md-drugs:client:cleanheroinlabkit",   icon = "fas fa-box-circle-check",   label = "Clean It", data = dirtylabkitheroin}
+for k, v in pairs (locations.dryplant) do
+    Bridge.Target.AddBoxZone('dryHeroin'..k,   v.loc, v.size, v.loc.w or 180.0,   {
+        {
+            label = Bridge.Language.Locale('heroin.targetDry'),
+            icon = Bridge.Language.Locale('heroin.dryIcon'),
+            action = function()
+                if not progressbar(Bridge.Language.Locale('heroin.pbDry')) then return end
+	            TriggerServerEvent("md-drugs:server:dryplant", k)
+            end,
+            canInteract = function()
+                return handleGang(v.gang)
+            end
         }
-        if Config.oxtarget then
-            exports.ox_target:addLocalEntity(dirtylabkitheroin,options )
-        else
-		    exports['qb-target']:AddTargetEntity(dirtylabkitheroin, {options = options})
-        end    
-	return end
-   if not progressbar(Lang.Heroin.success, 4000, 'uncuff') then return end
-    TriggerServerEvent("md-drugs:server:heatliquidheroin")
+    })
+    targets[#targets+1] = 'dryHeroin'..k
+end
+
+for k, v in pairs (locations.cutheroinone) do
+    Bridge.Target.AddBoxZone('cutHeroin'..k, v.loc, v.size, v.loc.w or 180.0,  {
+        {
+            label = Bridge.Language.Locale('heroin.targetCutHeroin'),
+            icon = Bridge.Language.Locale('heroin.cutIcon'),
+            action = function()
+                if not itemCheck('bakingsoda') then return end
+	            if not progressbar(Bridge.Language.Locale('heroin.pbCutHeroin')) then return end
+	            TriggerServerEvent("md-drugs:server:cutheroin", k)
+            end,
+            canInteract = function()
+                return handleGang(v.gang)
+            end
+        }
+    })
+    targets[#targets+1] = 'cutHeroin'..k
+end
+
+local peds = {}
+for k, v in pairs (locations.buyKit) do
+    requestModel(v.ped, 1000)
+    peds[k] = CreatePed(4, v.ped, v.loc.x, v.loc.y, v.loc.z, v.loc.w, false, false)
+    Freeze(peds[k], true, v.loc.w)
+    SetBlockingOfNonTemporaryEvents(peds[k], true)
+    SetEntityInvincible(peds[k], true)
+    Bridge.Target.AddLocalEntity(peds[k], {
+        {
+            label = Bridge.Language.Locale('heroin.targetBuyKit'),
+            icon = Bridge.Language.Locale('heroin.buyIcon'),
+            action = function()
+               if not progressbar(Bridge.Language.Locale('heroin.pbBuyKit')) then return end
+	            TriggerServerEvent("md-drugs:server:getheroinlabkit", k)
+            end,
+            canInteract = function()
+				if not handleGang(v.gang) then return false end
+				return true
+			end
+        }
+    })
+    targets[#targets+1] = peds[k]
+end
+
+
+Bridge.Callback.Register("md-drugs:client:setheroinlabkit", function() 
+    if herointable then
+       Bridge.Notify.SendNotify(Bridge.Language.Locale('heroin.tableout'), 'error')
+       return false
+    else
+        herointable = true
+        local location, head = StartRay()
+        if not location then herointable = false return end
+        if not progressbar(Bridge.Language.Locale('heroin.placing')) then return end
+    	createLabKit(location, head)
+        return true, location
+    end
 end)
 
-
-RegisterNetEvent("md-drugs:client:cleanheroinlabkit", function(data)
-    if not ItemCheck('cleaningkit') then return end
-    if not progressbar(Lang.Heroin.clean, 4000, 'clean') then return end
-	TriggerServerEvent("md-drugs:server:removecleaningkitheroin", data.data)
-end)
-
-RegisterNetEvent("md-drugs:client:deletedirtyheroin", function(data) 
-DeleteObject(data)
-herointable = false
-Wait(1000)
-TriggerEvent("md-drugs:client:setheroinlabkit")
-end)
-
-
-
-RegisterNetEvent("md-drugs:client:getheroinkitback", function(data) 
-   if not progressbar(Lang.Heroin.pickup, 4000, 'uncuff') then return end
-    herointable = false
-    DeleteObject(data.data)
-    TriggerServerEvent("md-drugs:server:getheroinlabkitback")
-end)
-
-
-RegisterNetEvent("md-drugs:client:fillneedle", function(data) 
-    if not minigame(2, 8) then TriggerServerEvent("md-drugs:server:failheroin", data.data) return end
-   if not  progressbar(Lang.Heroin.needles, 4000, 'uncuff') then return end
-    TriggerServerEvent("md-drugs:server:fillneedle", data.data)
-end)
-
-
+for k, v in pairs (locations.fillneedle) do
+    Bridge.Target.AddBoxZone('fillNeedle'..k, v.loc, v.size, v.loc.w or 180.0, {
+        {
+            label = Bridge.Language.Locale('heroin.targetFill'),
+            icon = Bridge.Language.Locale('heroin.fillNeedleIcon'),
+            action = function()
+                if not minigame() then TriggerServerEvent("md-drugs:server:failheroin", k) return end
+                if not progressbar(Bridge.Language.Locale('heroin.pbFill')) then return end
+                TriggerServerEvent("md-drugs:server:fillneedle", k)
+            end,
+            canInteract = function()
+                return handleGang(v.gang)
+            end
+        }
+    })
+    targets[#targets+1] = 'fillNeedle'..k
+end

client/lean.lua

@@ -1,22 +1,130 @@
-local QBCore = exports['qb-core']:GetCoreObject()
+if not Config.Drugs['lean'] then return end
+local started = false
+local leanCar = nil
 
-CreateThread(function()
-	local current = "s_m_m_doctor_01"
-	lib.requestModel(current, Config.RequestModelTime)
-	local SyrupLocation = CreatePed(0, current,Config.SyrupVendor.x,Config.SyrupVendor.y,Config.SyrupVendor.z-1, Config.SyrupVendor.w, false, false)
-    Freeze(SyrupLocation, true, Config.SyrupVendor.w)
-    local options = {
-        { type = "client", label = "Get Task", icon = "fas fa-eye", event = "md-drugs:client:getsyruplocationtobuy", distance = 2.0},
-    }
-    if Config.oxtarget then
-        exports.ox_target:addLocalEntity(SyrupLocation, options)
-    else
-	    exports['qb-target']:AddTargetEntity(SyrupLocation, { options = options, distance = 2.0})
-    end    
-end)
+local location = Config.Lean.Locations
 
+local function SpawnCarPedChase(loc)
+	local stoploc = vector3(-1157.63, -3056.71, 13.94)
+	local start = location.StartLoc[math.random(1,#location.StartLoc)]
 
-RegisterNetEvent("md-drugs:client:getsyruplocationtobuy", function() 
-Notify(Lang.Lean.marked, "success")
-SpawnCarPedChase()
-end)
+	if started then Bridge.Notify.SendNotify(Bridge.Language.Locale('lean.alreadyChasing'), 'error') return end
+    started = true
+
+    requestModel("pounder", 30000)
+    requestModel("ig_priest", 30000)
+    requestModel("cargobob3", 30000)
+
+    leanCar = CreateVehicle("pounder", start.x+3, start.y-2, start.z-1, 52.0, true, false)
+    local driver = CreatePed(26, "ig_priest", start.x, start.y, start.z, 268.9422, false, false)
+    local pilot2 = CreatePed(26, "ig_priest", stoploc.x-3, stoploc.y-3, stoploc.z-1, 268.9422, false, false)
+	local can = Bridge.Callback.Trigger('md-drugs:server:registerLean', loc, NetworkGetNetworkIdFromEntity(leanCar))
+
+	if not can then
+		Bridge.Notify.SendNotify(Bridge.Language.Locale('lean.cantStart'), 'error')
+		DeleteVehicle(leanCar)
+		DeleteEntity(driver)
+		DeleteEntity(pilot2)
+		started = false
+		return
+	end
+	Bridge.Notify.SendNotify(Bridge.Language.Locale('lean.chaseStarted'), 'success')
+	SetPedIntoVehicle(pilot2, leanCar, 1)
+	FreezeEntityPosition(driver, true)
+	FreezeEntityPosition(pilot2, true)
+	SetEntityInvincible(pilot2, true)
+    SetEntityAsMissionEntity(leanCar)
+    AddBlipForEntity(leanCar)
+    SetPedIntoVehicle(driver, leanCar, -1)
+    SetPedFleeAttributes(driver,false)
+    TaskVehicleDriveToCoordLongrange(driver, leanCar, stoploc.x, stoploc.y, stoploc.z-1, 50.0, 524288, 25.0)
+    SetPedKeepTask(driver, true)
+
+	repeat
+		Wait(1000)
+	until #(GetEntityCoords(driver) - stoploc) < 20.0 or GetEntityHealth(driver) == 0
+
+	RemoveBlip(leanCar)
+
+	if GetEntityHealth(driver) == 0 then
+		Bridge.Target.AddLocalEntity(leanCar, {
+			{
+				name = 'leancar',
+				icon = Bridge.Language.Locale('lean.carIcon'),
+				label = Bridge.Language.Locale('lean.stealFromTruck'),
+				action = function()
+					if not minigame() then return end
+					TriggerServerEvent('md-drugs:server:givelean')
+					started = false
+					DeleteEntity(driver)
+					DeleteEntity(pilot2)
+				end
+			}
+		})
+		targets[#targets+1] = leanCar
+	else
+		DeleteEntity(driver)
+		DeleteEntity(pilot2)
+	end
+end
+
+local leanPeds = {}
+for k, v in pairs (location.SyrupVendor) do
+	requestModel(v.ped)
+	leanPeds[k] = CreatePed(0, v.ped, v.loc.x, v.loc.y, v.loc.z, false, false)
+	Freeze(leanPeds[k], true, v.loc.w)
+	Bridge.Target.AddLocalEntity(leanPeds[k], {
+		{
+			icon = Bridge.Language.Locale('lean.startMissionIcon'),
+			label = Bridge.Language.Locale('lean.startMission'),
+			action = function()
+				SpawnCarPedChase(k)
+			end,
+			canInteract = function()
+				if not handleGang(v.gang) then return false end
+				return true
+			end
+		},
+	})
+	targets[#targets+1] = leanPeds[k]
+end
+
+local function concat(tbl)
+	local str = ""
+	for k, v in pairs (tbl) do
+		str = str .. v.item .. " X  " .. v.amount .. "  \n  "
+	end
+	return str
+end
+
+local function getDisabled(recipe)
+	for k, v in pairs (recipe.ingredients) do
+		local count = Bridge.Inventory.GetItemCount(v.item)
+		if count < v.amount then
+			return true
+		end
+	end
+	return false
+end
+
+RegisterNetEvent("md-drugs:client:makeLean", function()
+	local menu = {}
+	for k, v in pairs (Config.Lean.Recipes) do
+		menu[#menu+1] = {
+			title = Bridge.Inventory.GetItemInfo(v.item).label,
+			description = concat(v.ingredients),
+			icon = Bridge.Inventory.GetItemInfo(v.item).image,
+			disabled = getDisabled(v),
+			onSelect = function()
+				if not progressbar(Bridge.Language.Locale('lean.makingLean')) then return end
+				TriggerServerEvent('md-drugs:server:makeLean', k)
+			end,
+		}
+	end
+	Bridge.Menu.Open({
+		id = 'makeLeanMenu',
+		title = Bridge.Language.Locale('lean.makeLeanMenuTitle'),
+		description = Bridge.Language.Locale('lean.makeLeanMenuDesc'),
+		options = menu
+	})
+end)

client/lsd.lua

@@ -1,141 +1,183 @@
-local QBCore = exports['qb-core']:GetCoreObject()
+if not Config.Drugs['lsd'] then return end
 local tableout = false
+local dirtylsd = false
+local locations = Config.LSD.Locations
 
-
-local function loadParticle(dict)
-    if not HasNamedPtfxAssetLoaded(dict) then
-        RequestNamedPtfxAsset(dict)
-    end
-    while not HasNamedPtfxAssetLoaded(dict) do
-        Wait(0)
-    end
-    SetPtfxAssetNextCall(dict)
-end
-
-CreateThread(function() 
-local Ped = "g_m_y_famdnf_01"
-	lib.requestModel(Ped, Config.RequestModelTime)
-	local tabdealer = CreatePed(0, Ped,Config.buylsdlabkit.x,Config.buylsdlabkit.y,Config.buylsdlabkit.z-1, Config.buylsdlabkit.w, false, false)
-    Freeze(tabdealer, true, Config.buylsdlabkit.w)
-    local options = {
-        { type = "client", label = "Buy LSD Lab Kit", icon = "fas fa-eye", event = "md-drugs:client:buylabkit", distance = 2.0}
-     }
-    if Config.oxtarget then
-        exports.ox_target:addLocalEntity(tabdealer, options)
-    else 
-	    exports['qb-target']:AddTargetEntity(tabdealer, {options = options, distance = 2.0})
-    end    
-end)
-
-
-RegisterNetEvent("md-drugs:client:getlysergic", function(data) 
-    if not minigame(2, 8) then return end
-	if not progressbar(Lang.lsd.steallys, 4000, 'uncuff') then return end
-    TriggerServerEvent("md-drugs:server:getlysergic",data.data)
-end)
-
-
-RegisterNetEvent("md-drugs:client:getdiethylamide", function(data) 
-    if not minigame(2, 8) then return end
-	if not progressbar(Lang.lsd.stealdie, 4000, 'uncuff') then return end
-    TriggerServerEvent('md-drugs:server:getdiethylamide', data.data)
-end)
-
-RegisterNetEvent("md-drugs:client:setlsdlabkit")
-AddEventHandler("md-drugs:client:setlsdlabkit", function()
-if tableout then 
-    Notify(Lang.lsd.tableout, 'error')
-    TriggerServerEvent('md-drugs:server:getlabkitback')
-else
-    tableout = true
-    local PedCoords = GetEntityCoords(PlayerPedId())
-	if not progressbar(Lang.lsd.place, 4000, 'uncuff') then TriggerServerEvent('md-drugs:server:getlabkitback') return end
-	local labkit = CreateObject("v_ret_ml_tablea", PedCoords.x+1, PedCoords.y+1, PedCoords.z-1, true, false)
+local function createLabKit(coord, head)
+    requestModel("v_ret_ml_tablea")
+    local labkit = CreateObject("v_ret_ml_tablea", coord.x, coord.y, coord.z - 1, true, false)
+    SetEntityHeading(labkit, head)
     PlaceObjectOnGroundProperly(labkit)
-	
+    FreezeEntityPosition(labkit, true)
+    tableout = true
     local options = {
-        { event = "md-drugs:client:heatliquid", icon = "fas fa-box-circle-check", label = "Heat Liquid" ,    data = labkit, },
-        { event = "md-drugs:client:refinequalityacid", icon = "fas fa-box-circle-check", label = "Refine",   data = labkit, },
-		{ event = "md-drugs:client:maketabpaper", icon = "fas fa-box-circle-check", label = "Dab Sheets",    data = labkit, },
-		{ event = "md-drugs:client:getlabkitback", icon = "fas fa-box-circle-check", label = "Pick Up",      data = labkit, canInteract = function() if tableout then return true end end},
-    }
-    if Config.oxtarget then
-        exports.ox_target:addLocalEntity(labkit, options)
-    else
-	    exports['qb-target']:AddTargetEntity(labkit, {options = options})
-    end    
-end
-end)
-
-RegisterNetEvent("md-drugs:client:getlabkitback", function(data) 
-    if not progressbar(Lang.lsd.tablepack, 4000, 'uncuff') then return end
-	DeleteObject(data.data)
-	TriggerServerEvent('md-drugs:server:getlabkitback')
-    tableout = false
-end)
-
-RegisterNetEvent("md-drugs:client:heatliquid", function(data) 
-	local PedCoords = GetEntityCoords(PlayerPedId())
-	dict = "scr_ie_svm_technical2"
-    if not ItemCheck('lysergic_acid') then return end
-    if not ItemCheck('diethylamide') then return end
-	if not minigame(2, 8) then
-        TriggerServerEvent("md-drugs:server:failheating")
-		DeleteObject(data.data)
-		local dirtylabkit = CreateObject("v_ret_ml_tablea", PedCoords.x+1, PedCoords.y+1, PedCoords.z-1, true, false)
-		loadParticle(dict)
-	    exitPtfx = StartParticleFxLoopedOnEntity("scr_dst_cocaine", dirtylabkit, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.5, false, false, false)
-		PlaceObjectOnGroundProperly(dirtylabkit)
-        SetParticleFxLoopedAlpha(exitPtfx, 3.0)
-		local options = {
-            { event = "md-drugs:client:cleanlabkit", icon = "fas fa-box-circle-check", label = "Clean It", data = dirtylabkit },
+        {
+            icon = Bridge.Language.Locale('lsd.targetHeatIcon'),
+            label = Bridge.Language.Locale('lsd.targetHeat'),
+            action = function()
+	            if not minigame() then
+                    local coords = GetEntityCoords(labkit)
+                    AddExplosion(coords.x, coords.y, coords.z-1.0, 34, 0.0, true, false, true)
+                    dirtylsd = true
+                    TriggerServerEvent("md-drugs:server:failheating")
+                    return
+                end
+                if not progressbar(Bridge.Language.Locale('lsd.heating'), 7000) then return end
+                TriggerServerEvent("md-drugs:server:heatliquid")
+            end,
+            canInteract = function()
+                if not dirtylsd then return true end
+            end
+        },
+        {
+            icon = Bridge.Language.Locale('lsd.targetRefineIcon'),
+            label = Bridge.Language.Locale('lsd.targetRefine'),
+            action = function()
+                if not itemCheck('lsd_one_vial') then return end
+                if not minigame() then TriggerServerEvent("md-drugs:server:failrefinequality") return end
+                if not progressbar(Bridge.Language.Locale('lsd.refining')) then return end
+                TriggerServerEvent("md-drugs:server:refinequalityacid")
+            end,
+            canInteract = function()
+                if not dirtylsd then return true end
+            end
+        },
+        {
+            icon = Bridge.Language.Locale('lsd.targetDippingIcon'),
+            label = Bridge.Language.Locale('lsd.targetDipping'),
+            action = function()
+                if not itemCheck('tab_paper') then return end
+                if not minigame() then TriggerServerEvent("md-drugs:server:failtabs") return end
+                if not progressbar(Bridge.Language.Locale('lsd.dipping')) then return end
+                TriggerServerEvent("md-drugs:server:maketabpaper")
+            end,
+            canInteract = function()
+                if not dirtylsd then return true end
+            end
+        },
+        {
+            icon = Bridge.Language.Locale('lsd.targetPickupIcon'),
+            label = Bridge.Language.Locale('lsd.targetPickup'),
+            action = function()
+                if not progressbar(Bridge.Language.Locale('lsd.packup')) then return end
+	            DeleteObject(labkit)
+	            TriggerServerEvent('md-drugs:server:getlabkitback')
+                tableout = false
+            end,
+            canInteract = function()
+                if not dirtylsd then return true end
+            end
+        },
+        {
+            icon = Bridge.Language.Locale('lsd.targetCleanIcon'),
+            label = Bridge.Language.Locale('lsd.targetClean'),
+            action = function()
+                if not itemCheck('cleaningkit') then return end
+                if not progressbar(Bridge.Language.Locale('lsd.cleaning'), 4000, 'clean') then return end
+                local check = Bridge.Callback.Trigger('md-drugs:server:removecleaningkit')
+                if check then
+                    dirtylsd = false
+                end
+            end,
+            canInteract = function() if dirtylsd then return true end end
         }
-        if Config.oxtarget then
-            exports.ox_target:addLocalEntity(dirtylabkit, options)
-        else    
-	        exports['qb-target']:AddTargetEntity(dirtylabkit, { options = options})
-        end
-        return end
-    if not progressbar(Lang.lsd.heat, 7000, 'uncuff') then return end
-    TriggerServerEvent("md-drugs:server:heatliquid")
-end)
-
-RegisterNetEvent("md-drugs:client:cleanlabkit", function(data)
-    if not ItemCheck('cleaningkit')  then return end
-    if not progressbar(Lang.lsd.clean, 4000, 'clean') then return end
-    tableout = false
-	TriggerServerEvent("md-drugs:server:removecleaningkit", data.data)
-end)
-
-
-RegisterNetEvent("md-drugs:client:resetlsdkit", function(data) 
-DeleteObject(data)
-TriggerEvent("md-drugs:client:setlsdlabkit")
-end)
-
-
-RegisterNetEvent("md-drugs:client:refinequalityacid", function()
-    if not ItemCheck('lsd_one_vial')  then return end 
-    if not minigame(2, 8) then TriggerServerEvent("md-drugs:server:failrefinequality") return end
-    if not progressbar(Lang.lsd.refine, 4000, 'uncuff') then return end
-    TriggerServerEvent("md-drugs:server:refinequalityacid")
-end)
-
-RegisterNetEvent("md-drugs:client:maketabpaper", function()
-    if not ItemCheck('tab_paper')  then return end 
-    if not minigame(2, 8) then TriggerServerEvent("md-drugs:server:failtabs") return end
-	if not progressbar(Lang.lsd.dip, 4000, 'uncuff') then return end
-    TriggerServerEvent("md-drugs:server:maketabpaper")
-end)
-
-RegisterNetEvent("md-drugs:client:buytabs", function(data) 
-	if not progressbar(Lang.lsd.buypaper, 4000, 'uncuff') then return end
-    TriggerServerEvent("md-drugs:server:gettabpaper", data.data)
-end)
-
-
-RegisterNetEvent("md-drugs:client:buylabkit", function()
-    if QBCore.Functions.HasItem('lsdlabkit') then Notify('You Have One Idiot', 'error') return end 
-	if not progressbar(Lang.lsd.buykit, 4000, 'uncuff') then return end
-	TriggerServerEvent("md-drugs:server:getlabkit")
+    }
+    Bridge.Target.AddLocalEntity(labkit, options)
+    targets[#targets+1] = labkit
+end
+
+for k, v in pairs (locations.lysergicacid) do 
+    Bridge.Target.AddBoxZone('lysergicacid'..k,v.loc, v.size, v.loc.w or 180.0, {
+        {
+            label = Bridge.Language.Locale('lsd.targetLys'),
+            icon = Bridge.Language.Locale('lsd.targetLysIcon'),
+            action = function()
+                if not minigame() then TriggerServerEvent("md-drugs:server:faillysergic") return end
+                if not progressbar(Bridge.Language.Locale('lsd.stealLys')) then return end
+                TriggerServerEvent("md-drugs:server:getlysergic", k)
+            end,
+            canInteract = function()
+                if not handleGang(v.gang) then return false end
+                return true
+            end
+        }
+    })
+    targets[#targets+1] = 'lysergicacid'..k
+end
+
+for k, v in pairs (locations.diethylamide) do 
+    Bridge.Target.AddBoxZone('diethylamide'..k, v.loc, v.size, v.loc.w or 180.0, {
+        {
+            label = Bridge.Language.Locale('lsd.targetDie'),
+            icon = Bridge.Language.Locale('lsd.targetDieIcon'),
+            action = function()
+                if not minigame() then TriggerServerEvent("md-drugs:server:faildiethylamide") return end
+                if not progressbar(Bridge.Language.Locale('lsd.stealDie')) then return end
+                TriggerServerEvent("md-drugs:server:getdiethylamide", k)
+            end,
+            canInteract = function()
+                if not handleGang(v.gang) then return false end
+                return true
+            end
+        }
+    })
+    targets[#targets+1] = 'diethylamide'..k
+end
+
+for k, v in pairs (locations.gettabs) do
+    Bridge.Target.AddBoxZone('gettabs'..k, v.loc, v.size, v.loc.w or 180.0, {
+        {
+            label = Bridge.Language.Locale('lsd.targetBuyTab'),
+            icon = Bridge.Language.Locale('lsd.targetBuyTabIcon'),
+            action = function()
+                TriggerServerEvent("md-drugs:server:gettabpaper", k)
+            end,
+            canInteract = function()
+                if not handleGang(v.gang) then return false end
+                return true
+            end
+        }
+    })
+    targets[#targets+1] = 'gettabs'..k
+end
+
+local seller = {}
+for k, v in pairs (locations.buyLSDkit) do
+    requestModel(v.ped, 1000)
+    seller[k] = CreatePed(4, v.ped, v.loc.x, v.loc.y, v.loc.z, v.loc.w, false, false)
+    Freeze(seller[k], true, v.loc.w)
+    Bridge.Target.AddLocalEntity(seller[k], {
+        {
+            label = Bridge.Language.Locale('lsd.targetBuyKit'),
+            icon = Bridge.Language.Locale('lsd.targetBuyKitIcon'),
+            action = function()
+                if Bridge.Inventory.HasItem('lsdlabkit') then
+                    Bridge.Notify.SendNotify(Bridge.Language.Locale('lsd.alreadyOwn'), 'error')
+                    return
+                end
+                if not progressbar(Bridge.Language.Locale('lsd.buyingKit')) then return end
+                TriggerServerEvent('md-drugs:server:getlabkit', k)
+            end,
+            canInteract = function()
+                if not handleGang(v.gang) then return false end
+                return true
+            end
+        }
+    })
+    targets[#targets+1] = seller[k]
+end
+
+Bridge.Callback.Register("md-drugs:client:setlsdlabkit", function()
+    if tableout then
+        Bridge.Notify.SendNotify(Bridge.Language.Locale('lsd.tableout'), 'error')
+        return false
+    else
+        tableout = true
+        local loc, head = StartRay()
+        if not loc then tableout = false return end
+        if not progressbar(Bridge.Language.Locale('lsd.placing')) then return end
+        createLabKit(loc, head)
+        return true, loc
+    end
+
 end)

client/mescaline.lua

@@ -1,115 +1,55 @@
-local QBCore = exports['qb-core']:GetCoreObject()
-local Mescaline = {}
-
-function LoadModel(hash)
-    hash = GetHashKey(hash)
-    RequestModel(hash)
-    while not HasModelLoaded(hash) do
-        Wait(3000)
-    end
-end 
-
-RegisterNetEvent('Mescaline:respawnCane', function(loc)
-    local v = GlobalState.Mescaline[loc]
-    local hash = GetHashKey(v.model)
-    if not Mescaline[loc] then
-        Mescaline[loc] = CreateObject(hash, v.location, false, true, true)
-        Freeze(Mescaline[loc], true, v.heading)
-        exports['qb-target']:AddTargetEntity(Mescaline[loc], {
-        options = { 
-            {icon = "fas fa-hand",label = "pick Cactus",action = function()    if not progressbar(Lang.mescaline.pick, 4000, 'uncuff') then return end    TriggerServerEvent("Mescaline:pickupCane", loc)end}
-        },
-        distance = 2.5
-        })
-    end
-end)
+if not Config.Drugs['mescaline'] then return end
+local badTrip = 100
+local locations = Config.Mescaline.Locations
+local function AlienEffect()
+	CreateThread(function()
+    StartScreenEffect("DrugsMichaelAliensFightIn", 3.0, 0)
+    StartScreenEffect("DrugsMichaelAliensFight", 3.0, 0)
+    Wait(math.random(25000, 35000))
+    StartScreenEffect("DrugsMichaelAliensFightOut", 3.0, 0)
+    StopScreenEffect("DrugsMichaelAliensFightIn")
+    StopScreenEffect("DrugsMichaelAliensFight")
+    StopScreenEffect("DrugsMichaelAliensFightOut")
+	end)
+end
 
 
-
-RegisterNetEvent('Mescaline:removeCane', function(loc)
-    if DoesEntityExist(Mescaline[loc]) then DeleteEntity(Mescaline[loc]) end
-    Mescaline[loc] = nil
-end)
-
-
-
-RegisterNetEvent("Mescaline:init", function()
-    for k, v in pairs (GlobalState.Mescaline) do
-        local hash = GetHashKey(v.model)
-        if not HasModelLoaded(hash) then LoadModel(hash) end
-        if not v.taken then
-            Mescaline[k] = CreateObject(hash, v.location.x, v.location.y, v.location.z, false, true, true)
-            Freeze(Mescaline[k], true, v.heading)
-            exports['qb-target']:AddTargetEntity(Mescaline[k], {
-                options = { { icon = "fas fa-hand", label = "Pick Mescaline", action = function()  if not progressbar(Lang.mescaline.pick, 4000, 'uncuff') then return end  TriggerServerEvent("Mescaline:pickupCane", k) end}
-            },
-            distance = 2.5
-            })
-        end
-    end
-end)
-
-AddEventHandler('onResourceStart', function(resource)
-    if resource == GetCurrentResourceName() then
-        LoadModel('prop_cactus_03')
-        TriggerEvent('Mescaline:init')
-    end
- end)
- 
- RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function()
-     Wait(3000)
-     LoadModel('prop_cactus_03')
-     TriggerEvent('Mescaline:init')
- end)
- 
- AddEventHandler('onResourceStop', function(resourceName)
-    if GetCurrentResourceName() == resourceName then
-        SetModelAsNoLongerNeeded(GetHashKey('prop_cactus_03'))
-        for k, v in pairs(Mescaline) do
-            if DoesEntityExist(v) then
-                DeleteEntity(v) SetEntityAsNoLongerNeeded(v)
-            end
-        end
-    end
-end)
-
-
-
-RegisterNetEvent("md-drugs:client:drymescaline", function()
-    if not ItemCheck('cactusbulb')  then return end 
-	if not progressbar(Lang.mescaline.dry, 4000, 'uncuff') then return end
-	TriggerServerEvent("md-drugs:server:drymescaline")
-end)
-
+for k, v in pairs (locations.DryOutMescaline) do
+	Bridge.Target.AddBoxZone('dryoutMesc'..k, v.loc, v.size, v.loc.w or 180.0,{
+		{
+			label = Bridge.Language.Locale('mesc.targetDry'),
+			icon = 'fa-solid fa-temperature-high',
+			action = function()
+				if not itemCheck('cactusbulb') then return end
+				if not progressbar(Bridge.Language.Locale('mesc.dry')) then return end
+				TriggerServerEvent("md-drugs:server:drymescaline", k)
+			end,
+			canInteract = function()
+				if not handleGang(v.gang) then return false end
+				return true
+			end
+		}
+	})
+	targets[#targets+1] = 'dryoutMesc'..k
+end
 
 RegisterNetEvent("md-drugs:client:takemescaline", function()
-local chance = math.random(1,100)
-local chance2 = math.random(1,100)
-    if not progressbar(Lang.mescaline.eat, 4000, 'uncuff') then return end
-	if chance <= Config.Badtrip then 
+    local chance, chance2 = math.random(1,100), math.random(1,100)
+    local weapon = ''
+    if chance2 == 100 then weapon = 'weapon_rpg' else weapon = 'weapon_flaregun' end
+    if not progressbar(Bridge.Language.Locale('mesc.eat')) then return end
+	if chance <= badTrip then
 		AlienEffect()
-		clone = ClonePed(PlayerPedId(), false, false, true)
+		Wait(math.random(3000,6000))
+		local clone = ClonePed(PlayerPedId(), true, true, true)
 		SetEntityAsMissionEntity(clone)
-		SetEntityVisible(clone, true)
-		SetPedRelationshipGroupHash(clone)
-		SetPedAccuracy(clone)
-		SetPedArmour(clone)
-		SetPedCanSwitchWeapon(clone, true)
 		SetPedFleeAttributes(clone, false)
-		if chance2 <= 99 then
-			GiveWeaponToPed(clone, "weapon_flaregun", 1, false, true)
-			TaskCombatPed(clone, PlayerPedId(), 0, 16)
-			SetPedCombatAttributes(clone, 46, true)
-			Wait(1000 * 30)
-			DeleteEntity(clone)
-		else
-			GiveWeaponToPed(clone, "weapon_rpg", 1, false, true)
-			TaskCombatPed(clone, PlayerPedId(), 0, 16)
-			SetPedCombatAttributes(clone, 46, true)
-			Wait(1000 * 30)
-			DeleteEntity(clone)
-		end
+		GiveWeaponToPed(clone, weapon, 1, false, true)
+		TaskCombatPed(clone, PlayerPedId(), 0, 16)
+		SetPedCombatAttributes(clone, 46, true)
+		Wait(1000 * 30)
+        DeleteEntity(clone)
 	else
 		AlienEffect()
-	end	
+	end
 end)

client/meth.lua

@@ -1,225 +1,452 @@
-local QBCore = exports['qb-core']:GetCoreObject()
-local amonia = nil
-local tray = nil
-local heated = nil
-local active = nil
+if not Config.Drugs['meth'] then return end
+local amonia, tray, heated, active, trays, startedmeth, methVan = false, false, false, false, nil, false, nil
+local locations = Config.Meth.Locations
+--- meth heist 
 
-local function startcook()
-	if amonia == nil then
+
+local function SpawnMethCarPedChase(loc)
+	local stoploc = vector3(-1157.63, -3056.71, 13.94)
+	local start = locations.StartLoc[math.random(1,#locations.StartLoc)]
+	if startedmeth then
+		Bridge.Notify.SendNotify(Bridge.Language.Locale('meth.alreadyChasing'),'error')
+	else
+	    startedmeth = true
+	    requestModel("journey", 30000)
+	    requestModel("a_m_m_hillbilly_02", 30000)
+	    requestModel("cargobob3", 30000)
+	    methVan = CreateVehicle("journey", start.x+3, start.y-2, start.z-1, 52.0, true, false)
+	    local methdriver = CreatePed(26, "a_m_m_hillbilly_02", start.x, start.y, start.z, 268.9422, false, false)
+	    local methpilot = CreatePed(26, "a_m_m_hillbilly_02", stoploc.x-3, stoploc.y-3, stoploc.z-1, 268.9422, false, false)
+		local can = Bridge.Callback.Trigger('md-drugs:server:registerMeth', loc, NetworkGetNetworkIdFromEntity(methVan))
+		if not can then
+			startedmeth = false
+			DeleteVehicle(methVan)
+			DeleteEntity(methdriver)
+			DeleteEntity(methpilot)
+			return
+		end
+		FreezeEntityPosition(methpilot, true)
+		SetEntityInvincible(methpilot, true)
+	    SetEntityAsMissionEntity(methVan)
+	    AddBlipForEntity(methVan)
+	    SetPedIntoVehicle(methdriver, methVan, -1)
+	    SetPedFleeAttributes(methdriver,false)
+	    TaskVehicleDriveToCoordLongrange(methdriver, methVan, stoploc.x, stoploc.y, stoploc.z-1, 50.0, 524288, 25.0)
+	    SetPedKeepTask(methdriver, true)
+
+		repeat
+			Wait(1000)
+		until #(GetEntityCoords(methdriver) - stoploc) < 20.0 or GetEntityHealth(methdriver) == 0
+
+		if GetEntityHealth(methdriver) == 0 then
+			Bridge.Target.AddLocalEntity(methVan, {
+				{
+					name = 'methcar',
+					icon = Bridge.Language.Locale('meth.targetStealFromCarIcon'),
+					label = Bridge.Language.Locale('meth.targetStealFromCar'),
+					action = function()
+						if not minigame() then return end
+				 		TriggerServerEvent('md-drugs:server:givemethingridients', NetworkGetNetworkIdFromEntity(methVan))
+				 		startedmeth = false
+						DeleteEntity(methdriver)
+						DeleteEntity(methpilot)
+					end,
+				}
+			})
+		else
+			DeleteVehicle(methVan)
+			DeleteEntity(methdriver)
+			DeleteEntity(methpilot)
+	    end
+	end
+end
+
+local peds = {}
+for k, v in pairs (locations.MethHeist) do
+	peds[k] = CreatePed(4, GetHashKey(v.ped), v.loc.x, v.loc.y, v.loc.z, v.loc.w, false, true)
+	Freeze(peds[k], true, v.loc.w)
+	Bridge.Target.AddLocalEntity(peds[k], {
+		{
+			icon = Bridge.Language.Locale('meth.targetHeistIcon'),
+			label = Bridge.Language.Locale('meth.targetHeist'),
+			action = function()
+				if startedmeth then 
+					Bridge.Notify.SendNotify(Bridge.Language.Locale('meth.alreadyChasing'),'error')
+					return 
+				end
+				SpawnMethCarPedChase(k)
+			end,
+			canInteract = function()
+				return handleGang(v.gang)
+			end
+		}
+	})
+	targets[#targets+1] = peds[k]
+end
+
+---- start animation shit
+local function loadParticle(dict)
+    if not HasNamedPtfxAssetLoaded(dict) then
+        RequestNamedPtfxAsset(dict)
+    end
+    while not HasNamedPtfxAssetLoaded(dict) do
+        Wait(0)
+    end
+    SetPtfxAssetNextCall(dict)
+end
+
+local function dialSuccess(coords)
+	requestModel('hei_prop_heist_thermite', 2000)
+	loadParticle('scr_ornate_heist')
+	local thermite = CreateObject('hei_prop_heist_thermite', coords.x - 0.5, coords.y - 0.5, coords.z -0.5, true, false, false)
+	FreezeEntityPosition(thermite, true)
+	SetEntityVisible(thermite, false)
+	Wait(1000)
+	local therm = StartParticleFxLoopedOnEntity('scr_heist_ornate_thermal_burn', thermite, 0.0, 1.4, 0.0, 0.0, 0.0, 0.0, 1.5, false, false, false)
+	Wait(math.random(10000, 20000))
+	StopParticleFxLooped(therm, true)
+	DeleteObject(thermite)
+end
+
+local function MethCooking(coords, offset, rotation)
+	local animDict, animName = "anim@amb@business@meth@meth_monitoring_cooking@cooking@", "chemical_pour_short_cooker"
+	Bridge.Anim.RequestDict(animDict)
+	SetEntityCoords(PlayerPedId(), coords)
+	local targetPosition = GetEntityCoords(PlayerPedId())
+	local animDuration = GetAnimDuration(animDict, animName) * 800
+	FreezeEntityPosition(PlayerPedId(), true)
+	local scenePos, sceneRot = vector3(coords.x + offset.x, coords.y + offset.y, coords.z + offset.z), rotation
+	local netScene = NetworkCreateSynchronisedScene(scenePos, sceneRot, 2, false, false, 1065353216, 0, 1.3)
+	NetworkAddPedToSynchronisedScene(PlayerPedId(), netScene, animDict, animName, 1.5, -4.0, 1, 16, 1148846080, 0)
+	local sacid = CreateObjectNoOffset("bkr_prop_meth_sacid", targetPosition, 1, 1, 0)
+	NetworkAddEntityToSynchronisedScene(sacid, netScene, animDict, "chemical_pour_short_sacid", 4.0, -8.0, 1)
+	local ammonia = CreateObjectNoOffset("bkr_prop_meth_ammonia", targetPosition, 1, 1, 0)
+	NetworkAddEntityToSynchronisedScene(ammonia, netScene, animDict, "chemical_pour_short_ammonia", 4.0, -8.0, 1)
+	NetworkStartSynchronisedScene(netScene)
+	Wait(animDuration)
+	NetworkStopSynchronisedScene(netScene)
+	DeleteObject(sacid) DeleteObject(ammonia)
+	FreezeEntityPosition(PlayerPedId(), false)
+end
+
+
+local function SmashMeth(coords, offset, rotation)
+	local ver = ""
+	local animDict, animName = "anim@amb@business@meth@meth_smash_weight_check@", "break_weigh_"..ver.."char02"
+	Bridge.Anim.RequestDict(animDict, 500)
+	local ped = PlayerPedId()
+	local targetPosition = coords
+	SetEntityCoords(ped, targetPosition)
+	Wait(1)
+	local animDuration = GetAnimDuration(animDict, animName) * 800
+	FreezeEntityPosition(ped, true)
+	local scenePos, sceneRot = vector3(coords.x + offset.x, coords.y + offset.y, coords.z + offset.z), rotation
+	local netScene = NetworkCreateSynchronisedScene(scenePos, sceneRot, 2, false, false, 1065353216, 0, 1.3)
+	NetworkAddPedToSynchronisedScene(ped, netScene, animDict, animName, 1.5, -4.0, 1, 16, 1148846080, 0)
+	local objects, sceneObjects = {}, {
+		{	hash = "w_me_hammer",	animName = "break_weigh_" .. ver .. "hammer"},
+		{	hash = "bkr_Prop_Meth_SmashedTray_01_frag_",	animName = "break_weigh_"..ver.."tray01"},
+		{	hash = "bkr_Prop_Meth_Tray_02a",	animName = "break_weigh_"..ver.."tray01^1"},
+		{	hash = "bkr_Prop_Meth_Tray_02a",	animName = "break_weigh_"..ver.."tray01^2"},
+		{	hash = "bkr_Prop_Meth_SmashedTray_01_frag_",	animName = "break_weigh_"..ver.."tray01^3"},
+	}
+	for i=1, #sceneObjects, 1 do
+		local obj = CreateObjectNoOffset(sceneObjects[i].hash, targetPosition, true, true, true)
+		NetworkAddEntityToSynchronisedScene(obj, netScene, animDict, sceneObjects[i].animName, 4.0, -8.0, 1)
+		objects[#objects+1] = obj
+	end
+	NetworkStartSynchronisedScene(netScene)
+	Wait(animDuration)
+	NetworkStopSynchronisedScene(netScene)
+	for i=1, #objects, 1 do
+		DeleteObject(objects[i])
+	end
+	RemoveAnimDict(animDict)
+	FreezeEntityPosition(ped, false)
+end
+
+local function BagMeth(coords, offset, rotation)
+	local ver = ""
+	local animDict, animName = "anim@amb@business@meth@meth_smash_weight_check@", "break_weigh_"..ver.."char01"
+	Bridge.Anim.RequestDict(animDict, 500)
+	local animDuration = GetAnimDuration(animDict, animName) * 1000
+	local ped = PlayerPedId()
+	SetEntityCoords(ped, coords)
+	local scenePos, sceneRot = vector3(coords.x + offset.x, coords.y + offset.y, coords.z + offset.z), rotation
+	local scenes = {
+	{
+		{	hash = "bkr_prop_meth_bigbag_04a",	animName = "break_weigh_"..ver.."box01"},
+		{	hash = "bkr_prop_meth_bigbag_03a",	animName = "break_weigh_"..ver.."box01^1"},
+		{	hash = "bkr_prop_meth_openbag_02",	animName = "break_weigh_"..ver.."methbag01"}
+	},
+	{
+		{	hash = "bkr_prop_meth_openbag_02",	animName = "break_weigh_"..ver.."methbag01^1"},
+		{	hash = "bkr_prop_meth_openbag_02",	animName = "break_weigh_"..ver.."methbag01^2"},
+		{	hash = "bkr_prop_meth_openbag_02",	animName = "break_weigh_"..ver.."methbag01^3"}
+	},
+	{
+		{	hash = "bkr_prop_meth_openbag_02",	animName = "break_weigh_"..ver.."methbag01^4"},
+		{	hash = "bkr_prop_meth_openbag_02",	animName = "break_weigh_"..ver.."methbag01^5"},
+		{	hash = "bkr_prop_meth_openbag_02",	animName = "break_weigh_"..ver.."methbag01^6"}
+	},
+	{
+		{	hash = "bkr_prop_meth_scoop_01a",	animName = "break_weigh_"..ver.."scoop"},
+		{	hash = "bkr_prop_coke_scale_01",	animName = "break_weigh_"..ver.."scale"},
+		{	hash = "bkr_prop_fakeid_penclipboard",	animName = "break_weigh_"..ver.."pen"}
+	},
+	{
+		{	hash = "bkr_prop_fakeid_clipboard_01a",	animName = "break_weigh_"..ver.."clipboard"},
+		{	hash = "bkr_Prop_Meth_Tray_02a",	animName = "break_weigh_"..ver.."tray01^5"}
+	}
+}
+	local scenesList, entitiesList = {}, {}
+	for i=1, #scenes, 1 do
+		local scene = NetworkCreateSynchronisedScene(scenePos, sceneRot, 2, false, false, 1065353216, 0, 1.3)
+		NetworkAddPedToSynchronisedScene(ped, scene, animDict, animName, 1.5, -4.0, 1, 16, 1148846080, 0)
+		for j=1, #scenes[i], 1 do
+			local s = scenes[i][j]
+			RequestModel(s.hash)
+			while not HasModelLoaded(s.hash) do
+				Wait(0)
+			end
+			local obj = CreateObjectNoOffset(s.hash, coords, true, true, true)
+			SetModelAsNoLongerNeeded(s.hash)
+			entitiesList[#entitiesList+1] = obj
+			NetworkAddEntityToSynchronisedScene(obj, scene, animDict, s.animName, 4.0, -8.0, 1)
+		end
+		scenesList[#scenesList+1] = scene
+	end
+	DisableCamCollisionForEntity(ped)
+	FreezeEntityPosition(ped, true)
+	for i=1, #scenesList, 1 do
+		NetworkStartSynchronisedScene(scenesList[i])
+	end
+
+	Wait(animDuration-11000)
+	for i=1, #scenesList, 1 do
+		NetworkStopSynchronisedScene(scenesList[i])
+	end
+	for i=1, #entitiesList, 1 do
+		DeleteEntity(entitiesList[i])
+	end
+	RemoveAnimDict(animDict)
+	FreezeEntityPosition(ped, false)
+end
+---------------------- end animation shit
+---
+
+local function startcook(num, coords, offset, rotation)
+	if not amonia then
+		local adding = Bridge.Callback.Trigger('md-drugs:server:startcook', num)
+		if not adding then return end
 		active = true
-		TriggerServerEvent("md-drugs:server:startcook")
-		MethCooking()
+		MethCooking(coords, offset, rotation)
 		amonia = true
 	else
-		Notify(Lang.meth.inside, "error")
+		Bridge.Notify.SendNotify(Bridge.Language.Locale('meth.started'), "error")
 	end
 end
 
-local function dials()
-	if amonia == true then
-		if not minigame(2, 8) then
-			AddExplosion(1005.773, -3200.402, -38.524, 49, 10, true, false, true, true)
-			ClearPedTasks(PlayerPedId())
-			amonia = nil
-			active = nil
-		return end
-		Notify(Lang.meth.increaseheat, "success")
-		ClearPedTasks(PlayerPedId())
-		heated = true	
-	else
+
+local function dials(coords)
+	if amonia then
+		if not minigame() then
+			AddExplosion(coords.x, coords.y,coords.z, 49, 10, true, false, true)
+			amonia = false
+			active = false
+			return
+		end
+		Bridge.Notify.SendNotify(Bridge.Language.Locale('meth.increaseHeat'), "success")
+		dialSuccess(coords)
+		heated = true
 	end
 end
 
-local function smash()
-if tray then
-	tray = false
-	DeleteObject(trays)
-	local bucket = CreateObject(`bkr_prop_meth_bigbag_03a`, vector3(1012.85, -3194.29, -39.2), true, true, true)
-	SetEntityHeading(bucket, 90.0)
-	SmashMeth()
-
-	local options = {
-		{
-			name = 'bucket',
-			icon = 'fa-solid fa-car',
-			label = 'Bag Meth',
-			action = function()
-				DeleteObject(bucket)
-				amonia = nil
-				heated = nil
-				tray = nil
-				active = nil
-				BagMeth()
-				TriggerServerEvent('md-drugs:server:getmeth')
-				
-			end,
-
-		}
-	}
-	local optionsox = {
-		{
-			name = 'bucket',
-			icon = 'fa-solid fa-car',
-			label = 'Bag Meth',
-			onSelect = function()
-				DeleteObject(bucket)
-				amonia = nil
-				heated = nil
-				tray = nil
-				active = nil
-				BagMeth()
-				TriggerServerEvent('md-drugs:server:getmeth')
-			end,
-
-		}
-	}
-	if Config.oxtarget then
-        exports.ox_target:addLocalEntity(bucket,  optionsox)
-    else 
-	    exports['qb-target']:AddTargetEntity(bucket, {options = options, distance = 2.0})
-    end   
-end	
+local function smash(coords, offset, rotation, buckets, k)
+	if active and tray and amonia and heated then
+		DeleteObject(trays)
+		tray = false
+		local bucket = CreateObject("bkr_prop_meth_bigbag_03a", buckets.x, buckets.y, buckets.z, true, true, true)
+		Freeze(bucket, true, buckets.w)
+		SmashMeth(coords, offset, rotation)
+		Wait(100)
+		Bridge.Target.AddLocalEntity(bucket, {
+			{
+				name = 'bucket',
+				icon = Bridge.Language.Locale('meth.targetBagIcon'),
+				label = Bridge.Language.Locale('meth.targetBag'),
+				action = function()
+					DeleteObject(bucket)
+					active = false
+					amonia = false
+					heated = false
+					tray = false
+					BagMeth(locations.BagMeth[k].loc, locations.BagMeth[k].offset, locations.BagMeth[k].rotation)
+					TriggerServerEvent('md-drugs:server:getmeth', k)
+				end,
+				canInteract = function()
+					if not active then return false end
+					return true
+				end,
+			}
+		})
+		targets[#targets+1] = bucket
+	end
 end
 
 local function trayscarry()
-	if amonia then
+	if amonia and heated then
 		local pos = GetEntityCoords(PlayerPedId(), true)
-		RequestAnimDict('anim@heists@box_carry@')
-		while (not HasAnimDictLoaded('anim@heists@box_carry@')) do
-			Wait(7)
-		end
-		TaskPlayAnim(PlayerPedId(), 'anim@heists@box_carry@', 'idle', 5.0, -1, -1, 50, 0, false, false,
-			false)
-		RequestModel("bkr_prop_meth_tray_02a")
-		while not HasModelLoaded("bkr_prop_meth_tray_02a") do
-			Wait(0)
-		end
-		 trays = CreateObject("bkr_prop_meth_tray_02a", pos.x, pos.y, pos.z, true, true, true)
-		AttachEntityToEntity(trays, PlayerPedId(), GetPedBoneIndex(PlayerPedId(), 28422), 0.01, -0.2,
-			-0.2, 20.0, 0.0, 0.0, true, true, false, true, 1, true)
+		Bridge.Anim.RequestDict('anim@heists@box_carry@')
+		TaskPlayAnim(PlayerPedId(), 'anim@heists@box_carry@', 'idle', 5.0, -1, -1, 50, 0, false, false, false)
+		requestModel('bkr_prop_meth_tray_02a')	
+		trays = CreateObject("bkr_prop_meth_tray_02a", pos.x, pos.y, pos.z, true, true, true)
+		AttachEntityToEntity(trays, PlayerPedId(), GetPedBoneIndex(PlayerPedId(), 28422), 0.01, -0.2,-0.2, 20.0, 0.0, 0.0, true, true, false, true, 1, true)
 		tray = true
 	end
 end
+
+
+
+for k, v in pairs (locations.CookMeth) do
+	Bridge.Target.AddBoxZone('cookMeth'..k, v.loc, v.size, v.loc.w or 180.0, {
+		{
+			label = Bridge.Language.Locale('meth.targetCook'),
+			icon = Bridge.Language.Locale('meth.targetCookIcon'),
+			action = function()
+				startcook(k, v.loc, v.offset or vec3(0,0,0), v.rotation or vector3(0,0,180.0))
+			end,
+			canInteract = function()
+				if not handleGang(v.gang) then return false end
+				if not amonia and not active then
+					return true
+				end
+			end,
+		},
+		{
+			icon = Bridge.Language.Locale('meth.targetGrabTrayIcon'),
+			label = Bridge.Language.Locale('meth.targetGrabTray'),
+			action = function() trayscarry() end,
+		  	canInteract = function()
+				if not handleGang(v.gang) then return false end
+				if heated and amonia and not tray then
+					return true
+				end
+		  	end,
+		},
+	})
+	targets[#targets+1] = 'cookMeth'..k
+end
+
+for k, v in pairs (locations.MethDials) do
+	Bridge.Target.AddBoxZone('adjustMethDials'..k, v.loc, v.size, v.loc.w or 180.0, {
+		{
+			name = 'adjustdials',
+			icon = Bridge.Language.Locale('meth.targetHeatIcon'),
+			label = Bridge.Language.Locale('meth.targetHeat'),
+			action = function()
+				dials(locations.CookMeth[k].loc)
+			end,
+			canInteract = function()
+				if not handleGang(v.gang) then return false end
+				if amonia and heated == false then return true end
+			end
+		}
+	})
+	targets[#targets+1] = 'adjustMethDials'..k
+end
+
+for k, v in pairs (locations.MethSmash) do
+	Bridge.Target.AddBoxZone('smashMeth'..k, v.loc, v.size, v.loc.w or 180.0, {
+		{
+			name = 'smash',
+			icon = Bridge.Language.Locale('meth.targetSmashIcon'),
+			label = Bridge.Language.Locale('meth.targetSmash'),
+			action = function()
+				smash(v.loc, v.offset, v.rotation, v.bucket,k)
+			end,
+			canInteract = function()
+				if not handleGang(v.gang) then return false end
+				if heated and amonia and tray then return true end
+			end
+		}
+	})
+	targets[#targets+1] = 'smashMeth'..k
+end
+
+for k, v in pairs (locations.MethTele) do
+	Bridge.Target.AddBoxZone('meth_tele'..k, v.inside, v.size, v.rot, {
+		{
+			icon = Bridge.Language.Locale('meth.teleOutIcon'),
+			label = Bridge.Language.Locale('meth.teleOut'),
+			action = function()
+				SetEntityCoords(PlayerPedId(), v.outside)
+			end,
+			canInteract = function()
+                return handleGang(v.gang)
+            end
+		}
+	})
+	Bridge.Target.AddBoxZone('meth_teleout'..k, v.outside, v.size, v.rot, {
+		{
+			icon = Bridge.Language.Locale('meth.teleInIcon'),
+			label = Bridge.Language.Locale('meth.teleIn'),
+			action = function()
+				SetEntityCoords(PlayerPedId(), v.inside)
+			end,
+			canInteract = function()
+                return handleGang(v.gang)
+            end
+		}
+	})
+	targets[#targets+1] = 'meth_tele'..k
+	targets[#targets+1] = 'meth_teleout'..k
+end
+
+RegisterCommand('offset', function()
+	local pos = GetEntityCoords(PlayerPedId())
+	Wait(4000)
+	local offset = GetEntityCoords(PlayerPedId()) - pos
+	print("Offset: ", offset)
+end)
+
+for k, v in pairs (locations.MethEph) do
+	Bridge.Target.AddBoxZone('stealMethEph'..k, v.loc, v.size, v.loc.w or 180.0, {
+		{
+			label = Bridge.Language.Locale('meth.targetStealEPH'),
+			icon = Bridge.Language.Locale('meth.targetStealEPHIcon'),
+			action = function()
+				if not progressbar(Bridge.Language.Locale('meth.stealingEPH')) then return end
+				TriggerServerEvent("md-drugs:server:geteph", k)
+			end,
+			canInteract = function()
+				return handleGang(v.gang)
+			end
+		}
+	})
+	targets[#targets+1] = 'stealMethEph'..k
+end
+for k, v in pairs (locations.MethAce) do
+	Bridge.Target.AddBoxZone('stealMethAce'..k, v.loc, v.size, v.loc.w or 180.0, {
+		{
+			label = Bridge.Language.Locale('meth.targetStealACE'),
+			icon = Bridge.Language.Locale('meth.targetStealACEIcon'),
+			action = function()
+				if not progressbar(Bridge.Language.Locale('meth.stealingACE')) then return end
+				TriggerServerEvent("md-drugs:server:getace", k)
+			end,
+			canInteract = function()
+				return handleGang(v.gang)
+			end
+		}
+	})
+	targets[#targets+1] = 'stealMethAce'..k
+end
+
 CreateThread(function()
 	BikerMethLab = exports['bob74_ipl']:GetBikerMethLabObject()
 	BikerMethLab.Style.Set(BikerMethLab.Style.upgrade)
 	BikerMethLab.Security.Set(BikerMethLab.Security.upgrade)
 	BikerMethLab.Details.Enable(BikerMethLab.Details.production, true)
 	RefreshInterior(BikerMethLab.interiorId)
-end)
-
-CreateThread(function()
-	exports['qb-target']:AddBoxZone("methteleout", Config.MethTeleIn, 1.5, 1.75, { name = "methteleout", heading = 11.0, debugPoly = false, minZ = Config.MethTeleIn.z - 2, maxZ = Config.MethTeleIn.z + 2,}, {
-		options = {
-			{name = 'teleout',	icon = "fas fa-sign-in-alt",	label = "Enter Building",	action = function()		SetEntityCoords(PlayerPedId(), Config.MethTeleOut)	end},
-		},
-		distance = 2.5
-	})
-	exports['qb-target']:AddBoxZone("methtelein", Config.MethTeleOut, 1.5, 1.75, {name = "methtelein",heading = 11.0,debugPoly = false,minZ = Config.MethTeleOut.z - 2,maxZ = Config.MethTeleOut.z + 2,}, {
-		options = {
-			{ name = 'teleout', icon = "fas fa-sign-in-alt", label = "Exit Building", action = function() 	SetEntityCoords(PlayerPedId(), Config.MethTeleIn) end },
-		},
-		distance = 2.5
-	})
-	exports['qb-target']:AddBoxZone("maze", vector3(-95.55, -806.73, 44.04), 1.5, 1.75, { name = "maze", heading = 11.0, debugPoly = false, minZ = 44 - 2, maxZ = 44 + 2, }, {
-		options = {
-			{	name = 'die',	icon = "fas fa-sign-in-alt",	label = "dont click this",	action = function()		SetEntityCoords(PlayerPedId(), vector3(-75.36, -837.24, 318.93))	end},
-		},
-		distance = 2.5
-	})
-	local itemreqcook = { "ephedrine", "acetone" }
-	exports['qb-target']:AddBoxZone("ingridientsmeth", vector3(1005.7, -3201.28, -39.55), 1.5, 1.75,{ name = "ingridientsmeth", heading = 11.0, debugPoly = false, minZ = -39 - 2, maxZ = -39 + 2,}, {
-		options = {
-			{ name = 'methcook', icon = "fas fa-sign-in-alt", label = "Cook Meth", item = itemreqcook, action = function() 	startcook() end,
-				canInteract = function()
-					if amonia == nil and active == nil then
-						return true
-					end
-			  end,
-			},
-			{ name = 'grabtray', icon = "fas fa-sign-in-alt", label = "Grab Tray", distance = 5, action = function() 	trayscarry() end,
-			  canInteract = function()
-					if heated and amonia and tray == nil then return true end
-			  end,
-			},
-		},
-		distance = 2.5
-	})
-	exports['qb-target']:AddBoxZone("boxmeth", vector3(1012.15, -3194.04, -39.20), 1.5, 1.75,{	name = "boxmeth",	heading = 3.0,	debugPoly = false,	minZ = -39 - 2,	maxZ = -39 + 2,}, {
-		options = {
-			{name = 'boxmeth',icon = "fas fa-sign-in-alt",label = "Box Up Meth",distance = 5,action = function()	smash()end,
-				canInteract = function()
-					if tray then return true end
-				end,
-			},
-		},
-	})
-	exports['qb-target']:AddBoxZone("adjustdials", vector3(1007.89, -3201.17, -38.99), 1.5, 1.75,{	name = "adjustdials",	heading = 11.0,	debugPoly = false,	minZ = -39 - 2,	maxZ = -39 + 2,}, {
-		options = {
-			{	name = 'adjustdials',	icon = "fas fa-sign-in-alt",	label = "Adjust Dials",	distance = 5,	action = function()		dials()	end,
-				canInteract = function()
-					if amonia and heated == nil then return true end end
-			},
-		},
-	})
-	if Config.MethHeist == false then
-		for k, v in pairs (Config.MethEph) do 
-			if v.gang == nil or v.gang == '' or v.gang == "" then v.gang = 1 end
-			exports['qb-target']:AddBoxZone("methep"..k, v.loc, v.l, v.w, { name = "methep"..k, heading = v.rot, minZ = v.loc.z - 1.0, maxZ = v.loc.z + 2.0,}, {
-				options = {
-					{icon = "fas fa-sign-in-alt",	label = "Steal Ephedrine", event = 'md-drugs:client:stealeph', data = k,
-					canInteract = function()
-						if QBCore.Functions.GetPlayerData().gang.name == v.gang or v.gang == 1 then return true end end
-				},
-				},
-				distance = 2.5
-			})
-		end
-		for k, v in pairs (Config.Methace) do 
-			if v.gang == nil or v.gang == '' or v.gang == "" then v.gang = 1 end
-			exports['qb-target']:AddBoxZone("methace"..k, v.loc, v.l, v.w, { name = "methace"..k, heading = v.rot, minZ = v.loc.z - 1.0, maxZ = v.loc.z + 2.0,}, {
-				options = {
-					{icon = "fas fa-sign-in-alt",	label = "Steal Acetone", event = 'md-drugs:client:stealace', data = k,
-					canInteract = function()
-						if QBCore.Functions.GetPlayerData().gang.name == v.gang or v.gang == 1 then return true end end
-				},
-				},
-				distance = 2.5
-			})
-		end
-	end
-end)
-
-CreateThread(function()
-if Config.MethHeist == false then
-else
-	local current = "g_m_y_famdnf_01"
-	lib.requestModel(current, Config.RequestModelTime)
-	local CurrentLocation = Config.MethHeistStart
-	local methdealer = CreatePed(0, current, CurrentLocation.x, CurrentLocation.y, CurrentLocation.z - 1, false, false)
-	Freeze(methdealer, true, 220.0)
-	exports['qb-target']:AddTargetEntity(methdealer, {
-		options = {
-			{
-				label = "Get Mission",
-				icon = "fas fa-eye",
-				action = function()
-					Notify(Lang.meth.mission, "success")
-					SpawnMethCarPedChase()
-				end,
-			},
-		}
-	})
-end
-end)
-RegisterNetEvent("md-drugs:client:stealeph", function(data)
-	if not progressbar('Stealing Ephedrine', 4000, 'uncuff') then return end
-	TriggerServerEvent("md-drugs:server:geteph", data.data)
-end)
-
-RegisterNetEvent("md-drugs:client:stealace", function(data)
-	if not progressbar('Stealing Acetone', 4000, 'uncuff') then return end
-	TriggerServerEvent("md-drugs:server:getace", data.data)
-end)
-
-
+end)

client/oxyruns.lua

@@ -1,109 +1,101 @@
-local QBCore = exports['qb-core']:GetCoreObject()
-local deliveryBlip = nil
+if not Config.Drugs['oxyruns'] then return end
 local carryPackage = nil
+local onMission = false
+local locations = Config.Oxy.Locations
+local pdAlert =  90
+local vehicle = nil
 
+local function getRoute()
+	local Route = Bridge.Callback.Trigger('md-drugs:server:getRoute')
+    if not Route then
+		Bridge.Notify.SendNotify(Bridge.Language.Locale('oxy.ditchCar'), "error")
+		onMission = false
+		return false
+	end
+	local Route = locations.oxylocations[Route]
+    SetNewWaypoint(Route.x, Route.y)
+	requestModel('g_m_y_famdnf_01', 30000)
+    local oxybuyer = CreatePed(0, 'g_m_y_famdnf_01',Route.x,Route.y,Route.z-1, Route.w, false, false)
+	Freeze(oxybuyer, true, Route.w)
+	local timeOut = 300
 
-RegisterNetEvent("md-drugs:client:getoxytruck", function() 
-if TriggerServerEvent('md-drugs:server:payfortruck') then
-end
-end)
-
-
-RegisterNetEvent("md-drugs:Client:getoxylocation", function()
-	local coords = Config.truckspawn
-	local ModelHash = "burrito3" -- Use Compile-time hashes to get the hash of this model
-	lib.requestModel(ModelHash, Config.RequestModelTime)
-	local oxycar = CreateVehicle(ModelHash,Config.truckspawn.x, Config.truckspawn.y,Config.truckspawn.z, Config.truckspawn.h, true, false)
-    SetEntityHeading(oxycar, coords.w)
-    exports[Config.Fuel]:SetFuel(oxycar, 100.0)
-    TriggerEvent("vehiclekeys:client:SetOwner", QBCore.Functions.GetPlate(oxycar))
-	Notify(Lang.oxy.truck, 'success')
-	TriggerEvent("md-drugs:client:getoxylocationroute")
-    SetVehicleEngineOn(oxycar, true, true)
-    local options = {
-        { event = "md-drugs:client:getfromtrunk", icon = "fas fa-box-circle-check", label = "Get Package"},
-    }
-	if Config.oxtarget then
-		exports.ox_target:addLocalEntity(oxycar, options)
-	else 
-		exports['qb-target']:AddTargetEntity(oxycar, {options = options, distance = 2.0})
-	end  
-	
-end)
-
-
-
-RegisterNetEvent("md-drugs:client:getoxylocationroute", function() 
-	Wait(100)
-	local unlucky = math.random(1,100)
-    local CurrentLocation = Config.oxylocations[math.random(#Config.oxylocations)]
-	local unluck =  math.random(1,100)
-    if deliveryBlip ~= nil then
-        RemoveBlip(deliveryBlip)
-    end
-	if CurrentLocation ~= nil then
-    	deliveryBlip = AddBlipForCoord(CurrentLocation)
-    	SetBlipSprite(deliveryBlip, 1)
-    	SetBlipDisplay(deliveryBlip, 2)
-    	SetBlipScale(deliveryBlip, 1.0)
-    	SetBlipAsShortRange(deliveryBlip, false)
-    	SetBlipColour(deliveryBlip, 27)
-    	BeginTextCommandSetBlipName("STRING")
-    	AddTextComponentSubstringPlayerName("drug Meet")
-    	EndTextCommandSetBlipName(deliveryBlip)
-    	SetBlipRoute(deliveryBlip, true)
-	local current = "g_m_y_famdnf_01"
-	lib.requestModel(current, Config.RequestModelTime)
-    	local oxybuyer = CreatePed(0, current,CurrentLocation.x,CurrentLocation.y,CurrentLocation.z-1, CurrentLocation.w, false, false)
-	Freeze(oxybuyer, true, CurrentLocation.w)
 	repeat
 		Wait(1000)
-	until #(GetEntityCoords(PlayerPedId()) - vector3(CurrentLocation.x,CurrentLocation.y,CurrentLocation.z)) < 5.0
-		RemoveBlip(deliveryBlip)
-		PoliceCall(Config.PoliceAlertOxy)
-		local options = {
-    	        { type = "client", label = "Talk To Buyer", icon = "fas fa-eye", event = "md-drugs:client:giveoxybox", ped = oxybuyer},
-    	    }
-		if Config.oxtarget then
-			exports.ox_target:addLocalEntity(oxybuyer, options)
-		else 
-			exports['qb-target']:AddTargetEntity(oxybuyer, {options = options, distance = 2.0})
-		end   
-	end
-end)
+		timeOut = timeOut - 1
+	until #(GetEntityCoords(PlayerPedId()) - vector3(Route.x,Route.y,Route.z)) < 5.0 or timeOut == 0
 
+	PoliceCall(pdAlert)
+	Bridge.Target.AddLocalEntity(oxybuyer,{
+		{ 
+			label = Bridge.Language.Locale('oxy.targetHandoff'),
+			icon = Bridge.Language.Locale('oxy.targetHandOffIcon'),
+			action = function()
+				if carryPackage then
+					if not progressbar(Bridge.Language.Locale('oxy.handingoff')) then return end
+					TriggerServerEvent("md-drugs:server:giveoxybox")
+					DeleteEntity(oxybuyer)
+					DetachEntity(carryPackage, true, true)
+					DeleteObject(carryPackage)
+					carryPackage = nil
+					getRoute()
+				else
+					Bridge.Notify.SendNotify(Bridge.Language.Locale('oxy.emptyHands'), "error")
+				end
+			end
+		}
+	})
+	targets[#targets+1] = oxybuyer
+end
 
-RegisterNetEvent("md-drugs:client:getfromtrunk", function() 
-	if carryPackage then
-		Notify(Lang.oxy.cantcarry, "error")
-	else	
-		local pos = GetEntityCoords(PlayerPedId(), true)
-		RequestAnimDict('anim@heists@box_carry@')
-		while (not HasAnimDictLoaded('anim@heists@box_carry@')) do
-			Wait(7)
-		end
-		TaskPlayAnim(PlayerPedId(), 'anim@heists@box_carry@', 'idle', 5.0, -1, -1, 50, 0, false, false, false)
-		RequestModel("hei_prop_drug_statue_box_big")
-		while not HasModelLoaded("hei_prop_drug_statue_box_big") do
-			Wait(0)
-		end
-		local object = CreateObject("hei_prop_drug_statue_box_big", pos.x, pos.y, pos.z, true, true, true)
-		AttachEntityToEntity(object, PlayerPedId(), GetPedBoneIndex(PlayerPedId(), 57005), 0.05, 0.1, -0.3, 300.0, 250.0, 20.0, true, true, false, true, 1, true)
-		carryPackage = object
-	end	
-end)
-
-
-RegisterNetEvent("md-drugs:client:giveoxybox", function(data) 
-	if carryPackage then
-		if not progressbar(Lang.oxy.hand, 4000, 'uncuff') then return end
-		TriggerServerEvent("md-drugs:server:giveoxybox")
-		DeleteEntity(data.ped)
-		DetachEntity(carryPackage, true, true)
-		DeleteObject(carryPackage)
-	    carryPackage = nil
-	else
-		Notify(Lang.oxy.empty, "error")
-	end
-end)
+for k, v in pairs(locations.OxyPayForTruck) do
+	Bridge.Target.AddBoxZone('oxyTruckPur' ..k ,  v.loc, v.size, v.loc.w or 180.0, {
+		{
+			icon = Bridge.Language.Locale('oxy.targetPayIcon'),
+			label = Bridge.Language.Locale('oxy.targetPay'),
+			action = function()
+				requestModel("burrito3", 30000)
 
+				local paid = Bridge.Callback.Trigger('md-drugs:server:payfortruck', k)
+				if not paid then return end
+				vehicle = CreateVehicle("burrito3",v.truckSpawn.x, v.truckSpawn.y, v.truckSpawn.z, v.truckSpawn.w, true, false)
+				SetVehicleFuelLevel(vehicle, 100.0)
+    			local plate = GetVehicleNumberPlateText(vehicle)
+				Bridge.VehicleKey.GiveKeys(vehicle, plate)
+				Bridge.Notify.SendNotify(Bridge.Language.Locale('oxy.keys'), 'success')
+				onMission = true
+				TriggerServerEvent('md-drugs:server:startOxyRun', NetworkGetNetworkIdFromEntity(vehicle))
+				
+				Bridge.Target.AddLocalEntity(vehicle,  {
+					{
+						icon = Bridge.Language.Locale('oxy.targetGetPackageIcon'),
+						label = Bridge.Language.Locale('oxy.targetGetPackage'),
+						action = function()
+							if carryPackage then
+								Bridge.Notify.SendNotify(Bridge.Language.Locale('oxy.alreadyCarrying'), "error")
+							else
+								local pos = GetEntityCoords(PlayerPedId(), true)
+								Bridge.Anim.RequestDict('anim@heists@box_carry@')
+								TaskPlayAnim(PlayerPedId(), 'anim@heists@box_carry@', 'idle', 5.0, -1, -1, 50, 0, false, false, false)
+								requestModel("hei_prop_drug_statue_box_big")
+								carryPackage = CreateObject("hei_prop_drug_statue_box_big", pos.x, pos.y, pos.z, true, true, true)
+								AttachEntityToEntity(carryPackage, PlayerPedId(), GetPedBoneIndex(PlayerPedId(), 57005), 0.05, 0.1, -0.3, 300.0, 250.0, 20.0, true, true, false, true, 1, true)
+							end
+						end,
+						canInteract = function()
+							return handleGang(v.gang)
+						end
+					}
+				})
+				Wait(1000)
+				getRoute()
+			end,
+			canInteract = function()
+				if onMission then
+					return false
+				end
+				return true
+			end
+		}
+	})
+	targets[#targets+1] = 'oxyTruckPur' ..k
+end

client/pharma.lua

@@ -1,56 +1,47 @@
-local QBCore = exports['qb-core']:GetCoreObject()
 
-RegisterNetEvent("md-drugs:client:prescriptionpad", function(args)
-if QBCore.Functions.GetPlayerData().job.type == Config.PharmaJob then 
-   lib.registerContext({
-   id = 'prescriptionpad',
-   title = "Prescription Pad",
-   options = {
-        {title  = 'Give Vics', description  = 'Give Vics ', icon = 'fa-solid fa-file-prescription', event = 'md-drugs:client:writeprescription',  args = {item = 'vicodin_prescription'}},  
-        {title  = 'Give Madderal', description  = 'Give Madderal ', icon = 'fa-solid fa-file-prescription', event = 'md-drugs:client:writeprescription',  args = {item = 'adderal_prescription'}},  
-		{title  = 'Give Morphin',description  = 'Give Morphin ',icon = 'fa-solid fa-file-prescription', event = 'md-drugs:client:writeprescription', args = {item = 'morphine_prescription'}},  
-        {title  = 'Give Zany',   description  = 'Give Zany ', icon = 'fa-solid fa-file-prescription',   event = 'md-drugs:client:writeprescription',      args = {item = 'xanax_prescription'} },
-	}
+if not Config.Drugs['pharma'] then return end
+local locations = Config.Pharma.Locations
+
+Bridge.Callback.Register("md-drugs:client:prescriptionpad", function( data, op)
+    local job = Bridge.Framework.GetPlayerJob()
+    if job ~= 'ambulance' then
+       Bridge.Notify.SendNotify(Bridge.Language.Locale('pharma.notPharma'), 'error')
+        return
+    end
+    local input = Bridge.Input.Open(Bridge.Language.Locale('pharma.input.header'), {
+        {type = 'select', title = Bridge.Language.Locale('pharma.input.title1'), options = data},
+        {type = 'select', title = Bridge.Language.Locale('pharma.input.title2'), options = op}
     })
-    lib.showContext('prescriptionpad')	
-else
-    Notify(Lang.Pharma.notems, "error")
-end
+    if not input[1] then return end
+    if not progressbar(Bridge.Language.Locale('pharma.write'), 4000, {
+        dict = 'missheistdockssetup1clipboard@base',
+        clip = 'base',
+        flag = 49,
+        prop = {
+            model = 'prop_notepad_01',
+            bone = 18905,
+            pos = {0.1, 0.02, 0.03},
+            rot = { -90.0, 0.0, 0.0}
+        }
+    }) then return end
+    return {who = input[1], what = input[2]}
+end)
+
+Bridge.Callback.Register("md-drugs:client:unbottle", function() 
+    if not progressbar(Bridge.Language.Locale('pharma.opening')) then return end
+    return true
 end)
 
 
-
-RegisterNetEvent("md-drugs:client:writeprescription", function(args)
-    if not progressbar(Lang.Pharma.write, 4000, 'notepad') then return end
-	TriggerServerEvent("md-drugs:server:giveprescription", args.item)
-end)
-
-
-RegisterNetEvent("md-drugs:client:fillprescription", function(data) 
-    if not progressbar(Lang.Pharma.fill, 4000, 'uncuff') then return end
-	TriggerServerEvent("md-drugs:server:fillprescription", data.data)    
-end)
-
-
-RegisterNetEvent("md-drugs:client:unbottle", function(item) 
-    if not progressbar(Lang.Pharma.open, 4000, 'uncuff') then return end
-    if item.name == 'vicodinbottle' then item = 'vicodin' end
-    if item.name == 'adderalbottle' then item = 'adderal' end
-    if item.name == 'morphinebottle' then item = 'morphine' end
-    if item.name == 'xanaxbottle' then item = 'xanax' end
-    TriggerServerEvent('md-drugs:server:unbottle', item)
-end)
-
-
-RegisterNetEvent('md-drugs:client:takepharma', function(itemName)
-	if not progressbar(Lang.Pharma.consume, 1000, 'eat') then return end
-	if itemName == "vicodin" then
-		exports['ps-buffs']:AddHealthBuff(10000, 20)
-	elseif itemName == "adderal" then
-		exports['ps-buffs']:StaminaBuffEffect(5000, 1.3)
-	elseif itemName == "xanax" then 
-		exports['ps-buffs']:AddStressBuff(10000, 25)
-	else 
-		exports['ps-buffs']:AddHealthBuff(10000, 40)
-	end
-end)
+for k, v in pairs (locations.FillPrescription) do
+    Bridge.Target.AddBoxZone('pharma' ..k , v.loc,v.size, v.loc.w or 180, {
+        {
+            icon = Bridge.Language.Locale('pharma.fillIcon'),
+            label = Bridge.Language.Locale('pharma.targetFill'),
+            action = function()
+                if not progressbar(Bridge.Language.Locale('pharma.fill')) then return end
+	            TriggerServerEvent("md-drugs:server:fillprescription", k)
+            end,
+        }
+    })
+end

client/plantSpawns.lua

@@ -0,0 +1,100 @@
+
+local DrugPlants = {
+    {model = 'prop_plant_01a', label = 'coke', langs = Bridge.Language.Locale('coke.targetPick'), tbl = GlobalState.CocaPlant, plantTbl = {},
+        pick = function(loc)
+            if not progressbar(Bridge.Language.Locale('coke.picking')) then return end
+                TriggerServerEvent("coke:pickupCane", loc)
+            return true
+        end,
+        allow = Config.Drugs.cocaine,
+        icon = Bridge.Language.Locale('coke.pickIcon'),
+    },
+    {model = 'prop_plant_01b', label = 'heroin',langs = Bridge.Language.Locale('heroin.targetPick'), tbl = GlobalState.PoppyPlants, plantTbl = {},
+        pick = function(loc)
+            if not progressbar(Bridge.Language.Locale('heroin.picking')) then return end
+                TriggerServerEvent("heroin:pickupCane", loc)
+            return true
+        end,
+        allow = Config.Drugs.heroin,
+        icon = Bridge.Language.Locale('heroin.pickIcon'),
+    },
+    {model = 'prop_cactus_03', label = 'Mescaline', langs = Bridge.Language.Locale('mesc.targetPick'), tbl = GlobalState.Mescaline, plantTbl = {},
+        pick = function(loc)
+            if not progressbar(Bridge.Language.Locale('mesc.picking')) then return end
+                TriggerServerEvent("Mescaline:pickupCane", loc)
+            return true
+        end,
+        allow = Config.Drugs.mescaline,
+        icon = Bridge.Language.Locale('mesc.pickIcon'),
+
+    },
+    {model = 'prop_weed_01', label = 'weed', langs = Bridge.Language.Locale('weed.targetPick'), tbl = GlobalState.WeedPlant, plantTbl = {},
+        pick = function(loc)
+            if not progressbar(Bridge.Language.Locale('weed.picking')) then return end
+                TriggerServerEvent("weed:pickupCane", loc)
+            return true
+        end,
+        allow = Config.Drugs.weed,
+        icon = Bridge.Language.Locale('weed.pickIcon'),
+    },
+    {model = 'mushroom', label = 'shrooms', langs = Bridge.Language.Locale('shrooms.targetPick'), tbl = GlobalState.shrooms, plantTbl = {},
+        pick = function(loc)
+            if not progressbar(Bridge.Language.Locale('shrooms.picking')) then return end
+                TriggerServerEvent("shrooms:pickupCane", loc)
+            return true
+        end,
+        allow = Config.Drugs.shrooms,
+        icon = Bridge.Language.Locale('shrooms.pickIcon'),
+    },
+}
+
+for k, v in pairs (DrugPlants) do
+    if not v.allow then goto continue end
+    RegisterNetEvent(v.label ..':respawnCane', function(loc)
+        local plant = v.tbl[loc]
+        local hash = GetHashKey(plant.model)
+        if not v.plantTbl[loc] then
+            requestModel(hash)
+            v.plantTbl[loc] = CreateObject(hash, plant.location, false, true, true)
+            Freeze(v.plantTbl[loc], true, plant.heading)
+            Bridge.Target.AddLocalEntity(v.plantTbl[loc], {
+                {
+                    icon = v.icon,
+                    label = v.langs,
+                    action = function()
+                        if not v.pick(loc) then return end
+                    end
+                }
+            })
+            targets[#targets+1] = v.plantTbl[loc]
+        end
+    end)
+
+    RegisterNetEvent(v.label ..':removeCane', function(loc)
+        DeleteEntity(v.plantTbl[loc])
+        v.plantTbl[loc] = nil
+    end)
+
+    RegisterNetEvent(v.label ..":init", function()
+        if not v.plantTbl then v.plantTbl = {} end
+        for key, value in pairs (v.tbl) do
+            local hash = GetHashKey(value.model)
+            if not value.taken then
+                v.plantTbl[key] = CreateObject(hash, value.location.x, value.location.y, value.location.z, false, true, true)
+                Freeze(v.plantTbl[key], true, v.heading)
+                Bridge.Target.AddLocalEntity(v.plantTbl[key], {
+                    {
+                        icon = v.icon,
+                        label = v.langs,
+                        action = function()
+                            if not v.pick(key) then return end
+                        end
+                    }
+                })
+                targets[#targets+1] = v.plantTbl[key]
+            end
+        end
+    end)
+    TriggerEvent(v.label ..":init")
+    ::continue::
+end

client/shrooms.lua

@@ -1,78 +1,31 @@
-local QBCore = exports['qb-core']:GetCoreObject()
-local shrooms = {}
+if not Config.Drugs['shrooms'] then return end
 
-
-function LoadModel(hash)
-    hash = GetHashKey(hash)
-    RequestModel(hash)
-    while not HasModelLoaded(hash) do
-        Wait(3000)
+local function EcstasyEffect()
+    local startStamina = 50
+    SetFlash(0, 0, 500, 20000, 500)
+    while startStamina > 0 do
+        Wait(1000)
+        startStamina = startStamina - 1
+        RestorePlayerStamina(PlayerId(), 1.0)
+        if math.random(1, 100) < 51 then
+            SetFlash(0, 0, 500, 7000, 500)
+            ShakeGameplayCam('SMALL_EXPLOSION_SHAKE', 0.08)
+        end
     end
+    if IsPedRunning(PlayerPedId()) then
+        SetPedToRagdoll(PlayerPedId(), math.random(1000, 3000), math.random(1000, 3000), 3, 0, 0, 0)
+    end
+    startStamina = 0
 end
 
-RegisterNetEvent('shrooms:respawnCane', function(loc)
-    local v = GlobalState.shrooms[loc]
-    local hash = GetHashKey(v.model)
-    if not shrooms[loc] then
-        shrooms[loc] = CreateObject(hash, v.location, false, true, true)
-        Freeze(shrooms[loc], true, v.heading)
-        exports['qb-target']:AddTargetEntity(shrooms[loc], {
-            options = { { icon = "fas fa-hand", label = "pick shrooms", action = function() if not progressbar(Lang.Shrooms.pick, 4000, 'uncuff') then return end  TriggerServerEvent("shrooms:pickupCane", loc) end }
-        },
-        distance = 2.5
-        })
-    end
-end)
-AddEventHandler('onResourceStart', function(resource)
-    if resource == GetCurrentResourceName() then
-		Wait(3000)
-        LoadModel('mushroom')
-        TriggerEvent('shrooms:init')
-    end
- end)
-
-AddEventHandler('onResourceStop', function(resourceName)
-    if GetCurrentResourceName() == resourceName then
-        SetModelAsNoLongerNeeded(GetHashKey('mushroom'))
-        for k, v in pairs(shrooms) do
-            if DoesEntityExist(v) then
-                DeleteEntity(v) SetEntityAsNoLongerNeeded(v)
-            end
-        end
-    end
-end)
-
-RegisterNetEvent('shrooms:removeCane', function(loc)
-    if DoesEntityExist(shrooms[loc]) then DeleteEntity(shrooms[loc]) end
-    shrooms[loc] = nil
-end)
-
- RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function()
-     Wait(3000)
-     LoadModel('mushroom')
-     TriggerEvent('shrooms:init')
- end)
-
-
- RegisterNetEvent("shrooms:init", function()
-    for k, v in pairs (GlobalState.shrooms) do
-        local hash = GetHashKey(v.model)
-        if not HasModelLoaded(hash) then LoadModel(hash) end
-        if not v.taken then
-            shrooms[k] = CreateObject(hash, v.location.x, v.location.y, v.location.z, false, true, true)
-            Freeze(shrooms[k], true, v.heading)
-            exports['qb-target']:AddTargetEntity(shrooms[k], {
-                options = { { icon = "fas fa-hand", label = "Pick shrooms", action = function() if not progressbar(Lang.Shrooms.pick, 4000, 'uncuff') then return end     TriggerServerEvent("shrooms:pickupCane", k) end }
-            },
-            distance = 2.5
-            })
-        end
-    end
-end)
-
-
-RegisterNetEvent('md-drugs:client:takeshrooms', function()
-    if not progressbar(Lang.Shrooms.eat, 500, 'eat')  then return end              
-    TriggerEvent("evidence:client:SetStatus", "widepupils", 300)
-    EcstasyEffect()
-end)
+Bridge.Callback.Register("md-drugs:client:shrooms", function()
+    if not progressbar(Bridge.Language.Locale('shrooms.eat'), 5000, {
+        dict = 'mp_player_inteat@burger',
+        clip = 'mp_player_int_eat_burger',
+        flags = 49
+    })  then return end
+    CreateThread(function()
+        EcstasyEffect()
+    end)
+    return true
+end)

client/target.lua

@@ -1,298 +0,0 @@
-local QBCore = exports['qb-core']:GetCoreObject()
-
-CreateThread(function()
-
-if Config.oxtarget then
-	coketelein = exports.ox_target:addBoxZone({ coords = Config.CokeTeleIn, size = vec(1,1,3), rotation = 0, debug = false,
-	options = {
-		{name = 'teleout',icon = "fas fa-sign-in-alt",label = "Enter Building",distance = 5,
-			onSelect = function()
-				DoScreenFadeOut(500)
-				Wait(1000)
-				SetEntityCoords(PlayerPedId(),Config.CokeTeleOut.x, Config.CokeTeleOut.y, Config.CokeTeleOut.z)
-				Wait(1000)
-				DoScreenFadeIn(500)
-			end
-		},
-	},
-	})
-	coketeleout = exports.ox_target:addBoxZone({ coords = Config.CokeTeleOut, size = vec(1,1,3), rotation = 0, debug = false,
-	options = {
-			{name = 'teleout',icon = "fas fa-sign-in-alt",label = "Exit Building",distance = 5,
-				onSelect = function()
-					DoScreenFadeOut(500)
-					Wait(500)
-					SetEntityCoords(PlayerPedId(),Config.CokeTeleIn)
-					Wait(500)
-						DoScreenFadeIn(500)
-				end,
-
-			},
-		},
-	})
-else
-	exports['qb-target']:AddBoxZone("coketelein",Config.CokeTeleIn,1.5, 1.75, { name = "coketelein",heading = 156.0,debugPoly = false,minZ = Config.CokeTeleIn.z-2,maxZ = Config.CokeTeleIn.z+2,}, {
-		options = {
-			{
-				name = 'teleout',
-				icon = "fas fa-sign-in-alt",
-				label = "Enter Building",
-				action = function()
-					 DoScreenFadeOut(500)
-					Wait(500)
-					SetEntityCoords(PlayerPedId(),Config.CokeTeleOut)
-					 Wait(500)
-					 DoScreenFadeIn(500)
-				end,
-	
-			},
-		},
-	})
-	exports['qb-target']:AddBoxZone("CokeTeleOut",Config.CokeTeleOut,1.5, 1.75, {name = "CokeTeleOut",heading = 156.0,debugPoly = false,minZ = Config.CokeTeleOut.z-2,maxZ = Config.CokeTeleOut.z+2,}, {
-		options = {
-				{
-					name = 'teleout',
-					icon = "fas fa-sign-in-alt",
-					label = "Exit Building",
-					action = function()
-						DoScreenFadeOut(500)
-						Wait(500)
-						SetEntityCoords(PlayerPedId(),Config.CokeTeleIn)
-						Wait(500)
-							DoScreenFadeIn(500)
-					end,
-	
-				},
-			},
-		})
-end	
-	-- cocaine ( Bagging and Cutting is in Cocaine.lua due to globals used :))
-	for k, v in pairs (Config.MakePowder) do 
-		if v.gang == nil or v.gang == '' or v.gang == "" then v.gang = 1 end
-		 local options = {
-			{	type = "client",	event = "md-drugs:client:makepowder",	icon = "fas fa-sign-in-alt",	label = "chop it up", data = k,  distance = 2.0,
-				canInteract = function()
-					if QBCore.Functions.GetPlayerData().gang.name == v.gang or v.gang == 1 then return true end end
-			},
-		}
-		if Config.oxtarget then
-			exports.ox_target:addBoxZone({coords = v.loc, size = vec3(1,1,1),debugPoly = false,rotation = v.rot, options = options,})
-		else
-			exports['qb-target']:AddBoxZone("makepowder"..k ,vector3(v.loc.x, v.loc.y, v.loc.z), v.l, v.w, {name ="makepowder"..k, heading = 156.0,minZ = v.loc.z-1, maxZ = v.loc.z+1, }, {options = options, distance = 1.5})
-		end
-	end
-	------------- lsd
-	for k, v in pairs (Config.lysergicacid) do
-		if v.gang == nil or v.gang == '' or v.gang == "" then v.gang = 1 end
-		local options = {
-			{	type = "client",	event = "md-drugs:client:getlysergic",	icon = "fas fa-sign-in-alt",	label = "stealing", data = k,
-				canInteract = function()
-					if QBCore.Functions.GetPlayerData().gang.name == v.gang or v.gang == 1 then return true end end
-			}
-		}
-		if Config.oxtarget then
-			exports.ox_target:addBoxZone({coords = v.loc, size = vec3(1,1,1),debugPoly = false, rotation = v.rot, options = options,})
-		else
-			exports['qb-target']:AddBoxZone("getlysergic"..k ,vector3(v.loc.x, v.loc.y, v.loc.z), v.l, v.w, {name ="getlysergic"..k, heading = 156.0,minZ = v.loc.z-2, maxZ = v.loc.z+2, }, {options = options, distance = 1.5})	
-		end
-	end
-	for k, v in pairs (Config.diethylamide) do
-		if v.gang == nil or v.gang == '' or v.gang == "" then v.gang = 1 end
-		local options = {
-			{	type = "client",	event = "md-drugs:client:getdiethylamide",	icon = "fas fa-sign-in-alt",	label = "stealing", data = k,
-				canInteract = function()
-					if QBCore.Functions.GetPlayerData().gang.name == v.gang or v.gang == 1 then return true end end
-			}
-		}
-		if Config.oxtarget then
-			exports.ox_target:addBoxZone({coords = v.loc, size = vec3(1,1,1),debugPoly = false,rotation = v.rot, options = options,})
-		else
-			exports['qb-target']:AddBoxZone("getdiethylamide"..k ,vector3(v.loc.x, v.loc.y, v.loc.z), v.l, v.w, {name ="getdiethylamide"..k, heading = 156.0,minZ = v.loc.z-2, maxZ = v.loc.z+2, }, {options = options, distance = 1.5})	
-		end
-	end
-	for k, v in pairs (Config.gettabs) do
-		if v.gang == nil or v.gang == '' or v.gang == "" then v.gang = 1 end
-		local options = {
-			{	type = "client",	event = "md-drugs:client:buytabs",	icon = "fas fa-sign-in-alt",	label = "Buy Tabs", data = k,
-				canInteract = function()
-					if QBCore.Functions.GetPlayerData().gang.name == v.gang or v.gang == 1 then return true end end
-			}
-		}
-		if Config.oxtarget then
-			exports.ox_target:addBoxZone({coords = v.loc, size = vec3(1,1,1),debugPoly = false,rotation = v.rot, options = options,})
-		else
-			exports['qb-target']:AddBoxZone("buytabs"..k ,vector3(v.loc.x, v.loc.y, v.loc.z), v.l, v.w, {name ="buytabs"..k, heading = 156.0,minZ = v.loc.z-2, maxZ = v.loc.z+2, }, {options = options, distance = 1.5})	
-		end
-	end
-	------ heroin
-	for k, v in pairs (Config.dryplant) do
-		if v.gang == nil or v.gang == '' or v.gang == "" then v.gang = 1 end
-		local options = {
-			{	type = "client",	event = "md-drugs:client:dryplant",	icon = "fas fa-sign-in-alt",	label = "Dry Poppies", data = k,
-				canInteract = function()
-					if QBCore.Functions.GetPlayerData().gang.name == v.gang or v.gang == 1 then return true end end
-			}
-		}
-		if Config.oxtarget then
-			exports.ox_target:addBoxZone({coords = v.loc, size = vec3(1,1,1),debugPoly = false,rotation = v.rot, options = options,})
-		else
-			exports['qb-target']:AddBoxZone("dryplant"..k ,vector3(v.loc.x, v.loc.y, v.loc.z), v.l, v.w, {name ="dryplant"..k, heading = 156.0,minZ = v.loc.z-2, maxZ = v.loc.z+2, }, {options = options, distance = 1.5})	
-		end
-	end
-	for k, v in pairs (Config.cutheroinone) do
-		if v.gang == nil or v.gang == '' or v.gang == "" then v.gang = 1 end
-		local options = {
-			{	type = "client",	event = "md-drugs:client:cutheroin",	icon = "fas fa-sign-in-alt",	label = "Cut Heroin", data = k,
-				canInteract = function()
-					if QBCore.Functions.GetPlayerData().gang.name == v.gang or v.gang == 1 then return true end end
-			}
-		}
-		if Config.oxtarget then
-			exports.ox_target:addBoxZone({coords = v.loc, size = vec3(1,1,1),debugPoly = false,rotation = v.rot, options = options,})
-		else
-			exports['qb-target']:AddBoxZone("cutheroin"..k ,vector3(v.loc.x, v.loc.y, v.loc.z), v.l, v.w, {name ="cutheroin"..k, heading = 156.0,minZ = v.loc.z-2, maxZ = v.loc.z+2, }, {options = options, distance = 1.5})	
-		end
-	end
-	for k, v in pairs (Config.fillneedle) do
-		if v.gang == nil or v.gang == '' or v.gang == "" then v.gang = 1 end
-		local options = {
-			{	type = "client",	event = "md-drugs:client:fillneedle",	icon = "fas fa-sign-in-alt",	label = "Fill Needles", data = k,
-				canInteract = function()
-					if QBCore.Functions.GetPlayerData().gang.name == v.gang or v.gang == 1 then return true end end
-			}
-		}
-		if Config.oxtarget then
-			exports.ox_target:addBoxZone({coords = v.loc, size = vec3(1,1,1),debugPoly = false,rotation = v.rot, options = options,})
-		else
-			exports['qb-target']:AddBoxZone("fillneedle"..k ,vector3(v.loc.x, v.loc.y, v.loc.z), v.l, v.w, {name ="fillneedle"..k, heading = 156.0,minZ = v.loc.z-2, maxZ = v.loc.z+2, }, {options = options, distance = 1.5})	
-		end
-	end
-	------- crack
-	for k, v in pairs (Config.makecrack) do
-		if v.gang == nil or v.gang == '' or v.gang == "" then v.gang = 1 end
-		local options = {
-			{	type = "client",	event = "md-drugs:client:makecrackone",	icon = "fas fa-sign-in-alt",	label = "Cook Crack", data = k, distance = 2.0,
-				canInteract = function()
-					if QBCore.Functions.GetPlayerData().gang.name == v.gang or v.gang == 1 then return true end end
-			}
-		}
-		if Config.oxtarget then
-			exports.ox_target:addBoxZone({coords = v.loc, size = vec3(1,1,1),debugPoly = false,rotation = v.rot, options = options,})
-		else
-			exports['qb-target']:AddBoxZone("makecrackone"..k ,vector3(v.loc.x, v.loc.y, v.loc.z), v.l, v.w, {name ="makecrackone"..k, heading = 156.0,minZ = v.loc.z-2, maxZ = v.loc.z+2, }, {options = options, distance = 1.5})	
-		end
-	end
-	for k, v in pairs (Config.bagcrack) do
-		if v.gang == nil or v.gang == '' or v.gang == "" then v.gang = 1 end
-		local options = {
-			{	type = "client",	event = "md-drugs:client:bagcrack",	icon = "fas fa-sign-in-alt",	label = "Bag Crack", data = k, distance = 2.0,
-				canInteract = function()
-					if QBCore.Functions.GetPlayerData().gang.name == v.gang or v.gang == 1 then return true end end
-			}
-		}
-		if Config.oxtarget then
-			exports.ox_target:addBoxZone({coords = v.loc, size = vec3(1,1,1),debugPoly = false,rotation = v.rot, options = options,})
-		else
-			exports['qb-target']:AddBoxZone("bagcrack"..k ,vector3(v.loc.x, v.loc.y, v.loc.z), v.l, v.w, {name ="bagcrack"..k, heading = 156.0,minZ = v.loc.z-2, maxZ = v.loc.z+2, }, {options = options, distance = 1.5})	
-		end
-	end
-	------- pharma
-	for k, v in pairs (Config.FillPrescription) do
-		if v.gang == nil or v.gang == '' or v.gang == "" then v.gang = 1 end
-		local options = {
-			{	type = "client",	event = "md-drugs:client:fillprescription",	icon = "fas fa-sign-in-alt",	label = "Fill Prescription", data = k,
-				canInteract = function()
-					if QBCore.Functions.GetPlayerData().gang.name == v.gang or v.gang == 1 then return true end end
-			}
-		}
-		if Config.oxtarget then
-			exports.ox_target:addBoxZone({coords = v.loc, size = vec3(1,1,1),debugPoly = false,rotation = v.rot, options = options,})
-		else
-			exports['qb-target']:AddBoxZone("fillprescription"..k ,vector3(v.loc.x, v.loc.y, v.loc.z), v.l, v.w, {name ="fillprescription"..k, heading = 156.0,minZ = v.loc.z-2, maxZ = v.loc.z+2, }, {options = options, distance = 1.5})	
-		end
-	end
-	-------- oxy runs
-	local options2 = {
-		{	event = "md-drugs:client:getoxytruck",	icon = "fas fa-sign-in-alt",	label = "Pay For Truck",},
-	}
-	if Config.oxtarget then
-		exports.ox_target:addBoxZone({coords = Config.Payfortruck, size = vec3(1,1,1),debugPoly = false,rotation = 90.0, options = options2,})
-	else
-		exports['qb-target']:AddBoxZone("payfortruck" ,Config.Payfortruck, 1.0, 1.0, {name ="payfortruck", heading = 156.0,minZ = Config.Payfortruck.z-2, maxZ = Config.Payfortruck.z+2, }, {options = options2, distance = 1.5})	
-	end
-	------------ mescaline
-	local options3 = {
-		{	type = "client",	event = "md-drugs:client:drymescaline",	icon = "fas fa-sign-in-alt",	label = "Dry Out"},
-	}
-	if Config.oxtarget then
-		exports.ox_target:addBoxZone({coords = Config.DryOut, size = vec3(1,1,1),debugPoly = false,rotation = 90.0, options = options3,})
-	else
-		exports['qb-target']:AddBoxZone("DryOut" ,Config.DryOut, 1.0, 1.0, {name ="DryOut", heading = 156.0,minZ = Config.DryOut.z-2, maxZ = Config.DryOut.z+2, }, {options = options3, distance = 1.5})	
-	end
-	------ XTC
-	for k, v in pairs (Config.isosafrole) do
-		if v.gang == nil or v.gang == '' or v.gang == "" then v.gang = 1 end
-		local options = {
-			{	type = "client",	event = "md-drugs:client:stealisosafrole",	icon = "fas fa-sign-in-alt",	label = "Steal Isosafrole", data = k,
-				canInteract = function()
-					if QBCore.Functions.GetPlayerData().gang.name == v.gang or v.gang == 1 then return true end end
-			}
-		}
-		if Config.oxtarget then
-			exports.ox_target:addBoxZone({coords = v.loc, size = vec3(1,1,1),debugPoly = false,rotation = v.rot, options = options,})
-		else
-			exports['qb-target']:AddBoxZone("stealisosafrole"..k ,vector3(v.loc.x, v.loc.y, v.loc.z), v.l, v.w, {name ="stealisosafrole"..k, heading = 156.0,minZ = v.loc.z-2, maxZ = v.loc.z+2, }, {options = options, distance = 1.5})	
-		end
-	end
-	for k, v in pairs (Config.mdp2p) do
-		if v.gang == nil or v.gang == '' or v.gang == "" then v.gang = 1 end
-		local options = {
-			{	type = "client",	event = "md-drugs:client:stealmdp2p",	icon = "fas fa-sign-in-alt",	label = "Steal MDP2P", data = k,
-				canInteract = function()
-					if QBCore.Functions.GetPlayerData().gang.name == v.gang or v.gang == 1 then return true end end
-			}
-		}
-		if Config.oxtarget then
-			exports.ox_target:addBoxZone({coords = v.loc, size = vec3(1,1,1),debugPoly = false,rotation = v.rot, options = options,})
-		else
-			exports['qb-target']:AddBoxZone("stealmdp2p"..k ,vector3(v.loc.x, v.loc.y, v.loc.z), v.l, v.w, {name ="stealmdp2p"..k, heading = 156.0,minZ = v.loc.z-2, maxZ = v.loc.z+2, }, {options = options, distance = 1.5})	
-		end
-	end
-
-	for k, v in pairs (Config.rawxtcloc) do
-		if v.gang == nil or v.gang == '' or v.gang == "" then v.gang = 1 end
-		local options = {
-			{	type = "client",	event = "md-drugs:client:makingrawxtc",	icon = "fas fa-sign-in-alt",	label = "Make Raw XTC", data = k,
-				canInteract = function()
-					if QBCore.Functions.GetPlayerData().gang.name == v.gang or v.gang == 1 then return true end end
-			}
-		}
-		if Config.oxtarget then
-			exports.ox_target:addBoxZone({coords = v.loc, size = vec3(1,1,1),debugPoly = false,rotation = v.rot, options = options,})
-		else
-			exports['qb-target']:AddBoxZone("makingrawxtc"..k ,vector3(v.loc.x, v.loc.y, v.loc.z), v.l, v.w, {name ="makingrawxtc"..k, heading = 156.0,minZ = v.loc.z-2, maxZ = v.loc.z+2, }, {options = options, distance = 1.5})	
-		end
-	end
-	local options4 = {
-		{	type = "client",	event = "md-drugs:client:buypress",	icon = 'fas fa-eye',	label = 'Buy Press',},
-	}
-	if Config.oxtarget then
-		exports.ox_target:addBoxZone({ coords = Config.buypress, size = vec3(2,2,2), debugPoly = false, rotation = 45, options = options4})
-	else
-		exports['qb-target']:AddBoxZone("buypress" ,Config.buypress, 1.0, 1.0, {name ="buypress", heading = 156.0,minZ = Config.buypress.z-2, maxZ = Config.buypress.z+2, }, {options = options4, distance = 1.5})	
-	end
-	for k, v in pairs(Config.stamp) do
-		if v.gang == nil or v.gang == '' or v.gang == "" then v.gang = 1 end
-		local options = {
-			{type = "client",   event = "md-drugs:client:stampwhite",   icon = 'fas fa-eye',    label = 'Stamp Pills',	data = k, canInteract = function() if QBCore.Functions.GetPlayerData().gang.name == v.gang or v.gang == 1 then return true end end },
-			
-		}
-	
-		if Config.oxtarget then
-			exports.ox_target:addBoxZone({coords = v.loc, size = vec3(1,1,1),debugPoly = false,rotation = v.rot, options = options,})
-		else
-			exports['qb-target']:AddBoxZone("stampxtc"..k ,vector3(v.loc.x, v.loc.y, v.loc.z), v.l, v.w, {name ="stampxtc"..k, heading = 156.0,minZ = v.loc.z-2, maxZ = v.loc.z+2, }, {options = options, distance = 1.5})	
-		end
-	end	
-
-end)

client/travellingmerchant.lua

@@ -1,61 +0,0 @@
-local QBCore = exports['qb-core']:GetCoreObject()
-
-CreateThread(function() 
-local current = "g_m_y_famdnf_01"
-	lib.requestModel(current, Config.RequestModelTime)
-	local CurrentLocation = Config.Travellingmerchant[math.random(#Config.Travellingmerchant)]
-	local travellingmerchant = CreatePed(0, current,CurrentLocation.x,CurrentLocation.y,CurrentLocation.z-1, CurrentLocation.w, false, false)
-	Freeze(travellingmerchant, true, CurrentLocation.w)
-	if Config.oxtarget then
-		local options = {
-			{ label = "Travelling Merchant", icon = "fas fa-eye", onSelect = function() 	lib.showContext('travellingmerchant') end},
-		}
-		exports.ox_target:addLocalEntity(travellingmerchant, options)
-	else
-		exports['qb-target']:AddTargetEntity(travellingmerchant, { 
-			options = {
-				{ label = "Travelling Merchant", icon = "fas fa-eye", action = function() 	lib.showContext('travellingmerchant') end},
-			}
-		})
-	end
-end)
-
-CreateThread(function()
-	local ShopMenu = {}
-
-	for k, v in pairs (Config.Items.items) do 
-		ShopMenu[#ShopMenu + 1] = {
-			   icon =  GetImage(v.name),
-			    description = '$'.. v.price,
-				title = GetLabel(v.name),
-				event = "md-drugs:client:travellingmerchantox",
-				args = {
-					item = v.name,
-					cost = v.price,
-					amount = v.amount,
-					table = Config.Items.items,
-					num = k
-				}
-			}
-		
-		lib.registerContext({id = 'travellingmerchant',title = "Travelling Merchant", options = ShopMenu})
-	end
-end)
-
-
-RegisterNetEvent("md-drugs:client:travellingmerchantox", function(data) local dialog
-	local price = data.cost 
-	local settext = "Amnt: "..data.amount.." | Cost: "..price or "Cost: "..price
-	local max = data.amount  
-	local dialog = exports.ox_lib:inputDialog(data.item .."!",   {
-		{ type = 'select', label = "Payment Type", default = "cash",
-			options = {
-				{ value = "cash"},
-				{ value = "bank"},
-			}
-		},
-		{ type = 'number', label = "Amount to buy", description = settext, min = 0, max = max, default = 1 },
-	})
-	if data.cost == "Free" then data.cost = 0 end
-		TriggerServerEvent("md-drugs:server:travellingmerchantox", dialog[2], dialog[1], data.item, data.cost, data.table, data.num )
-end)

client/weed.lua

@@ -1,332 +1,64 @@
-local QBCore = exports['qb-core']:GetCoreObject()
-local WeedPlant = {}
-local exploded = nil
-local drying = false
-function LoadModel(hash)
-    hash = GetHashKey(hash)
-    RequestModel(hash)
-    while not HasModelLoaded(hash) do
-        Wait(3000)
-    end
-end 
-
-RegisterNetEvent('weed:respawnCane', function(loc)
-    local v = GlobalState.WeedPlant[loc]
-    local hash = GetHashKey(v.model)
-    if not HasModelLoaded(hash) then LoadModel(hash) end
-    if not WeedPlant[loc] then
-        WeedPlant[loc] = CreateObject(hash, v.location.x, v.location.y, v.location.z-3.5, false, true, true)
-	Freeze(WeedPlant[loc],true,  v.heading)
-         exports['qb-target']:AddTargetEntity(WeedPlant[loc], {
-            options = { 
-				{
-                    icon = "fas fa-hand",
-                    label = "Pick Weed",
-                    action = function()
-                       if not progressbar(Lang.Weed.pick, 4000, 'uncuff') then return end
-                        TriggerServerEvent("weed:pickupCane", loc)
-                    end,
-					canInteract = function()
-						if Config.Joblock then
-							if  QBCore.Functions.GetPlayerData().job.name == Config.weedjob then
-								return true end
-						else
-						return true end end,
-                }
-            },
-distance = 2.5
-           })
-    end
-end)
-
-RegisterNetEvent('weed:removeCane', function(loc)
-    if DoesEntityExist(WeedPlant[loc]) then DeleteEntity(WeedPlant[loc]) end
-    WeedPlant[loc] = nil
-end)
-
-RegisterNetEvent("weed:init", function()
-    for k, v in pairs (GlobalState.WeedPlant) do
-        local hash = GetHashKey(v.model)
-        if not HasModelLoaded(hash) then LoadModel(hash) end
-        if not v.taken then
-            WeedPlant[k] = CreateObject(hash, v.location.x, v.location.y, v.location.z-3.5, false, true, true)
-	Freeze(WeedPlant[k],true,  v.heading)
-            exports['qb-target']:AddTargetEntity(WeedPlant[k], {
-                options = { 
+if not Config.Drugs['weed'] then return end
+local exploded, drying = false, false
+local locations, recipes = Config.Weed.Locations, Config.Weed.Recipes
+for k, v in pairs (locations.WeedDry) do
+	Bridge.Target.AddBoxZone('weed_dry'..k, v.loc, v.size, v.loc.w or 180.0, {
+		{
+			icon = Bridge.Language.Locale('weed.targetDryIcon'),
+			label = Bridge.Language.Locale('weed.targetDry'),
+			action = function()
+				if not itemCheck("wetcannabis") then return end
+				if drying then return end
+				local loc = GetEntityCoords(PlayerPedId())
+				local weedplant = CreateObject("bkr_prop_weed_drying_01a", loc.x, loc.y+.2, loc.z, true, false)
+				drying = true
+				FreezeEntityPosition(weedplant, true)
+				Bridge.Notify.SendNotify(Bridge.Language.Locale('weed.wait'), "success")
+				Wait(math.random(1000,5000))
+				Bridge.Notify.SendNotify(Bridge.Language.Locale('weed.take'), "success")
+				Bridge.Target.AddLocalEntity(weedplant, {
 					{
-                        icon = "fas fa-hand",
-                        label = "Pick Weed",
-                        action = function()
-							if not progressbar(Lang.Weed.pick, 4000, 'uncuff') then return end
-							TriggerServerEvent("weed:pickupCane", k)
-                        end,
-						canInteract = function()
-						if Config.Joblock then
-							if  QBCore.Functions.GetPlayerData().job.name == Config.weedjob then
-								return true end
-						else
-						return true end end,
-                    }
-                },
-                distance = 2.5
-               })
-        end
-    end
-end)
-
-AddEventHandler('onResourceStart', function(resource)
-    if resource == GetCurrentResourceName() then
-        LoadModel('bkr_prop_weed_lrg_01b')
-        TriggerEvent('weed:init')
-    end
- end)
- RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function()
-     Wait(3000)
-     LoadModel('bkr_prop_weed_lrg_01b')
-     TriggerEvent('weed:init')
- end)
- 
-AddEventHandler('onResourceStop', function(resourceName)
-    if GetCurrentResourceName() == resourceName then
-        SetModelAsNoLongerNeeded(GetHashKey('bkr_prop_weed_lrg_01b'))
-        for k, v in pairs(WeedPlant) do
-            if DoesEntityExist(v) then
-                DeleteEntity(v) SetEntityAsNoLongerNeeded(v)
-            end
-        end
-    end
-end)
-
-CreateThread(function()
-
-
-for k, v in pairs (Config.WeedDry) do
-
-exports['qb-target']:AddBoxZone("weeddry"..k,v,1.5, 1.75, {name = "weeddry"..k,heading = 11.0,debugPoly = false,minZ = v.z-2,maxZ = v.z+2,}, {
-	options = {
-		{
-			name = 'dryweed',
-			icon = "fas fa-sign-in-alt",
-			label = "Dry Weed",
-			distance = 1,
-			item = "wetcannabis",
-			action = function()
-				if drying then
-					Notify(Lang.Weed.busy, "error")
-				else
-					local loc = GetEntityCoords(PlayerPedId())
-					local weedplant = CreateObject("bkr_prop_weed_drying_01a", loc.x, loc.y+.2, loc.z, true, false)
-					drying = true
-					FreezeEntityPosition(weedplant, true)
-					Notify("Wait A little Bit To Dry", "success")
-					Wait(math.random(1000,5000))
-					Notify("Take Down The Weed", "success")
-					local options = {
-						{
-							icon = "fas fa-sign-in-alt",
-							label = "Pick Up Weed",
-							action = function()
-								DeleteEntity(weedplant)
-								drying = false
-								TriggerServerEvent('md-drugs:server:dryoutweed')
-							end,
-							canInteract = function()
-								if Config.Joblock then
-									if  QBCore.Functions.GetPlayerData().job.name == Config.weedjob then
-										return true end
-								else
-								return true end end,										
-						}
+						icon = Bridge.Language.Locale('weed.targetDryIcon'),
+						label = Bridge.Language.Locale('weed.targetDryed'),
+						action = function()
+							DeleteEntity(weedplant)
+							drying = false
+							TriggerServerEvent('md-drugs:server:dryoutweed', k)
+						end,
 					}
-					local optionsox = {
-						{
-							icon = "fas fa-sign-in-alt",
-							label = "Pick Up Weed",
-							onSelect = function()
-								DeleteEntity(weedplant)
-								drying = false
-								TriggerServerEvent('md-drugs:server:dryoutweed')
-							end,
-							canInteract = function()
-								if Config.Joblock then
-									if  QBCore.Functions.GetPlayerData().job.name == Config.weedjob then
-										return true end
-								else
-								return true end end,										
-						}
-					}
-					if Config.oxtarget then
-						exports.ox_target:addLocalEntity(weedplant, optionsox )
-					else
-						exports['qb-target']:AddTargetEntity(weedplant, {options = options})
-					end
-				end
+				})
 			end,
 			canInteract = function()
-			if Config.Joblock then
-				if  QBCore.Functions.GetPlayerData().job.name == Config.weedjob then
-					if drying == false then 
-					return true end end
-			else
-			return true end end,
-		},
-	},
-})
+				if drying then return false end
+				return true
+			end
+		}
+	})
+	targets[#targets+1] = 'weed_dry'..k
 end
-exports['qb-target']:AddBoxZone("teleinweed",Config.Telein,1.5, 1.75, {name = "teleinweed",heading = 11.0,debugPoly = false,minZ = Config.Telein.z-2,maxZ = Config.Telein.z+2,}, {
-	options = {
-		{ name = 'teleout', icon = "fas fa-sign-in-alt", label = "Enter Building", distance = 2.0,
-			action = function()
-				SetEntityCoords(PlayerPedId(),Config.Teleout)
-				
-			end,
-			canInteract = function()
-			if Config.Joblock then
-				if  QBCore.Functions.GetPlayerData().job.name == Config.weedjob then
-					return true end
-			else
-			return true end end,
-		},
-	},	
-})
-exports['qb-target']:AddBoxZone("teleinweedout",Config.Teleout,1.5, 1.75, { name = "teleinweedout",heading = 11.0,debugPoly = false,minZ = Config.Teleout.z-2,maxZ = Config.Teleout.z+2,}, {
-options = {
-		{ name = 'teleout', icon = "fas fa-sign-in-alt", label = "Exit Building", distance = 2.0,
-			action = function()
-				SetEntityCoords(PlayerPedId(),Config.Telein)
-			end,
-			canInteract = function()
-			if Config.Joblock then
-				if  QBCore.Functions.GetPlayerData().job.name == Config.weedjob then
-					return true end
-			else
-			return true end end,
-		},
-	},	
-})
-exports['qb-target']:AddBoxZone("MakeButter",Config.MakeButter,1.5, 1.75, {name = "MakeButter",heading = 11.0,debugPoly = false,minZ = Config.MakeButter.z-2,maxZ = Config.MakeButter.z+2,}, {
-options = {
+
+for k, v in pairs (locations.WeedTele) do
+	Bridge.Target.AddBoxZone('weed_tele'..k, v.inside, v.size, v.rot or 180.0, {
 		{
-			name = 'butter',
-			icon = "fas fa-sign-in-alt",
-			label = "Make Butter",
+			icon = Bridge.Language.Locale('weed.teleportOutIcon'),
+			label = Bridge.Language.Locale('weed.teleportOut'),
 			action = function()
-				if not ItemCheck('mdbutter') and not ItemCheck('grindedweed') then return end
-				if not minigame(2, 8) then return end
-				if not progressbar(Lang.Weed.canna, 4000, 'uncuff') then return end
-				TriggerServerEvent("md-drugs:server:makebutter")       
-			end,
-			canInteract = function()
-			if Config.Joblock then
-				if  QBCore.Functions.GetPlayerData().job.name == Config.weedjob then
-					return true end
-			else
-			return true end end,
-		},
+				SetEntityCoords(PlayerPedId(), v.outside)
+			end
+		}
+	})
+	targets[#targets+1] = 'weed_tele'..k
+	Bridge.Target.AddBoxZone('weed_teleout'..k, v.outside, v.size, v.rot or 180.0, {
 		{
-			name = 'makebrownies',
-			icon = "fas fa-sign-in-alt",
-			label = "Make Brownies",
-			item = "cannabutter",
+			icon = Bridge.Language.Locale('weed.teleportInIcon'),
+			label = Bridge.Language.Locale('weed.teleportIn'),
 			action = function()
-				if not ItemCheck('cannabutter') and not ItemCheck('flour') and not ItemCheck('chocolate') then return end
-				if not minigame(2, 8) then return end
-				if not progressbar(Lang.Weed.brown, 4000, 'uncuff') then return end
-				TriggerServerEvent("md-drugs:server:makebrownies")       
-				
-			end,
-			canInteract = function()
-			if Config.Joblock then
-				if  QBCore.Functions.GetPlayerData().job.name == Config.weedjob then
-					return true end
-			else
-			return true end end,
-		},
-		{
-			name = 'makecookies',
-			icon = "fas fa-sign-in-alt",
-			label = "Make Cookies",
-			item = "cannabutter",
-			action = function()
-				if not ItemCheck('cannabutter') and not ItemCheck('flour') then return end
-				if not minigame(2, 8) then return end
-				if not progressbar(Lang.Weed.cook, 4000, 'uncuff') then return end
-				TriggerServerEvent("md-drugs:server:makecookies")       
-			end,
-			canInteract = function()
-			if Config.Joblock then
-				if  QBCore.Functions.GetPlayerData().job.name == Config.weedjob then
-					return true end
-			else
-			return true end end,
-		},
-		{
-			name = 'makechocolate',
-			icon = "fas fa-sign-in-alt",
-			label = "Make Chocolate",
-			item = "cannabutter",
-			action = function()
-				if not ItemCheck('cannabutter') and not ItemCheck('chocolate') then return end
-				if not minigame(2, 8) then return end
-				if not progressbar(Lang.Weed.choc, 4000, 'uncuff') then return end
-				TriggerServerEvent("md-drugs:server:makechocolate")       
-			end,
-			canInteract = function()
-			if Config.Joblock then
-				if  QBCore.Functions.GetPlayerData().job.name == Config.weedjob then
-					return true end
-			else
-			return true end end,
-		},
-		{
-			name = 'makemuffin',
-			icon = "fas fa-sign-in-alt",
-			label = "Make Muffin",
-			item = "cannabutter",
-			action = function()
-				if not ItemCheck('cannabutter') and not ItemCheck('flour') then return end
-				if not minigame(2, 8) then return end
-				if not progressbar(Lang.Weed.muff, 4000, 'uncuff') then return end
-				TriggerServerEvent("md-drugs:server:makemuffin")       
-			end,
-			canInteract = function()
-			if Config.Joblock then
-				if  QBCore.Functions.GetPlayerData().job.name == Config.weedjob then
-					return true end
-			else
-			return true end end,
-		},
-	},	
-})
-exports['qb-target']:AddBoxZone("makeoil",Config.MakeOil,1.5, 1.75, {name = "makeoil",heading = 11.0,debugPoly = false,minZ = Config.MakeOil.z-2,maxZ = Config.MakeOil.z+2,}, {
-options = {
-		{
-			name = 'Oil',
-			icon = "fas fa-sign-in-alt",
-			label = "Make Oil",
-			action = function()
-				if not ItemCheck('butane') and not ItemCheck('grindedweed') then return end
-				if not minigame(2, 8) then 
-					local explosion = math.random(1,100)
-						local loc = GetEntityCoords(PlayerPedId())
-						if explosion <= 99 then
-							AddExplosion(loc.x, loc.y, loc.z, 49, 10, true, false, true, true)
-							exploded = true
-							Notify(Lang.Weed.stovehot, "error")
-							Wait(1000 * 30)
-							exploded = nil
-						end	
-				return end
-				if not progressbar(Lang.Weed.shat, 4000, 'uncuff') then return end
-				TriggerServerEvent("md-drugs:server:makeoil")       			
-			end,
-			canInteract = function()
-			if exploded == nil then return true end
-			end,
-		},
-	},	
-})
-end)
+				SetEntityCoords(PlayerPedId(), v.inside)
+			end
+		}
+	})
+	targets[#targets+1] = 'weed_teleout'..k
+end
 
 CreateThread(function()
     BikerWeedFarm = exports['bob74_ipl']:GetBikerWeedFarmObject()
@@ -334,80 +66,174 @@ CreateThread(function()
     BikerWeedFarm.Security.Set(BikerWeedFarm.Security.upgrade)
     BikerWeedFarm.Details.Enable(BikerWeedFarm.Details.chairs, true)
     BikerWeedFarm.Details.Enable({BikerWeedFarm.Details.production, BikerWeedFarm.Details.chairs, BikerWeedFarm.Details.drying}, true)
-	BikerWeedFarm.Plant1.Clear(false)
-    BikerWeedFarm.Plant2.Clear(false)
-    BikerWeedFarm.Plant3.Clear(false)
-    BikerWeedFarm.Plant4.Clear(false)
-    BikerWeedFarm.Plant5.Clear(false)
-    BikerWeedFarm.Plant6.Clear(false)
-    BikerWeedFarm.Plant7.Clear(false)
-    BikerWeedFarm.Plant8.Clear(false)
-    BikerWeedFarm.Plant9.Clear(false)
+	BikerWeedFarm.Plant1.Clear(false) BikerWeedFarm.Plant2.Clear(false) BikerWeedFarm.Plant3.Clear(false)
+	BikerWeedFarm.Plant4.Clear(false) BikerWeedFarm.Plant5.Clear(false) BikerWeedFarm.Plant6.Clear(false)
+	BikerWeedFarm.Plant7.Clear(false) BikerWeedFarm.Plant8.Clear(false) BikerWeedFarm.Plant9.Clear(false)
     RefreshInterior(BikerWeedFarm.interiorId)
-	stove = CreateObject("prop_cooker_03",vector3(1045.49, -3198.46, -38.15-1), true, false)
-	SetEntityHeading(stove, 270.00)
-	FreezeEntityPosition(stove, true)
-	stove2 = CreateObject("prop_cooker_03",vector3(1038.90, -3198.66, -38.17-1), true, false)
-	SetEntityHeading(stove2, 90.00)
-	FreezeEntityPosition(stove2, true)
 end)
 
-RegisterNetEvent('md-drugs:client:bluntwraps', function(args)
-  lib.registerContext({
-    id = 'bluntroll',
-    title = 'Blunt Types',
-    menu = 'bluntroll',
-    options = {
-    	{ title = 'Roll Blunt',  description = 'Roll A Regular Blunt',  icon = 'check',  serverEvent = 'md-drugs:server:rollblunt'},
-		{ title = 'Dip Blunt Wrap In Lean', description = 'Roll A Lean Blunt', icon = 'check', serverEvent = 'md-drugs:server:rollleanblunt'},
-		{ title = 'Dip Blunt Wrap In Dextro',  description = 'Roll A Dextro Blunt',  icon = 'check',  serverEvent = 'md-drugs:server:rolldextroblunt'},
-		{ title = 'Roll A Chewy Blunt',  description = 'Roll A Chewy Blunt',  icon = 'check',  serverEvent = 'md-drugs:server:rollchewyblunt'},
-  	},
-  })
-  lib.showContext('bluntroll')
-end)
-
-RegisterNetEvent("md-drugs:client:rollanim", function()
-if not progressbar(Lang.Weed.roll, 4000, 'uncuff') then return end
-end)
-RegisterNetEvent("md-drugs:client:grind", function()
-	if not progressbar("grinding", 4000, 'uncuff') then return end
-end)
-	
-
+local function AlienEffect()
+    StartScreenEffect("DrugsMichaelAliensFightIn", 3.0, 0)
+    Wait(math.random(5000, 8000))
+    StartScreenEffect("DrugsMichaelAliensFight", 3.0, 0)
+    Wait(math.random(5000, 8000))
+    StartScreenEffect("DrugsMichaelAliensFightOut", 3.0, 0)
+    StopScreenEffect("DrugsMichaelAliensFightIn")
+    StopScreenEffect("DrugsMichaelAliensFight")
+    StopScreenEffect("DrugsMichaelAliensFightOut")
+end
 
 RegisterNetEvent("md-drugs:client:dodabs", function()
-if not progressbar('Doing Dabs', 4000, 'bong2') then return end
-AlienEffect()
+	if not progressbar(Bridge.Language.Locale('weed.dabs'), 4000, 'bong2') then AlienEffect() return end
 end)
 
-CreateThread(function()
-local WeedShop = {}
-local current = "u_m_m_jesus_01"
-
-	lib.requestModel(current, Config.RequestModelTime)
-	local CurrentLocation = Config.WeedSaleman
-	local WeedGuy = CreatePed(0,current,CurrentLocation.x,CurrentLocation.y,CurrentLocation.z-1, CurrentLocation.w, false, false)
-	Freeze(WeedGuy, true, CurrentLocation.w)
-	exports['qb-target']:AddTargetEntity(WeedGuy, { 
-        options = {
-            {label = "Weed Shop",icon = "fas fa-eye",action = function() lib.showContext('WeedShop')end},
+local function createBluntOptions(contextId, contextTitle, eventLabelPrefix, tableName)
+    local options = {}
+	
+    for k, v in pairs(recipes[tableName]) do
+        local label = {}
+        local item = ''
+        for m, d in pairs(v.take) do table.insert(label, Bridge.Inventory.GetItemInfo(m).label .. ' X ' .. d .. ' \n  ') end 
+		for m, d in pairs(v.give) do item = m end
+		local itemData = Bridge.Inventory.GetItemInfo(item)
+        options[#options + 1] = {
+            icon = itemData.image,
+            description = table.concat(label, " "),
+            title = itemData.label,
+			onSelect = function()
+				if not minigame() then return end
+				if not progressbar( Bridge.Language.Locale(eventLabelPrefix, itemData.label)) then return end
+				TriggerServerEvent('md-drugs:server:RollBlunt', tableName, item)
+			end
         }
-		})
-for k, v in pairs (Config.Weed.items) do 
-	WeedShop[#WeedShop + 1] = {
-		icon =  GetImage(v.name),
-		 title = GetLabel(v.name),
-		 description = '$'.. v.price,
-		 event = "md-drugs:client:travellingmerchantox",
-		 args = {
-			item = v.name,
-			cost = v.price,
-		   	amount = v.amount,
-		   	table = Config.Weed.items,
-		  	 num = k,
-		 }
-	 }
- lib.registerContext({id = 'WeedShop',title = "Weed Shop", options = WeedShop})
-	end
+    end
+    Bridge.Menu.Open({
+		id = contextId,
+		title = contextTitle,
+		options = options,
+	})
+end
+
+RegisterNetEvent('md-drugs:client:makeBluntWrap', function(data)
+	createBluntOptions('mddrugsbluntwraps', "Dipping Syrup", 'weed.bluntWrap', 'bluntwrap')
 end)
+
+RegisterNetEvent('md-drugs:client:rollBlunt', function(data)
+	createBluntOptions('mddrugsblunts', "Roll Blunts", 'weed.rolling', 'blunts')
+end)
+
+for k, v in pairs (locations.WeedSalesman) do
+	requestModel(v.ped)
+	local ped = CreatePed(4, v.ped, v.loc.x, v.loc.y, v.loc.z - 1.0, v.loc.w, false, true)
+	FreezeEntityPosition(ped, true)
+	SetEntityInvincible(ped, true)
+	SetBlockingOfNonTemporaryEvents(ped, true)
+	Bridge.Target.AddLocalEntity(ped, {
+		{
+			icon = Bridge.Language.Locale('weed.salesIcon'),
+			label = Bridge.Language.Locale('weed.targetSales'),
+			action = function()
+				local options = {}
+				for m, d in pairs (recipes.weedStore) do
+					local itemInfo = Bridge.Inventory.GetItemInfo(m)
+					options[#options + 1] = {
+						icon = itemInfo.image,
+						title = itemInfo.label,
+						description = '$' .. d,
+						onSelect = function()
+							local input = Bridge.Input.Open(Bridge.Language.Locale('weed.salesHeader'),{
+								{type = 'number', title = Bridge.Language.Locale('weed.salesDesc'), min = 1, max = 1000}
+							})
+							if not input and input[1] then return end
+							if not progressbar(Bridge.Language.Locale('weed.buying', Bridge.Inventory.GetItemInfo(m).label)) then return end
+							TriggerServerEvent('md-drugs:server:buyWeedItem', k, m, input[1])
+						end
+					}
+				end
+				Bridge.Menu.Open({
+					id = 'weedDude',
+					title = Bridge.Language.Locale('weed.salessHeader'),
+					options = options,
+				})
+			end
+		}
+	})
+	targets[#targets+1] = ped
+end
+
+local props = {}
+
+for locationKey, locationData in pairs (locations.MakeButter) do
+	if locationData.prop then
+		requestModel(locationData.prop)
+		props[#props+1] = CreateObject(locationData.prop, locationData.loc.x, locationData.loc.y, locationData.loc.z - 1.0, false, false, false)
+		FreezeEntityPosition(props[#props], true)
+		SetEntityHeading(props[#props], locationData.loc.w)
+		Bridge.Target.AddLocalEntity(props[#props], {
+			{
+				icon = Bridge.Language.Locale('weed.cannabisIcon'),
+				label = Bridge.Language.Locale('weed.targetMakeButter'),
+				action = function()
+					local options = {}
+					for k, v in pairs (recipes.makeButter) do
+						local itemInfo = Bridge.Inventory.GetItemInfo(k)
+						local label = {}
+						for m, d in pairs(v.recipe) do table.insert(label, Bridge.Inventory.GetItemInfo(m).label .. ' X ' .. d .. '  \n  ') end 
+						options[#options + 1] = {
+							icon = itemInfo.image,
+							title = itemInfo.label,
+							description = table.concat(label, " "),
+							onSelect = function()
+								if not progressbar(Bridge.Language.Locale('weed.making', itemInfo.label)) then return end
+								TriggerServerEvent('md-drugs:server:MakeWeedItems', 'makeButter', k, locationKey)
+							end
+						}
+					end
+					Bridge.Menu.Open({
+						id = 'weedMakeButter',
+						title = Bridge.Language.Locale('weed.makeButter'),
+						options = options,
+					})
+				end
+			}
+		})
+		targets[#targets+1] = props[#props]
+	end
+end
+for locationKey, locationData in pairs (locations.MakeOil) do
+	if locationData.prop then
+		requestModel(locationData.prop)
+		props[#props+1] = CreateObject(locationData.prop, locationData.loc.x, locationData.loc.y, locationData.loc.z - 1.0, false, false, false)
+		FreezeEntityPosition(props[#props], true)
+		SetEntityHeading(props[#props], locationData.loc.w)
+		Bridge.Target.AddLocalEntity(props[#props], {
+			{
+				icon = Bridge.Language.Locale('weed.cannabisIcon'),
+				label = Bridge.Language.Locale('weed.targetMakeOil'),
+				action = function()
+					local options = {}
+					for k, v in pairs (recipes.makeOil) do
+						local itemInfo = Bridge.Inventory.GetItemInfo(k)
+						local label = {}
+						for m, d in pairs(v.recipe) do table.insert(label, Bridge.Inventory.GetItemInfo(m).label .. ' X ' .. d .. '  \n  ') end 
+						options[#options + 1] = {
+							icon = itemInfo.image,
+							title = itemInfo.label,
+							description = table.concat(label, " "),
+							onSelect = function()
+								if not progressbar(Bridge.Language.Locale('weed.making', itemInfo.label)) then return end
+								TriggerServerEvent('md-drugs:server:MakeWeedItems', 'makeOil', k, locationKey)
+							end
+						}
+					end
+					Bridge.Menu.Open({
+						id = 'weedMakeOil',
+						title = Bridge.Language.Locale('weed.makeOil'),
+						options = options,
+					})
+				end
+			}
+		})
+		targets[#targets+1] = props[#props]
+	end
+end

client/whippit.lua

@@ -0,0 +1,84 @@
+if not Config.Drugs['whippit'] then return end
+local prop = nil
+
+local function animation(color)
+    local coords = GetEntityCoords(PlayerPedId())
+    Bridge.Anim.RequestDict('mp_player_intdrink')
+    requestModel(color)
+    prop = CreateObject(GetHashKey(color), coords.x, coords.y, coords.z, true, true, true)
+    AttachEntityToEntity(prop, PlayerPedId(), GetPedBoneIndex(PlayerPedId(), 18905), 0.087000, -0.130001, 0.138999, 63.630001, 3.299881, -21.000000, true, true, false, true, 1, true)
+    TaskPlayAnim(PlayerPedId(), 'mp_player_intdrink', 'loop_bottle', 8.0, -8.0, -1, 49, 0, false, false, false)
+    if progressbar('Inhaling Nitrous', 5000, false) then
+        ClearPedTasks(PlayerPedId())
+        DetachEntity(prop, true, true)
+        DeleteEntity(prop)
+        prop = nil
+        return true
+    else
+        ClearPedTasks(PlayerPedId())
+        DetachEntity(prop, true, true)
+        DeleteEntity(prop)
+        prop = nil
+        return false
+    end
+end
+local function blur(duration)
+    CreateThread(function()
+        TriggerScreenblurFadeIn(1000)
+        Wait(duration)
+        TriggerScreenblurFadeOut(1000)
+    end)
+end
+
+Bridge.Callback.Register('md-drugs:client:useWhippit', function(color)
+    if animation(color) then
+        blur(30000)
+        return true
+    else
+        return false
+    end
+end)
+
+local function spawnShops()
+
+    for k, v in pairs(Config.Whippit.Locations.Whippit) do
+        requestModel(v.ped)
+        local ped = CreatePed(5, GetHashKey(v.ped), v.loc.x, v.loc.y, v.loc.z, v.loc.w, true, true)
+        FreezeEntityPosition(ped, true)
+        SetEntityInvincible(ped, true)
+        SetBlockingOfNonTemporaryEvents(ped, true)
+        Bridge.Target.AddLocalEntity(ped, {
+           {
+               label = Bridge.Language.Locale('Whippit.targetShop'),
+               icon = Bridge.Language.Locale('Whippit.whippitIcon'),
+               action = function()
+                   local menu = {}
+                   for item, price in pairs (Config.Whippit.Recipes.shop) do
+                    local itemInfo = Bridge.Inventory.GetItemInfo(item)
+                       menu[#menu + 1] = {
+                           title = itemInfo.label,
+                           icon = itemInfo.image,
+                           description = '$' .. price,
+                           onSelect = function()
+                               local amount = Bridge.Input.Open(itemInfo.label, {
+                                   {type = 'number', label = 'Amount', name = 'amount', min = 1, max = 100, default = 1}
+                               })
+                               if amount and amount[1] then
+                                   TriggerServerEvent('md-drugs:server:buyWhippitItem', k, item, amount[1])
+                               end
+                           end
+                       }
+                   end
+                   Bridge.Menu.Open({
+                       id = 'whippitShop',
+                       title = Bridge.Language.Locale('Whippit.shopHeader'),
+                       options = menu
+                   })
+               end
+           },
+        })
+        targets[#targets+1] = ped
+    end
+end
+
+spawnShops()

client/wholesale.lua

@@ -1,92 +1,95 @@
-local QBCore = exports['qb-core']:GetCoreObject()
-local miss = false
-local deliveryBlip = nil
+if not Config.Drugs['wholesale'] then return end
+local active, ped, peds = false, nil, {}
 
-RegisterNetEvent("md-drugs:client:GetLocation", function(drug, notify)
-    if not GetCops(Config.PoliceCount) then return end
- if miss then
-    Notify('Already Called Someone', 'error')
- else   
-    TriggerServerEvent('md-drugs:server:RemoveBurner', drug)
-    Notify(notify, 'success')
-	local unlucky = math.random(1,100)
-    local CurrentLocation = Config.oxylocations[math.random(#Config.oxylocations)]
-    local timer = 0
-    miss = true
-    deliveryBlip = AddBlipForCoord(CurrentLocation)
-    SetBlipSprite(deliveryBlip, 1)
-    SetBlipDisplay(deliveryBlip, 2)
-    SetBlipScale(deliveryBlip, 1.0)
-    SetBlipAsShortRange(deliveryBlip, false)
-    SetBlipColour(deliveryBlip, 27)
-    BeginTextCommandSetBlipName("STRING")
-    AddTextComponentSubstringPlayerName("drug Meet")
-    EndTextCommandSetBlipName(deliveryBlip)
-    SetBlipRoute(deliveryBlip, true)
-	repeat
+local function loop(wholesaleData)
+    local timeout = 600 -- 10 minutes
+    while active do
         Wait(1000)
-        timer = timer + 1
-    until #(GetEntityCoords(PlayerPedId()) - vector3(CurrentLocation.x, CurrentLocation.y, CurrentLocation.z) ) < 4.0 or timer == Config.WholesaleTimeout + 1
-    PoliceCall(Config.AlertPoliceWholesale)
-    if timer <= Config.WholesaleTimeout or #(GetEntityCoords(PlayerPedId()) - vector3(CurrentLocation.x, CurrentLocation.y, CurrentLocation.z) ) < 4.0  then
-        timer = 0
-        RemoveBlip(deliveryBlip)
-        lib.requestModel("g_m_y_famdnf_01", Config.RequestModelTime)
-	    local current = "g_m_y_famdnf_01"
-       local drugdealer = CreatePed(0, current,CurrentLocation.x,CurrentLocation.y,CurrentLocation.z-1, 90.0, false, false)
-        FreezeEntityPosition(drugdealer, true)
-        SetEntityInvincible(drugdealer, true)
-	        exports['qb-target']:AddTargetEntity(drugdealer, {
-           options = {
-               {
-                   type = "client",
-                   label = "Talk To Buyer",
-                   icon = "fas fa-eye",
-                   action = function()
-	        				local luck = math.random(1,100)
-	        				local ped = GetEntityCoords(PlayerPedId())
-	        				if luck <= Config.SuccessfulChance then
-	        					TriggerEvent("md-drugs:client:SuccessSale", drug)
-                                Wait(4000)
-                                DeleteEntity(drugdealer)
-	        				else
-	        					TriggerEvent("md-drugs:client:SetUp")
-	        					Wait(3000)
-	        					SetUpPeds()
-                                Wait(4000)
-                                DeleteEntity(drugdealer)
-	        				end
-                            miss = false
-	        			end,	
-               },
-           },
-           distance = 2.0
-        })
-    else
-        Notify('The Buyer Waited To Long')
-        RemoveBlip(deliveryBlip)
+        local dist = #(GetEntityCoords(PlayerPedId()) - vector3(wholesaleData.location.x, wholesaleData.location.y, wholesaleData.location.z))
+        if dist < 100.0 then
+            if IsEntityDead(PlayerPedId()) then
+                active = false
+                Bridge.Point.Remove('md-drugs:wholesaleZone'..Bridge.Framework.GetPlayerIdentifier())
+                TriggerServerEvent('md-drugs:server:getkilledFuckingNoob')
+                for k, v in pairs (peds) do
+                    DeleteEntity(v)
+                end
+                peds = {}
+                break
+            end
+        end
+        timeout = timeout - 1
+        if timeout <= 0 then
+            break
+        end
     end
 end
-end)
 
+function SetUpPeds(attackerCount, location)
+    local models = {"g_m_y_ballasout_01", "g_m_y_famdnf_01", "g_m_y_famca_01", "g_m_y_mexgoon_01", "g_m_y_salvagoon_01"}
+    for i = 1, attackerCount do
+        local angle = (360 / attackerCount) * i
+        local x = location.x + math.cos(math.rad(angle)) * 15
+        local y = location.y + math.sin(math.rad(angle)) * 15
+        local z = location.z
+        local modelHash = GetHashKey(models[math.random(1, #models)])
+        requestModel(modelHash)
+        peds[#peds+1] = CreatePed(4, modelHash, x, y, z, 0.0, true, true)
+        local weapon = math.random(1, 2) == 1 and "WEAPON_PISTOL" or "WEAPON_BAT"
+        SetPedRelationshipGroupHash(peds[#peds], GetHashKey("HATES_PLAYER"))
+        SetPedCombatAttributes(peds[#peds], 46, true)
+        SetPedCombatAttributes(peds[#peds], 0, true)
+        SetPedCombatAttributes(peds[#peds], 5, true)
+        SetPedCombatAttributes(peds[#peds], 2, true)
+        GiveWeaponToPed(peds[#peds], GetHashKey(weapon), 500, false, true)
+        TaskCombatPed(peds[#peds], PlayerPedId(), 0, 16)
+    end
+end
 
-RegisterNetEvent("md-drugs:client:SuccessSale", function(drug) 
-        if not progressbar("Wholesaling Drugs", 4000, 'uncuff') then return end
-        if drug == 'coke' then
-            TriggerServerEvent("md-drugs:server:wholesalecoke")
-        elseif drug == 'crack' then
-            TriggerServerEvent("md-drugs:server:wholesalecrack")
-        elseif drug == 'lsd' then 
-            TriggerServerEvent("md-drugs:server:wholesalelsd")
-        elseif drug == 'heroin' then
-            TriggerServerEvent("md-drugs:server:wholesaleheroin")
-        elseif drug == 'xtc' then
-            TriggerEvent("md-drugs:client:wholesalextc")    
+RegisterNetEvent("md-drugs:client:GetLocation", function(wholesaleData)
+    if active then return end
+    if not wholesaleData then return end
+    active = true
+    SetNewWaypoint(wholesaleData.location.x, wholesaleData.location.y)
+    Bridge.Notify.SendNotify(Bridge.Language.Locale('wholesale.go_location'), 'success')
+    Bridge.Point.Register(
+    'md-drugs:wholesaleZone'..Bridge.Framework.GetPlayerIdentifier(),
+    vector3(wholesaleData.location.x, wholesaleData.location.y, wholesaleData.location.z),
+    50.0,
+    nil,
+    function(point, data)
+        if wholesaleData.ambush then
+            SetUpPeds(wholesaleData.attackerCount, wholesaleData.location)
+            loop(wholesaleData)
         end
+        requestModel(GetHashKey("s_m_m_ammucountry"))
+        ped = CreatePed(4, GetHashKey("s_m_m_ammucountry"), wholesaleData.location.x, wholesaleData.location.y, wholesaleData.location.z, wholesaleData.location.w, false, true)
+        FreezeEntityPosition(ped, true)
+        TaskStartScenarioInPlace(ped, "WORLD_HUMAN_STAND_IMPATIENT", 0, true)
+        Bridge.Notify.SendNotify(Bridge.Language.Locale('wholesale.meet_dealer'), 'info')
+        Bridge.Target.AddLocalEntity(ped, {
+            {
+                label = Bridge.Language.Locale('wholesale.sell_drugs'),
+                icon = Bridge.Language.Locale('wholesale.sell_drugs_icon'),
+                action = function()
+                    if not progressbar(Bridge.Language.Locale('wholesale.selling_drugs'), 15000) then return end
+                    TriggerServerEvent('md-drugs:server:SuccessSale')
+                    DeleteEntity(ped)
+                    active = false
+                    Bridge.Point.Remove('md-drugs:wholesaleZone'.. Bridge.Framework.GetPlayerIdentifier())
+                end
+            }
+        })
+        targets[#targets+1] = ped
+    end,
+    function(point, data)
+        Bridge.Point.Remove('md-drugs:wholesaleZone'.. Bridge.Framework.GetPlayerIdentifier())
+        return data
+    end)
 end)
 
 
-RegisterNetEvent("md-drugs:client:SetUp", function() 
-    progressbar("YOU FUCKED NOW", 4000, 'uncuff') 
-    SetUpPeds() 
-end)
+RegisterNetEvent('md-drugs:client:MarkLocation', function(data)
+    SetNewWaypoint(data.x, data.y)
+    Bridge.Notify.SendNotify(Bridge.Language.Locale('wholesale.go_location'), 'success')
+end)

client/xtc.lua

@@ -1,212 +1,221 @@
-local QBCore = exports['qb-core']:GetCoreObject()
+if not Config.Drugs['xtc'] then return end
 local xtcpress = false
+local locations = Config.XTC.Locations
 
+local function getRecipeList(tbl, type)
+    local rec
+  if type == 'presses' then
+    rec = {'XTC FROM THE PREVIOUS TIER REQUIRED TO UPGRADE  \n  '}
+  else
+    rec = {'REQUIRED INGREDIENTS:  \n  '}
+  end
 
-RegisterNetEvent("md-drugs:client:setpress", function(type)
-    
-    if xtcpress then 
-        Notify(Lang.xtc.out, 'error')
-    else
-        local PedCoords = GetEntityCoords(PlayerPedId())
-        xtcpress = true
-	    progressbar('Setting Press On The Ground', 4000, 'uncuff')
-	    local press = CreateObject("bkr_prop_coke_press_01aa", PedCoords.x+1, PedCoords.y+1, PedCoords.z-1, true, false)
-	    PlaceObjectOnGroundProperly(press)
-	
-        local options = {
-            {   
-                icon = "fas fa-eye",
-                label = "Make XTC",
-                action = function() 
-                    TriggerEvent("md-drugs:client:XTCMenu", type) 
-                end,   
-                canInteract = function()
-                    if xtcpress then return true end end
-            },
-            {     
-                icon = "fas fa-eye",    
-                label = "Pick Up",   
-                action = function()  
-                    TriggerEvent("md-drugs:client:GetPressBack", type, press) 
-                end,  
-                canInteract = function()        
-                    if xtcpress then return true end end 
-            },
-        }
-        local optionsox = {
-            {   
-                icon = "fas fa-eye",
-                label = "Make XTC",
-                onSelect = function() 
-                    TriggerEvent("md-drugs:client:XTCMenu", type) 
-                end,   
-                canInteract = function()
-                    if xtcpress then return true end end
-            },
-            {     
-                icon = "fas fa-eye",    
-                label = "Pick Up",   
-                onSelect = function()  
-                    TriggerEvent("md-drugs:client:GetPressBack", type, press) 
-                end,  
-                canInteract = function()        
-                    if xtcpress then return true end end 
-            },
-        }
-        if Config.oxtarget then
-            exports.ox_target:addLocalEntity(press,  optionsox)
-        else
-            exports['qb-target']:AddTargetEntity(press, { options = options})
-        end
+  for m, d in pairs(tbl) do table.insert(rec, Bridge.Inventory.GetItemInfo(m).label .. ' X ' .. d .. '  \n  ') end
+  return table.concat(rec, ' ')
+end
+
+Bridge.Callback.Register('md-drugs:client:setpress', function(xtcData)
+    if xtcpress then
+        Bridge.Notify.SendNotify(Bridge.Language.Locale('xtc.alreadyOut'), 'error')
+        return
     end
-end)    
+    local coords, head = StartRay2()
+    xtcpress = true
+	if not progressbar(Bridge.Language.Locale('xtc.settingDown')) then return end
+	local press = CreateObject("bkr_prop_coke_press_01aa", coords.x, coords.y, coords.z, true, false, false)
+	PlaceObjectOnGroundProperly(press)
+    Freeze(press, true, head)
+      local options = {
+          {
+            icon = Bridge.Language.Locale('xtc.pressIcon'),
+            label = Bridge.Language.Locale('xtc.targetMake'),
+            distance = 2.0,
+            action = function()
+                local options = {}
+                for k, v in pairs(xtcData.recipes) do
+                  local descript = getRecipeList(v.take)
+                  local itemInfo = Bridge.Inventory.GetItemInfo(k)
+                    options[#options + 1] = {
+                        icon = itemInfo.image,
+                        title = Bridge.Language.Locale(k),
+                        description = descript,
+                        onSelect = function()
+                            if not minigame() then return end
+                            if not progressbar(Bridge.Language.Locale('xtc.making', Bridge.Language.Locale(k))) then return end
+                            TriggerServerEvent("md-drugs:server:makextc", k)
+                        end,
+                        distance = 2.0
+                    }
+                end
+                Bridge.Menu.Open({
+                    id = 'XTC Recipes', 
+                    title = 'XTC Recipes',
+                    options = options
+                })
+            end,
+            canInteract = function()
+              if xtcpress then return true end
+            end
+          },
+          {
+            icon = Bridge.Language.Locale('xtc.pressIcon'),
+            label = Bridge.Language.Locale('xtc.targetPickup'),
+            action = function()
+               if not progressbar(Bridge.Language.Locale('xtc.picking')) then return end
+               DeleteObject(press)
+               xtcpress = false
+               TriggerServerEvent("md-drugs:server:getpressback")
+            end,
+            canInteract = function()
+               if xtcpress then return true end
+            end
+          },
+      }
+    Bridge.Target.AddLocalEntity(press, options)
+    targets[#targets+1] = press
+    return coords
+end)
 
-RegisterNetEvent("md-drugs:client:XTCMenu", function(type)
-    lib.registerContext({
-        id = 'XTCmenu',
-        title = 'XTC Menu',
-        options = {
-          {
-            icon = GetImage('white_xtc'),
-            title = 'White XTC',
-            description = '1 X Raw XTC',
-            event = "md-drugs:client:MakeXTC",
-            args = { data = type, color = 'white'}
-          },
-          {
-            icon = GetImage('red_xtc'),
-            title = 'Red XTC',
-            description = '1 X Raw XTC and 1 X Loose Coke',
-            event = "md-drugs:client:MakeXTC",
-            args = { data = type, color = 'red'}
-          },
-          {
-            icon = GetImage('orange_xtc'),
-            title = 'Orange XTC',
-            description = '1 X Raw XTC and 1 X Heroin Vial',
-            event = "md-drugs:client:MakeXTC",
-            args = { data = type, color = 'orange'}
-          },
-          {
-            icon = GetImage('blue_xtc'),
-            title = 'Blue XTC',
-            description = '1 X Raw XTC and 1 X Crack Rock',
-            event = "md-drugs:client:MakeXTC",
-            args = { data = type, color = 'blue'}
-          },
-          
+for k, v in pairs(locations.mdp2p) do
+    Bridge.Target.AddBoxZone('mdp2p'..k, v.loc, v.size, v.rot or 180.0, {
+        {
+            icon = Bridge.Language.Locale('xtc.mdp2pIcon'),
+            label = Bridge.Language.Locale('xtc.targetStealMDP2P'),
+            action = function()
+                if not minigame() then  return end
+                if not progressbar(Bridge.Language.Locale('xtc.stealingMDP2P')) then return end
+                TriggerServerEvent("md-drugs:server:stealmdp2p", k)
+            end,
+            canInteract = function()
+                return handleGang(v.gang)
+            end
         }
-      }) 
-      lib.showContext('XTCmenu')
-end)
-
-RegisterNetEvent("md-drugs:client:GetPressBack", function(type, press)
-    if not progressbar('Packing Up The Press', 5000, 'uncuff') then return end
-    DeleteObject(press)
-    xtcpress = false
-    TriggerServerEvent("md-drugs:server:getpressback", type)
-end)
-
-RegisterNetEvent("md-drugs:client:stealisosafrole", function(data) 
-    if not minigame(2, 8) then Notify(Lang.xtc.fail, "error") return end
-    if not progressbar(Lang.xtc.iso, 4000, 'uncuff') then return end
-    TriggerServerEvent("md-drugs:server:stealisosafrole",data.data)
-end)
-
-
-RegisterNetEvent("md-drugs:client:stealmdp2p", function(data) 
-    if not minigame(2, 8) then Notify(Lang.xtc.fail, "error") return end
-    if not progressbar(Lang.xtc.mdp2p, 4000, 'uncuff') then return end
-    TriggerServerEvent("md-drugs:server:stealmdp2p", data.data)   
-end)
-
-
-RegisterNetEvent("md-drugs:client:makingrawxtc", function(data) 
-    if not ItemCheck('isosafrole') then return end 
-    if not ItemCheck('mdp2p') then return end
-    if not progressbar(Lang.xtc.raw, 4000, 'uncuff') then return end
-    TriggerServerEvent("md-drugs:server:makingrawxtc",data.data)
-end)
-
-RegisterNetEvent("md-drugs:client:MakeXTC", function(data) 
-    if not ItemCheck('raw_xtc') then return end
-    if not progressbar(Lang.xtc.pressing, 4000, 'uncuff') then return end
-    TriggerServerEvent("md-drugs:server:makextc",data)
-end)
-
------------------------------------------------------------------- Stamping
-
-RegisterNetEvent("md-drugs:client:stampwhite", function(data) 
-    lib.registerContext({
-    id = 'stampxtc',
-    title = 'Stamp XTC Menu',
-    options = {
-      {
-        icon = GetImage('white_xtc'),
-        title = 'White XTC',
-        onSelect = function()
-            if not minigame(2, 8) then Notify(Lang.xtc.fail, "error") return end
-            if not progressbar('Stamping White Pills', 4000, 'uncuff') then return end
-            TriggerServerEvent("md-drugs:server:stampwhite",data.data)
-        end      
-      },
-      {
-        icon = GetImage('red_xtc'),
-        title = 'Red XTC',
-        onSelect = function()
-            if not minigame(2, 8) then Notify(Lang.xtc.fail, "error") return end
-            if not progressbar('Stamping Red Pills', 4000, 'uncuff') then return end
-            TriggerServerEvent("md-drugs:server:stampred", data.data)
-        end
-      },
-      {
-        icon = GetImage('orange_xtc'),
-        title = 'Orange XTC',
-        onSelect = function()
-            if not minigame(2, 8) then Notify(Lang.xtc.fail, "error") return end
-            if not progressbar('Stamping Orange Pills', 4000, 'uncuff') then return end
-            TriggerServerEvent("md-drugs:server:stamporange", data.data)
-        end,
-      },
-      {
-        icon = GetImage('blue_xtc'),
-        title = 'Blue XTC',
-        onSelect = function()
-            if not minigame(2, 8) then Notify(Lang.xtc.fail, "error") return end
-            if not progressbar('Stamping Blue Pills', 4000, 'uncuff') then return end
-            TriggerServerEvent("md-drugs:server:stampblue", data.data)
-        end
-      },
-      
-    }
-  }) 
-  lib.showContext('stampxtc')
-end)
-
-
-RegisterNetEvent("md-drugs:client:getsinglepress", function() 
-    if not progressbar('Buying Press', 4000, 'uncuff') then return end
-	TriggerServerEvent("md-drugs:server:buypress")
-end)
-
-
-RegisterNetEvent("md-drugs:client:exchangepresses", function(data) 
-   if not progressbar('Buying Press', 4000, 'uncuff') then return end
-	TriggerServerEvent("md-drugs:server:upgradepress", data.data)
-end)
-
-RegisterNetEvent("md-drugs:client:buypress", function() 
-    local img = GetImage('singlepress'),
-     lib.registerContext({
-	 id = 'buypresses',
-	 title = 'Purchase Presses',
-	 options = {
-        {    title  = 'Single Press',                description  = 'Buy a single press for 20k',                                       icon = img,    event = 'md-drugs:client:getsinglepress'},
-        {    title  = 'Exchange Single For Dual',    description  = '20 of each unstamped single stack pill and your single press ',    icon = img,    event = 'md-drugs:client:exchangepresses', args = {data = 'dual'}},
-        {    title  = 'Exchange Dual For Triple',    description  = '50 of each unstamped dual stack pill and your dual press ',        icon = img,    event = 'md-drugs:client:exchangepresses', args = {data = 'triple'}},
-        {    title  = 'Exchange Triple For Quad',    description  = '150 of each unstamped Triple stack pill and your triple press ',   icon = img,    event = 'md-drugs:client:exchangepresses', args = {data = 'quad'}} 
-	}	
     })
-  lib.showContext('buypresses')	
-end)
+    targets[#targets+1] = 'mdp2p'..k
+end
+for k, v in pairs(locations.isosafrole) do
+    Bridge.Target.AddBoxZone('isosafrole'..k, v.loc, v.size, v.rot or 180.0, {
+        {
+            icon = Bridge.Language.Locale('xtc.isosafroleIcon'),
+            label = Bridge.Language.Locale('xtc.targetStealIsosafrole'),
+            action = function()
+                if not minigame() then  return end
+                if not progressbar(Bridge.Language.Locale('xtc.stealingIsosafrole')) then return end
+                TriggerServerEvent("md-drugs:server:stealisosafrole", k)
+            end,
+            canInteract = function()
+                return handleGang(v.gang)
+            end
+        }
+    })
+    targets[#targets+1] = 'isosafrole'..k
+end
 
+for k, v in pairs(locations.rawxtcloc) do
+    Bridge.Target.AddBoxZone('xtcraw'..k, v.loc, v.size, v.rot or 180.0, {
+        {
+            icon = Bridge.Language.Locale('xtc.rawIcon'),
+            label = Bridge.Language.Locale('xtc.targetRaw'),
+            action = function()
+                if not minigame() then  return end
+                if not progressbar(Bridge.Language.Locale('xtc.makingRaw')) then return end
+                TriggerServerEvent("md-drugs:server:makingrawxtc", k)
+            end,
+            canInteract = function()
+                return handleGang(v.gang)
+            end
+        }
+    })
+    targets[#targets+1] = 'xtcraw'..k
+end
+
+for k, v in pairs(locations.xtcpress) do
+    requestModel(v.ped)
+    local ped = CreatePed(0, v.ped, v.loc, false, false)
+    Freeze(ped, true, v.loc.w)
+    Bridge.Target.AddLocalEntity(ped, {
+        {
+            icon = Bridge.Language.Locale('xtc.pressIcon'),
+            label = Bridge.Language.Locale('xtc.getPress'),
+            onSelect = function()
+                local options = {}
+                local recipeList = Config.XTC.Recipes.presses
+                for m, d in pairs(recipeList) do
+                    if m == 'singlepress' then
+                        local itemInfo = Bridge.Inventory.GetItemInfo(m)
+                        options[#options + 1] = {
+                          icon = itemInfo.image,
+                          title = itemInfo.label,
+                          description = Bridge.Language.Locale('xtc.buySingle', d.cash),
+                          type = d.type,
+                          onSelect = function()
+                            if not progressbar(Bridge.Language.Locale('xtc.buyp')) then return end
+                            TriggerServerEvent('md-drugs:server:buypress',k, m)
+                          end,
+                        }
+                    else
+                        local itemInfo = Bridge.Inventory.GetItemInfo(m)
+                        local descript = getRecipeList(d.take, 'presses')
+                        options[#options + 1] = {
+                            icon = itemInfo.image,
+                            title = itemInfo.label,
+                            description = descript,
+                            type = d.type,
+                            onSelect = function()
+                                 if not progressbar(Bridge.Language.Locale('xtc.buyp')) then return end
+                                TriggerServerEvent("md-drugs:server:upgradepress", k, m)
+                            end,
+                            distance = 2.0
+                        }
+                    end
+                end
+                table.sort(options, function(a, b) return a.type < b.type end)
+                Bridge.Menu.Open({
+                    id = 'XTC Presses', 
+                    title = 'XTC Presses',
+                    options = options
+                })
+            end,
+             canInteract = function() return handleGang(v.gang) end
+        }
+    })
+    targets[#targets+1] = ped
+end
+
+for k, v in pairs (locations.stamp) do
+    Bridge.Target.AddBoxZone('xtcstamp'..k, v.loc, v.size, v.rot or 180.0, {
+        {
+            icon = Bridge.Language.Locale('xtc.stampIcon'),
+            label = Bridge.Language.Locale('xtc.targetStamp'),
+            onSelect = function()
+                local item = {
+                    {item = 'white_xtc', label = Bridge.Inventory.GetItemInfo('white_xtc').label, color = 'white'},
+                    {item = 'red_xtc', label = Bridge.Inventory.GetItemInfo('red_xtc').label, color = 'red'},
+                    {item = 'orange_xtc', label = Bridge.Inventory.GetItemInfo('orange_xtc').label, color = 'orange'},
+                    {item = 'blue_xtc', label = Bridge.Inventory.GetItemInfo('blue_xtc').label, color = 'blue'},
+                }
+                local options = {}
+                for m, d in pairs (item) do
+                    options[#options + 1] = {
+                        icon = Bridge.Inventory.GetItemInfo(d.item).image,
+                        title = d.label,
+                        description = Bridge.Language.Locale('xtc.stamp_desc', d.color),
+                        action = function()
+                            if not minigame() then  return end
+                            if not progressbar(Bridge.Language.Locale('xtc.stamping', d.label)) then return end
+                            TriggerServerEvent("md-drugs:server:stamp", k, d.color)
+                        end,
+                        distance = 2.0
+                    }
+                end
+                Bridge.Menu.Open({
+                    id = 'XTC Stamp', 
+                    title = 'XTC Stamp',
+                    options = options
+                })
+            end,
+            canInteract = function() return handleGang(v.gang) end
+        }
+    })
+    targets[#targets+1] = 'xtcstamp'..k
+end

fxmanifest.lua

@@ -3,32 +3,28 @@ author "mustache_dom"
 description "drugs by mustache dom"
 fx_version "cerulean"
 game "gta5"
-version  '3.5.9'
+version  '4.0.8'
 client_scripts {
+	'client/functions.lua',
 	'client/**.lua',
-	'@PolyZone/client.lua',
-   	 '@PolyZone/CircleZone.lua',
 }
 
 server_scripts {
-    'server/**.lua',
 	'@oxmysql/lib/MySQL.lua',
-	
+	'server/functions.lua',
+	'server/**.lua',
 }
 
 shared_scripts {
-	'@ox_lib/init.lua',
-	'shared/**.lua',
-
+ 	'@ox_lib/init.lua', 
+	'shared/config.lua',
+	'shared/DrugData/*.lua',
 }
 
-
 lua54 'yes'
 
-
-dependency 'bob74_ipl'
 files {
-	'stream/mushroom.ytyp'
+	'client/**.lua',
+	'server/**.lua',
+	'locales/**.json'
 }
-
-data_file 'DLC_ITYP_REQUEST' 'stream/mushroom.ytyp'