Update cocaine.lua

- `added` dependancy check to yell at you if it isnt the proper load order

.vscode/settings.json

@@ -0,0 +1,26 @@
+{
+    "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"
+    ]
+}

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,28 @@
+
+local function spawn()
+    local data = ps.callback('md-drugs:server:GetMerchant')
+    local model = 's_m_m_trucker_01'
+    ps.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)
+    ps.entityTarget(ped, {
+        {
+            label = ps.lang('merchant.targetOpen'),
+            action = function()
+                local options = {}
+                for k, v in pairs (data.items) do
+                    options[#options+1] = {
+                        title = ps.getLabel(k),
+                        description = '$'..v,
+                        icon = ps.getImage(k),
+                        action = function()
+                            TriggerServerEvent('md-drugs:server:purchaseGoods', k)
+                        end
+                    }
+                end
+                ps.menu('Travelling Merchant', 'Travelling Merchant', options)
+            end
+        }
+    })
+end
+spawn()

client/cocaine.lua

@@ -1,146 +1,215 @@
-local QBCore = exports['qb-core']:GetCoreObject()
-local CocaPlant = {}
 
-function LoadModel(hash)
-    hash = GetHashKey(hash)
-    RequestModel(hash)
-    while not HasModelLoaded(hash) do
-        Wait(3000)
+local cuttingcoke = nil
+local baggingcoke = nil
+local locations = ps.callback('md-drugs:server:GetCokeLocations')
+
+local function CutCoke(coords, offset, rotation)
+cuttingcoke = true
+	local animDict, animName = "anim@amb@business@coc@coc_unpack_cut_left@", "coke_cut_v5_coccutter"
+	ps.requestAnim(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
+
+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"
+	ps.requestAnim(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_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:respawnCane', function(loc)
-    local v = GlobalState.CocaPlant[loc]
-    local hash = GetHashKey(v.model)
-    --if not HasModelLoaded(hash) then LoadModel(hash) end
-    if not CocaPlant[loc] then
-        CocaPlant[loc] = CreateObject(hash, v.location, false, true, true)
-        SetEntityAsMissionEntity(CocaPlant[loc], true, true)
-        FreezeEntityPosition(CocaPlant[loc], true)
-        SetEntityHeading(CocaPlant[loc], v.heading)
-        exports['qb-target']:AddTargetEntity(CocaPlant[loc], {
-            options = { {
-                    icon = "fas fa-hand",
-                    label = "pick Cocaine",
-                    action = function()
-                        QBCore.Functions.Progressbar("pick_cane", "picking Cocaine Leaves", 2000, false, true, {
-                            disableMovement = true, disableCarMovement = true, disableMouse = false, disableCombat = true, },
-                            { animDict = 'amb@prop_human_bum_bin@idle_a', anim = 'idle_a', flags = 47, },
-                            {}, {}, function()
-                            TriggerServerEvent("coke:pickupCane", loc)
-                            ClearPedTasks(PlayerPedId())
-                        end, function() -- Cancel
-                            ClearPedTasks(PlayerPedId())
-                        end)
-                    end
-                }
-            },
-            distance = 3.0
-        })
+    DisableCamCollisionForEntity(ped)
+    FreezeEntityPosition(ped, true)
+    for i=1, #scenesList, 1 do
+    	NetworkStartSynchronisedScene(scenesList[i])
     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)
-            SetEntityAsMissionEntity(CocaPlant[k], true, true)
-            FreezeEntityPosition(CocaPlant[k], true)
-            SetEntityHeading(CocaPlant[k], v.heading)
-            exports['qb-target']:AddTargetEntity(CocaPlant[k], {
-                options = { {
-                        icon = "fas fa-hand",
-                        label = "pick cocaine",
-                        action = function()
-                            QBCore.Functions.Progressbar("pick_cane", "picking Cocaine Leaves", 2000, false, true, {
-                                disableMovement = true, disableCarMovement = true, disableMouse = false, disableCombat = true, },
-                                { animDict = 'amb@prop_human_bum_bin@idle_a', anim = 'idle_a', flags = 47, },
-                                {}, {}, function()
-                                TriggerServerEvent("coke:pickupCane", k)
-                                ClearPedTasks(PlayerPedId())
-                            end, function() -- Cancel
-                                ClearPedTasks(PlayerPedId())
-                            end)
-                        end
-                    }
-                },
-                distance = 3.0
-            })
-        end
+    Wait(animDuration-11000)
+    for i=1, #scenesList, 1 do
+    	NetworkStopSynchronisedScene(scenesList[i])
     end
-end)
-
-AddEventHandler('onResourceStart', function(resource)
-    if resource == GetCurrentResourceName() then
-        LoadModel('prop_plant_01a')
-        TriggerEvent('coke:init')
+    for i=1, #entitiesList, 1 do
+    	DeleteEntity(entitiesList[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)
+    RemoveAnimDict(animDict)
+    FreezeEntityPosition(ped, false)
+baggingcoke = nil
+end
+
+for k, v in pairs (locations.MakePowder) do
+    ps.boxTarget('cocaplant'..k, v.loc, {length = v.l, width = v.w, height = 1.0, rotation = v.rot}, {
+        {
+            label = ps.lang('coke.targetMakePow'),
+            icon = 'fa-solid fa-seedling',
+            action = function()
+                if not ps.hasItem('coca_leaf') then
+                    ps.notify(ps.lang('Catches.itemMissings', ps.getLabel('coca_leaf')), 'error')
+                    return
+                end
+                if not ps.progressbar(ps.lang('coke.makePow'), 4000, 'uncuff') then return end
+	            TriggerServerEvent("md-drugs:server:makepowder", k)
+            end,
+            canInteract = function()
+                return handleGang(v.gang)
             end
-        end
-    end
+        }
+    })
+end
+
+for k, v in pairs (locations.CuttingCoke) do
+    ps.boxTarget('cutcoke'..k, v.loc, {length = 1.0, width = 1.0, height = 1.0, rotation = 180.0}, {
+        {
+            label = ps.lang('coke.targetCutCoke'),
+            icon = 'fa-solid fa-mortar-pestle',
+            action = function()
+                if not ps.hasItem('bakingsoda') then
+                    ps.notify(ps.lang('Catches.itemMissings', ps.getLabel('bakingsoda')), 'error')
+                    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,
+        }
+    })
+end
+
+for k, v in pairs (locations.BaggingCoke) do
+    ps.boxTarget('bagcoke'..k, v.loc, {length = 1.0, width = 1.0, height = 1.0, rotation = 180.0}, {
+        {
+            label = ps.lang('coke.targetBagCoke'),
+            icon = 'fa-solid fa-sack-xmark',
+            action = function()
+                if not ps.hasItem('empty_weed_bag') then
+                    ps.notify(ps.lang('Catches.itemMissings', ps.getLabel('empty_weed_bag')), 'error')
+                    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
+        }
+    })
+end
+
+for k, v in pairs (locations.cokeTele) do
+	ps.boxTarget('coke_tele'..k, v.inside, {length = v.l, width = v.w, heading = v.rot}, {
+		{
+			icon = 'fa-solid fa-door-open',
+			label = ps.lang('coke.teleOut'),
+			action = function()
+				SetEntityCoords(PlayerPedId(), v.outside)
+			end,
+			canInteract = function()
+                return handleGang(v.gang)
+            end
+		}
+	})
+	ps.boxTarget('coke_teleout'..k, v.outside, {length = v.l, width = v.w, heading = v.rot}, {
+		{
+			icon = 'fa-solid fa-door-closed',
+			label = ps.lang('coke.teleIn'),
+			action = function()
+				SetEntityCoords(PlayerPedId(), v.inside)
+			end,
+			canInteract = function()
+                return handleGang(v.gang)
+            end
+		}
+	})
+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)
 
-RegisterNetEvent("md-drugs:client:makepowder")
-AddEventHandler("md-drugs:client:makepowder", function() 
-	exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-    QBCore.Functions.Progressbar("drink_something", "chopping plants to powder", 4000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-	    TriggerServerEvent("md-drugs:server:makepowder")
-        ClearPedTasks(PlayerPedId())
-    end)
-end)
-
-RegisterNetEvent("md-drugs:client:cutcokeone")
-AddEventHandler("md-drugs:client:cutcokeone", function() 
-	exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-    QBCore.Functions.Progressbar("drink_something", "cutting coke to increase profits yeeee!", 4000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-	    TriggerServerEvent("md-drugs:server:cutcokeone")
-        ClearPedTasks(PlayerPedId())
-    end)
-end)
-
-RegisterNetEvent("md-drugs:client:bagcoke")
-AddEventHandler("md-drugs:client:bagcoke", function() 
-	exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-    QBCore.Functions.Progressbar("drink_something", "Bilbo Baggin this bitch!", 4000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-	    TriggerServerEvent("md-drugs:server:bagcoke")
-        ClearPedTasks(PlayerPedId())
-    end)
-end)

client/consumables.lua

@@ -1,24 +1,145 @@
-local QBCore = exports['qb-core']:GetCoreObject()
 
-RegisterNetEvent('md-drugs:client:consumedrugs', function(itemName)
-      QBCore.Functions.Progressbar("use_lsd", "Have Fun!", 1750, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-		disableMouse = false,
-		disableCombat = true,
-    }, {
-		animDict = "mp_suicide",
-		anim = "pill",
-		flags = 49,
-    }, {}, {}, function()
-       ClearPedTasks(PlayerPedId())
-	TriggerEvent("evidence:client:SetStatus", "widepupils", 300)
-		if itemName == "white_playboys" or itemName ==  "white_playboys2" or itemName ==  "white_playboys3" or itemName ==  "white_playboys4" or itemName == "blue_playboys" or itemName ==  "blue_playboys2" or itemName ==  "blue_playboys3" or itemName ==  "blue_playboys4" or itemName ==  "red_playboys" or itemName ==  "red_playboys2" or itemName ==  "red_playboys3" or itemName ==  "red_playboys4" or itemName ==  "orange_playboys" or itemName ==  "orange_playboy2s" or itemName ==  "orange_playboys3" or itemName ==  "orange_playboys4" or itemName ==  "white_aliens" or itemName ==  "white_aliens2" or itemName ==  "white_aliens3" or itemName ==  "white_aliens4" or itemName ==  "blue_aliens" or itemName ==  "blue_aliens2" or itemName ==  "blue_aliens3" or itemName ==  "blue_aliens4" or itemName ==  "red_aliens" or itemName ==  "red_aliens3" or itemName ==  "red_aliens2" or itemName ==  "red_aliens4" or itemName ==  "orange_aliens" or itemName ==  "orange_aliens2" or itemName ==  "orange_aliens3" or itemName ==  "orange_aliens4" or itemName ==  "white_pl" or itemName ==  "white_pl2" or itemName ==  "white_pl3" or itemName ==  "white_pl4" or itemName == "blue_pl" or itemName ==  "blue_pl2" or itemName ==  "blue_pl3" or itemName ==  "blue_pl4" or itemName ==  "red_pl" or itemName ==  "red_pl2" or itemName ==  "red_pl3" or itemName ==  "red_pl4" or itemName ==  "orange_pl" or itemName ==  "orange_pl2" or itemName ==  "orange_pl3" or itemName ==  "orange_pl4" or itemName ==  "white_trolls" or itemName ==  "white_trolls2" or itemName ==  "white_trolls3" or itemName ==  "white_trolls4" or itemName == "blue_trolls" or itemName ==  "blue_trolls2" or itemName ==  "blue_trolls3" or itemName ==  "blue_trolls4" or itemName ==  "red_trolls" or itemName ==  "red_trolls2" or itemName ==  "red_trolls3" or itemName ==  "red_trolls4" or itemName ==  "orange_trolls" or itemName ==  "orange_trolls2" or itemName ==  "orange_trolls3" or itemName ==  "orange_trolls4" or itemName ==  "white_cats2" or itemName ==  "white_cats3" or itemName ==  "white_cats4" or itemName ==  "white_cats" or itemName == "blue_cats" or itemName ==  "blue_cats3" or itemName ==  "blue_cats2" or itemName ==  "blue_cats4" or itemName ==  "red_cats" or itemName ==  "red_cats2" or itemName ==  "red_cats3" or itemName ==  "red_cats4" or itemName ==  "orange_cats" or itemName ==  "orange_cats2" or itemName ==  "orange_cats3" or itemName ==  "orange_cats4" then
-			AlienEffect()
-		elseif itemName == "cokebaggystagetwo" or itemName == "cokebaggystagethree" or itemName == "baggedcracked" or itemName == "baggedcrackedstagetwo" or itemName == "baggedcrackedstagethree" then
-			CokeBaggyEffect()
-		else
-			TrevorEffect()
-		end	
-   end)
+
+ps.registerCallback('md-drugs:client:consumedrugs', function(time, effect, anim, progresstext, status, item)
+	if not ps.progressbar(progresstext .. ps.getLabel(item).. "!", 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)
+	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,312 +1,173 @@
-local QBCore = exports['qb-core']:GetCoreObject()
-local cornerselling = false
-local hasTarget = false
-local lastPed = {}
-local stealingPed = nil
-local stealData = {}
-local availableDrugs = {}
-local currentOfferDrug = nil
-local CurrentCops = 0
-local textDrawn = false
-local zoneMade = false
+local sell = false
+local inZone = false
+local buyers = {}
 
--- Functions
-local function LoadAnimDict(dict)
-    RequestAnimDict(dict)
-    while not HasAnimDictLoaded(dict) do
-        Wait(0)
-    end
+local function walkAway(targ)
+    FreezeEntityPosition(targ, false)
+    ClearPedTasks(targ)
 end
 
-local function TooFarAway()
-    QBCore.Functions.Notify("too far from your corner homie", 'error')
-    LocalPlayer.state:set("inv_busy", false, true)
-    cornerselling = false
-    hasTarget = false
-    availableDrugs = {}
-end
-
-local function PoliceCall()
-   -- if Config.PoliceCallChance <= math.random(1, 100) then
-    --    TriggerServerEvent('police:server:policeAlert', 'Drug sale in progress')
-   -- end
-end
-
-local function RobberyPed()
-    if Config.UseTarget then
-        exports['qb-target']:AddEntityZone('stealingPed', stealingPed, {
-            name = 'stealingPed',
-            debugPoly = false,
-        }, {
-            options = {
-                {
-                    icon = 'fas fa-magnifying-glass',
-                    label = "take back",
-                    action = function()
-                        local player = PlayerPedId()
-                       exports["rpemotes"]:EmoteCommandStart("pickup", 0)
-                        Wait(2000)
-                        ClearPedTasks(player)
-                        TriggerServerEvent('md-drugs:server:giveStealItems', stealData.item, stealData.amount)
-                        TriggerEvent('inventory:client:ItemBox', QBCore.Shared.Items[stealData.item], "add")
-                        stealingPed = nil
-                        stealData = {}
-                        exports['qb-target']:RemoveZone('stealingPed')
-                    end,
-                    canInteract = function(entity)
-                        if IsEntityDead(entity) then
-                            return true
-                        end
-                    end
-                }
-            },
-            distance = 1.5,
-        })
-        CreateThread(function()
-            while stealingPed do
-                local playerPed = PlayerPedId()
-                local pos = GetEntityCoords(playerPed)
-                local pedpos = GetEntityCoords(stealingPed)
-                local dist = #(pos - pedpos)
-                if dist > 100 then
-                    stealingPed = nil
-                    stealData = {}
-                    exports['qb-target']:RemoveZone('stealingPed')
-                    break
-                end
-                Wait(0)
-            end
-        end)
-    end
-end
-
-local function SellToPed(ped)
-    hasTarget = true
-
-    for i = 1, #lastPed, 1 do
-        if lastPed[i] == ped then
-            hasTarget = false
-            return
-        end
+local function sellDrug(item, amount, price, targ)
+    PoliceCall(20)
+    if ps.vehicleData() then
+        ps.notify(ps.lang('Cornerselling.inVeh'), 'error')
+        walkAway(targ)
+        return
     end
 
-    local successChance = math.random(1, 100)
-    local scamChance = math.random(1, 100)
-    local getRobbed = math.random(1, 100)
-    if successChance <= Config.SuccessChance then hasTarget = false return end
+    if not ps.progressbar(string.format(ps.lang('Cornerselling.selling', ps.getLabel(item), price)), 4000, 'uncuff') then walkAway(targ) return end
+    buyers[targ] = 'sold'
+    TriggerServerEvent('md-drugs:server:sellCornerDrugs', item, amount, price)
+    walkAway(targ)
+ end
 
-    local drugType = math.random(1, #availableDrugs)
-    local bagAmount = math.random(1, availableDrugs[drugType].amount)
-    if bagAmount > 15 then bagAmount = math.random(9, 15) end
+local function deny(targ)
+     PoliceCall(20)
+    buyers[targ] = 'sold'
+    if not ps.progressbar(ps.lang('Cornerselling.deny'), 4000, 'argue5') then return end
+    walkAway(targ)
+end
 
-    currentOfferDrug = availableDrugs[drugType]
-
-    local ddata = Config.DrugsPrice[currentOfferDrug.item]
-    local randomPrice = math.random(ddata.min, ddata.max) * bagAmount
-    if scamChance <= Config.ScamChance then randomPrice = math.random(3, 10) * bagAmount end
-
-    SetEntityAsNoLongerNeeded(ped)
-    ClearPedTasks(ped)
-
-    local coords = GetEntityCoords(PlayerPedId(), true)
-    local pedCoords = GetEntityCoords(ped)
-    local pedDist = #(coords - pedCoords)
-    if getRobbed <= Config.RobberyChance then
-        TaskGoStraightToCoord(ped, coords, 15.0, -1, 0.0, 0.0)
-    else
-        TaskGoStraightToCoord(ped, coords, 1.2, -1, 0.0, 0.0)
-    end
-
-    while pedDist > 1.5 do
-        coords = GetEntityCoords(PlayerPedId(), true)
-        pedCoords = GetEntityCoords(ped)
-        if getRobbed <= Config.RobberyChance then
-            TaskGoStraightToCoord(ped, coords, 15.0, -1, 0.0, 0.0)
-        else
-            TaskGoStraightToCoord(ped, coords, 1.2, -1, 0.0, 0.0)
-        end
-        TaskGoStraightToCoord(ped, coords, 1.2, -1, 0.0, 0.0)
-        pedDist = #(coords - pedCoords)
+local function findPed()
+    local targ = nil
+    repeat
         Wait(100)
-    end
+        targ = ps.getNearestPed(GetEntityCoords(PlayerPedId()), 8)
 
-    TaskLookAtEntity(ped, PlayerPedId(), 5500.0, 2048, 3)
-    TaskTurnPedToFaceEntity(ped, PlayerPedId(), 5500)
-    TaskStartScenarioInPlace(ped, "WORLD_HUMAN_STAND_IMPATIENT_UPRIGHT", 0, false)
-
-    if hasTarget then
-        while pedDist < 3.0 and not IsPedDeadOrDying(ped) do
-            local coords2 = GetEntityCoords(PlayerPedId(), true)
-            local pedCoords2 = GetEntityCoords(ped)
-            local pedDist2 = #(coords2 - pedCoords2)
-            if getRobbed <= Config.RobberyChance then
-                TriggerServerEvent('md-drugs:server:robCornerDrugs', drugType, bagAmount)
-                QBCore.Functions.Notify("You Got Robbed " .. bagAmount .. " Bags of " .. currentOfferDrug.item.. "!")
-                stealingPed = ped
-                stealData = {
-                    item = availableDrugs[drugType].item,
-                    drugType = drugType,
-                    amount = bagAmount,
-                }
-                hasTarget = false
-                local moveto = GetEntityCoords(PlayerPedId())
-                local movetoCoords = {x = moveto.x + math.random(100, 500), y = moveto.y + math.random(100, 500), z = moveto.z, }
-                ClearPedTasksImmediately(ped)
-                TaskGoStraightToCoord(ped, movetoCoords.x, movetoCoords.y, movetoCoords.z, 15.0, -1, 0.0, 0.0)
-                lastPed[#lastPed + 1] = ped
-                RobberyPed()
-                break
-            else
-                if pedDist2 < 1.5 and cornerselling then
-                    if Config.UseTarget and not zoneMade then
-                        zoneMade = true
-                        exports['qb-target']:AddEntityZone('sellingPed', ped, {
-                            name = 'sellingPed',
-                            debugPoly = false,
-                        }, {
-                            options = {
-                                {
-                                    icon = 'fas fa-hand-holding-dollar',
-                                    label = "Sell " ..bagAmount.. " of " .. currentOfferDrug.item.. " for " .. randomPrice .. " Dollars! ",
-                                    action = function(entity)
-									 local playerPed = PlayerPedId()
-                                        if IsPedInAnyVehicle(PlayerPedId(), false) then
-                                            QBCore.Functions.Notify("youre in a car", 'error')
-                                            hasTarget = false
-                                            SetPedKeepTask(entity, false)
-                                            SetEntityAsNoLongerNeeded(entity)
-                                            ClearPedTasksImmediately(entity)
-                                            lastPed[#lastPed + 1] = entity
-                                            exports['qb-target']:RemoveZone('sellingPed')
-                                            return
-                                        else
-                                            QBCore.Functions.Progressbar("cornerSelling", "selling Drugs", '5000', false, false, {
-                                                disableMovement = true,
-                                                disableCarMovement = true,
-                                                disableMouse = false,
-                                                disableCombat = false,
-                                            }, {}, {}, {}, function()
-                                                TriggerServerEvent('md-drugs:server:sellCornerDrugs', drugType, bagAmount, randomPrice)
-                                                hasTarget = false
-                                                exports["rpemotes"]:EmoteCommandStart("point", 0)
-                                                Wait(650)
-                                                ClearPedTasks(PlayerPedId())
-                                                SetPedKeepTask(entity, false)
-                                                SetEntityAsNoLongerNeeded(entity)
-                                                ClearPedTasksImmediately(entity)
-                                                lastPed[#lastPed + 1] = entity
-                                                exports['qb-target']:RemoveZone('sellingPed')
-                                                PoliceCall()
-                                            end)
-                                        end
-                                    end,
-                                },
-                                {
-                                    icon = 'fas fa-x',
-                                    label = 'Decline offer',
-                                    action = function(entity)
-                                        QBCore.Functions.Notify("Fuck that Offer", 'error')
-                                        hasTarget = false
-                                        SetPedKeepTask(entity, false)
-                                        SetEntityAsNoLongerNeeded(entity)
-                                        ClearPedTasksImmediately(entity)
-                                        lastPed[#lastPed + 1] = entity
-                                        exports['qb-target']:RemoveZone('sellingPed')
-                                    end,
-                                },
-                            },
-                            distance = 1.5,
-                        })
-                    end
-                else
-                    if Config.UseTarget then
-                        zoneMade = false
-                        exports['qb-target']:RemoveZone('sellingPed')
-                    
-                    end
-                    hasTarget = false
-                    SetPedKeepTask(ped, false)
-                    SetEntityAsNoLongerNeeded(ped)
-                    ClearPedTasksImmediately(ped)
-                    lastPed[#lastPed + 1] = ped
-                    break
-                end
-            end
-            Wait(0)
+        if IsPedInAnyVehicle(targ, false) or GetEntityHealth(targ) == 0 or not IsPedHuman(targ) then
+            targ = nil
         end
-        Wait(math.random(4000, 7000))
-    end
-end
-
-local function ToggleSelling()
-    if not cornerselling then
-        cornerselling = true
-        LocalPlayer.state:set("inv_busy", true, true)
-        QBCore.Functions.Notify("get that paper")
-        local startLocation = GetEntityCoords(PlayerPedId())
-        CreateThread(function()
-            while cornerselling do
-                local player = PlayerPedId()
-                local coords = GetEntityCoords(player)
-                if not hasTarget then
-                    local PlayerPeds = {}
-                    if next(PlayerPeds) == nil then
-                        for _, activePlayer in ipairs(GetActivePlayers()) do
-                            local ped = GetPlayerPed(activePlayer)
-                            PlayerPeds[#PlayerPeds + 1] = ped
-                        end
-                    end
-                    local closestPed, closestDistance = QBCore.Functions.GetClosestPed(coords, PlayerPeds)
-                    if closestDistance < 15.0 and closestPed ~= 0 and not IsPedInAnyVehicle(closestPed) and GetPedType(closestPed) ~= 28 then
-                        SellToPed(closestPed)
-                    end
-                end
-                local startDist = #(startLocation - coords)
-                if startDist > 30 then
-                    TooFarAway()
-                end
-                Wait(0)
-            end
-        end)
-    else
-        stealingPed = nil
-        stealData = {}
-        cornerselling = false
-        LocalPlayer.state:set("inv_busy", false, true)
-        QBCore.Functions.Notify("lazy ass cant even sell drugs")
-    end
-end
-
--- Events
-RegisterNetEvent('md-drugs:client:cornerselling', function()
-    QBCore.Functions.TriggerCallback('md-drugs:server:cornerselling:getAvailableDrugs', function(result)
-        if CurrentCops >= Config.MinimumDrugSalePolice then
-            if IsPedInAnyVehicle(PlayerPedId(), false) then
-                QBCore.Functions.Notify("youre in a car", 'error')
-            else
-                if result then
-                    availableDrugs = result
-                    ToggleSelling()
-                else
-                    QBCore.Functions.Notify("what you gonna sell fuckin air or something?", 'error')
-                    LocalPlayer.state:set("inv_busy", false, true)
-                end
-            end
-        else
-            QBCore.Functions.Notify("not enough pork", "error")
+        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
+
+    ps.drawText(ps.lang('Cornerselling.wait'))
+
+    repeat
+        Wait(1000)
+        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)
+    ps.hideText()
+    CreateThread(function()
+        Wait(45000)
+        walkAway(targ)
+        buyers[targ] = 'sold'
     end)
-end)
+    return targ
+end
 
-RegisterNetEvent('police:SetCopCount', function(amount)
-    CurrentCops = amount
-end)
+local function checkItems()
+    local count = 0
+    for k, v in pairs (GlobalState.DrugNames) do
+        if ps.hasItem(v) then
+            count = count + 1
+            break
+        end
+    end
+    if count == 0 then ps.notify(ps.lang('Cornerselling.nodrugs', 'error')) return false end
+    return true
+end
 
-RegisterNetEvent('md-drugs:client:refreshAvailableDrugs', function(items)
-    availableDrugs = items
-    if availableDrugs == nil or #availableDrugs <= 0 then
-        QBCore.Functions.Notify("no Drugs", 'error')
-        cornerselling = false
-        LocalPlayer.state:set("inv_busy", false, true)
+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
+
+    ps.drawText(ps.lang('Cornerselling.searching'))
+
+    local targ = findPed()
+    local data = ps.callback('md-drugs:server:cornerselling:getAvailableDrugs', 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
+        ps.entityTarget(targ, {
+            {
+                label = ps.lang('Cornerselling.targetTakeBack'),
+                icon ="fa-solid fa-money-bill",
+                action =   function()
+                    got = true
+                    TriggerServerEvent('md-drugs:server:getBackRobbed')
+                    Cornersell()
+                end,
+                canInteract = function()
+                    if IsEntityDead(targ) and not got then
+                        return true
+                    end
+                end,
+        }}, nil)
+    else
+        ps.requestAnim("rcmme_tracey1")
+        TaskStartScenarioInPlace(targ, "WORLD_HUMAN_STAND_IMPATIENT_UPRIGHT", 0, false)
+        FreezeEntityPosition(targ, true)
+        ps.entityTarget(targ, {
+            {
+                label = string.format(ps.lang('Cornerselling.targetSell'), data.amount, ps.getLabel(data.item), data.price),
+                icon ="fa-solid fa-money-bill",
+                action =   function()
+                    sellDrug(data.item, data.amount, data.price, targ)
+                    Cornersell()
+                end,
+                canInteract = function()
+                    if buyers[targ] ~= 'sold' and sell then
+                        return true
+                    end
+                end,
+            },
+            {
+                label = ps.lang('Cornerselling.targetDeny'),
+                icon = "fa-solid fa-person-harassing",
+                action = function()
+                    deny(targ)
+                    walkAway(targ)
+                    Cornersell()
+                end,
+                canInteract = function()
+                    if buyers[targ] == true and sell then
+                        return true
+                    end
+                end
+            }
+        })
+    end
+end
+
+RegisterNetEvent('md-drugs:client:cornerselling', function()
+    if sell then
+        sell = false
+        ps.hideText()
+        ps.notify(ps.lang('Cornerselling.stopped'), 'error')
+    else
+        sell = true
+        ps.notify(ps.lang('Cornerselling.start'), 'success')
+        Cornersell()
     end
 end)
+
+CreateThread(function()
+    for k, v in pairs (QBConfig.NoSellZones) do
+        local box = ps.zones.box({ coords = v.loc, size = vec3(v.width, v.length, v.height), rotation = 180.0, debug = false,
+        onEnter = function() inZone = true end, onExit = function() inZone = false end})
+    end
+end)

client/crack.lua

@@ -1,40 +1,47 @@
-local QBCore = exports['qb-core']:GetCoreObject()
+local locations = ps.callback('md-drugs:server:GetCrackLocations')
 
-RegisterNetEvent("md-drugs:client:makecrackone")
-AddEventHandler("md-drugs:client:makecrackone", function() 
-	exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-    QBCore.Functions.Progressbar("drink_something", "Cooking Crack", 1000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-	exports['ps-ui']:Circle(function(success)
-    if success then
-        TriggerServerEvent("md-drugs:server:makecrackone")       
-        ClearPedTasks(PlayerPedId())
-	else
-		TriggerServerEvent("md-drugs:server:failcrackone")
-        ClearPedTasks(PlayerPedId())
-	end
-end, 3, 8) -- NumberOfCircles, 
-    end)
-end)
-
-
-RegisterNetEvent("md-drugs:client:bagcrack")
-AddEventHandler("md-drugs:client:bagcrack", function() 
-	exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-    QBCore.Functions.Progressbar("drink_something", "bagging some good good", 4000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-	    TriggerServerEvent("md-drugs:server:bagcrack")
-        ClearPedTasks(PlayerPedId())
-    end)
-end)
+for k, v in pairs (locations.makecrack) do
+	ps.boxTarget('makeCrack'..k, v.loc, {length = v.l, width = v.w, height = 1.0, rotation = v.rot}, {
+		{
+			label = ps.lang('crack.targetMake'),
+			icon = 'fa-solid fa-temperature-high',
+			action = function()
+				if not ps.hasItem('bakingsoda') then
+					ps.notify(ps.lang('Catches.itemMissings', ps.getLabel('bakingsoda')), 'error')
+					return
+				end
+				if not minigame() then
+					TriggerServerEvent("md-drugs:server:failcrackone", k)
+					return
+				end
+				if not ps.progressbar(ps.lang('crack.cook'), 4000, 'uncuff') then return end
+				TriggerServerEvent('md-drugs:server:makecrackone', k)
+			end,
+			canInteract = function()
+				if not handleGang(v.gang) then return false end
+				return true
+			end
+		}
+	})
+end
 
+for k, v in pairs (locations.bagcrack) do
+	ps.boxTarget('bagCrack'..k, v.loc, {length = v.l, width = v.w, height = 1.0, rotation = v.rot}, {
+		{
+			label = ps.lang('crack.targetBag'),
+			icon = 'fa-solid fa-weight-scale',
+			action = function()
+				if not ps.hasItem('empty_weed_bag') then
+					ps.notify(ps.lang('Catches.itemMissings', ps.getLabel('empty_weed_bag')), 'error')
+					return
+				end
+				if not ps.progressbar(ps.lang('crack.bag'), 4000, 'uncuff') then return end
+				TriggerServerEvent("md-drugs:server:bagcrack", k)
+			end,
+			canInteract = function()
+				if not handleGang(v.gang) then return false end
+				return true
+			end
+		}
+	})
+end

client/deliveries.lua

@@ -1,351 +1,79 @@
-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
+local isActive = false
+local dealer = {}
 
--- Handlers
-
-AddStateBagChangeHandler('isLoggedIn', nil, function(_, _, value)
-    if value then
-        QBCore.Functions.TriggerCallback('md-drugs:server:RequestConfig', function(DealerConfig)
-            Config.Dealers = DealerConfig
-        end)
-        Wait(1000)
-        InitZones()
-    else
-        if not Config.UseTarget and dealerCombo then dealerCombo:destroy() end
-    end
-end)
-
--- Functions
-
-local function GetClosestDealer()
-    local ped = PlayerPedId()
-    local pCoords = GetEntityCoords(ped)
-    for k,v in pairs(Config.Dealers) do
-        local dealerCoords = vector3(v.coords.x, v.coords.y, v.coords.z)
-        if #(pCoords - dealerCoords) < 2 then
-            currentDealer = k
-            break
-        end
-    end
-end
-
-local function OpenDealerShop()
-    GetClosestDealer()
-    local repItems = {}
-    repItems.label = Config.Dealers[currentDealer]["name"]
-    repItems.items = {}
-    repItems.slots = 30
-    for k, _ in pairs(Config.Dealers[currentDealer]["products"]) do
-        if QBCore.Functions.GetPlayerData().metadata["dealerrep"] >= Config.Dealers[currentDealer]["products"][k].minrep then
-            repItems.items[k] = Config.Dealers[currentDealer]["products"][k]
-        end
-    end
-    TriggerServerEvent("inventory:server:OpenInventory", "shop", "Dealer_"..Config.Dealers[currentDealer]["name"], repItems)
-end
-
-
-
-local function RandomDeliveryItemOnRep()
-    local myRep = QBCore.Functions.GetPlayerData().metadata["dealerrep"]
-    local availableItems = {}
-    for k, _ in pairs(Config.DeliveryItems) do
-        if Config.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()
-
-        QBCore.Functions.Notify("Currently searching for a delivery...", '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
-                QBCore.Functions.Notify("Nothing Close By", 'error')
-                
-            end
-        else
-            local location = math.random(1, #Config.DeliveryLocations)
-
-            waitingDelivery = {
-                ["coords"] = Config.DeliveryLocations[location]["coords"],
-                ["locationLabel"] = Config.DeliveryLocations[location]["label"],
-                ["amount"] = amount,
-                ["dealer"] = currentDealer,
-                ["itemData"] = Config.DeliveryItems[item],
-                ["item"] = item
-            }
-            if Config.Debug == true then
-                print(Config.DeliveryLocations[location]["coords"])
-                print(Config.DeliveryLocations[location]["label"])
-            end
-        end
-		
-        TriggerServerEvent('md-drugs:server:giveDeliveryItems', waitingDelivery)
-        SetTimeout(2000, function()
-           TriggerServerEvent('qb-phone:server:sendNewMail', {
-               sender = Config.Dealers[currentDealer]["name"],
-               subject = "Delivery Location",
-               message = "Deliver This For Me",
-               button = {
-                   enabled = true,
-                   buttonEvent = "md-drugs:client:setLocation",
-                   buttonData = waitingDelivery
-               }
-           })
-        end)
-    else
-        QBCore.Functions.Notify("You Havent Even Finished The One I Told You Too", '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 PoliceCall()
-   -- local random = math.random(1, 100)
-  --  if random <= Config.PoliceCallChance then
-  --      TriggerServerEvent('police:server:policeAlert', 'Suspicous activity')
-  --  end
-end
-
-local function DeliverStuff()
-    if deliveryTimeout > 0 then
-        Wait(500)
-        exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-        PoliceCall()
-        QBCore.Functions.Progressbar("work_dropbox", "handing Off Package", 3500, false, true, {
-            disableMovement = true,
-            disableCarMovement = true,
-            disableMouse = false,
-            disableCombat = true,
-        }, {}, {}, {}, function() -- Done
-            TriggerServerEvent('md-drugs:server:successDelivery', activeDelivery, true)
-            activeDelivery = nil
-            exports['qb-target']:RemoveZone('drugDeliveryZone')
-            ClearPedTasks(PlayerPedId())
-        end)
-    else
-        TriggerServerEvent('md-drugs:server:successDelivery', activeDelivery, false)
-    end
-    deliveryTimeout = 0
-end
-
-local function SetMapBlip(x, y)
-    SetNewWaypoint(x, y)
-    QBCore.Functions.Notify("Marked On Your Map", 'success');
-end
-
--- PolyZone specific functions
-
-
-function InitZones()
-    if next(Config.Dealers) == nil then return end
-   
-     for k,v in pairs(Config.Dealers) do
+local function SpawnDealer()
+    local getDealers = ps.callback('md-drugs:server:getDealers')
+    for k,v in pairs(getDealers) 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)
-          FreezeEntityPosition(testdealer, true)
-         SetEntityInvincible(testdealer, true)
-         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 = Config.Dealers[currentDealer]["time"]["min"]
-                         local max = Config.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()
-                         OpenDealerShop()
-                     end,
-                     canInteract = function()
-                         GetClosestDealer()
-                         local hours = GetClockHours()
-                         local min = Config.Dealers[currentDealer]["time"]["min"]
-                         local max = Config.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 not Config.UseTarget and dealerCombo then dealerCombo:destroy() end
-    Config.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)
-    Config.Dealers[dealer]["products"][itemData.slot].amount = Config.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"])
-        QBCore.Functions.Notify("Already Delivering", '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)
-     FreezeEntityPosition(Buyer, true)
-    SetEntityInvincible(Buyer, true)
-    if Config.UseTarget then
-       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
+        ps.requestModel(Ped, 30000)
+        local loc = json.decode(v.coords)
+        dealer[k] = CreatePed(0, Ped,loc.x,loc.y, loc.z-1, loc.h, false, false)
+        Freeze(dealer[k], true, loc.h)
+        ps.entityTarget(dealer[k], {
+            {
+                icon = 'fas fa-user-secret',
+                label = ps.lang('Deliveries.targetGetDel'),
+                action = function()
+                    local data = ps.callback('md-drugs:server:GetDeliveryItem', k)
+                    if type(data) == 'table' and data.coords then
+                        TriggerEvent('md-drugs:client:setLocation', data)
+                    end
+                end,
+            },
+            {
+                icon = "fa-solid fa-store",
+                label = ps.lang('Deliveries.targetOpenShop'),
+                action = function()
+                    local rep = GetRep()
+                    local items = ps.callback('md-drugs:server:dealerList')
+                    local options = {}
+                    for m, d in pairs (items) do
+                        if rep.dealerrep >= d.minrep then
+                            options[#options+1] = {
+                                title = ps.getLabel(d.name),
+                                description = '$' .. d.price,
+                                icon = ps.getImage(d.name),
+                                action = function()
+                                    TriggerServerEvent('md-drugs:server:buyItemDealer', m)
+                                end,
+                            }
                         end
                     end
-                }
-            },
-            distance = 1.5
+                    ps.menu(ps.lang('Deliveries.shopHeader'), ps.lang('Deliveries.shopHeader'), options)
+                end,
+            }
         })
     end
+end
+
+RegisterNetEvent('md-drugs:client:RefreshDealers', function()
+    SpawnDealer()
 end)
 
-RegisterNetEvent('md-drugs:client:sendDeliveryMail', function(type, deliveryData)
-    if type == 'perfect' then
-        TriggerServerEvent('qb-phone:server:sendNewMail', {
-            sender = Config.Dealers[deliveryData["dealer"]]["name"],
-            subject = "Delivery",
-            message = "You did it"
-        })
-    elseif type == 'bad' then
-        TriggerServerEvent('qb-phone:server:sendNewMail', {
-            sender = Config.Dealers[deliveryData["dealer"]]["name"],
-            subject = "Delivery",
-            message = "You Fucked Me Over"
-        })
-    elseif type == 'late' then
-        TriggerServerEvent('qb-phone:server:sendNewMail', {
-            sender = Config.Dealers[deliveryData["dealer"]]["name"],
-            subject = "Delivery",
-            message = "Better Late Than Dead"
-        })
-    end
-end)
+SpawnDealer()
 
-RegisterCommand('checkrep', function()
-    local drugrep = QBCore.Functions.GetPlayerData().metadata["dealerrep"]
-    QBCore.Functions.Notify("Current Rep: "..drugrep)
-end)
+RegisterNetEvent('md-drugs:client:setLocation', function(data)
+    local coord = json.decode(data.coords)
+    SetNewWaypoint(coord.x, coord.y)
+    if isActive then return end
+    isActive = true
+    local Buyer = CreatePed(0, "g_m_y_famdnf_01",coord.x, coord.y, coord.z-1, coord.w, false, false)
+    Freeze(Buyer, true, coord.w)
+    ps.entityTarget(Buyer,  {
+        {
+            icon = 'fas fa-user-secret',
+            label = ps.lang('Deliveries.targetHandOff'),
+            action = function()
+               if not ps.progressbar(ps.lang('Deliveries.delivering'), 4000, 'uncuff') then return end
+               isActive = false
+               DeletePed(Buyer)
+               TriggerServerEvent('md-drugs:server:giveDeliveryItems', data.item, data.amount)
+            end,
+            canInteract = function()
+                if isActive then
+                    return true
+                end
+            end
+        }
+    })
+end)

client/functions.lua

@@ -0,0 +1,256 @@
+
+local minigametype = Config.minigametype
+local dispatch = Config.Dispatch
+
+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
+		print"^1 SCRIPT ERROR: Md-Drugs set your minigame with one of the options!"
+	end
+end
+
+function GetRep()
+	local rep = ps.callback('md-drugs:server:GetRep')
+	return rep
+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()
+		elseif dispatch == 'codem' then
+			local Data = {
+				type = 'Drug Sale',
+				header = 'Someone Selling Drugs',
+				text = 'Hurry up and save the community',
+				code = '420-69',
+			}
+			exports['codem-dispatch']:CustomDispatch(Data)
+		else
+			print('Congrats, You Choose 0 of the options :)')	
+		end
+	else
+		return
+	end
+end
+
+function GetCops(number)
+	if number == 0 then return true end
+	local amount = ps.callback('md-drugs:server:GetCoppers')
+	if amount >= number then return true else ps.notify('You Need '.. number - amount .. ' More Cops To Do This', '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
+
+local created = false
+local heading = 180.0
+function StartRay()
+    local run = true
+	local pedcoord = GetEntityCoords(PlayerPedId())
+	ps.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 = ps.raycast()
+		if not created then 
+			created = true
+			ps.drawText([[[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
+            ps.hideText()
+            run = false
+			DeleteObject(table)
+			created = false
+            return endCoords, heading
+        end
+
+        if IsControlPressed(0, 178) then
+            ps.hideText()
+            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())
+	ps.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 = ps.raycast()
+		if not created then 
+			created = true
+			ps.drawText([[[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
+            ps.hideText()
+            run = false
+			DeleteObject(table)
+			created = false
+            return endCoords, heading
+        end
+
+        if IsControlPressed(0, 178) then
+            ps.hideText()
+            run = false
+			created = false
+			DeleteObject(table)
+            return nil, nil
+		end
+        Wait(0)
+    until run == false
+end
+
+ps.registerCallback('md-drugs:client:uncuff', function(data)
+	if not ps.progressbar(data, 4000, 'uncuff') then return end
+	return true
+end)
+
+RegisterCommand('DrugRep', function()
+	if not Config.TierSystem then return end
+	local rep = ps.callback('md-drugs:server:GetRep', false)
+	ps.menu('Drug Rep', 'Drug Rep', {
+		{icon = "fa-solid fa-face-flushed", title = 'Cocaine: '..rep.coke},
+		{icon = "fa-solid fa-syringe", 	  title = 'Heroin: '..rep.heroin},
+		{icon = "fa-solid fa-vial",		  title = 'LSD: '..rep.lsd},
+		{icon = "fa-solid fa-plug", 		  title = 'Dealer: '..rep.dealerrep},
+		{icon = "fa-solid fa-money-bill",   title = 'Corner Selling: ' .. rep.cornerselling.rep, description = 'Rank: ' .. rep.cornerselling.label }
+	})
+end, false)
+
+function handleGang(gang)
+	if gang == nil or gang == '' or gang == "" then return true end
+	if ps.getGangName() == gang or gang == 1 then return true end
+	return false
+end

client/heroin.lua

@@ -1,322 +1,157 @@
-local QBCore = exports['qb-core']:GetCoreObject()
-local CocaPlant = {}
-local PoppyPlants = {}
 
-function LoadModel(hash)
-    hash = GetHashKey(hash)
-    RequestModel(hash)
-    while not HasModelLoaded(hash) do
-        Wait(3000)
-    end
-end 
+local herointable = false
+local dirty = false
+local locations = ps.callback('md-drugs:server:GetHeroinLocations')
 
-local function loadParticle(dict)
-    if not HasNamedPtfxAssetLoaded(dict) then
-        RequestNamedPtfxAsset(dict)
-    end
-    while not HasNamedPtfxAssetLoaded(dict) do
-        Wait(0)
-    end
-    SetPtfxAssetNextCall(dict)
+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)
+    ps.entityTarget(heroinlabkit, {
+        {
+            icon = "fa-solid fa-temperature-high",
+            label = ps.lang('heroin.targetCook'),
+            action = function()
+            if not ps.hasItem('emptyvial') then
+                ps.notify(ps.lang('Catches.itemMissings', ps.getLabel('emptyvial')), 'error')
+                return
+            end
+
+            if not minigame() then
+                dirty = true
+                TriggerServerEvent("md-drugs:server:failheatingheroin")
+	        	ps.requestPTFX("core")
+	            local heroinkit = StartParticleFxLoopedOnEntity("exp_air_molotov", heroinlabkit, 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)
+	        return end
+
+            if not ps.progressbar(ps.lang('heroin.pbCook'), 4000, 'uncuff') then return end
+            TriggerServerEvent("md-drugs:server:heatliquidheroin")
+        end,
+        canInteract = function()
+            if not dirty then return true end
+        end
+    },
+    {
+        icon = "fas fa-box-circle-check",
+        label = ps.lang('heroin.targetPickup'),
+        action = function()
+            if not ps.progressbar(ps.lang('heroin.pbPickup'), 4000, 'uncuff') 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 = "fa-solid fa-hand-sparkles",
+        label = ps.lang('heroin.targetClean'),
+        action = function()
+            if not ps.hasItem('cleaningkit') then
+                ps.notify(ps.lang('Catches.itemMissings', ps.getLabel('cleaningkit')), 'error')
+                return
+            end
+            if not ps.progressbar(ps.lang('heroin.pbClean'), 4000, 'clean') then return end
+	        local done = ps.callback('removeCleaningkit', false)
+            if done then dirty = false end
+        end,
+        canInteract = function()
+            if dirty then return true end
+            return false
+        end
+    }})
 end
 
-CreateThread(function() 
-local Ped = "g_m_y_famdnf_01"
-       RequestModel(Ped)
-       while not HasModelLoaded(Ped) do
-          Wait(0)
-       end
-	labkitlocation = Config.buyheroinlabkit
-	heroinkitdealer = CreatePed(0, Ped,labkitlocation-1, 180.0, false, false)
-    FreezeEntityPosition(heroinkitdealer, true)
-    SetEntityInvincible(heroinkitdealer, true)
-	exports['qb-target']:AddTargetEntity(heroinkitdealer, {
-                options = {
-                    {
-                        type = "client",
-                        label = "Talk To Buyer",
-                        icon = "fas fa-eye",
-                        event = "md-drugs:client:buyheroinlabkit"
-                    },
-                },
-                distance = 2.0
-            })
-end)
-
----- plant spawns dont edit
-RegisterNetEvent('heroin:respawnCane', function(loc)
-    local v = GlobalState.PoppyPlants[loc]
-    local hash = GetHashKey(v.model)
-    --if not HasModelLoaded(hash) then LoadModel(hash) end
-    if not PoppyPlants[loc] then
-        PoppyPlants[loc] = CreateObject(hash, v.location, false, true, true)
-        SetEntityAsMissionEntity(PoppyPlants[loc], true, true)
-        FreezeEntityPosition(PoppyPlants[loc], true)
-        SetEntityHeading(PoppyPlants[loc], v.heading)
-        exports['qb-target']:AddTargetEntity(PoppyPlants[loc], {
-            options = { {
-                    icon = "fas fa-hand",
-                    label = "pick Poppies",
-                    action = function()
-                        QBCore.Functions.Progressbar("pick_cane", "picking heroin", 2000, false, true, {
-                            disableMovement = true, disableCarMovement = true, disableMouse = false, disableCombat = true, },
-                            { animDict = 'amb@prop_human_bum_bin@idle_a', anim = 'idle_a', flags = 47, },
-                            {}, {}, function()
-                            TriggerServerEvent("heroin:pickupCane", loc)
-                            ClearPedTasks(PlayerPedId())
-                        end, function() -- Cancel
-                            ClearPedTasks(PlayerPedId())
-                        end)
-                    end
-                }
-            },
-            distance = 3.0
-        })
-    end
-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)
-            SetEntityAsMissionEntity(PoppyPlants[k], true, true)
-            FreezeEntityPosition(PoppyPlants[k], true)
-            SetEntityHeading(PoppyPlants[k], v.heading)
-            exports['qb-target']:AddTargetEntity(PoppyPlants[k], {
-                options = { {
-                        icon = "fas fa-hand",
-                        label = "Pick Poppies",
-                        action = function()
-                            QBCore.Functions.Progressbar("pick_cane", "Picking Heroin", 2000, false, true, {
-                                disableMovement = true, disableCarMovement = true, disableMouse = false, disableCombat = true, },
-                                { animDict = 'amb@prop_human_bum_bin@idle_a', anim = 'idle_a', flags = 47, },
-                                {}, {}, function()
-                                TriggerServerEvent("heroin:pickupCane", k)
-                                ClearPedTasks(PlayerPedId())
-                            end, function() -- Cancel
-                                ClearPedTasks(PlayerPedId())
-                            end)
-                        end
-                    }
-                },
-                distance = 3.0
-            })
-        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)
+for k, v in pairs (locations.dryplant) do
+    ps.boxTarget('dryHeroin'..k, v.loc, {length = v.l, width = v.w, height = 1.0, rotation = v.rot}, {
+        {
+            label = ps.lang('heroin.targetDry'),
+            icon = 'fa-solid fa-temperature-high',
+            action = function()
+                if not ps.progressbar(ps.lang('heroin.pbDry'), 4000, 'uncuff') then return end
+	            TriggerServerEvent("md-drugs:server:dryplant", k)
+            end,
+            canInteract = function()
+                return handleGang(v.gang)
             end
-        end
+        }
+    })
+end
+
+for k, v in pairs (locations.cutheroinone) do
+    ps.boxTarget('cutHeroin'..k, v.loc, {length = v.l, width = v.w, height = 1.0, rotation = v.rot}, {
+        {
+            label = ps.lang('heroin.targetCutHeroin'),
+            icon = 'fa-solid fa-seedling',
+            action = function()
+                if not ps.hasItem('bakingsoda') then
+                    ps.notify(ps.lang('Catches.itemMissings', ps.getLabel('bakingsoda')), 'error')
+                    return
+                end
+	            if not ps.progressbar(ps.lang('heroin.pbCutHeroin'), 4000, 'uncuff') then return end
+	            TriggerServerEvent("md-drugs:server:cutheroin", k)
+            end,
+            canInteract = function()
+                return handleGang(v.gang)
+            end
+        }
+    })
+end
+local peds = {}
+for k, v in pairs (locations.buyKit) do
+    ps.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)
+    ps.entityTarget(peds[k], {
+        {
+            label = ps.lang('heroin.targetBuyKit'),
+            icon = 'fa-solid fa-box-open',
+            action = function()
+               if not ps.progressbar(ps.lang('heroin.pbBuyKit'), 4000, 'uncuff') then return end
+	            TriggerServerEvent("md-drugs:server:getheroinlabkit", k)
+            end,
+            canInteract = function()
+				if not handleGang(v.gang) then return false end
+				return true
+			end
+        }
+    })
+end
+
+
+ps.registerCallback("md-drugs:client:setheroinlabkit", function() 
+    if herointable then
+       ps.notify(ps.lang('heroin.tableout'), 'error')
+       return false
+    else
+        herointable = true
+        local location, head = StartRay()
+        if not location then herointable = false return end
+        if not ps.progressbar(ps.lang('heroin.placing'), 4000, 'uncuff') then return end
+    	createLabKit(location, head)
+        return true, location
     end
-	DeleteObject(heroinlabkit)
-	DeleteObject(dirtylabkitheroin)
-end)
----- plant stop end
-
-RegisterNetEvent("md-drugs:client:dryplant")
-AddEventHandler("md-drugs:client:dryplant", function() 
-exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-    QBCore.Functions.Progressbar("drink_something", "drying out these poppies!", 4000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-	    TriggerServerEvent("md-drugs:server:dryplant")
-        ClearPedTasks(PlayerPedId())
-    end)
 end)
 
-RegisterNetEvent("md-drugs:client:cutheroin")
-AddEventHandler("md-drugs:client:cutheroin", function() 
-	exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-    QBCore.Functions.Progressbar("drink_something", "cutting the heroin!", 4000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-	    TriggerServerEvent("md-drugs:server:cutheroin")
-        ClearPedTasks(PlayerPedId())
-    end)
-end)
-
-RegisterNetEvent("md-drugs:client:buyheroinlabkit")
-AddEventHandler("md-drugs:client:buyheroinlabkit", function() 
-exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-    QBCore.Functions.Progressbar("drink_something", "Shhhhh!", 4000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-	    TriggerServerEvent("md-drugs:server:getheroinlabkit")
-        ClearPedTasks(PlayerPedId())
-    end)
-end)
-
-RegisterNetEvent("md-drugs:client:setheroinlabkit")
-AddEventHandler("md-drugs:client:setheroinlabkit", function() 
-local PedCoords = GetEntityCoords(PlayerPedId())
-	exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-	ClearPedTasks(PlayerPedId())
-	heroinlabkit = CreateObject("v_ret_ml_tablea", PedCoords.x+1, PedCoords.y+1, PedCoords.z-1, true, false)
-	SetVehicleOnGroundProperly(heroinlabkit)
-	exports['qb-target']:AddTargetEntity(heroinlabkit, {
-    options = {
+for k, v in pairs (locations.fillneedle) do
+    ps.boxTarget('fillNeedle'..k, v.loc, {length = v.l, width = v.w, height = 1.0, rotation = v.rot}, {
         {
-            type = "client",
-            event = "md-drugs:client:heatliquidheroin",
-            icon = "fas fa-box-circle-check",
-            label = "Cook Heroin",
-        },
-		{
-            type = "client",
-            event = "md-drugs:client:getheroinkitback",
-            icon = "fas fa-box-circle-check",
-            label = "Pick Up",
-        },
-    },
-    distance = 3.0
-})
-end)
-
-RegisterNetEvent("md-drugs:client:heatliquidheroin")
-AddEventHandler("md-drugs:client:heatliquidheroin", function() 
-local PedCoords = GetEntityCoords(PlayerPedId())
-exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-    QBCore.Functions.Progressbar("drink_something", "Heating Heroin!", 1000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-	exports['ps-ui']:Circle(function(success)
-    if success then
-        TriggerServerEvent("md-drugs:server:heatliquidheroin")
-        ClearPedTasks(PlayerPedId())
-	else
-		TriggerServerEvent("md-drugs:server:failheatingheroin")
-        ClearPedTasks(PlayerPedId())
-		DeleteObject(heroinlabkit)
-		Wait(100)
-		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)
-		 ClearPedTasks(PlayerPedId())
-		 
-		 
-		exports['qb-target']:AddTargetEntity(dirtylabkitheroin, {
-		options = {
-        {
-            type = "client",
-            event = "md-drugs:client:cleanheroinlabkit",
-            icon = "fas fa-box-circle-check",
-            label = "Clean It",
-        },
-    },
-    distance = 3.0
-})
-	end
-end, 1, 8) -- NumberOfCircles, MS
-    end)
-end)
-
-RegisterNetEvent("md-drugs:client:cleanheroinlabkit")
-AddEventHandler("md-drugs:client:cleanheroinlabkit", function() 
-    exports["rpemotes"]:EmoteCommandStart("clean", 0)
-    QBCore.Functions.Progressbar("drink_something", "Cleaning", 4000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-		TriggerServerEvent("md-drugs:server:removecleaningkitheroin")
-		 ClearPedTasks(PlayerPedId())
-	end)
-end)
-
-RegisterNetEvent("md-drugs:client:deletedirtyheroin")
-AddEventHandler("md-drugs:client:deletedirtyheroin", function() 
-DeleteObject(dirtylabkitheroin)
-TriggerEvent("md-drugs:client:setheroinlabkit")
-ClearPedTasks(PlayerPedId())
-end)
-
-
-RegisterNetEvent("md-drugs:client:getheroinkitback")
-AddEventHandler("md-drugs:client:getheroinkitback", function() 
-DeleteObject(heroinlabkit)
-TriggerServerEvent("md-drugs:server:getheroinlabkitback")
-ClearPedTasks(PlayerPedId())
-end)
-
-
-RegisterNetEvent("md-drugs:client:resetheroinkit")
-AddEventHandler("md-drugs:client:resetheroinkit", function() 
-DeleteObject(heroinlabkit)
-TriggerEvent("md-drugs:server:getheroinlabkitback")
-ClearPedTasks(PlayerPedId())
-end)
-
-
-
-RegisterNetEvent("md-drugs:client:fillneedle")
-AddEventHandler("md-drugs:client:fillneedle", function() 
-exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-    QBCore.Functions.Progressbar("drink_something", "Filling Needles!", 1000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-	exports['ps-ui']:Circle(function(success)
-    if success then
-        TriggerServerEvent("md-drugs:server:fillneedle")
-        ClearPedTasks(PlayerPedId())
-	else
-		TriggerServerEvent("md-drugs:server:failheroin")
-        ClearPedTasks(PlayerPedId())
-	end
-end, 2, 8) -- NumberOfCircles, 
-    end)
-end)
-
-
+            label = ps.lang('heroin.targetFill'),
+            icon = 'fa-solid fa-syringe',
+            action = function()
+                if not minigame() then TriggerServerEvent("md-drugs:server:failheroin", k) return end
+                if not ps.progressbar(ps.lang('heroin.pbFill'), 4000, 'uncuff') then return end
+                TriggerServerEvent("md-drugs:server:fillneedle", k)
+            end,
+            canInteract = function()
+                return handleGang(v.gang)
+            end
+        }
+    })
+end

client/lean.lua

@@ -0,0 +1,82 @@
+
+local started = false
+local hit = 0
+local location = ps.callback('md-drugs:server:GetLeanLocs')
+
+local function SpawnCarPedChase()
+	local stoploc = vector3(-1157.63, -3056.71, 13.94)
+	local start = location.StartLoc[math.random(1,#location.StartLoc)]
+
+	if started then ps.notify(ps.lang('lean.alreadyChasing'), 'error') return end
+    started = true
+
+	ps.callback('md-drugs:server:RegisterLean')
+    ps.requestModel("pounder", 30000)
+    ps.requestModel("ig_priest", 30000)
+    ps.requestModel("cargobob3", 30000)
+
+    local 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)
+
+	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
+		ps.entityTarget(leancar, {
+			{
+				name = 'leancar',
+				icon = 'fa-solid fa-car',
+				label = ps.lang('lean.stealFromTruck'),
+				action = function()
+					hit = hit + 1
+					if not minigame() then return end
+					TriggerServerEvent('md-drugs:server:givelean')
+					started = false
+					if math.random(1,100) <= 30 or hit == 4 then
+					hit = 0
+					DeleteVehicle(leancar)
+					DeleteEntity(driver)
+					DeleteEntity(pilot2)
+					end
+				end
+			}
+		})
+	else
+		DeleteVehicle(leancar)
+		DeleteEntity(driver)
+		DeleteEntity(pilot2)
+	end
+end
+
+local leanPeds = {}
+for k, v in pairs (location.SyrupVendor) do
+	ps.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)
+	ps.entityTarget(leanPeds[k], {
+		{
+			icon = "fa-solid fa-hand-holding-medical",
+			label = ps.lang('lean.startMission'),
+			action = function()
+				SpawnCarPedChase()
+			end,
+			canInteract = function()
+				if not handleGang(v.gang) then return false end
+				return true
+			end
+		},
+	})
+end

client/lsd.lua

@@ -1,4 +1,6 @@
-local QBCore = exports['qb-core']:GetCoreObject()
+local tableout = false
+local dirtylsd = false
+local locations = ps.callback('md-drugs:server:GetLSDLocations')
 
 local function loadParticle(dict)
     if not HasNamedPtfxAssetLoaded(dict) then
@@ -10,406 +12,185 @@ local function loadParticle(dict)
     SetPtfxAssetNextCall(dict)
 end
 
-CreateThread(function() 
-local Ped = "g_m_y_famdnf_01"
-       RequestModel(Ped)
-       while not HasModelLoaded(Ped) do
-          Wait(0)
-       end
-	tabdealer = CreatePed(0, Ped,vector3(-318.69, -773.59, 47.43), 180.0, false, false)
-    FreezeEntityPosition(tabdealer, true)
-    SetEntityInvincible(tabdealer, true)
-	exports['qb-target']:AddTargetEntity(tabdealer, {
-                options = {
-                    {
-                        type = "client",
-                        label = "Talk To Buyer",
-                        icon = "fas fa-eye",
-                        event = "md-drugs:client:buytabs"
-                    },
-                },
-                distance = 2.0
-            })
-end)
-
-RegisterNetEvent("md-drugs:client:getlysergic")
-AddEventHandler("md-drugs:client:getlysergic", function() 
-	exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-    QBCore.Functions.Progressbar("drink_something", "Stealing Lysergic Acid!", 1000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-	exports['ps-ui']:Circle(function(success)
-    if success then
-        TriggerServerEvent("md-drugs:server:getlysergic")
-        ClearPedTasks(PlayerPedId())
-	else
-        ClearPedTasks(PlayerPedId())
-	end
-end, 1, 8) -- NumberOfCircles, MS
-    end)
-end)
-
-RegisterNetEvent("md-drugs:client:getdiethylamide")
-AddEventHandler("md-drugs:client:getdiethylamide", function() 
-	exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-    QBCore.Functions.Progressbar("drink_something", "Stealing Diethylamide!", 1000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-	exports['ps-ui']:Circle(function(success)
-    if success then
-        TriggerServerEvent("md-drugs:server:getdiethylamide")
-        ClearPedTasks(PlayerPedId())
-	else
-        ClearPedTasks(PlayerPedId())
-	end
-end, 1, 8) -- NumberOfCircles, MS
-    end)
-end)
-
-RegisterNetEvent("md-drugs:client:setlsdlabkit")
-AddEventHandler("md-drugs:client:setlsdlabkit", function() 
-local PedCoords = GetEntityCoords(PlayerPedId())
-	exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-	QBCore.Functions.Progressbar("drink_something", "Setting Table Down", 1000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-	labkit = CreateObject("v_ret_ml_tablea", PedCoords.x+1, PedCoords.y+1, PedCoords.z-1, true, false)
-	SetVehicleOnGroundProperly(labkit)
-	ClearPedTasks(PlayerPedId())
-	
-	exports['qb-target']:AddTargetEntity(labkit, {
-    options = {
+local function createLabKit(coord, head)
+    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 = {
         {
-			num = 1,
-            type = "client",
-            event = "md-drugs:client:heatliquid",
-            icon = "fas fa-box-circle-check",
-            label = "Heat Liquid",
+            icon = "fa-solid fa-temperature-high",
+            label = ps.lang('lsd.targetHeat'),
+            action = function()
+	            local dict = "scr_ie_svm_technical2"
+	            if not minigame() then
+                    dirtylsd = true
+	            	loadParticle(dict)
+	                local exitPtfx = StartParticleFxLoopedOnEntity("scr_dst_cocaine", labkit, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.5, false, false, false)
+                    SetParticleFxLoopedAlpha(exitPtfx, 3.0)
+                    return
+                end
+                if not ps.progressbar(ps.lang('lsd.heating'), 7000, 'uncuff') then return end
+                TriggerServerEvent("md-drugs:server:heatliquid")
+            end,
+            canInteract = function()
+                if not dirtylsd then return true end
+            end
         },
-		{
-			num = 4,
-            type = "client",
+        {
+            icon = "fa-solid fa-temperature-high",
+            label = ps.lang('lsd.targetRefine'),
+            action = function()
+                if not ps.hasItem('lsd_one_vial') then
+                    ps.notify(ps.lang('Catches.itemNeeded', ps.getLabel('lsd_one_vial')), 'error')
+                    return
+                end
+                if not minigame() then TriggerServerEvent("md-drugs:server:failrefinequality") return end
+                if not ps.progressbar(ps.lang('lsd.refining'), 4000, 'uncuff') then return end
+                TriggerServerEvent("md-drugs:server:refinequalityacid")
+            end,
+            canInteract = function()
+                if not dirtylsd then return true end
+            end
+        },
+        {
+            icon = "fa-regular fa-note-sticky",
+            label = ps.lang('lsd.targetDipping'),
+            action = function()
+                if not ps.hasItem('tab_paper') then
+                    ps.notify(ps.lang('Catches.itemNeeded', ps.getLabel('tab_paper')), 'error')
+                    return
+                end
+                if not minigame() then TriggerServerEvent("md-drugs:server:failtabs") return end
+                if not ps.progressbar(ps.lang('lsd.dipping'), 4000, 'uncuff') then return end
+                TriggerServerEvent("md-drugs:server:maketabpaper")
+            end,
+            canInteract = function()
+                if not dirtylsd then return true end
+            end
+        },
+        {
             event = "md-drugs:client:getlabkitback",
             icon = "fas fa-box-circle-check",
-            label = "Pick Up",
+            label = ps.lang('lsd.targetPickup'),
+            action = function()
+                if not ps.progressbar(ps.lang('lsd.packup'), 4000, 'uncuff') then return end
+	            DeleteObject(labkit)
+	            TriggerServerEvent('md-drugs:server:getlabkitback')
+                tableout = false
+            end,
+            canInteract = function()
+                if not dirtylsd then return true end
+            end
         },
-		{
-			num = 2,
-            type = "client",
-            event = "md-drugs:client:refinequalityacid",
-            icon = "fas fa-box-circle-check",
-            label = "Refine",
-        },
-		{
-			num = 3,
-            type = "client",
-            event = "md-drugs:client:maketabpaper",
-            icon = "fas fa-box-circle-check",
-            label = "Dab Sheets",
-        },
-    },
-    distance = 3.0
-})
-end)
-end)
-
-RegisterNetEvent("md-drugs:client:getlabkitback")
-AddEventHandler("md-drugs:client:getlabkitback", function() 
-    exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-    local PedCoords = GetEntityCoords(PlayerPedId())
-    QBCore.Functions.Progressbar("drink_something", "Packing Up", 1000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-		DeleteObject(labkit)
-		TriggerServerEvent('md-drugs:server:getlabkitback')
-		 ClearPedTasks(PlayerPedId())
-	end)
-end)
-
-
-RegisterNetEvent("md-drugs:client:heatliquid")
-AddEventHandler("md-drugs:client:heatliquid", function() 
-	exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-	local PedCoords = GetEntityCoords(PlayerPedId())
-	dict = "scr_ie_svm_technical2"
-    QBCore.Functions.Progressbar("drink_something", "Heating Liquids!", 1000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-	exports['ps-ui']:Circle(function(success)
-    if success then
-        TriggerServerEvent("md-drugs:server:heatliquid")
-        ClearPedTasks(PlayerPedId())
-	else
-		TriggerServerEvent("md-drugs:server:failheating")
-        ClearPedTasks(PlayerPedId())
-		DeleteObject(labkit)
-		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)
-        SetParticleFxLoopedAlpha(exitPtfx, 3.0)
-		 ClearPedTasks(PlayerPedId())
-		exports['qb-target']:AddTargetEntity(dirtylabkit, {
-		options = {
         {
-            type = "client",
-            event = "md-drugs:client:cleanlabkit",
-            icon = "fas fa-box-circle-check",
-            label = "Clean It",
-        },
-    },
-    distance = 3.0
-})
-	end
-end, 1, 8) -- NumberOfCircles, MS
-    end)
-end)
-
-RegisterNetEvent("md-drugs:client:cleanlabkit")
-AddEventHandler("md-drugs:client:cleanlabkit", function() 
-    exports["rpemotes"]:EmoteCommandStart("clean", 0)
-    QBCore.Functions.Progressbar("drink_something", "Cleaning", 4000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-		TriggerServerEvent("md-drugs:server:removecleaningkit")
-		 ClearPedTasks(PlayerPedId())
-	end)
-end)
-
-RegisterNetEvent("md-drugs:client:resetlsdkit")
-AddEventHandler("md-drugs:client:resetlsdkit", function() 
-DeleteObject(dirtylabkit)
-TriggerEvent("md-drugs:client:setlsdlabkit")
-end)
-
-RegisterNetEvent("md-drugs:client:refinequalityacid")
-AddEventHandler("md-drugs:client:refinequalityacid", function() 
-	exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-    QBCore.Functions.Progressbar("drink_something", "Refining The Quality!", 1000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-	exports['ps-ui']:Circle(function(success)
-    if success then
-        TriggerServerEvent("md-drugs:server:refinequalityacid")
-        ClearPedTasks(PlayerPedId())
-	else
-		TriggerServerEvent("md-drugs:server:failrefinequality")
-        ClearPedTasks(PlayerPedId())
-	end
-end, 1, 8) -- NumberOfCircles, MS
-    end)
-end)
-
-RegisterNetEvent("md-drugs:client:maketabpaper")
-AddEventHandler("md-drugs:client:maketabpaper", function() 
-	exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-    QBCore.Functions.Progressbar("drink_something", "Dipping LSD Onto Paper", 1000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-	exports['ps-ui']:Circle(function(success)
-    if success then
-        TriggerServerEvent("md-drugs:server:maketabpaper")
-        ClearPedTasks(PlayerPedId())
-	else
-		TriggerServerEvent("md-drugs:server:failtabs")
-        ClearPedTasks(PlayerPedId())
-	end
-end, 3, 8) -- NumberOfCircles, 
-    end)
-end)
-
-
-RegisterNetEvent("md-drugs:client:cutsheet")
-AddEventHandler("md-drugs:client:cutsheet", function() 
-	exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-    QBCore.Functions.Progressbar("drink_something", "Cutting Sheets", 4000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-        ClearPedTasks(PlayerPedId())
-    end)
-end)
-
-RegisterNetEvent("md-drugs:client:buytabs")
-AddEventHandler("md-drugs:client:buytabs", function() 
-	exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-    QBCore.Functions.Progressbar("drink_something", "Buying Tab Paper", 4000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-		TriggerServerEvent("md-drugs:server:gettabpaper")
-        ClearPedTasks(PlayerPedId())
-    end)
-end)
-
-RegisterNetEvent("md-drugs:client:buylabkit")
-AddEventHandler("md-drugs:client:buylabkit", function() 
-	exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-    QBCore.Functions.Progressbar("drink_something", "Buying A Lab Kit", 4000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-		TriggerServerEvent("md-drugs:server:getlabkit")
-        ClearPedTasks(PlayerPedId())
-    end)
-end)
-
-
-
-function MethBagEffect()
-    local startStamina = 8
-    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)
+            icon = "fa-solid fa-hand-sparkles",
+            label = ps.lang('lsd.targetClean'),
+            action = function()
+                if not ps.hasItem('cleaningkit') then
+                    ps.notify(ps.lang('Catches.itemNeeded', ps.getLabel('cleaningkit')), 'error')
+                    return
+                end
+                if not ps.progressbar(ps.lang('lsd.cleaning'), 4000, 'clean') then return end
+                local check = ps.callback('md-drugs:server:removecleaningkit')
+                if check then
+                    dirtylsd = false
+                end
+            end,
+            canInteract = function() if dirtylsd then return true end end
+        }
+    }
+    ps.entityTarget(labkit, options)
 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")
+for k, v in pairs (locations.lysergicacid) do 
+    ps.boxTarget('lysergicacid'..k, v.loc, {length = v.l, width = v.w, height = 1.0, rotation = v.rot}, {
+        {
+            label = ps.lang('lsd.targetLys'),
+            icon = 'fa-solid fa-temperature-high',
+            action = function()
+                if not minigame() then TriggerServerEvent("md-drugs:server:faillysergic") return end
+                if not ps.progressbar(ps.lang('lsd.stealLys'), 4000, 'uncuff') then return end
+                TriggerServerEvent("md-drugs:server:getlysergic", k)
+            end,
+            canInteract = function()
+                if not handleGang(v.gang) then return false end
+                return true
+            end
+        }
+    })
 end
 
-function EcstasyEffect()
-    local startStamina = 30
-    SetFlash(0, 0, 500, 7000, 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
+for k, v in pairs (locations.diethylamide) do 
+    ps.boxTarget('diethylamide'..k, v.loc, {length = v.l, width = v.w, height = 1.0, rotation = v.rot}, {
+        {
+            label = ps.lang('lsd.targetDie'),
+            icon = 'fa-solid fa-temperature-high',
+            action = function()
+                if not minigame() then TriggerServerEvent("md-drugs:server:faildiethylamide") return end
+                if not ps.progressbar(ps.lang('lsd.stealDie'), 4000, 'uncuff') then return end
+                TriggerServerEvent("md-drugs:server:getdiethylamide", k)
+            end,
+            canInteract = function()
+                if not handleGang(v.gang) then return false end
+                return true
+            end
+        }
+    })
 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)
+for k, v in pairs (locations.gettabs) do
+    ps.boxTarget('gettabs'..k, v.loc, {length = v.l, width = v.w, height = 1.0, rotation = v.rot}, {
+        {
+            label = ps.lang('lsd.targetBuyTab'),
+            icon = 'fa-solid fa-hand-holding-dollar',
+            action = function()
+                TriggerServerEvent("md-drugs:server:gettabpaper", k)
+            end,
+            canInteract = function()
+                if not handleGang(v.gang) then return false end
+                return true
+            end
+        }
+    })
+end
+local seller = {}
+for k, v in pairs (locations.buyLSDkit) do
+    ps.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)
+    ps.entityTarget(seller[k], {
+        {
+            label = ps.lang('lsd.targetBuyKit'),
+            icon = 'fa-solid fa-hand-holding-dollar',
+            action = function()
+                if ps.hasItem('lsdlabkit') then
+                    ps.notify(ps.lang('lsd.alreadyOwn'), 'error')
+                    return
+                end
+                if not ps.progressbar(ps.lang('lsd.buyingKit'), 4000, 'uncuff') then return end
+                TriggerServerEvent('md-drugs:server:getlabkit', k)
+            end,
+            canInteract = function()
+                if not handleGang(v.gang) then return false end
+                return true
+            end
+        }
+    })
 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
+ps.registerCallback("md-drugs:client:setlsdlabkit", function()
+    if tableout then
+        ps.notify(ps.lang('lsd.tableout'), 'error')
+        return false
+    else
+        tableout = true
+        local loc, head = StartRay()
+        if not loc then tableout = false return end
+        if not ps.progressbar(ps.lang('lsd.placing'), 4000, 'uncuff') then return end
+        createLabKit(loc, head)
+        return true, loc
+    end
 
-
-RegisterNetEvent('md-drugs:client:taketabs', function(itemName)
-	    QBCore.Functions.Progressbar("use_lsd", "Have Fun!", 1750, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-		disableMouse = false,
-		disableCombat = true,
-    }, {
-		animDict = "mp_suicide",
-		anim = "pill",
-		flags = 49,
-    }, {}, {}, function() -- Done
-        StopAnimTask(PlayerPedId(), "mp_suicide", "pill", 1.0)
-        TriggerEvent("evidence:client:SetStatus", "widepupils", 300)
-		if itemName == "smiley_tabs" or itemName == "wildcherry_tabs" or itemName == "yinyang_tabs"   then
-			AlienEffect()
-		elseif itemName == "pineapple_tabs" then
-			 EcstasyEffect()
-		elseif itemName == "bart_tabs" then
-				TrevorEffect()
-		else
-			TrevorEffect()
-			Wait(15000)
-			EcstasyEffect()
-		end	
-    end, function() -- Cancel
-        StopAnimTask(PlayerPedId(), "mp_suicide", "pill", 1.0)
-        QBCore.Functions.Notify("Canceled", "error")
-    end)
 end)

client/mescaline.lua

@@ -1,179 +1,54 @@
-local QBCore = exports['qb-core']:GetCoreObject()
-local Mescaline = {}
-local hallucinate = nil
-
-function LoadModel(hash)
-    hash = GetHashKey(hash)
-    RequestModel(hash)
-    while not HasModelLoaded(hash) do
-        Wait(3000)
-    end
-end 
-
-local function loadParticle(dict)
-    if not HasNamedPtfxAssetLoaded(dict) then
-        RequestNamedPtfxAsset(dict)
-    end
-    while not HasNamedPtfxAssetLoaded(dict) do
-        Wait(0)
-    end
-    SetPtfxAssetNextCall(dict)
+local locations = ps.callback('md-drugs:server:GetMescalineLocs')
+local badTrip = 20
+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
 
 
----- plant spawns dont edit
-RegisterNetEvent('Mescaline:respawnCane', function(loc)
-    local v = GlobalState.Mescaline[loc]
-    local hash = GetHashKey(v.model)
-    --if not HasModelLoaded(hash) then LoadModel(hash) end
-    if not Mescaline[loc] then
-        Mescaline[loc] = CreateObject(hash, v.location, false, true, true)
-        SetEntityAsMissionEntity(Mescaline[loc], true, true)
-        FreezeEntityPosition(Mescaline[loc], true)
-        SetEntityHeading(Mescaline[loc], v.heading)
-        exports['qb-target']:AddTargetEntity(Mescaline[loc], {
-            options = { {
-                    icon = "fas fa-hand",
-                    label = "pick Cactus",
-                    action = function()
-                        QBCore.Functions.Progressbar("pick_cane", "picking Cactus", 2000, false, true, {
-                            disableMovement = true, disableCarMovement = true, disableMouse = false, disableCombat = true, },
-                            { animDict = 'amb@prop_human_bum_bin@idle_a', anim = 'idle_a', flags = 47, },
-                            {}, {}, function()
-                            TriggerServerEvent("Mescaline:pickupCane", loc)
-                            ClearPedTasks(PlayerPedId())
-                        end, function() -- Cancel
-                            ClearPedTasks(PlayerPedId())
-                        end)
-                    end
-                }
-            },
-            distance = 3.0
-        })
-    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)
-            SetEntityAsMissionEntity(Mescaline[k], true, true)
-            FreezeEntityPosition(Mescaline[k], true)
-            SetEntityHeading(Mescaline[k], v.heading)
-            exports['qb-target']:AddTargetEntity(Mescaline[k], {
-                options = { {
-                        icon = "fas fa-hand",
-                        label = "Pick Mescaline",
-                        action = function()
-                            QBCore.Functions.Progressbar("pick_cane", "Picking Mescaline", 2000, false, true, {
-                                disableMovement = true, disableCarMovement = true, disableMouse = false, disableCombat = true, },
-                                { animDict = 'amb@prop_human_bum_bin@idle_a', anim = 'idle_a', flags = 47, },
-                                {}, {}, function()
-                                TriggerServerEvent("Mescaline:pickupCane", k)
-                                ClearPedTasks(PlayerPedId())
-                            end, function() -- Cancel
-                                ClearPedTasks(PlayerPedId())
-                            end)
-                        end
-                    }
-                },
-                distance = 3.0
-            })
-        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")
-AddEventHandler("md-drugs:client:drymescaline", function() 
-	exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-    QBCore.Functions.Progressbar("drink_something", "Drying Out", 4000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-	    TriggerServerEvent("md-drugs:server:drymescaline")
-        ClearPedTasks(PlayerPedId())
-    end)
-end)
-
-RegisterNetEvent("md-drugs:client:takemescaline")
-AddEventHandler("md-drugs:client:takemescaline", function()
-local chance = math.random(1,100)
-local chance2 = math.random(1,100)
-    QBCore.Functions.Progressbar("drink_something", "Taking Mescaline", 1000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-		if chance <= Config.Badtrip then 
-			AlienEffect()
-			clone = ClonePed(PlayerPedId(), false, false, true)
-			NetworkRegisterEntityAsNetworked(clone)
-			networkID = NetworkGetNetworkIdFromEntity(clone)
-			SetNetworkIdCanMigrate(networkID, true)
-			SetNetworkIdExistsOnAllMachines(networkID, 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)
+for k, v in pairs (locations.DryOutMescaline) do
+	ps.boxTarget('dryoutMesc'..k, v.loc, {length = v.l, width = v.w, height = 1.0, rotation = v.rot}, {
+		{
+			label = ps.lang('mesc.targetDry'),
+			icon = 'fa-solid fa-temperature-high',
+			action = function()
+				if not ps.hasItem('cactusbulb') then 
+					ps.notify(ps.lang('Catches.itemNeeded', ps.getLabel('cactusbulb')), 'error') 
+					return 
+				end
+				if not ps.progressbar(ps.lang('mescaline.dry'), 4000, 'uncuff') then return end
+				TriggerServerEvent("md-drugs:server:drymescaline", k)
+			end,
+			canInteract = function()
+				if not handleGang(v.gang) then return false end
+				return true
 			end
-		else
-			AlienEffect()
-		end	
-    end)
+		}
+	})
+end
+
+RegisterNetEvent("md-drugs:client:takemescaline", function()
+    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 ps.progressbar(ps.lang('mescaline.eat'), 4000, 'uncuff') then return end
+	if chance <= badTrip then 
+		AlienEffect()
+		local clone = ClonePed(PlayerPedId(), false, false, true)
+		SetEntityAsMissionEntity(clone)
+		SetPedFleeAttributes(clone, false)
+		GiveWeaponToPed(clone, weapon, 1, false, true)
+		TaskCombatPed(clone, PlayerPedId(), 0, 16)
+		SetPedCombatAttributes(clone, 46, true)
+		Wait(1000 * 30)
+        DeleteEntity(clone)
+	else
+		AlienEffect()
+	end
 end)

client/meth.lua

@@ -0,0 +1,441 @@
+local amonia = false
+local tray = false
+local heated = false
+local active = false
+local trays = nil
+
+local locations = ps.callback('md-drugs:server:GetMethLocs')
+--- meth heist 
+local startedmeth = false
+
+local function SpawnMethCarPedChase()
+	local stoploc = vector3(-1157.63, -3056.71, 13.94)
+	local start = locations.StartLoc[math.random(1,#locations.StartLoc)]
+	if startedmeth then
+		ps.notify(ps.lang('meth.alreadyChasing'),'error')
+	else
+	    startedmeth = true
+		ps.callback('md-drugs:server:registerMeth')
+
+	    ps.requestModel("journey", 30000)
+	    ps.requestModel("a_m_m_hillbilly_02", 30000)
+	    ps.requestModel("cargobob3", 30000)
+
+	    local methcar = 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)
+
+		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
+			ps.entityTarget(methcar, {
+				{
+					name = 'methcar',
+					icon = 'fa-solid fa-car',
+					label = ps.lang('meth.targetStealFromCar'),
+					action = function()
+						if not minigame() then return end
+				 		TriggerServerEvent('md-drugs:server:givemethingridients')
+				 		startedmeth = false
+				 		if math.random(1,100) <= 30 then
+							DeleteVehicle(methcar)
+							DeleteEntity(methdriver)
+							DeleteEntity(methpilot)
+				 		end
+					end,
+				}
+			})
+		else
+			DeleteVehicle(methcar)
+			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)
+	ps.entityTarget(peds[k], {
+		{
+			name = 'methheist'..k,
+			icon = 'fa-solid fa-user-secret',
+			label = ps.lang('meth.targetHeist'),
+			action = function()
+				if startedmeth then ps.notify(ps.lang('meth.alreadyChasing'),'error') return end
+				SpawnMethCarPedChase()
+			end,
+			canInteract = function()
+				return handleGang(v.gang)
+			end
+		}
+	})
+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)
+	ps.requestModel('hei_prop_heist_thermite', 2000)
+	loadParticle('scr_ornate_heist')
+	local thermite = CreateObject('hei_prop_heist_thermite', vector3(1006.09, -3201.29, -39.30), 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
+
+local function MethCooking(coords, offset, rotation)
+	local animDict, animName = "anim@amb@business@meth@meth_monitoring_cooking@cooking@", "chemical_pour_short_cooker"
+	ps.requestAnim(animDict, 500)
+	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"
+	ps.requestAnim(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"
+	ps.requestAnim(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 = ps.callback('md-drugs:server:startcook', num)
+		if not adding then return end
+		active = true
+		MethCooking(coords, offset, rotation)
+		amonia = true
+	else
+		ps.notify(ps.lang('meth.started'), "error")
+	end
+end
+
+
+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
+		ps.notify(ps.lang('meth.increaseHeat'), "success")
+		dialSuccess(coords)
+		heated = true
+	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)
+		ps.entityTarget(bucket, {
+			{
+				name = 'bucket',
+				icon = "fa-solid fa-sack-xmark",
+				label = ps.lang('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,
+			}
+		})
+	end
+end
+
+local function trayscarry()
+	if amonia and heated then
+		local pos = GetEntityCoords(PlayerPedId(), true)
+		ps.requestAnim('anim@heists@box_carry@')
+		TaskPlayAnim(PlayerPedId(), 'anim@heists@box_carry@', 'idle', 5.0, -1, -1, 50, 0, false, false, false)
+		ps.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
+
+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)
+
+for k, v in pairs (locations.CookMeth) do
+	ps.boxTarget('cookMeth'..k, v.loc, {length = v.l, width = v.w, rotation = v.rot, height = 1.0},{
+		{
+			label = ps.lang('meth.targetCook'),
+			icon = 'fa-solid fa-temperature-high',
+			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 = "fas fa-sign-in-alt",
+			label = ps.lang('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,
+		},
+	})
+end
+
+for k, v in pairs (locations.MethDials) do
+	ps.boxTarget('adjustMethDials'..k, v.loc, {length = v.l, width = v.w, rotation = v.rot, height = 1.0},{
+		{
+			name = 'adjustdials',
+			icon = "fa-solid fa-temperature-three-quarters",
+			label = ps.lang('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
+		}
+	})
+end
+
+for k, v in pairs (locations.MethSmash) do
+	ps.boxTarget('smashMeth'..k, v.loc, {length = v.l, width = v.w, rotation = v.rot, height = 1.0},{
+		{
+			name = 'smash',
+			icon = "fa-solid fa-weight-scale",
+			label = ps.lang('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
+		}
+	})
+end
+
+for k, v in pairs (locations.MethTele) do
+	ps.boxTarget('meth_tele'..k, v.inside, {length = v.l, width = v.w, heading = v.rot}, {
+		{
+			icon = 'fa-solid fa-door-open',
+			label = ps.lang('coke.teleOut'),
+			action = function()
+				SetEntityCoords(PlayerPedId(), v.outside)
+			end,
+			canInteract = function()
+                return handleGang(v.gang)
+            end
+		}
+	})
+	ps.boxTarget('meth_teleout'..k, v.outside, {length = v.l, width = v.w, heading = v.rot}, {
+		{
+			icon = 'fa-solid fa-door-closed',
+			label = ps.lang('coke.teleIn'),
+			action = function()
+				SetEntityCoords(PlayerPedId(), v.inside)
+			end,
+			canInteract = function()
+                return handleGang(v.gang)
+            end
+		}
+	})
+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
+	ps.boxTarget('stealMethEph'..k, v.loc, {length = v.l, width = v.w, rotation = v.rot, height = 1.0},{
+		{
+			label = ps.lang('meth.targetStealEPH'),
+			icon = 'fa-solid fa-bucket',
+			action = function()
+				if not ps.progressbar(ps.lang('meth.stealingEPH'), 4000, 'uncuff') then return end
+				TriggerServerEvent("md-drugs:server:geteph", k)
+			end,
+			canInteract = function()
+				return handleGang(v.gang)
+			end
+		}
+	})
+end
+for k, v in pairs (locations.MethAce) do
+	ps.boxTarget('stealMethAce'..k, v.loc, {length = v.l, width = v.w, rotation = v.rot, height = 1.0},{
+		{
+			label = ps.lang('meth.targetStealACE'),
+			icon = 'fa-solid fa-bucket',
+			action = function()
+				if not ps.progressbar(ps.lang('meth.stealingACE'), 4000, 'uncuff') then return end
+				TriggerServerEvent("md-drugs:server:getace", k)
+			end,
+			canInteract = function()
+				return handleGang(v.gang)
+			end
+		}
+	})
+
+end
+

client/oxyruns.lua

@@ -1,188 +1,100 @@
-local QBCore = exports['qb-core']:GetCoreObject()
-
-local deliveryBlip = nil
-local PZone = nil
-local listen = false
 local carryPackage = nil
+local onMission = false
+local locations = ps.callback('md-drugs:server:GetOxyLocs')
+local pdAlert =  90
 
-
-RegisterNetEvent("md-drugs:client:getoxytruck")
-AddEventHandler("md-drugs:client:getoxytruck", function() 
-if TriggerServerEvent('md-drugs:server:payfortruck') then
-end
-end)
-
-function Policecall()
----------------------- insert police call in here
-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
-	if not IsModelInCdimage(ModelHash) then return end
-	RequestModel(ModelHash) -- Request the model
-	while not HasModelLoaded(ModelHash) do -- Waits for the model to load
-	Wait(0)
+local function getRoute()
+	local Route = ps.callback('md-drugs:server:getRoute')
+    if not Route then
+		ps.notify(ps.lang('oxy.ditchCar'), "error")
+		onMission = false
+		return false
 	end
-	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))
-	TriggerEvent('QBCore:Notify', 'Your truck is here', 'success')
-	TriggerEvent("md-drugs:client:getoxylocationroute")
-    SetVehicleEngineOn(oxycar, true, true)
-	exports['qb-target']:AddTargetEntity(oxycar, {
-    options = {
-        {
-            type = "client",
-            event = "md-drugs:client:getfromtrunk",
-            icon = "fas fa-box-circle-check",
-            label = "Get Package",
-            
-        },
-    },
-    distance = 3.0
-})
-end)
 
-CreateThread(function()
- if Config.oxtarget then
- exports.ox_target:addBoxZone({ -- 963.37, -2122.95, 31.47
-		coords = Config.Payfortruck,
-		size = vec3(2,2,2),
-		debugPoly = false,
-		rotation = 45,
-		options = {
-			{
-            type = "client",
-            event = "md-drugs:client:getoxytruck",
-			icon = "fas fa-sign-in-alt",
-			label = "Pay For Truck",
-			
-			
-			},
-		},
+    SetNewWaypoint(Route.x, Route.y)
+	ps.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
+
+	repeat
+		Wait(1000)
+		timeOut = timeOut - 1
+	until #(GetEntityCoords(PlayerPedId()) - vector3(Route.x,Route.y,Route.z)) < 5.0 or timeOut == 0
+
+	PoliceCall(pdAlert)
+	ps.entityTarget(oxybuyer,{
+		{ 
+			label = ps.lang('oxy.targetHandoff'),
+			icon = "fa-solid fa-dollar-sign",
+			action = function()
+				if carryPackage then
+					if not ps.progressbar(ps.lang('oxy.handingoff'), 4000, 'uncuff') then return end
+					TriggerServerEvent("md-drugs:server:giveoxybox")
+					DeleteEntity(oxybuyer)
+					DetachEntity(carryPackage, true, true)
+					DeleteObject(carryPackage)
+					carryPackage = nil
+					getRoute()
+				else
+					ps.notify(ps.lang('oxy.emptyHands'), "error")
+				end
+			end
+		}
 	})
- else
- exports['qb-target']:AddBoxZone("getoxylocation",Config.Payfortruck,1.5, 1.75, { -- 963.37, -2122.95, 31.47
-	name = "getoxylocation",
-	heading = 11.0,
-	debugPoly = false,
-	minZ = Config.Payfortruck-2,
-	maxZ = Config.Payfortruck+2,
-}, {
-	options = {
+end
+
+for k, v in pairs(locations.OxyPayForTruck) do
+	ps.boxTarget('oxyTruckPur' ..k , v.loc, {length = v.l, width = v.w, heading = v.rot}, {
 		{
-            type = "client",
-            event = "md-drugs:client:getoxytruck",
-			icon = "fas fa-sign-in-alt",
-			label = "Pay For Truck",
-			
-			
-		},
-		
-	},
-	distance = 2.5
- })
-	
-end	
-end)
-RegisterNetEvent("md-drugs:client:getoxylocationroute")
-AddEventHandler("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)
-	druglocation = CircleZone:Create(CurrentLocation, 5,{ name = "oxyruns", debugPoly = false })
-	druglocation:onPlayerInOut(function(isPointInside) if isPointInside then  RemoveBlip(deliveryBlip) end end)
-	end
-	if unluck <= Config.PoliceAlertOxy then 
-        Policecall()
-    end
-	local current = "g_m_y_famdnf_01"
-            RequestModel(current)
-            while not HasModelLoaded(current) do
-                Wait(0)
-            end
-            
-            drugdealer = CreatePed(0, current,CurrentLocation.x,CurrentLocation.y,CurrentLocation.z-1, false, false)
-			SetEntityHeading(drugdealer, 180)
-             FreezeEntityPosition(drugdealer, true)
-            SetEntityInvincible(drugdealer, true)
-	exports['qb-target']:AddTargetEntity(drugdealer, {
-                options = {
-                    {
-                        type = "client",
-                        label = "Talk To Buyer",
-                        icon = "fas fa-eye",
-                        event = "md-drugs:client:giveoxybox"
-                    },
-                },
-                distance = 2.0
-            })
-	 
-	
-end)
+			icon = 'fa-solid fa-truck-fast',
+			label = ps.lang('oxy.targetPay'),
+			action = function()
+				ps.requestModel("burrito3", 30000)
 
+				local paid = ps.callback('md-drugs:server:payfortruck', false)
+				if not paid then return end
+				local oxycar = CreateVehicle("burrito3",v.truckSpawn.x, v.truckSpawn.y, v.truckSpawn.z, v.truckSpawn.w, true, false)
 
+    			if Config.Fuel == "ox_fuel" then
+					Entity(oxycar).state.fuel = 100.0
+				else
+    				exports[Config.Fuel]:SetFuel(oxycar, 100.0)
+				end
+    			TriggerEvent("vehiclekeys:client:SetOwner", GetVehicleNumberPlateText(oxycar))
+				ps.notify(ps.lang('oxy.keys'), 'success')
+				onMission = true
+				getRoute()
 
-RegisterNetEvent("md-drugs:client:getfromtrunk")
-AddEventHandler("md-drugs:client:getfromtrunk", function() 
-	if carryPackage then
-		QBCore.Functions.Notify("You Cant Carry More Than One", "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")
-AddEventHandler("md-drugs:client:giveoxybox", function() 
-	if carryPackage then
-		QBCore.Functions.Progressbar("drink_something", "handing over oxy", 4000, false, true, {
-			disableMovement = false,
-			disableCarMovement = false,
-			disableMouse = false,
-			disableCombat = true,
-			disableInventory = true,
-		}, {}, {}, {}, function()-- Done
-			TriggerServerEvent("md-drugs:server:giveoxybox")
-			
-			ClearPedTasks(PlayerPedId())
-			
-			DeleteEntity(drugdealer)
-			 DetachEntity(carryPackage, true, true)
-			 DeleteObject(carryPackage)
-			 carryPackage = nil
-		end)
-	else
-	QBCore.Functions.Notify("cant be empty handed idiot", "error")
-	end
-end)
+				ps.entityTarget(oxycar,  {
+					{
+						icon = "fa-solid fa-box",
+						label = ps.lang('oxy.targetGetPackage'),
+						action = function()
+							if carryPackage then
+								ps.notify(ps.lang('oxy.alreadyCarrying'), "error")
+							else
+								local pos = GetEntityCoords(PlayerPedId(), true)
+								ps.requestAnim('anim@heists@box_carry@')
+								TaskPlayAnim(PlayerPedId(), 'anim@heists@box_carry@', 'idle', 5.0, -1, -1, 50, 0, false, false, false)
+								ps.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
+					}
+				})
+			end,
+			canInteract = function()
+				if onMission then
+					return false
+				end
+				return true
+			end
+		}
+	})
 
+end

client/pharma.lua

@@ -1,172 +1,31 @@
-local QBCore = exports['qb-core']:GetCoreObject()
+local locations = ps.callback('md-drugs:server:GetPharmaLocs')
 
-RegisterCommand('prescriptionpad', function()
-if QBCore.Functions.GetPlayerData().job.name == "ambulance"  then 
-    exports['qb-menu']:openMenu({
-        {
-            header = 'Prescription Pad',
-            icon = 'fa-solid fa-prescription',
-            isMenuHeader = true, -- Set to true to make a nonclickable title
-        },
-        {
-            header = 'Give Vicodin',
-            txt = 'Give Vicodin ',
-            icon = 'fa-solid fa-file-prescription',
-            params = {
-                event = 'md-drugs:client:givevicodinprescription',
-                args = {
-                }
-            }
-        },  
-        {
-            header = 'Give Adderal',
-            txt = 'Give Adderal ',
-            icon = 'fa-solid fa-file-prescription',
-            params = {
-                event = 'md-drugs:client:giveadderalprescription',
-                args = {
-                }
-            }
-        },  
-		 {
-            header = 'Give Morphine',
-            txt = 'Give Morphine ',
-            icon = 'fa-solid fa-file-prescription',
-            params = {
-                event = 'md-drugs:client:givemorphineprescription',
-                args = {
-                }
-            }
-        },  
-        {
-            header = 'Give Xanax',
-            txt = 'Give Vicodin ',
-            icon = 'fa-solid fa-file-prescription',
-            params = {
-                event = 'md-drugs:client:givexanaxprescription',
-                args = {
-                }
-            }
-        },  
+ps.registerCallback("md-drugs:client:prescriptionpad", function(data, op)
+    if ps.getJobType() ~= 'ems' then return end
+    local input = ps.input(ps.lang('pharma.input.header'), {
+        {type = 'select', title = ps.lang('pharma.input.title1'), options = data},
+        {type = 'select', title = ps.lang('pharma.input.title2'), options = op}
     })
-else
-QBCore.Functions.Notify("Youre Not A Medical Person", "error")
-end
+    if not input[1] then return end
+    if not ps.progressbar(ps.lang('pharma.write'), 4000, 'notepad') then return end
+    return {who = input[1], what = input[2]}
+end)
+
+ps.registerCallback("md-drugs:client:unbottle", function() 
+    if not ps.progressbar(ps.lang('pharma.opening'), 4000, 'uncuff') then return end
+    return true
 end)
 
 
-RegisterNetEvent("md-drugs:client:givevicodinprescription")
-AddEventHandler("md-drugs:client:givevicodinprescription", function() 
- exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-    QBCore.Functions.Progressbar("drink_something", "Getting The Prescription Written", 4000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-	    TriggerServerEvent("md-drugs:server:givevicodinprescription")
-        ClearPedTasks(PlayerPedId())
-    end)
-end)
-RegisterNetEvent("md-drugs:client:giveadderalprescription")
-AddEventHandler("md-drugs:client:giveadderalprescription", function() 
-exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-    QBCore.Functions.Progressbar("drink_something", "Getting The Prescription Written", 4000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-	    TriggerServerEvent("md-drugs:server:giveadderalprescription")
-        ClearPedTasks(PlayerPedId())
-    end)
-end)
-
-RegisterNetEvent("md-drugs:client:givemorphineprescription")
-AddEventHandler("md-drugs:client:givemorphineprescription", function() 
-exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-    QBCore.Functions.Progressbar("drink_something", "Getting The Prescription Written", 4000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-	    TriggerServerEvent("md-drugs:server:givemorphineprescription")
-        ClearPedTasks(PlayerPedId())
-    end)
-end)
-RegisterNetEvent("md-drugs:client:givexanaxprescription")
-AddEventHandler("md-drugs:client:givexanaxprescription", function() 
-exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-    QBCore.Functions.Progressbar("drink_something", "Getting The Prescription Written", 4000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-	    TriggerServerEvent("md-drugs:server:givexanaxprescription")
-        ClearPedTasks(PlayerPedId())
-    end)
-end)
-
-RegisterNetEvent("md-drugs:client:fillprescription")
-AddEventHandler("md-drugs:client:fillprescription", function() 
-exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-    QBCore.Functions.Progressbar("drink_something", "Picking Up Your Prescription", 4000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-	    TriggerServerEvent("md-drugs:server:fillprescription")
-        ClearPedTasks(PlayerPedId())
-    end)
-end)
-
-RegisterNetEvent("md-drugs:client:openingvicodin")
-AddEventHandler("md-drugs:client:openingvicodin", function() 
-exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-    QBCore.Functions.Progressbar("drink_something", "Opening Bottle", 4000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-        ClearPedTasks(PlayerPedId())
-    end)
-end)
-
-
-RegisterNetEvent('md-drugs:client:takepharma', function(itemName)
-	    QBCore.Functions.Progressbar("use_lsd", "Get Pain Relief!", 1750, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-		disableMouse = false,
-		disableCombat = true,
-    }, {
-		animDict = "mp_suicide",
-		anim = "pill",
-		flags = 49,
-    }, {}, {}, function() -- Done
-        StopAnimTask(PlayerPedId(), "mp_suicide", "pill", 1.0)
-        
-		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, function() -- Cancel
-        StopAnimTask(PlayerPedId(), "mp_suicide", "pill", 1.0)
-        QBCore.Functions.Notify("Canceled", "error")
-    end)
-end)
+for k, v in pairs (locations.FillPrescription) do
+    ps.boxTarget('pharma' ..k , v.loc, {length = v.l, width = v.w, heading = v.rot}, {
+        {
+            icon = 'fa-solid fa-capsules',
+            label = ps.lang('pharma.targetFill'),
+            action = function()
+                if not ps.progressbar(ps.lang('pharma.fill'), 4000, 'uncuff') then return end
+	            TriggerServerEvent("md-drugs:server:fillprescription", k)
+            end,
+        }
+    })
+end

client/plantSpawns.lua

@@ -0,0 +1,106 @@
+
+local DrugPlants = {
+    {model = 'prop_plant_01a', label = 'coke', langs = ps.lang('coke.targetPick'), tbl = GlobalState.CocaPlant, plantTbl = {},
+        pick = function(loc)
+            if not ps.progressbar(ps.lang('coke.picking'), 4000, 'uncuff') then return end
+                TriggerServerEvent("coke:pickupCane", loc)
+            return true
+        end,
+        allow = Config.Drugs.cocaine,
+    },
+    {model = 'prop_plant_01b', label = 'heroin',langs = ps.lang('heroin.targetPick'), tbl = GlobalState.PoppyPlants, plantTbl = {},
+        pick = function(loc)
+            if not ps.progressbar(ps.lang('heroin.picking'), 4000, 'uncuff') then return end
+                TriggerServerEvent("heroin:pickupCane", loc)
+            return true
+        end,
+        allow = Config.Drugs.heroin,
+    },
+    {model = 'prop_cactus_03', label = 'Mescaline', langs = ps.lang('mesc.targetPick'), tbl = GlobalState.Mescaline, plantTbl = {},
+        pick = function(loc)
+            if not ps.progressbar(ps.lang('mesc.picking'), 4000, 'uncuff') then return end
+                TriggerServerEvent("Mescaline:pickupCane", loc)
+            return true
+        end,
+        allow = Config.Drugs.mescaline,
+
+    },
+    {model = 'prop_weed_01', label = 'weed', langs = ps.lang('weed.targetPick'), tbl = GlobalState.WeedPlant, plantTbl = {},
+        pick = function(loc)
+            if not ps.progressbar(ps.lang('weed.picking'), 4000, 'uncuff') then return end
+                TriggerServerEvent("weed:pickupCane", loc)
+            return true
+        end,
+        allow = Config.Drugs.weed,
+    },
+    {model = 'mushroom', label = 'shrooms', langs = ps.lang('shrooms.targetPick'), tbl = GlobalState.shrooms, plantTbl = {},
+        pick = function(loc)
+            if not ps.progressbar(ps.lang('shrooms.picking'), 4000, 'uncuff') then return end
+                TriggerServerEvent("shrooms:pickupCane", loc)
+            return true
+        end,
+        allow = Config.Drugs.shrooms,
+    },
+}
+
+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
+            ps.requestModel(hash)
+            v.plantTbl[loc] = CreateObject(hash, plant.location, false, true, true)
+            Freeze(v.plantTbl[loc], true, plant.heading)
+            ps.entityTarget(v.plantTbl[loc], {
+                {
+                    icon = v.icon,
+                    label = v.langs,
+                    action = function()
+                        if not v.pick(loc) then return end
+                    end
+                }
+            })
+        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)
+                ps.entityTarget(v.plantTbl[key], {
+                    {
+                        icon = v.icon,
+                        label = v.langs,
+                        action = function()
+                            if not v.pick(key) then return end
+                        end
+                    }
+                })
+            end
+        end
+    end)
+    TriggerEvent(v.label ..":init")
+    ::continue::
+    
+end
+
+AddEventHandler('onResourceStop', function(resourceName)
+    if GetCurrentResourceName() == resourceName then
+        SetModelAsNoLongerNeeded(GetHashKey('prop_plant_01a'))
+        for k, v in pairs(DrugPlants) do
+            for key, plant in pairs(v.plantTbl) do
+                if DoesEntityExist(plant) then DeleteEntity(plant) end
+                v.plantTbl[key] = nil
+            end
+        end
+    end
+end)

client/shrooms.lua

@@ -1,99 +1,6 @@
-local QBCore = exports['qb-core']:GetCoreObject()
-local shrooms = {}
-
-
-function LoadModel(hash)
-    hash = GetHashKey(hash)
-    RequestModel(hash)
-    while not HasModelLoaded(hash) do
-        Wait(3000)
-    end
-end 
-
-RegisterNetEvent('shrooms:respawnCane', function(loc)
-    local v = GlobalState.shrooms[loc]
-    local hash = GetHashKey(v.model)
-    --if not HasModelLoaded(hash) then LoadModel(hash) end
-    if not shrooms[loc] then
-        shrooms[loc] = CreateObject(hash, v.location, false, true, true)
-        SetEntityAsMissionEntity(shrooms[loc], true, true)
-        FreezeEntityPosition(shrooms[loc], true)
-        SetEntityHeading(shrooms[loc], v.heading)
-        exports['qb-target']:AddTargetEntity(shrooms[loc], {
-            options = { {
-                    icon = "fas fa-hand",
-                    label = "pick shrooms",
-                    action = function()
-                        QBCore.Functions.Progressbar("pick_cane", "picking shrooms", 2000, false, true, {
-                            disableMovement = true, disableCarMovement = true, disableMouse = false, disableCombat = true, },
-                            { animDict = 'amb@prop_human_bum_bin@idle_a', anim = 'idle_a', flags = 47, },
-                            {}, {}, function()
-                            TriggerServerEvent("shrooms:pickupCane", loc)
-                            ClearPedTasks(PlayerPedId())
-                        end, function() -- Cancel
-                            ClearPedTasks(PlayerPedId())
-                        end)
-                    end
-                }
-            },
-            distance = 3.0
-        })
-    end
-end)
-
-AddEventHandler('onResourceStart', function(resource)
-    if resource == GetCurrentResourceName() then
-        LoadModel('prop_stoneshroom1')
-        TriggerEvent('shrooms:init')
-    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('prop_stoneshroom1')
-     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)
-            SetEntityAsMissionEntity(shrooms[k], true, true)
-            FreezeEntityPosition(shrooms[k], true)
-            SetEntityHeading(shrooms[k], v.heading)
-            exports['qb-target']:AddTargetEntity(shrooms[k], {
-                options = { {
-                        icon = "fas fa-hand",
-                        label = "Pick shrooms",
-                        action = function()
-                            QBCore.Functions.Progressbar("pick_cane", "Picking Shrooms", 2000, false, true, {
-                                disableMovement = true, disableCarMovement = true, disableMouse = false, disableCombat = true, },
-                                { animDict = 'amb@prop_human_bum_bin@idle_a', anim = 'idle_a', flags = 47, },
-                                {}, {}, function()
-                                TriggerServerEvent("shrooms:pickupCane", k)
-                                ClearPedTasks(PlayerPedId())
-                            end, function() -- Cancel
-                                ClearPedTasks(PlayerPedId())
-                            end)
-                        end
-                    }
-                },
-                distance = 3.0
-            })
-        end
-    end
-end)
-
-function EcstasyEffect()
-    local startStamina = 30
-    SetFlash(0, 0, 500, 7000, 500)
+local function EcstasyEffect()
+    local startStamina = 50
+    SetFlash(0, 0, 500, 20000, 500)
     while startStamina > 0 do
         Wait(1000)
         startStamina = startStamina - 1
@@ -106,27 +13,13 @@ function EcstasyEffect()
     if IsPedRunning(PlayerPedId()) then
         SetPedToRagdoll(PlayerPedId(), math.random(1000, 3000), math.random(1000, 3000), 3, 0, 0, 0)
     end
-
     startStamina = 0
 end
 
-RegisterNetEvent('md-drugs:client:takeshrooms', function()
-    QBCore.Functions.Progressbar("use_lsd", "Have Fun!", 1750, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-		disableMouse = false,
-		disableCombat = true,
-    }, {
-		animDict = "mp_suicide",
-		anim = "pill",
-		flags = 49,
-    }, {}, {}, function() -- Done
-        StopAnimTask(PlayerPedId(), "mp_suicide", "pill", 1.0)
-        TriggerEvent("evidence:client:SetStatus", "widepupils", 300)
+ps.registerCallback("md-drugs:client:shrooms", function()
+    if not ps.progressbar(ps.lang('shrooms.eat'), 5000, 'eat')  then return end
+    CreateThread(function()
         EcstasyEffect()
-        -- exports["qb-smallresources"]:DoAcid(240000)
-    end, function() -- Cancel
-        StopAnimTask(PlayerPedId(), "mp_suicide", "pill", 1.0)
-        QBCore.Functions.Notify("Canceled", "error")
     end)
-end)
+    return true
+end)

client/target.lua

@@ -1,706 +0,0 @@
-local QBCore = exports['qb-core']:GetCoreObject()
-
-CreateThread(function()
-if Config.oxtarget then
-	 exports.ox_target:addBoxZone({ -- 963.37, -2122.95, 31.47
-		coords = Config.makecokepowder,
-		size = vec3(2,2,2),
-		debugPoly = false,
-		rotation = 45,
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:makepowder",
-				icon = "fas fa-sign-in-alt",
-				label = "chop it up",
-				
-			},
-		},
-	})
-	exports.ox_target:addBoxZone({ -- 963.37, -2122.95, 31.47
-		coords = Config.cutcokeone,
-		size = vec3(2,2,2),
-		debugPoly = false,
-		rotation = 45,
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:cutcokeone",
-				icon = "fas fa-sign-in-alt",
-				label = "cut up",
-				
-			},
-		},
-	})
-	exports.ox_target:addBoxZone({ -- 963.37, -2122.95, 31.47
-		coords = Config.bagcoke,
-		size = vec3(2,2,2),
-		debugPoly = false,
-		rotation = 45,
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:bagcoke",
-				icon = "fas fa-sign-in-alt",
-				label = "bagging",
-				
-			},
-		},
-	})
-	------------- lsd
-	exports.ox_target:addBoxZone({ -- 963.37, -2122.95, 31.47
-		coords = Config.lysergicacid,
-		size = vec3(2,2,2),
-		debugPoly = false,
-		rotation = 45,
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:getlysergic",
-				icon = "fas fa-sign-in-alt",
-				label = "stealing",
-			},
-		},
-	})
-	exports.ox_target:addBoxZone({ -- 963.37, -2122.95, 31.47
-		coords = Config.diethylamide,
-		size = vec3(2,2,2),
-		debugPoly = false,
-		rotation = 45,
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:getdiethylamide",
-				icon = "fas fa-sign-in-alt",
-				label = "stealing",
-			},
-		},
-	})
-	exports.ox_target:addBoxZone({ -- 963.37, -2122.95, 31.47
-		coords = Config.buylsdlabkit,
-		size = vec3(2,2,2),
-		debugPoly = false,
-		rotation = 45,
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:buylabkit",
-				icon = "fas fa-sign-in-alt",
-				label = "Buy A Kit",
-				
-			},
-		},
-	})
-	exports.ox_target:addBoxZone({ -- 963.37, -2122.95, 31.47
-		coords = Config.gettabs,
-		size = vec3(2,2,2),
-		debugPoly = false,
-		rotation = 45,
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:buytabs",
-				icon = "fas fa-sign-in-alt",
-				label = "Buy Tabs",
-				
-			},
-		},
-	})
-	------ heroin
-	exports.ox_target:addBoxZone({ -- 963.37, -2122.95, 31.47
-		coords = Config.dryplant,
-		size = vec3(2,2,2),
-		debugPoly = false,
-		rotation = 45,
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:dryplant",
-				icon = "fas fa-sign-in-alt",
-				label = "Dry out",
-				
-			},
-		},
-	})
-	exports.ox_target:addBoxZone({ -- 963.37, -2122.95, 31.47
-		coords = Config.cutheroinone,
-		size = vec3(2,2,2),
-		debugPoly = false,
-		rotation = 45,
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:cutheroin",
-				icon = "fas fa-sign-in-alt",
-				label = "Cut Heroin",
-				
-			},
-		},
-	})
-	exports.ox_target:addBoxZone({ -- 963.37, -2122.95, 31.47
-		coords = Config.fillneedle,
-		size = vec3(2,2,2),
-		debugPoly = false,
-		rotation = 45,
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:fillneedle",
-				icon = "fas fa-sign-in-alt",
-				label = "Fill Needles",
-				
-			},
-		},
-	})
-	exports.ox_target:addBoxZone({ -- 963.37, -2122.95, 31.47
-		coords = Config.buyheroinlabkit,
-		size = vec3(2,2,2),
-		debugPoly = false,
-		rotation = 45,
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:buyheroinlabkit",
-				icon = "fas fa-sign-in-alt",
-				label = "Buy A Kit",
-				
-			},
-		},
-	})
-	------- crack
-	exports.ox_target:addBoxZone({ -- 963.37, -2122.95, 31.47
-		coords = Config.makecrack,
-		size = vec3(2,2,2),
-		debugPoly = false,
-		rotation = 45,
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:makecrackone",
-				icon = "fas fa-sign-in-alt",
-				label = "cook some crack",
-				
-			},
-		},
-	})
-	exports.ox_target:addBoxZone({ -- 963.37, -2122.95, 31.47
-		coords = Config.bagcrack,
-		size = vec3(2,2,2),
-		debugPoly = false,
-		rotation = 45,
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:bagcrack",
-				icon = "fas fa-sign-in-alt",
-				label = "bag some crack",
-				
-			},
-		},
-	})
-	------- pharma
-	exports.ox_target:addBoxZone({ -- 963.37, -2122.95, 31.47
-		coords = Config.FillPrescription,
-		size = vec3(2,2,2),
-		debugPoly = false,
-		rotation = 45,
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:fillprescription",
-				icon = "fas fa-sign-in-alt",
-				label = "Fill Prescription",
-				
-			},
-		},
-	})
-	------------ mescaline
-	exports.ox_target:addBoxZone({ -- 963.37, -2122.95, 31.47
-		coords = Config.DryOut,
-		size = vec3(2,2,2),
-		debugPoly = false,
-		rotation = 45,
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:drymescaline",
-				icon = "fas fa-sign-in-alt",
-				label = "Dry Out",
-				
-			},
-		},
-	})
-	exports.ox_target:addBoxZone({ -- 963.37, -2122.95, 31.47
-		coords = Config.isosafrole,
-		size = vec3(2,2,2),
-		debugPoly = false,
-		rotation = 45,
-		options = {
-			{ 
-			type = "client",
-			event = "md-drugs:client:stealisosafrole",
-			icon = 'fas fa-sign-in-alt',
-			label = 'Steal Isosafrole',   
-			},
-		},
-	})
-	exports.ox_target:addBoxZone({ -- 963.37, -2122.95, 31.47
-		coords = Config.mdp2p,
-		size = vec3(2,2,2),
-		debugPoly = false,
-		rotation = 45,
-		options = {
-			{ 
-				type = "client",
-				event = "md-drugs:client:stealmdp2p",
-				icon = 'fas fa-eye',
-				label = 'Steal mdp2p',  
-			},
-		},
-	})
-	exports.ox_target:addBoxZone({ -- 963.37, -2122.95, 31.47
-		coords = Config.rawxtcloc,
-		size = vec3(2,2,2),
-		debugPoly = false,
-		rotation = 45,
-		options = {
-			{ 
-				type = "client",
-				event = "md-drugs:client:makingrawxtc",
-				icon = 'fas fa-eye',
-				label = 'Make Raw XTC', 
-			},
-		},
-	})
-	exports.ox_target:addBoxZone({ -- 963.37, -2122.95, 31.47
-		coords = Config.buypress,
-		size = vec3(2,2,2),
-		debugPoly = false,
-		rotation = 45,
-		options = {
-			{ 
-				type = "client",
-				event = "md-drugs:client:buypress",
-				icon = 'fas fa-eye',
-				label = 'Buy Press',  
-			},
-		},
-	})
-	exports.ox_target:addBoxZone({ -- 963.37, -2122.95, 31.47
-		coords = Config.stamp,
-		size = vec3(2,2,2),
-		debugPoly = false,
-		rotation = 45,
-		options = {
-			{ 
-				type = "client",
-				event = "md-drugs:client:stampwhite",
-				icon = 'fas fa-eye',
-				label = 'Make White Stamped Pills', 
-			},
-			{ 
-				type = "client",
-				event = "md-drugs:client:stampred",
-				icon = 'fas fa-eye',
-				label = 'Make Red Stamped Pills', 
-			},
-			{ 
-				type = "client",
-				event = "md-drugs:client:stamporange",
-				icon = 'fas fa-eye',
-				label = 'Make Orange Stamped Pills', 
-			},
-			{ 
-				type = "client",
-				event = "md-drugs:client:stampblue",
-				icon = 'fas fa-eye',
-				label = 'Make Blue Stamped Pills', 
-			},
-		},
-	})
-		--------------------------------------- XTC
-else	
-	exports['qb-target']:AddBoxZone("makepowdercoke",Config.makecokepowder,1.5, 1.75, { -- 963.37, -2122.95, 31.47
-		name = "makepowdercoke",
-		heading = 11.0,
-		debugPoly = false,
-		minZ = Config.makecokepowder-2,
-		maxZ = Config.makecokepowder+2,
-	}, {
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:makepowder",
-				icon = "fas fa-sign-in-alt",
-				label = "chop it up",
-				
-			},
-		},
-		distance = 2.5
-	})
-	
-	exports['qb-target']:AddBoxZone("cutcokepowder",Config.cutcokeone,1.5, 1.75, { -- 963.37, -2122.95, 31.47
-		name = "cutcokepowder",
-		heading = 11.0,
-		debugPoly = false,
-		minZ = Config.cutcokeone-2,
-		maxZ = Config.cutcokeone+2,
-	}, {
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:cutcokeone",
-				icon = "fas fa-sign-in-alt",
-				label = "cut up",
-				
-			},
-		},
-		distance = 2.5
-	})
-	
-	exports['qb-target']:AddBoxZone("bagcokepowder",Config.bagcoke,1.5, 1.75, { -- 963.37, -2122.95, 31.47
-		name = "bagcokepowder",
-		heading = 11.0,
-		debugPoly = false,
-		minZ = Config.bagcoke-2,
-		maxZ = Config.bagcoke+2,
-	}, {
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:bagcoke",
-				icon = "fas fa-sign-in-alt",
-				label = "bagging",
-				
-			},
-		},
-		distance = 2.5
-	})
-	
-	
-	----- LSD 
-	exports['qb-target']:AddBoxZone("getlysergic",Config.lysergicacid,1.5, 1.75, { -- 963.37, -2122.95, 31.47
-		name = "getlysergic",
-		heading = 156.0,
-		debugPoly = false,
-		minZ = Config.lysergicacid-2,
-		maxZ = Config.lysergicacid+2,
-	}, {
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:getlysergic",
-				icon = "fas fa-sign-in-alt",
-				label = "stealing",
-			},
-		},
-		distance = 2.5
-	})
-	exports['qb-target']:AddBoxZone("getdiethylamide",Config.diethylamide,1.5, 1.75, { -- 963.37, -2122.95, 31.47
-		name = "getdiethylamide",
-		heading = 156.0,
-		debugPoly = false,
-		minZ = Config.diethylamide-2,
-		maxZ = Config.diethylamide+2,
-	}, {
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:getdiethylamide",
-				icon = "fas fa-sign-in-alt",
-				label = "stealing",
-			},
-		},
-		distance = 2.5
-	}) 
-	
-		exports['qb-target']:AddBoxZone("buylabkit",Config.buylsdlabkit,1.5, 1.75, { -- 963.37, -2122.95, 31.47
-		name = "buylabkit",
-		heading = 156.0,
-		debugPoly = false,
-		minZ = Config.buylsdlabkit-2,
-		maxZ = Config.buylsdlabkit+2,
-	}, {
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:buylabkit",
-				icon = "fas fa-sign-in-alt",
-				label = "Buy A Kit",
-				
-			},
-		},
-		distance = 2.5
-	})
-		exports['qb-target']:AddBoxZone("buylabkit1",Config.gettabs,1.5, 1.75, { -- 963.37, -2122.95, 31.47
-		name = "buylabkit1",
-		heading = 156.0,
-		debugPoly = false,
-		minZ = Config.gettabs-2,
-		maxZ = Config.gettabs+2,
-	}, {
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:buytabs",
-				icon = "fas fa-sign-in-alt",
-				label = "Buy Tabs",
-				
-			},
-		},
-		distance = 2.5
-	})
-		exports['qb-target']:AddBoxZone("dryplant",Config.dryplant,1.5, 1.75, { -- 963.37, -2122.95, 31.47
-		name = "dryplant",
-		heading = 156.0,
-		debugPoly = false,
-		minZ = Config.dryplant-2,
-		maxZ = Config.dryplant+2,
-	}, {
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:dryplant",
-				icon = "fas fa-sign-in-alt",
-				label = "Dry out",
-				
-			},
-		},
-		distance = 2.5
-	})
-			exports['qb-target']:AddBoxZone("cutheroin",Config.cutheroinone,1.5, 1.75, { -- 963.37, -2122.95, 31.47
-		name = "cutheroin",
-		heading = 156.0,
-		debugPoly = false,
-		minZ = Config.cutheroinone-2,
-		maxZ = Config.cutheroinone+2,
-	}, {
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:cutheroin",
-				icon = "fas fa-sign-in-alt",
-				label = "Cut Heroin",
-				
-			},
-		},
-		distance = 2.5
-	})
-	
-			exports['qb-target']:AddBoxZone("fillneedle",Config.fillneedle,1.5, 1.75, { -- 963.37, -2122.95, 31.47
-		name = "fillneedle",
-		heading = 156.0,
-		debugPoly = false,
-		minZ = Config.fillneedle-2,
-		maxZ = Config.fillneedle+2,
-	}, {
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:fillneedle",
-				icon = "fas fa-sign-in-alt",
-				label = "Fill Needles",
-				
-			},
-		},
-		distance = 2.5
-	})
-	
-		exports['qb-target']:AddBoxZone("buyheroinlabkit",Config.buyheroinlabkit,1.5, 1.75, { -- 963.37, -2122.95, 31.47
-		name = "buyheroinlabkit",
-		heading = 156.0,
-		debugPoly = false,
-		minZ = Config.buyheroinlabkit-2,
-		maxZ = Config.buyheroinlabkit+2,
-	}, {
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:buyheroinlabkit",
-				icon = "fas fa-sign-in-alt",
-				label = "Buy A Kit",
-				
-			},
-		},
-		distance = 2.5
-	})
-	exports['qb-target']:AddBoxZone("crackmakeone",Config.makecrack,1.5, 1.75, { -- 963.37, -2122.95, 31.47
-		name = "crackmakeone",
-		heading = 156.0,
-		debugPoly = false,
-		minZ = Config.makecrack-2,
-		maxZ = Config.makecrack+2,
-	}, {
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:makecrackone",
-				icon = "fas fa-sign-in-alt",
-				label = "cook some crack",
-				
-			},
-		},
-		distance = 2.5
-	})
-		exports['qb-target']:AddBoxZone("bagcrack",Config.bagcrack,1.5, 1.75, { -- 963.37, -2122.95, 31.47
-		name = "bagcrack",
-		heading = 156.0,
-		debugPoly = false,
-		minZ = Config.bagcrack-2,
-		maxZ = Config.bagcrack+2,
-	}, {
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:bagcrack",
-				icon = "fas fa-sign-in-alt",
-				label = "Bag some crack",
-				
-			},
-		},
-		distance = 2.5
-	})
-	exports['qb-target']:AddBoxZone("pharmapresc",Config.FillPrescription,1.5, 1.75, { -- 963.37, -2122.95, 31.47
-		name = "pharmapresc",
-		heading = 156.0,
-		debugPoly = false,
-		minZ = Config.FillPrescription-2,
-		maxZ = Config.FillPrescription+2,
-	}, {
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:fillprescription",
-				icon = "fas fa-sign-in-alt",
-				label = "Fill Prescription",
-				
-			},
-		},
-		distance = 2.5
-	})
-	----------------------------------------- mescaline
-	exports['qb-target']:AddBoxZone("drymescaline",Config.DryOut,1.5, 1.75, { -- 963.37, -2122.95, 31.47
-		name = "drymescaline",
-		heading = 11.0,
-		debugPoly = false,
-		minZ = Config.DryOut-2,
-		maxZ = Config.DryOut+2,
-	}, {
-		options = {
-			{
-				type = "client",
-				event = "md-drugs:client:drymescaline",
-				icon = "fas fa-sign-in-alt",
-				label = "Dry Out",
-				
-			},
-		},
-		distance = 2.5
-	})
-		--------------------------------------- XTC
-		exports['qb-target']:AddBoxZone("stealisosafrole2",Config.isosafrole,1.5, 1.75, { -- 963.37, -2122.95, 31.47
-		name = "stealisosafrole2",
-		heading = 156.0,
-		debugPoly = false,
-		minZ = Config.isosafrole-2,
-		maxZ = Config.isosafrole+2,
-	}, {
-		options = {
-		{ 
-			type = "client",
-			event = "md-drugs:client:stealisosafrole",
-			icon = 'fas fa-sign-in-alt',
-			label = 'Steal Isosafrole',   
-			},
-		},
-		distance = 2.5
-	})
-	exports['qb-target']:AddBoxZone("stealmdp2p",Config.mdp2p,1.5, 1.75, { -- 963.37, -2122.95, 31.47
-		name = "stealmdp2p",
-		heading = 156.0,
-		debugPoly = false,
-		minZ = Config.mdp2p-2,
-		maxZ = Config.mdp2p+2,
-	}, {
-		options = {
-		{ 
-		type = "client",
-		event = "md-drugs:client:stealmdp2p",
-		icon = 'fas fa-eye',
-		label = 'Steal mdp2p',  
-		},
-		},
-		distance = 2.5
-	})
-	exports['qb-target']:AddBoxZone("makerawxtc",Config.rawxtcloc,1.5, 1.75, { -- 963.37, -2122.95, 31.47
-		name = "makerawxtc",
-		heading = 156.0,
-		debugPoly = false,
-		minZ = Config.rawxtcloc-2,
-		maxZ = Config.rawxtcloc+2,
-	}, {
-		options = {
-			{ 
-			type = "client",
-			event = "md-drugs:client:makingrawxtc",
-			icon = 'fas fa-eye',
-			label = 'Make Raw XTC', 
-			},
-		},
-		distance = 2.5
-	})
-	exports['qb-target']:AddBoxZone("buypress",Config.buypress,1.5, 1.75, { -- 963.37, -2122.95, 31.47
-		name = "buypress",
-		heading = 156.0,
-		debugPoly = false,
-		minZ = Config.buypress-2,
-		maxZ = Config.buypress+2,
-	}, {
-		options = {
-		{ 
-		type = "client",
-		event = "md-drugs:client:buypress",
-		icon = 'fas fa-eye',
-		label = 'Buy Press',  
-			},
-		},
-		distance = 2.5
-	})
-	
-		exports['qb-target']:AddBoxZone("stampwhite",Config.stamp,1.5, 1.75, { -- 963.37, -2122.95, 31.47
-		name = "stampwhite",
-		heading = 156.0,
-		debugPoly = false,
-		minZ = Config.stamp-2,
-		maxZ = Config.stamp+2,
-	}, {
-	options = {
-		{ 
-		type = "client",
-		event = "md-drugs:client:stampwhite",
-		icon = 'fas fa-eye',
-		label = 'Make White Stamped Pills', 
-		},
-		{ 
-		type = "client",
-		event = "md-drugs:client:stampred",
-		icon = 'fas fa-eye',
-		label = 'Make Red Stamped Pills', 
-		},
-		{ 
-		type = "client",
-		event = "md-drugs:client:stamporange",
-		icon = 'fas fa-eye',
-		label = 'Make Orange Stamped Pills', 
-		},
-		{ 
-		type = "client",
-		event = "md-drugs:client:stampblue",
-		icon = 'fas fa-eye',
-		label = 'Make Blue Stamped Pills', 
-		},
-	},
-		distance = 2.5
-	})
-end	
-end)

client/travellingmerchant.lua

@@ -1,29 +0,0 @@
-
-CreateThread(function() 
-local current = "g_m_y_famdnf_01"
-       RequestModel(current)
-       while not HasModelLoaded(current) do
-          Wait(0)
-       end
-	local CurrentLocation = Config.Travellingmerchant[math.random(#Config.Travellingmerchant)]
-	
-	 travellingmerchant = CreatePed(0, current,CurrentLocation.x,CurrentLocation.y,CurrentLocation.z-1, CurrentLocation.h, false, false)
-             FreezeEntityPosition(travellingmerchant, true)
-            SetEntityInvincible(travellingmerchant, true)
-	exports['qb-target']:AddTargetEntity(travellingmerchant, {
-                options = {
-                    {
-                        type = "client",
-                        label = "Travelling Merchant",
-                        icon = "fas fa-eye",
-                        event = "md-drugs:client:OpenMerchant"
-                    },
-                },
-                distance = 2.0
-            })	
-end)
-
-RegisterNetEvent('md-drugs:client:OpenMerchant')
-AddEventHandler('md-drugs:client:OpenMerchant', function()
-    TriggerServerEvent("inventory:server:OpenInventory", "shop", "travelling merchant", Config.Items)
-end)

client/weed.lua

@@ -0,0 +1,170 @@
+local exploded, drying = false, false
+local locations = ps.callback('md-drugs:server:GetWeedLocs')
+for k, v in pairs (locations.WeedDry) do
+	ps.boxTarget('weed_dry'..k, v.loc, {length = v.l, width = v.w, heading = v.rot}, {
+		{
+			icon = 'fa-solid fa-cannabis',
+			label = ps.lang('weed.targetDry'),
+			action = function()
+				if not ps.hasItem('wetcannabis', 1) then
+					ps.notify(ps.lang('weed.noDry'), "error")
+					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)
+				ps.notify(ps.lang('weed.wait'), "success")
+				Wait(math.random(1000,5000))
+				ps.notify(ps.lang('weed.take'), "success")
+				ps.entityTarget(weedplant, {
+					{
+						icon = "fa-solid fa-cannabis",
+						label = ps.lang('weed.targetDryed'),
+						action = function()
+							DeleteEntity(weedplant)
+							drying = false
+							TriggerServerEvent('md-drugs:server:dryoutweed')
+						end,
+					}
+				})
+			end,
+			canInteract = function()
+				if drying then return false end
+				return true
+			end
+		}
+	})
+end
+
+for k, v in pairs (locations.WeedTele) do
+	ps.boxTarget('weed_tele'..k, v.inside, {length = v.l, width = v.w, heading = v.rot}, {
+		{
+			icon = 'fa-solid fa-door-open',
+			label = ps.lang('weed.teleportOut'),
+			action = function()
+				SetEntityCoords(PlayerPedId(), v.outside)
+			end
+		}
+	})
+	ps.boxTarget('weed_teleout'..k, v.outside, {length = v.l, width = v.w, heading = v.rot}, {
+		{
+			icon = 'fa-solid fa-door-closed',
+			label = ps.lang('weed.teleportIn'),
+			action = function()
+				SetEntityCoords(PlayerPedId(), v.inside)
+			end
+		}
+	})
+end
+
+CreateThread(function()
+    BikerWeedFarm = exports['bob74_ipl']:GetBikerWeedFarmObject()
+    BikerWeedFarm.Style.Set(BikerWeedFarm.Style.upgrade)
+    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)
+    RefreshInterior(BikerWeedFarm.interiorId)
+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 ps.progressbar(ps.lang('weed.dabs'), 4000, 'bong2') then AlienEffect() return end
+end)
+
+local function createBluntOptions(contextId, contextTitle, eventLabelPrefix, tableName)
+    local options = {}
+	local items = ps.callback('md-drugs:server:GetWeedRecipe', tableName)
+    for k, v in pairs(items) do
+        local label = {}
+        local item = ''
+        for m, d in pairs(v.take) do table.insert(label, ps.getLabel(m) .. ' X ' .. d) end 
+		for m, d in pairs(v.give) do item = m end
+        options[#options + 1] = {
+            icon = ps.getImage(item),
+            description = table.concat(label, ", "),
+            title = ps.getLabel(item),
+			action = function()
+				if not minigame() then return end
+				if not ps.progressbar(eventLabelPrefix .. ps.getLabel(item), 4000, 'uncuff') then return end
+				TriggerServerEvent('md-drugs:server:MakeWeedItems', {item = item, recipe = 'weed', num = k, table = tableName})
+			end
+        }
+    end
+    ps.sorter(options, 'title')
+    ps.menu(contextTitle, contextTitle, options)
+end
+
+RegisterNetEvent('md-drugs:client:makeBluntWrap', function(data)
+	createBluntOptions('mddrugsbluntwraps', "Dipping Syrup", ps.lang('weed.bluntWrap'), 'bluntwrap')
+end)
+
+RegisterNetEvent('md-drugs:client:rollBlunt', function(data)
+	createBluntOptions('mddrugsblunts', "Roll Blunts", ps.lang('weed.blunts'), 'blunts')
+end)
+
+for k, v in pairs (locations.WeedSalesman) do
+	ps.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)
+	ps.entityTarget(ped, {
+		{
+			icon = "fa-solid fa-cannabis",
+			label = ps.lang('weed.targetSales'),
+			action = function()
+				local itemList = ps.callback('md-drugs:server:getWeedItems')
+				local options = {}
+				for m, d in pairs (itemList) do
+					options[#options + 1] = {
+						icon = ps.getImage(m),
+						title = ps.getLabel(m),
+						description = '$' .. d,
+						action = function()
+							local input = ps.input('Amount To Buy',{
+								{type = 'number', title = 'How Many To Buy', min = 1, max = 1000}
+							})
+							if not input and input[1] then return end
+							if not ps.progressbar(ps.lang('weed.buying', ps.getLabel(m)), 2000, 'uncuff') then return end
+							TriggerServerEvent('md-drugs:server:buyWeedItem', k, m, input[1])
+						end
+					}
+				end
+				ps.menu('Weed Shop', 'Weed Shop', options)
+			end
+		}
+	})
+end
+local props = {}
+
+for locationKey, locationData in pairs (locations.MakeButter) do
+	if locationData.prop then
+		ps.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)
+	end
+end
+for locationKey, locationData in pairs (locations.MakeOil) do
+	if locationData.prop then
+		ps.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)
+	end
+end

client/whippit.lua

@@ -0,0 +1,77 @@
+local prop = nil
+local function animation(color)
+    local coords = GetEntityCoords(PlayerPedId())
+    ps.requestAnim('mp_player_intdrink')
+    ps.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 ps.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
+
+ps.registerCallback('md-drugs:client:useWhippit', function(color)
+    if animation(color) then
+        blur(30000)
+        return true
+    else
+        return false
+    end
+end)
+
+local function spawnShops()
+    local locations = ps.callback('md-drugs:server:getWhippitLocations')
+    for k, v in pairs(locations) do
+        ps.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)
+        ps.entityTarget(ped, {
+            {
+                label = ps.lang('Whippit.targetShop'),
+                icon = 'fa-solid fa-cart-shopping',
+                action = function()
+                    local menu = {}
+                    local items = ps.callback('md-drugs:server:getwhippitShop')
+                    for item, price in pairs (items) do
+                        menu[#menu + 1] = {
+                            title = ps.getLabel(item),
+                            icon = ps.getImage(item),
+                            description = '$' .. price,
+                            action = function()
+                                local amount = ps.input(ps.getLabel(item), {
+                                    {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
+                    ps.menu(ps.lang('Whippit.shopHeader'), ps.lang('Whippit.shopHeader'), menu)
+                end
+            },
+        })
+    end
+end
+
+spawnShops()

client/wholesale.lua

@@ -1,583 +1,152 @@
-local QBCore = exports['qb-core']:GetCoreObject()
+local miss = false
+local settings = ps.callback('md-drugs:server:GetWSsettings')
 
-local deliveryBlip = nil
-local PZone = nil
-local listen = false
-RegisterNetEvent("md-drugs:client:getloccoke")
-AddEventHandler("md-drugs:client:getloccoke", function() 
-	local unlucky = math.random(1,100)
-    local CurrentLocation = vector3(642.18, 641.48, 129.11)
-	local unluck =  math.random(1,100)
-    if deliveryBlip ~= nil then
-        RemoveBlip(deliveryBlip)
-    end
-	if unlucky <= 90 then 
-        if  Config.cd then
-            TriggerServerEvent('cd_dispatch:AddNotification', { 
-            job_table = {'police'}, 
-            coords = CurrentLocation,
-            title = 'Oxy Run',
-            message = 'this id from cd', 
-            flash = 0,
-            unique_id = tostring(math.random(0000000,9999999)),
-                blip = {
-                    sprite = 825, 
-                    scale = 1.2, 
-                    colour = 1,
-                    flashes = false, 
-                    text = 'Anon Tip',
-                    time = (5*60*1000),
-                    sound = 1,
-                }
-            }) 
-        elseif Config.ps then
-            local currentPos = CurrentLocation
-                TriggerServerEvent("dispatch:server:notify", {
-                dispatchcodename = "susactivity", -- has to match the codes in sv_dispatchcodes.lua so that it generates the right blip
-                dispatchCode = "10-66",
-                origin = {
-                    x = currentPos.x,
-                    y = currentPos.y,
-                    z = currentPos.z
-                },
-                dispatchMessage = "Oxy Runs",
-                job = {"LEO", "police"} -- has to match the recipientList in sv_dispatchcodes.lua
-            })
+function SetUpPeds(drugCount)
+    local attackerCount = settings.WholesaleAmbushBase
+    if settings.WholesaleAmbushScale then
+        if drugCount > settings.WholesaleAmbushTier1 then
+            attackerCount = 3
+        end
+        if drugCount > settings.WholesaleAmbushTier2 then
+            attackerCount = 4
+        end
+        if drugCount > settings.WholesaleAmbushTier3 then
+            attackerCount = 5
         end
     end
-    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)
-	druglocation = CircleZone:Create(CurrentLocation, 5,{ name = "cokesell", debugPoly = false })
-	druglocation:onPlayerInOut(function(isPointInside) if isPointInside then  RemoveBlip(deliveryBlip) end end)
-	  if Config.Gks then
-	 TriggerServerEvent('gksphone:NewMail', {
-				sender = 'Anon',
-				image = '/html/static/img/icons/mail.png',
-				subject = "Meet Me At The Marked location",
-			message = 'Bring me 100 bags of crack. If You Bring Police. You are dead.'
-			})
-	else
-		TriggerServerEvent('qb-phone:server:sendNewMail', {
-            sender = 'Anonymous',
-            subject = 'Meet Me At The Marked Location',
-            message = 'Bring me 100 bags of crack. If You Bring Police. You are dead',
-        })
-	end
-	local current = "g_m_y_famdnf_01"
-            RequestModel(current)
-            while not HasModelLoaded(current) do
-                Wait(0)
-            end
-            
-            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",
-                        event = "md-drugs:client:wholesaledrugscoke"
-                    },
-                },
-                distance = 2.0
-            })
-	 
-	
-end)
-
-RegisterNetEvent("md-drugs:client:wholesaledrugscoke")
-AddEventHandler("md-drugs:client:wholesaledrugscoke", function() 
-local luck = math.random(1,1000)
-
-	if luck <= 900 then
-		TriggerEvent("md-drugs:client:successsalecoke")
-	else
-		
-		TriggerEvent("md-drugs:client:setupcoke")
-		Wait(3000)
-		 for i = 1, #Config.Cokepeds do
-		CokePed = CreatePed(4, "g_m_y_famdnf_01", Config.Cokepeds[i].x, Config.Cokepeds[i].y, Config.Cokepeds[i].z, 90.0, true, true)
-         SetPedArmour(CokePed, 200)
-         SetPedCanSwitchWeapon(CokePed, true)
-         GiveWeaponToPed(CokePed, "weapon_pistol", 1, false, true)
-         TaskCombatPed(CokePed, PlayerPedId(), 0, 16)
-         SetPedCombatAttributes(CokePed, 46, true)
-		
-		end
-	end
-end)
-
-
-RegisterNetEvent("md-drugs:client:successsalecoke")
-AddEventHandler("md-drugs:client:successsalecoke", function() 
-exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-QBCore.Functions.Progressbar("drink_something", "Wholesaling Drugs", 4000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-       TriggerServerEvent("md-drugs:server:wholesalecoke")
-	   Citizen.Wait(4000)
-		
-        DeleteEntity(drugdealer)
-        ClearPedTasks(PlayerPedId())
-    end)
-end)
-
-RegisterNetEvent("md-drugs:client:setupcoke")
-AddEventHandler("md-drugs:client:setupcoke", function() 
-exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-QBCore.Functions.Progressbar("drink_something", "YOU FUCKED NOW", 4000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-        Citizen.Wait(4000)
-        DeleteEntity(drugdealer)
-        ClearPedTasks(PlayerPedId())
-    end)
-end)
-----------crack
-RegisterNetEvent("md-drugs:client:getloccrack")
-AddEventHandler("md-drugs:client:getloccrack", function() 
-	local unlucky = math.random(1,100)
-    local CurrentLocation = vector3(1872.35, 283.52, 164.27)
-	local unluck =  math.random(1,100)
-    if deliveryBlip ~= nil then
-        RemoveBlip(deliveryBlip)
-    end
-	if unlucky <= 90 then 
-        if  Config.cd then
-            TriggerServerEvent('cd_dispatch:AddNotification', { 
-            job_table = {'police'}, 
-            coords = CurrentLocation,
-            title = 'anonymous tip',
-            message = 'this id from cd', 
-            flash = 0,
-            unique_id = tostring(math.random(0000000,9999999)),
-                blip = {
-                    sprite = 825, 
-                    scale = 1.2, 
-                    colour = 1,
-                    flashes = false, 
-                    text = 'Anon Tip',
-                    time = (5*60*1000),
-                    sound = 1,
-                }
-            }) 
-        elseif Config.ps then
-            local currentPos = CurrentLocation
-                TriggerServerEvent("dispatch:server:notify", {
-                dispatchcodename = "susactivity", -- has to match the codes in sv_dispatchcodes.lua so that it generates the right blip
-                dispatchCode = "10-66",
-                origin = {
-                    x = currentPos.x,
-                    y = currentPos.y,
-                    z = currentPos.z
-                },
-                dispatchMessage = "Suspicious Activity",
-                job = {"LEO", "police"} -- has to match the recipientList in sv_dispatchcodes.lua
-            })
+    local weaponTier = settings.WholesaleWeaponsTier1
+    if settings.WholesaleWeaponTiers then
+        if drugCount > settings.WholesaleAmbushTier3 then
+            weaponTier = settings.WholesaleWeaponsTier4
+        elseif drugCount > settings.WholesaleAmbushTier2 then
+            weaponTier = settings.WholesaleWeaponsTier3
+        elseif drugCount > settings.WholesaleAmbushTier1 then
+            weaponTier = settings.WholesaleWeaponsTier2
         end
     end
-    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)
-	druglocation = CircleZone:Create(CurrentLocation, 5,{ name = "cracksell", debugPoly = false })
-	druglocation:onPlayerInOut(function(isPointInside) if isPointInside then  RemoveBlip(deliveryBlip) end end)
-	 if Config.Gks then
-	 TriggerServerEvent('gksphone:NewMail', {
-				sender = 'Anon',
-				image = '/html/static/img/icons/mail.png',
-				subject = "Meet Me At The Marked location",
-			message = 'Bring me 100 bags of crack. If You Bring Police. You are dead.'
-			})
-	else
-		TriggerServerEvent('qb-phone:server:sendNewMail', {
-            sender = 'Anonymous',
-            subject = 'Meet Me At The Marked Location',
-            message = 'Bring me 100 bags of crack. If You Bring Police. You are dead',
-        })
-	end
-	local current = "g_m_y_famca_01"
-            RequestModel(current)
-            while not HasModelLoaded(current) do
-                Wait(0)
-            end
-            
-            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",
-                        event = "md-drugs:client:wholesaledrugscrack"
-                    },
-                },
-                distance = 2.0
-            })
-	 
-	
-end)
-
-RegisterNetEvent("md-drugs:client:wholesaledrugscrack")
-AddEventHandler("md-drugs:client:wholesaledrugscrack", function() 
-local luck = math.random(1,1000)
-
-	if luck <= 900 then
-		TriggerEvent("md-drugs:client:successsalecrack")
-	else
-		
-		TriggerEvent("md-drugs:client:setupcrack")
-		 for i = 1, #Config.CrackPeds do
-		CrackPed = CreatePed(4, "g_m_y_famdnf_01", Config.CrackPeds[i].x, Config.CrackPeds[i].y, Config.CrackPeds[i].z, 90.0, true, true)
-         SetPedArmour(CrackPed, 200)
-         SetPedCanSwitchWeapon(CrackPed, true)
-         GiveWeaponToPed(CrackPed, "weapon_pistol", 1, false, true)
-         TaskCombatPed(CrackPed, PlayerPedId(), 0, 16)
-         SetPedCombatAttributes(CrackPed, 46, true)
-		
-		end
-	end
-end)
-
-
-RegisterNetEvent("md-drugs:client:successsalecrack")
-AddEventHandler("md-drugs:client:successsalecrack", function() 
-exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-QBCore.Functions.Progressbar("drink_something", "Wholesaling Drugs", 4000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-       TriggerServerEvent("md-drugs:server:wholesalecrack")
-	   Citizen.Wait(4000)
-		
-        DeleteEntity(drugdealer)
-        ClearPedTasks(PlayerPedId())
-    end)
-end)
-
-RegisterNetEvent("md-drugs:client:setupcrack")
-AddEventHandler("md-drugs:client:setupcrack", function() 
-exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-QBCore.Functions.Progressbar("drink_something", "YOU FUCKED NOW", 4000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-        Citizen.Wait(4000)
-        DeleteEntity(drugdealer)
-        ClearPedTasks(PlayerPedId())
-    end)
-end)
------------------------------ heroin
-RegisterNetEvent("md-drugs:client:getlocheroin")
-AddEventHandler("md-drugs:client:getlocheroin", function() 
-	local unlucky = math.random(1,100)
-    local CurrentLocation = vector3(2729.87, 1372.7, 24.52)
-	local unluck =  math.random(1,100)
-    if deliveryBlip ~= nil then
-        RemoveBlip(deliveryBlip)
-    end
-	if unlucky <= 90 then 
-        if  Config.cd then
-            TriggerServerEvent('cd_dispatch:AddNotification', { 
-            job_table = {'police'}, 
-            coords = CurrentLocation,
-            title = 'anonymous tip',
-            message = 'this id from cd', 
-            flash = 0,
-            unique_id = tostring(math.random(0000000,9999999)),
-                blip = {
-                    sprite = 825, 
-                    scale = 1.2, 
-                    colour = 1,
-                    flashes = false, 
-                    text = 'Anon Tip',
-                    time = (5*60*1000),
-                    sound = 1,
-                }
-            }) 
-        elseif Config.ps then
-            local currentPos = CurrentLocation
-                TriggerServerEvent("dispatch:server:notify", {
-                dispatchcodename = "susactivity", -- has to match the codes in sv_dispatchcodes.lua so that it generates the right blip
-                dispatchCode = "10-66",
-                origin = {
-                    x = currentPos.x,
-                    y = currentPos.y,
-                    z = currentPos.z
-                },
-                dispatchMessage = "Suspicious Activity",
-                job = {"LEO", "police"} -- has to match the recipientList in sv_dispatchcodes.lua
-            })
+    local playerPed = PlayerPedId()
+    local playerCoords = GetEntityCoords(playerPed, false)
+    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 = playerCoords.x + math.cos(math.rad(angle)) * 15
+        local y = playerCoords.y + math.sin(math.rad(angle)) * 15
+        local z = playerCoords.z
+        local modelHash = GetHashKey(models[math.random(1, #models)])
+        ps.requestModel(modelHash)
+        local ped = CreatePed(4, modelHash, x, y, z, 0.0, true, false)
+        local weapon = weaponTier[math.random(1, #weaponTier)]
+        SetPedRelationshipGroupHash(ped, GetHashKey("HATES_PLAYER"))
+        SetPedCombatAttributes(ped, 46, true)
+        SetPedCombatAttributes(ped, 0, true)
+        SetPedCombatAttributes(ped, 5, true)
+        SetPedCombatAttributes(ped, 2, true)
+        local healthMultiplier = 1.0
+        if drugCount > settings.WholesaleAmbushTier3 then
+            healthMultiplier = 1.5
+        elseif drugCount > settings.WholesaleAmbushTier2 then
+            healthMultiplier = 1.3
+        elseif drugCount > settings.WholesaleAmbushTier1 then
+            healthMultiplier = 1.2
         end
+        local baseHealth = GetEntityHealth(ped)
+        SetEntityHealth(ped, math.floor(baseHealth * healthMultiplier))
+        GiveWeaponToPed(ped, GetHashKey(weapon), 500, false, true)
+        TaskCombatPed(ped, playerPed, 0, 16)
+        local blip = AddBlipForEntity(ped)
+        SetBlipAsShortRange(blip, true)
+        SetBlipColour(blip, 1)
+        SetBlipScale(blip, 0.7)
+        SetEntityAsNoLongerNeeded(ped)
     end
-    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)
-	druglocation = CircleZone:Create(CurrentLocation, 5,{ name = "heroinsell", debugPoly = false })
-	druglocation:onPlayerInOut(function(isPointInside) if isPointInside then  RemoveBlip(deliveryBlip) end end)
-	 TriggerServerEvent('gksphone:NewMail', {
-				sender = 'Anon',
-				image = '/html/static/img/icons/mail.png',
-				subject = "Meet Me At The Marked location",
-			message = 'Bring me 100 syringes of heroin. If You Bring Police. You are dead.'
-			})
-	local current = "g_m_y_famdnf_01"
-            RequestModel(current)
-            while not HasModelLoaded(current) do
-                Wait(0)
+    local tierName = "Basic"
+    if drugCount > settings.WholesaleAmbushTier3 then
+        tierName = "Elite"
+    elseif drugCount > settings.WholesaleAmbushTier2 then
+        tierName = "Advanced"
+    elseif drugCount > settings.WholesaleAmbushTier1 then
+        tierName = "Medium"
+    end
+    ps.notify(string.format(ps.lang('wholesale.ambush'), attackerCount, tierName), 'error')
+end
+
+RegisterNetEvent("md-drugs:client:GetLocation", function(drug)
+    if miss then
+       SetNewWaypoint(drug.location.x, drug.location.y)
+    else
+       local loc = drug.location
+       local timer = 0
+       miss = true
+       SetNewWaypoint(loc.x, loc.y)
+       if settings.WholesaleShowEstimates and drug.count > 0 then
+           local bonusTiers = math.floor(drug.count / 10)
+           local potentialBonus = math.min(bonusTiers * settings.WholesaleQuantityBonus, settings.WholesaleMaxBonus)
+           local bonusPercent = math.floor(potentialBonus * 100)
+           local minPayout = math.floor(drug.price.min * (1 + potentialBonus))
+           local maxPayout = math.floor(drug.price.max * (1 + potentialBonus))
+           local totalMinPayout = drug.count * minPayout
+           local totalMaxPayout = drug.count * maxPayout
+           ps.notify(string.format(ps.lang('wholesale.count'), drug.count), 'info')
+           if bonusPercent > 0 then
+               ps.notify(string.format(ps.lang('wholesale.bonus'), bonusPercent), 'info')
+           end
+           ps.notify(string.format(ps.lang('wholesale.estimate'), totalMinPayout, totalMaxPayout), 'info')
+       elseif drug.count <= 0 then
+           ps.notify(ps.lang('wholesale.no_drugs'), 'error')
+       end
+       ps.requestModel("g_m_y_famdnf_01", settings.RequestModelTime)
+       local current = "g_m_y_famdnf_01"
+       local drugdealer = CreatePed(0, current,loc.x,loc.y,loc.z-1, 90.0, false, false)
+       FreezeEntityPosition(drugdealer, true)
+       SetEntityInvincible(drugdealer, true)
+       ps.entityTarget(drugdealer, {{
+           label = ps.lang('wholesale.targetBuyer'),
+           icon = "fas fa-eye",
+           action = function()
+                local luck = math.random(1,100)
+                if luck <= settings.SuccessfulChance then
+                    if not ps.progressbar(ps.lang('wholesale.wholesaling'), 4000, 'uncuff') then return end
+                    TriggerServerEvent("md-drugs:server:SuccessSale", drug)
+                else
+                    ps.progressbar("Deal Going Bad", 4000, 'uncuff')
+                    if settings.WholesaleAmbushEnabled then
+                        SetUpPeds(drug.count)
+                    end
+                    if settings.WholesaleFailPoliceAlert > 0 then
+                        local alertChance = math.random(1, 100)
+                        if alertChance <= settings.WholesaleFailPoliceAlert then
+                            PoliceCall(100)
+                        end
+                    end
+                    TriggerServerEvent('md-drugs:server:CleanupWholesale')
+                end
+                Wait(3000)
+                DeleteEntity(drugdealer)
+                miss = false
             end
-            
-            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",
-                        event = "md-drugs:client:wholesaledrugsheroin"
-                    },
-                },
-                distance = 2.0
-            })
-	 
-	
-end)
-
-RegisterNetEvent("md-drugs:client:wholesaledrugsheroin")
-AddEventHandler("md-drugs:client:wholesaledrugsheroin", function() 
-local luck = math.random(1,1000)
-
-	if luck <= 900 then
-		TriggerEvent("md-drugs:client:successsaleheroin")
-	else
-		
-		TriggerEvent("md-drugs:client:setupheroin")
-		Wait(3000)
-		 for i = 1, #Config.heroinPeds do
-		heroinPed = CreatePed(4, "g_m_y_famdnf_01", Config.heroinPeds[i].x, Config.heroinPeds[i].y, Config.heroinPeds[i].z, 90.0, true, true)
-         SetPedArmour(heroinPed, 200)
-         SetPedCanSwitchWeapon(heroinPed, true)
-         GiveWeaponToPed(heroinPed, "weapon_pistol", 1, false, true)
-         TaskCombatPed(heroinPed, PlayerPedId(), 0, 16)
-         SetPedCombatAttributes(heroinPed, 46, true)
-		
-		end
-	end
-end)
-
-
-RegisterNetEvent("md-drugs:client:successsaleheroin")
-AddEventHandler("md-drugs:client:successsaleheroin", function() 
-exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-QBCore.Functions.Progressbar("drink_something", "Wholesaling Drugs", 4000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-       TriggerServerEvent("md-drugs:server:wholesaleheroin")
-	   Citizen.Wait(4000)
-		
-        DeleteEntity(drugdealer)
-        ClearPedTasks(PlayerPedId())
-    end)
-end)
-
-RegisterNetEvent("md-drugs:client:setupheroin")
-AddEventHandler("md-drugs:client:setupheroin", function() 
-exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-QBCore.Functions.Progressbar("drink_something", "YOU FUCKED NOW", 4000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-        Citizen.Wait(4000)
-        DeleteEntity(drugdealer)
-        ClearPedTasks(PlayerPedId())
-    end)
-end)
----------------------------  lsd
-RegisterNetEvent("md-drugs:client:getloclsd")
-AddEventHandler("md-drugs:client:getloclsd", function() 
-	local unlucky = math.random(1,100)
-    local CurrentLocation = vector3(-1533.66, 837.38, 181.59)
-	local unlucky =  math.random(1,100)
-    if deliveryBlip ~= nil then
-        RemoveBlip(deliveryBlip)
+       }},drugdealer )
+    	repeat
+           Wait(1000)
+           timer = timer + 1
+       until #(GetEntityCoords(PlayerPedId()) - vector3(loc.x, loc.y, loc.z) ) < 4.0 or timer == settings.WholesaleTimeout + 1
+       PoliceCall(settings.AlertPoliceWholesale)
+       if timer <= settings.WholesaleTimeout or #(GetEntityCoords(PlayerPedId()) - vector3(loc.x, loc.y, loc.z) ) < 4.0  then
+           timer = 0
+       else
+           ps.notify(ps.lang('wholesale.tooLong'), 'error')
+           DeleteEntity(drugdealer)
+           TriggerServerEvent('md-drugs:server:CleanupWholesale')
+           if settings.WholesaleResetOnTimeout then
+               miss = false
+           end
+       end
     end
-	if unlucky <= 90 then 
-        if  Config.cd then
-            TriggerServerEvent('cd_dispatch:AddNotification', { 
-            job_table = {'police'}, 
-            coords = CurrentLocation,
-            title = 'anonymous tip',
-            message = 'this id from cd', 
-            flash = 0,
-            unique_id = tostring(math.random(0000000,9999999)),
-                blip = {
-                    sprite = 825, 
-                    scale = 1.2, 
-                    colour = 1,
-                    flashes = false, 
-                    text = 'Anon Tip',
-                    time = (5*60*1000),
-                    sound = 1,
-                }
-            }) 
-        elseif Config.ps then
-            local currentPos = CurrentLocation
-                TriggerServerEvent("dispatch:server:notify", {
-                dispatchcodename = "susactivity", -- has to match the codes in sv_dispatchcodes.lua so that it generates the right blip
-                dispatchCode = "10-66",
-                origin = {
-                    x = currentPos.x,
-                    y = currentPos.y,
-                    z = currentPos.z
-                },
-                dispatchMessage = "Suspicious Activity",
-                job = {"LEO", "police"} -- has to match the recipientList in sv_dispatchcodes.lua
-            })
-        end
+end)
+
+RegisterNetEvent('md-drugs:client:WholesaleComplete', function(data)
+    local bonusText = ""
+    if data.bonus > 0 then
+        bonusText = " (+" .. data.bonus .. "% quantity bonus)"
     end
-    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)
-	druglocation = CircleZone:Create(CurrentLocation, 5,{ name = "lsdsell", debugPoly = false })
-	druglocation:onPlayerInOut(function(isPointInside) if isPointInside then  RemoveBlip(deliveryBlip) end end)
-	 TriggerServerEvent('gksphone:NewMail', {
-				sender = 'Anon',
-				image = '/html/static/img/icons/mail.png',
-				subject = "Meet Me At The Marked location",
-			message = 'Bring me 500 tabs of lsd. If You Bring Police. You are dead.'
-			})
-	local current = "g_m_y_famdnf_01"
-            RequestModel(current)
-            while not HasModelLoaded(current) do
-                Wait(0)
-            end
-            
-            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",
-                        event = "md-drugs:client:wholesaledrugslsd"
-                    },
-                },
-                distance = 2.0
-            })
-	 
-	
-end)
-
-RegisterNetEvent("md-drugs:client:wholesaledrugslsd")
-AddEventHandler("md-drugs:client:wholesaledrugslsd", function() 
-local luck = math.random(1,1000)
-
-	if luck <= 900 then
-		TriggerEvent("md-drugs:client:successsalelsd")
-	else
-		
-		TriggerEvent("md-drugs:client:setuplsd")
-		 for i = 1, #Config.lsdPeds do
-		 Wait(3000)
-		lsdPed = CreatePed(4, "g_m_y_famdnf_01", Config.lsdPeds[i].x, Config.lsdPeds[i].y, Config.lsdPeds[i].z, 90.0, true, true)
-         SetPedArmour(lsdPed, 200)
-         SetPedCanSwitchWeapon(lsdPed, true)
-         GiveWeaponToPed(lsdPed, "weapon_pistol", 1, false, true)
-         TaskCombatPed(lsdPed, PlayerPedId(), 0, 16)
-         SetPedCombatAttributes(lsdPed, 46, true)
-		
-		end
-	end
-end)
-
-
-RegisterNetEvent("md-drugs:client:successsalelsd")
-AddEventHandler("md-drugs:client:successsalelsd", function() 
-exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-QBCore.Functions.Progressbar("drink_something", "Wholesaling Drugs", 4000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-       TriggerServerEvent("md-drugs:server:wholesalelsd")
-	   Citizen.Wait(4000)
-		
-        DeleteEntity(drugdealer)
-        ClearPedTasks(PlayerPedId())
-    end)
-end)
-
-RegisterNetEvent("md-drugs:client:setuplsd")
-AddEventHandler("md-drugs:client:setuplsd", function() 
-exports["rpemotes"]:EmoteCommandStart("uncuff", 0)
-QBCore.Functions.Progressbar("drink_something", "YOU FUCKED NOW", 4000, false, true, {
-        disableMovement = false,
-        disableCarMovement = false,
-        disableMouse = false,
-        disableCombat = true,
-        disableInventory = true,
-    }, {}, {}, {}, function()-- Done
-        Citizen.Wait(4000)
-        DeleteEntity(drugdealer)
-        ClearPedTasks(PlayerPedId())
-    end)
-end)
+    ps.notify(string.format(ps.lang('wholesale.complete'), data.quantity, data.payout, bonusText), 'success')
+end)

clientRun.lua

@@ -0,0 +1,27 @@
+function loadFile(filePath)
+    local resourceName = 'md-drugs'
+    local fullScript = LoadResourceFile(resourceName, filePath)
+    if not fullScript then
+        ps.error("Error: Failed to load module '" .. filePath .. "' from resource '" .. resourceName .. "'.")
+        return false
+    end
+    local chunk, err = load(fullScript, filePath, "t")
+    if not chunk then
+        ps.error("Error loading Lua chunk from '" .. filePath .. "': " .. tostring(err))
+        return false
+    end
+
+    local success, execErr = pcall(chunk)
+    if not success then
+        ps.error("Error executing Lua chunk from '" .. filePath .. "': " .. tostring(execErr))
+        return false
+    end
+
+    return true
+end
+
+for scriptName, toggle in pairs(Config.Drugs) do
+    if not toggle then goto continue end
+    loadFile('client/' .. scriptName .. '.lua')
+    ::continue::
+end

config.lua

@@ -1,629 +0,0 @@
-Config = {} --Ignore.
-
-Config.UseTarget = true
-Config.rewardItem = "coca_leaf"
-Config.rewardItemheroin = "poppyresin"
-Config.rewardshrooms = "shrooms"
-Config.rewardMescaline = "cactusbulb"
-Config.oxtarget = false --- turn to true if you use oxtarget
-Config.respawnTime = 150 -- Seconds
-Config.cd = false ---- if you use cd-dispatch
-Config.ps = false --- if you use ps dispatch
-Config.gks = true -- true if you use gks, false if you use qb or renewed phone
-Config.Fuel = "LegacyFuel" -- type the name of script you use i.e. ps-fuel, cdn-fuel, LegacyFuel
-
-------------- Cocaine locations
-Config.makecokepowder = vector3(-1365.47, -323.64, 39.41) --  where to take coca leaves to make powder
-Config.cutcokeone = vector3(-1362.8, -322.13, 39.49) -- cutting stage  coke with baking soda
-Config.bagcoke = vector3(-1364.8, -320.26, 39.51) -- bag stage 
-
----------------- Crack locations
-Config.makecrack = vector3(-1366.22, -317.84, 39.55) -- make crack with baking soda with cut coke 1-3
-Config.bagcrack = vector3(-1367.28, -315.88, 39.59) ---  bag crack 1-3 stages
-
-------------------------- LSD Locations
-Config.lysergicacid = vector3(-1370.71, -317.3, 39.51) -- get lysergic acid
-Config.diethylamide = vector3(-1371.71, -316.02, 39.53) -- get diethylamide
-Config.gettabs = vector3(-1370.77, -314.51, 39.58) -- buy tab paper
-Config.buylsdlabkit = vector3(-1369.26, -312.04, 39.66)--  buy lab kit
-
-------------------------- Heroin Locations
-Config.dryplant = vector3(-1367.05, -311.07, 39.72) -- turn resin into powder
-Config.buyheroinlabkit = vector3(-1368.19, -309.84, 39.73) -- buy heroin lab kit
-Config.cutheroinone = vector3(-1368.87, -308.96, 39.75) -- cut heroin stage 1-3 with baking soda
-Config.fillneedle = vector3(-1373.13, -311.36, 39.63) -- fill needles with heroin
-
------------- XTC
-Config.isosafrole = vector3(892.7, -957.2, 39.28) -- where to steal isosafrole
-Config.mdp2p = vector3(901.07, -963.11, 39.28) -- where to steal mdp2p
-Config.rawxtcloc = vector3(898.51, -960.2, 39.28) --  where to combine the 2 ingridents to make raw xtc
-Config.stamp = vector3(895.98, -963.57, 39.28) --  where to stamp pills
-Config.buypress = vector3(868.3, -960.72, 26.28)--  Where you buy your presses
-
------ mescaline
-Config.DryOut = vector3(2622.6, 4222.57, 43.6) -- Place to dry out mescaline into usuable drug
-Config.Badtrip = 20 -- number means % chance to spawn a clone that chases and attacks while on mescaline
-
----------- Pharma
-Config.FillPrescription = vector3(2432.43, 4253, 45.2) ----------- this is where you want people to take their prescription to get a bottle of pills. They use bottle to get a random amount of prescription pills
-------- travelling merchant
-
-Config.Travellingmerchant = { ------------ these are the random locations the merchant can spawn on script start. whatever you want for the merchant is in Config.Items right below
-	vector4(-119.06, -977.19, 304.25, 103.88),
-	vector4(-1522.23, 1475.63, 112.02, 23.57),
-	vector4(-3278.99, 973.33, 5.34, 90.02),
-}
-Config.Items = { --- this is the store for the travelling merchant
-    label = "Travelling Merchant",
-    slots = 13,
-    items = {
-        [1] = {name = "tab_paper", price = 50,amount = 50, info = {}, type = "item", slot = 1},
-        [2] = {name = "bakingsoda", price = 25, amount = 50, info = {}, type = "item", slot = 2},
-		[3] = {name = "isosafrole", price = 25, amount = 50, info = {}, type = "item", slot = 3},
-		[4] = {name = "mdp2p", price = 25, amount = 50, info = {}, slot = 4},
-		[5] = {name = "lysergic_acid", price = 25, amount = 50, info = {}, type = "item", slot = 5},
-		[6] = {name = "diethylamide", price = 25, amount = 50, info = {}, type = "item", slot = 6},
-		[7] = {name = "empty_weed_bag", price = 2, amount = 1000, info = {}, type = "item", slot = 7},
-		[8] = {name = "emptyvial", price = 2, amount = 1000, info = {}, type = "item", slot = 8},
-		[9] = {name = "needle", price = 2, amount = 1000, info = {}, type = "item", slot = 9},
-		[10] = {name = "cokeburner", price = 25, amount = 50, info = {}, type = "item", slot = 10},
-		[11] = {name = "crackburner", price = 2, amount = 50, info = {}, type = "item", slot = 11},
-		[12] = {name = "lsdburner", price = 2, amount = 50, info = {}, type = "item", slot = 12},
-		[13] = {name = "heroinburner", price = 2, amount = 50, info = {}, type = "item", slot = 13},
-	}
-}
---------------------------------------- oxy runs
----- How oxyruns work. You pay for a truck, you get in it and it gives a route. There is a 20% chance that the car will be "hot" and you have to ditch it. No Routes will spawn if that pops up
------ when you get to the drop off point third eye the truck. You will carry a box to the ped. He will give you cash, some oxy and maybe a random item. Rinse and repeat
-Config.truckspawn = vector4(1449.65, -1486.0, 63.22, 342.58) --- where the truck will spawn when you pay for it 
-Config.Payfortruck = vector3(1437.64, -1491.91, 63.62) --- where you pay for the truck
-
-Config.oxylocations = { -- These are different locations where a ped spawns.
-    vector4(-2352.32, 266.78, 165.3, 23.46),
-    vector4(-1467.49, 874.01, 183.59, 298.45),
-    vector4(-856.71, 874.26, 202.85, 205.3),
-   vector4(950.58, -128.49, 74.42, 205.3),
-   vector4(1152.71, -328.43, 69.21, 205.3),
-	vector4(112.66, -1955.67, 20.75, 37.94),
-	vector4(-544.4, -1684.8, 19.89, 252.07),
-	vector4(-1185.02, -1805.4, 3.91, 184.83),
-	vector4(-1641.4, -981.99, 7.58, 35.38),
-	vector4(-1827.93, 782.36, 138.29, 219.99),
-	vector4(-320.84, 2818.73, 59.45, 337.22),
-	vector4(474.88, 2609.56, 44.48, 357.0),
-}	
-
-Config.OxyRandItems = { -- random items you get for completing the mission
-"oxy",
-"lockpick",
-"cryptostick",
-}
-Config.PoliceAlertOxy = 90 -- This is a % out of 100 to alert police
-	------------------------ Drug Picking locations. 
-Config.CocaPlant = {
-    [1] = {
-        location = vector3(1474.25, -2643.87, 42.88),
-        heading = 334.49,
-        model = "prop_plant_01a"
-    },
-    [2] = {
-        location = vector3(1472.35, -2649.3, 41.87),
-        heading = 329.56,
-        model = "prop_plant_01a"
-    },
-    [3] = {
-        location = vector3(1475.7, -2652.9, 40.8),
-        heading = 25.16,
-        model = "prop_plant_01a"
-    },
-    [4] = {
-        location = vector3(1481.0, -2654.99, 39.86),
-        heading = 21.52,
-        model = "prop_plant_01a"
-    },
-    [5] = {
-        location = vector3(1480.9, -2660.63, 38.68),
-        heading = 202.97,
-        model = "prop_plant_01a"
-    },
-    [6] = {
-        location = vector3(1477.18, -2666.53, 38.19),
-        heading = 202.97,
-        model = "prop_plant_01a"
-    },
-    [7] = {
-        location = vector3(1477.58, -2670.82, 37.73),
-        heading = 202.97,
-        model = "prop_plant_01a"
-    },
-    [8] = {
-        location = vector3(1476.56, -2675.82, 37.46),
-        heading = 202.97,
-        model = "prop_plant_01a"
-    },
-    [9] = {
-        location = vector3(1474.8, -2680.19, 37.03),
-        heading = 202.97,
-        model = "prop_plant_01a"
-    },
-    [10] = {
-        location = vector3(1471.52, -2685.0, 36.82),
-        heading = 202.97,
-        model = "prop_plant_01a"
-    },
-    [11] = {
-        location = vector3(1462.82, -2676.58, 38.83),
-        heading = 202.97,
-        model = "prop_plant_01a"
-    },
-    [12] = {
-        location = vector3(1461.31, -2667.74, 39.67),
-        heading = 202.97,
-        model = "prop_plant_01a"
-    },
-    [13] = {
-        location = vector3(1456.3, -2647.61, 43.39),
-        heading = 202.97,
-        model = "prop_plant_01a"
-    },
-    [14] = {
-        location = vector3(1453.65, -2641.56, 45.0),
-        heading = 202.97,
-        model = "prop_plant_01a"
-    },
-}
-
-
-Config.PoppyPlants = {
-    [1] = {
-        location = vector3(-2251.3, -99.18, 100.11),
-        heading = 334.49,
-        model = "prop_plant_01b"
-    },
-    [2] = {
-        location = vector3(-2249.63, -92.97, 101.8),
-        heading = 329.56,
-        model = "prop_plant_01b"
-    },
-    [3] = {
-        location = vector3(-2245.57, -85.12, 104.5),
-        heading = 25.16,
-        model = "prop_plant_01b"
-    },
-    [4] = {
-        location = vector3(-2240.81, -88.48, 105.88),
-        heading = 21.52,
-        model = "prop_plant_01b"
-    },
-	[5] = {
-        location = vector3(-2240.87, -93.36, 103.88),
-        heading = 334.49,
-        model = "prop_plant_01b"
-    },
-    [6] = {
-        location = vector3(-2236.0, -95.34, 102.55),
-        heading = 329.56,
-        model = "prop_plant_01b"
-    },
-    [7] = {
-        location = vector3(-2240.6, -100.01, 100.49),
-        heading = 25.16,
-        model = "prop_plant_01b"
-    },
-    [8] = {
-        location = vector3(-2246.29, -104.92, 99.27),
-        heading = 21.52,
-        model = "prop_plant_01b"
-    },
-	[9] = {
-        location = vector3(-2243.64, -107.99, 96.71),
-        heading = 334.49,
-        model = "prop_plant_01b"
-    },
-    [10] = {
-        location = vector3(-2254.22, -108.76, 97.25),
-        heading = 329.56,
-        model = "prop_plant_01b"
-    },
-    [11] = {
-        location = vector3(-2247.33, -108.92, 97.70),
-        heading = 25.16,
-        model = "prop_plant_01b"
-    },
-    [12] = {
-        location = vector3(-2250.96, -111.22, 97.50),
-        heading = 21.52,
-        model = "prop_plant_01b"
-    },
-	 [13] = {
-        location = vector3(465.95, -1021.32, 31.78),
-        heading = 21.52,
-        model = "prop_plant_01b"
-    },
-   
-}
-
-Config.shrooms = {
-    [1] = {
-        location = vector3(2185.14, 5183.81, 57.48),
-        heading = 334.49,
-        model = "prop_stoneshroom1"
-    },
-    [2] = {
-        location = vector3(2174.45, 5187.85, 57.43),
-        heading = 329.56,
-        model = "prop_stoneshroom1"
-    },
-    [3] = {
-        location = vector3(2166.22, 5196.56, 58.0),
-        heading = 25.16,
-        model = "prop_stoneshroom1"
-    },
-    [4] = {
-        location = vector3(2166.82, 5204.83, 58.63),
-        heading = 21.52,
-        model = "prop_stoneshroom1"
-    },
-	[5] = {
-        location = vector3(2174.84, 5205.82, 59.19),
-        heading = 334.49,
-        model = "prop_stoneshroom1"
-    },
-    [6] = {
-        location = vector3(2184.46, 5201.23, 59.2),
-        heading = 329.56,
-        model = "prop_stoneshroom1"
-    },
-    [7] = {
-        location = vector3(2192.45, 5194.89, 58.86),
-        heading = 25.16,
-        model = "prop_stoneshroom1"
-    },
-    [8] = {
-        location = vector3(2207.53, 5187.81, 58.95),
-        heading = 21.52,
-        model = "prop_stoneshroom1"
-    },
-	[9] = {
-        location = vector3(2213.46, 5191.11, 59.81),
-        heading = 334.49,
-        model = "prop_stoneshroom1"
-    },
-    [10] = {
-        location = vector3(2218.31, 5180.0, 58.18),
-        heading = 329.56,
-        model = "prop_stoneshroom1"
-    },
-    [11] = {
-        location = vector3(2212.75, 5172.35, 57.2),
-        heading = 25.16,
-        model = "prop_stoneshroom1"
-    },
-    [12] = {
-        location = vector3(2208.56, 5167.06, 56.34),
-        heading = 21.52,
-        model = "prop_stoneshroom1"
-    },
-	 [13] = {
-        location = vector3(2196.9, 5158.59, 54.84),
-        heading = 21.52,
-        model = "prop_stoneshroom1"
-    },
-   
-    [14] = {
-        location = vector3(2191.62, 5174.91, 56.68),
-        heading = 21.52,
-        model = "prop_stoneshroom1"
-    },
-    [15] = {
-        location = vector3(2190.18, 5182.54, 57.47),
-        heading = 21.52,
-        model = "prop_stoneshroom1"
-    },
-    [16] = {
-        location = vector3(2185.85, 5190.49, 58.1),
-        heading = 21.52,
-        model = "prop_stoneshroom1"
-    },
-    [17] = {
-        location = vector3(2179.95, 5194.19, 58.26),
-        heading = 21.52,
-        model = "prop_stoneshroom1"
-    },
-   
-   
-}
-
-Config.Mescaline = {
-    [1] = {
-        location = vector3(2598.73, 4207.89, 41.02),
-        heading = 334.49,
-        model = "prop_cactus_03"
-    },
-    [2] = {
-        location = vector3(2601.46, 4199.34, 40.62),
-        heading = 329.56,
-        model = "prop_cactus_03"
-    },
-    [3] = {
-        location = vector3(2611.63, 4194.18, 41.18),
-        heading = 25.16,
-        model = "prop_cactus_03"
-    },
-    [4] = {
-        location = vector3(2620.18, 4202.69, 41.5),
-        heading = 21.52,
-        model = "prop_cactus_03"
-    },
-	[5] = {
-        location = vector3(2624.26, 4211.75, 42.34),
-        heading = 334.49,
-        model = "prop_cactus_03"
-    },
-    [6] = {
-        location = vector3(2635.21, 4207.5, 42.49),
-        heading = 329.56,
-        model = "prop_cactus_03"
-    },
-    [7] = {
-        location = vector3(2644.97, 4193.51, 42.11),
-        heading = 25.16,
-        model = "prop_cactus_03"
-    },
-    [8] = {
-        location = vector3(2654.21, 4195.31, 41.23),
-        heading = 21.52,
-        model = "prop_cactus_03"
-    },
-	[9] = {
-        location = vector3(2653.32, 4206.49, 41.62),
-        heading = 334.49,
-        model = "prop_cactus_03"
-    },
-    [10] = {
-        location = vector3(2647.45, 4213.94, 42.49),
-        heading = 329.56,
-        model = "prop_cactus_03"
-    },
-    [11] = {
-        location = vector3(2636.3, 4218.49, 43.03),
-        heading = 25.16,
-        model = "prop_cactus_03"
-    },
-    [12] = {
-        location = vector3(2627.37, 4223.2, 42.88),
-        heading = 21.52,
-        model = "prop_cactus_03"
-    },
-	 [13] = {
-        location = vector3(2617.86, 4230.38, 42.63),
-        heading = 21.52,
-        model = "prop_cactus_03"
-    },
-   
-    [14] = {
-        location = vector3(2609.8, 4222.12, 41.19),
-        heading = 21.52,
-        model = "prop_cactus_03"
-    },
-    [15] = {
-        location = vector3(2602.96, 4194.05, 41.01),
-        heading = 21.52,
-        model = "prop_cactus_03"
-    },
-    [16] = {
-        location = vector3(2614.39, 4188.3, 41.68),
-        heading = 21.52,
-        model = "prop_cactus_03"
-    },
-    [17] = {
-        location = vector3(2623.82, 4189.97, 41.44),
-        heading = 21.52,
-        model = "prop_cactus_03"
-    },
-   
-   
-}
----------------------- even though there is a comment out section since this feature was released i get constant questions about it. so ill make a note. if you ask for support saying these peds arent spawning ill delete your ticket. 
----------------------- This only happens if the wholesale is a setup. They will spawn and shoot you. THEY ONLY SPAWN IF ITS A SETUP
-Config.Cokepeds = { ------------- this is where the setup peds will spawn to kill you
-	vector3(640.24, 644.18, 129.09),
-	vector3(642.64, 649.71, 128.91),
-	vector3(646.47, 650.65, 128.91),
-	vector3(652.8, 649.88, 128.95),
-	vector3(656.87, 631.85, 128.91),
-	vector3(649.96, 620.57, 128.91),
-}
-
-Config.CrackPeds = { ------------- this is where the setup peds will spawn to kill you
-	vector3(1873.25, 299.28, 164.27),
-	vector3(1891.37, 292.12, 163.68),
-	vector3(1886.68, 274.1, 162.96),
-	vector3(1869.67, 265.97, 163.72),
-	vector3(1836.88, 251.09, 162.56),
-	vector3(1853.3, 230.64, 162.09),
-}
-
-Config.heroinPeds = { ------------- this is where the setup peds will spawn to kill you
-	vector3(2740.93, 1389.09, 24.5),
-	vector3(2713.38, 1392.31, 24.54),
-	vector3(2703.66, 1355.09, 24.52),
-	vector3(2680.34, 1363.39, 24.52),
-	vector3(2766.1, 1388.15, 24.52),
-	vector3(2764.76, 1364.16, 24.52),
-}
-
-Config.lsdPeds = { ------------- this is where the setup peds will spawn to kill you
-	vector3(-1564.49, 838.85, 184.18),
-	vector3(-1545.33, 863.67, 181.44),
-	vector3(-1542.18, 802.71, 184.24),
-	vector3(-1524.31, 820.44, 181.79),
-}
-
------------  qb-drugs update built in here below
------------ Everything is now a target and not displaytext. Dealers are no longer just doors, they will spawn peds where you place your dealer. This is a literally qb-drugs with SLIGHT edits. mainly added peds for deliveries, made everything a target
------------- and changed the range a ped will walk up to you to be a bigger radius. 
-Config.SuccessChance = 50
-Config.ScamChance = 25
-Config.RobberyChance = 25
-Config.MinimumDrugSalePolice = 0
-
-Config.DrugsPrice = {
-    ["weed_white-widow"] = { min = 15, max = 24 },
-    ["weed_og-kush"] = {min = 15, max = 28},
-    ["weed_skunk"] = {min = 15, max = 31 },
-    ["weed_amnesia"] = {min = 18, max = 34},
-    ["weed_purple-haze"] = {min = 18, max = 37},
-    ["weed_ak47"] = {min = 18, max = 40},
-    ["crack_baggy"] = {min = 18, max = 34},
-    ["cokebaggy"] = {min = 18, max = 37},
-    ["cokebaggystagetwo"] = {min = 18, max = 40},
-	["cokebaggystagethree"] = {min = 18, max = 40},
-	["heroin_ready"] = {min = 18, max = 40},
-	["heroin_readystagetwo"] = {min = 18, max = 40},
-	["heroin_readystagethree"] = {min = 18, max = 40},
-	["baggedcracked"] = {min = 18, max = 40},
-	["baggedcrackedstagetwo"] = {min = 18, max = 40},
-	["baggedcrackedstagethree"] = {min = 18, max = 40},
-	["white_playboys"] = {min = 18, max = 40},
-	["white_playboys2"] = {min = 18, max = 40},
-	["white_playboys3"] = {min = 18, max = 40},
-	["white_playboys4"] = {min = 18, max = 40},
-	["blue_playboys"] = {min = 18, max = 40},
-	["blue_playboys2"] = {min = 18, max = 40},
-	["blue_playboys3"] = {min = 18, max = 40},
-	["blue_playboys4"] = {min = 18, max = 40},
-	["red_playboys"] = {min = 18, max = 40},
-	["red_playboys2"] = {min = 18, max = 40},
-	["red_playboys3"] = {min = 18, max = 40},
-	["red_playboys4"] = {min = 18, max = 40},
-	["orange_playboys"] = {min = 18, max = 40},
-	["orange_playboys2"] = {min = 18, max = 40},
-	["orange_playboys3"] = {min = 18, max = 40},
-	["orange_playboys4"] = {min = 18, max = 40},
-	["white_aliens"] = {min = 18, max = 40},
-	["white_aliens2"] = {min = 18, max = 40},
-	["white_aliens3"] = {min = 18, max = 40},
-	["white_aliens4"] = {min = 18, max = 40},
-	["blue_aliens"] = {min = 18, max = 40},
-	["blue_aliens2"] = {min = 18, max = 40},
-	["blue_aliens3"] = {min = 18, max = 40},
-	["blue_aliens4"] = {min = 18, max = 40},
-	["red_aliens"] = {min = 18, max = 40},
-	["red_aliens2"] = {min = 18, max = 40},
-	["red_aliens3"] = {min = 18, max = 40},
-	["red_aliens4"] = {min = 18, max = 40},
-	["orange_aliens"] = {min = 18, max = 40},
-	["orange_aliens2"] = {min = 18, max = 40},
-	["orange_aliens3"] = {min = 18, max = 40},
-	["orange_aliens4"] = {min = 18, max = 40},
-	["white_pl"] = {min = 18, max = 40},
-	["white_pl2"] = {min = 18, max = 40},
-	["white_pl3"] = {min = 18, max = 40},
-	["white_pl4"] = {min = 18, max = 40},
-	["blue_pl"] = {min = 18, max = 40},
-	["blue_pl2"] = {min = 18, max = 40},
-	["blue_pl3"] = {min = 18, max = 40},
-	["blue_pl4"] = {min = 18, max = 40},
-	["red_pl"] = {min = 18, max = 40},
-	["red_pl2"] = {min = 18, max = 40},
-	["red_pl3"] = {min = 18, max = 40},
-	["red_pl4"] = {min = 18, max = 40},
-	["orange_pl"] = {min = 18, max = 40},
-	["orange_pl2"] = {min = 18, max = 40},
-	["orange_pl3"] = {min = 18, max = 40},
-	["orange_pl4"] = {min = 18, max = 40},
-	["white_trolls"] = {min = 18, max = 40},
-	["white_trolls2"] = {min = 18, max = 40},
-	["white_trolls3"] = {min = 18, max = 40},
-	["white_trolls4"] = {min = 18, max = 40},
-	["blue_trolls"] = {min = 18, max = 40},
-	["blue_trolls2"] = {min = 18, max = 40},
-	["blue_trolls3"] = {min = 18, max = 40},
-	["blue_trolls4"] = {min = 18, max = 40},
-	["red_trolls"] = {min = 18, max = 40},
-	["red_trolls2"] = {min = 18, max = 40},
-	["red_trolls3"] = {min = 18, max = 40},
-	["red_trolls4"] = {min = 18, max = 40},
-	["orange_trolls"] = {min = 18, max = 40},
-	["orange_trolls2"] = {min = 18, max = 40},
-	["orange_trolls3"] = {min = 18, max = 40},
-	["orange_trolls4"] = {min = 18, max = 40},
-	["white_cats"] = {min = 18, max = 40},
-	["white_cats2"] = {min = 18, max = 40},
-	["white_cats3"] = {min = 18, max = 40},
-	["white_cats4"] = {min = 18, max = 40},
-	["blue_cats"] = {min = 18, max = 40},
-	["blue_cats2"] = {min = 18, max = 40},
-	["blue_cats3"] = {min = 18, max = 40},
-	["blue_cats4"] = {min = 18, max = 40},
-	["red_cats"] = {min = 18, max = 40},
-	["red_cats2"] = {min = 18, max = 40},
-	["red_cats3"] = {min = 18, max = 40},
-	["red_cats4"] = {min = 18, max = 40},
-	["orange_cats"] = {min = 18, max = 40},
-	["orange_cats2"] = {min = 18, max = 40},
-	["orange_cats3"] = {min = 18, max = 40},
-	["orange_cats4"] = {min = 18, max = 40},	
-}
-
-	Debug = false -- true / false - Currently prints the vector3 and label of locations when requesting a delivery
-    NearbyDeliveries = false -- true / false - Do you want deliveries to be within a certain amount of units?
-    DeliveryWithin = 2000 -- int (Default 2000) - How many units do you want the delivery location to be within from the player when making a delivery request?
-    Config.Dealers = {}
-    --UseTarget =  GetConvar('UseTarget', 'false') == 'true', -- Use qb-target interactions (don't change this, go to your server.cfg and add setr UseTarget true)
-    PoliceCallChance = 99 --in percentage (if 99, theres the 99% to call the police)
-
-    -- Shop Config
-Config.Products = {
-        [1] = {name = "weed_white-widow_seed", price = 15, amount = 150, info = {}, type = "item", slot = 1, minrep = 0},
-        [2] = {name = "weed_skunk_seed", price = 15, amount = 150, info = {}, type = "item", slot = 1, minrep = 20},
-        [3] = {name = "weed_purple-haze_seed", price = 15, amount = 150, info = {}, type = "item", slot = 1, minrep = 40},
-		[4] = {name = "weed_og-kush_seed", price = 15, amount = 150, info = {}, type = "item", slot = 1, minrep = 60},
-		[5] = {name = "weed_amnesia_seed", price = 15, amount = 150, info = {}, type = "item", slot = 1, minrep = 80},
-}
-
-Config.UseMarkedBills = false -- true for marked bills, false for cash
-Config.DeliveryRepGain = 1 -- amount of rep gained per delivery
-Config.DeliveryRepLoss = 1 -- amount of rep lost if delivery wrong or late
-Config.PoliceDeliveryModifier = 2 -- amount to multiply active cop count by
-Config.WrongAmountFee = 2 -- divide the payout by this value for wrong delivery amount
-Config.OverdueDeliveryFee = 4 -- divide the payout by this value for overdue delivery
-
-Config.DeliveryItems = {
-   [1] = {
-       ["item"] = "weed_brick",
-       ["minrep"] = 0,
-       ['payout'] = 1000
-   },
-   [2] = {
-       ["item"] = "coke_brick",
-       ["minrep"] = 0,
-       ['payout'] = 1000
-   },
-}
-
-Config.DeliveryLocations = {
-        [1] = {
-            ["label"] = "Stripclub",
-            ["coords"] = vector3(106.24, -1280.32, 29.24),
-        },
-        [2] = {
-            ["label"] = "Vinewood Video",
-            ["coords"] = vector3(223.98, 121.53, 102.76),
-        },
-        [3] = {
-            ["label"] = "Taxi",
-            ["coords"] = vector3(882.67, -160.26, 77.11),
-        },
-        [4] = {
-            ["label"] = "Resort",
-            ["coords"] = vector3(-1245.63, 376.21, 75.34),
-        },
-        [5] = {
-            ["label"] = "Bahama Mamas",
-            ["coords"] = vector3(-1383.1, -639.99, 28.67),
-        },
- }
- 
- 

fxmanifest.lua

@@ -3,26 +3,29 @@ author "mustache_dom"
 description "drugs by mustache dom"
 fx_version "cerulean"
 game "gta5"
-
+version  '4.0.8'
 client_scripts {
-	'client/**.lua',
-	'@PolyZone/client.lua',
-   	 '@PolyZone/CircleZone.lua',
+	'client/functions.lua',
+	'client/plantSpawns.lua',
+	'clientRun.lua',
 }
 
 server_scripts {
-    'server/**.lua',
+	'server/functions.lua',
+	'server/plantSpawns.lua',
+	'serverRun.lua',
 	'@oxmysql/lib/MySQL.lua',
-	
 }
 
 shared_scripts {
-    'config.lua',
-	
-	
+ '@ox_lib/init.lua', 
+	'shared/**.lua',
 }
 
-
 lua54 'yes'
 
-dependency '/assetpacks'
+files {
+	'client/**.lua',
+	'server/**.lua',
+	'locales/**.lua'
+}